aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/patches-4.14
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-06-04 20:06:00 +0300
committerStijn Tintel <stijn@linux-ipv6.be>2018-06-05 22:54:00 +0300
commite52f3e9b13763cbfbd92fca8db0b4d19dc1e309e (patch)
tree804a13ddc9ccf75e3f0ae38102ddbf950806ea79 /target/linux/oxnas/patches-4.14
parent7590c3c58f5e9d580c86da10473d1d29a2f081c9 (diff)
downloadupstream-e52f3e9b13763cbfbd92fca8db0b4d19dc1e309e.tar.gz
upstream-e52f3e9b13763cbfbd92fca8db0b4d19dc1e309e.tar.bz2
upstream-e52f3e9b13763cbfbd92fca8db0b4d19dc1e309e.zip
kernel: bump 4.14 to 4.14.48
Remove upstreamed patches: generic/pending/101-clocksource-mips-gic-timer-fix-clocksource-counter-w.patch generic/pending/103-MIPS-c-r4k-fix-data-corruption-related-to-cache-coherence.patch generic/pending/182-net-qmi_wwan-add-BroadMobi-BM806U-2020-2033.patch lantiq/0025-MIPS-lantiq-gphy-Remove-reboot-remove-reset-asserts.patch Update patches that no longer apply: generic/pending/811-pci_disable_usb_common_quirks.patch ath79/0009-MIPS-ath79-add-lots-of-missing-registers.patch Fixes CVE-2018-6412. Compile-tested: octeon, x86/64. Runtime-tested: octeon, x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/oxnas/patches-4.14')
-rw-r--r--target/linux/oxnas/patches-4.14/0001-ARM-dts-rename-oxnas-dts-files.patch437
-rw-r--r--target/linux/oxnas/patches-4.14/0002-MAINTAINERS-update-ARM-OXNAS-platform-support-patter.patch7
-rw-r--r--target/linux/oxnas/patches-4.14/0003-ARM-configs-add-OXNAS-v6-defconfig.patch6
-rw-r--r--target/linux/oxnas/patches-4.14/050-ox820-remove-left-overs.patch7
-rw-r--r--target/linux/oxnas/patches-4.14/100-oxnas-clk-plla-pllb.patch4
-rw-r--r--target/linux/oxnas/patches-4.14/340-oxnas-pcie.patch2
-rw-r--r--target/linux/oxnas/patches-4.14/500-oxnas-sata.patch2
-rw-r--r--target/linux/oxnas/patches-4.14/510-ox820-libata-leds.patch4
-rw-r--r--target/linux/oxnas/patches-4.14/800-oxnas-ehci.patch2
-rw-r--r--target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch4
-rw-r--r--target/linux/oxnas/patches-4.14/999-libata-hacks.patch4
11 files changed, 436 insertions, 43 deletions
diff --git a/target/linux/oxnas/patches-4.14/0001-ARM-dts-rename-oxnas-dts-files.patch b/target/linux/oxnas/patches-4.14/0001-ARM-dts-rename-oxnas-dts-files.patch
index 20289b3903..db6144c397 100644
--- a/target/linux/oxnas/patches-4.14/0001-ARM-dts-rename-oxnas-dts-files.patch
+++ b/target/linux/oxnas/patches-4.14/0001-ARM-dts-rename-oxnas-dts-files.patch
@@ -20,8 +20,6 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
rename arch/arm/boot/dts/{wd-mbwe.dts => ox810se-wd-mbwe.dts} (100%)
rename arch/arm/boot/dts/{cloudengines-pogoplug-series-3.dts => ox820-cloudengines-pogoplug-series-3.dts} (100%)
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index eff87a344566..1ae23ffa6ff4 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -685,8 +685,8 @@ dtb-$(CONFIG_ARCH_ACTIONS) += \
@@ -35,14 +33,427 @@ index eff87a344566..1ae23ffa6ff4 100644
dtb-$(CONFIG_ARCH_QCOM) += \
qcom-apq8060-dragonboard.dtb \
qcom-apq8064-arrow-sd-600eval.dtb \
-diff --git a/arch/arm/boot/dts/wd-mbwe.dts b/arch/arm/boot/dts/ox810se-wd-mbwe.dts
-similarity index 100%
-rename from arch/arm/boot/dts/wd-mbwe.dts
-rename to arch/arm/boot/dts/ox810se-wd-mbwe.dts
-diff --git a/arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
-similarity index 100%
-rename from arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts
-rename to arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
---
-2.17.1
-
+--- a/arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts
++++ /dev/null
+@@ -1,94 +0,0 @@
+-/*
+- * cloudengines-pogoplug-series-3.dtsi - Device tree file for Cloud Engines PogoPlug Series 3
+- *
+- * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
+- *
+- * Licensed under GPLv2 or later
+- */
+-
+-/dts-v1/;
+-#include "ox820.dtsi"
+-
+-/ {
+- model = "Cloud Engines PogoPlug Series 3";
+-
+- compatible = "cloudengines,pogoplugv3", "oxsemi,ox820";
+-
+- chosen {
+- bootargs = "earlyprintk";
+- stdout-path = "serial0:115200n8";
+- };
+-
+- memory {
+- /* 128Mbytes DDR */
+- reg = <0x60000000 0x8000000>;
+- };
+-
+- aliases {
+- serial0 = &uart0;
+- gpio0 = &gpio0;
+- gpio1 = &gpio1;
+- };
+-
+- leds {
+- compatible = "gpio-leds";
+-
+- blue {
+- label = "pogoplug:blue";
+- gpios = <&gpio0 2 0>;
+- default-state = "keep";
+- };
+-
+- orange {
+- label = "pogoplug:orange";
+- gpios = <&gpio1 16 1>;
+- default-state = "keep";
+- };
+-
+- green {
+- label = "pogoplug:green";
+- gpios = <&gpio1 17 1>;
+- default-state = "keep";
+- };
+- };
+-};
+-
+-&uart0 {
+- status = "okay";
+-
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_uart0>;
+-};
+-
+-&nandc {
+- status = "okay";
+-
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_nand>;
+-
+- nand@0 {
+- reg = <0>;
+- #address-cells = <1>;
+- #size-cells = <1>;
+- nand-ecc-mode = "soft";
+- nand-ecc-algo = "hamming";
+-
+- partition@0 {
+- label = "boot";
+- reg = <0x00000000 0x00e00000>;
+- read-only;
+- };
+-
+- partition@e00000 {
+- label = "ubi";
+- reg = <0x00e00000 0x07200000>;
+- };
+- };
+-};
+-
+-&etha {
+- status = "okay";
+-
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_etha_mdio>;
+-};
+--- /dev/null
++++ b/arch/arm/boot/dts/ox810se-wd-mbwe.dts
+@@ -0,0 +1,112 @@
++/*
++ * wd-mbwe.dtsi - Device tree file for Western Digital My Book World Edition
++ *
++ * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
++ *
++ * Licensed under GPLv2 or later
++ */
++
++/dts-v1/;
++#include "ox810se.dtsi"
++
++/ {
++ model = "Western Digital My Book World Edition";
++
++ compatible = "wd,mbwe", "oxsemi,ox810se";
++
++ chosen {
++ bootargs = "console=ttyS1,115200n8 earlyprintk=serial";
++ };
++
++ memory {
++ /* 128Mbytes DDR */
++ reg = <0x48000000 0x8000000>;
++ };
++
++ aliases {
++ serial1 = &uart1;
++ gpio0 = &gpio0;
++ gpio1 = &gpio1;
++ };
++
++ gpio-keys-polled {
++ compatible = "gpio-keys-polled";
++ #address-cells = <1>;
++ #size-cells = <0>;
++ poll-interval = <100>;
++
++ power {
++ label = "power";
++ gpios = <&gpio0 0 1>;
++ linux,code = <0x198>;
++ };
++
++ recovery {
++ label = "recovery";
++ gpios = <&gpio0 4 1>;
++ linux,code = <0xab>;
++ };
++ };
++
++ leds {
++ compatible = "gpio-leds";
++
++ a0 {
++ label = "activity0";
++ gpios = <&gpio0 25 0>;
++ default-state = "keep";
++ };
++
++ a1 {
++ label = "activity1";
++ gpios = <&gpio0 26 0>;
++ default-state = "keep";
++ };
++
++ a2 {
++ label = "activity2";
++ gpios = <&gpio0 5 0>;
++ default-state = "keep";
++ };
++
++ a3 {
++ label = "activity3";
++ gpios = <&gpio0 6 0>;
++ default-state = "keep";
++ };
++
++ a4 {
++ label = "activity4";
++ gpios = <&gpio0 7 0>;
++ default-state = "keep";
++ };
++
++ a5 {
++ label = "activity5";
++ gpios = <&gpio1 2 0>;
++ default-state = "keep";
++ };
++ };
++
++ i2c-gpio {
++ compatible = "i2c-gpio";
++ gpios = <&gpio0 3 0 /* sda */
++ &gpio0 2 0 /* scl */
++ >;
++ i2c-gpio,delay-us = <2>; /* ~100 kHz */
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ rtc0: rtc@48 {
++ compatible = "st,m41t00";
++ reg = <0x68>;
++ };
++ };
++};
++
++&uart1 {
++ status = "okay";
++
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart1>;
++};
+--- /dev/null
++++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
+@@ -0,0 +1,94 @@
++/*
++ * cloudengines-pogoplug-series-3.dtsi - Device tree file for Cloud Engines PogoPlug Series 3
++ *
++ * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
++ *
++ * Licensed under GPLv2 or later
++ */
++
++/dts-v1/;
++#include "ox820.dtsi"
++
++/ {
++ model = "Cloud Engines PogoPlug Series 3";
++
++ compatible = "cloudengines,pogoplugv3", "oxsemi,ox820";
++
++ chosen {
++ bootargs = "earlyprintk";
++ stdout-path = "serial0:115200n8";
++ };
++
++ memory {
++ /* 128Mbytes DDR */
++ reg = <0x60000000 0x8000000>;
++ };
++
++ aliases {
++ serial0 = &uart0;
++ gpio0 = &gpio0;
++ gpio1 = &gpio1;
++ };
++
++ leds {
++ compatible = "gpio-leds";
++
++ blue {
++ label = "pogoplug:blue";
++ gpios = <&gpio0 2 0>;
++ default-state = "keep";
++ };
++
++ orange {
++ label = "pogoplug:orange";
++ gpios = <&gpio1 16 1>;
++ default-state = "keep";
++ };
++
++ green {
++ label = "pogoplug:green";
++ gpios = <&gpio1 17 1>;
++ default-state = "keep";
++ };
++ };
++};
++
++&uart0 {
++ status = "okay";
++
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart0>;
++};
++
++&nandc {
++ status = "okay";
++
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_nand>;
++
++ nand@0 {
++ reg = <0>;
++ #address-cells = <1>;
++ #size-cells = <1>;
++ nand-ecc-mode = "soft";
++ nand-ecc-algo = "hamming";
++
++ partition@0 {
++ label = "boot";
++ reg = <0x00000000 0x00e00000>;
++ read-only;
++ };
++
++ partition@e00000 {
++ label = "ubi";
++ reg = <0x00e00000 0x07200000>;
++ };
++ };
++};
++
++&etha {
++ status = "okay";
++
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_etha_mdio>;
++};
+--- a/arch/arm/boot/dts/wd-mbwe.dts
++++ /dev/null
+@@ -1,112 +0,0 @@
+-/*
+- * wd-mbwe.dtsi - Device tree file for Western Digital My Book World Edition
+- *
+- * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
+- *
+- * Licensed under GPLv2 or later
+- */
+-
+-/dts-v1/;
+-#include "ox810se.dtsi"
+-
+-/ {
+- model = "Western Digital My Book World Edition";
+-
+- compatible = "wd,mbwe", "oxsemi,ox810se";
+-
+- chosen {
+- bootargs = "console=ttyS1,115200n8 earlyprintk=serial";
+- };
+-
+- memory {
+- /* 128Mbytes DDR */
+- reg = <0x48000000 0x8000000>;
+- };
+-
+- aliases {
+- serial1 = &uart1;
+- gpio0 = &gpio0;
+- gpio1 = &gpio1;
+- };
+-
+- gpio-keys-polled {
+- compatible = "gpio-keys-polled";
+- #address-cells = <1>;
+- #size-cells = <0>;
+- poll-interval = <100>;
+-
+- power {
+- label = "power";
+- gpios = <&gpio0 0 1>;
+- linux,code = <0x198>;
+- };
+-
+- recovery {
+- label = "recovery";
+- gpios = <&gpio0 4 1>;
+- linux,code = <0xab>;
+- };
+- };
+-
+- leds {
+- compatible = "gpio-leds";
+-
+- a0 {
+- label = "activity0";
+- gpios = <&gpio0 25 0>;
+- default-state = "keep";
+- };
+-
+- a1 {
+- label = "activity1";
+- gpios = <&gpio0 26 0>;
+- default-state = "keep";
+- };
+-
+- a2 {
+- label = "activity2";
+- gpios = <&gpio0 5 0>;
+- default-state = "keep";
+- };
+-
+- a3 {
+- label = "activity3";
+- gpios = <&gpio0 6 0>;
+- default-state = "keep";
+- };
+-
+- a4 {
+- label = "activity4";
+- gpios = <&gpio0 7 0>;
+- default-state = "keep";
+- };
+-
+- a5 {
+- label = "activity5";
+- gpios = <&gpio1 2 0>;
+- default-state = "keep";
+- };
+- };
+-
+- i2c-gpio {
+- compatible = "i2c-gpio";
+- gpios = <&gpio0 3 0 /* sda */
+- &gpio0 2 0 /* scl */
+- >;
+- i2c-gpio,delay-us = <2>; /* ~100 kHz */
+- #address-cells = <1>;
+- #size-cells = <0>;
+-
+- rtc0: rtc@48 {
+- compatible = "st,m41t00";
+- reg = <0x68>;
+- };
+- };
+-};
+-
+-&uart1 {
+- status = "okay";
+-
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_uart1>;
+-};
diff --git a/target/linux/oxnas/patches-4.14/0002-MAINTAINERS-update-ARM-OXNAS-platform-support-patter.patch b/target/linux/oxnas/patches-4.14/0002-MAINTAINERS-update-ARM-OXNAS-platform-support-patter.patch
index 66dacabbd7..44e1d03511 100644
--- a/target/linux/oxnas/patches-4.14/0002-MAINTAINERS-update-ARM-OXNAS-platform-support-patter.patch
+++ b/target/linux/oxnas/patches-4.14/0002-MAINTAINERS-update-ARM-OXNAS-platform-support-patter.patch
@@ -19,11 +19,9 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
MAINTAINERS | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 546beb6b0176..6ecdaed0a3ef 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -1677,9 +1677,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+@@ -1677,9 +1677,7 @@ L: linux-arm-kernel@lists.infradead.org
L: linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)
S: Maintained
F: arch/arm/mach-oxnas/
@@ -34,6 +32,3 @@ index 546beb6b0176..6ecdaed0a3ef 100644
N: oxnas
ARM/PALM TREO SUPPORT
---
-2.17.1
-
diff --git a/target/linux/oxnas/patches-4.14/0003-ARM-configs-add-OXNAS-v6-defconfig.patch b/target/linux/oxnas/patches-4.14/0003-ARM-configs-add-OXNAS-v6-defconfig.patch
index bc4bc369da..be9f1ecace 100644
--- a/target/linux/oxnas/patches-4.14/0003-ARM-configs-add-OXNAS-v6-defconfig.patch
+++ b/target/linux/oxnas/patches-4.14/0003-ARM-configs-add-OXNAS-v6-defconfig.patch
@@ -13,9 +13,6 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 file changed, 93 insertions(+)
create mode 100644 arch/arm/configs/oxnas_v6_defconfig
-diff --git a/arch/arm/configs/oxnas_v6_defconfig b/arch/arm/configs/oxnas_v6_defconfig
-new file mode 100644
-index 000000000000..f6ba32c9d173
--- /dev/null
+++ b/arch/arm/configs/oxnas_v6_defconfig
@@ -0,0 +1,93 @@
@@ -112,6 +109,3 @@ index 000000000000..f6ba32c9d173
+CONFIG_NLS_UTF8=y
+CONFIG_PRINTK_TIME=y
+CONFIG_MAGIC_SYSRQ=y
---
-2.17.1
-
diff --git a/target/linux/oxnas/patches-4.14/050-ox820-remove-left-overs.patch b/target/linux/oxnas/patches-4.14/050-ox820-remove-left-overs.patch
index 6dd3b056cf..ad0df9199b 100644
--- a/target/linux/oxnas/patches-4.14/050-ox820-remove-left-overs.patch
+++ b/target/linux/oxnas/patches-4.14/050-ox820-remove-left-overs.patch
@@ -9,8 +9,6 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
include/dt-bindings/clock/oxsemi,ox820.h | 32 +++++++++++-------------
2 files changed, 14 insertions(+), 20 deletions(-)
-diff --git a/drivers/clk/clk-oxnas.c b/drivers/clk/clk-oxnas.c
-index e51e0023fc6e..da6af71649de 100644
--- a/drivers/clk/clk-oxnas.c
+++ b/drivers/clk/clk-oxnas.c
@@ -40,8 +40,6 @@ struct oxnas_stdclk_data {
@@ -22,8 +20,6 @@ index e51e0023fc6e..da6af71649de 100644
};
/* Regmap offsets */
-diff --git a/include/dt-bindings/clock/oxsemi,ox820.h b/include/dt-bindings/clock/oxsemi,ox820.h
-index f661ecc8d760..35b44ca1b104 100644
--- a/include/dt-bindings/clock/oxsemi,ox820.h
+++ b/include/dt-bindings/clock/oxsemi,ox820.h
@@ -17,24 +17,20 @@
@@ -65,6 +61,3 @@ index f661ecc8d760..35b44ca1b104 100644
+#define CLK_820_USBDEV 13
#endif /* DT_CLOCK_OXSEMI_OX820_H */
---
-2.17.1
-
diff --git a/target/linux/oxnas/patches-4.14/100-oxnas-clk-plla-pllb.patch b/target/linux/oxnas/patches-4.14/100-oxnas-clk-plla-pllb.patch
index f78ecb26b2..d3bf9a9e43 100644
--- a/target/linux/oxnas/patches-4.14/100-oxnas-clk-plla-pllb.patch
+++ b/target/linux/oxnas/patches-4.14/100-oxnas-clk-plla-pllb.patch
@@ -43,7 +43,7 @@
/* Standard regmap gate clocks */
struct clk_oxnas_gate {
struct clk_hw hw;
-@@ -49,6 +70,135 @@ struct oxnas_stdclk_data {
+@@ -47,6 +70,135 @@ struct oxnas_stdclk_data {
#define CLK_SET_REGOFFSET 0x2c
#define CLK_CLR_REGOFFSET 0x30
@@ -179,7 +179,7 @@
static inline struct clk_oxnas_gate *to_clk_oxnas_gate(struct clk_hw *hw)
{
return container_of(hw, struct clk_oxnas_gate, hw);
-@@ -262,3 +412,42 @@ static struct platform_driver oxnas_stdc
+@@ -260,3 +412,42 @@ static struct platform_driver oxnas_stdc
},
};
builtin_platform_driver(oxnas_stdclk_driver);
diff --git a/target/linux/oxnas/patches-4.14/340-oxnas-pcie.patch b/target/linux/oxnas/patches-4.14/340-oxnas-pcie.patch
index b1ae62b7af..4681888da0 100644
--- a/target/linux/oxnas/patches-4.14/340-oxnas-pcie.patch
+++ b/target/linux/oxnas/patches-4.14/340-oxnas-pcie.patch
@@ -22,7 +22,7 @@
--- a/arch/arm/boot/dts/ox820.dtsi
+++ b/arch/arm/boot/dts/ox820.dtsi
-@@ -302,6 +302,83 @@
+@@ -307,6 +307,83 @@
reg = <0x1000 0x1000>,
<0x100 0x500>;
};
diff --git a/target/linux/oxnas/patches-4.14/500-oxnas-sata.patch b/target/linux/oxnas/patches-4.14/500-oxnas-sata.patch
index 3825ef0acb..f79b100a5e 100644
--- a/target/linux/oxnas/patches-4.14/500-oxnas-sata.patch
+++ b/target/linux/oxnas/patches-4.14/500-oxnas-sata.patch
@@ -26,7 +26,7 @@
obj-$(CONFIG_PATA_ALI) += pata_ali.o
--- a/arch/arm/boot/dts/ox820.dtsi
+++ b/arch/arm/boot/dts/ox820.dtsi
-@@ -380,5 +380,20 @@
+@@ -385,5 +385,20 @@
};
};
diff --git a/target/linux/oxnas/patches-4.14/510-ox820-libata-leds.patch b/target/linux/oxnas/patches-4.14/510-ox820-libata-leds.patch
index 7788802887..6d85a046b6 100644
--- a/target/linux/oxnas/patches-4.14/510-ox820-libata-leds.patch
+++ b/target/linux/oxnas/patches-4.14/510-ox820-libata-leds.patch
@@ -1,5 +1,5 @@
---- linux-4.14.44.orig/arch/arm/mach-oxnas/Kconfig
-+++ linux-4.14.44/arch/arm/mach-oxnas/Kconfig
+--- a/arch/arm/mach-oxnas/Kconfig
++++ b/arch/arm/mach-oxnas/Kconfig
@@ -1,6 +1,7 @@
menuconfig ARCH_OXNAS
bool "Oxford Semiconductor OXNAS Family SoCs"
diff --git a/target/linux/oxnas/patches-4.14/800-oxnas-ehci.patch b/target/linux/oxnas/patches-4.14/800-oxnas-ehci.patch
index 8fd6f69c1d..b4e34e5e3f 100644
--- a/target/linux/oxnas/patches-4.14/800-oxnas-ehci.patch
+++ b/target/linux/oxnas/patches-4.14/800-oxnas-ehci.patch
@@ -26,7 +26,7 @@
obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o
--- a/arch/arm/boot/dts/ox820.dtsi
+++ b/arch/arm/boot/dts/ox820.dtsi
-@@ -120,6 +120,22 @@
+@@ -105,6 +105,22 @@
status = "disabled";
};
diff --git a/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch
index 7a4dce7502..85947b1974 100644
--- a/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch
+++ b/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch
@@ -157,7 +157,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
}
--- a/init/main.c
+++ b/init/main.c
-@@ -96,6 +96,10 @@
+@@ -95,6 +95,10 @@
#include <asm/sections.h>
#include <asm/cacheflush.h>
@@ -168,7 +168,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
static int kernel_init(void *);
extern void init_IRQ(void);
-@@ -575,6 +579,18 @@ asmlinkage __visible void __init start_k
+@@ -574,6 +578,18 @@ asmlinkage __visible void __init start_k
page_alloc_init();
pr_notice("Kernel command line: %s\n", boot_command_line);
diff --git a/target/linux/oxnas/patches-4.14/999-libata-hacks.patch b/target/linux/oxnas/patches-4.14/999-libata-hacks.patch
index 2a3ba72184..6d0f231403 100644
--- a/target/linux/oxnas/patches-4.14/999-libata-hacks.patch
+++ b/target/linux/oxnas/patches-4.14/999-libata-hacks.patch
@@ -15,7 +15,7 @@
/* initialize internal qc */
/* XXX: Tag 0 is used for drivers with legacy EH as some
-@@ -5096,6 +5104,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -5127,6 +5135,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (unlikely(ap->pflags & ATA_PFLAG_FROZEN))
return NULL;
@@ -25,7 +25,7 @@
/* libsas case */
if (ap->flags & ATA_FLAG_SAS_HOST) {
tag = ata_sas_allocate_tag(ap);
-@@ -5141,6 +5152,8 @@ void ata_qc_free(struct ata_queued_cmd *
+@@ -5172,6 +5183,8 @@ void ata_qc_free(struct ata_queued_cmd *
qc->tag = ATA_TAG_POISON;
if (ap->flags & ATA_FLAG_SAS_HOST)
ata_sas_free_tag(tag, ap);