aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorOliver O'Halloran <oohall@gmail.com>2019-08-07 16:24:35 +1000
committerOliver O'Halloran <oohall@gmail.com>2019-08-16 15:51:55 +1000
commitb03906a990fa3fe5f12e3eaf24a2fac370efb81e (patch)
treef353575f8984bbfb05d6f83786682e968b60b40f /include
parentabf3e4c6a5349f7d25822f0a558f9b8cf71678cc (diff)
downloadskiboot-b03906a990fa3fe5f12e3eaf24a2fac370efb81e.zip
skiboot-b03906a990fa3fe5f12e3eaf24a2fac370efb81e.tar.gz
skiboot-b03906a990fa3fe5f12e3eaf24a2fac370efb81e.tar.bz2
include/xscom: Use the name EQ rather than EP
The P9 pervasive spec uses the term "EP" to refer to the combination of an EQ chiplet and its two child EX chiplets. Nothing else seems to use the term EP and in Skiboot all the uses of the XSCOM_ADDR_P9_EP() macro are to translate the address of EQ specific SCOM registers. Change the name of our address calculation macros to match the general terminology to make what it does clearer. Cc: Anju T Sudhakar <anju@linux.vnet.ibm.com> Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Diffstat (limited to 'include')
-rw-r--r--include/xscom.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/include/xscom.h b/include/xscom.h
index 051b7c0..8a466d5 100644
--- a/include/xscom.h
+++ b/include/xscom.h
@@ -112,17 +112,21 @@
* Additional useful definitions for P9
*/
-/* An EQ is a quad (also named an EP) */
-#define XSCOM_ADDR_P9_EP(core, addr) \
+/*
+ * An EQ is a quad. The Pervasive spec also uses the term "EP"
+ * to refer to an EQ and it's two child EX chiplets, but
+ * nothing else does
+ */
+#define XSCOM_ADDR_P9_EQ(core, addr) \
(((((core) & 0x1c) + 0x40) << 22) | (addr))
-#define XSCOM_ADDR_P9_EP_SLAVE(core, addr) \
- XSCOM_ADDR_P9_EP(core, (addr) | 0xf0000)
+#define XSCOM_ADDR_P9_EQ_SLAVE(core, addr) \
+ XSCOM_ADDR_P9_EQ(core, (addr) | 0xf0000)
/* An EX is a pair of cores. They are accessed via their corresponding EQs
* with bit 0x400 indicating which of the 2 EX to address
*/
#define XSCOM_ADDR_P9_EX(core, addr) \
- (XSCOM_ADDR_P9_EP(core, addr | (((core) & 2) << 9)))
+ (XSCOM_ADDR_P9_EQ(core, addr | (((core) & 2) << 9)))
/* An EC is an individual core and has its own XSCOM addressing */
#define XSCOM_ADDR_P9_EC(core, addr) \