On 7/24/24 23:21, Michael Kowal wrote:
> From: Frederic Barrat <fbarrat@linux.ibm.com>
>
> Moving xive2_nvp_pic_print_info() to align with the other "pic_print_info"
> functions.
>
> 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.
> ---
> 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(-)
>
> diff --git a/include/hw/ppc/xive2_regs.h b/include/hw/ppc/xive2_regs.h
> index 4e5e17cd89..ec5d6ec2d6 100644
> --- a/include/hw/ppc/xive2_regs.h
> +++ b/include/hw/ppc/xive2_regs.h
> @@ -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)
> */
> diff --git a/hw/intc/pnv_xive2.c b/hw/intc/pnv_xive2.c
> index 9fe3ec9a67..4740c56347 100644
> --- a/hw/intc/pnv_xive2.c
> +++ b/hw/intc/pnv_xive2.c
> @@ -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.
> diff --git a/hw/intc/xive2.c b/hw/intc/xive2.c
> index 3e7238c663..ac914b3d1c 100644
> --- a/hw/intc/xive2.c
> +++ b/hw/intc/xive2.c
> @@ -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);