XIVE changes for Cache Watch, VSTs, STT and info pic
v4 cover XIVE changes for Cache Watch, VSTs, STT and info pic
From: Michael Kowal <[email protected]>
These changes provide enhanced support of the External Interrupt Virtualization Engine. The changes are focused on the following areas:
- Cache Watch, Cache Flush and Sync Injection
- Virtual Structure Tables
- Set Translation Table
- 'info pic' command data that is dumped
Version 4 changes:
- Added Reviewed-by Tags to patch sets 1-8
- split patch set 9 into 3 patch sets, 9, 10 and 11
Frederic Barrat (9):
pnv/xive2: XIVE2 Cache Watch, Cache Flush and Sync Injection support pnv/xive2: Add NVG and NVC to cache watch facility pnv/xive2: Configure Virtualization Structure Tables through the PC pnv/xive2: Enable VST NVG and NVC index compression pnv/xive2: Set Translation Table for the NVC port space pnv/xive2: Fail VST entry address computation if table has no VSD pnv/xive2: Move xive2_nvp_pic_print_info() to xive2.c pnv/xive2: Refine TIMA 'info pic' output
pnv/xive2: Dump more END state with 'info pic'
Michael Kowal (1):
pnv/xive2: Structure/define alignment changes
Nicholas Piggin (1):
pnv/xive: Support cache flush and queue sync inject with notifications
hw/intc/pnv_xive2_regs.h | 108 +++++++ include/hw/ppc/pnv_chip.h | 1 + include/hw/ppc/xive2_regs.h | 9 + hw/intc/pnv_xive2.c | 566 ++++++++++++++++++++++++++++++------ hw/intc/xive.c | 12 +- hw/intc/xive2.c | 33 ++- 6 files changed, 633 insertions(+), 96 deletions(-)
--
2.43.0
PATCH v4 1/11 pnv/xive2: XIVE2 Cache Watch, Cache Flush and Sync Injection support
From: Frederic Barrat <[email protected]>
XIVE offers a 'cache watch facility', which allows software to read/update a potentially cached table entry with no software lock. There's one such facility in the Virtualization Controller (VC) to update the ESB and END entries and one in the Presentation Controller (PC) to update the NVP/NVG/NVC entries.
Each facility has 4 cache watch engines to control the updates and firmware can request an available engine by querying the hardware 'watch_assign' register of the VC or PC. The engine is then reserved and is released after the data is updated by reading the 'watch_spec' register (which also allows to check for a conflict during the update). If no engine is available, the special value 0xFF is returned and firmware is expected to repeat the request until an engine becomes available.
--- hw/intc/pnv_xive2_regs.h | 90 ++++++++++++++ hw/intc/pnv_xive2.c | 251 +++++++++++++++++++++++++++++++++------ 2 files changed, 305 insertions(+), 36 deletions(-)
hw/intc/pnv_xive2_regs.h +90 -0
@@ -283,6 +283,15 @@#define VC_ENDC_SYNC_QUEUE_HARD PPC_BIT(6)#define VC_QUEUE_COUNT 7 +/* ENDC cache watch assign */ +#define X_VC_ENDC_WATCH_ASSIGN 0x186 +#define VC_ENDC_WATCH_ASSIGN 0x430 + +/* ENDC configuration register */ +#define X_VC_ENDC_CFG 0x188 +#define VC_ENDC_CFG 0x440 +#define VC_ENDC_CFG_CACHE_WATCH_ASSIGN PPC_BITMASK(32, 35) +/* ENDC cache watch specification 0 */ #define X_VC_ENDC_WATCH0_SPEC 0x1A0#define VC_ENDC_WATCH0_SPEC 0x500
@@ -302,6 +311,42 @@#define VC_ENDC_WATCH0_DATA2 0x530#define VC_ENDC_WATCH0_DATA3 0x538 +/* ENDC cache watch 1 */ +#define X_VC_ENDC_WATCH1_SPEC 0x1A8 +#define VC_ENDC_WATCH1_SPEC 0x540 +#define X_VC_ENDC_WATCH1_DATA0 0x1AC +#define X_VC_ENDC_WATCH1_DATA1 0x1AD +#define X_VC_ENDC_WATCH1_DATA2 0x1AE +#define X_VC_ENDC_WATCH1_DATA3 0x1AF +#define VC_ENDC_WATCH1_DATA0 0x560 +#define VC_ENDC_WATCH1_DATA1 0x568 +#define VC_ENDC_WATCH1_DATA2 0x570 +#define VC_ENDC_WATCH1_DATA3 0x578 + +/* ENDC cache watch 2 */ +#define X_VC_ENDC_WATCH2_SPEC 0x1B0 +#define VC_ENDC_WATCH2_SPEC 0x580 +#define X_VC_ENDC_WATCH2_DATA0 0x1B4 +#define X_VC_ENDC_WATCH2_DATA1 0x1B5 +#define X_VC_ENDC_WATCH2_DATA2 0x1B6 +#define X_VC_ENDC_WATCH2_DATA3 0x1B7 +#define VC_ENDC_WATCH2_DATA0 0x5A0 +#define VC_ENDC_WATCH2_DATA1 0x5A8 +#define VC_ENDC_WATCH2_DATA2 0x5B0 +#define VC_ENDC_WATCH2_DATA3 0x5B8 + +/* ENDC cache watch 3 */ +#define X_VC_ENDC_WATCH3_SPEC 0x1B8 +#define VC_ENDC_WATCH3_SPEC 0x5C0 +#define X_VC_ENDC_WATCH3_DATA0 0x1BC +#define X_VC_ENDC_WATCH3_DATA1 0x1BD +#define X_VC_ENDC_WATCH3_DATA2 0x1BE +#define X_VC_ENDC_WATCH3_DATA3 0x1BF +#define VC_ENDC_WATCH3_DATA0 0x5E0 +#define VC_ENDC_WATCH3_DATA1 0x5E8 +#define VC_ENDC_WATCH3_DATA2 0x5F0 +#define VC_ENDC_WATCH3_DATA3 0x5F8 +/* * PC LSB1 */
@@ -358,6 +403,15 @@#define PC_NXC_FLUSH_POLL_BLOCK_ID_MASK PPC_BITMASK(36, 39)#define PC_NXC_FLUSH_POLL_OFFSET_MASK PPC_BITMASK(40, 63)/* 24-bit */ +/* NxC Cache watch assign */ +#define X_PC_NXC_WATCH_ASSIGN 0x286 +#define PC_NXC_WATCH_ASSIGN 0x430 + +/* NxC Proc config */ +#define X_PC_NXC_PROC_CONFIG 0x28A +#define PC_NXC_PROC_CONFIG 0x450 +#define PC_NXC_PROC_CONFIG_WATCH_ASSIGN PPC_BITMASK(0, 3) +/* NxC Cache Watch 0 Specification */ #define X_PC_NXC_WATCH0_SPEC 0x2A0#define PC_NXC_WATCH0_SPEC 0x500
@@ -381,6 +435,42 @@#define PC_NXC_WATCH0_DATA2 0x530#define PC_NXC_WATCH0_DATA3 0x538 +/* NxC Cache Watch 1 */ +#define X_PC_NXC_WATCH1_SPEC 0x2A8 +#define PC_NXC_WATCH1_SPEC 0x540 +#define X_PC_NXC_WATCH1_DATA0 0x2AC +#define X_PC_NXC_WATCH1_DATA1 0x2AD +#define X_PC_NXC_WATCH1_DATA2 0x2AE +#define X_PC_NXC_WATCH1_DATA3 0x2AF +#define PC_NXC_WATCH1_DATA0 0x560 +#define PC_NXC_WATCH1_DATA1 0x568 +#define PC_NXC_WATCH1_DATA2 0x570 +#define PC_NXC_WATCH1_DATA3 0x578 + +/* NxC Cache Watch 2 */ +#define X_PC_NXC_WATCH2_SPEC 0x2B0 +#define PC_NXC_WATCH2_SPEC 0x580 +#define X_PC_NXC_WATCH2_DATA0 0x2B4 +#define X_PC_NXC_WATCH2_DATA1 0x2B5 +#define X_PC_NXC_WATCH2_DATA2 0x2B6 +#define X_PC_NXC_WATCH2_DATA3 0x2B7 +#define PC_NXC_WATCH2_DATA0 0x5A0 +#define PC_NXC_WATCH2_DATA1 0x5A8 +#define PC_NXC_WATCH2_DATA2 0x5B0 +#define PC_NXC_WATCH2_DATA3 0x5B8 + +/* NxC Cache Watch 3 */ +#define X_PC_NXC_WATCH3_SPEC 0x2B8 +#define PC_NXC_WATCH3_SPEC 0x5C0 +#define X_PC_NXC_WATCH3_DATA0 0x2BC +#define X_PC_NXC_WATCH3_DATA1 0x2BD +#define X_PC_NXC_WATCH3_DATA2 0x2BE +#define X_PC_NXC_WATCH3_DATA3 0x2BF +#define PC_NXC_WATCH3_DATA0 0x5E0 +#define PC_NXC_WATCH3_DATA1 0x5E8 +#define PC_NXC_WATCH3_DATA2 0x5F0 +#define PC_NXC_WATCH3_DATA3 0x5F8 +/* * TCTXT Registers */
hw/intc/pnv_xive2.c +215 -36
423 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH v4 2/11 pnv/xive2: Structure/define alignment changes
In reply to Michael KowalFrom: Michael Kowal <[email protected]>
Made changes to some structure and define elements to ease review in next patchset.
--- hw/intc/pnv_xive2.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
hw/intc/pnv_xive2.c +15 -15
@@ -45,16 +45,16 @@ typedef struct XiveVstInfo {static const XiveVstInfo vst_infos[] = { - [VST_EAS ] = {"EAT" ,sizeof (Xive2Eas),16 }, - [VST_ESB ] = {"ESB" ,1 ,16 }, - [VST_END ] = {"ENDT" ,sizeof (Xive2End),16 }, + [VST_EAS ] = {"EAT" ,sizeof (Xive2Eas),16 }, + [VST_ESB ] = {"ESB" ,1 ,16 }, + [VST_END ] = {"ENDT" ,sizeof (Xive2End),16 }, - [VST_NVP ] = {"NVPT" ,sizeof (Xive2Nvp),16 }, - [VST_NVG ] = {"NVGT" ,sizeof (Xive2Nvgc),16 }, - [VST_NVC ] = {"NVCT" ,sizeof (Xive2Nvgc),16 }, + [VST_NVP ] = {"NVPT" ,sizeof (Xive2Nvp),16 }, + [VST_NVG ] = {"NVGT" ,sizeof (Xive2Nvgc),16 }, + [VST_NVC ] = {"NVCT" ,sizeof (Xive2Nvgc),16 }, - [VST_IC ] = {"IC" ,1 /* ? */ ,16 },/* Topology # */ - [VST_SYNC ] = {"SYNC" ,1 /* ? */ ,16 },/* Topology # */ + [VST_IC ] = {"IC" ,1 ,/* ? */ 16 },/* Topology # */ + [VST_SYNC ] = {"SYNC" ,1 ,/* ? */ 16 },/* Topology # */ /* * This table contains the backing store pages for the interrupt
@@ -1720,13 +1720,13 @@ static const MemoryRegionOps pnv_xive2_ic_lsi_ops = {/* * Sync MMIO page (write only) */ -#define PNV_XIVE2_SYNC_IPI 0x000 -#define PNV_XIVE2_SYNC_HW 0x080 -#define PNV_XIVE2_SYNC_NxC 0x100 -#define PNV_XIVE2_SYNC_INT 0x180 -#define PNV_XIVE2_SYNC_OS_ESC 0x200 -#define PNV_XIVE2_SYNC_POOL_ESC 0x280 -#define PNV_XIVE2_SYNC_HARD_ESC 0x300 +#define PNV_XIVE2_SYNC_IPI 0x000 +#define PNV_XIVE2_SYNC_HW 0x080 +#define PNV_XIVE2_SYNC_NxC 0x100 +#define PNV_XIVE2_SYNC_INT 0x180 +#define PNV_XIVE2_SYNC_OS_ESC 0x200 +#define PNV_XIVE2_SYNC_POOL_ESC 0x280 +#define PNV_XIVE2_SYNC_HARD_ESC 0x300static uint64_t pnv_xive2_ic_sync_read (void *opaque,hwaddr offset,unsigned size)
Signature · 1 line
2.43.0
PATCH v4 3/11 pnv/xive: Support cache flush and queue sync inject with notifications
In reply to Michael KowalFrom: Nicholas Piggin <npiggin@gmail,com>
Adds support for writing a completion notification byte in memory whenever a cache flush or queue sync inject operation is requested by software. QEMU does not cache any of the XIVE data that is in memory and therefore it simply writes the completion notification byte at the time that the operation is requested.
--- hw/intc/pnv_xive2_regs.h | 16 ++++ include/hw/ppc/pnv_chip.h | 1 + hw/intc/pnv_xive2.c | 154 +++++++++++++++++++++++++++++++++++++- 3 files changed, 169 insertions(+), 2 deletions(-)
hw/intc/pnv_xive2_regs.h +16 -0
@@ -232,6 +232,10 @@#define VC_ESBC_FLUSH_POLL_BLOCK_ID_MASK PPC_BITMASK(32, 35)#define VC_ESBC_FLUSH_POLL_OFFSET_MASK PPC_BITMASK(36, 63)/* 28-bit */ +/* ESBC cache flush inject register */ +#define X_VC_ESBC_FLUSH_INJECT 0x142 +#define VC_ESBC_FLUSH_INJECT 0x210 +/* ESBC configuration */ #define X_VC_ESBC_CFG 0x148#define VC_ESBC_CFG 0x240
@@ -250,6 +254,10 @@#define VC_EASC_FLUSH_POLL_BLOCK_ID_MASK PPC_BITMASK(32, 35)#define VC_EASC_FLUSH_POLL_OFFSET_MASK PPC_BITMASK(36, 63)/* 28-bit */ +/* EASC flush inject register */ +#define X_VC_EASC_FLUSH_INJECT 0x162 +#define VC_EASC_FLUSH_INJECT 0x310 +/* * VC2 */
@@ -270,6 +278,10 @@#define VC_ENDC_FLUSH_POLL_BLOCK_ID_MASK PPC_BITMASK(36, 39)#define VC_ENDC_FLUSH_POLL_OFFSET_MASK PPC_BITMASK(40, 63)/* 24-bit */ +/* ENDC flush inject register */ +#define X_VC_ENDC_FLUSH_INJECT 0x182 +#define VC_ENDC_FLUSH_INJECT 0x410 +/* ENDC Sync done */ #define X_VC_ENDC_SYNC_DONE 0x184#define VC_ENDC_SYNC_DONE 0x420
@@ -403,6 +415,10 @@#define PC_NXC_FLUSH_POLL_BLOCK_ID_MASK PPC_BITMASK(36, 39)#define PC_NXC_FLUSH_POLL_OFFSET_MASK PPC_BITMASK(40, 63)/* 24-bit */ +/* NxC Cache flush inject */ +#define X_PC_NXC_FLUSH_INJECT 0x282 +#define PC_NXC_FLUSH_INJECT 0x410 +/* NxC Cache watch assign */ #define X_PC_NXC_WATCH_ASSIGN 0x286#define PC_NXC_WATCH_ASSIGN 0x430
include/hw/ppc/pnv_chip.h +1 -0
@@ -131,6 +131,7 @@ struct Pnv10Chip {#define PNV10_PIR2FUSEDCORE (pir) (((pir) >> 3) & 0xf)#define PNV10_PIR2CHIP (pir) (((pir) >> 8) & 0x7f) +#define PNV10_PIR2THREAD (pir) (((pir) & 0x7f))struct PnvChipClass {/*< private >*/
hw/intc/pnv_xive2.c +152 -2
229 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH v4 4/11 pnv/xive2: Add NVG and NVC to cache watch facility
In reply to Michael KowalFrom: Frederic Barrat <[email protected]>
The cache watch facility uses the same register interface to handle entries in the NVP, NVG and NVC tables. A bit-field in the 'watchX specification' register tells the table type. So far, that bit-field was not read and the code assumed a read/write to the NVP table.
This patch allows to read/write entries in the NVG and NVC table as well.
--- hw/intc/pnv_xive2.c | 49 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 11 deletions(-)
hw/intc/pnv_xive2.c +38 -11
@@ -465,10 +465,30 @@ static int pnv_xive2_write_nvp(Xive2Router *xrtr, uint8_t blk, uint32_t idx, word_number); } -static int pnv_xive2_nvp_update (PnvXive2 *xive,uint8_t watch_engine) +static int pnv_xive2_nxc_to_table_type (uint8_t nxc_type,uint32_t *table_type) { -uint8_t blk; -uint32_t idx; +switch (nxc_type) { +case PC_NXC_WATCH_NXC_NVP : + *table_type =VST_NVP ; +break ; +case PC_NXC_WATCH_NXC_NVG : + *table_type =VST_NVG ; +break ; +case PC_NXC_WATCH_NXC_NVC : + *table_type =VST_NVC ; +break ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"XIVE: invalid table type for nxc operation\n" ); +return -1 ; + } +return 0 ; +} + +static int pnv_xive2_nxc_update (PnvXive2 *xive,uint8_t watch_engine) +{ +uint8_t blk, nxc_type; +uint32_t idx, table_type =-1 ;int i, spec_reg, data_reg;uint64_t nxc_watch[4 ];
@@ -476,21 +496,24 @@ static int pnv_xive2_nvp_update(PnvXive2 *xive, uint8_t watch_engine) spec_reg = (PC_NXC_WATCH0_SPEC + watch_engine *0x40 ) >>3 ; data_reg = (PC_NXC_WATCH0_DATA0 + watch_engine *0x40 ) >>3 ; + nxc_type =GETFIELD (PC_NXC_WATCH_NXC_TYPE , xive->pc_regs[spec_reg]); blk =GETFIELD (PC_NXC_WATCH_BLOCK_ID , xive->pc_regs[spec_reg]); idx =GETFIELD (PC_NXC_WATCH_INDEX , xive->pc_regs[spec_reg]); +assert (pnv_xive2_nxc_to_table_type (nxc_type, &table_type)); +for (i =0 ; i <ARRAY_SIZE (nxc_watch); i++) { nxc_watch[i] =cpu_to_be64 (xive->pc_regs[data_reg + i]); } -return pnv_xive2_vst_write (xive,VST_NVP , blk, idx, nxc_watch, +return pnv_xive2_vst_write (xive, table_type, blk, idx, nxc_watch,XIVE_VST_WORD_ALL ); } -static void pnv_xive2_nvp_cache_load (PnvXive2 *xive,uint8_t watch_engine) +static void pnv_xive2_nxc_cache_load (PnvXive2 *xive,uint8_t watch_engine) { -uint8_t blk; -uint32_t idx; +uint8_t blk, nxc_type; +uint32_t idx, table_type =-1 ;uint64_t nxc_watch[4 ] = {0 };int i, spec_reg, data_reg;
@@ -498,11 +521,15 @@ static void pnv_xive2_nvp_cache_load(PnvXive2 *xive, uint8_t watch_engine) spec_reg = (PC_NXC_WATCH0_SPEC + watch_engine *0x40 ) >>3 ; data_reg = (PC_NXC_WATCH0_DATA0 + watch_engine *0x40 ) >>3 ; + nxc_type =GETFIELD (PC_NXC_WATCH_NXC_TYPE , xive->pc_regs[spec_reg]); blk =GETFIELD (PC_NXC_WATCH_BLOCK_ID , xive->pc_regs[spec_reg]); idx =GETFIELD (PC_NXC_WATCH_INDEX , xive->pc_regs[spec_reg]); -if (pnv_xive2_vst_read (xive,VST_NVP , blk, idx, nxc_watch)) { -xive2_error (xive,"VST: no NVP entry %x/%x !?" , blk, idx); +assert (pnv_xive2_nxc_to_table_type (nxc_type, &table_type)); + +if (pnv_xive2_vst_read (xive, table_type, blk, idx, nxc_watch)) { +xive2_error (xive,"VST: no NXC entry %x/%x in %s table!?" , + blk, idx, vst_infos[table_type].name); }for (i =0 ; i <ARRAY_SIZE (nxc_watch); i++) {
@@ -1432,7 +1459,7 @@ static uint64_t pnv_xive2_ic_pc_read(void *opaque, hwaddr offset,* SPEC register */ watch_engine = (offset -PC_NXC_WATCH0_DATA0 ) >>6 ; -pnv_xive2_nvp_cache_load (xive, watch_engine); +pnv_xive2_nxc_cache_load (xive, watch_engine); val = xive->pc_regs[reg];break ;
@@ -1506,7 +1533,7 @@ static void pnv_xive2_ic_pc_write(void *opaque, hwaddr offset,/* writing to DATA0 triggers the cache write */ watch_engine = (offset -PC_NXC_WATCH0_DATA0 ) >>6 ; xive->pc_regs[reg] = val; -pnv_xive2_nvp_update (xive, watch_engine); +pnv_xive2_nxc_update (xive, watch_engine);break ;/* case PC_NXC_FLUSH_CTRL: */
Signature · 1 line
2.43.0
Re: [PATCH v4 04/11] pnv/xive2: Add NVG and NVC to cache watch facility
Quoted 56 lines · Michael Kowal
From: Frederic Barrat <[email protected]>
The cache watch facility uses the same register interface to handle entries in the NVP, NVG and NVC tables. A bit-field in the 'watchX specification' register tells the table type. So far, that bit-field was not read and the code assumed a read/write to the NVP table.
This patch allows to read/write entries in the NVG and NVC table as well.
Signed-off-by Frederic Barrat <[email protected]>Signed-off-by Michael Kowal <[email protected]>Reviewed-by Cédric Le Goater <[email protected]>--- hw/intc/pnv_xive2.c | 49 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 11 deletions(-)hw/intc/pnv_xive2.c +23
-3@@ -465,10 +465,30 @@ static int pnv_xive2_write_nvp(Xive2Router *xrtr, uint8_t blk, uint32_t idx, word_number); } -static int pnv_xive2_nvp_update (PnvXive2 *xive,uint8_t watch_engine) +static int pnv_xive2_nxc_to_table_type (uint8_t nxc_type,uint32_t *table_type) { -uint8_t blk; -uint32_t idx; +switch (nxc_type) { +case PC_NXC_WATCH_NXC_NVP : + *table_type =VST_NVP ; +break ; +case PC_NXC_WATCH_NXC_NVG : + *table_type =VST_NVG ; +break ; +case PC_NXC_WATCH_NXC_NVC : + *table_type =VST_NVC ; +break ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"XIVE: invalid table type for nxc operation\n" ); +return -1 ; + } +return 0 ; +} + +static int pnv_xive2_nxc_update (PnvXive2 *xive,uint8_t watch_engine) +{ +uint8_t blk, nxc_type; +uint32_t idx, table_type =-1 ;int i, spec_reg, data_reg;uint64_t nxc_watch[4 ];
hw/intc/pnv_xive2.c static int pnv_xive2_nvp_update(PnvXive2 *xive, uint8_t watch_engine) · line 503
Quoted 8 lines
hw/intc/pnv_xive2.c +2
-0@@ -476,21 +496,24 @@ static int pnv_xive2_nvp_update(PnvXive2 *xive, uint8_t watch_engine) spec_reg = (PC_NXC_WATCH0_SPEC + watch_engine *0x40 ) >>3 ; data_reg = (PC_NXC_WATCH0_DATA0 + watch_engine *0x40 ) >>3 ; + nxc_type =GETFIELD (PC_NXC_WATCH_NXC_TYPE , xive->pc_regs[spec_reg]); blk =GETFIELD (PC_NXC_WATCH_BLOCK_ID , xive->pc_regs[spec_reg]); idx =GETFIELD (PC_NXC_WATCH_INDEX , xive->pc_regs[spec_reg]); +assert (pnv_xive2_nxc_to_table_type (nxc_type, &table_type));
Hey Mike,
Was in a bit of a rush and forgot to let you know earlier (thanks for reminding me) - I flipped the assert condition on these when merging. IIRC I got an always-false warning on one of the CI tests there, but I can't seem to find which one, or why it didn't usually warn.
I know you're part way through wrangling a bunch of other xive stuff that makes this stuff difficult to test, so no worries.
Thanks,
Nick
PATCH v4 5/11 pnv/xive2: Configure Virtualization Structure Tables through the PC
In reply to Michael KowalFrom: Frederic Barrat <[email protected]>
Both the virtualization layer (VC) and presentation layer (PC) need to be configured to access the VSTs. Since the information is redundant, the xive model combines both into one set of tables and only the definitions going through the VC are kept. The definitions through the PC are ignored. That works well as long as firmware calls the VC for all the tables.
For the NVG and NVC tables, it can make sense to only configure them with the PC, since they are only used by the presenter. So this patch allows firmware to configure the VST tables through the PC as well. The definitions are still shared, since the VST tables can be set through both the VC and/or PC, they are dynamically re-mapped in memory by first deleting the memory subregion.
--- hw/intc/pnv_xive2.c | 47 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-)
hw/intc/pnv_xive2.c +38 -9
@@ -762,6 +762,9 @@ static void pnv_xive2_vst_set_exclusive(PnvXive2 *xive, uint8_t type,* entries provisioned by FW (such as skiboot) and resize the * ESB window accordingly. */ +if (memory_region_is_mapped (&xsrc->esb_mmio)) { +memory_region_del_subregion (&xive->esb_mmio, &xsrc->esb_mmio); + }if (!(VSD_INDIRECT & vsd)) {memory_region_set_size (&xsrc->esb_mmio, vst_tsize *SBE_PER_BYTE * (1ull << xsrc->esb_shift));
@@ -777,6 +780,9 @@ static void pnv_xive2_vst_set_exclusive(PnvXive2 *xive, uint8_t type,/* * Backing store pages for the END. */ +if (memory_region_is_mapped (&end_xsrc->esb_mmio)) { +memory_region_del_subregion (&xive->end_mmio, &end_xsrc->esb_mmio); + }if (!(VSD_INDIRECT & vsd)) {memory_region_set_size (&end_xsrc->esb_mmio, (vst_tsize / info->size) * (1ull << end_xsrc->esb_shift));
@@ -801,13 +807,10 @@ static void pnv_xive2_vst_set_exclusive(PnvXive2 *xive, uint8_t type,* Both PC and VC sub-engines are configured as each use the Virtual * Structure Tables */ -static void pnv_xive2_vst_set_data (PnvXive2 *xive,uint64_t vsd) +static void pnv_xive2_vst_set_data (PnvXive2 *xive,uint64_t vsd, +uint8_t type,uint8_t blk) {uint8_t mode =GETFIELD (VSD_MODE , vsd); -uint8_t type =GETFIELD (VC_VSD_TABLE_SELECT , - xive->vc_regs[VC_VSD_TABLE_ADDR >>3 ]); -uint8_t blk =GETFIELD (VC_VSD_TABLE_ADDRESS , - xive->vc_regs[VC_VSD_TABLE_ADDR >>3 ]);uint64_t vst_addr = vsd &VSD_ADDRESS_MASK ;if (type >VST_ERQ ) {
@@ -842,6 +845,16 @@ static void pnv_xive2_vst_set_data(PnvXive2 *xive, uint64_t vsd) } } +static void pnv_xive2_vc_vst_set_data (PnvXive2 *xive,uint64_t vsd) +{ +uint8_t type =GETFIELD (VC_VSD_TABLE_SELECT , + xive->vc_regs[VC_VSD_TABLE_ADDR >>3 ]); +uint8_t blk =GETFIELD (VC_VSD_TABLE_ADDRESS , + xive->vc_regs[VC_VSD_TABLE_ADDR >>3 ]); + +pnv_xive2_vst_set_data (xive, vsd, type, blk); +} +/* * MMIO handlers */
@@ -1271,7 +1284,7 @@ static void pnv_xive2_ic_vc_write(void *opaque, hwaddr offset,case VC_VSD_TABLE_ADDR :break ;case VC_VSD_TABLE_DATA : -pnv_xive2_vst_set_data (xive, val); +pnv_xive2_vc_vst_set_data (xive, val);break ;/*
@@ -1490,6 +1503,16 @@ static uint64_t pnv_xive2_ic_pc_read(void *opaque, hwaddr offset,return val; } +static void pnv_xive2_pc_vst_set_data (PnvXive2 *xive,uint64_t vsd) +{ +uint8_t type =GETFIELD (PC_VSD_TABLE_SELECT , + xive->pc_regs[PC_VSD_TABLE_ADDR >>3 ]); +uint8_t blk =GETFIELD (PC_VSD_TABLE_ADDRESS , + xive->pc_regs[PC_VSD_TABLE_ADDR >>3 ]); + +pnv_xive2_vst_set_data (xive, vsd, type, blk); +} +static void pnv_xive2_ic_pc_write (void *opaque,hwaddr offset,uint64_t val,unsigned size) {
@@ -1500,12 +1523,18 @@ static void pnv_xive2_ic_pc_write(void *opaque, hwaddr offset,switch (offset) {/* -* VSD table settings. Only taken into account in the VC -* sub-engine because the Xive2Router model combines both VC and PC -* sub-engines +* VSD table settings. +* The Xive2Router model combines both VC and PC sub-engines. We +* allow to configure the tables through both, for the rare cases +* where a table only really needs to be configured for one of +* them (e.g. the NVG table for the presenter). It assumes that +* firmware passes the same address to the VC and PC when tables +* are defined for both, which seems acceptable. */ case PC_VSD_TABLE_ADDR : +break ;case PC_VSD_TABLE_DATA : +pnv_xive2_pc_vst_set_data (xive, val);break ;case PC_NXC_PROC_CONFIG :
Signature · 1 line
2.43.0
PATCH v4 6/11 pnv/xive2: Enable VST NVG and NVC index compression
In reply to Michael KowalFrom: Frederic Barrat <[email protected]>
Enable NVG and NVC VST tables for index compression which indicates the number of bits the address is shifted to the right for the table accesses. The compression values are defined as:
0000 - No compression
0001 - 1 bit shift
0010 - 2 bit shift
....
1000 - 8 bit shift
1001-1111 - No compression
--- hw/intc/pnv_xive2_regs.h | 2 ++ hw/intc/pnv_xive2.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+)
hw/intc/pnv_xive2_regs.h +2 -0
@@ -427,6 +427,8 @@#define X_PC_NXC_PROC_CONFIG 0x28A#define PC_NXC_PROC_CONFIG 0x450#define PC_NXC_PROC_CONFIG_WATCH_ASSIGN PPC_BITMASK(0, 3) +#define PC_NXC_PROC_CONFIG_NVG_TABLE_COMPRESS PPC_BITMASK(32, 35) +#define PC_NXC_PROC_CONFIG_NVC_TABLE_COMPRESS PPC_BITMASK(36, 39)/* NxC Cache Watch 0 Specification */ #define X_PC_NXC_WATCH0_SPEC 0x2A0
hw/intc/pnv_xive2.c +20 -0
@@ -217,6 +217,20 @@ static uint64_t pnv_xive2_vst_addr_indirect(PnvXive2 *xive, uint32_t type,return pnv_xive2_vst_addr_direct (xive, type, vsd, (idx % vst_per_page)); } +static uint8_t pnv_xive2_nvc_table_compress_shift (PnvXive2 *xive) +{ +uint8_t shift =GETFIELD (PC_NXC_PROC_CONFIG_NVC_TABLE_COMPRESS , + xive->pc_regs[PC_NXC_PROC_CONFIG >>3 ]); +return shift >8 ?0 : shift; +} + +static uint8_t pnv_xive2_nvg_table_compress_shift (PnvXive2 *xive) +{ +uint8_t shift =GETFIELD (PC_NXC_PROC_CONFIG_NVG_TABLE_COMPRESS , + xive->pc_regs[PC_NXC_PROC_CONFIG >>3 ]); +return shift >8 ?0 : shift; +} +static uint64_t pnv_xive2_vst_addr (PnvXive2 *xive,uint32_t type,uint8_t blk,uint32_t idx) {
@@ -238,6 +252,12 @@ static uint64_t pnv_xive2_vst_addr(PnvXive2 *xive, uint32_t type, uint8_t blk,return xive ?pnv_xive2_vst_addr (xive, type, blk, idx) :0 ; } +if (type ==VST_NVG ) { + idx >>=pnv_xive2_nvg_table_compress_shift (xive); + }else if (type ==VST_NVC ) { + idx >>=pnv_xive2_nvc_table_compress_shift (xive); + } +if (VSD_INDIRECT & vsd) {return pnv_xive2_vst_addr_indirect (xive, type, vsd, idx); }
Signature · 1 line
2.43.0
PATCH v4 7/11 pnv/xive2: Set Translation Table for the NVC port space
In reply to Michael KowalFrom: Frederic Barrat <[email protected]>
Set Translation Table for the NVC port space is missing. The xive model doesn't take into account the remapping of IO operations via the Set Translation Table but firmware is allowed to define it for the Notify Virtual Crowd (NVC), like it's already done for the other VST tables.
--- hw/intc/pnv_xive2.c | 1 + 1 file changed, 1 insertion(+)
hw/intc/pnv_xive2.c +1 -0
@@ -722,6 +722,7 @@ static int pnv_xive2_stt_set_data(PnvXive2 *xive, uint64_t val)case CQ_TAR_NVPG :case CQ_TAR_ESB :case CQ_TAR_END : +case CQ_TAR_NVC : xive->tables[tsel][entry] = val;break ;default :
Signature · 1 line
2.43.0
PATCH v4 8/11 pnv/xive2: Fail VST entry address computation if table has no VSD
In reply to Michael KowalFrom: Frederic Barrat <[email protected]>
Fail VST entry address computation if firmware doesn't define a descriptor for one of the Virtualization Structure Tables (VST), there's no point in trying to compute the address of its entry. Abort the operation and log an error.
--- hw/intc/pnv_xive2.c | 5 +++++ 1 file changed, 5 insertions(+)
hw/intc/pnv_xive2.c +5 -0
@@ -244,6 +244,11 @@ static uint64_t pnv_xive2_vst_addr(PnvXive2 *xive, uint32_t type, uint8_t blk, } vsd = xive->vsds[type][blk]; +if (vsd ==0 ) { +xive2_error (xive,"VST: vsd == 0 block id %d for VST %s %d !?" , + blk, info->name, idx); +return 0 ; + }/* Remote VST access */ if (GETFIELD (VSD_MODE , vsd) ==VSD_MODE_FORWARD ) {
Signature · 1 line
2.43.0
PATCH v4 9/11 pnv/xive2: Move xive2_nvp_pic_print_info() to xive2.c
In reply to Michael KowalFrom: Frederic Barrat <[email protected]>
Moving xive2_nvp_pic_print_info() to align with the other "pic_print_info" functions.
--- include/hw/ppc/xive2_regs.h | 2 ++ hw/intc/pnv_xive2.c | 27 --------------------------- hw/intc/xive2.c | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 27 deletions(-)
include/hw/ppc/xive2_regs.h +2 -0
@@ -194,6 +194,8 @@ static inline uint32_t xive2_nvp_blk(uint32_t cam_line)return (cam_line >>XIVE2_NVP_SHIFT ) &0xf ; } +void xive2_nvp_pic_print_info (Xive2Nvp *nvp,uint32_t nvp_idx,GString *buf); +/* * Notification Virtual Group or Crowd (NVG/NVC) */
hw/intc/pnv_xive2.c +0 -27
@@ -2436,33 +2436,6 @@ static void pnv_xive2_register_types(void)type_init (pnv_xive2_register_types) -static void xive2_nvp_pic_print_info(Xive2Nvp *nvp, uint32_t nvp_idx, -GString *buf) -{ -uint8_t eq_blk =xive_get_field32 (NVP2_W5_VP_END_BLOCK , nvp->w5); -uint32_t eq_idx =xive_get_field32 (NVP2_W5_VP_END_INDEX , nvp->w5); - -if (!xive2_nvp_is_valid (nvp)) { -return ; - } - -g_string_append_printf (buf," %08x end:%02x/%04x IPB:%02x" , - nvp_idx, eq_blk, eq_idx, -xive_get_field32 (NVP2_W2_IPB , nvp->w2)); -/* -* When the NVP is HW controlled, more fields are updated -*/ -if (xive2_nvp_is_hw (nvp)) { -g_string_append_printf (buf," CPPR:%02x" , -xive_get_field32 (NVP2_W2_CPPR , nvp->w2)); -if (xive2_nvp_is_co (nvp)) { -g_string_append_printf (buf," CO:%04x" , -xive_get_field32 (NVP2_W1_CO_THRID , nvp->w1)); - } - } -g_string_append_c (buf,'\n' ); -} -/* * If the table is direct, we can compute the number of PQ entries * provisioned by FW.
hw/intc/xive2.c +26 -0
@@ -137,6 +137,32 @@ void xive2_end_eas_pic_print_info(Xive2End *end, uint32_t end_idx, (uint32_t) xive_get_field64(EAS2_END_DATA, eas->w)); } +void xive2_nvp_pic_print_info (Xive2Nvp *nvp,uint32_t nvp_idx,GString *buf) +{ +uint8_t eq_blk =xive_get_field32 (NVP2_W5_VP_END_BLOCK , nvp->w5); +uint32_t eq_idx =xive_get_field32 (NVP2_W5_VP_END_INDEX , nvp->w5); + +if (!xive2_nvp_is_valid (nvp)) { +return ; + } + +g_string_append_printf (buf," %08x end:%02x/%04x IPB:%02x" , + nvp_idx, eq_blk, eq_idx, +xive_get_field32 (NVP2_W2_IPB , nvp->w2)); +/* +* When the NVP is HW controlled, more fields are updated +*/ +if (xive2_nvp_is_hw (nvp)) { +g_string_append_printf (buf," CPPR:%02x" , +xive_get_field32 (NVP2_W2_CPPR , nvp->w2)); +if (xive2_nvp_is_co (nvp)) { +g_string_append_printf (buf," CO:%04x" , +xive_get_field32 (NVP2_W1_CO_THRID , nvp->w1)); + } + } +g_string_append_c (buf,'\n' ); +} +static void xive2_end_enqueue (Xive2End *end,uint32_t data) {uint64_t qaddr_base =xive2_end_qaddr (end);
Signature · 1 line
2.43.0
Re: [PATCH v4 09/11] pnv/xive2: Move xive2_nvp_pic_print_info() to xive2.c
Quoted 7 lines · Michael Kowal
From: Frederic Barrat <[email protected]>
Moving
xive2_nvp_pic_print_info()to align with the other "pic_print_info" functions.Signed-off-by Frederic Barrat <[email protected]>Signed-off-by Michael Kowal <[email protected]>
Thanks,
C.
Quoted 94 lines
--- include/hw/ppc/xive2_regs.h | 2 ++ hw/intc/pnv_xive2.c | 27 --------------------------- hw/intc/xive2.c | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 27 deletions(-)include/hw/ppc/xive2_regs.h +2
-0@@ -194,6 +194,8 @@ static inline uint32_t xive2_nvp_blk(uint32_t cam_line)return (cam_line >>XIVE2_NVP_SHIFT ) &0xf ; } +void xive2_nvp_pic_print_info (Xive2Nvp *nvp,uint32_t nvp_idx,GString *buf); +/* * Notification Virtual Group or Crowd (NVG/NVC) */ hw/intc/pnv_xive2.c +0
-27@@ -2436,33 +2436,6 @@ static void pnv_xive2_register_types(void)type_init (pnv_xive2_register_types) -static void xive2_nvp_pic_print_info(Xive2Nvp *nvp, uint32_t nvp_idx, -GString *buf) -{ -uint8_t eq_blk =xive_get_field32 (NVP2_W5_VP_END_BLOCK , nvp->w5); -uint32_t eq_idx =xive_get_field32 (NVP2_W5_VP_END_INDEX , nvp->w5); - -if (!xive2_nvp_is_valid (nvp)) { -return ; - } - -g_string_append_printf (buf," %08x end:%02x/%04x IPB:%02x" , - nvp_idx, eq_blk, eq_idx, -xive_get_field32 (NVP2_W2_IPB , nvp->w2)); -/* -* When the NVP is HW controlled, more fields are updated -*/ -if (xive2_nvp_is_hw (nvp)) { -g_string_append_printf (buf," CPPR:%02x" , -xive_get_field32 (NVP2_W2_CPPR , nvp->w2)); -if (xive2_nvp_is_co (nvp)) { -g_string_append_printf (buf," CO:%04x" , -xive_get_field32 (NVP2_W1_CO_THRID , nvp->w1)); - } - } -g_string_append_c (buf,'\n' ); -} -/* * If the table is direct, we can compute the number of PQ entries * provisioned by FW. hw/intc/xive2.c +26
-0@@ -137,6 +137,32 @@ void xive2_end_eas_pic_print_info(Xive2End *end, uint32_t end_idx, (uint32_t) xive_get_field64(EAS2_END_DATA, eas->w)); } +void xive2_nvp_pic_print_info (Xive2Nvp *nvp,uint32_t nvp_idx,GString *buf) +{ +uint8_t eq_blk =xive_get_field32 (NVP2_W5_VP_END_BLOCK , nvp->w5); +uint32_t eq_idx =xive_get_field32 (NVP2_W5_VP_END_INDEX , nvp->w5); + +if (!xive2_nvp_is_valid (nvp)) { +return ; + } + +g_string_append_printf (buf," %08x end:%02x/%04x IPB:%02x" , + nvp_idx, eq_blk, eq_idx, +xive_get_field32 (NVP2_W2_IPB , nvp->w2)); +/* +* When the NVP is HW controlled, more fields are updated +*/ +if (xive2_nvp_is_hw (nvp)) { +g_string_append_printf (buf," CPPR:%02x" , +xive_get_field32 (NVP2_W2_CPPR , nvp->w2)); +if (xive2_nvp_is_co (nvp)) { +g_string_append_printf (buf," CO:%04x" , +xive_get_field32 (NVP2_W1_CO_THRID , nvp->w1)); + } + } +g_string_append_c (buf,'\n' ); +} +static void xive2_end_enqueue (Xive2End *end,uint32_t data) {uint64_t qaddr_base =xive2_end_qaddr (end);
PATCH v4 10/11 pnv/xive2: Refine TIMA 'info pic' output
In reply to Michael KowalFrom: Frederic Barrat <[email protected]>
In XIVE Gen 2 there were some minor changes to the TIMA header that were updated when printed.
--- hw/intc/xive.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
hw/intc/xive.c +9 -3
@@ -692,9 +692,15 @@ void xive_tctx_pic_print_info(XiveTCTX *tctx, GString *buf) } } -g_string_append_printf (buf,"CPU[%04x]: " -"QW NSR CPPR IPB LSMFB ACK# INC AGE PIPR W2\n" , - cpu_index); +if (xive_presenter_get_config (tctx->xptr) &XIVE_PRESENTER_GEN1_TIMA_OS ) { +g_string_append_printf (buf,"CPU[%04x]: " +"QW NSR CPPR IPB LSMFB ACK# INC AGE PIPR" +" W2\n" , cpu_index); + }else { +g_string_append_printf (buf,"CPU[%04x]: " +"QW NSR CPPR IPB LSMFB - LGS T PIPR" +" W2\n" , cpu_index); + }for (i =0 ; i <XIVE_TM_RING_COUNT ; i++) {char *s =xive_tctx_ring_print (&tctx->regs[i *XIVE_TM_RING_SIZE ]);
Signature · 1 line
2.43.0
Re: [PATCH v4 10/11] pnv/xive2: Refine TIMA 'info pic' output
Quoted 7 lines · Michael Kowal
From: Frederic Barrat <[email protected]>
In XIVE Gen 2 there were some minor changes to the TIMA header that were updated when printed.
Signed-off-by Frederic Barrat <[email protected]>Signed-off-by Michael Kowal <[email protected]>
Thanks,
C.
Quoted 27 lines
--- hw/intc/xive.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)hw/intc/xive.c +9
-3@@ -692,9 +692,15 @@ void xive_tctx_pic_print_info(XiveTCTX *tctx, GString *buf) } } -g_string_append_printf (buf,"CPU[%04x]: " -"QW NSR CPPR IPB LSMFB ACK# INC AGE PIPR W2\n" , - cpu_index); +if (xive_presenter_get_config (tctx->xptr) &XIVE_PRESENTER_GEN1_TIMA_OS ) { +g_string_append_printf (buf,"CPU[%04x]: " +"QW NSR CPPR IPB LSMFB ACK# INC AGE PIPR" +" W2\n" , cpu_index); + }else { +g_string_append_printf (buf,"CPU[%04x]: " +"QW NSR CPPR IPB LSMFB - LGS T PIPR" +" W2\n" , cpu_index); + }for (i =0 ; i <XIVE_TM_RING_COUNT ; i++) {char *s =xive_tctx_ring_print (&tctx->regs[i *XIVE_TM_RING_SIZE ]);
PATCH v4 11/11 pnv/xive2: Dump more END state with 'info pic'
In reply to Michael KowalFrom: Frederic Barrat <[email protected]>
Additional END state 'info pic' information as added. The 'ignore', 'crowd' and 'precluded escalation control' bits of an Event Notification Descriptor are all used when delivering an interrupt targeting a VP-group or crowd.
--- include/hw/ppc/xive2_regs.h | 7 +++++++ hw/intc/xive2.c | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-)
include/hw/ppc/xive2_regs.h +7 -0
@@ -97,6 +97,7 @@ typedef struct Xive2End {uint32_t w6;#define END2_W6_FORMAT_BIT PPC_BIT32(0)#define END2_W6_IGNORE PPC_BIT32(1) +#define END2_W6_CROWD PPC_BIT32(2)#define END2_W6_VP_BLOCK PPC_BITMASK32(4, 7)#define END2_W6_VP_OFFSET PPC_BITMASK32(8, 31)#define END2_W6_VP_OFFSET_GEN1 PPC_BITMASK32(13, 31)
@@ -111,6 +112,8 @@ typedef struct Xive2End {#define xive2_end_is_notify (end) \ (be32_to_cpu((end)->w0) & END2_W0_UCOND_NOTIFY)#define xive2_end_is_backlog (end) (be32_to_cpu((end)->w0) & END2_W0_BACKLOG) +#define xive2_end_is_precluded_escalation (end) \ + (be32_to_cpu((end)->w0) & END2_W0_PRECL_ESC_CTL)#define xive2_end_is_escalate (end) \ (be32_to_cpu((end)->w0) & END2_W0_ESCALATE_CTL)#define xive2_end_is_uncond_escalation (end) \
@@ -123,6 +126,10 @@ typedef struct Xive2End { (be32_to_cpu((end)->w0) & END2_W0_FIRMWARE1)#define xive2_end_is_firmware2 (end) \ (be32_to_cpu((end)->w0) & END2_W0_FIRMWARE2) +#define xive2_end_is_ignore (end) \ + (be32_to_cpu((end)->w6) & END2_W6_IGNORE) +#define xive2_end_is_crowd (end) \ + (be32_to_cpu((end)->w6) & END2_W6_CROWD)static inline uint64_t xive2_end_qaddr (Xive2End *end) {
hw/intc/xive2.c +5 -2
@@ -89,7 +89,7 @@ void xive2_end_pic_print_info(Xive2End *end, uint32_t end_idx, GString *buf) pq =xive_get_field32 (END2_W1_ESn, end->w1); g_string_append_printf(buf, - " %08x %c%c %c%c%c%c%c%c%c%c%c%c " + " %08x %c%c %c%c%c%c%c%c%c%c%c%c%c %c%c " "prio:%d nvp:%02x/%04x", end_idx, pq & XIVE_ESB_VAL_P ? 'P' : '-',
@@ -98,12 +98,15 @@ void xive2_end_pic_print_info(Xive2End *end, uint32_t end_idx, GString *buf)xive2_end_is_enqueue (end) ?'q' :'-' ,xive2_end_is_notify (end) ?'n' :'-' ,xive2_end_is_backlog (end) ?'b' :'-' , +xive2_end_is_precluded_escalation (end) ?'p' :'-' ,xive2_end_is_escalate (end) ?'e' :'-' ,xive2_end_is_escalate_end (end) ?'N' :'-' ,xive2_end_is_uncond_escalation (end) ?'u' :'-' ,xive2_end_is_silent_escalation (end) ?'s' :'-' ,xive2_end_is_firmware1 (end) ?'f' :'-' ,xive2_end_is_firmware2 (end) ?'F' :'-' , +xive2_end_is_ignore (end) ?'i' :'-' , +xive2_end_is_crowd (end) ?'c' :'-' , priority, nvp_blk, nvp_idx);if (qaddr_base) {
@@ -676,7 +679,7 @@ static void xive2_router_end_notify(Xive2Router *xrtr, uint8_t end_blk, } found =xive_presenter_notify (xrtr->xfb, format, nvp_blk, nvp_idx, -xive_get_field32 (END2_W6_IGNORE , end.w7), +xive2_end_is_ignore (&end), priority,xive_get_field32 (END2_W7_F1_LOG_SERVER_ID , end.w7));
Signature · 1 line
2.43.0
Re: [PATCH v4 11/11] pnv/xive2: Dump more END state with 'info pic'
Quoted 9 lines · Michael Kowal
From: Frederic Barrat <[email protected]>
Additional END state 'info pic' information as added. The 'ignore', 'crowd' and 'precluded escalation control' bits of an Event Notification Descriptor are all used when delivering an interrupt targeting a VP-group or crowd.
Signed-off-by Frederic Barrat <[email protected]>Signed-off-by Michael Kowal <[email protected]>
Thanks,
C.
Quoted 75 lines
--- include/hw/ppc/xive2_regs.h | 7 +++++++ hw/intc/xive2.c | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-)include/hw/ppc/xive2_regs.h +7
-0@@ -97,6 +97,7 @@ typedef struct Xive2End {uint32_t w6;#define END2_W6_FORMAT_BIT PPC_BIT32(0)#define END2_W6_IGNORE PPC_BIT32(1) +#define END2_W6_CROWD PPC_BIT32(2)#define END2_W6_VP_BLOCK PPC_BITMASK32(4, 7)#define END2_W6_VP_OFFSET PPC_BITMASK32(8, 31)#define END2_W6_VP_OFFSET_GEN1 PPC_BITMASK32(13, 31)@@ -111,6 +112,8 @@ typedef struct Xive2End {#define xive2_end_is_notify (end) \ (be32_to_cpu((end)->w0) & END2_W0_UCOND_NOTIFY)#define xive2_end_is_backlog (end) (be32_to_cpu((end)->w0) & END2_W0_BACKLOG) +#define xive2_end_is_precluded_escalation (end) \ + (be32_to_cpu((end)->w0) & END2_W0_PRECL_ESC_CTL)#define xive2_end_is_escalate (end) \ (be32_to_cpu((end)->w0) & END2_W0_ESCALATE_CTL)#define xive2_end_is_uncond_escalation (end) \@@ -123,6 +126,10 @@ typedef struct Xive2End { (be32_to_cpu((end)->w0) & END2_W0_FIRMWARE1)#define xive2_end_is_firmware2 (end) \ (be32_to_cpu((end)->w0) & END2_W0_FIRMWARE2) +#define xive2_end_is_ignore (end) \ + (be32_to_cpu((end)->w6) & END2_W6_IGNORE) +#define xive2_end_is_crowd (end) \ + (be32_to_cpu((end)->w6) & END2_W6_CROWD)static inline uint64_t xive2_end_qaddr (Xive2End *end) {hw/intc/xive2.c +5
-2@@ -89,7 +89,7 @@ void xive2_end_pic_print_info(Xive2End *end, uint32_t end_idx, GString *buf) pq =xive_get_field32 (END2_W1_ESn, end->w1); g_string_append_printf(buf, - " %08x %c%c %c%c%c%c%c%c%c%c%c%c " + " %08x %c%c %c%c%c%c%c%c%c%c%c%c%c %c%c " "prio:%d nvp:%02x/%04x", end_idx, pq & XIVE_ESB_VAL_P ? 'P' : '-',@@ -98,12 +98,15 @@ void xive2_end_pic_print_info(Xive2End *end, uint32_t end_idx, GString *buf)xive2_end_is_enqueue (end) ?'q' :'-' ,xive2_end_is_notify (end) ?'n' :'-' ,xive2_end_is_backlog (end) ?'b' :'-' , +xive2_end_is_precluded_escalation (end) ?'p' :'-' ,xive2_end_is_escalate (end) ?'e' :'-' ,xive2_end_is_escalate_end (end) ?'N' :'-' ,xive2_end_is_uncond_escalation (end) ?'u' :'-' ,xive2_end_is_silent_escalation (end) ?'s' :'-' ,xive2_end_is_firmware1 (end) ?'f' :'-' ,xive2_end_is_firmware2 (end) ?'F' :'-' , +xive2_end_is_ignore (end) ?'i' :'-' , +xive2_end_is_crowd (end) ?'c' :'-' , priority, nvp_blk, nvp_idx);if (qaddr_base) {@@ -676,7 +679,7 @@ static void xive2_router_end_notify(Xive2Router *xrtr, uint8_t end_blk, } found =xive_presenter_notify (xrtr->xfb, format, nvp_blk, nvp_idx, -xive_get_field32 (END2_W6_IGNORE , end.w7), +xive2_end_is_ignore (&end), priority,xive_get_field32 (END2_W7_F1_LOG_SERVER_ID , end.w7));