aboutsummaryrefslogtreecommitdiff
path: root/hw/xscom.c
diff options
context:
space:
mode:
authorNicholas Piggin <npiggin@gmail.com>2019-11-11 15:44:48 +1000
committerOliver O'Halloran <oohall@gmail.com>2019-11-11 18:35:00 +1100
commit3fbfb0e351cdeb9279aa2857046ecf0823b787dc (patch)
treeeb1564eaf99f4dbb1d21c6be55e813d3eafa0d83 /hw/xscom.c
parentbb445088d0dd11c2a1b749792e49ccdb1d6f6c33 (diff)
downloadskiboot-3fbfb0e351cdeb9279aa2857046ecf0823b787dc.zip
skiboot-3fbfb0e351cdeb9279aa2857046ecf0823b787dc.tar.gz
skiboot-3fbfb0e351cdeb9279aa2857046ecf0823b787dc.tar.bz2
Remove dead POWER7 code
There are a number of proc_gen branches removed that are trivially dead code and comments that refer to P7. As well as those: - Oliver points out that add_xics_icps() must be unused on POWER8 because it asserts if number of threads > 4, so remove it. - Change 16b7ae641 ("Remove POWER7 and POWER7+ support") removed all references to opal_boot_trampoline, so remove that. - It also removed the only non-trival choose_bus implementation, so that is removed and its caller simplified. - Remove the paca code, later CPUs use pcia. Cc: Stewart Smith <stewart@flamingspork.com> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Diffstat (limited to 'hw/xscom.c')
-rw-r--r--hw/xscom.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/hw/xscom.c b/hw/xscom.c
index 9b28422..f3f4e10 100644
--- a/hw/xscom.c
+++ b/hw/xscom.c
@@ -61,7 +61,7 @@ static inline void *xscom_addr(uint32_t gcid, uint32_t pcb_addr)
assert(chip);
addr = chip->xscom_base;
- if (proc_gen <= proc_gen_p8) {
+ if (proc_gen == proc_gen_p8) {
addr |= ((uint64_t)pcb_addr << 4) & ~0xfful;
addr |= (pcb_addr << 3) & 0x78;
} else
@@ -432,11 +432,6 @@ static int xscom_indirect_read_form0(uint32_t gcid, uint64_t pcb_addr,
uint64_t data;
int rc, retries;
- if (proc_gen < proc_gen_p8) {
- *val = (uint64_t)-1;
- return OPAL_UNSUPPORTED;
- }
-
/* Write indirect address */
addr = pcb_addr & 0x7fffffff;
data = XSCOM_DATA_IND_READ |
@@ -491,9 +486,6 @@ static int xscom_indirect_write_form0(uint32_t gcid, uint64_t pcb_addr,
uint64_t data;
int rc, retries;
- if (proc_gen < proc_gen_p8)
- return OPAL_UNSUPPORTED;
-
/* Only 16 bit data with indirect */
if (val & ~(XSCOM_ADDR_IND_DATA))
return OPAL_PARAMETER;