From 962c3c4a6f46a4d52864b603da9f656defbf8654 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso Date: Thu, 17 Mar 2016 18:20:19 +0100 Subject: [PATCH 1/5] [x86] iopl/64: properly context-switch IOPL on Xen PV (CVE-2016-3157) --- debian/changelog | 7 ++ ...operly-context-switch-IOPL-on-Xen-PV.patch | 83 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 91 insertions(+) create mode 100644 debian/patches/bugfix/x86/x86-iopl-64-properly-context-switch-IOPL-on-Xen-PV.patch diff --git a/debian/changelog b/debian/changelog index 796ce6345..a92ba45e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux (4.4.6-2) UNRELEASED; urgency=medium + + [ Salvatore Bonaccorso ] + * [x86] iopl/64: properly context-switch IOPL on Xen PV (CVE-2016-3157) + + -- Salvatore Bonaccorso Thu, 17 Mar 2016 18:19:26 +0100 + linux (4.4.6-1) unstable; urgency=medium [ Salvatore Bonaccorso ] diff --git a/debian/patches/bugfix/x86/x86-iopl-64-properly-context-switch-IOPL-on-Xen-PV.patch b/debian/patches/bugfix/x86/x86-iopl-64-properly-context-switch-IOPL-on-Xen-PV.patch new file mode 100644 index 000000000..3753e7aef --- /dev/null +++ b/debian/patches/bugfix/x86/x86-iopl-64-properly-context-switch-IOPL-on-Xen-PV.patch @@ -0,0 +1,83 @@ +From 91b210501e1bc7518a44d24526f223375bf3d039 Mon Sep 17 00:00:00 2001 +From: Andy Lutomirski +Date: Thu, 17 Mar 2016 17:55:31 +0100 +Origin: http://xenbits.xen.org/xsa/xsa171.patch +Subject: x86/iopl/64: properly context-switch IOPL on Xen PV + +On Xen PV, regs->flags doesn't reliably reflect IOPL and the +exit-to-userspace code doesn't change IOPL. We need to context +switch it manually. + +I'm doing this without going through paravirt because this is +specific to Xen PV. After the dust settles, we can merge this with +the 32-bit code, tidy up the iopl syscall implementation, and remove +the set_iopl pvop entirely. + +This is XSA-171. + +Signed-off-by: Andy Lutomirski +Cc: stable@vger.kernel.org +Reviewed-by: Jan Beulich +--- + arch/x86/include/asm/xen/hypervisor.h | 2 ++ + arch/x86/kernel/process_64.c | 12 ++++++++++++ + arch/x86/xen/enlighten.c | 2 +- + 3 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/arch/x86/include/asm/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h +index 8b2d4be..7b87b3c 100644 +--- a/arch/x86/include/asm/xen/hypervisor.h ++++ b/arch/x86/include/asm/xen/hypervisor.h +@@ -62,4 +62,6 @@ void xen_arch_register_cpu(int num); + void xen_arch_unregister_cpu(int num); + #endif + ++void xen_set_iopl_mask(unsigned mask); ++ + #endif /* _ASM_X86_XEN_HYPERVISOR_H */ +diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c +index e835d26..4cbb60f 100644 +--- a/arch/x86/kernel/process_64.c ++++ b/arch/x86/kernel/process_64.c +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include + + asmlinkage extern void ret_from_fork(void); + +@@ -411,6 +412,17 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) + task_thread_info(prev_p)->flags & _TIF_WORK_CTXSW_PREV)) + __switch_to_xtra(prev_p, next_p, tss); + ++#ifdef CONFIG_XEN ++ /* ++ * On Xen PV, IOPL bits in pt_regs->flags have no effect, and ++ * current_pt_regs()->flags may not match the current task's ++ * intended IOPL. We need to switch it manually. ++ */ ++ if (unlikely(static_cpu_has(X86_FEATURE_XENPV) && ++ prev->iopl != next->iopl)) ++ xen_set_iopl_mask(next->iopl); ++#endif ++ + if (static_cpu_has_bug(X86_BUG_SYSRET_SS_ATTRS)) { + /* + * AMD CPUs have a misfeature: SYSRET sets the SS selector but +diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c +index b7de78b..beab8c7 100644 +--- a/arch/x86/xen/enlighten.c ++++ b/arch/x86/xen/enlighten.c +@@ -961,7 +961,7 @@ static void xen_load_sp0(struct tss_struct *tss, + tss->x86_tss.sp0 = thread->sp0; + } + +-static void xen_set_iopl_mask(unsigned mask) ++void xen_set_iopl_mask(unsigned mask) + { + struct physdev_set_iopl set_iopl; + +-- +2.8.0.rc3 + diff --git a/debian/patches/series b/debian/patches/series index 6f300e254..84c84a15a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -138,3 +138,4 @@ debian/module-fix-abi-change-in-4.4.5.patch bugfix/x86/x86-efi-fix-boot-crash-by-always-mapping-boot-servic.patch bugfix/x86/x86-mm-pat-fix-boot-crash-when-1gb-pages-are-not-supported.patch bugfix/all/netfilter-x_tables-check-for-size-overflow.patch +bugfix/x86/x86-iopl-64-properly-context-switch-IOPL-on-Xen-PV.patch From cea35dbc2dcd7b0bda98da3ad663b4b62812e05d Mon Sep 17 00:00:00 2001 From: Roger Shimizu Date: Thu, 24 Mar 2016 08:21:40 +0900 Subject: [PATCH 2/5] [armel/marvell] Change MTD_CFI_AMDSTD from module to built-in Because orion5x-based Buffalo Linkstation devices still need it (Closes: #818598) --- debian/changelog | 5 +++++ debian/config/armel/config.marvell | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a92ba45e0..6bbfe0e89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ linux (4.4.6-2) UNRELEASED; urgency=medium [ Salvatore Bonaccorso ] * [x86] iopl/64: properly context-switch IOPL on Xen PV (CVE-2016-3157) + [ Roger Shimizu ] + * [armel/marvell] Change MTD_CFI_AMDSTD from module to built-in + because orion5x-based Buffalo Linkstation devices still need it + (Closes: #818598) + -- Salvatore Bonaccorso Thu, 17 Mar 2016 18:19:26 +0100 linux (4.4.6-1) unstable; urgency=medium diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell index 22392dd58..ef7803c7f 100644 --- a/debian/config/armel/config.marvell +++ b/debian/config/armel/config.marvell @@ -373,8 +373,8 @@ CONFIG_MTD_CFI_I4=y # CONFIG_MTD_OTP is not set #. Needed e.g. on QNAP devices CONFIG_MTD_CFI_INTELEXT=y -#. Needed e.g. on the D-Link DNS-323 -CONFIG_MTD_CFI_AMDSTD=m +#. Needed e.g. on D-Link DNS-323, Buffalo KuroBox-Pro, Buffalo Linkstation LS-GL / LS-WTGL, etc +CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_CFI_STAA=m # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set From b1e9b11e7af69837160cb52d3bc74c5cc0179ea7 Mon Sep 17 00:00:00 2001 From: Roger Shimizu Date: Thu, 31 Mar 2016 00:30:03 +0900 Subject: [PATCH 3/5] [armel/marvell] Add DT support for "Synology DS112" and "Zyxel NSA320" Thanks to Heinrich Schuchardt. (Closes: #819393) --- debian/changelog | 2 + ...d-add-kirkwood-ds112.dtb-to-Makefile.patch | 28 +++++++++++++ ...-add-kirkwood-nsa320.dtb-to-Makefile.patch | 28 +++++++++++++ ...od-use-unique-machine-name-for-ds112.patch | 40 +++++++++++++++++++ debian/patches/series | 3 ++ 5 files changed, 101 insertions(+) create mode 100644 debian/patches/features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-ds112.dtb-to-Makefile.patch create mode 100644 debian/patches/features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-nsa320.dtb-to-Makefile.patch create mode 100644 debian/patches/features/arm/device-tree/ARM-dts-kirkwood-use-unique-machine-name-for-ds112.patch diff --git a/debian/changelog b/debian/changelog index 6bbfe0e89..0742ddaa0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ linux (4.4.6-2) UNRELEASED; urgency=medium * [armel/marvell] Change MTD_CFI_AMDSTD from module to built-in because orion5x-based Buffalo Linkstation devices still need it (Closes: #818598) + * [armel/marvell] Add DT support for "Synology DS112" and "Zyxel NSA320". + Thanks to Heinrich Schuchardt. (Closes: #819393) -- Salvatore Bonaccorso Thu, 17 Mar 2016 18:19:26 +0100 diff --git a/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-ds112.dtb-to-Makefile.patch b/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-ds112.dtb-to-Makefile.patch new file mode 100644 index 000000000..e673e898f --- /dev/null +++ b/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-ds112.dtb-to-Makefile.patch @@ -0,0 +1,28 @@ +From: Heinrich Schuchardt +Date: Mon, 28 Mar 2016 10:03:48 +0200 +Subject: [PATCH 1/2] ARM: dts: kirkwood: add kirkwood-ds112.dtb to Makefile +Origin: http://git.infradead.org/linux-mvebu.git/commitdiff/fc5c796e12511a7c027b5a4438719dde2f796208 + +Commit 2d0a7addbd10 ("ARM: Kirkwood: Add support for many Synology +NAS devices") created the new file kirkwood-ds112.dts but did not +add it to the Makefile. + +Fixes: 2d0a7addbd10 ("ARM: Kirkwood: Add support for many Synology NAS devices") +Signed-off-by: Heinrich Schuchardt +Signed-off-by: Gregory CLEMENT +--- + arch/arm/boot/dts/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile +index 95c1923..67d5368 100644 +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -177,6 +177,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ + kirkwood-ds109.dtb \ + kirkwood-ds110jv10.dtb \ + kirkwood-ds111.dtb \ ++ kirkwood-ds112.dtb \ + kirkwood-ds209.dtb \ + kirkwood-ds210.dtb \ + kirkwood-ds212.dtb \ diff --git a/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-nsa320.dtb-to-Makefile.patch b/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-nsa320.dtb-to-Makefile.patch new file mode 100644 index 000000000..c1a160e7d --- /dev/null +++ b/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-nsa320.dtb-to-Makefile.patch @@ -0,0 +1,28 @@ +From: Heinrich Schuchardt +Date: Mon, 28 Mar 2016 10:38:31 +0200 +Subject: [PATCH 2/2] ARM: dts: kirkwood: add kirkwood-nsa320.dtb to Makefile +Origin: http://git.infradead.org/linux-mvebu.git/commitdiff/9ec423ed62b8278412400fae6c064edb6ce1bb51 + +Commit be3d7d023b87 ("ARM: kirkwood: Add DTS file for NSA320") +created the new file kirkwood-nsa320.dts but did not +add it to the Makefile. + +Fixes: be3d7d023b87 ("ARM: kirkwood: Add DTS file for NSA320") +Signed-off-by: Heinrich Schuchardt +Signed-off-by: Gregory CLEMENT +--- + arch/arm/boot/dts/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile +index 67d5368..e9083a9 100644 +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -215,6 +215,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ + kirkwood-ns2mini.dtb \ + kirkwood-nsa310.dtb \ + kirkwood-nsa310a.dtb \ ++ kirkwood-nsa320.dtb \ + kirkwood-openblocks_a6.dtb \ + kirkwood-openblocks_a7.dtb \ + kirkwood-openrd-base.dtb \ diff --git a/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-use-unique-machine-name-for-ds112.patch b/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-use-unique-machine-name-for-ds112.patch new file mode 100644 index 000000000..ccf7796ca --- /dev/null +++ b/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-use-unique-machine-name-for-ds112.patch @@ -0,0 +1,40 @@ +From: Heinrich Schuchardt +Date: Sun, 7 Feb 2016 19:34:26 +0100 +Subject: [PATCH] ARM: dts: kirkwood: use unique machine name for ds112 +Origin: https://git.kernel.org/linus/9d021c9d1b4b774a35d8a03d58dbf029544debda + +Downstream packages like Debian flash-kernel use +/proc/device-tree/model +to determine which dtb file to install. + +Hence each dts in the Linux kernel should provide a unique model +identifier. + +Commit 2d0a7addbd10 ("ARM: Kirkwood: Add support for many Synology NAS +devices") created the new files kirkwood-ds111.dts and kirkwood-ds112.dts +using the same model identifier. + +This patch provides a unique model identifier for the +Synology DiskStation DS112. + +Fixes: 2d0a7addbd10 ("ARM: Kirkwood: Add support for many Synology NAS devices") +Signed-off-by: Heinrich Schuchardt +Reviewed-by: Andrew Lunn +Signed-off-by: Gregory CLEMENT +--- + arch/arm/boot/dts/kirkwood-ds112.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/kirkwood-ds112.dts b/arch/arm/boot/dts/kirkwood-ds112.dts +index bf4143c..b84af3d 100644 +--- a/arch/arm/boot/dts/kirkwood-ds112.dts ++++ b/arch/arm/boot/dts/kirkwood-ds112.dts +@@ -14,7 +14,7 @@ + #include "kirkwood-synology.dtsi" + + / { +- model = "Synology DS111"; ++ model = "Synology DS112"; + compatible = "synology,ds111", "marvell,kirkwood"; + + memory { diff --git a/debian/patches/series b/debian/patches/series index 84c84a15a..c38f87183 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -94,6 +94,9 @@ features/arm/device-tree/ARM-dts-kirkwood-split-lswvl-dts-to-linkstation-lsvl-an features/arm/device-tree/ARM-dts-kirkwood-add-for-buffalo-linkstation-ls-qvl.patch features/arm/device-tree/ARM-dts-orion5x-split-linkstation-lswtgl-into-common-and-.patch features/arm/device-tree/ARM-dts-orion5x-add-for-buffalo-linkstation-ls-gl.patch +features/arm/device-tree/ARM-dts-kirkwood-use-unique-machine-name-for-ds112.patch +features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-ds112.dtb-to-Makefile.patch +features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-nsa320.dtb-to-Makefile.patch features/arm/novena/ARM-dts-imx6q-add-Novena-board.patch features/arm/novena/ARM-dts-imx6q-clean-up-unused-ipu2grp.patch From 5c3489a433f749f45988c11a168af2f403dfa99e Mon Sep 17 00:00:00 2001 From: Roger Shimizu Date: Fri, 8 Apr 2016 08:33:27 +0900 Subject: [PATCH 4/5] [armel/marvell] Add DT support for "Buffalo/Revogear Kurobox Pro" --- debian/changelog | 1 + ...on5x-add-device-tree-for-kurobox-pro.patch | 176 ++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 178 insertions(+) create mode 100644 debian/patches/features/arm/device-tree/ARM-dts-orion5x-add-device-tree-for-kurobox-pro.patch diff --git a/debian/changelog b/debian/changelog index 0742ddaa0..8363d95e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ linux (4.4.6-2) UNRELEASED; urgency=medium (Closes: #818598) * [armel/marvell] Add DT support for "Synology DS112" and "Zyxel NSA320". Thanks to Heinrich Schuchardt. (Closes: #819393) + * [armel/marvell] Add DT support for "Buffalo/Revogear Kurobox Pro" -- Salvatore Bonaccorso Thu, 17 Mar 2016 18:19:26 +0100 diff --git a/debian/patches/features/arm/device-tree/ARM-dts-orion5x-add-device-tree-for-kurobox-pro.patch b/debian/patches/features/arm/device-tree/ARM-dts-orion5x-add-device-tree-for-kurobox-pro.patch new file mode 100644 index 000000000..37bf1a61f --- /dev/null +++ b/debian/patches/features/arm/device-tree/ARM-dts-orion5x-add-device-tree-for-kurobox-pro.patch @@ -0,0 +1,176 @@ +From: Roger Shimizu +Date: Wed, 30 Mar 2016 01:11:45 +0900 +Subject: [PATCH] ARM: dts: orion5x: add device tree for kurobox-pro +Origin: http://git.infradead.org/linux-mvebu.git/commitdiff/452cc94458237d4a26aa1e08f23f57f072368e4e + +Add dts file to support Buffalo/Revogear Kurobox-Pro, which is marvell +orion5x based 3.5" HDD NAS. + +It's a quite old product and already discontinued. So there's no +official website for it. But it was an early product which used marvell +orion5x 88F5182 chipset, it's popular in the community. +Some unofficial site: + - http://buffalo.nas-central.org/wiki/Category:KuroboxPro + - http://nice.kaze.com/KUROPRO_ProductSpecifications.pdf + +This device tree is based on the board file: + arch/arm/mach-orion5x/kurobox_pro-setup.c +However, the probing order of NAND and JEDEC-Flash are different from +the original board file, this results in incompatible minor number +for a few /dev/mtdX and /dev/mtdblockX devices. +So I still want to keep the board file for the time being. + +Signed-off-by: Roger Shimizu +Reviewed-by: Andrew Lunn +Signed-off-by: Gregory CLEMENT +--- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/orion5x-kuroboxpro.dts | 127 +++++++++++++++++++++++++++++++ + 2 files changed, 128 insertions(+) + create mode 100644 arch/arm/boot/dts/orion5x-kuroboxpro.dts + +diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile +index e9083a9..8ec2874 100644 +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -497,6 +497,7 @@ dtb-$(CONFIG_SOC_DRA7XX) += \ + am57xx-beagle-x15.dtb \ + dra72-evm.dtb + dtb-$(CONFIG_ARCH_ORION5X) += \ ++ orion5x-kuroboxpro.dtb \ + orion5x-lacie-d2-network.dtb \ + orion5x-lacie-ethernet-disk-mini-v2.dtb \ + orion5x-linkstation-lsgl.dtb \ +diff --git a/arch/arm/boot/dts/orion5x-kuroboxpro.dts b/arch/arm/boot/dts/orion5x-kuroboxpro.dts +new file mode 100644 +index 0000000..1a672b0 +--- /dev/null ++++ b/arch/arm/boot/dts/orion5x-kuroboxpro.dts +@@ -0,0 +1,127 @@ ++/* ++ * Device Tree file for Buffalo/Revogear Kurobox Pro ++ * ++ * Copyright (C) 2016 ++ * Roger Shimizu ++ * ++ * Based on the board file arch/arm/mach-orion5x/kurobox_pro-setup.c ++ * Copyright (C) Ronen Shitrit ++ * ++ * This file is dual-licensed: you can use it either under the terms ++ * of the GPL or the X11 license, at your option. Note that this dual ++ * licensing only applies to this file, and not this project as a ++ * whole. ++ * ++ * a) This file is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This file is distributed in the hope that it will be useful ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * Or, alternatively ++ * ++ * b) Permission is hereby granted, free of charge, to any person ++ * obtaining a copy of this software and associated documentation ++ * files (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use ++ * copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following ++ * conditions: ++ * ++ * The above copyright notice and this permission notice shall be ++ * included in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES ++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT ++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY ++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++/dts-v1/; ++ ++#include "orion5x-linkstation.dtsi" ++#include ++ ++/ { ++ model = "Buffalo/Revogear Kurobox Pro"; ++ compatible = "buffalo,kurobox-pro", "marvell,orion5x-88f5182", "marvell,orion5x"; ++ ++ soc { ++ ranges = , ++ , ++ , ++ ; ++ }; ++ ++ memory { /* 128 MB */ ++ device_type = "memory"; ++ reg = <0x00000000 0x8000000>; ++ }; ++}; ++ ++&pinctrl { ++ pmx_power_hdd: pmx-power-hdd { ++ marvell,pins = "mpp1"; ++ marvell,function = "gpio"; ++ }; ++ ++ pmx_power_usb: pmx-power-usb { ++ marvell,pins = "mpp9"; ++ marvell,function = "gpio"; ++ }; ++}; ++ ++&devbus_cs0 { ++ status = "okay"; ++ compatible = "marvell,orion-nand"; ++ reg = ; ++ cle = <0>; ++ ale = <1>; ++ bank-width = <1>; ++ ++ partitions { ++ compatible = "fixed-partitions"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ++ uImage@0 { /* 4 MB */ ++ reg = <0 0x400000>; ++ read-only; ++ }; ++ ++ rootfs@400000 { /* 64 MB */ ++ reg = <0x400000 0x4000000>; ++ read-only; ++ }; ++ ++ extra@4400000 { /* 188 MB */ ++ reg = <0x4400000 0xBC00000>; ++ read-only; ++ }; ++ }; ++}; ++ ++&hdd_power { ++ gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>; ++}; ++ ++&usb_power { ++ gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; ++}; ++ ++&sata { ++ nr-ports = <2>; ++}; ++ ++&ehci1 { ++ status = "okay"; ++}; diff --git a/debian/patches/series b/debian/patches/series index c38f87183..002ed3d4f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -97,6 +97,7 @@ features/arm/device-tree/ARM-dts-orion5x-add-for-buffalo-linkstation-ls-gl.patch features/arm/device-tree/ARM-dts-kirkwood-use-unique-machine-name-for-ds112.patch features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-ds112.dtb-to-Makefile.patch features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-nsa320.dtb-to-Makefile.patch +features/arm/device-tree/ARM-dts-orion5x-add-device-tree-for-kurobox-pro.patch features/arm/novena/ARM-dts-imx6q-add-Novena-board.patch features/arm/novena/ARM-dts-imx6q-clean-up-unused-ipu2grp.patch From dfd9a83664fc9909ca8b40f9f8f5a7f148f0e23f Mon Sep 17 00:00:00 2001 From: Roger Shimizu Date: Wed, 13 Apr 2016 22:37:43 +0900 Subject: [PATCH 5/5] [armhf/armmp] Enable DW_WATCHDOG as module Enable DW_WATCHDOG as module, used on Firefly-RK3288. Patch by Vagrant Cascadian. (Closes: #820834) --- debian/changelog | 2 ++ debian/config/armhf/config.armmp | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8363d95e8..c69d435ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ linux (4.4.6-2) UNRELEASED; urgency=medium * [armel/marvell] Add DT support for "Synology DS112" and "Zyxel NSA320". Thanks to Heinrich Schuchardt. (Closes: #819393) * [armel/marvell] Add DT support for "Buffalo/Revogear Kurobox Pro" + * [armhf/armmp] Enable DW_WATCHDOG as module, used on Firefly-RK3288. + Patch by Vagrant Cascadian. (Closes: #820834) -- Salvatore Bonaccorso Thu, 17 Mar 2016 18:19:26 +0100 diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp index af73db29f..e192aeab9 100644 --- a/debian/config/armhf/config.armmp +++ b/debian/config/armhf/config.armmp @@ -1085,6 +1085,7 @@ CONFIG_TWL4030_WATCHDOG=m CONFIG_IMX2_WDT=m CONFIG_TEGRA_WATCHDOG=m CONFIG_BCM2835_WDT=m +CONFIG_DW_WATCHDOG=m ## ## file: kernel/power/Kconfig