diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-02-02 07:25:04 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-02-02 07:25:04 +0100 |
| commit | 7c51aaa99814e1b33fb0d4f40437e3fbeb0f630b (patch) | |
| tree | d0c960ab3865d14af60de3bdf86e134f97cf27dc | |
| parent | 22e606deb3e4bceff8c16fab4d6c2a13b6cc4d62 (diff) | |
| parent | 2788aaebb0c4b3e11a1d0fe910126120beedb733 (diff) | |
| download | kernel-4.10.0-0.rc6.git2.1.vanilla.knurd.1.fc26.tar.gz kernel-4.10.0-0.rc6.git2.1.vanilla.knurd.1.fc26.tar.xz kernel-4.10.0-0.rc6.git2.1.vanilla.knurd.1.fc26.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc6.git2.1.vanilla.knurd.1.fc26kernel-4.10.0-0.rc6.git2.1.vanilla.knurd.1.fc25kernel-4.10.0-0.rc6.git2.1.vanilla.knurd.1.fc24
28 files changed, 94 insertions, 303 deletions
diff --git a/PatchList.txt b/PatchList.txt index 3a7fd7377..c7945639d 100644 --- a/PatchList.txt +++ b/PatchList.txt @@ -60,8 +60,6 @@ disable-i8042-check-on-apple-mac.patch lis3-improve-handling-of-null-rate.patch -watchdog-Disable-watchdog-on-virtual-machines.patch - scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch criu-no-expert.patch diff --git a/baseconfig/CONFIG_SENSORS_JC42 b/baseconfig/CONFIG_SENSORS_JC42 index 02894fb8f..8a07c3eef 100644 --- a/baseconfig/CONFIG_SENSORS_JC42 +++ b/baseconfig/CONFIG_SENSORS_JC42 @@ -1 +1 @@ -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m diff --git a/bcm2837-initial-support.patch b/bcm2837-initial-support.patch index adccf4335..faeef87ea 100644 --- a/bcm2837-initial-support.patch +++ b/bcm2837-initial-support.patch @@ -1,24 +1,16 @@ -From cdb86691df26e0962f081981f4bfa97ee43bd391 Mon Sep 17 00:00:00 2001 +From 49a6e9faf9a4e3b56c2bffd516f17ca1b6244084 Mon Sep 17 00:00:00 2001 From: Peter Robinson <pbrobinson@gmail.com> -Date: Mon, 29 Aug 2016 09:14:15 +0100 -Subject: [PATCH] ARM: bcm283x: Add devicetree for the Raspberry Pi 3. - -For now this doesn't support the new hardware present on the Pi 3 (BT, -wifi, GPIO expander). - -Rebased to the patch that went upstream for ARM64 +Date: Tue, 31 Jan 2017 23:21:32 +0000 +Subject: [PATCH] ARM: bcm2835: include rather than copy the commits for arm32 + RPi3 support so it's always in sync Signed-off-by: Peter Robinson <pbrobinson@gmail.com> --- - arch/arm/boot/dts/Makefile | 3 +- - arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 30 ++++++++++++++ - arch/arm/boot/dts/bcm2837.dtsi | 76 +++++++++++++++++++++++++++++++++++ - 3 files changed, 108 insertions(+), 1 deletion(-) - create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b.dts - create mode 100644 arch/arm/boot/dts/bcm2837.dtsi + arch/arm/boot/dts/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index befcd26..c96fb38 100644 +index f10fe85..4c46851 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -70,7 +70,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ @@ -27,191 +19,9 @@ index befcd26..c96fb38 100644 bcm2836-rpi-2-b.dtb \ - bcm2835-rpi-zero.dtb + bcm2835-rpi-zero.dtb \ -+ bcm2837-rpi-3-b.dtb ++ ../../../arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm4708-asus-rt-ac56u.dtb \ bcm4708-asus-rt-ac68u.dtb \ -diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts -new file mode 100644 -index 0000000..7841b72 ---- /dev/null -+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts -@@ -0,0 +1,30 @@ -+/dts-v1/; -+#include "bcm2837.dtsi" -+#include "bcm2835-rpi.dtsi" -+#include "bcm283x-rpi-smsc9514.dtsi" -+ -+/ { -+ compatible = "raspberrypi,3-model-b", "brcm,bcm2837"; -+ model = "Raspberry Pi 3 Model B"; -+ -+ memory { -+ reg = <0 0x40000000>; -+ }; -+ -+ leds { -+ act { -+ gpios = <&gpio 47 0>; -+ }; -+ -+ pwr { -+ label = "PWR"; -+ gpios = <&gpio 35 0>; -+ default-state = "keep"; -+ linux,default-trigger = "default-on"; -+ }; -+ }; -+}; -+ -+&uart1 { -+ status = "okay"; -+}; -diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi -new file mode 100644 -index 0000000..8216bbb ---- /dev/null -+++ b/arch/arm/boot/dts/bcm2837.dtsi -@@ -0,0 +1,76 @@ -+#include "bcm283x.dtsi" -+ -+/ { -+ compatible = "brcm,bcm2836"; -+ -+ soc { -+ ranges = <0x7e000000 0x3f000000 0x1000000>, -+ <0x40000000 0x40000000 0x00001000>; -+ dma-ranges = <0xc0000000 0x00000000 0x3f000000>; -+ -+ local_intc: local_intc { -+ compatible = "brcm,bcm2836-l1-intc"; -+ reg = <0x40000000 0x100>; -+ interrupt-controller; -+ #interrupt-cells = <1>; -+ interrupt-parent = <&local_intc>; -+ }; -+ }; -+ -+ timer { -+ compatible = "arm,armv7-timer"; -+ interrupt-parent = <&local_intc>; -+ interrupts = <0>, // PHYS_SECURE_PPI -+ <1>, // PHYS_NONSECURE_PPI -+ <3>, // VIRT_PPI -+ <2>; // HYP_PPI -+ always-on; -+ }; -+ -+ cpus: cpus { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ cpu0: cpu@0 { -+ device_type = "cpu"; -+ compatible = "arm,cortex-a53"; -+ reg = <0>; -+ enable-method = "spin-table"; -+ cpu-release-addr = <0x0 0x000000d8>; -+ }; -+ -+ cpu1: cpu@1 { -+ device_type = "cpu"; -+ compatible = "arm,cortex-a53"; -+ reg = <1>; -+ enable-method = "spin-table"; -+ cpu-release-addr = <0x0 0x000000e0>; -+ }; -+ -+ cpu2: cpu@2 { -+ device_type = "cpu"; -+ compatible = "arm,cortex-a53"; -+ reg = <2>; -+ enable-method = "spin-table"; -+ cpu-release-addr = <0x0 0x000000e8>; -+ }; -+ -+ cpu3: cpu@3 { -+ device_type = "cpu"; -+ compatible = "arm,cortex-a53"; -+ reg = <3>; -+ enable-method = "spin-table"; -+ cpu-release-addr = <0x0 0x000000f0>; -+ }; -+ }; -+}; -+ -+/* Make the BCM2835-style global interrupt controller be a child of the -+ * CPU-local interrupt controller. -+ */ -+&intc { -+ compatible = "brcm,bcm2836-armctrl-ic"; -+ reg = <0x7e00b200 0x200>; -+ interrupt-parent = <&local_intc>; -+ interrupts = <8>; -+}; --- -2.7.4 - -From 345863374ebec9aa11ea97b99f5adbf97f99bbdf Mon Sep 17 00:00:00 2001 -From: Peter Robinson <pbrobinson@gmail.com> -Date: Mon, 16 Jan 2017 06:38:08 +0000 -Subject: [PATCH] add upstream RPi3 fixes from arm64 DT - -Signed-off-by: Peter Robinson <pbrobinson@gmail.com> ---- - arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 8 +------- - arch/arm/boot/dts/bcm2837.dtsi | 8 +++++++- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts -index 7841b72..c309633 100644 ---- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts -+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts -@@ -2,6 +2,7 @@ - #include "bcm2837.dtsi" - #include "bcm2835-rpi.dtsi" - #include "bcm283x-rpi-smsc9514.dtsi" -+#include "bcm283x-rpi-usb-host.dtsi" - - / { - compatible = "raspberrypi,3-model-b", "brcm,bcm2837"; -@@ -15,13 +16,6 @@ - act { - gpios = <&gpio 47 0>; - }; -- -- pwr { -- label = "PWR"; -- gpios = <&gpio 35 0>; -- default-state = "keep"; -- linux,default-trigger = "default-on"; -- }; - }; - }; - -diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi -index 8216bbb..19f2fe6 100644 ---- a/arch/arm/boot/dts/bcm2837.dtsi -+++ b/arch/arm/boot/dts/bcm2837.dtsi -@@ -1,7 +1,7 @@ - #include "bcm283x.dtsi" - - / { -- compatible = "brcm,bcm2836"; -+ compatible = "brcm,bcm2837"; - - soc { - ranges = <0x7e000000 0x3f000000 0x1000000>, -@@ -74,3 +74,9 @@ - interrupt-parent = <&local_intc>; - interrupts = <8>; - }; -+ -+/* enable thermal sensor with the correct compatible property set */ -+&thermal { -+ compatible = "brcm,bcm2837-thermal"; -+ status = "okay"; -+}; -- 2.9.3 - @@ -1 +1 @@ -566cf877a1fcb6d6dc0126b076aad062054c2637 +6d04dfc8966019b8b0977b2cb942351f13d2b178 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 6f159134d..986e16c07 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -4616,7 +4616,7 @@ CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_SENSORS_LIS3LV02D=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 134cf0d3e..8f5b7cd60 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -4594,7 +4594,7 @@ CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_SENSORS_LIS3LV02D=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 8c5698530..dd5648cb7 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -5003,7 +5003,7 @@ CONFIG_SENSORS_INA3221=m CONFIG_SENSORS_ISL29018=m CONFIG_SENSORS_ISL29028=m CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_SENSORS_LIS3LV02D=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index aa4dc34af..3e92b7da9 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4736,7 +4736,7 @@ CONFIG_SENSORS_INA3221=m CONFIG_SENSORS_ISL29018=m CONFIG_SENSORS_ISL29028=m CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_SENSORS_LIS3LV02D=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index f0b7c7485..8057d5d49 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4715,7 +4715,7 @@ CONFIG_SENSORS_INA3221=m CONFIG_SENSORS_ISL29018=m CONFIG_SENSORS_ISL29028=m CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_SENSORS_LIS3LV02D=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index e63c66081..e971cc899 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4982,7 +4982,7 @@ CONFIG_SENSORS_INA3221=m CONFIG_SENSORS_ISL29018=m CONFIG_SENSORS_ISL29028=m CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_SENSORS_LIS3LV02D=m diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index b0f9cc9cb..0f1b6fb5b 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -4389,7 +4389,7 @@ CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_K10TEMP=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_LINEAGE=m diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 57dcf5991..34a24cdb7 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -4409,7 +4409,7 @@ CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_K10TEMP=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_LINEAGE=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 6ff1e94de..0ab2f1adf 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -4409,7 +4409,7 @@ CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_K10TEMP=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_LINEAGE=m diff --git a/kernel-i686.config b/kernel-i686.config index a63bcb922..0dffd51d6 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -4389,7 +4389,7 @@ CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_K10TEMP=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_LINEAGE=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 342cd6de4..a452d7b57 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -4270,7 +4270,7 @@ CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_SENSORS_LIS3LV02D=m diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 21a6d5e04..9b1623c62 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -4248,7 +4248,7 @@ CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_SENSORS_LIS3LV02D=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 99c26d4aa..181ad231d 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -4210,7 +4210,7 @@ CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_SENSORS_LIS3LV02D=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index b67fac408..e565b2f54 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -4188,7 +4188,7 @@ CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_SENSORS_LIS3LV02D=m diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index efa1ecd0d..21c8b5551 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -4209,7 +4209,7 @@ CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_SENSORS_LIS3LV02D=m diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 483ef2b72..a1f6c20f7 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -4187,7 +4187,7 @@ CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_SENSORS_LIS3LV02D=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 36fe54367..1b80a8cff 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -4107,7 +4107,7 @@ CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_SENSORS_LIS3LV02D=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 7b962cfba..a54c07c68 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -4085,7 +4085,7 @@ CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_SENSORS_LIS3LV02D=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index b6714a8ee..4a002b8d6 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -4432,7 +4432,7 @@ CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_K10TEMP=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_LINEAGE=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index d6c92e25d..be6185d94 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -4412,7 +4412,7 @@ CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set CONFIG_SENSORS_IT87=m -# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_JC42=m CONFIG_SENSORS_K10TEMP=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_LINEAGE=m diff --git a/kernel.spec b/kernel.spec index bf3e3761c..a8c0da65c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 6 # The git snapshot level -%define gitrev 0 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -133,7 +133,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} @@ -613,6 +613,9 @@ Patch852: selinux-allow-context-mounts-on-tmpfs-etc.patch # See http://lists.infradead.org/pipermail/linux-arm-kernel/2016-October/461597.html Patch853: 0001-Work-around-for-gcc7-and-arm64.patch +#CVE-2017-2596 rhbz 1417812 1417813 +Patch854: kvm-fix-page-struct-leak-in-handle_vmon.patch + # END OF PATCH DEFINITIONS %endif @@ -2186,6 +2189,15 @@ fi # # %changelog +* Wed Feb 01 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc6.git2.1 +- Linux v4.10-rc6-85-g6d04dfc +- enable CONFIG_SENSORS_JC42 (rhbz 1417454) + +* Tue Jan 31 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc6.git1.1 +- Linux v4.10-rc6-24-gf1774f4 +- Reenable debugging options. +- Fix kvm nested virt CVE-2017-2596 (rhbz 1417812 1417813) + * Mon Jan 30 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc6.git0.1 - Linux v4.10-rc6 - Disable debugging options. diff --git a/kvm-fix-page-struct-leak-in-handle_vmon.patch b/kvm-fix-page-struct-leak-in-handle_vmon.patch new file mode 100644 index 000000000..b29bcea03 --- /dev/null +++ b/kvm-fix-page-struct-leak-in-handle_vmon.patch @@ -0,0 +1,49 @@ +From patchwork Tue Jan 24 10:56:21 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: kvm: fix page struct leak in handle_vmon +From: Paolo Bonzini <pbonzini@redhat.com> +X-Patchwork-Id: 9534885 +Message-Id: <1485255381-18069-1-git-send-email-pbonzini@redhat.com> +To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org +Cc: dvyukov@google.com +Date: Tue, 24 Jan 2017 11:56:21 +0100 + +handle_vmon gets a reference on VMXON region page, +but does not release it. Release the reference. + +Found by syzkaller; based on a patch by Dmitry. + +Reported-by: Dmitry Vyukov <dvyukov@google.com> +Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> +Reviewed-by: David Hildenbrand <david@redhat.com> +--- + arch/x86/kvm/vmx.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c +index 42cc3d6f4d20..0f7345035210 100644 +--- a/arch/x86/kvm/vmx.c ++++ b/arch/x86/kvm/vmx.c +@@ -7085,13 +7085,18 @@ static int nested_vmx_check_vmptr(struct kvm_vcpu *vcpu, int exit_reason, + } + + page = nested_get_page(vcpu, vmptr); +- if (page == NULL || +- *(u32 *)kmap(page) != VMCS12_REVISION) { ++ if (page == NULL) { + nested_vmx_failInvalid(vcpu); ++ return kvm_skip_emulated_instruction(vcpu); ++ } ++ if (*(u32 *)kmap(page) != VMCS12_REVISION) { + kunmap(page); ++ nested_release_page_clean(page); ++ nested_vmx_failInvalid(vcpu); + return kvm_skip_emulated_instruction(vcpu); + } + kunmap(page); ++ nested_release_page_clean(page); + vmx->nested.vmxon_ptr = vmptr; + break; + case EXIT_REASON_VMCLEAR: @@ -1,3 +1,4 @@ SHA512 (linux-4.9.tar.xz) = bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a SHA512 (perf-man-4.9.tar.gz) = d23bb3da1eadd6623fddbf4696948de7675f3dcf57c711a7427dd7ae111394f58d8f42752938bbea7cd219f1e7f6f116fc67a1c74f769711063940a065f37b99 SHA512 (patch-4.10-rc6.xz) = eb6dfcdcb427d198d955b6c2146abd5c6a74d01ab10855d713f33b9c87df05f20f2688cb354d5881dfb82ebdcf4ecac37b36956ff3645977f967f021b52ad507 +SHA512 (patch-4.10-rc6-git2.xz) = 48f8233d4a9bdb0eaa71123437633c4b6d01a5e2ca577f8ab3435a404ea78f4f6d6c90c4ad39c4497f3affcdb240a383d92923eb98d505f927014485acf1839a diff --git a/watchdog-Disable-watchdog-on-virtual-machines.patch b/watchdog-Disable-watchdog-on-virtual-machines.patch deleted file mode 100644 index 0a988c189..000000000 --- a/watchdog-Disable-watchdog-on-virtual-machines.patch +++ /dev/null @@ -1,79 +0,0 @@ -From f1293c68aff98cd913a59b151aac938ec4ce4857 Mon Sep 17 00:00:00 2001 -From: Dave Jones <davej@redhat.com> -Date: Tue, 24 Jun 2014 08:43:34 -0400 -Subject: [PATCH] watchdog: Disable watchdog on virtual machines. - -For various reasons, VMs seem to trigger the soft lockup detector a lot, -in cases where it's just not possible for a lockup to occur. -(Example: https://bugzilla.redhat.com/show_bug.cgi?id=971139) - -In some cases it seems that the host just never scheduled the app running -the VM for a very long time (Could be the host was under heavy load). - -Just disable the detector on VMs. - -Bugzilla: 971139 -Upstream-status: Fedora mustard for now - -Signed-off-by: Dave Jones <davej@redhat.com> ---- - kernel/watchdog.c | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - -diff --git a/kernel/watchdog.c b/kernel/watchdog.c -index 18f34cf..6aadffe 100644 ---- a/kernel/watchdog.c -+++ b/kernel/watchdog.c -@@ -20,6 +20,7 @@ - #include <linux/sched/rt.h> - #include <linux/tick.h> - #include <linux/workqueue.h> -+#include <linux/dmi.h> - - #include <asm/irq_regs.h> - #include <linux/kvm_para.h> -@@ -185,6 +186,32 @@ static int __init hardlockup_all_cpu_backtrace_setup(char *str) - __setup("hardlockup_all_cpu_backtrace=", hardlockup_all_cpu_backtrace_setup); - #endif - -+static int disable_watchdog(const struct dmi_system_id *d) -+{ -+ printk(KERN_INFO "watchdog: disabled (inside virtual machine)\n"); -+ watchdog_user_enabled = 0; -+ return 0; -+} -+ -+static const struct dmi_system_id watchdog_virt_dmi_table[] = { -+ { -+ .callback = disable_watchdog, -+ .ident = "VMware", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "VMware, Inc."), -+ }, -+ }, -+ { -+ .callback = disable_watchdog, -+ .ident = "Bochs", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "Bochs"), -+ }, -+ }, -+ {} -+}; -+ -+ - /* - * Hard-lockup warnings should be triggered after just a few seconds. Soft- - * lockups can have false positives under extreme conditions. So we generally -@@ -1030,6 +1057,8 @@ out: - - void __init lockup_detector_init(void) - { -+ dmi_check_system(watchdog_virt_dmi_table); -+ - set_sample_period(); - - #ifdef CONFIG_NO_HZ_FULL --- -2.5.0 - |