ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ppc/xive: Fix TM_PULL_POOL_CTX special operation 

When a CPU is reseted, the hypervisor (Linux or OPAL) invalidates the
POOL interrupt context of a CPU with this special command. It returns
the POOL CAM line value and resets the VP bit.

Fixes: 4836b45510 ("ppc/xive: activate HV support")
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20190630204601.30574-5-clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Cédric Le Goater 2019-06-30 22:45:55 +02:00 committed by David Gibson
parent 0df68c7ed6
commit aaa450300e
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/intc/xive.c
View File

@ -132,6 +132,11 @@ static void xive_tctx_set_cppr(XiveTCTX *tctx, uint8_t ring, uint8_t cppr)
xive_tctx_notify(tctx, ring); xive_tctx_notify(tctx, ring);
} }
static inline uint32_t xive_tctx_word2(uint8_t *ring)
{
return *((uint32_t *) &ring[TM_WORD2]);
}
/* /*
* XIVE Thread Interrupt Management Area (TIMA) * XIVE Thread Interrupt Management Area (TIMA)
*/ */
@ -150,11 +155,12 @@ static uint64_t xive_tm_ack_hv_reg(XiveTCTX *tctx, hwaddr offset, unsigned size)
static uint64_t xive_tm_pull_pool_ctx(XiveTCTX *tctx, hwaddr offset, static uint64_t xive_tm_pull_pool_ctx(XiveTCTX *tctx, hwaddr offset,
unsigned size) unsigned size)
{ {
uint64_t ret; uint32_t qw2w2_prev = xive_tctx_word2(&tctx->regs[TM_QW2_HV_POOL]);
uint32_t qw2w2;
ret = tctx->regs[TM_QW2_HV_POOL + TM_WORD2] & TM_QW2W2_POOL_CAM; qw2w2 = xive_set_field32(TM_QW2W2_VP, qw2w2_prev, 0);
tctx->regs[TM_QW2_HV_POOL + TM_WORD2] &= ~TM_QW2W2_POOL_CAM; memcpy(&tctx->regs[TM_QW2_HV_POOL + TM_WORD2], &qw2w2, 4);
return ret; return qw2w2;
} }
static void xive_tm_vt_push(XiveTCTX *tctx, hwaddr offset, static void xive_tm_vt_push(XiveTCTX *tctx, hwaddr offset,
@ -484,11 +490,6 @@ const MemoryRegionOps xive_tm_ops = {
}, },
}; };
static inline uint32_t xive_tctx_word2(uint8_t *ring)
{
return *((uint32_t *) &ring[TM_WORD2]);
}
static char *xive_tctx_ring_print(uint8_t *ring) static char *xive_tctx_ring_print(uint8_t *ring)
{ {
uint32_t w2 = xive_tctx_word2(ring); uint32_t w2 = xive_tctx_word2(ring);