diff options
17 files changed, 158 insertions, 125 deletions
diff --git a/libre/linux-libre-lts/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/libre/linux-libre-lts/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch index 8df0c4761..7aaecf303 100644 --- a/libre/linux-libre-lts/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch +++ b/libre/linux-libre-lts/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch @@ -1,4 +1,4 @@ -From e1c642a72eb85ec98e1903f9391fb29076234369 Mon Sep 17 00:00:00 2001 +From ba0f7bad7435de617093d47ac4f0895a71dcee00 Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w@xxxxxx> Date: Sun, 2 Dec 2012 19:59:28 +0100 Subject: [PATCH 01/14] ARM: atags: add support for Marvell's u-boot @@ -47,5 +47,5 @@ index 6b335a9ff8c8..614150b53643 100644 }; -- -2.16.1 +2.18.0 diff --git a/libre/linux-libre-lts/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/libre/linux-libre-lts/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch index 1f782d2b4..67aaf723e 100644 --- a/libre/linux-libre-lts/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch +++ b/libre/linux-libre-lts/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch @@ -1,4 +1,4 @@ -From d52721ca6718ac91256b3073dd6a4749940bc0d3 Mon Sep 17 00:00:00 2001 +From 89b2c1805d92a98ccc424ecad060cb08ba8e6211 Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w@xxxxxx> Date: Sun, 2 Dec 2012 19:56:58 +0100 Subject: [PATCH 02/14] ARM: atags/fdt: retrieve MAC addresses from Marvell @@ -43,5 +43,5 @@ index 41fa7316c52b..807ed160a4b9 100644 } -- -2.16.1 +2.18.0 diff --git a/libre/linux-libre-lts/0003-SMILE-Plug-device-tree-file.patch b/libre/linux-libre-lts/0003-SMILE-Plug-device-tree-file.patch index e6cab4cd4..e1416218a 100644 --- a/libre/linux-libre-lts/0003-SMILE-Plug-device-tree-file.patch +++ b/libre/linux-libre-lts/0003-SMILE-Plug-device-tree-file.patch @@ -1,4 +1,4 @@ -From f8f42603eeec186337ebab563de5b91ae6050de6 Mon Sep 17 00:00:00 2001 +From d441e0ca2b03d5cc7e5034efc6b15b56698b353f Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Fri, 5 Sep 2014 15:41:19 -0600 Subject: [PATCH 03/14] SMILE Plug device tree file @@ -9,15 +9,15 @@ dts with the LED definitions. Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org> --- arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/armada-370-smileplug.dts | 173 +++++++++++++++++++++++++++++ + arch/arm/boot/dts/armada-370-smileplug.dts | 173 +++++++++++++++++++++ 2 files changed, 174 insertions(+) create mode 100644 arch/arm/boot/dts/armada-370-smileplug.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index d0381e9caf21..e142999e7cff 100644 +index 7e2424957809..431a7ca68751 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -1046,6 +1046,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ +@@ -1100,6 +1100,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ armada-370-db.dtb \ armada-370-dlink-dns327l.dtb \ armada-370-mirabox.dtb \ @@ -205,5 +205,5 @@ index 000000000000..d01308ab848b + }; +}; -- -2.16.1 +2.18.0 diff --git a/libre/linux-libre-lts/0004-fix-mvsdio-eMMC-timing.patch b/libre/linux-libre-lts/0004-fix-mvsdio-eMMC-timing.patch index 842dfcd77..965b849b8 100644 --- a/libre/linux-libre-lts/0004-fix-mvsdio-eMMC-timing.patch +++ b/libre/linux-libre-lts/0004-fix-mvsdio-eMMC-timing.patch @@ -1,4 +1,4 @@ -From c6275cb1cf73c56e9c2e74ae7c41abf3b70cb5ae Mon Sep 17 00:00:00 2001 +From 23883cf4470afeb33dc9c171978df76f5470f4f0 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Fri, 5 Sep 2014 15:43:56 -0600 Subject: [PATCH 04/14] fix mvsdio eMMC timing @@ -34,5 +34,5 @@ index 210247b3d11a..1a1802dc9ef4 100644 host->clock = ios->clock; host->ns_per_clk = 1000000000 / (host->base_clock / (m+1)); -- -2.16.1 +2.18.0 diff --git a/libre/linux-libre-lts/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/libre/linux-libre-lts/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index ad19d606d..e90048ad6 100644 --- a/libre/linux-libre-lts/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/libre/linux-libre-lts/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,11 +1,11 @@ -From 0764c77a4c04d9e7d770e62ac6f8edac76a39183 Mon Sep 17 00:00:00 2001 +From b8082b65dc78228d48e693c7bdf9dbe75a2043ff Mon Sep 17 00:00:00 2001 From: popcornmix <popcornmix@gmail.com> Date: Tue, 18 Feb 2014 01:43:50 -0300 Subject: [PATCH 05/14] net/smsc95xx: Allow mac address to be set as a parameter --- - drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ + drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c @@ -92,5 +92,5 @@ index 309b88acd3d0..7bc9feb891a1 100644 /* maybe the boot loader passed the MAC address in devicetree */ -- -2.16.1 +2.18.0 diff --git a/libre/linux-libre-lts/0006-set-default-cubietruck-led-triggers.patch b/libre/linux-libre-lts/0006-set-default-cubietruck-led-triggers.patch index ff270752a..a5a9bcc44 100644 --- a/libre/linux-libre-lts/0006-set-default-cubietruck-led-triggers.patch +++ b/libre/linux-libre-lts/0006-set-default-cubietruck-led-triggers.patch @@ -1,4 +1,4 @@ -From 8049afc8467f9f7fdeb3b7db97e0e8c64805e867 Mon Sep 17 00:00:00 2001 +From 0cf9ae3f97075a40cd14e09c91de0468459c45d3 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sat, 14 Feb 2015 12:32:27 +0100 Subject: [PATCH 06/14] set default cubietruck led triggers @@ -9,7 +9,7 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org> 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -index 8c9bedc602ec..b3a765ba03fd 100644 +index 5649161de1d7..2be64a886555 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts @@ -80,6 +80,7 @@ @@ -29,5 +29,5 @@ index 8c9bedc602ec..b3a765ba03fd 100644 }; -- -2.16.1 +2.18.0 diff --git a/libre/linux-libre-lts/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/libre/linux-libre-lts/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch index a8836586a..e29c41c6c 100644 --- a/libre/linux-libre-lts/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch +++ b/libre/linux-libre-lts/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch @@ -1,4 +1,4 @@ -From fa5e1322788ebe804da87c671b6491b21d143d18 Mon Sep 17 00:00:00 2001 +From 8d59092709da9dc0f852411cb1bad579decd457c Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Thu, 11 Aug 2016 00:42:37 -0600 Subject: [PATCH 07/14] exynos4412-odroid: set higher minimum buck2 regulator @@ -13,10 +13,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi -index a21be71000c1..65cdf0d9c512 100644 +index d7ad07fd48f9..53c31c01713b 100644 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi -@@ -421,7 +421,7 @@ +@@ -418,7 +418,7 @@ buck2_reg: BUCK2 { regulator-name = "vdd_arm"; @@ -26,5 +26,5 @@ index a21be71000c1..65cdf0d9c512 100644 regulator-always-on; regulator-boot-on; -- -2.16.1 +2.18.0 diff --git a/libre/linux-libre-lts/0009-ARM-dove-enable-ethernet-on-D3Plug.patch b/libre/linux-libre-lts/0008-ARM-dove-enable-ethernet-on-D3Plug.patch index a1c658823..8e85907d0 100644 --- a/libre/linux-libre-lts/0009-ARM-dove-enable-ethernet-on-D3Plug.patch +++ b/libre/linux-libre-lts/0008-ARM-dove-enable-ethernet-on-D3Plug.patch @@ -1,7 +1,7 @@ -From 0025f973fdfa0c4409439ee65a4c074241e1d210 Mon Sep 17 00:00:00 2001 +From c26422909f777d60214288dfdb538fa8cf510c5f Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sun, 7 May 2017 13:32:25 -0600 -Subject: [PATCH 09/14] ARM: dove: enable ethernet on D3Plug +Subject: [PATCH 08/14] ARM: dove: enable ethernet on D3Plug Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org> --- @@ -27,5 +27,5 @@ index 826026c28f90..a4c9963e1261 100644 /* Samsung M8G2F eMMC */ &sdio0 { -- -2.16.1 +2.18.0 diff --git a/libre/linux-libre-lts/0008-disable-USB3-port-on-ODROID-XU.patch b/libre/linux-libre-lts/0008-disable-USB3-port-on-ODROID-XU.patch deleted file mode 100644 index 868d3d5f1..000000000 --- a/libre/linux-libre-lts/0008-disable-USB3-port-on-ODROID-XU.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f9e3db4a1d7ec8578be2012ca727c8a2259f8de8 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich <kevin@archlinuxarm.org> -Date: Sat, 25 Feb 2017 19:39:51 -0700 -Subject: [PATCH 08/14] disable USB3 port on ODROID-XU - -Ports report over-current condition and are non-operable. - -Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org> ---- - arch/arm/boot/dts/exynos5410-odroidxu.dts | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts -index a45eaae33f8f..7f7de094724e 100644 ---- a/arch/arm/boot/dts/exynos5410-odroidxu.dts -+++ b/arch/arm/boot/dts/exynos5410-odroidxu.dts -@@ -630,6 +630,7 @@ - - &usbdrd_dwc3_0 { - dr_mode = "host"; -+ status = "disabled"; - }; - - &usbdrd_dwc3_1 { --- -2.16.1 - diff --git a/libre/linux-libre-lts/0010-power-add-power-sequence-library.patch b/libre/linux-libre-lts/0009-power-add-power-sequence-library.patch index 74d8a615d..e2dbaf12b 100644 --- a/libre/linux-libre-lts/0010-power-add-power-sequence-library.patch +++ b/libre/linux-libre-lts/0009-power-add-power-sequence-library.patch @@ -1,7 +1,7 @@ -From c63f0d2231c841534a30c60db102ad9afc835994 Mon Sep 17 00:00:00 2001 +From ce6183d0a8a9aea1a1d9acc9a85a05d73e741023 Mon Sep 17 00:00:00 2001 From: Peter Chen <peter.chen@nxp.com> Date: Wed, 21 Jun 2017 14:42:03 +0800 -Subject: [PATCH 10/14] power: add power sequence library +Subject: [PATCH 09/14] power: add power sequence library We have an well-known problem that the device needs to do some power sequence before it can be recognized by related host, the typical @@ -31,15 +31,15 @@ Tested-by Joshua Clayton <stillcompiling@gmail.com> Reviewed-by: Matthias Kaehlcke <mka@chromium.org> Tested-by: Matthias Kaehlcke <mka@chromium.org> --- - Documentation/power/power-sequence/design.rst | 54 +++++ + Documentation/power/power-sequence/design.rst | 54 ++++ MAINTAINERS | 9 + drivers/power/Kconfig | 1 + drivers/power/Makefile | 1 + drivers/power/pwrseq/Kconfig | 20 ++ drivers/power/pwrseq/Makefile | 2 + - drivers/power/pwrseq/core.c | 293 ++++++++++++++++++++++++++ - drivers/power/pwrseq/pwrseq_generic.c | 210 ++++++++++++++++++ - include/linux/power/pwrseq.h | 84 ++++++++ + drivers/power/pwrseq/core.c | 293 ++++++++++++++++++ + drivers/power/pwrseq/pwrseq_generic.c | 210 +++++++++++++ + include/linux/power/pwrseq.h | 84 +++++ 9 files changed, 674 insertions(+) create mode 100644 Documentation/power/power-sequence/design.rst create mode 100644 drivers/power/pwrseq/Kconfig @@ -109,10 +109,10 @@ index 000000000000..554608e5f3b6 +.. kernel-doc:: drivers/power/pwrseq/core.c + :export: diff --git a/MAINTAINERS b/MAINTAINERS -index 845fc25812f1..c0925efb554c 100644 +index 9c125f705f78..31042fc6c400 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -10898,6 +10898,15 @@ F: drivers/firmware/psci*.c +@@ -11247,6 +11247,15 @@ F: drivers/firmware/psci*.c F: include/linux/psci.h F: include/uapi/linux/psci.h @@ -786,5 +786,5 @@ index 000000000000..c5b278f5f2ae + +#endif /* __LINUX_PWRSEQ_H */ -- -2.16.1 +2.18.0 diff --git a/libre/linux-libre-lts/0011-usb-core-add-power-sequence-handling-for-USB-devices.patch b/libre/linux-libre-lts/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch index ac86e626d..5737cac20 100644 --- a/libre/linux-libre-lts/0011-usb-core-add-power-sequence-handling-for-USB-devices.patch +++ b/libre/linux-libre-lts/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch @@ -1,7 +1,7 @@ -From 292560a839e5622bf2e071c1afe54bdb34209516 Mon Sep 17 00:00:00 2001 +From 5b874f0a1f92812bc797c01fa558f0ab4ed338ae Mon Sep 17 00:00:00 2001 From: Peter Chen <peter.chen@nxp.com> Date: Wed, 21 Jun 2017 14:42:05 +0800 -Subject: [PATCH 11/14] usb: core: add power sequence handling for USB devices +Subject: [PATCH 10/14] usb: core: add power sequence handling for USB devices Some hard-wired USB devices need to do power sequence to let the device work normally, the typical power sequence like: enable USB @@ -22,15 +22,15 @@ Reviewed-by: Vaibhav Hiremath <hvaibhav.linux@gmail.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> --- drivers/usb/Kconfig | 1 + - drivers/usb/core/hub.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- + drivers/usb/core/hub.c | 49 ++++++++++++++++++++++++++++++++++++++---- drivers/usb/core/hub.h | 1 + 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig -index f699abab1787..67316ba6a84c 100644 +index 987fc5ba6321..bd09fc8ff763 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig -@@ -39,6 +39,7 @@ config USB +@@ -45,6 +45,7 @@ config USB tristate "Support for Host-side USB" depends on USB_ARCH_HAS_HCD select USB_COMMON @@ -39,7 +39,7 @@ index f699abab1787..67316ba6a84c 100644 ---help--- Universal Serial Bus (USB) is a specification for a serial bus diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index cf7bbcb9a63c..34f249f73757 100644 +index e3bf65e213cd..f6a739bbe754 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -28,6 +28,7 @@ @@ -50,7 +50,7 @@ index cf7bbcb9a63c..34f249f73757 100644 #include <linux/uaccess.h> #include <asm/byteorder.h> -@@ -1634,6 +1635,7 @@ static void hub_disconnect(struct usb_interface *intf) +@@ -1654,6 +1655,7 @@ static void hub_disconnect(struct usb_interface *intf) hub->error = 0; hub_quiesce(hub, HUB_DISCONNECT); @@ -58,7 +58,7 @@ index cf7bbcb9a63c..34f249f73757 100644 mutex_lock(&usb_port_peer_mutex); /* Avoid races with recursively_mark_NOTATTACHED() */ -@@ -1680,11 +1682,41 @@ static bool hub_descriptor_is_sane(struct usb_host_interface *desc) +@@ -1700,11 +1702,41 @@ static bool hub_descriptor_is_sane(struct usb_host_interface *desc) return true; } @@ -100,7 +100,7 @@ index cf7bbcb9a63c..34f249f73757 100644 desc = intf->cur_altsetting; hdev = interface_to_usbdev(intf); -@@ -1775,6 +1807,7 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) +@@ -1795,6 +1827,7 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) INIT_DELAYED_WORK(&hub->leds, led_work); INIT_DELAYED_WORK(&hub->init_work, NULL); INIT_WORK(&hub->events, hub_event); @@ -108,7 +108,7 @@ index cf7bbcb9a63c..34f249f73757 100644 usb_get_intf(intf); usb_get_dev(hdev); -@@ -1788,11 +1821,14 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) +@@ -1808,11 +1841,14 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) if (id->driver_info & HUB_QUIRK_CHECK_PORT_AUTOSUSPEND) hub->quirk_check_port_auto_suspend = 1; @@ -126,7 +126,7 @@ index cf7bbcb9a63c..34f249f73757 100644 } static int -@@ -3606,14 +3642,19 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg) +@@ -3633,14 +3669,19 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg) /* stop hub_wq and related activity */ hub_quiesce(hub, HUB_SUSPEND); @@ -148,7 +148,7 @@ index cf7bbcb9a63c..34f249f73757 100644 return 0; } diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h -index 2a700ccc868c..3a0e6e6b22b0 100644 +index 4dc769ee9c74..b5d5c4818f90 100644 --- a/drivers/usb/core/hub.h +++ b/drivers/usb/core/hub.h @@ -70,6 +70,7 @@ struct usb_hub { @@ -160,5 +160,5 @@ index 2a700ccc868c..3a0e6e6b22b0 100644 /** -- -2.16.1 +2.18.0 diff --git a/libre/linux-libre-lts/0012-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch b/libre/linux-libre-lts/0011-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch index 9631476bc..7c5261680 100644 --- a/libre/linux-libre-lts/0012-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch +++ b/libre/linux-libre-lts/0011-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch @@ -1,7 +1,7 @@ -From 059a623ab52a9fdaccd7a5d1b189478d5e7a96be Mon Sep 17 00:00:00 2001 +From dd0ec5ddeff7c8435888e7250eb47954740e7e5d Mon Sep 17 00:00:00 2001 From: Joshua Clayton <stillcompiling@gmail.com> Date: Wed, 21 Jun 2017 14:42:06 +0800 -Subject: [PATCH 12/14] ARM: dts: imx6qdl: Enable usb node children with <reg> +Subject: [PATCH 11/14] ARM: dts: imx6qdl: Enable usb node children with <reg> Give usb nodes #address and #size attributes, so that a child node representing a permanently connected device such as an onboard hub may @@ -14,10 +14,10 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com> 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi -index 1ce4eabf0590..3ff1ada590d1 100644 +index c003e62bf290..7ffd2f1f769e 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi -@@ -969,6 +969,8 @@ +@@ -983,6 +983,8 @@ usbh1: usb@2184200 { compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; @@ -26,7 +26,7 @@ index 1ce4eabf0590..3ff1ada590d1 100644 reg = <0x02184200 0x200>; interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_USBOH3>; -@@ -983,6 +985,8 @@ +@@ -997,6 +999,8 @@ usbh2: usb@2184400 { compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; @@ -35,7 +35,7 @@ index 1ce4eabf0590..3ff1ada590d1 100644 reg = <0x02184400 0x200>; interrupts = <0 41 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_USBOH3>; -@@ -996,6 +1000,8 @@ +@@ -1010,6 +1014,8 @@ usbh3: usb@2184600 { compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; @@ -45,5 +45,5 @@ index 1ce4eabf0590..3ff1ada590d1 100644 interrupts = <0 42 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_USBOH3>; -- -2.16.1 +2.18.0 diff --git a/libre/linux-libre-lts/0013-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch b/libre/linux-libre-lts/0012-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch index 8e8a085c9..606b49708 100644 --- a/libre/linux-libre-lts/0013-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch +++ b/libre/linux-libre-lts/0012-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch @@ -1,7 +1,7 @@ -From 74bb546b27536c3f9bdd16080a915d98e8c1667f Mon Sep 17 00:00:00 2001 +From 01dea63eabb838525a193c32526791f6880c2b79 Mon Sep 17 00:00:00 2001 From: Peter Chen <peter.chen@nxp.com> Date: Wed, 21 Jun 2017 14:42:07 +0800 -Subject: [PATCH 13/14] ARM: dts: imx6qdl-udoo.dtsi: fix onboard USB HUB +Subject: [PATCH 12/14] ARM: dts: imx6qdl-udoo.dtsi: fix onboard USB HUB property The current dts describes USB HUB's property at USB controller's @@ -17,7 +17,7 @@ Tested-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-udoo.dtsi b/arch/arm/boot/dts/imx6qdl-udoo.dtsi -index c96c91d83678..a173de20ee73 100644 +index 906387915dc5..d3cc0b666e0d 100644 --- a/arch/arm/boot/dts/imx6qdl-udoo.dtsi +++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi @@ -9,6 +9,8 @@ @@ -29,7 +29,7 @@ index c96c91d83678..a173de20ee73 100644 / { aliases { backlight = &backlight; -@@ -58,17 +60,6 @@ +@@ -65,17 +67,6 @@ #address-cells = <1>; #size-cells = <0>; @@ -47,7 +47,7 @@ index c96c91d83678..a173de20ee73 100644 reg_panel: regulator@1 { compatible = "regulator-fixed"; reg = <1>; -@@ -188,7 +179,7 @@ +@@ -201,7 +192,7 @@ pinctrl_usbh: usbhgrp { fsl,pins = < @@ -56,7 +56,7 @@ index c96c91d83678..a173de20ee73 100644 MX6QDL_PAD_NANDF_CS2__CCM_CLKO2 0x130b0 >; }; -@@ -259,9 +250,16 @@ +@@ -272,9 +263,16 @@ &usbh1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usbh>; @@ -76,5 +76,5 @@ index c96c91d83678..a173de20ee73 100644 &usdhc3 { -- -2.16.1 +2.18.0 diff --git a/libre/linux-libre-lts/0014-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch b/libre/linux-libre-lts/0013-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch index dbc7fce01..0eaf2c470 100644 --- a/libre/linux-libre-lts/0014-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch +++ b/libre/linux-libre-lts/0013-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch @@ -1,7 +1,7 @@ -From 47a3451ea61bc01753f71acfc011738f8681dc53 Mon Sep 17 00:00:00 2001 +From 29a513109fa45d1039d7f52aacb3fc4a188e60d4 Mon Sep 17 00:00:00 2001 From: Joshua Clayton <stillcompiling@gmail.com> Date: Wed, 21 Jun 2017 14:42:08 +0800 -Subject: [PATCH 14/14] ARM: dts: imx6q-evi: Fix onboard hub reset line +Subject: [PATCH 13/14] ARM: dts: imx6q-evi: Fix onboard hub reset line Previously the onboard hub was made to work by treating its reset gpio as a regulator enable. @@ -15,7 +15,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com> 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-evi.dts b/arch/arm/boot/dts/imx6q-evi.dts -index e0aea782c666..6f3afffc8faa 100644 +index fcd257bc5ac3..d32fa81bba95 100644 --- a/arch/arm/boot/dts/imx6q-evi.dts +++ b/arch/arm/boot/dts/imx6q-evi.dts @@ -54,18 +54,6 @@ @@ -70,5 +70,5 @@ index e0aea782c666..6f3afffc8faa 100644 >; }; -- -2.16.1 +2.18.0 diff --git a/libre/linux-libre-lts/0014-ARM-mvebu-declare-asm-symbols-as-character-arrays-in.patch b/libre/linux-libre-lts/0014-ARM-mvebu-declare-asm-symbols-as-character-arrays-in.patch new file mode 100644 index 000000000..8dbde1ca0 --- /dev/null +++ b/libre/linux-libre-lts/0014-ARM-mvebu-declare-asm-symbols-as-character-arrays-in.patch @@ -0,0 +1,61 @@ +From ac139b06e1b309c605c65cea2d547cbba4ae5370 Mon Sep 17 00:00:00 2001 +From: Ethan Tuttle <ethan@ethantuttle.com> +Date: Tue, 19 Jun 2018 21:31:08 -0700 +Subject: [PATCH 14/14] ARM: mvebu: declare asm symbols as character arrays in + pmsu.c + +With CONFIG_FORTIFY_SOURCE, memcpy uses the declared size of operands to +detect buffer overflows. If src or dest is declared as a char, attempts to +copy more than byte will result in a fortify_panic(). + +Address this problem in mvebu_setup_boot_addr_wa() by declaring +mvebu_boot_wa_start and mvebu_boot_wa_end as character arrays. Also remove +a couple addressof operators to avoid "arithmetic on pointer to an +incomplete type" compiler error. + +See commit 54a7d50b9205 ("x86: mark kprobe templates as character arrays, +not single characters") for a similar fix. + +Fixes "detected buffer overflow in memcpy" error during init on some mvebu +systems (armada-370-xp, armada-375): + +(fortify_panic) from (mvebu_setup_boot_addr_wa+0xb0/0xb4) +(mvebu_setup_boot_addr_wa) from (mvebu_v7_cpu_pm_init+0x154/0x204) +(mvebu_v7_cpu_pm_init) from (do_one_initcall+0x7c/0x1a8) +(do_one_initcall) from (kernel_init_freeable+0x1bc/0x254) +(kernel_init_freeable) from (kernel_init+0x8/0x114) +(kernel_init) from (ret_from_fork+0x14/0x2c) + +Signed-off-by: Ethan Tuttle <ethan@ethantuttle.com> +Tested-by: Ethan Tuttle <ethan@ethantuttle.com> +--- + arch/arm/mach-mvebu/pmsu.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-mvebu/pmsu.c b/arch/arm/mach-mvebu/pmsu.c +index 27a78c80e5b1..73d5d72dfc3e 100644 +--- a/arch/arm/mach-mvebu/pmsu.c ++++ b/arch/arm/mach-mvebu/pmsu.c +@@ -116,8 +116,8 @@ void mvebu_pmsu_set_cpu_boot_addr(int hw_cpu, void *boot_addr) + PMSU_BOOT_ADDR_REDIRECT_OFFSET(hw_cpu)); + } + +-extern unsigned char mvebu_boot_wa_start; +-extern unsigned char mvebu_boot_wa_end; ++extern unsigned char mvebu_boot_wa_start[]; ++extern unsigned char mvebu_boot_wa_end[]; + + /* + * This function sets up the boot address workaround needed for SMP +@@ -130,7 +130,7 @@ int mvebu_setup_boot_addr_wa(unsigned int crypto_eng_target, + phys_addr_t resume_addr_reg) + { + void __iomem *sram_virt_base; +- u32 code_len = &mvebu_boot_wa_end - &mvebu_boot_wa_start; ++ u32 code_len = mvebu_boot_wa_end - mvebu_boot_wa_start; + + mvebu_mbus_del_window(BOOTROM_BASE, BOOTROM_SIZE); + mvebu_mbus_add_window_by_id(crypto_eng_target, crypto_eng_attribute, +-- +2.18.0 + diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index a966e4a34..ce96286ae 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -12,7 +12,7 @@ pkgbase=linux-libre-lts _pkgbasever=4.14-gnu -_pkgver=4.14.52-gnu +_pkgver=4.14.55-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -49,13 +49,13 @@ source=( '0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch' '0006-set-default-cubietruck-led-triggers.patch' '0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch' - '0008-disable-USB3-port-on-ODROID-XU.patch' - '0009-ARM-dove-enable-ethernet-on-D3Plug.patch' - '0010-power-add-power-sequence-library.patch' - '0011-usb-core-add-power-sequence-handling-for-USB-devices.patch' - '0012-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch' - '0013-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch' - '0014-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch' + '0008-ARM-dove-enable-ethernet-on-D3Plug.patch' + '0009-power-add-power-sequence-library.patch' + '0010-usb-core-add-power-sequence-handling-for-USB-devices.patch' + '0011-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch' + '0012-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch' + '0013-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch' + '0014-ARM-mvebu-declare-asm-symbols-as-character-arrays-in.patch' # other patches '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch' '0002-fix-Atmel-maXTouch-touchscreen-support.patch' @@ -68,7 +68,7 @@ validpgpkeys=( ) sha512sums=('0d4b0b8ec1ffc39c59295adf56f6a2cccf77cad56d8a8bf8072624bbb52ba3e684147ebed91d1528d2685423dd784c5fca0f3650f874f2b93cfc6b7689b9a87f' 'SKIP' - 'd143a0b1fd687f8a240cf480b784d7ae3082c6bb0eefaf00944bcb1598df4dd26dea252082982c0be22cc7e99c8ef968d18d992d3ef5ddd3f906e7465451bf8c' + 'eb2177160a41d204e1116a2d82b85a053f44241823926b243ff7e778dc142c6d8e1e208256c6df5f2c569591d1d938c7e1e61a1e970e258a644c09d513ac2ba1' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -78,26 +78,26 @@ sha512sums=('0d4b0b8ec1ffc39c59295adf56f6a2cccf77cad56d8a8bf8072624bbb52ba3e6841 'SKIP' 'bfc139818a618bd53c7321910c524229556a235b9400bf57d8d77d29fcb6e31bc56d71fc6ea5d10cbc5564f763f48a14e67dd924ea637f7dc3265e9cc756bb03' '7126904b54a8622a488a0d2f667b3ff36761d8c43f943b058875f19c4b673a2c5c6afc80f4d3a7bfa88497d117d11a68d80ee8d482bb503c7886a7c549aa1cd2' - '47aaf101bea1d248b0b02687b4ec02279666c61d51341ba35f324a613c1ac88f7b3f41d77a09a77b165fca351d020633e82b22d6df2b246eaaa7aa13bab9ccaa' + '23c4664b5ba260b10ea148be239dd132e0fa60bef745cb80968506ad326bc0768895f64cf012815686790b09e648f969993d9d1d821c51dd7ec2d9af0bac332c' '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a' '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44' '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' - '8f5fe2da45ff82207a2348177b7e8280ad3e4950ee3d828b6b0a235b51a0faac54235d18fde83caaef7163d9bc15ec1daf331271d269b31df44e11080a800c67' + 'e6e608e7ec0dd3ec82792875f3318cfbd83ad7bad0af51eb15aabff895d8835cc7613d6d2352525fda928929059059440da7cbe8847e58d5ec80b8a8a9313aff' 'SKIP' - 'ba44aa1252aa1b172e0bc8bbbff864ff60cad6739b2aed2f6a2402848aa65cdb8a8ca6bb9341569b089d60dfd83c3bdd744b5810061ac76b19f0d337afe4cc8d' - '738bc2874351d9e1b94319e6caf615b49753155c99dc9318a1ce9eced50f87627a7331762951f55e2bea8abdb97b80a617a08f3f0bc735e56ff831a8bbb19816' - 'f45d8d417eb3f4b6e02e337480bd99a8ebb4b9ac004c53a5432255e5841578fb64530663b6eacb3c8f40aaade8e1dc1e584aa1cf4b560103119e4b32e19b66c3' - '25ee5d9859d3df2d054fd6d53fe6b8931d6ac9f85533c54f3dd926fce917c81bd96cb3858189a20cf28a32b43efd1566cb5513f7db18a0bb8ead1a4e8a7be6fc' - 'a1aa8272760da0c8d2772cc8a57d8600f08db176206afd2a155055d2969bf0295f342a156841964a07de53fbf0356385b604ad75e5556569872dfad1863b2c27' - 'b58efc374344d10290371f3dfe8a124f855015d3ce169ccf538e6c1476092abf7ac689f0f10fb6a191fa19545b49ce13957ada066b37415f37dd5989ff93db37' - 'd2326e2e3ef6f2f5e911e6ad2fc3ac33b6f53fc5bb03e61d0e8371e6c7199028b226356926472ba676ca68a6cc57d33856c662615ed5b52566570670d0f96c89' - 'bc47549f2a79a79659d4d53f739e091c1e8f54cef8c1776be2034675cbb43f584a128607b1d4dd6a9f465706bb1470c6cb4277877dd3218e7280f503babf8300' - 'd90f3a3b74d65b84c4c2c229d10d2bb854e39e3429ba1469f8bb286819d559c68e00302de2be5043cf274b39a58686dc822c60afe1c553c4c967ef168d98af05' - '0c1a4334fcb4e75d25ec43873275b2f8a599a096b05a51ef2f9d48f3c8425a153f5f0df775e030e61b792f8b34e9c848229028fb6d2411f85028441826951dd5' - '0ccccf4411df6b86486b14e9354bf48355a2dc5bfefce693c5afc1a340db6f9db525a0306897ccbb5ed80304fa38ef13f32355cfeee1c9b684db0a9c0063d5c1' - '1a491eab1b07e9fb0b8a8dba4ef17d658c85106e7f62f3a37c34513aa9cd50b4bbb273aa445380f2e2135adea68c7102718e71bf2c9f4d3a5c24515620606605' - '9ae97a7f29323542d70576e8800e2090a69a43caee3182a453e80c3c3265d6cc04e2b5701e5d24d8a2717e29272950231b7e477aa32d69c7333c083626fc6802' - '9b8829fd9bf6c91e5c9e21184c7f57b22d786c20a15512e91cc75890a5d08a633df555973b29f2da9a7d9b965abd0c76ecdefa5498217837389ad1d0be0fb754' + 'c6e758931e599199db07276a51b204a4030e0da80f08df60783278cf3d4d3ee6c0c280cc1788ca024cdf2043a39dd527e2205dd678368097b68240a7e80b931c' + '3e0852e188549e60fa35b70e82740d5124936688d5f5ff0314c4e555ad9cc4c7688c56b5949baa8fd67ede22a579019919b09091b59eafac60409fdf18105af5' + 'f80538cfb1af660a3dc2a8bf31ada1132d24d81064b347419d221417ad8e0e949431ef277b22fee771b6f9d43abf47d3e6a92ce4f5928a6cc4f25f0b628ba02a' + 'e09ef9f021515474d41a3cb3d11b88a133db012b322a604cc6597b675d9b98c96dbd5cc447426f053bcb00598d640f9ba0651d1496762cf39ee3f698b03b0416' + 'f0573b49e4184ddcac6e273c46a63439dfcea7ca0b7a232bf35fb22979bf593fdb18f6dbe243505a22dd94b465c22f2a92cab13d159d76aa330f9a4cf3f17971' + '56f20c4f0683e9a2d0936fe0669449485043431d8b77fcbdec30bad88349db8ed7d1286af5f3ad4732561533e716b0df6faa094d7a5b9a84acfea756d3139ac0' + 'a5f73c34912393bdf49cde6dd4e99d16f6a95a267e9384a5bc33633d89a0669a3dac49fdf3efb43aa0e477d520fcb577d826f3a2907f11d1d7584ca9e2d90faa' + '155b2b44d320a2605473c95ffb6664ba34ba806f8e53f951f2471adb45f0f6e18f04e409b31620c4fa096090916a4f1af69a3d7e467395a2845d4c0657927891' + '9b6f5fbc5738e1d83caad3328d2cc9bfc7e60a1a09a9eaaffb739952e13f630c029bb3472f7b4385fa52bd6953fd7e7492a44258d5b4baf30f81c99c71965b9a' + 'd32f7808c35cb58d7218c4cfe42d0967ee0975346827580b3fd34c1a45a975560b276cec909954d27a6feff23f4364b8a802501a03f46ac8e6b61f16910cb784' + 'b6b39a2fdc5963611806d387866edab43eb52c591b05d92e0ed887657d43383ddfc2e088b7063bd6586ff872203fdbf0348fecc2c1f673134a8cc5112a1d4179' + '79da6491df96d8bc13edc2bd071b8859a7f915a72244992869e3be44c3118fd3421d9fff4fe6c858895ad8c19dcc02d8d3b458dc6f3efbae3120693708af31b4' + '1d0626f6e95ffe71dbbf281167d312a8acfc300930b39e80ef7771a2b65091e974e2ec703d463d8fc16d36472f5f5deb28b77d854c0e96685d31e42040d18f6d' + 'a4d72cdcddc3f43f27e0d415e1d8ce45bc552ee07d29b566cd8128715daf8267f549968434ca6a949b39aed8bbd6b8790f65f7f4641d8008d1b856d8f1a8ee94' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' '485f37aca7793cee2361e126bc619e5bfd1737bff484b06bbba76cd326f3845c4d96c17bb9a56623a653b7b7062a698975d6a7f019f5c1a3eb9faf9b352d73f2' @@ -137,13 +137,13 @@ prepare() { patch -p1 -i ../0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch patch -p1 -i ../0006-set-default-cubietruck-led-triggers.patch patch -p1 -i ../0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch - patch -p1 -i ../0008-disable-USB3-port-on-ODROID-XU.patch - patch -p1 -i ../0009-ARM-dove-enable-ethernet-on-D3Plug.patch - patch -p1 -i ../0010-power-add-power-sequence-library.patch - patch -p1 -i ../0011-usb-core-add-power-sequence-handling-for-USB-devices.patch - patch -p1 -i ../0012-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch - patch -p1 -i ../0013-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch - patch -p1 -i ../0014-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch + patch -p1 -i ../0008-ARM-dove-enable-ethernet-on-D3Plug.patch + patch -p1 -i ../0009-power-add-power-sequence-library.patch + patch -p1 -i ../0010-usb-core-add-power-sequence-handling-for-USB-devices.patch + patch -p1 -i ../0011-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch + patch -p1 -i ../0012-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch + patch -p1 -i ../0013-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch + patch -p1 -i ../0014-ARM-mvebu-declare-asm-symbols-as-character-arrays-in.patch fi # add freedo as boot logo diff --git a/libre/linux-libre-lts/config.armv7h b/libre/linux-libre-lts/config.armv7h index 4cbff221e..45413b962 100644 --- a/libre/linux-libre-lts/config.armv7h +++ b/libre/linux-libre-lts/config.armv7h @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.48-gnu-1-lts Kernel Configuration +# Linux/arm 4.14.55-gnu-1-lts Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -6760,7 +6760,6 @@ CONFIG_DMA_ENGINE_RAID=y CONFIG_SYNC_FILE=y # CONFIG_SW_SYNC is not set # CONFIG_AUXDISPLAY is not set -CONFIG_ARM_CHARLCD=y CONFIG_UIO=m CONFIG_UIO_CIF=m CONFIG_UIO_PDRV_GENIRQ=m |