aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-5.4/0154-lantiq-pci-bar11mask-fix.patch
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2020-03-01 08:09:19 +0100
committerMathias Kresin <dev@kresin.me>2020-03-16 22:28:16 +0100
commit005dedd3480f47ff1049e132ec8d83bc0e24fbef (patch)
tree56fdc5bdf6c715d63fc5acb963eab4e747747920 /target/linux/lantiq/patches-5.4/0154-lantiq-pci-bar11mask-fix.patch
parent0dbe8b9029df1c1b254101bacbc20c3418eb956f (diff)
downloadupstream-005dedd3480f47ff1049e132ec8d83bc0e24fbef.tar.gz
upstream-005dedd3480f47ff1049e132ec8d83bc0e24fbef.tar.bz2
upstream-005dedd3480f47ff1049e132ec8d83bc0e24fbef.zip
lantiq: copy target to kernel 5.4
Duplicate kernel 4.19 config and patches for kernel 5.4. Duplicate the devicetree source files as well, they need kernel 5.4 specific adjustments. Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/lantiq/patches-5.4/0154-lantiq-pci-bar11mask-fix.patch')
-rw-r--r--target/linux/lantiq/patches-5.4/0154-lantiq-pci-bar11mask-fix.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-5.4/0154-lantiq-pci-bar11mask-fix.patch b/target/linux/lantiq/patches-5.4/0154-lantiq-pci-bar11mask-fix.patch
new file mode 100644
index 0000000000..d0acd4bb10
--- /dev/null
+++ b/target/linux/lantiq/patches-5.4/0154-lantiq-pci-bar11mask-fix.patch
@@ -0,0 +1,22 @@
+--- a/arch/mips/pci/pci-lantiq.c
++++ b/arch/mips/pci/pci-lantiq.c
+@@ -61,6 +61,8 @@
+ #define ltq_pci_cfg_w32(x, y) ltq_w32((x), ltq_pci_mapped_cfg + (y))
+ #define ltq_pci_cfg_r32(x) ltq_r32(ltq_pci_mapped_cfg + (x))
+
++extern u32 max_low_pfn;
++
+ __iomem void *ltq_pci_mapped_cfg;
+ static __iomem void *ltq_pci_membase;
+
+@@ -86,8 +88,8 @@ static inline u32 ltq_calc_bar11mask(voi
+ u32 mem, bar11mask;
+
+ /* BAR11MASK value depends on available memory on system. */
+- mem = get_num_physpages() * PAGE_SIZE;
+- bar11mask = (0x0ffffff0 & ~((1 << (fls(mem) - 1)) - 1)) | 8;
++ mem = max_low_pfn << PAGE_SHIFT;
++ bar11mask = ((-roundup_pow_of_two(mem)) & 0x0F000000) | 8;
+
+ return bar11mask;
+ }