Message ID | 20240724212130.26811-11-kowal@linux.ibm.com |
---|---|
State | New |
Headers | show |
Series | XIVE changes for Cache Watch, VSTs, STT and info pic | expand |
On 7/24/24 23:21, Michael Kowal wrote: > From: Frederic Barrat <fbarrat@linux.ibm.com> > > In XIVE Gen 2 there were some minor changes to the TIMA header that were > updated when printed. > > Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com> > Signed-off-by: Michael Kowal <kowal@linux.vnet.ibm.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > --- > hw/intc/xive.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/hw/intc/xive.c b/hw/intc/xive.c > index 70f11f993b..5a02dd8e02 100644 > --- a/hw/intc/xive.c > +++ b/hw/intc/xive.c > @@ -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]);
diff --git a/hw/intc/xive.c b/hw/intc/xive.c index 70f11f993b..5a02dd8e02 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -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]);