* [PATCH] pnv/psi: Allow access to PSI registers through xscom
@ 2023-06-30 10:26 Frederic Barrat
2023-06-30 12:22 ` Cédric Le Goater
2023-06-30 16:51 ` Daniel Henrique Barboza
0 siblings, 2 replies; 3+ messages in thread
From: Frederic Barrat @ 2023-06-30 10:26 UTC (permalink / raw)
To: clg, danielhb413, joel, qemu-ppc, qemu-devel
skiboot only uses mmio to access the PSI registers (once the BAR is
set) but we don't have any reason to block the accesses through
xscom. This patch enables xscom access to the PSI registers. It
converts the xscom addresses to mmio addresses, which requires a bit
of care for the PSIHB, then reuse the existing mmio ops.
Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com>
---
hw/ppc/pnv_psi.c | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
index 8aa09ab26b..46da58dff8 100644
--- a/hw/ppc/pnv_psi.c
+++ b/hw/ppc/pnv_psi.c
@@ -121,8 +121,12 @@
#define PSIHB9_BAR_MASK 0x00fffffffff00000ull
#define PSIHB9_FSPBAR_MASK 0x00ffffff00000000ull
+/* mmio address to xscom address */
#define PSIHB_REG(addr) (((addr) >> 3) + PSIHB_XSCOM_BAR)
+/* xscom address to mmio address */
+#define PSIHB_MMIO(reg) ((reg - PSIHB_XSCOM_BAR) << 3)
+
static void pnv_psi_set_bar(PnvPsi *psi, uint64_t bar)
{
PnvPsiClass *ppc = PNV_PSI_GET_CLASS(psi);
@@ -769,24 +773,31 @@ static const MemoryRegionOps pnv_psi_p9_mmio_ops = {
static uint64_t pnv_psi_p9_xscom_read(void *opaque, hwaddr addr, unsigned size)
{
- /* No read are expected */
- qemu_log_mask(LOG_GUEST_ERROR, "PSI: xscom read at 0x%" PRIx64 "\n", addr);
- return -1;
+ uint32_t reg = addr >> 3;
+ uint64_t val = -1;
+
+ if (reg < PSIHB_XSCOM_BAR) {
+ /* FIR, not modeled */
+ qemu_log_mask(LOG_UNIMP, "PSI: xscom read at 0x%08x\n", reg);
+ } else {
+ val = pnv_psi_p9_mmio_read(opaque, PSIHB_MMIO(reg), size);
+ }
+ return val;
}
static void pnv_psi_p9_xscom_write(void *opaque, hwaddr addr,
uint64_t val, unsigned size)
{
PnvPsi *psi = PNV_PSI(opaque);
+ uint32_t reg = addr >> 3;
- /* XSCOM is only used to set the PSIHB MMIO region */
- switch (addr >> 3) {
- case PSIHB_XSCOM_BAR:
+ if (reg < PSIHB_XSCOM_BAR) {
+ /* FIR, not modeled */
+ qemu_log_mask(LOG_UNIMP, "PSI: xscom write at 0x%08x\n", reg);
+ } else if (reg == PSIHB_XSCOM_BAR) {
pnv_psi_set_bar(psi, val);
- break;
- default:
- qemu_log_mask(LOG_GUEST_ERROR, "PSI: xscom write at 0x%" PRIx64 "\n",
- addr);
+ } else {
+ pnv_psi_p9_mmio_write(opaque, PSIHB_MMIO(reg), val, size);
}
}
--
2.41.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] pnv/psi: Allow access to PSI registers through xscom
2023-06-30 10:26 [PATCH] pnv/psi: Allow access to PSI registers through xscom Frederic Barrat
@ 2023-06-30 12:22 ` Cédric Le Goater
2023-06-30 16:51 ` Daniel Henrique Barboza
1 sibling, 0 replies; 3+ messages in thread
From: Cédric Le Goater @ 2023-06-30 12:22 UTC (permalink / raw)
To: Frederic Barrat, danielhb413, joel, qemu-ppc, qemu-devel
On 6/30/23 12:26, Frederic Barrat wrote:
> skiboot only uses mmio to access the PSI registers (once the BAR is
> set) but we don't have any reason to block the accesses through
> xscom. This patch enables xscom access to the PSI registers. It
> converts the xscom addresses to mmio addresses, which requires a bit
> of care for the PSIHB, then reuse the existing mmio ops.
>
> Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com>
Looks good.
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Thanks,
C.
> ---
> hw/ppc/pnv_psi.c | 31 +++++++++++++++++++++----------
> 1 file changed, 21 insertions(+), 10 deletions(-)
>
> diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
> index 8aa09ab26b..46da58dff8 100644
> --- a/hw/ppc/pnv_psi.c
> +++ b/hw/ppc/pnv_psi.c
> @@ -121,8 +121,12 @@
> #define PSIHB9_BAR_MASK 0x00fffffffff00000ull
> #define PSIHB9_FSPBAR_MASK 0x00ffffff00000000ull
>
> +/* mmio address to xscom address */
> #define PSIHB_REG(addr) (((addr) >> 3) + PSIHB_XSCOM_BAR)
>
> +/* xscom address to mmio address */
> +#define PSIHB_MMIO(reg) ((reg - PSIHB_XSCOM_BAR) << 3)
> +
> static void pnv_psi_set_bar(PnvPsi *psi, uint64_t bar)
> {
> PnvPsiClass *ppc = PNV_PSI_GET_CLASS(psi);
> @@ -769,24 +773,31 @@ static const MemoryRegionOps pnv_psi_p9_mmio_ops = {
>
> static uint64_t pnv_psi_p9_xscom_read(void *opaque, hwaddr addr, unsigned size)
> {
> - /* No read are expected */
> - qemu_log_mask(LOG_GUEST_ERROR, "PSI: xscom read at 0x%" PRIx64 "\n", addr);
> - return -1;
> + uint32_t reg = addr >> 3;
> + uint64_t val = -1;
> +
> + if (reg < PSIHB_XSCOM_BAR) {
> + /* FIR, not modeled */
> + qemu_log_mask(LOG_UNIMP, "PSI: xscom read at 0x%08x\n", reg);
> + } else {
> + val = pnv_psi_p9_mmio_read(opaque, PSIHB_MMIO(reg), size);
> + }
> + return val;
> }
>
> static void pnv_psi_p9_xscom_write(void *opaque, hwaddr addr,
> uint64_t val, unsigned size)
> {
> PnvPsi *psi = PNV_PSI(opaque);
> + uint32_t reg = addr >> 3;
>
> - /* XSCOM is only used to set the PSIHB MMIO region */
> - switch (addr >> 3) {
> - case PSIHB_XSCOM_BAR:
> + if (reg < PSIHB_XSCOM_BAR) {
> + /* FIR, not modeled */
> + qemu_log_mask(LOG_UNIMP, "PSI: xscom write at 0x%08x\n", reg);
> + } else if (reg == PSIHB_XSCOM_BAR) {
> pnv_psi_set_bar(psi, val);
> - break;
> - default:
> - qemu_log_mask(LOG_GUEST_ERROR, "PSI: xscom write at 0x%" PRIx64 "\n",
> - addr);
> + } else {
> + pnv_psi_p9_mmio_write(opaque, PSIHB_MMIO(reg), val, size);
> }
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] pnv/psi: Allow access to PSI registers through xscom
2023-06-30 10:26 [PATCH] pnv/psi: Allow access to PSI registers through xscom Frederic Barrat
2023-06-30 12:22 ` Cédric Le Goater
@ 2023-06-30 16:51 ` Daniel Henrique Barboza
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Henrique Barboza @ 2023-06-30 16:51 UTC (permalink / raw)
To: Frederic Barrat, clg, joel, qemu-ppc, qemu-devel
On 6/30/23 07:26, Frederic Barrat wrote:
> skiboot only uses mmio to access the PSI registers (once the BAR is
> set) but we don't have any reason to block the accesses through
> xscom. This patch enables xscom access to the PSI registers. It
> converts the xscom addresses to mmio addresses, which requires a bit
> of care for the PSIHB, then reuse the existing mmio ops.
>
> Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com>
> ---
Queued in gitlab.com/danielhb/qemu/tree/ppc-next. Thanks,
Daniel
> hw/ppc/pnv_psi.c | 31 +++++++++++++++++++++----------
> 1 file changed, 21 insertions(+), 10 deletions(-)
>
> diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
> index 8aa09ab26b..46da58dff8 100644
> --- a/hw/ppc/pnv_psi.c
> +++ b/hw/ppc/pnv_psi.c
> @@ -121,8 +121,12 @@
> #define PSIHB9_BAR_MASK 0x00fffffffff00000ull
> #define PSIHB9_FSPBAR_MASK 0x00ffffff00000000ull
>
> +/* mmio address to xscom address */
> #define PSIHB_REG(addr) (((addr) >> 3) + PSIHB_XSCOM_BAR)
>
> +/* xscom address to mmio address */
> +#define PSIHB_MMIO(reg) ((reg - PSIHB_XSCOM_BAR) << 3)
> +
> static void pnv_psi_set_bar(PnvPsi *psi, uint64_t bar)
> {
> PnvPsiClass *ppc = PNV_PSI_GET_CLASS(psi);
> @@ -769,24 +773,31 @@ static const MemoryRegionOps pnv_psi_p9_mmio_ops = {
>
> static uint64_t pnv_psi_p9_xscom_read(void *opaque, hwaddr addr, unsigned size)
> {
> - /* No read are expected */
> - qemu_log_mask(LOG_GUEST_ERROR, "PSI: xscom read at 0x%" PRIx64 "\n", addr);
> - return -1;
> + uint32_t reg = addr >> 3;
> + uint64_t val = -1;
> +
> + if (reg < PSIHB_XSCOM_BAR) {
> + /* FIR, not modeled */
> + qemu_log_mask(LOG_UNIMP, "PSI: xscom read at 0x%08x\n", reg);
> + } else {
> + val = pnv_psi_p9_mmio_read(opaque, PSIHB_MMIO(reg), size);
> + }
> + return val;
> }
>
> static void pnv_psi_p9_xscom_write(void *opaque, hwaddr addr,
> uint64_t val, unsigned size)
> {
> PnvPsi *psi = PNV_PSI(opaque);
> + uint32_t reg = addr >> 3;
>
> - /* XSCOM is only used to set the PSIHB MMIO region */
> - switch (addr >> 3) {
> - case PSIHB_XSCOM_BAR:
> + if (reg < PSIHB_XSCOM_BAR) {
> + /* FIR, not modeled */
> + qemu_log_mask(LOG_UNIMP, "PSI: xscom write at 0x%08x\n", reg);
> + } else if (reg == PSIHB_XSCOM_BAR) {
> pnv_psi_set_bar(psi, val);
> - break;
> - default:
> - qemu_log_mask(LOG_GUEST_ERROR, "PSI: xscom write at 0x%" PRIx64 "\n",
> - addr);
> + } else {
> + pnv_psi_p9_mmio_write(opaque, PSIHB_MMIO(reg), val, size);
> }
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-30 16:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-30 10:26 [PATCH] pnv/psi: Allow access to PSI registers through xscom Frederic Barrat
2023-06-30 12:22 ` Cédric Le Goater
2023-06-30 16:51 ` Daniel Henrique Barboza
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).