powerpc/powernv: Remove OPALv2 firmware define and references

OPALv2 only ever existed in the lab and didn't escape to the world.
All OPAL systems in the wild are OPALv3.

The probability of there being an OPALv2 system still powered on
anywhere inside IBM is approximately zero, let alone anyone
expecting to run mainline kernels.

So, start to remove references to OPALv2.

Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/firmware.h b/arch/powerpc/include/asm/firmware.h
index e05808a328db24ec39a8eb144e423cb7015f31a8..50af5e5ea86fdae7a03708d50409c999fe092760 100644 (file)
--- a/arch/powerpc/include/asm/firmware.h
+++ b/arch/powerpc/include/asm/firmware.h
@@ -47,7 +47,6 @@
 #define FW_FEATURE_VPHN                ASM_CONST(0x0000000004000000)
 #define FW_FEATURE_XCMO                ASM_CONST(0x0000000008000000)
 #define FW_FEATURE_OPAL                ASM_CONST(0x0000000010000000)
-#define FW_FEATURE_OPALv2      ASM_CONST(0x0000000020000000)
 #define FW_FEATURE_SET_MODE    ASM_CONST(0x0000000040000000)
 #define FW_FEATURE_BEST_ENERGY ASM_CONST(0x0000000080000000)
 #define FW_FEATURE_TYPE1_AFFINITY ASM_CONST(0x0000000100000000)
@@ -70,8 +69,7 @@ enum {
                FW_FEATURE_SET_MODE | FW_FEATURE_BEST_ENERGY |
                FW_FEATURE_TYPE1_AFFINITY | FW_FEATURE_PRRN,
        FW_FEATURE_PSERIES_ALWAYS = 0,
-       FW_FEATURE_POWERNV_POSSIBLE = FW_FEATURE_OPAL | FW_FEATURE_OPALv2 |
-               FW_FEATURE_OPALv3,
+       FW_FEATURE_POWERNV_POSSIBLE = FW_FEATURE_OPAL | FW_FEATURE_OPALv3,
        FW_FEATURE_POWERNV_ALWAYS = 0,
        FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
        FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,

diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index faea1abaa785934b76c2872290e419fcf34f9c78..5ce51d9b4ca6fd7f345562441a5c232d55b3d670 100644 (file)
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -100,7 +100,6 @@ int __init early_init_dt_scan_opal(unsigned long node,
 
        powerpc_firmware_features |= FW_FEATURE_OPAL;
        if (of_flat_dt_is_compatible(node, "ibm,opal-v3")) {
-               powerpc_firmware_features |= FW_FEATURE_OPALv2;
                powerpc_firmware_features |= FW_FEATURE_OPALv3;
                pr_info("OPAL V3 detected !\n");
        } else {
@@ -349,7 +348,7 @@ int opal_put_chars(uint32_t vtermno, const char *data, int total_len)
         * enough room and be done with it
         */
        spin_lock_irqsave(&opal_write_lock, flags);
-       if (firmware_has_feature(FW_FEATURE_OPALv2)) {
+       if (firmware_has_feature(FW_FEATURE_OPALv3)) {
                rc = opal_console_write_buffer_space(vtermno, &olen);
                len = be64_to_cpu(olen);
                if (rc || len < total_len) {
@@ -693,10 +692,7 @@ static int __init opal_init(void)
        }
 
        /* Register OPAL consoles if any ports */
-       if (firmware_has_feature(FW_FEATURE_OPALv2))
-               consoles = of_find_node_by_path("/ibm,opal/consoles");
-       else
-               consoles = of_node_get(opal_node);
+       consoles = of_find_node_by_path("/ibm,opal/consoles");
        if (consoles) {
                for_each_child_of_node(consoles, np) {
                        if (strcmp(np->name, "serial"))

diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index a9a8fa37a555f5e9b6e3ed835265bc6426b7d85f..54583fc417bed6db1655e1bc0aac8137d57cb3a8 100644 (file)
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -92,10 +92,6 @@ static void pnv_show_cpuinfo(struct seq_file *m)
        seq_printf(m, "machine\t\t: PowerNV %s\n", model);
        if (firmware_has_feature(FW_FEATURE_OPALv3))
                seq_printf(m, "firmware\t: OPAL v3\n");
-       else if (firmware_has_feature(FW_FEATURE_OPALv2))
-               seq_printf(m, "firmware\t: OPAL v2\n");
-       else if (firmware_has_feature(FW_FEATURE_OPAL))
-               seq_printf(m, "firmware\t: OPAL v1\n");
        else
                seq_printf(m, "firmware\t: BML\n");
        of_node_put(root);

diff --git a/arch/powerpc/platforms/powernv/smp.c b/arch/powerpc/platforms/powernv/smp.c
index ca264833ee64d5c7a55035c66c21454d7b4d0b14..9b968a3151035c03aa458a0cb3e810d90dae8dab 100644 (file)
--- a/arch/powerpc/platforms/powernv/smp.c
+++ b/arch/powerpc/platforms/powernv/smp.c
@@ -65,10 +65,10 @@ static int pnv_smp_kick_cpu(int nr)
        BUG_ON(nr < 0 || nr >= NR_CPUS);
 
        /*
-        * If we already started or OPALv2 is not supported, we just
+        * If we already started or OPALv3 is not supported, we just
         * kick the CPU via the PACA
         */
-       if (paca[nr].cpu_start || !firmware_has_feature(FW_FEATURE_OPALv2))
+       if (paca[nr].cpu_start || !firmware_has_feature(FW_FEATURE_OPALv3))
                goto kick;
 
        /*