Revert "arm: mach-k3: common: don't reconfigure background firewalls"

This reverts commit b8ebf24e7f4afb5093a31bdf122e1ed0781e5c3c.

This patch seems to be fundamentally wrong and requires a different way
on how the background firewalls should be configured so revert the patch

Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>

diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index 3c85caee579d9612baa2936d0ffa5e0d879d6788..b40e930b615d91742f15b27f8b5735f399de6601 100644 (file)
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -580,10 +580,7 @@ void remove_fwl_configs(struct fwl_data *fwl_data, size_t fwl_data_size)
 
                        fwl_ops->get_fwl_region(ti_sci, &region);
 
-                       /* Don't disable the background regions */
-                       if (region.control != 0 &&
-                           ((region.control & K3_BACKGROUND_FIREWALL_BIT) ==
-                            0)) {
+                       if (region.control != 0) {
                                pr_debug("Attempting to disable firewall %5d (%25s)\n",
                                         region.fwl_id, fwl_data[i].name);
                                region.control = 0;

diff --git a/arch/arm/mach-k3/common.h b/arch/arm/mach-k3/common.h
index e7e59f533b7008097697270558442e853ba3bfcf..130f5021123aceca4d1060dde57df25920450c73 100644 (file)
--- a/arch/arm/mach-k3/common.h
+++ b/arch/arm/mach-k3/common.h
@@ -9,10 +9,6 @@
 #include <asm/armv7_mpu.h>
 #include <asm/hardware.h>
 
-#define J721E  0xbb64
-#define J7200  0xbb6d
-#define K3_BACKGROUND_FIREWALL_BIT BIT(8)
-
 struct fwl_data {
        const char *name;
        u16 fwl_id;