From c3110e368218e094a23feffa69ab71ffbddea773 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Wed, 2 Jan 2019 08:15:21 -0800 Subject: [PATCH] Linux v4.20-10595-g8e143b90e4d4 --- 0001-Drop-that-def_bool.patch | 40 +++ ...req-add-CPU-frequency-control-driver.patch | 41 +-- gitrev | 2 +- kernel-aarch64-debug.config | 8 + kernel-aarch64.config | 8 + kernel-armv7hl-debug.config | 8 + kernel-armv7hl-lpae-debug.config | 8 + kernel-armv7hl-lpae.config | 8 + kernel-armv7hl.config | 8 + kernel-i686-debug.config | 8 + kernel-i686.config | 8 + kernel-ppc64le-debug.config | 8 + kernel-ppc64le.config | 8 + kernel-s390x-debug.config | 7 + kernel-s390x.config | 7 + kernel-x86_64-debug.config | 8 + kernel-x86_64.config | 8 + kernel.spec | 11 +- ...ix-firmware-calls-with-large-buffers.patch | 245 ------------------ sources | 2 +- 20 files changed, 181 insertions(+), 270 deletions(-) create mode 100644 0001-Drop-that-def_bool.patch delete mode 100644 raspberrypi-Fix-firmware-calls-with-large-buffers.patch diff --git a/0001-Drop-that-def_bool.patch b/0001-Drop-that-def_bool.patch new file mode 100644 index 000000000..296e76393 --- /dev/null +++ b/0001-Drop-that-def_bool.patch @@ -0,0 +1,40 @@ +From d8a29c727d073b674adcf7ca122c3e5d04ba54ff Mon Sep 17 00:00:00 2001 +From: Laura Abbott +Date: Wed, 2 Jan 2019 08:13:21 -0800 +Subject: [PATCH] Drop that def_bool + +I don't know why + +BUILDSTDERR: In file included from drivers/vfio/pci/trace.h:102, +BUILDSTDERR: from drivers/vfio/pci/vfio_pci_nvlink2.c:29: +BUILDSTDERR: ./include/trace/define_trace.h:89:42: fatal error: ./trace.h: No such file or directory +BUILDSTDERR: #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) +BUILDSTDERR: ^ +BUILDSTDERR: compilation terminated. +BUILDSTDERR: make[3]: *** [scripts/Makefile.build:277: drivers/vfio/pci/vfio_pci_nvlink2.o] Error 1 +BUILDSTDERR: make[2]: *** [scripts/Makefile.build:492: drivers/vfio/pci] Error 2 +BUILDSTDERR: make[1]: *** [scripts/Makefile.build:492: drivers/vfio] Error 2 +BUILDSTDERR: make: *** [Makefile:1053: drivers] Error 2 +BUILDSTDERR: make: *** Waiting for unfinished jobs.... + +Signed-off-by: Laura Abbott +--- + drivers/vfio/pci/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/vfio/pci/Kconfig b/drivers/vfio/pci/Kconfig +index d0f8e4f5a039..11efd2099797 100644 +--- a/drivers/vfio/pci/Kconfig ++++ b/drivers/vfio/pci/Kconfig +@@ -40,7 +40,7 @@ config VFIO_PCI_IGD + To enable Intel IGD assignment through vfio-pci, say Y. + + config VFIO_PCI_NVLINK2 +- def_bool y ++ bool y + depends on VFIO_PCI && PPC_POWERNV + help + VFIO PCI support for P9 Witherspoon machine with NVIDIA V100 GPUs +-- +2.20.1 + diff --git a/bcm2835-cpufreq-add-CPU-frequency-control-driver.patch b/bcm2835-cpufreq-add-CPU-frequency-control-driver.patch index e845e0070..36c3eea75 100644 --- a/bcm2835-cpufreq-add-CPU-frequency-control-driver.patch +++ b/bcm2835-cpufreq-add-CPU-frequency-control-driver.patch @@ -1,7 +1,7 @@ -From 624e057827435de39274c34e20c2d937cb9d4ac3 Mon Sep 17 00:00:00 2001 +From fbdb31e061b67941342fc5afa714488f75174632 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 31 May 2018 19:08:12 +0100 -Subject: [PATCH] bcm2835: cpufreq: add CPU frequency control driver +Subject: [PATCH 1/3] bcm2835: cpufreq: add CPU frequency control driver Signed-off-by: Peter Robinson --- @@ -14,11 +14,11 @@ Signed-off-by: Peter Robinson create mode 100644 drivers/clk/bcm/clk-raspberrypi.c diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi -index 6c3cfaa77f3d..e6d1627ec421 100644 +index 29f970f864dc..6d0f43957af4 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -35,6 +35,13 @@ - reg = <0x7e00b840 0xf>; + reg = <0x7e00b840 0x3c>; interrupts = <0 2>; }; + @@ -32,10 +32,10 @@ index 6c3cfaa77f3d..e6d1627ec421 100644 }; diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi -index 7704bb029605..c24176282a1f 100644 +index beb6c502dadc..9cfc553a3633 100644 --- a/arch/arm/boot/dts/bcm2837.dtsi +++ b/arch/arm/boot/dts/bcm2837.dtsi -@@ -38,6 +38,9 @@ +@@ -44,6 +44,9 @@ reg = <0>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000d8>; @@ -45,7 +45,7 @@ index 7704bb029605..c24176282a1f 100644 }; cpu1: cpu@1 { -@@ -46,6 +49,9 @@ +@@ -52,6 +55,9 @@ reg = <1>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000e0>; @@ -55,7 +55,7 @@ index 7704bb029605..c24176282a1f 100644 }; cpu2: cpu@2 { -@@ -54,6 +60,9 @@ +@@ -60,6 +66,9 @@ reg = <2>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000e8>; @@ -65,7 +65,7 @@ index 7704bb029605..c24176282a1f 100644 }; cpu3: cpu@3 { -@@ -62,6 +71,30 @@ +@@ -68,6 +77,30 @@ reg = <3>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000f0>; @@ -269,12 +269,13 @@ index 000000000000..046efc822a59 +MODULE_DESCRIPTION("Raspberry Pi CPU clock driver"); +MODULE_LICENSE("GPL v2"); -- -2.17.0 +2.20.1 -From 40a82f71737891581dcbe45331d15a29dd3e7805 Mon Sep 17 00:00:00 2001 + +From 0681db63db37cf9015ef9b667c237c3974de04e6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 4 Jun 2018 09:14:10 +0100 -Subject: [PATCH 7/7] add 1.4 ghz OPP for the 3B+ +Subject: [PATCH 2/3] add 1.4 ghz OPP for the 3B+ Signed-off-by: Peter Robinson --- @@ -282,7 +283,7 @@ Signed-off-by: Peter Robinson 1 file changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts -index 4adb85e66be3..aaefb078f391 100644 +index 42bb09044cc7..3333c080696c 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts @@ -106,3 +106,10 @@ @@ -297,12 +298,13 @@ index 4adb85e66be3..aaefb078f391 100644 + }; +}; -- -2.17.1 +2.20.1 -From d00bd46b40001d3500b8a7207dcfe1d66600e47e Mon Sep 17 00:00:00 2001 + +From 65f821f03ac635f28c8c79c5e436b398194521f2 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Wed, 26 Sep 2018 21:13:22 +0200 -Subject: [PATCH] ARM: bcm2837: Use CPU0 as cooling device +Subject: [PATCH 3/3] ARM: bcm2837: Use CPU0 as cooling device Signed-off-by: Stefan Wahren --- @@ -311,7 +313,7 @@ Signed-off-by: Stefan Wahren 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi -index 9cfc553..1590d94 100644 +index 9cfc553a3633..1590d94b618e 100644 --- a/arch/arm/boot/dts/bcm2837.dtsi +++ b/arch/arm/boot/dts/bcm2837.dtsi @@ -1,4 +1,5 @@ @@ -380,7 +382,7 @@ index 9cfc553..1590d94 100644 /* enable thermal sensor with the correct compatible property set */ diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi -index 31b2964..2def068 100644 +index 31b29646b14c..2def0684d198 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -38,7 +38,7 @@ @@ -393,4 +395,5 @@ index 31b2964..2def068 100644 hysteresis = <0>; type = "critical"; -- -2.7.4 +2.20.1 + diff --git a/gitrev b/gitrev index af040e663..198357be1 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -f12e840c819bab42621685558a01d3f46ab9a226 +8e143b90e4d45cca3dc53760d3cfab988bc74571 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 48e0a93e9..c736c02ca 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2383,8 +2383,10 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_GPCV2_PM_DOMAINS is not set # CONFIG_IMX_IPUV3_CORE is not set # CONFIG_IMX_IRQSTEER is not set +# CONFIG_IMX_SCU_PD is not set CONFIG_INA2XX_ADC=m CONFIG_INDIRECT_PIO=y CONFIG_INET6_AH=m @@ -3213,6 +3215,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set CONFIG_MESON_CANVAS=m +# CONFIG_MESON_CLK_MEASURE is not set CONFIG_MESON_EFUSE=m CONFIG_MESON_GXBB_WATCHDOG=m CONFIG_MESON_GXL_PHY=m @@ -4442,6 +4445,7 @@ CONFIG_PINCTRL_MSM8998=m # CONFIG_PINCTRL_MSM8X74 is not set CONFIG_PINCTRL_MSM=y CONFIG_PINCTRL_MVEBU=y +# CONFIG_PINCTRL_OCELOT is not set CONFIG_PINCTRL_QCOM_SPMI_PMIC=y # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set # CONFIG_PINCTRL_QCS404 is not set @@ -4465,6 +4469,7 @@ CONFIG_PLATFORM_MHU=m # CONFIG_PLATFORM_SI4713 is not set # CONFIG_PLIP is not set CONFIG_PLX_HERMES=m +# CONFIG_PM8916_WATCHDOG is not set CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_AUTOSLEEP is not set CONFIG_PMBUS=m @@ -4955,6 +4960,7 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_RTC_DRV_HYM8563=m +# CONFIG_RTC_DRV_IMX_SC is not set CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -5902,6 +5908,7 @@ CONFIG_SND_YMFPCI=m CONFIG_SNI_NETSEC=m # CONFIG_SOC_BRCMSTB is not set # CONFIG_SOC_CAMERA is not set +# CONFIG_SOC_IMX7ULP is not set CONFIG_SOCIONEXT_SYNQUACER_PREITS=y CONFIG_SOC_TEGRA_FLOWCTRL=y # CONFIG_SOC_TI is not set @@ -6135,6 +6142,7 @@ CONFIG_TCS3472=m CONFIG_TEE=m CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y +# CONFIG_TEGRA20_EMC is not set CONFIG_TEGRA210_ADMA=y CONFIG_TEGRA_ACONNECT=m CONFIG_TEGRA_AHB=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index fd99d239d..a1ba57e18 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2366,8 +2366,10 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_GPCV2_PM_DOMAINS is not set # CONFIG_IMX_IPUV3_CORE is not set # CONFIG_IMX_IRQSTEER is not set +# CONFIG_IMX_SCU_PD is not set CONFIG_INA2XX_ADC=m CONFIG_INDIRECT_PIO=y CONFIG_INET6_AH=m @@ -3193,6 +3195,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set CONFIG_MESON_CANVAS=m +# CONFIG_MESON_CLK_MEASURE is not set CONFIG_MESON_EFUSE=m CONFIG_MESON_GXBB_WATCHDOG=m CONFIG_MESON_GXL_PHY=m @@ -4421,6 +4424,7 @@ CONFIG_PINCTRL_MSM8998=m # CONFIG_PINCTRL_MSM8X74 is not set CONFIG_PINCTRL_MSM=y CONFIG_PINCTRL_MVEBU=y +# CONFIG_PINCTRL_OCELOT is not set CONFIG_PINCTRL_QCOM_SPMI_PMIC=y # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set # CONFIG_PINCTRL_QCS404 is not set @@ -4444,6 +4448,7 @@ CONFIG_PLATFORM_MHU=m # CONFIG_PLATFORM_SI4713 is not set # CONFIG_PLIP is not set CONFIG_PLX_HERMES=m +# CONFIG_PM8916_WATCHDOG is not set # CONFIG_PM_ADVANCED_DEBUG is not set # CONFIG_PM_AUTOSLEEP is not set CONFIG_PMBUS=m @@ -4933,6 +4938,7 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_RTC_DRV_HYM8563=m +# CONFIG_RTC_DRV_IMX_SC is not set CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -5879,6 +5885,7 @@ CONFIG_SND_YMFPCI=m CONFIG_SNI_NETSEC=m # CONFIG_SOC_BRCMSTB is not set # CONFIG_SOC_CAMERA is not set +# CONFIG_SOC_IMX7ULP is not set CONFIG_SOCIONEXT_SYNQUACER_PREITS=y CONFIG_SOC_TEGRA_FLOWCTRL=y # CONFIG_SOC_TI is not set @@ -6112,6 +6119,7 @@ CONFIG_TCS3472=m CONFIG_TEE=m CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y +# CONFIG_TEGRA20_EMC is not set CONFIG_TEGRA210_ADMA=y CONFIG_TEGRA_ACONNECT=m CONFIG_TEGRA_AHB=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 8ff1f3a53..b1850b42c 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2488,11 +2488,13 @@ CONFIG_IMX2_WDT=m CONFIG_IMX7D_ADC=m CONFIG_IMX7_PM_DOMAINS=y CONFIG_IMX_DMA=m +# CONFIG_IMX_GPCV2_PM_DOMAINS is not set CONFIG_IMX_GPCV2=y CONFIG_IMX_IPUV3_CORE=m # CONFIG_IMX_IRQSTEER is not set CONFIG_IMX_MBOX=m CONFIG_IMX_REMOTEPROC=m +# CONFIG_IMX_SCU_PD is not set CONFIG_IMX_SCU=y CONFIG_IMX_SDMA=m CONFIG_IMX_THERMAL=m @@ -3366,6 +3368,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set CONFIG_MESON_CANVAS=m +# CONFIG_MESON_CLK_MEASURE is not set CONFIG_MESON_EFUSE=m # CONFIG_MESON_GXBB_WATCHDOG is not set # CONFIG_MESON_GXL_PHY is not set @@ -4679,6 +4682,7 @@ CONFIG_PINCTRL_MSM8960=m CONFIG_PINCTRL_MSM8998=m CONFIG_PINCTRL_MSM8X74=m CONFIG_PINCTRL_MVEBU=y +# CONFIG_PINCTRL_OCELOT is not set CONFIG_PINCTRL_PALMAS=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=m CONFIG_PINCTRL_QCOM_SSBI_PMIC=m @@ -4710,6 +4714,7 @@ CONFIG_PLATFORM_MHU=m # CONFIG_PLAT_SPEAR is not set # CONFIG_PLIP is not set CONFIG_PLX_HERMES=m +# CONFIG_PM8916_WATCHDOG is not set CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_AUTOSLEEP is not set CONFIG_PMBUS=m @@ -5220,6 +5225,7 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_RTC_DRV_HYM8563=m CONFIG_RTC_DRV_IMXDI=m +# CONFIG_RTC_DRV_IMX_SC is not set CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -6269,6 +6275,7 @@ CONFIG_SOC_IMX6SX=y CONFIG_SOC_IMX6UL=y CONFIG_SOC_IMX6=y CONFIG_SOC_IMX7D=y +# CONFIG_SOC_IMX7ULP is not set # CONFIG_SOC_LS1021A is not set CONFIG_SOC_OMAP3430=y CONFIG_SOC_OMAP5=y @@ -6526,6 +6533,7 @@ CONFIG_TCS3472=m CONFIG_TEE=m CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y +# CONFIG_TEGRA20_EMC is not set CONFIG_TEGRA_AHB=y # CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 2f101734f..a772df971 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2373,9 +2373,11 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_GPCV2_PM_DOMAINS is not set # CONFIG_IMX_IPUV3_CORE is not set # CONFIG_IMX_IRQSTEER is not set CONFIG_IMX_MBOX=m +# CONFIG_IMX_SCU_PD is not set CONFIG_IMX_SCU=y # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m @@ -3221,6 +3223,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set CONFIG_MESON_CANVAS=m +# CONFIG_MESON_CLK_MEASURE is not set CONFIG_MESON_EFUSE=m # CONFIG_MESON_GXBB_WATCHDOG is not set # CONFIG_MESON_GXL_PHY is not set @@ -4450,6 +4453,7 @@ CONFIG_PINCTRL_DOVE=y # CONFIG_PINCTRL_MSM8996 is not set CONFIG_PINCTRL_MSM8998=m CONFIG_PINCTRL_MVEBU=y +# CONFIG_PINCTRL_OCELOT is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m CONFIG_PINCTRL_SAMSUNG=y @@ -4477,6 +4481,7 @@ CONFIG_PLATFORM_MHU=m # CONFIG_PLAT_SPEAR is not set # CONFIG_PLIP is not set CONFIG_PLX_HERMES=m +# CONFIG_PM8916_WATCHDOG is not set CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_AUTOSLEEP is not set CONFIG_PMBUS=m @@ -4930,6 +4935,7 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_RTC_DRV_HYM8563=m +# CONFIG_RTC_DRV_IMX_SC is not set CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -5901,6 +5907,7 @@ CONFIG_SOC_EXYNOS5410=y CONFIG_SOC_EXYNOS5420=y CONFIG_SOC_EXYNOS5800=y # CONFIG_SOC_IMX6SLL is not set +# CONFIG_SOC_IMX7ULP is not set # CONFIG_SOC_OMAP5 is not set CONFIG_SOC_TEGRA_FLOWCTRL=y # CONFIG_SOC_TI is not set @@ -6134,6 +6141,7 @@ CONFIG_TCS3472=m CONFIG_TEE=m CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y +# CONFIG_TEGRA20_EMC is not set CONFIG_TEGRA_AHB=y # CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index ae6b6c125..716719ae3 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2357,9 +2357,11 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_GPCV2_PM_DOMAINS is not set # CONFIG_IMX_IPUV3_CORE is not set # CONFIG_IMX_IRQSTEER is not set CONFIG_IMX_MBOX=m +# CONFIG_IMX_SCU_PD is not set CONFIG_IMX_SCU=y # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m @@ -3202,6 +3204,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set CONFIG_MESON_CANVAS=m +# CONFIG_MESON_CLK_MEASURE is not set CONFIG_MESON_EFUSE=m # CONFIG_MESON_GXBB_WATCHDOG is not set # CONFIG_MESON_GXL_PHY is not set @@ -4430,6 +4433,7 @@ CONFIG_PINCTRL_DOVE=y # CONFIG_PINCTRL_MSM8996 is not set CONFIG_PINCTRL_MSM8998=m CONFIG_PINCTRL_MVEBU=y +# CONFIG_PINCTRL_OCELOT is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m CONFIG_PINCTRL_SAMSUNG=y @@ -4457,6 +4461,7 @@ CONFIG_PLATFORM_MHU=m # CONFIG_PLAT_SPEAR is not set # CONFIG_PLIP is not set CONFIG_PLX_HERMES=m +# CONFIG_PM8916_WATCHDOG is not set # CONFIG_PM_ADVANCED_DEBUG is not set # CONFIG_PM_AUTOSLEEP is not set CONFIG_PMBUS=m @@ -4909,6 +4914,7 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_RTC_DRV_HYM8563=m +# CONFIG_RTC_DRV_IMX_SC is not set CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -5879,6 +5885,7 @@ CONFIG_SOC_EXYNOS5410=y CONFIG_SOC_EXYNOS5420=y CONFIG_SOC_EXYNOS5800=y # CONFIG_SOC_IMX6SLL is not set +# CONFIG_SOC_IMX7ULP is not set # CONFIG_SOC_OMAP5 is not set CONFIG_SOC_TEGRA_FLOWCTRL=y # CONFIG_SOC_TI is not set @@ -6112,6 +6119,7 @@ CONFIG_TCS3472=m CONFIG_TEE=m CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y +# CONFIG_TEGRA20_EMC is not set CONFIG_TEGRA_AHB=y # CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index dd75e9374..607db2fa8 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -2472,11 +2472,13 @@ CONFIG_IMX2_WDT=m CONFIG_IMX7D_ADC=m CONFIG_IMX7_PM_DOMAINS=y CONFIG_IMX_DMA=m +# CONFIG_IMX_GPCV2_PM_DOMAINS is not set CONFIG_IMX_GPCV2=y CONFIG_IMX_IPUV3_CORE=m # CONFIG_IMX_IRQSTEER is not set CONFIG_IMX_MBOX=m CONFIG_IMX_REMOTEPROC=m +# CONFIG_IMX_SCU_PD is not set CONFIG_IMX_SCU=y CONFIG_IMX_SDMA=m CONFIG_IMX_THERMAL=m @@ -3347,6 +3349,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set CONFIG_MESON_CANVAS=m +# CONFIG_MESON_CLK_MEASURE is not set CONFIG_MESON_EFUSE=m # CONFIG_MESON_GXBB_WATCHDOG is not set # CONFIG_MESON_GXL_PHY is not set @@ -4659,6 +4662,7 @@ CONFIG_PINCTRL_MSM8960=m CONFIG_PINCTRL_MSM8998=m CONFIG_PINCTRL_MSM8X74=m CONFIG_PINCTRL_MVEBU=y +# CONFIG_PINCTRL_OCELOT is not set CONFIG_PINCTRL_PALMAS=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=m CONFIG_PINCTRL_QCOM_SSBI_PMIC=m @@ -4690,6 +4694,7 @@ CONFIG_PLATFORM_MHU=m # CONFIG_PLAT_SPEAR is not set # CONFIG_PLIP is not set CONFIG_PLX_HERMES=m +# CONFIG_PM8916_WATCHDOG is not set # CONFIG_PM_ADVANCED_DEBUG is not set # CONFIG_PM_AUTOSLEEP is not set CONFIG_PMBUS=m @@ -5199,6 +5204,7 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_RTC_DRV_HYM8563=m CONFIG_RTC_DRV_IMXDI=m +# CONFIG_RTC_DRV_IMX_SC is not set CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -6247,6 +6253,7 @@ CONFIG_SOC_IMX6SX=y CONFIG_SOC_IMX6UL=y CONFIG_SOC_IMX6=y CONFIG_SOC_IMX7D=y +# CONFIG_SOC_IMX7ULP is not set # CONFIG_SOC_LS1021A is not set CONFIG_SOC_OMAP3430=y CONFIG_SOC_OMAP5=y @@ -6504,6 +6511,7 @@ CONFIG_TCS3472=m CONFIG_TEE=m CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y +# CONFIG_TEGRA20_EMC is not set CONFIG_TEGRA_AHB=y # CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 997810eab..53d037587 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2215,6 +2215,8 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_GPCV2_PM_DOMAINS is not set +# CONFIG_IMX_SCU_PD is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -3079,6 +3081,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set +# CONFIG_MESON_CLK_MEASURE is not set # CONFIG_MESON_GX_PM_DOMAINS is not set # CONFIG_MESON_MX_EFUSE is not set # CONFIG_MESON_MX_SOCINFO is not set @@ -4222,6 +4225,7 @@ CONFIG_PINCTRL_ICELAKE=m # CONFIG_PINCTRL_IPQ8074 is not set CONFIG_PINCTRL_LEWISBURG=m # CONFIG_PINCTRL_MCP23S08 is not set +# CONFIG_PINCTRL_OCELOT is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SDM660 is not set @@ -4238,6 +4242,7 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m # CONFIG_PLATFORM_SI4713 is not set # CONFIG_PLIP is not set CONFIG_PLX_HERMES=m +# CONFIG_PM8916_WATCHDOG is not set CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_AUTOSLEEP is not set CONFIG_PMBUS=m @@ -4624,6 +4629,7 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set # CONFIG_RTC_DRV_HYM8563 is not set +# CONFIG_RTC_DRV_IMX_SC is not set CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -5737,6 +5743,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set +# CONFIG_TEGRA20_EMC is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -5913,6 +5920,7 @@ CONFIG_TPM_KEY_PARSER=m # CONFIG_TPS65010 is not set # CONFIG_TPS6507X is not set # CONFIG_TPS68470_PMIC_OPREGION is not set +# CONFIG_TQMX86_WDT is not set # CONFIG_TRACE_BRANCH_PROFILING is not set CONFIG_TRACE_EVAL_MAP_FILE=y # CONFIG_TRACEPOINT_BENCHMARK is not set diff --git a/kernel-i686.config b/kernel-i686.config index cda672702..c648b1de3 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2197,6 +2197,8 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_GPCV2_PM_DOMAINS is not set +# CONFIG_IMX_SCU_PD is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -3059,6 +3061,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set +# CONFIG_MESON_CLK_MEASURE is not set # CONFIG_MESON_GX_PM_DOMAINS is not set # CONFIG_MESON_MX_EFUSE is not set # CONFIG_MESON_MX_SOCINFO is not set @@ -4202,6 +4205,7 @@ CONFIG_PINCTRL_ICELAKE=m # CONFIG_PINCTRL_IPQ8074 is not set CONFIG_PINCTRL_LEWISBURG=m # CONFIG_PINCTRL_MCP23S08 is not set +# CONFIG_PINCTRL_OCELOT is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SDM660 is not set @@ -4218,6 +4222,7 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m # CONFIG_PLATFORM_SI4713 is not set # CONFIG_PLIP is not set CONFIG_PLX_HERMES=m +# CONFIG_PM8916_WATCHDOG is not set # CONFIG_PM_ADVANCED_DEBUG is not set # CONFIG_PM_AUTOSLEEP is not set CONFIG_PMBUS=m @@ -4603,6 +4608,7 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set # CONFIG_RTC_DRV_HYM8563 is not set +# CONFIG_RTC_DRV_IMX_SC is not set CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -5715,6 +5721,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set +# CONFIG_TEGRA20_EMC is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -5891,6 +5898,7 @@ CONFIG_TPM_KEY_PARSER=m # CONFIG_TPS65010 is not set # CONFIG_TPS6507X is not set # CONFIG_TPS68470_PMIC_OPREGION is not set +# CONFIG_TQMX86_WDT is not set # CONFIG_TRACE_BRANCH_PROFILING is not set CONFIG_TRACE_EVAL_MAP_FILE=y # CONFIG_TRACEPOINT_BENCHMARK is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 7d6f1da77..3b4236680 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2043,6 +2043,8 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_GPCV2_PM_DOMAINS is not set +# CONFIG_IMX_SCU_PD is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -2855,6 +2857,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set +# CONFIG_MESON_CLK_MEASURE is not set # CONFIG_MESON_GX_PM_DOMAINS is not set # CONFIG_MESON_MX_EFUSE is not set # CONFIG_MESON_MX_SOCINFO is not set @@ -3931,6 +3934,7 @@ CONFIG_PINCTRL_CEDARFORK=m # CONFIG_PINCTRL_IPQ8074 is not set # CONFIG_PINCTRL is not set # CONFIG_PINCTRL_MCP23S08 is not set +# CONFIG_PINCTRL_OCELOT is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SDM660 is not set @@ -3944,6 +3948,7 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m # CONFIG_PLATFORM_SI4713 is not set # CONFIG_PLIP is not set CONFIG_PLX_HERMES=m +# CONFIG_PM8916_WATCHDOG is not set CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_AUTOSLEEP is not set CONFIG_PMBUS=m @@ -4360,6 +4365,7 @@ CONFIG_RTC_DRV_FM3130=m CONFIG_RTC_DRV_GENERIC=y # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set # CONFIG_RTC_DRV_HYM8563 is not set +# CONFIG_RTC_DRV_IMX_SC is not set CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -5413,6 +5419,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set +# CONFIG_TEGRA20_EMC is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -6018,6 +6025,7 @@ CONFIG_VFIO_MDEV_DEVICE=m CONFIG_VFIO_MDEV=m # CONFIG_VFIO_NOIOMMU is not set CONFIG_VFIO_PCI=m +# CONFIG_VFIO_PCI_NVLINK2 is not set CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_VGA_ARB=y # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 112398140..d4ad36591 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2025,6 +2025,8 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_GPCV2_PM_DOMAINS is not set +# CONFIG_IMX_SCU_PD is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -2834,6 +2836,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set +# CONFIG_MESON_CLK_MEASURE is not set # CONFIG_MESON_GX_PM_DOMAINS is not set # CONFIG_MESON_MX_EFUSE is not set # CONFIG_MESON_MX_SOCINFO is not set @@ -3909,6 +3912,7 @@ CONFIG_PINCTRL_CEDARFORK=m # CONFIG_PINCTRL_IPQ8074 is not set # CONFIG_PINCTRL is not set # CONFIG_PINCTRL_MCP23S08 is not set +# CONFIG_PINCTRL_OCELOT is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SDM660 is not set @@ -3922,6 +3926,7 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m # CONFIG_PLATFORM_SI4713 is not set # CONFIG_PLIP is not set CONFIG_PLX_HERMES=m +# CONFIG_PM8916_WATCHDOG is not set # CONFIG_PM_ADVANCED_DEBUG is not set # CONFIG_PM_AUTOSLEEP is not set CONFIG_PMBUS=m @@ -4337,6 +4342,7 @@ CONFIG_RTC_DRV_FM3130=m CONFIG_RTC_DRV_GENERIC=y # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set # CONFIG_RTC_DRV_HYM8563 is not set +# CONFIG_RTC_DRV_IMX_SC is not set CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -5389,6 +5395,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set +# CONFIG_TEGRA20_EMC is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -5994,6 +6001,7 @@ CONFIG_VFIO_MDEV_DEVICE=m CONFIG_VFIO_MDEV=m # CONFIG_VFIO_NOIOMMU is not set CONFIG_VFIO_PCI=m +# CONFIG_VFIO_PCI_NVLINK2 is not set CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_VGA_ARB=y # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 28c35abe2..264670a33 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1997,6 +1997,8 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_GPCV2_PM_DOMAINS is not set +# CONFIG_IMX_SCU_PD is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -2798,6 +2800,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set +# CONFIG_MESON_CLK_MEASURE is not set # CONFIG_MESON_GX_PM_DOMAINS is not set # CONFIG_MESON_MX_EFUSE is not set # CONFIG_MESON_MX_SOCINFO is not set @@ -3863,6 +3866,7 @@ CONFIG_PINCTRL_CEDARFORK=m # CONFIG_PINCTRL_IPQ8074 is not set # CONFIG_PINCTRL is not set # CONFIG_PINCTRL_MCP23S08 is not set +# CONFIG_PINCTRL_OCELOT is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SDM660 is not set @@ -3877,6 +3881,7 @@ CONFIG_PKEY=m # CONFIG_PLATFORM_SI4713 is not set # CONFIG_PLIP is not set CONFIG_PLX_HERMES=m +# CONFIG_PM8916_WATCHDOG is not set CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_AUTOSLEEP is not set CONFIG_PMBUS=m @@ -4250,6 +4255,7 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set # CONFIG_RTC_DRV_HYM8563 is not set +# CONFIG_RTC_DRV_IMX_SC is not set CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -5305,6 +5311,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set +# CONFIG_TEGRA20_EMC is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 272ba0f27..4a38f32a5 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1979,6 +1979,8 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_GPCV2_PM_DOMAINS is not set +# CONFIG_IMX_SCU_PD is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -2777,6 +2779,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set +# CONFIG_MESON_CLK_MEASURE is not set # CONFIG_MESON_GX_PM_DOMAINS is not set # CONFIG_MESON_MX_EFUSE is not set # CONFIG_MESON_MX_SOCINFO is not set @@ -3841,6 +3844,7 @@ CONFIG_PINCTRL_CEDARFORK=m # CONFIG_PINCTRL_IPQ8074 is not set # CONFIG_PINCTRL is not set # CONFIG_PINCTRL_MCP23S08 is not set +# CONFIG_PINCTRL_OCELOT is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SDM660 is not set @@ -3855,6 +3859,7 @@ CONFIG_PKEY=m # CONFIG_PLATFORM_SI4713 is not set # CONFIG_PLIP is not set CONFIG_PLX_HERMES=m +# CONFIG_PM8916_WATCHDOG is not set # CONFIG_PM_ADVANCED_DEBUG is not set # CONFIG_PM_AUTOSLEEP is not set CONFIG_PMBUS=m @@ -4227,6 +4232,7 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set # CONFIG_RTC_DRV_HYM8563 is not set +# CONFIG_RTC_DRV_IMX_SC is not set CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -5281,6 +5287,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set +# CONFIG_TEGRA20_EMC is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 700f4b859..c872ace4c 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2257,6 +2257,8 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_GPCV2_PM_DOMAINS is not set +# CONFIG_IMX_SCU_PD is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -3128,6 +3130,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set +# CONFIG_MESON_CLK_MEASURE is not set # CONFIG_MESON_GX_PM_DOMAINS is not set # CONFIG_MESON_MX_EFUSE is not set # CONFIG_MESON_MX_SOCINFO is not set @@ -4260,6 +4263,7 @@ CONFIG_PINCTRL_ICELAKE=m # CONFIG_PINCTRL_IPQ8074 is not set CONFIG_PINCTRL_LEWISBURG=m # CONFIG_PINCTRL_MCP23S08 is not set +# CONFIG_PINCTRL_OCELOT is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SDM660 is not set @@ -4275,6 +4279,7 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m # CONFIG_PLATFORM_SI4713 is not set # CONFIG_PLIP is not set CONFIG_PLX_HERMES=m +# CONFIG_PM8916_WATCHDOG is not set CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_AUTOSLEEP is not set CONFIG_PMBUS=m @@ -4661,6 +4666,7 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set # CONFIG_RTC_DRV_HYM8563 is not set +# CONFIG_RTC_DRV_IMX_SC is not set CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -5782,6 +5788,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set +# CONFIG_TEGRA20_EMC is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -5957,6 +5964,7 @@ CONFIG_TPM_KEY_PARSER=m # CONFIG_TPS65010 is not set # CONFIG_TPS6507X is not set # CONFIG_TPS68470_PMIC_OPREGION is not set +# CONFIG_TQMX86_WDT is not set # CONFIG_TRACE_BRANCH_PROFILING is not set CONFIG_TRACE_EVAL_MAP_FILE=y # CONFIG_TRACEPOINT_BENCHMARK is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 9d83f38ab..d169d8125 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2239,6 +2239,8 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_GPCV2_PM_DOMAINS is not set +# CONFIG_IMX_SCU_PD is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -3108,6 +3110,7 @@ CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set # CONFIG_MEN_A21_WDT is not set +# CONFIG_MESON_CLK_MEASURE is not set # CONFIG_MESON_GX_PM_DOMAINS is not set # CONFIG_MESON_MX_EFUSE is not set # CONFIG_MESON_MX_SOCINFO is not set @@ -4240,6 +4243,7 @@ CONFIG_PINCTRL_ICELAKE=m # CONFIG_PINCTRL_IPQ8074 is not set CONFIG_PINCTRL_LEWISBURG=m # CONFIG_PINCTRL_MCP23S08 is not set +# CONFIG_PINCTRL_OCELOT is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SDM660 is not set @@ -4255,6 +4259,7 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m # CONFIG_PLATFORM_SI4713 is not set # CONFIG_PLIP is not set CONFIG_PLX_HERMES=m +# CONFIG_PM8916_WATCHDOG is not set # CONFIG_PM_ADVANCED_DEBUG is not set # CONFIG_PM_AUTOSLEEP is not set CONFIG_PMBUS=m @@ -4640,6 +4645,7 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set # CONFIG_RTC_DRV_HYM8563 is not set +# CONFIG_RTC_DRV_IMX_SC is not set CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -5760,6 +5766,7 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set # CONFIG_TEE is not set +# CONFIG_TEGRA20_EMC is not set CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -5935,6 +5942,7 @@ CONFIG_TPM_KEY_PARSER=m # CONFIG_TPS65010 is not set # CONFIG_TPS6507X is not set # CONFIG_TPS68470_PMIC_OPREGION is not set +# CONFIG_TQMX86_WDT is not set # CONFIG_TRACE_BRANCH_PROFILING is not set CONFIG_TRACE_EVAL_MAP_FILE=y # CONFIG_TRACEPOINT_BENCHMARK is not set diff --git a/kernel.spec b/kernel.spec index 5f8df0b89..d0531dd2d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 4 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -579,9 +579,6 @@ Patch306: arm-sdhci-esdhc-imx-fixes.patch Patch330: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch -# https://patchwork.kernel.org/patch/10686407/ -Patch332: raspberrypi-Fix-firmware-calls-with-large-buffers.patch - # Improve raspberry pi camera and analog audio # Needs to be rebased # Patch333: bcm2835-vc04_services-Improve-driver-load-unload.patch @@ -607,6 +604,9 @@ Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch # rhbz 1645070 patch queued upstream for merging into 4.21 Patch505: asus-fx503-keyb.patch +# nvlink failure +Patch506: 0001-Drop-that-def_bool.patch + # END OF PATCH DEFINITIONS %endif @@ -1878,6 +1878,9 @@ fi # # %changelog +* Wed Jan 02 2019 Laura Abbott - 4.21.0-0.rc0.git5.1 +- Linux v4.20-10595-g8e143b90e4d4 + * Mon Dec 31 2018 Laura Abbott - 4.21.0-0.rc0.git4.1 - Linux v4.20-9221-gf12e840c819b diff --git a/raspberrypi-Fix-firmware-calls-with-large-buffers.patch b/raspberrypi-Fix-firmware-calls-with-large-buffers.patch deleted file mode 100644 index 79421d616..000000000 --- a/raspberrypi-Fix-firmware-calls-with-large-buffers.patch +++ /dev/null @@ -1,245 +0,0 @@ -From patchwork Fri Nov 16 14:39:07 2018 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: James Hughes -X-Patchwork-Id: 10686407 -Return-Path: - -Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org - [172.30.200.125]) - by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9BA9C3CF1 - for ; - Fri, 16 Nov 2018 14:40:20 +0000 (UTC) -Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) - by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88C992D04D - for ; - Fri, 16 Nov 2018 14:40:20 +0000 (UTC) -Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) - id 7C6802D0B5; Fri, 16 Nov 2018 14:40:20 +0000 (UTC) -X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on - pdx-wl-mail.web.codeaurora.org -X-Spam-Level: -X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, - DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 -Received: from bombadil.infradead.org (bombadil.infradead.org - [198.137.202.133]) - (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) - (No client certificate requested) - by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 02F272D0B9 - for ; - Fri, 16 Nov 2018 14:40:19 +0000 (UTC) -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; - d=lists.infradead.org; s=bombadil.20170209; h=Sender: - Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: - List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: - Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: - Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: - References:List-Owner; bh=q+rr6CTCNe7Aj9DWt6k8ZBDJfuNlw6LK4NEqho/OsL8=; b=slV - BxeOcHW4UYDgm2VXfNMIZb+/8LPmzjGPpBpBe5IaMR/NthCsM9AL2A1aGdlPRKp8j/Oimcml9ytBG - vy3/u46ZlKFd5bAYEl5veGalWXzUg1KN7UhADmXD9fmMOzkFD4fMChA8+g2qK83F6SfqDM0VS3i14 - /ubAQ9CUdaFi4Vr7F4EZtPdbPmSm76Rm9H8sWxWe6seIEmsL6VMpLVzRLAA0zvX5nslXgUPvDLEZj - uk7BIzGfdWU1oB15xwTu8kyp24WrC2Xd/DNCrrIlvBJ6Vn4lvfdqwPT+Xg59IAaibUhoj/fq1HNet - QenokEPTxg7SS3FsAKl96cR5mWeudtg==; -Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) - by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) - id 1gNfI9-0007DF-JA; Fri, 16 Nov 2018 14:40:17 +0000 -Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) - by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) - id 1gNfI4-00075P-2l - for linux-arm-kernel@bombadil.infradead.org; Fri, 16 Nov 2018 14:40:12 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; - d=infradead.org; s=casper.20170209; h=Message-Id:Date:Subject:Cc:To:From: - Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: - Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: - Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: - List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; - bh=0v+Gt0Sb75ntX3ncvTo0T5q/LQ9HrDko5y0UEkZ6WVk=; b=SCmdpUIYIRr3Gb8eXMDGHl/os - AVmLBMIQEbA1mUB4WPQJlUjz7NKtNXgtLQxSY+yiwIb+LrripAgbQ6yK1Vkn+4bmhtSkb97glmraT - bMOZKrRj/cPhxW5osOa0o2BJQRqWqignWxy8539dbxXbpAAKW+12jA+dOqrjOFUftFH7geD4Ttwis - y/j75BOi7ObkcK1mBDyJDNuSEt2CZutCNZ+A7v7/zqkxnhS3hS7Y9hUD81+J+cIu5x103POH6i7FC - 7JazaqnBZYtl66kXXPOs62v3HA96/QLz7CxmdsnNQvw28MNKsxLw5TKnXJUDJmDCybQ5FL6k6Xomg - T9PDZO9+g==; -Received: from mx08-00252a01.pphosted.com ([91.207.212.211]) - by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) - id 1gNfHz-0006AE-RY - for linux-arm-kernel@lists.infradead.org; Fri, 16 Nov 2018 14:40:09 +0000 -Received: from pps.filterd (m0102629.ppops.net [127.0.0.1]) - by mx08-00252a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id - wAGEcLBT000897 - for ; Fri, 16 Nov 2018 14:39:55 GMT -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org; - h=from : to : cc : subject : date : message-id; s=pp; - bh=0v+Gt0Sb75ntX3ncvTo0T5q/LQ9HrDko5y0UEkZ6WVk=; - b=ynWh6Gt8VRIRTTbVy4Q9U7IsJWRMWYUNzTD1MYt8M2mcj01ElaCuktcZdGoRxGBJXjLU - CYJP75gWsuHHvbSWSSn2l+qpGuEHm+ddFXuMB4nxC5VmQokt/Z0KPScc4Na2IOOU1Ci/ - wUg2tPdhfupkGIPzTt32SXu3pQX4aAYqx0AEaeJ3ptU/223MOj2Z40HZui1SL0yHxdsT - 283+7DokK0bontWXs0j69cFVklLF+txi0untOXTxGuvtbzj0vu6uMErB9qhph6HVKlnH - kwaoGLPYrc0JnmZt1Kx7nmAQ+xxE3RaNA7E/IisHqX9m5C57JAMtN6WdWUTaLjWeIs8n 2Q== -Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com - [209.85.128.70]) - by mx08-00252a01.pphosted.com with ESMTP id 2nr7cnhbky-1 - (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK) - for ; Fri, 16 Nov 2018 14:39:55 +0000 -Received: by mail-wm1-f70.google.com with SMTP id d26-v6so24770633wmb.4 - for ; - Fri, 16 Nov 2018 06:39:55 -0800 (PST) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=raspberrypi.org; s=google; - h=from:to:cc:subject:date:message-id; - bh=0v+Gt0Sb75ntX3ncvTo0T5q/LQ9HrDko5y0UEkZ6WVk=; - b=TFhWj6OD0WYvVWhFc0RE+UyQKaAMuO0Da2ahzvPlkfTJj3d26Mf15Ai4ipbfJy4x9d - RLlgEH8Vj457x2kK3QmlXDC5Cy+kzp6FiZi2aFSBinKjY06Dmt4LElzlaye8szk/IuJ/ - f6HdjG3Rmt6Ys/Kx8fct+p87NyvHNe/yfCGnUj5k1nz7+m2eApkvTkGxzYe5SXn5s1Jp - nv/30o4+CcPFK3SqAWo+GkWgD/Uae+4gCP38KxLx6dsYxCS7/kqIF46ac9WmAx9k44Jz - Wt18Pe1A7rIj38vRwLv2JuwUkZrOlAhav52EyDM/03QbgRKzEM9En5DYV2GFAqR1Xc3w - qLzw== -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id; - bh=0v+Gt0Sb75ntX3ncvTo0T5q/LQ9HrDko5y0UEkZ6WVk=; - b=gFrGygir8lioHrOeF0abzZ3xbTuyQEnk7F/vaRJmx5SyMuxe5SQqcM/PozflvPaB4w - wHeng0ewo0t6S/xfZo9EpTKB19L5L5XnrxLoseo+tagkZJkCH2Bcw7dsBzALR2upGwrT - SfHywXMeCKH9fRAu3/Hj0W934lZDwMG3xqmWWebQ/wqDBE41Nk/dl9iHnGKp9QN61uee - Qv0jpp3sglzprI5CIEQqkElIXAF/jjnPqbknf+5nUyH4xUoe+CzTaEldVeHFc4iTerOZ - b48uPgriPJVTq7Gr7L8qWJ5yLZWqenG4sAIpLbanD8Mkw8ogaybVfIZyzrSKoTbtBiSa - oOEg== -X-Gm-Message-State: AA+aEWaOCOYCkmegm7N2wWsL8XdrnmJenH+HXps2b21WEUnrWH3tCofP - O07nsIq/s30FFJwtMB9dMCaWwCmc2iSWxn7hnqFhagZMyuYFYcJ1Zs5caqAV/LcSS/BBriTI4M7 - 4RALk0oVU/TiJvemnTTRSwFul6+hCHLFRxRM= -X-Received: by 2002:a1c:1cc4:: with SMTP id - c187-v6mr2937585wmc.75.1542379194749; - Fri, 16 Nov 2018 06:39:54 -0800 (PST) -X-Google-Smtp-Source: - AFSGD/XjyVsHsmDi+oKxMsFZ/hLG36TQdg1uDC2wO1upiuvyI+72rZz3AeAffzu3LWvkW8xxAI1e0w== -X-Received: by 2002:a1c:1cc4:: with SMTP id - c187-v6mr2937565wmc.75.1542379194454; - Fri, 16 Nov 2018 06:39:54 -0800 (PST) -Received: from jamesh-VirtualBox.pitowers.org - ([2a00:2381:fdf7:14:4419:8784:6076:3820]) - by smtp.gmail.com with ESMTPSA id a7sm26247594wrx.26.2018.11.16.06.39.53 - (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); - Fri, 16 Nov 2018 06:39:53 -0800 (PST) -From: James Hughes -To: eric@anholt.net, stefan.wahren@i2se.com, - linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org -Subject: [PATCH v3] firmware: raspberrypi: Fix firmware calls with large - buffers -Date: Fri, 16 Nov 2018 14:39:07 +0000 -Message-Id: <20181116143907.6149-1-james.hughes@raspberrypi.org> -X-Mailer: git-send-email 2.17.1 -X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , - definitions=2018-11-16_09:, , signatures=0 -X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 -X-CRM114-CacheID: sfid-20181116_144007_971248_9AC931E8 -X-CRM114-Status: GOOD ( 21.12 ) -X-BeenThere: linux-arm-kernel@lists.infradead.org -X-Mailman-Version: 2.1.21 -Precedence: list -List-Id: -List-Unsubscribe: - , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: - , - -Cc: James Hughes -MIME-Version: 1.0 -Content-Type: text/plain; charset="us-ascii" -Sender: "linux-arm-kernel" -Errors-To: - linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org -X-Virus-Scanned: ClamAV using ClamSMTP - -Commit a1547e0bca51 ("firmware: raspberrypi: Remove VLA usage") -moved away from VLA's to a fixed maximum size for mailbox data. -However, some mailbox calls use larger data buffers -than the maximum allowed in that change. This fix therefor -moves from using fixed buffers to kmalloc to ensure all sizes -are catered for. - -There is some documentation, which is somewhat out of date, -on the mailbox calls here : -https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface - -Fixes: a1547e0bca51 ("firmware: raspberrypi: Remove VLA usage") - -Signed-off-by: James Hughes -Reviewed-by: Eric Anholt ---- - drivers/firmware/raspberrypi.c | 35 +++++++++++++++++----------------- - 1 file changed, 18 insertions(+), 17 deletions(-) - -v2: Changes to commit message and format only. No code change. -v3: Moved declaration of header back to original position - -diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c -index a200a2174611..44eb99807e33 100644 ---- a/drivers/firmware/raspberrypi.c -+++ b/drivers/firmware/raspberrypi.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - - #define MBOX_MSG(chan, data28) (((data28) & ~0xf) | ((chan) & 0xf)) -@@ -21,8 +22,6 @@ - #define MBOX_DATA28(msg) ((msg) & ~0xf) - #define MBOX_CHAN_PROPERTY 8 - --#define MAX_RPI_FW_PROP_BUF_SIZE 32 -- - static struct platform_device *rpi_hwmon; - - struct rpi_firmware { -@@ -144,28 +143,30 @@ EXPORT_SYMBOL_GPL(rpi_firmware_property_list); - int rpi_firmware_property(struct rpi_firmware *fw, - u32 tag, void *tag_data, size_t buf_size) - { -- /* Single tags are very small (generally 8 bytes), so the -- * stack should be safe. -- */ -- u8 data[sizeof(struct rpi_firmware_property_tag_header) + -- MAX_RPI_FW_PROP_BUF_SIZE]; -- struct rpi_firmware_property_tag_header *header = -- (struct rpi_firmware_property_tag_header *)data; -+ struct rpi_firmware_property_tag_header *header; - int ret; - -- if (WARN_ON(buf_size > sizeof(data) - sizeof(*header))) -- return -EINVAL; -+ /* Some mailboxes can use over 1k bytes. Rather than checking -+ * size and using stack or kmalloc depending on requirements, -+ * just use kmalloc. Mailboxes don't get called enough to worry -+ * too much about the time taken in the allocation. -+ */ -+ void *data = kmalloc(sizeof(*header) + buf_size, GFP_KERNEL); - -+ if (!data) -+ return -ENOMEM; -+ -+ header = data; - header->tag = tag; - header->buf_size = buf_size; - header->req_resp_size = 0; -- memcpy(data + sizeof(struct rpi_firmware_property_tag_header), -- tag_data, buf_size); -+ memcpy(data + sizeof(*header), tag_data, buf_size); -+ -+ ret = rpi_firmware_property_list(fw, data, buf_size + sizeof(*header)); -+ -+ memcpy(tag_data, data + sizeof(*header), buf_size); - -- ret = rpi_firmware_property_list(fw, &data, buf_size + sizeof(*header)); -- memcpy(tag_data, -- data + sizeof(struct rpi_firmware_property_tag_header), -- buf_size); -+ kfree(data); - - return ret; - } diff --git a/sources b/sources index 9d136c2ad..fade7e17f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-4.20.tar.xz) = e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4 -SHA512 (patch-4.20-git4.xz) = 923c85ddb79c38e9e20ad55bcb860de8d0dec8b151f5a94be84afa50ad9199f8407ed601e3a6ec397da6f01f7871bb2ed7bdb2b55ee59dfb0849f395806a1710 +SHA512 (patch-4.20-git5.xz) = 8735ac8abb204356c45534465cb14765c6e36d0b062b469bb4a439d64c1fafc81b650841ba5cfde93fc23d81266c9981b72cec52ad22777f52b96082b9b69e81