summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorOleksij Rempel <o.rempel@pengutronix.de>2021-08-26 11:21:52 +0200
committerOleksij Rempel <o.rempel@pengutronix.de>2021-09-02 10:45:43 +0200
commit97233ca74a920db0b53232b95ccf2a9bc3b074dd (patch)
tree68776ffa4d95e89608f2d421334260f1ba9386bd /configs
parent9cb201a837cb176b8528ba859b3d16bc0b41df55 (diff)
downloadDistroKit-master.tar.gz
DistroKit-master.tar.xz
MIPS: kernel: fix alignment of the devicetree bufferHEADmaster
Starting with kernel v5.12 we have more strict alignment checking for the devicetree buffers. Fix it by telling the compiler to align fdt_buf properly. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Diffstat (limited to 'configs')
-rw-r--r--configs/platform-mips/patches/linux-5.14/0001-MIPS-Malta-fix-alignment-of-the-devicetree-buffer.patch34
-rw-r--r--configs/platform-mips/patches/linux-5.14/series4
-rw-r--r--configs/platform-mipsel/patches/linux-5.14/0001-MIPS-Malta-fix-alignment-of-the-devicetree-buffer.patch34
-rw-r--r--configs/platform-mipsel/patches/linux-5.14/series4
4 files changed, 76 insertions, 0 deletions
diff --git a/configs/platform-mips/patches/linux-5.14/0001-MIPS-Malta-fix-alignment-of-the-devicetree-buffer.patch b/configs/platform-mips/patches/linux-5.14/0001-MIPS-Malta-fix-alignment-of-the-devicetree-buffer.patch
new file mode 100644
index 0000000..ebf1030
--- /dev/null
+++ b/configs/platform-mips/patches/linux-5.14/0001-MIPS-Malta-fix-alignment-of-the-devicetree-buffer.patch
@@ -0,0 +1,34 @@
+From: Oleksij Rempel <o.rempel@pengutronix.de>
+Date: Thu, 2 Sep 2021 08:35:37 +0200
+Subject: [PATCH] MIPS: Malta: fix alignment of the devicetree buffer
+
+Starting with following patch MIPS Malta is not able to boot:
+| commit 79edff12060fe7772af08607eff50c0e2486c5ba
+| Author: Rob Herring <robh@kernel.org>
+| scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9
+
+The reason is the alignment test added to the fdt_ro_probe_(). To fix
+this issue, we need to make sure that fdt_buf is aligned.
+
+Since the dtc patch was designed to uncover potential issue, I handle
+initial MIPS Malta patch as initial bug.
+
+Fixes: e81a8c7dabac ("MIPS: Malta: Setup RAM regions via DT")
+Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
+---
+ arch/mips/mti-malta/malta-dtshim.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/mips/mti-malta/malta-dtshim.c b/arch/mips/mti-malta/malta-dtshim.c
+index 0ddf03df6268..f451268f6c38 100644
+--- a/arch/mips/mti-malta/malta-dtshim.c
++++ b/arch/mips/mti-malta/malta-dtshim.c
+@@ -22,7 +22,7 @@
+ #define ROCIT_CONFIG_GEN1_MEMMAP_SHIFT 8
+ #define ROCIT_CONFIG_GEN1_MEMMAP_MASK (0xf << 8)
+
+-static unsigned char fdt_buf[16 << 10] __initdata;
++static unsigned char fdt_buf[16 << 10] __initdata __aligned(8);
+
+ /* determined physical memory size, not overridden by command line args */
+ extern unsigned long physical_memsize;
diff --git a/configs/platform-mips/patches/linux-5.14/series b/configs/platform-mips/patches/linux-5.14/series
new file mode 100644
index 0000000..b220453
--- /dev/null
+++ b/configs/platform-mips/patches/linux-5.14/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-MIPS-Malta-fix-alignment-of-the-devicetree-buffer.patch
+# 25ed4bdad4900ab6e57594b71c39b60c - git-ptx-patches magic
diff --git a/configs/platform-mipsel/patches/linux-5.14/0001-MIPS-Malta-fix-alignment-of-the-devicetree-buffer.patch b/configs/platform-mipsel/patches/linux-5.14/0001-MIPS-Malta-fix-alignment-of-the-devicetree-buffer.patch
new file mode 100644
index 0000000..ebf1030
--- /dev/null
+++ b/configs/platform-mipsel/patches/linux-5.14/0001-MIPS-Malta-fix-alignment-of-the-devicetree-buffer.patch
@@ -0,0 +1,34 @@
+From: Oleksij Rempel <o.rempel@pengutronix.de>
+Date: Thu, 2 Sep 2021 08:35:37 +0200
+Subject: [PATCH] MIPS: Malta: fix alignment of the devicetree buffer
+
+Starting with following patch MIPS Malta is not able to boot:
+| commit 79edff12060fe7772af08607eff50c0e2486c5ba
+| Author: Rob Herring <robh@kernel.org>
+| scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9
+
+The reason is the alignment test added to the fdt_ro_probe_(). To fix
+this issue, we need to make sure that fdt_buf is aligned.
+
+Since the dtc patch was designed to uncover potential issue, I handle
+initial MIPS Malta patch as initial bug.
+
+Fixes: e81a8c7dabac ("MIPS: Malta: Setup RAM regions via DT")
+Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
+---
+ arch/mips/mti-malta/malta-dtshim.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/mips/mti-malta/malta-dtshim.c b/arch/mips/mti-malta/malta-dtshim.c
+index 0ddf03df6268..f451268f6c38 100644
+--- a/arch/mips/mti-malta/malta-dtshim.c
++++ b/arch/mips/mti-malta/malta-dtshim.c
+@@ -22,7 +22,7 @@
+ #define ROCIT_CONFIG_GEN1_MEMMAP_SHIFT 8
+ #define ROCIT_CONFIG_GEN1_MEMMAP_MASK (0xf << 8)
+
+-static unsigned char fdt_buf[16 << 10] __initdata;
++static unsigned char fdt_buf[16 << 10] __initdata __aligned(8);
+
+ /* determined physical memory size, not overridden by command line args */
+ extern unsigned long physical_memsize;
diff --git a/configs/platform-mipsel/patches/linux-5.14/series b/configs/platform-mipsel/patches/linux-5.14/series
new file mode 100644
index 0000000..b220453
--- /dev/null
+++ b/configs/platform-mipsel/patches/linux-5.14/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-MIPS-Malta-fix-alignment-of-the-devicetree-buffer.patch
+# 25ed4bdad4900ab6e57594b71c39b60c - git-ptx-patches magic