cns3xxx: backport pci fix for cns3xxx_write_config
authorJohn Crispin <john@openwrt.org>
Tue, 26 Apr 2016 11:43:57 +0000 (11:43 +0000)
committerJohn Crispin <john@openwrt.org>
Tue, 26 Apr 2016 11:43:57 +0000 (11:43 +0000)
Fix is required to properly set pci config bits.
Original Patch: https://patchwork.ozlabs.org/patch/596170/

Signed-off-by: Pushpal Sidhu <psidhu@gateworks.com>
SVN-Revision: 49248

target/linux/cns3xxx/patches-4.4/033-CNS3xxx-Fix-PCI-cns3xxx_write_config.patch [new file with mode: 0644]

diff --git a/target/linux/cns3xxx/patches-4.4/033-CNS3xxx-Fix-PCI-cns3xxx_write_config.patch b/target/linux/cns3xxx/patches-4.4/033-CNS3xxx-Fix-PCI-cns3xxx_write_config.patch
new file mode 100644 (file)
index 0000000..3f5ab06
--- /dev/null
@@ -0,0 +1,19 @@
+--- a/arch/arm/mach-cns3xxx/pcie.c
++++ b/arch/arm/mach-cns3xxx/pcie.c
+@@ -220,13 +220,13 @@ static void cns3xxx_write_config(struct
+       u32 mask = (0x1ull << (size * 8)) - 1;
+       int shift = (where % 4) * 8;
+-      v = readl_relaxed(base + (where & 0xffc));
++      v = readl_relaxed(base);
+       v &= ~(mask << shift);
+       v |= (val & mask) << shift;
+-      writel_relaxed(v, base + (where & 0xffc));
+-      readl_relaxed(base + (where & 0xffc));
++      writel_relaxed(v, base);
++      readl_relaxed(base);
+ }
+ static void __init cns3xxx_pcie_hw_init(struct cns3xxx_pcie *cnspci)