aboutsummaryrefslogtreecommitdiff
path: root/core/direct-controls.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 /core/direct-controls.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 'core/direct-controls.c')
-rw-r--r--core/direct-controls.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/core/direct-controls.c b/core/direct-controls.c
index 507a16f..793ef29 100644
--- a/core/direct-controls.c
+++ b/core/direct-controls.c
@@ -522,7 +522,7 @@ int dctl_set_special_wakeup(struct cpu_thread *t)
struct cpu_thread *c = t->primary;
int rc = OPAL_SUCCESS;
- if (proc_gen != proc_gen_p9 && proc_gen != proc_gen_p8)
+ if (proc_gen == proc_gen_unknown)
return OPAL_UNSUPPORTED;
lock(&c->dctl_lock);
@@ -544,7 +544,7 @@ int dctl_clear_special_wakeup(struct cpu_thread *t)
struct cpu_thread *c = t->primary;
int rc = OPAL_SUCCESS;
- if (proc_gen != proc_gen_p9 && proc_gen != proc_gen_p8)
+ if (proc_gen == proc_gen_unknown)
return OPAL_UNSUPPORTED;
lock(&c->dctl_lock);
@@ -592,9 +592,6 @@ static int dctl_stop(struct cpu_thread *t)
struct cpu_thread *c = t->primary;
int rc;
- if (proc_gen != proc_gen_p9 && proc_gen != proc_gen_p8)
- return OPAL_UNSUPPORTED;
-
lock(&c->dctl_lock);
if (t->dctl_stopped) {
unlock(&c->dctl_lock);
@@ -643,9 +640,6 @@ static int dctl_sreset(struct cpu_thread *t)
struct cpu_thread *c = t->primary;
int rc;
- if (proc_gen != proc_gen_p9 && proc_gen != proc_gen_p8)
- return OPAL_UNSUPPORTED;
-
lock(&c->dctl_lock);
if (!t->dctl_stopped) {
unlock(&c->dctl_lock);
@@ -669,6 +663,9 @@ int sreset_all_prepare(void)
{
struct cpu_thread *cpu;
+ if (proc_gen == proc_gen_unknown)
+ return OPAL_UNSUPPORTED;
+
prlog(PR_DEBUG, "RESET: Resetting from cpu: 0x%x (core 0x%x)\n",
this_cpu()->pir, pir_to_core_id(this_cpu()->pir));