POWER9: Make xscom_addr() work for p8 and p9

Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/hw/xscom.c b/hw/xscom.c
index 2a91a7b..9aa2c81 100644
--- a/hw/xscom.c
+++ b/hw/xscom.c
@@ -69,9 +69,11 @@ static inline void *xscom_addr(uint32_t gcid, uint32_t pcb_addr)
 
 	assert(chip);
 	addr  = chip->xscom_base;
-	addr |= ((uint64_t)pcb_addr << 4) & ~0xfful;
-	addr |= (pcb_addr << 3) & 0x78;
-
+	if (proc_gen <= proc_gen_p8) {
+		addr |= ((uint64_t)pcb_addr << 4) & ~0xfful;
+		addr |= (pcb_addr << 3) & 0x78;
+	} else
+		addr |= ((uint64_t)pcb_addr << 3);
 	return (void *)addr;
 }