commit f22f56dd483b27f8c4463dbb310029dd9161bb04
author Cédric Le Goater <clg@kaod.org> Mon Nov 25 07:58:19 2019 +0100
committer David Gibson <david@gibson.dropbear.id.au> Tue Dec 17 10:39:48 2019 +1100
tree 35aa65734c403c91a93c124abd18f317e2e5a5c9
parent dc2526e45a0ffebc88d7ed007d906f669827f834

ppc/pnv: Extend XiveRouter with a get_block_id() handler

When doing CAM line compares, fetch the block id from the interrupt
controller which can have set the PC_TCTXT_CHIPID field.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20191125065820.927-20-clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

hw/intc/spapr_xive.c

diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c
index b785066..57305c5 100644
--- a/hw/intc/spapr_xive.c
+++ b/hw/intc/spapr_xive.c
@@ -473,6 +473,11 @@
     return count;
 }
 
+static uint8_t spapr_xive_get_block_id(XiveRouter *xrtr)
+{
+    return SPAPR_XIVE_BLOCK_ID;
+}
+
 static const VMStateDescription vmstate_spapr_xive_end = {
     .name = TYPE_SPAPR_XIVE "/end",
     .version_id = 1,
@@ -766,6 +771,7 @@
     xrc->write_end = spapr_xive_write_end;
     xrc->get_nvt = spapr_xive_get_nvt;
     xrc->write_nvt = spapr_xive_write_nvt;
+    xrc->get_block_id = spapr_xive_get_block_id;
 
     sicc->activate = spapr_xive_activate;
     sicc->deactivate = spapr_xive_deactivate;