From 700baa35a69ec9d7b1bbd5551366a24560334451 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Apr 10 2014 13:38:28 +0000 Subject: Linux v3.14-12042-g69cd9eba3886 --- diff --git a/arm-imx6-utilite.patch b/arm-imx6-utilite.patch deleted file mode 100644 index 35f34c1..0000000 --- a/arm-imx6-utilite.patch +++ /dev/null @@ -1,158 +0,0 @@ -commit 682d055e6ac5c3855f51649de6d68e9bb29c26a6 -Author: Valentin Raevsky -Date: Tue Oct 29 14:11:43 2013 +0200 - - ARM: dts: Add initial support for cm-fx6. - - Add initial support for cm-fx6 module. - - cm-fx6 is a module based on mx6q SoC with the following features: - - Up to 4GB of DDR3 - - 1 LCD/DVI output port - - 1 HDMI output port - - 2 LVDS LCD ports - - Gigabit Ethernet - - Analog Audio - - CAN - - SATA - - NAND - - PCIE - - This patch allows to boot up the module, configures the serial console, - the Ethernet adapter and the heartbeat led. - - cm-fx6 is embedded inside the Utilite computer. - - Signed-off-by: Valentin Raevsky - Signed-off-by: Igor Grinberg - Signed-off-by: Shawn Guo - -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 8081479..5672e91 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -162,6 +162,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ - imx6dl-sabresd.dtb \ - imx6dl-wandboard.dtb \ - imx6q-arm2.dtb \ -+ imx6q-cm-fx6.dtb \ - imx6q-cubox-i.dtb \ - imx6q-phytec-pbab01.dtb \ - imx6q-sabreauto.dtb \ -diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts -new file mode 100644 -index 0000000..99b46f8 ---- /dev/null -+++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts -@@ -0,0 +1,107 @@ -+/* -+ * Copyright 2013 CompuLab Ltd. -+ * -+ * Author: Valentin Raevsky -+ * -+ * The code contained herein is licensed under the GNU General Public -+ * License. You may obtain a copy of the GNU General Public License -+ * Version 2 or later at the following locations: -+ * -+ * http://www.opensource.org/licenses/gpl-license.html -+ * http://www.gnu.org/copyleft/gpl.html -+ */ -+ -+/dts-v1/; -+#include "imx6q.dtsi" -+ -+/ { -+ model = "CompuLab CM-FX6"; -+ compatible = "compulab,cm-fx6", "fsl,imx6q"; -+ -+ memory { -+ reg = <0x10000000 0x80000000>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ heartbeat-led { -+ label = "Heartbeat"; -+ gpios = <&gpio2 31 0>; -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+}; -+ -+&fec { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_enet>; -+ phy-mode = "rgmii"; -+ status = "okay"; -+}; -+ -+&gpmi { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_gpmi_nand>; -+ status = "okay"; -+}; -+ -+&iomuxc { -+ imx6q-cm-fx6 { -+ pinctrl_enet: enetgrp { -+ fsl,pins = < -+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0 -+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0 -+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0 -+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0 -+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0 -+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0 -+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0 -+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0 -+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0 -+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0 -+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0 -+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0 -+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0 -+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0 -+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0 -+ MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8 -+ >; -+ }; -+ -+ pinctrl_gpmi_nand: gpminandgrp { -+ fsl,pins = < -+ MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1 -+ MX6QDL_PAD_NANDF_ALE__NAND_ALE 0xb0b1 -+ MX6QDL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1 -+ MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000 -+ MX6QDL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1 -+ MX6QDL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1 -+ MX6QDL_PAD_SD4_CMD__NAND_RE_B 0xb0b1 -+ MX6QDL_PAD_SD4_CLK__NAND_WE_B 0xb0b1 -+ MX6QDL_PAD_NANDF_D0__NAND_DATA00 0xb0b1 -+ MX6QDL_PAD_NANDF_D1__NAND_DATA01 0xb0b1 -+ MX6QDL_PAD_NANDF_D2__NAND_DATA02 0xb0b1 -+ MX6QDL_PAD_NANDF_D3__NAND_DATA03 0xb0b1 -+ MX6QDL_PAD_NANDF_D4__NAND_DATA04 0xb0b1 -+ MX6QDL_PAD_NANDF_D5__NAND_DATA05 0xb0b1 -+ MX6QDL_PAD_NANDF_D6__NAND_DATA06 0xb0b1 -+ MX6QDL_PAD_NANDF_D7__NAND_DATA07 0xb0b1 -+ MX6QDL_PAD_SD4_DAT0__NAND_DQS 0x00b1 -+ >; -+ }; -+ -+ pinctrl_uart4: uart4grp { -+ fsl,pins = < -+ MX6QDL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1 -+ MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1 -+ >; -+ }; -+ }; -+}; -+ -+&uart4 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart4>; -+ status = "okay"; -+}; -+ -+&sata { -+ status = "okay"; -+}; diff --git a/arm-tegra-paz00-panel-dts.patch b/arm-tegra-paz00-panel-dts.patch deleted file mode 100644 index e64f2ce..0000000 --- a/arm-tegra-paz00-panel-dts.patch +++ /dev/null @@ -1,99 +0,0 @@ -From fb4a8356eb67514b10618d1e9e4059ced14c05f2 Mon Sep 17 00:00:00 2001 -From: Marc Dietrich -Date: Sat, 21 Dec 2013 21:38:13 +0100 -Subject: [PATCH] ARM: tegra: paz00: Add LVDS support to device tree - -Add backlight and panel nodes for the PAZ00 TFT LCD panel. - -Signed-off-by: Marc Dietrich ---- - arch/arm/boot/dts/tegra20-paz00.dts | 46 ++++++++++++++++++++++++++++++++++- - 1 files changed, 45 insertions(+), 1 deletions(-) - -diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts -index c7cd8e6..9a39a80 100644 ---- a/arch/arm/boot/dts/tegra20-paz00.dts -+++ b/arch/arm/boot/dts/tegra20-paz00.dts -@@ -17,6 +17,14 @@ - }; - - host1x@50000000 { -+ dc@54200000 { -+ rgb { -+ status = "okay"; -+ -+ nvidia,panel = <&panel>; -+ }; -+ }; -+ - hdmi@54280000 { - status = "okay"; - -@@ -257,7 +265,11 @@ - status = "okay"; - }; - -- i2c@7000c000 { -+ pwm: pwm@7000a000 { -+ status = "okay"; -+ }; -+ -+ lvds_ddc: i2c@7000c000 { - status = "okay"; - clock-frequency = <400000>; - -@@ -475,6 +487,18 @@ - non-removable; - }; - -+ backlight: backlight { -+ compatible = "pwm-backlight"; -+ -+ enable-gpios = <&gpio TEGRA_GPIO(U, 4) GPIO_ACTIVE_HIGH>; -+ pwms = <&pwm 0 5000000>; -+ -+ brightness-levels = <0 16 32 48 64 80 96 112 128 144 160 176 192 208 224 240 255>; -+ default-brightness-level = <10>; -+ -+ backlight-boot-off; -+ }; -+ - clocks { - compatible = "simple-bus"; - #address-cells = <1>; -@@ -509,6 +533,16 @@ - }; - }; - -+ panel: panel { -+ compatible = "samsung,ltn101nt05", "simple-panel"; -+ -+ ddc-i2c-bus = <&lvds_ddc>; -+ power-supply = <&vdd_pnl_reg>; -+ enable-gpios = <&gpio TEGRA_GPIO(M, 6) GPIO_ACTIVE_HIGH>; -+ -+ backlight = <&backlight>; -+ }; -+ - regulators { - compatible = "simple-bus"; - #address-cells = <1>; -@@ -522,6 +556,16 @@ - regulator-max-microvolt = <5000000>; - regulator-always-on; - }; -+ -+ vdd_pnl_reg: regulator@1 { -+ compatible = "regulator-fixed"; -+ reg = <1>; -+ regulator-name = "+3VS,vdd_pnl"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ gpio = <&gpio TEGRA_GPIO(A, 4) GPIO_ACTIVE_HIGH>; -+ enable-active-high; -+ }; - }; - - sound { --- -1.7.1 diff --git a/config-arm-generic b/config-arm-generic index cd56b24..9b91f5c 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -14,6 +14,7 @@ CONFIG_NFS_FS=y CONFIG_PWM=y CONFIG_PWM_SYSFS=y +# CONFIG_PWM_FSL_FTM is not set CONFIG_RESET_CONTROLLER=y CONFIG_RESET_GPIO=y diff --git a/config-armv7 b/config-armv7 index bd05983..d085f23 100644 --- a/config-armv7 +++ b/config-armv7 @@ -24,6 +24,8 @@ CONFIG_ARCH_ZYNQ=y CONFIG_MACH_ARMADA_370_XP=y CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_XP=y +# CONFIG_MACH_ARMADA_375 is not set +# CONFIG_MACH_ARMADA_38X is not set CONFIG_MVEBU_DEVBUS=y CONFIG_PCI_MVEBU=y @@ -52,6 +54,9 @@ CONFIG_PHY_MVEBU_SATA=y CONFIG_ARMADA_THERMAL=m CONFIG_DRM_ARMADA=m # CONFIG_SND_KIRKWOOD_SOC is not set +# CONFIG_CACHE_FEROCEON_L2 is not set +# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set +# CONFIG_ORION_WATCHDOG is not set # omap CONFIG_ARCH_OMAP2PLUS_TYPICAL=y @@ -416,6 +421,7 @@ CONFIG_DRM_IMX_TVE=m CONFIG_VIDEO_CODA=m CONFIG_MFD_SYSCON=y +CONFIG_GPIO_SYSCON=m CONFIG_SENSORS_MC13783_ADC=m CONFIG_REGULATOR_ANATOP=m CONFIG_REGULATOR_MC13783=m @@ -574,6 +580,8 @@ CONFIG_DRM_TEGRA_FBDEV=y CONFIG_DRM_TEGRA_STAGING=y CONFIG_DRM_PANEL=y CONFIG_DRM_PANEL_SIMPLE=m +CONFIG_DRM_PANEL_LD9040=m +CONFIG_DRM_PANEL_S6E8AA0=m CONFIG_TEGRA_WATCHDOG=m @@ -665,6 +673,8 @@ CONFIG_REGULATOR_MAX8973=m # CONFIG_CRYPTO_DEV_UX500_DEBUG is not set # CONFIG_AB8500_DEBUG is not set +# CONFIG_MACH_DOVE is not set + # CONFIG_SOC_VF610 is not set # CONFIG_MMC_TMIO is not set # CONFIG_SND_SOC_ADI is not set diff --git a/config-armv7-generic b/config-armv7-generic index 0e3e3db..65870a9 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -64,6 +64,7 @@ CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y # CONFIG_ARCH_BERLIN is not set # CONFIG_ARCH_HI3xxx is not set # CONFIG_ARCH_MSM_DT is not set +# CONFIG_ARCH_QCOM is not set # errata # v5/v6 @@ -262,6 +263,7 @@ CONFIG_MFD_TPS65912_SPI=y # CONFIG_MFD_ARIZONA_SPI is not set # CONFIG_MFD_WM831X_SPI is not set # CONFIG_MFD_MC13XXX_SPI is not set +# CONFIG_MFD_PM8921_CORE is not set # Pin stuff CONFIG_PINMUX=y @@ -283,6 +285,7 @@ CONFIG_GPIO_MAX7301=m CONFIG_GPIO_MC33880=m CONFIG_GPIO_TPS65910=y CONFIG_GPIO_TPS65912=m +# CONFIG_GPIO_ZEVIO is not set CONFIG_LEDS_GPIO=m CONFIG_MDIO_BUS_MUX=m CONFIG_MDIO_BUS_MUX_GPIO=m @@ -371,6 +374,7 @@ CONFIG_MTD_NAND_TMIO=m CONFIG_MTD_SPINAND_MT29F=m CONFIG_MTD_SPINAND_ONDIEECC=y CONFIG_MTD_SST25L=m +CONFIG_MTD_ST_SPI_FSM=m CONFIG_EEPROM_AT25=m CONFIG_EEPROM_93XX46=m @@ -468,6 +472,7 @@ CONFIG_RTC_DRV_RS5C348=m CONFIG_RTC_DRV_RX4581=m CONFIG_RTC_DRV_TPS65910=m CONFIG_RTC_DRV_TPS80031=m +# CONFIG_RTC_DRV_DS1347 is not set # Regulators CONFIG_REGULATOR=y @@ -544,6 +549,7 @@ CONFIG_LCD_HX8357=m CONFIG_INPUT_GP2A=m CONFIG_INPUT_ARIZONA_HAPTICS=m CONFIG_INPUT_MC13783_PWRBUTTON=m +# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set CONFIG_TOUCHSCREEN_ADS7846=m CONFIG_TOUCHSCREEN_AD7877=m diff --git a/config-armv7-lpae b/config-armv7-lpae index 25fe122..7c362a1 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -90,6 +90,8 @@ CONFIG_DRM_EXYNOS_IPP=y CONFIG_DRM_EXYNOS_FIMC=y CONFIG_DRM_EXYNOS_ROTATOR=y CONFIG_DRM_EXYNOS_GSC=y +CONFIG_DRM_EXYNOS_DPI=y +CONFIG_DRM_EXYNOS_DSI=y # CONFIG_FB_S3C is not set CONFIG_SND_SOC_SAMSUNG=m CONFIG_USB_EHCI_HCD=y @@ -133,3 +135,6 @@ CONFIG_S3C_LOWLEVEL_UART_PORT=1 # CONFIG_S3C2410_WATCHDOG is not set # CONFIG_MMC_SDHCI_S3C is not set # CONFIG_TEGRA_HOST1X is not set +# CONFIG_DRM_PANEL_SIMPLE is not set +# CONFIG_DRM_PANEL_LD9040 is not set +# CONFIG_DRM_PANEL_S6E8AA0 is not set diff --git a/config-generic b/config-generic index e2eb3b6..e85fcf2 100644 --- a/config-generic +++ b/config-generic @@ -37,6 +37,7 @@ CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y # CONFIG_COMPILE_TEST is not set CONFIG_FHANDLE=y +# CONFIG_USELIB is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y @@ -293,6 +294,7 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set +# CONFIG_MTD_UBI_BLOCK is not set # # Parallel port support @@ -318,6 +320,7 @@ CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m # CONFIG_PARIDE is not set CONFIG_ZRAM=m +# CONFIG_ZRAM_LZ4_COMPRESS is not set # CONFIG_ZRAM_DEBUG is not set CONFIG_BLK_CPQ_DA=m @@ -638,6 +641,7 @@ CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_CACHE=m CONFIG_DM_CACHE_MQ=m CONFIG_DM_CACHE_CLEANER=m +# CONFIG_DM_ERA is not set # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set # CONFIG_DM_DEBUG_SPACE_MAPS is not set CONFIG_DM_UEVENT=y @@ -2905,6 +2909,7 @@ CONFIG_DRM_VMWGFX=m CONFIG_DRM_VMWGFX_FBCON=y CONFIG_DRM_QXL=m CONFIG_DRM_BOCHS=m +CONFIG_DRM_PTN3460=m # # PCMCIA character devices @@ -3161,8 +3166,10 @@ CONFIG_IR_JVC_DECODER=m CONFIG_IR_SONY_DECODER=m CONFIG_IR_RC5_SZ_DECODER=m CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_SHARP_DECODER=m CONFIG_IR_MCE_KBD_DECODER=m CONFIG_IR_LIRC_CODEC=m +# CONFIG_IR_IMG is not set CONFIG_IR_IMON=m CONFIG_IR_MCEUSB=m CONFIG_IR_ITE_CIR=m @@ -3988,6 +3995,10 @@ CONFIG_MFD_VIPERBOARD=m # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_DA9063 is not set # CONFIG_MFD_LP3943 is not set +# CONFIG_MFD_BCM590XX is not set +# CONFIG_MFD_RTSX_USB is not set +# CONFIG_MFD_TPS65218 is not set + # # File systems @@ -4153,7 +4164,8 @@ CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m -CONFIG_SUNRPC_XPRT_RDMA=m +CONFIG_SUNRPC_XPRT_RDMA_CLIENT=m +# CONFIG_SUNRPC_XPRT_RDMA_SERVER is not set CONFIG_SUNRPC_DEBUG=y CONFIG_RPCSEC_GSS_KRB5=m CONFIG_CIFS=m @@ -4560,7 +4572,7 @@ CONFIG_MEMCG_SWAP_ENABLED=y CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set CONFIG_CGROUP_PERF=y -CONFIG_CGROUP_NET_PRIO=m +CONFIG_CGROUP_NET_PRIO=y # CONFIG_CGROUP_NET_CLASSID is not set CONFIG_BLK_CGROUP=y @@ -4958,6 +4970,7 @@ CONFIG_RTL8192E=m # CONFIG_R8188EU is not set # CONFIG_R8821AE is not set # CONFIG_RTL8192U is not set +# CONFIG_R8723AU is not set # CONFIG_FB_SM7XX is not set # CONFIG_SPECTRA is not set # CONFIG_EASYCAP is not set @@ -4978,6 +4991,8 @@ CONFIG_R8712U=m # Larry Finger maintains this (rhbz 699618) # CONFIG_RTS_PSTOR is not set CONFIG_ALTERA_STAPL=m # CONFIG_DVB_CXD2099 is not set +# CONFIG_DVB_RTL2832_SDR is not set +# CONFIG_PWM_FSL_FTM is not set # CONFIG_USBIP_CORE is not set # CONFIG_INTEL_MEI is not set # CONFIG_ZCACHE is not set @@ -5004,6 +5019,7 @@ CONFIG_ALTERA_STAPL=m # CONFIG_GS_FPGABOOT is not set # CONFIG_BT_NOKIA_H4P is not set # CONFIG_UNISYSSPAR is not set +# CONFIG_MEDIA_TUNER_MSI001 is not set # END OF STAGING # @@ -5121,6 +5137,7 @@ CONFIG_GPIO_VIPERBOARD=m # CONFIG_GPIO_PL061 is not set # CONFIG_GPIO_BCM_KONA is not set # CONFIG_GPIO_SCH311X is not set +# CONFIG_GPIO_DWAPB is not set # FIXME: Why? CONFIG_EVENT_POWER_TRACING_DEPRECATED=y diff --git a/config-x86-generic b/config-x86-generic index 963584c..25e8781 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -450,6 +450,7 @@ CONFIG_NFC_MICROREAD_MEI=m # CONFIG_DEBUG_NMI_SELFTEST is not set CONFIG_X86_INTEL_LPSS=y +CONFIG_PWM_LPSS=m CONFIG_PINCTRL=y CONFIG_PINCTRL_BAYTRAIL=y diff --git a/gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch b/gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch new file mode 100644 index 0000000..56cd753 --- /dev/null +++ b/gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch @@ -0,0 +1,163 @@ +Path: news.gmane.org!not-for-mail +From: Mika Westerberg +Newsgroups: gmane.linux.kernel.gpio,gmane.linux.kernel +Subject: [PATCH] gpio / ACPI: Don't crash on NULL chip->dev +Date: Mon, 31 Mar 2014 15:16:49 +0300 +Lines: 114 +Approved: news@gmane.org +Message-ID: <1396268209-19108-1-git-send-email-mika.westerberg@linux.intel.com> +NNTP-Posting-Host: plane.gmane.org +X-Trace: ger.gmane.org 1396268225 9280 80.91.229.3 (31 Mar 2014 12:17:05 GMT) +X-Complaints-To: usenet@ger.gmane.org +NNTP-Posting-Date: Mon, 31 Mar 2014 12:17:05 +0000 (UTC) +Cc: Alexandre Courbot , + Sabrina Dubroca , + linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, + Mika Westerberg +To: Linus Walleij +Original-X-From: linux-gpio-owner@vger.kernel.org Mon Mar 31 14:16:58 2014 +Return-path: +Envelope-to: glg-linux-gpio@plane.gmane.org +Original-Received: from vger.kernel.org ([209.132.180.67]) + by plane.gmane.org with esmtp (Exim 4.69) + (envelope-from ) + id 1WUb96-00049j-5K + for glg-linux-gpio@plane.gmane.org; Mon, 31 Mar 2014 14:16:56 +0200 +Original-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1752154AbaCaMQz (ORCPT ); + Mon, 31 Mar 2014 08:16:55 -0400 +Original-Received: from mga11.intel.com ([192.55.52.93]:46420 "EHLO mga11.intel.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1751749AbaCaMQy (ORCPT ); + Mon, 31 Mar 2014 08:16:54 -0400 +Original-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) + by fmsmga102.fm.intel.com with ESMTP; 31 Mar 2014 05:16:54 -0700 +X-ExtLoop1: 1 +X-IronPort-AV: E=Sophos;i="4.97,764,1389772800"; + d="scan'208";a="510938110" +Original-Received: from blue.fi.intel.com ([10.237.72.156]) + by fmsmga002.fm.intel.com with ESMTP; 31 Mar 2014 05:16:50 -0700 +Original-Received: by blue.fi.intel.com (Postfix, from userid 1004) + id 73976E0098; Mon, 31 Mar 2014 15:16:49 +0300 (EEST) +X-Mailer: git-send-email 1.9.1 +Original-Sender: linux-gpio-owner@vger.kernel.org +Precedence: bulk +List-ID: +X-Mailing-List: linux-gpio@vger.kernel.org +Xref: news.gmane.org gmane.linux.kernel.gpio:2461 gmane.linux.kernel:1675129 +Archived-At: + +Commit aa92b6f689ac (gpio / ACPI: Allocate ACPI specific data directly in +acpi_gpiochip_add()) moved ACPI handle checking to acpi_gpiochip_add() but +forgot to check whether chip->dev is NULL before dereferencing it. + +Since chip->dev pointer is optional we can end up with crash like following: + + BUG: unable to handle kernel NULL pointer dereference at 00000138 + IP: [] acpi_gpiochip_add+0x13/0x190 + *pde = 00000000 + Oops: 0000 [#1] PREEMPT SMP + Modules linked in: ssb(+) ... + CPU: 0 PID: 512 Comm: modprobe Tainted: G W 3.14.0-rc7-next-20140324-t1 #24 + Hardware name: Dell Inc. Latitude D830 /0UY141, BIOS A02 06/07/2007 + task: f5799900 ti: f543e000 task.ti: f543e000 + EIP: 0060:[] EFLAGS: 00010282 CPU: 0 + EIP is at acpi_gpiochip_add+0x13/0x190 + EAX: 00000000 EBX: f57824c4 ECX: 00000000 EDX: 00000000 + ESI: f57824c4 EDI: 00000010 EBP: f543fc54 ESP: f543fc40 + DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 + CR0: 8005003b CR2: 00000138 CR3: 355f8000 CR4: 000007d0 + Stack: + f543fc5c fd1f7790 f57824c4 000000be 00000010 f543fc84 c1269f4e f543fc74 + fd1f78bd 00008002 f57822b0 f5782090 fd1f8400 00000286 fd1f9994 00000000 + f5782000 f543fc8c fd1f7e39 f543fcc8 fd1f0bd8 000000c0 00000000 00000000 + Call Trace: + [] ? ssb_pcie_mdio_write+0xa0/0xd0 [ssb] + [] gpiochip_add+0xee/0x300 + [] ? ssb_pcicore_serdes_workaround+0xfd/0x140 [ssb] + [] ssb_gpio_init+0x89/0xa0 [ssb] + [] ssb_attach_queued_buses+0xc8/0x2d0 [ssb] + [] ssb_bus_register+0x185/0x1f0 [ssb] + [] ? ssb_pci_xtal+0x220/0x220 [ssb] + [] ssb_bus_pcibus_register+0x2c/0x80 [ssb] + [] ssb_pcihost_probe+0x9c/0x110 [ssb] + [] pci_device_probe+0x6f/0xc0 + [] ? sysfs_create_link+0x25/0x40 + [] driver_probe_device+0x79/0x360 + [] ? pci_match_device+0xb2/0xc0 + [] __driver_attach+0x71/0x80 + [] ? __device_attach+0x40/0x40 + [] bus_for_each_dev+0x47/0x80 + [] driver_attach+0x1e/0x20 + [] ? __device_attach+0x40/0x40 + [] bus_add_driver+0x157/0x230 + [] driver_register+0x59/0xe0 + ... + +Fix this by checking chip->dev pointer against NULL first. Also we can now +remove redundant check in acpi_gpiochip_request/free_interrupts(). + +Reported-by: Sabrina Dubroca +Signed-off-by: Mika Westerberg +--- +Sabrina, + +Can you please re-test this and provide your tested-by? I changed the patch +a bit to remove redundant checks. Just to be sure that I don't accidentally +break something. + +Thanks. + + drivers/gpio/gpiolib-acpi.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c +index bf0f8b476696..d5be56fe689e 100644 +--- a/drivers/gpio/gpiolib-acpi.c ++++ b/drivers/gpio/gpiolib-acpi.c +@@ -233,7 +233,7 @@ static void acpi_gpiochip_request_interrupts(struct acpi_gpio_chip *acpi_gpio) + { + struct gpio_chip *chip = acpi_gpio->chip; + +- if (!chip->dev || !chip->to_irq) ++ if (!chip->to_irq) + return; + + INIT_LIST_HEAD(&acpi_gpio->events); +@@ -253,7 +253,7 @@ static void acpi_gpiochip_free_interrupts(struct acpi_gpio_chip *acpi_gpio) + struct acpi_gpio_event *event, *ep; + struct gpio_chip *chip = acpi_gpio->chip; + +- if (!chip->dev || !chip->to_irq) ++ if (!chip->to_irq) + return; + + list_for_each_entry_safe_reverse(event, ep, &acpi_gpio->events, node) { +@@ -501,6 +501,9 @@ void acpi_gpiochip_add(struct gpio_chip *chip) + acpi_handle handle; + acpi_status status; + ++ if (!chip || !chip->dev) ++ return; ++ + handle = ACPI_HANDLE(chip->dev); + if (!handle) + return; +@@ -531,6 +534,9 @@ void acpi_gpiochip_remove(struct gpio_chip *chip) + acpi_handle handle; + acpi_status status; + ++ if (!chip || !chip->dev) ++ return; ++ + handle = ACPI_HANDLE(chip->dev); + if (!handle) + return; +-- +1.9.1 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-gpio" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + diff --git a/kernel.spec b/kernel.spec index 8e94978..8da5868 100644 --- a/kernel.spec +++ b/kernel.spec @@ -61,7 +61,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 9 +%define gitrev 10 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -610,13 +610,7 @@ Patch21010: arm-omap-load-tfp410.patch # ARM tegra Patch21020: arm-tegra-usb-no-reset-linux33.patch -# Add panel support for tegra paz00 -# Backported from linux-next scheduled for 3.15 -Patch21021: arm-tegra-paz00-panel-dts.patch - # ARM i.MX6 -# http://www.spinics.net/lists/devicetree/msg08276.html -Patch21030: arm-imx6-utilite.patch # ARM sunxi (AllWinner) @@ -636,11 +630,9 @@ Patch25047: drm-radeon-Disable-writeback-by-default-on-ppc.patch #Fixes module loading on ppc64le Patch25036: ppc64le_module_fix.patch -Patch25055: net-enic-include-irq.h-for-irqreturn_t-definitions.patch -Patch25056: net-bnx2x-include-irq.h-for-irqreturn_t-definitions.patch -Patch25057: net-qlcnic-include-irq.h-for-irq-definitions.patch Patch25058: net-cpts-Add-includes-for-ETH_HLEN-and-VLAN_HLEN-def.patch Patch25059: btrfs-fix-lockdep-warning-with-reclaim-lock-inversion.patch +Patch25061: gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch #CVE-2014-0155 rhbz 1081589 1085016 Patch25060: KVM-ioapic-fix-assignment-of-ioapic-rtc_status-pending_eoi.patch @@ -1176,8 +1168,6 @@ ApplyPatch arm-lpae-ax88796.patch ApplyPatch arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch ApplyPatch arm-omap-load-tfp410.patch ApplyPatch arm-tegra-usb-no-reset-linux33.patch -ApplyPatch arm-tegra-paz00-panel-dts.patch -ApplyPatch arm-imx6-utilite.patch # # bugfixes to drivers and filesystems @@ -1286,11 +1276,9 @@ ApplyPatch drm-radeon-Disable-writeback-by-default-on-ppc.patch # Fixes module loading on ppc64le ApplyPatch ppc64le_module_fix.patch -ApplyPatch net-enic-include-irq.h-for-irqreturn_t-definitions.patch -ApplyPatch net-bnx2x-include-irq.h-for-irqreturn_t-definitions.patch -ApplyPatch net-qlcnic-include-irq.h-for-irq-definitions.patch ApplyPatch net-cpts-Add-includes-for-ETH_HLEN-and-VLAN_HLEN-def.patch ApplyPatch btrfs-fix-lockdep-warning-with-reclaim-lock-inversion.patch +ApplyPatch gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch #CVE-2014-0155 rhbz 1081589 1085016 ApplyPatch KVM-ioapic-fix-assignment-of-ioapic-rtc_status-pending_eoi.patch @@ -2074,6 +2062,9 @@ fi # ||----w | # || || %changelog +* Wed Apr 09 2014 Josh Boyer - 3.15.0-0.rc0.git10.1 +- Linux v3.14-12042-g69cd9eba3886 + * Wed Apr 09 2014 Josh Boyer - CVE-2014-0155 KVM: BUG caused by invalid guest ioapic redirect table (rhbz 1081589 1085016) diff --git a/net-bnx2x-include-irq.h-for-irqreturn_t-definitions.patch b/net-bnx2x-include-irq.h-for-irqreturn_t-definitions.patch deleted file mode 100644 index 6131e99..0000000 --- a/net-bnx2x-include-irq.h-for-irqreturn_t-definitions.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b6580f8eea4993bc5cbd903c705db0155919fbad Mon Sep 17 00:00:00 2001 -From: Josh Boyer -Date: Wed, 2 Apr 2014 10:08:03 -0400 -Subject: [PATCH] net: bnx2x: include irq.h for irqreturn_t definitions - -The bnx2x driver fails to build on ARM with: - -In file included from drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c:28:0: -drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h:243:1: error: unknown type name 'irqreturn_t' - irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance); - ^ -drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h:251:1: error: unknown type name 'irqreturn_t' - irqreturn_t bnx2x_interrupt(int irq, void *dev_instance); - ^ - -Nothing in bnx2x_link.c or bnx2x_cmn.h is explicitly including the irq -definitions, so we add an include of linux/irq.h to pick them up. - -Signed-off-by: Josh Boyer ---- - drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h -index a89a40f88c25..384025605948 100644 ---- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h -+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - #include "bnx2x.h" - #include "bnx2x_sriov.h" --- -1.8.5.3 - diff --git a/net-enic-include-irq.h-for-irqreturn_t-definitions.patch b/net-enic-include-irq.h-for-irqreturn_t-definitions.patch deleted file mode 100644 index 796c1b8..0000000 --- a/net-enic-include-irq.h-for-irqreturn_t-definitions.patch +++ /dev/null @@ -1,35 +0,0 @@ -From aaed30ef3df1c0679c57da27c268a518921f1ed8 Mon Sep 17 00:00:00 2001 -From: Josh Boyer -Date: Wed, 2 Apr 2014 09:23:17 -0400 -Subject: [PATCH] net: enic: include irq.h for irqreturn_t definitions - -The enic driver fails to build on ARM with: - -In file included from drivers/net/ethernet/cisco/enic/enic_res.c:40:0: -drivers/net/ethernet/cisco/enic/enic.h:48:2: error: expected specifier-qualifier-list before 'irqreturn_t' - irqreturn_t (*isr)(int, void *); - ^ - -Nothing in the driver is explicitly including the irq definitions, so we add -an include of linux/irq.h to pick them up. - -Signed-off-by: Josh Boyer ---- - drivers/net/ethernet/cisco/enic/enic.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/cisco/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h -index e9f7c656ddda..e35c8e0202ad 100644 ---- a/drivers/net/ethernet/cisco/enic/enic.h -+++ b/drivers/net/ethernet/cisco/enic/enic.h -@@ -29,6 +29,7 @@ - #include "vnic_stats.h" - #include "vnic_nic.h" - #include "vnic_rss.h" -+#include - - #define DRV_NAME "enic" - #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" --- -1.8.5.3 - diff --git a/net-qlcnic-include-irq.h-for-irq-definitions.patch b/net-qlcnic-include-irq.h-for-irq-definitions.patch deleted file mode 100644 index 2f3cda2..0000000 --- a/net-qlcnic-include-irq.h-for-irq-definitions.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0115d51042e99a35c3bf83a01b9e776dedea7bdb Mon Sep 17 00:00:00 2001 -From: Josh Boyer -Date: Wed, 2 Apr 2014 10:48:37 -0400 -Subject: [PATCH] net: qlcnic: include irq.h for irq definitions - -The qlcnic driver fails to build on ARM with errors like: - -In file included from drivers/net/ethernet/qlogic/qlcnic/qlcnic.h:36:0, - from drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c:8: -drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h:585:1: error: unknown type name 'irqreturn_t' - irqreturn_t qlcnic_83xx_clear_legacy_intr(struct qlcnic_adapter *); - ^ - -Nothing in the driver is explicitly including the irq definitions, so we -add an include of linux/irq.h to pick them up. - -Signed-off-by: Josh Boyer ---- - drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h -index f19f81cde134..cbc897e6bb8f 100644 ---- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h -+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include - --- -1.8.5.3 - diff --git a/secure-modules.patch b/secure-modules.patch index 0c93fa5..478c62f 100644 --- a/secure-modules.patch +++ b/secure-modules.patch @@ -1,7 +1,7 @@ Bugzilla: N/A Upstream-status: Fedora mustard. Replaced by securelevels, but that was nak'd -From b0466e5c5483957f8ca30b8f1bcf60bbad9d40aa Mon Sep 17 00:00:00 2001 +From 0f81a4461431941c17ff26fd3d5e284ede4a368a Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Fri, 9 Aug 2013 17:58:15 -0400 Subject: [PATCH 01/14] Add secure_modules() call @@ -17,10 +17,10 @@ Signed-off-by: Matthew Garrett 2 files changed, 17 insertions(+) diff --git a/include/linux/module.h b/include/linux/module.h -index eaf60ff9ba94..5ab9d81e3b96 100644 +index f520a767c86c..fc9b54eb779e 100644 --- a/include/linux/module.h +++ b/include/linux/module.h -@@ -512,6 +512,8 @@ int unregister_module_notifier(struct notifier_block *nb); +@@ -509,6 +509,8 @@ int unregister_module_notifier(struct notifier_block *nb); extern void print_modules(void); @@ -29,7 +29,7 @@ index eaf60ff9ba94..5ab9d81e3b96 100644 #else /* !CONFIG_MODULES... */ /* Given an address, look for it in the exception tables. */ -@@ -622,6 +624,11 @@ static inline int unregister_module_notifier(struct notifier_block *nb) +@@ -619,6 +621,11 @@ static inline int unregister_module_notifier(struct notifier_block *nb) static inline void print_modules(void) { } @@ -42,10 +42,10 @@ index eaf60ff9ba94..5ab9d81e3b96 100644 #ifdef CONFIG_SYSFS diff --git a/kernel/module.c b/kernel/module.c -index 8dc7f5e80dd8..62f9b72bf85e 100644 +index 11869408f79b..2b9204fe055f 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -3833,3 +3833,13 @@ void module_layout(struct module *mod, +@@ -3835,3 +3835,13 @@ void module_layout(struct module *mod, } EXPORT_SYMBOL(module_layout); #endif @@ -63,7 +63,7 @@ index 8dc7f5e80dd8..62f9b72bf85e 100644 1.8.5.3 -From 3df1daaa8cd3c8450fd8fda62ff4836eddbf0f09 Mon Sep 17 00:00:00 2001 +From 806c4ee0e6484b529b88b3d0ceb49f6edf96ae11 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Thu, 8 Mar 2012 10:10:38 -0500 Subject: [PATCH 02/14] PCI: Lock down BAR access when module security is @@ -182,7 +182,7 @@ index 24750a1b39b6..fa57896b97dd 100644 1.8.5.3 -From c14a3599cdf71ccd6ea47e8b404412b8e7a5c1b3 Mon Sep 17 00:00:00 2001 +From 16ee82e2add8684e374451e6ba34be3ee41e4ef1 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Thu, 8 Mar 2012 10:35:59 -0500 Subject: [PATCH 03/14] x86: Lock down IO port access when module security is @@ -255,7 +255,7 @@ index 917403fe10da..cdf839f9defe 100644 1.8.5.3 -From ccbc02eee179074b13acc2d7dfd17835726a579a Mon Sep 17 00:00:00 2001 +From 2fd4b35393b19cde87e4770d3b85d12760e72f6a Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Fri, 9 Mar 2012 08:39:37 -0500 Subject: [PATCH 04/14] ACPI: Limit access to custom_method @@ -287,7 +287,7 @@ index c68e72414a67..4277938af700 100644 1.8.5.3 -From b40f05f5ec470bc59f41ca7ce66ea09614db60ea Mon Sep 17 00:00:00 2001 +From 543d64276237adb782ec30a5dab67d0b21afc1d4 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Fri, 9 Mar 2012 08:46:50 -0500 Subject: [PATCH 05/14] asus-wmi: Restrict debugfs interface when module @@ -342,7 +342,7 @@ index c5e082fb82fa..03c57fc8de8a 100644 1.8.5.3 -From bfa6f400f5e0f98772f3c77b60d8ac3d39b080a8 Mon Sep 17 00:00:00 2001 +From 6e2fec5547b597c43ca72e34729b8a402660a7c1 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Fri, 9 Mar 2012 09:28:15 -0500 Subject: [PATCH 06/14] Restrict /dev/mem and /dev/kmem when module loading is @@ -385,7 +385,7 @@ index cdf839f9defe..c63cf93b00eb 100644 1.8.5.3 -From e399403d8b74cbbb23ead4e43b70b4d82ee00402 Mon Sep 17 00:00:00 2001 +From 358cea0a54f726fa61839b411f3f54284d4588bf Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mon, 25 Jun 2012 19:57:30 -0400 Subject: [PATCH 07/14] acpi: Ignore acpi_rsdp kernel parameter when module @@ -401,7 +401,7 @@ Signed-off-by: Josh Boyer 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c -index 27f84af4e337..bd3ac0947890 100644 +index f7fd72ac69cf..ccdae1c8c386 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -44,6 +44,7 @@ @@ -425,7 +425,7 @@ index 27f84af4e337..bd3ac0947890 100644 1.8.5.3 -From 686268dea5fa802409d99f964005bc57d62f6b04 Mon Sep 17 00:00:00 2001 +From 89751b3ad4dea7cf5b806cd14126dd70657a9148 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Fri, 9 Aug 2013 03:33:56 -0400 Subject: [PATCH 08/14] kexec: Disable at runtime if the kernel enforces module @@ -441,18 +441,18 @@ Signed-off-by: Matthew Garrett 1 file changed, 8 insertions(+) diff --git a/kernel/kexec.c b/kernel/kexec.c -index 45601cf41bee..d5819bb45bec 100644 +index c8380ad203bc..e6eb239f567a 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c -@@ -32,6 +32,7 @@ - #include +@@ -33,6 +33,7 @@ #include #include + #include +#include #include #include -@@ -947,6 +948,13 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments, +@@ -948,6 +949,13 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments, return -EPERM; /* @@ -470,7 +470,7 @@ index 45601cf41bee..d5819bb45bec 100644 1.8.5.3 -From 4a1068eb94b99cab1d31a8a87eea9aafb39bcea0 Mon Sep 17 00:00:00 2001 +From 31174421a7103571a1c3faf7ba27d4045e5fbc18 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 3 Sep 2013 11:23:29 -0400 Subject: [PATCH 09/14] uswsusp: Disable when module loading is restricted @@ -510,7 +510,7 @@ index 98d357584cd6..efe99dee9510 100644 1.8.5.3 -From 569d0384d6846dae76910d5104666f11597a6a78 Mon Sep 17 00:00:00 2001 +From ea5cf8801db979fa7d5f90ab3faf72eb22490f9b Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Fri, 8 Feb 2013 11:12:13 -0800 Subject: [PATCH 10/14] x86: Restrict MSR access when module loading is @@ -527,7 +527,7 @@ Signed-off-by: Matthew Garrett 1 file changed, 7 insertions(+) diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c -index 05266b5aae22..e2bd647f676e 100644 +index c9603ac80de5..8bef43fc3f40 100644 --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c @@ -103,6 +103,9 @@ static ssize_t msr_write(struct file *file, const char __user *buf, @@ -555,7 +555,7 @@ index 05266b5aae22..e2bd647f676e 100644 1.8.5.3 -From bca29272512c8646bf2feaf304a0eceb05c0d0c0 Mon Sep 17 00:00:00 2001 +From 2985684ff78972bde7ebf1e295b52afd9bea29e0 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Fri, 9 Aug 2013 18:36:30 -0400 Subject: [PATCH 11/14] Add option to automatically enforce module signatures @@ -591,10 +591,10 @@ index 199f453cb4de..ec38acf00b40 100644 290/040 ALL edd_mbr_sig_buffer EDD MBR signatures 2D0/A00 ALL e820_map E820 memory map table diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index 26237934ac87..e27b78bcca34 100644 +index 5b8ec0f53b57..085d5eb36361 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -1597,6 +1597,16 @@ config EFI_MIXED +@@ -1534,6 +1534,16 @@ config EFI_MIXED If unsure, say N. @@ -687,10 +687,10 @@ index 225b0988043a..90dbfb73e11f 100644 * The sentinel is set to a nonzero value (0xff) in header.S. * diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index fa511acff7e6..aa227f68687c 100644 +index 09c76d265550..5a61d732fd5c 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -1143,6 +1143,12 @@ void __init setup_arch(char **cmdline_p) +@@ -1142,6 +1142,12 @@ void __init setup_arch(char **cmdline_p) io_delay_init(); @@ -704,10 +704,10 @@ index fa511acff7e6..aa227f68687c 100644 * Parse the ACPI tables for possible boot-time SMP configuration. */ diff --git a/include/linux/module.h b/include/linux/module.h -index 5ab9d81e3b96..83144dd56ff0 100644 +index fc9b54eb779e..7377bc851461 100644 --- a/include/linux/module.h +++ b/include/linux/module.h -@@ -191,6 +191,12 @@ const struct exception_table_entry *search_exception_tables(unsigned long add); +@@ -188,6 +188,12 @@ const struct exception_table_entry *search_exception_tables(unsigned long add); struct notifier_block; @@ -721,10 +721,10 @@ index 5ab9d81e3b96..83144dd56ff0 100644 extern int modules_disabled; /* for sysctl */ diff --git a/kernel/module.c b/kernel/module.c -index 62f9b72bf85e..dcfb07ae5e4e 100644 +index 2b9204fe055f..2b8cc2d57c16 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -3834,6 +3834,13 @@ void module_layout(struct module *mod, +@@ -3836,6 +3836,13 @@ void module_layout(struct module *mod, EXPORT_SYMBOL(module_layout); #endif @@ -742,7 +742,7 @@ index 62f9b72bf85e..dcfb07ae5e4e 100644 1.8.5.3 -From 67ff850d16232e30c39109d29510d2a4aef34de9 Mon Sep 17 00:00:00 2001 +From b2e4ea728ccab2befbd5fe1bd834881a7dd8f34b Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 5 Feb 2013 19:25:05 -0500 Subject: [PATCH 12/14] efi: Disable secure boot if shim is in insecure mode @@ -801,7 +801,7 @@ index b00745ff398a..bf42cc5f083d 100644 1.8.5.3 -From 53645ba848224ee81978b17c5e5328dca798466f Mon Sep 17 00:00:00 2001 +From fb418c682d01c447d30b5591a591fdbf33b1334e Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 27 Aug 2013 13:28:43 -0400 Subject: [PATCH 13/14] efi: Make EFI_SECURE_BOOT_SIG_ENFORCE depend on EFI @@ -815,10 +815,10 @@ Signed-off-by: Josh Boyer 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index e27b78bcca34..dfd068b32cdc 100644 +index 085d5eb36361..3e8d398a976d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -1598,7 +1598,8 @@ config EFI_MIXED +@@ -1535,7 +1535,8 @@ config EFI_MIXED If unsure, say N. config EFI_SECURE_BOOT_SIG_ENFORCE @@ -832,7 +832,7 @@ index e27b78bcca34..dfd068b32cdc 100644 1.8.5.3 -From e5b7eaf1b5d04ec739464b6e2df21c666d060c69 Mon Sep 17 00:00:00 2001 +From 87bf357dd4589cfca043ec4b641b912a088b1234 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 27 Aug 2013 13:33:03 -0400 Subject: [PATCH 14/14] efi: Add EFI_SECURE_BOOT bit @@ -847,10 +847,10 @@ Signed-off-by: Josh Boyer 2 files changed, 3 insertions(+) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index aa227f68687c..c7cf7919b3c4 100644 +index 5a61d732fd5c..23fe9bf3c401 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -1145,7 +1145,9 @@ void __init setup_arch(char **cmdline_p) +@@ -1144,7 +1144,9 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE if (boot_params.secure_boot) { diff --git a/sources b/sources index b943353..ed9a0d8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ b621207b3f6ecbb67db18b13258f8ea8 linux-3.14.tar.xz d36baf2d62de5aa61f10a976d00d2d2a perf-man-3.14.tar.gz -1ffb416fada7ceb3e051253d4c582b3d patch-3.14-git9.xz +9b89bbd8bc248fccc00565479d44fd8e patch-3.14-git10.xz