qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Balamuruhan S <bala24@linux.ibm.com>
To: qemu-devel@nongnu.org
Cc: Balamuruhan S <bala24@linux.ibm.com>,
	david@gibson.dropbear.id.au, qemu-ppc@nongnu.org, clg@kaod.org,
	groug@kaod.org
Subject: [PATCH 3/5] hw/ppc/pnv_xscom: Power8 occ common area is in PBA BAR 3
Date: Tue, 19 Nov 2019 23:20:54 +0530	[thread overview]
Message-ID: <20191119175056.32518-4-bala24@linux.ibm.com> (raw)
In-Reply-To: <20191119175056.32518-1-bala24@linux.ibm.com>

Fix incorrect PBA BAR and BARMASK value for Power8 occ common area
region where skiboot enum declaration have it in BAR 3 and BARMASK
is calculated BARMASK0 + BAR,

enum P8_BAR {
        P8_BAR_HOMER = 0,
        P8_BAR_CENTAUR = 1,
        P8_BAR_SLW = 2,
        P8_BAR_OCC_COMMON = 3,
};

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Balamuruhan S <bala24@linux.ibm.com>
---
 hw/ppc/pnv_xscom.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c
index cdd5fa356e..cb6d6bbcfc 100644
--- a/hw/ppc/pnv_xscom.c
+++ b/hw/ppc/pnv_xscom.c
@@ -38,9 +38,9 @@
 
 /* PBA BARs */
 #define P8_PBA_BAR0                     0x2013f00
-#define P8_PBA_BAR2                     0x2013f02
+#define P8_PBA_BAR3                     0x2013f03
 #define P8_PBA_BARMASK0                 0x2013f04
-#define P8_PBA_BARMASK2                 0x2013f06
+#define P8_PBA_BARMASK3                 0x2013f07
 #define P9_PBA_BAR0                     0x5012b00
 #define P9_PBA_BAR2                     0x5012b02
 #define P9_PBA_BARMASK0                 0x5012b04
@@ -99,11 +99,11 @@ static uint64_t xscom_read_default(PnvChip *chip, uint32_t pcba)
 
     case P9_PBA_BAR2: /* P9 occ common area */
         return PNV9_OCC_COMMON_AREA(chip);
-    case P8_PBA_BAR2: /* P8 occ common area */
+    case P8_PBA_BAR3: /* P8 occ common area */
         return PNV_OCC_COMMON_AREA(chip);
 
     case P9_PBA_BARMASK2: /* P9 occ common area size */
-    case P8_PBA_BARMASK2: /* P8 occ common area size */
+    case P8_PBA_BARMASK3: /* P8 occ common area size */
         return OCC_SIZE_MASK;
 
     case 0x1010c00:     /* PIBAM FIR */
@@ -126,9 +126,9 @@ static uint64_t xscom_read_default(PnvChip *chip, uint32_t pcba)
     case 0x202000f:     /* ADU stuff, receive status register*/
         return 0;
     case 0x2013f01:     /* PBA stuff */
-    case 0x2013f03:     /* PBA stuff */
+    case 0x2013f02:     /* PBA stuff */
     case 0x2013f05:     /* PBA stuff */
-    case 0x2013f07:     /* PBA stuff */
+    case 0x2013f06:     /* PBA stuff */
         return 0;
     case 0x2013028:     /* CAPP stuff */
     case 0x201302a:     /* CAPP stuff */
-- 
2.14.5



  parent reply	other threads:[~2019-11-19 17:56 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-19 17:50 [PATCH 0/5] ppc/pnv: fix Homer/Occ mappings on multichip systems Balamuruhan S
2019-11-19 17:50 ` [PATCH 1/5] hw/ppc/pnv: incorrect homer and occ common area size Balamuruhan S
2019-11-20  7:13   ` Cédric Le Goater
2019-11-21  8:32     ` Balamuruhan S
2019-11-19 17:50 ` [PATCH 2/5] hw/ppc/pnv_xscom: PBA bar mask values are incorrect with homer/occ sizes Balamuruhan S
2019-11-19 21:56   ` David Gibson
2019-11-19 22:00     ` David Gibson
2019-11-19 22:02       ` David Gibson
2019-11-20  3:01         ` Balamuruhan S
2019-11-20  3:16           ` Balamuruhan S
2019-11-20  7:59             ` Greg Kurz
2019-11-21  8:34               ` Balamuruhan S
2019-11-20  7:18   ` Cédric Le Goater
2019-11-21  8:37     ` Balamuruhan S
2019-11-19 17:50 ` Balamuruhan S [this message]
2019-11-20  7:20   ` [PATCH 3/5] hw/ppc/pnv_xscom: Power8 occ common area is in PBA BAR 3 Cédric Le Goater
2019-11-21  8:39     ` Balamuruhan S
2019-11-19 17:50 ` [PATCH 4/5] hw/ppc/pnv_xscom: occ common area to be mapped only once Balamuruhan S
2019-11-20  7:30   ` Cédric Le Goater
2019-11-21  8:49     ` Balamuruhan S
2019-11-19 17:50 ` [PATCH 5/5] hw/ppc/pnv_xscom: add PBA BARs for Power8 slw image Balamuruhan S
2019-11-20  7:31   ` Cédric Le Goater
2019-11-21  8:50     ` Balamuruhan S
2019-11-20  7:46 ` [PATCH 0/5] ppc/pnv: fix Homer/Occ mappings on multichip systems Cédric Le Goater
2019-11-21  9:11   ` Balamuruhan S
2019-11-21 10:00     ` Cédric Le Goater
2019-11-22 16:41       ` Balamuruhan S

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191119175056.32518-4-bala24@linux.ibm.com \
    --to=bala24@linux.ibm.com \
    --cc=clg@kaod.org \
    --cc=david@gibson.dropbear.id.au \
    --cc=groug@kaod.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).