[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH v3 18/18] ppc/xive: Introduce a xive_os_cam_decode() h
From: |
Cédric Le Goater |
Subject: |
[Qemu-ppc] [PATCH v3 18/18] ppc/xive: Introduce a xive_os_cam_decode() helper |
Date: |
Wed, 31 Jul 2019 16:12:33 +0200 |
The OS CAM line has a special encoding exploited by the HW. Provide a
helper routine to hide the details to the TIMA command handlers. This
also clarifies the endianness of different variables : 'qw1w2' is
big-endian and 'cam' is native.
Also add a check on the V bit in the TM_PULL_POOL_CTX special
operation.
Signed-off-by: Cédric Le Goater <address@hidden>
---
hw/intc/xive.c | 40 +++++++++++++++++++++++++++++++---------
1 file changed, 31 insertions(+), 9 deletions(-)
diff --git a/hw/intc/xive.c b/hw/intc/xive.c
index e79439f6b940..bdc36f2a1b0b 100644
--- a/hw/intc/xive.c
+++ b/hw/intc/xive.c
@@ -339,14 +339,34 @@ static void xive_tm_set_os_pending(XivePresenter *xptr,
XiveTCTX *tctx,
xive_tctx_ipb_update(tctx, TM_QW1_OS, priority_to_ipb(value & 0xff));
}
+static void xive_os_cam_decode(uint32_t cam, uint8_t *nvt_blk,
+ uint32_t *nvt_idx, bool *vo)
+{
+ *nvt_blk = xive_nvt_blk(cam);
+ *nvt_idx = xive_nvt_idx(cam);
+ *vo = !!(cam & TM_QW1W2_VO);
+}
+
static uint64_t xive_tm_pull_os_ctx(XivePresenter *xptr, XiveTCTX *tctx,
hwaddr offset, unsigned size)
{
- uint32_t qw1w2_prev = xive_tctx_word2(&tctx->regs[TM_QW1_OS]);
- uint32_t qw1w2;
+ uint32_t qw1w2 = xive_tctx_word2(&tctx->regs[TM_QW1_OS]);
+ uint32_t qw1w2_new;
+ uint32_t cam = be32_to_cpu(qw1w2);
+ uint8_t nvt_blk;
+ uint32_t nvt_idx;
+ bool vo;
- qw1w2 = xive_set_field32(TM_QW1W2_VO, qw1w2_prev, 0);
- memcpy(&tctx->regs[TM_QW1_OS + TM_WORD2], &qw1w2, 4);
+ xive_os_cam_decode(cam, &nvt_blk, &nvt_idx, &vo);
+
+ if (!vo) {
+ qemu_log_mask(LOG_GUEST_ERROR, "XIVE: pulling invalid NVT %x/%x !?\n",
+ nvt_blk, nvt_idx);
+ }
+
+ /* Invalidate CAM line */
+ qw1w2_new = xive_set_field32(TM_QW1W2_VO, qw1w2, 0);
+ memcpy(&tctx->regs[TM_QW1_OS + TM_WORD2], &qw1w2_new, 4);
return qw1w2;
}
@@ -384,13 +404,15 @@ static void xive_tctx_need_resend(XiveRouter *xrtr,
XiveTCTX *tctx,
static void xive_tm_push_os_ctx(XivePresenter *xptr, XiveTCTX *tctx,
hwaddr offset, uint64_t value, unsigned size)
{
- uint32_t qw1w2 = value;
- uint8_t nvt_blk = xive_nvt_blk(qw1w2);
- uint32_t nvt_idx = xive_nvt_idx(qw1w2);
- bool vo = !!(qw1w2 & TM_QW1W2_VO);
+ uint32_t cam = value;
+ uint32_t qw1w2 = cpu_to_be32(cam);
+ uint8_t nvt_blk;
+ uint32_t nvt_idx;
+ bool vo;
+
+ xive_os_cam_decode(cam, &nvt_blk, &nvt_idx, &vo);
/* First update the registers */
- qw1w2 = cpu_to_be32(qw1w2);
memcpy(&tctx->regs[TM_QW1_OS + TM_WORD2], &qw1w2, 4);
/* Check the interrupt pending bits */
--
2.21.0
- [Qemu-ppc] [PATCH v3 08/18] ppc/pnv: Clarify how the TIMA is accessed on a multichip system, (continued)
- [Qemu-ppc] [PATCH v3 08/18] ppc/pnv: Clarify how the TIMA is accessed on a multichip system, Cédric Le Goater, 2019/07/31
- [Qemu-ppc] [PATCH v3 09/18] ppc/xive: Move the TIMA operations to the controller model, Cédric Le Goater, 2019/07/31
- [Qemu-ppc] [PATCH v3 10/18] ppc/xive: Introduce a xive_tctx_ipb_update() helper, Cédric Le Goater, 2019/07/31
- [Qemu-ppc] [PATCH v3 11/18] ppc/xive: Synthesize interrupt from the saved IPB in the NVT, Cédric Le Goater, 2019/07/31
- [Qemu-ppc] [PATCH v3 12/18] ppc/pnv: Remove pnv_xive_vst_size() routine, Cédric Le Goater, 2019/07/31
- [Qemu-ppc] [PATCH v3 13/18] ppc/pnv: Dump the XIVE NVT table, Cédric Le Goater, 2019/07/31
- [Qemu-ppc] [PATCH v3 14/18] ppc/pnv: Skip empty slots of the XIVE NVT table, Cédric Le Goater, 2019/07/31
- [Qemu-ppc] [PATCH v3 15/18] ppc/pnv: Introduce a pnv_xive_block_id() helper, Cédric Le Goater, 2019/07/31
- [Qemu-ppc] [PATCH v3 16/18] ppc/pnv: Extend XivePresenter with a get_block_id() handler, Cédric Le Goater, 2019/07/31
- [Qemu-ppc] [PATCH v3 17/18] ppc/pnv: Quiesce some XIVE errors, Cédric Le Goater, 2019/07/31
- [Qemu-ppc] [PATCH v3 18/18] ppc/xive: Introduce a xive_os_cam_decode() helper,
Cédric Le Goater <=