mach-k3: common: correct the calculations for determining firewalls

The background firewall calculations were wrong, fix that to determine
both the background and foreground correctly.

Fixes: 8bfce2f9989f ("arm: mach-k3: common: reorder removal of firewalls")
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 450c7b7e4c0412c87b2c3ce5389586391ed138c0..a35110429b23eabd429e1caa93e876eb90d99703 100644 (file)
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -497,8 +497,7 @@ static void remove_fwl_regions(struct fwl_data fwl_data, size_t num_regions,
 
                /* Don't disable the background regions */
                if (region.control != 0 &&
-                   ((region.control & K3_FIREWALL_BACKGROUND_BIT) ==
-                    fwl_type)) {
+                   ((region.control >> K3_FIREWALL_BACKGROUND_BIT) & 1) == fwl_type) {
                        pr_debug("Attempting to disable firewall %5d (%25s)\n",
                                 region.fwl_id, fwl_data.name);
                        region.control = 0;

diff --git a/arch/arm/mach-k3/common.h b/arch/arm/mach-k3/common.h
index 6cffbd444b8300ea3c883c972dfa6c8ca08f972d..9bd9ad6d1a0f834f90e9c0e1cfcb24aef738cb87 100644 (file)
--- a/arch/arm/mach-k3/common.h
+++ b/arch/arm/mach-k3/common.h
@@ -9,7 +9,7 @@
 #include <asm/armv7_mpu.h>
 #include <asm/hardware.h>
 
-#define K3_FIREWALL_BACKGROUND_BIT BIT(8)
+#define K3_FIREWALL_BACKGROUND_BIT (8)
 
 struct fwl_data {
        const char *name;