From b1c64264f9913f970043a542787ab9a24958afa3 Mon Sep 17 00:00:00 2001 From: Kernel Build Daemon Date: Nov 22 2021 07:08:33 +0000 Subject: Merge branch 'SLE15-SP4' into SLE15-SP4-AZURE --- diff --git a/config/arm64/default b/config/arm64/default index c565428..dce4528 100644 --- a/config/arm64/default +++ b/config/arm64/default @@ -2462,6 +2462,7 @@ CONFIG_RFD_FTL=m CONFIG_SSFDC=m # CONFIG_SM_FTL is not set CONFIG_MTD_OOPS=m +CONFIG_MTD_PSTORE=m CONFIG_MTD_SWAP=m CONFIG_MTD_PARTITIONED_MASTER=y @@ -10989,6 +10990,14 @@ CONFIG_PSTORE_CONSOLE=y CONFIG_PSTORE_PMSG=y CONFIG_PSTORE_FTRACE=y CONFIG_PSTORE_RAM=m +CONFIG_PSTORE_ZONE=m +CONFIG_PSTORE_BLK=m +CONFIG_PSTORE_BLK_BLKDEV="" +CONFIG_PSTORE_BLK_KMSG_SIZE=64 +CONFIG_PSTORE_BLK_MAX_REASON=2 +CONFIG_PSTORE_BLK_PMSG_SIZE=64 +CONFIG_PSTORE_BLK_CONSOLE_SIZE=64 +CONFIG_PSTORE_BLK_FTRACE_SIZE=64 CONFIG_SYSV_FS=m CONFIG_UFS_FS=m CONFIG_UFS_FS_WRITE=y diff --git a/config/armv7hl/default b/config/armv7hl/default index 5b86157..cb76a42 100644 --- a/config/armv7hl/default +++ b/config/armv7hl/default @@ -2431,6 +2431,7 @@ CONFIG_RFD_FTL=m CONFIG_SSFDC=m # CONFIG_SM_FTL is not set CONFIG_MTD_OOPS=m +CONFIG_MTD_PSTORE=m CONFIG_MTD_SWAP=m CONFIG_MTD_PARTITIONED_MASTER=y @@ -10890,6 +10891,14 @@ CONFIG_PSTORE_CONSOLE=y CONFIG_PSTORE_PMSG=y CONFIG_PSTORE_FTRACE=y CONFIG_PSTORE_RAM=m +CONFIG_PSTORE_ZONE=m +CONFIG_PSTORE_BLK=m +CONFIG_PSTORE_BLK_BLKDEV="" +CONFIG_PSTORE_BLK_KMSG_SIZE=64 +CONFIG_PSTORE_BLK_MAX_REASON=2 +CONFIG_PSTORE_BLK_PMSG_SIZE=64 +CONFIG_PSTORE_BLK_CONSOLE_SIZE=64 +CONFIG_PSTORE_BLK_FTRACE_SIZE=64 CONFIG_SYSV_FS=m CONFIG_UFS_FS=m CONFIG_UFS_FS_WRITE=y diff --git a/config/ppc64le/default b/config/ppc64le/default index 5dbf6ae..375ba21 100644 --- a/config/ppc64le/default +++ b/config/ppc64le/default @@ -1903,6 +1903,7 @@ CONFIG_MTD_BLOCK=m # CONFIG_SSFDC is not set # CONFIG_SM_FTL is not set # CONFIG_MTD_OOPS is not set +# CONFIG_MTD_PSTORE is not set CONFIG_MTD_SWAP=m CONFIG_MTD_PARTITIONED_MASTER=y @@ -5838,6 +5839,14 @@ CONFIG_PSTORE_CONSOLE=y CONFIG_PSTORE_PMSG=y CONFIG_PSTORE_FTRACE=y CONFIG_PSTORE_RAM=m +CONFIG_PSTORE_ZONE=m +CONFIG_PSTORE_BLK=m +CONFIG_PSTORE_BLK_BLKDEV="" +CONFIG_PSTORE_BLK_KMSG_SIZE=64 +CONFIG_PSTORE_BLK_MAX_REASON=2 +CONFIG_PSTORE_BLK_PMSG_SIZE=64 +CONFIG_PSTORE_BLK_CONSOLE_SIZE=64 +CONFIG_PSTORE_BLK_FTRACE_SIZE=64 # CONFIG_SYSV_FS is not set CONFIG_UFS_FS=m CONFIG_UFS_FS_WRITE=y diff --git a/config/s390x/default b/config/s390x/default index e1e8997..0c1170c 100644 --- a/config/s390x/default +++ b/config/s390x/default @@ -3459,6 +3459,7 @@ CONFIG_PSTORE_CONSOLE=y CONFIG_PSTORE_PMSG=y CONFIG_PSTORE_FTRACE=y # CONFIG_PSTORE_RAM is not set +# CONFIG_PSTORE_BLK is not set # CONFIG_SYSV_FS is not set CONFIG_UFS_FS=m # CONFIG_UFS_FS_WRITE is not set diff --git a/config/x86_64/default b/config/x86_64/default index 1eb9511..5758459 100644 --- a/config/x86_64/default +++ b/config/x86_64/default @@ -2362,6 +2362,7 @@ CONFIG_RFD_FTL=m CONFIG_SSFDC=m # CONFIG_SM_FTL is not set CONFIG_MTD_OOPS=m +CONFIG_MTD_PSTORE=m CONFIG_MTD_SWAP=m CONFIG_MTD_PARTITIONED_MASTER=y @@ -9452,6 +9453,14 @@ CONFIG_PSTORE_CONSOLE=y CONFIG_PSTORE_PMSG=y CONFIG_PSTORE_FTRACE=y CONFIG_PSTORE_RAM=m +CONFIG_PSTORE_ZONE=m +CONFIG_PSTORE_BLK=m +CONFIG_PSTORE_BLK_BLKDEV="" +CONFIG_PSTORE_BLK_KMSG_SIZE=64 +CONFIG_PSTORE_BLK_MAX_REASON=2 +CONFIG_PSTORE_BLK_PMSG_SIZE=64 +CONFIG_PSTORE_BLK_CONSOLE_SIZE=64 +CONFIG_PSTORE_BLK_FTRACE_SIZE=64 CONFIG_SYSV_FS=m CONFIG_UFS_FS=m CONFIG_UFS_FS_WRITE=y diff --git a/patches.suse/ACPI-Add-stubs-for-wakeup-handler-functions.patch b/patches.suse/ACPI-Add-stubs-for-wakeup-handler-functions.patch new file mode 100644 index 0000000..fb5461f --- /dev/null +++ b/patches.suse/ACPI-Add-stubs-for-wakeup-handler-functions.patch @@ -0,0 +1,48 @@ +From e9380df851878cee71df5a1c7611584421527f7e Mon Sep 17 00:00:00 2001 +From: Mario Limonciello +Date: Sun, 31 Oct 2021 20:48:52 -0500 +Subject: [PATCH] ACPI: Add stubs for wakeup handler functions +Git-commit: e9380df851878cee71df5a1c7611584421527f7e +Patch-mainline: v5.16-rc2 +References: git-fixes + +The commit ddfd9dcf270c ("ACPI: PM: Add acpi_[un]register_wakeup_handler()") +added new functions for drivers to use during the s2idle wakeup path, but +didn't add stubs for when CONFIG_ACPI wasn't set. + +Add those stubs in for other drivers to be able to use. + +Fixes: ddfd9dcf270c ("ACPI: PM: Add acpi_[un]register_wakeup_handler()") +Acked-by: Rafael J. Wysocki +Signed-off-by: Mario Limonciello +Link: https://lore.kernel.org/r/20211101014853.6177-1-mario.limonciello@amd.com +Signed-off-by: Linus Walleij +Acked-by: Takashi Iwai + +--- + include/linux/acpi.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/include/linux/acpi.h b/include/linux/acpi.h +index 143ce7e0bee1..668d007f0917 100644 +--- a/include/linux/acpi.h ++++ b/include/linux/acpi.h +@@ -974,6 +974,15 @@ static inline int acpi_get_local_address(acpi_handle handle, u32 *addr) + return -ENODEV; + } + ++static inline int acpi_register_wakeup_handler(int wake_irq, ++ bool (*wakeup)(void *context), void *context) ++{ ++ return -ENXIO; ++} ++ ++static inline void acpi_unregister_wakeup_handler( ++ bool (*wakeup)(void *context), void *context) { } ++ + #endif /* !CONFIG_ACPI */ + + #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC +-- +2.26.2 + diff --git a/patches.suse/Revert-mark-pstore-blk-as-broken.patch b/patches.suse/Revert-mark-pstore-blk-as-broken.patch new file mode 100644 index 0000000..bcd6671 --- /dev/null +++ b/patches.suse/Revert-mark-pstore-blk-as-broken.patch @@ -0,0 +1,41 @@ +From d1faacbf67b1944f0e0c618dc581d929263f6fe9 Mon Sep 17 00:00:00 2001 +From: Kees Cook +Date: Tue, 16 Nov 2021 10:15:59 -0800 +Subject: [PATCH] Revert "mark pstore-blk as broken" +Git-commit: d1faacbf67b1944f0e0c618dc581d929263f6fe9 +Patch-mainline: v5.16-rc2 +References: git-fixes + +This reverts commit d07f3b081ee632268786601f55e1334d1f68b997. + +pstore-blk was fixed to avoid the unwanted APIs in commit 7bb9557b48fc +("pstore/blk: Use the normal block device I/O path"), which landed in +the same release as the commit adding BROKEN. + +Cc: Jens Axboe +Cc: Christoph Hellwig +Cc: stable@vger.kernel.org +Signed-off-by: Kees Cook +Link: https://lore.kernel.org/r/20211116181559.3975566-1-keescook@chromium.org +Signed-off-by: Jens Axboe +Acked-by: Takashi Iwai + +--- + fs/pstore/Kconfig | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/fs/pstore/Kconfig b/fs/pstore/Kconfig +index 328da35da390..8adabde685f1 100644 +--- a/fs/pstore/Kconfig ++++ b/fs/pstore/Kconfig +@@ -173,7 +173,6 @@ config PSTORE_BLK + tristate "Log panic/oops to a block device" + depends on PSTORE + depends on BLOCK +- depends on BROKEN + select PSTORE_ZONE + default n + help +-- +2.26.2 + diff --git a/patches.suse/pinctrl-qcom-sdm845-Enable-dual-edge-errata.patch b/patches.suse/pinctrl-qcom-sdm845-Enable-dual-edge-errata.patch new file mode 100644 index 0000000..1aa4b56 --- /dev/null +++ b/patches.suse/pinctrl-qcom-sdm845-Enable-dual-edge-errata.patch @@ -0,0 +1,48 @@ +From 3a3a100473d2f6ebf9bdfe6efedd7e18de724388 Mon Sep 17 00:00:00 2001 +From: Bjorn Andersson +Date: Mon, 1 Nov 2021 22:41:15 -0500 +Subject: [PATCH] pinctrl: qcom: sdm845: Enable dual edge errata +Git-commit: 3a3a100473d2f6ebf9bdfe6efedd7e18de724388 +Patch-mainline: v5.16-rc2 +References: git-fixes + +It has been observed that dual edge triggered wakeirq GPIOs on SDM845 +doesn't trigger interrupts on the falling edge. + +Enabling wakeirq_dual_edge_errata for SDM845 indicates that the PDC in +SDM845 suffers from the same problem described, and worked around, by +Doug in 'c3c0c2e18d94 ("pinctrl: qcom: Handle broken/missing PDC dual +edge IRQs on sc7180")', so enable the workaround for SDM845 as well. + +The specific problem seen without this is that gpio-keys does not detect +the falling edge of the LID gpio on the Lenovo Yoga C630 and as such +consistently reports the LID as closed. + +Fixes: e35a6ae0eb3a ("pinctrl/msm: Setup GPIO chip in hierarchy") +Signed-off-by: Bjorn Andersson +Tested-by: Steev Klimaszewski +Reviewed-by: Douglas Anderson +Reviewed-by: Stephen Boyd +Link: https://lore.kernel.org/r/20211102034115.1946036-1-bjorn.andersson@linaro.org +Signed-off-by: Linus Walleij +Acked-by: Takashi Iwai + +--- + drivers/pinctrl/qcom/pinctrl-sdm845.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/pinctrl/qcom/pinctrl-sdm845.c b/drivers/pinctrl/qcom/pinctrl-sdm845.c +index c51793f6546f..fdfd7b8f3a76 100644 +--- a/drivers/pinctrl/qcom/pinctrl-sdm845.c ++++ b/drivers/pinctrl/qcom/pinctrl-sdm845.c +@@ -1310,6 +1310,7 @@ static const struct msm_pinctrl_soc_data sdm845_pinctrl = { + .ngpios = 151, + .wakeirq_map = sdm845_pdc_map, + .nwakeirq_map = ARRAY_SIZE(sdm845_pdc_map), ++ .wakeirq_dual_edge_errata = true, + }; + + static const struct msm_pinctrl_soc_data sdm845_acpi_pinctrl = { +-- +2.26.2 + diff --git a/patches.suse/pinctrl-qcom-sm8350-Correct-UFS-and-SDC-offsets.patch b/patches.suse/pinctrl-qcom-sm8350-Correct-UFS-and-SDC-offsets.patch new file mode 100644 index 0000000..31ba285 --- /dev/null +++ b/patches.suse/pinctrl-qcom-sm8350-Correct-UFS-and-SDC-offsets.patch @@ -0,0 +1,48 @@ +From 62209e805b5c68577602a5803a71d8e2e11ee0d3 Mon Sep 17 00:00:00 2001 +From: Bjorn Andersson +Date: Thu, 4 Nov 2021 10:08:35 -0700 +Subject: [PATCH] pinctrl: qcom: sm8350: Correct UFS and SDC offsets +Git-commit: 62209e805b5c68577602a5803a71d8e2e11ee0d3 +Patch-mainline: v5.16-rc2 +References: git-fixes + +The downstream TLMM binding covers a group of TLMM-related hardware +blocks, but the upstream binding only captures the particular block +related to controlling the TLMM pins from an OS. In the translation of +the driver from downstream, the offset of 0x100000 was lost for the UFS +and SDC pingroups. + +Fixes: d5d348a3271f ("pinctrl: qcom: Add SM8350 pinctrl driver") +Signed-off-by: Bjorn Andersson +Reviewed-by: Vinod Koul +Reviewed-by: Vladimir Zapolskiy +Link: https://lore.kernel.org/r/20211104170835.1993686-1-bjorn.andersson@linaro.org +Signed-off-by: Linus Walleij +Acked-by: Takashi Iwai + +--- + drivers/pinctrl/qcom/pinctrl-sm8350.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/pinctrl/qcom/pinctrl-sm8350.c b/drivers/pinctrl/qcom/pinctrl-sm8350.c +index 4d8f8636c2b3..1c042d39380c 100644 +--- a/drivers/pinctrl/qcom/pinctrl-sm8350.c ++++ b/drivers/pinctrl/qcom/pinctrl-sm8350.c +@@ -1597,10 +1597,10 @@ static const struct msm_pingroup sm8350_groups[] = { + [200] = PINGROUP(200, qdss_gpio, _, _, _, _, _, _, _, _), + [201] = PINGROUP(201, _, _, _, _, _, _, _, _, _), + [202] = PINGROUP(202, _, _, _, _, _, _, _, _, _), +- [203] = UFS_RESET(ufs_reset, 0x1d8000), +- [204] = SDC_PINGROUP(sdc2_clk, 0x1cf000, 14, 6), +- [205] = SDC_PINGROUP(sdc2_cmd, 0x1cf000, 11, 3), +- [206] = SDC_PINGROUP(sdc2_data, 0x1cf000, 9, 0), ++ [203] = UFS_RESET(ufs_reset, 0xd8000), ++ [204] = SDC_PINGROUP(sdc2_clk, 0xcf000, 14, 6), ++ [205] = SDC_PINGROUP(sdc2_cmd, 0xcf000, 11, 3), ++ [206] = SDC_PINGROUP(sdc2_data, 0xcf000, 9, 0), + }; + + static const struct msm_gpio_wakeirq_map sm8350_pdc_map[] = { +-- +2.26.2 + diff --git a/patches.suse/pinctrl-ralink-include-ralink_regs.h-in-pinctrl-mt76.patch b/patches.suse/pinctrl-ralink-include-ralink_regs.h-in-pinctrl-mt76.patch new file mode 100644 index 0000000..35bf994 --- /dev/null +++ b/patches.suse/pinctrl-ralink-include-ralink_regs.h-in-pinctrl-mt76.patch @@ -0,0 +1,37 @@ +From a5b9703fe11cd1d6d7a60102aa2abe686dc1867f Mon Sep 17 00:00:00 2001 +From: Sergio Paracuellos +Date: Sun, 31 Oct 2021 07:40:46 +0100 +Subject: [PATCH] pinctrl: ralink: include 'ralink_regs.h' in 'pinctrl-mt7620.c' +Git-commit: a5b9703fe11cd1d6d7a60102aa2abe686dc1867f +Patch-mainline: v5.16-rc2 +References: git-fixes + +mt7620.h, included by pinctrl-mt7620.c, mentions MT762X_SOC_MT7628AN +declared in ralink_regs.h. + +Fixes: 745ec436de72 ("pinctrl: ralink: move MT7620 SoC pinmux config into a new 'pinctrl-mt7620.c' file") +Cc: stable@vger.kernel.org +Signed-off-by: Luiz Angelo Daros de Luca +Signed-off-by: Sergio Paracuellos +Link: https://lore.kernel.org/r/20211031064046.13533-1-sergio.paracuellos@gmail.com +Signed-off-by: Linus Walleij +Acked-by: Takashi Iwai + +--- + drivers/pinctrl/ralink/pinctrl-mt7620.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/pinctrl/ralink/pinctrl-mt7620.c b/drivers/pinctrl/ralink/pinctrl-mt7620.c +index 425d55a2ee19..6853b5b8b0fe 100644 +--- a/drivers/pinctrl/ralink/pinctrl-mt7620.c ++++ b/drivers/pinctrl/ralink/pinctrl-mt7620.c +@@ -1,5 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0-only + ++#include + #include + #include + #include +-- +2.26.2 + diff --git a/series.conf b/series.conf index 33e76ab..2a8e1c1 100644 --- a/series.conf +++ b/series.conf @@ -5351,6 +5351,11 @@ patches.suse/drm-cma-helper-Release-non-coherent-memory-with-dma_.patch patches.suse/fbdev-Prevent-probing-generic-drivers-if-a-FB-is-alr.patch patches.suse/Revert-drm-i915-tgl-dsi-Gate-the-ddi-clocks-after-pl.patch + patches.suse/ACPI-Add-stubs-for-wakeup-handler-functions.patch + patches.suse/pinctrl-ralink-include-ralink_regs.h-in-pinctrl-mt76.patch + patches.suse/pinctrl-qcom-sdm845-Enable-dual-edge-errata.patch + patches.suse/pinctrl-qcom-sm8350-Correct-UFS-and-SDC-offsets.patch + patches.suse/Revert-mark-pstore-blk-as-broken.patch # paulmck/linux-rcu dev.2021.11.12a patches.suse/clocksource-Forgive-repeated-long-latency-watchdog-c.patch diff --git a/supported.conf b/supported.conf index 2440cc1..f2a1f26 100644 --- a/supported.conf +++ b/supported.conf @@ -2568,7 +2568,7 @@ drivers/mtd/mtd # needed by romfs and sfc bsc#444220 drivers/mtd/mtd_blkdevs # bsc#444220 drivers/mtd/mtdblock # bsc#444220 - drivers/mtd/mtdpstore +-!optional drivers/mtd/mtdpstore drivers/mtd/nand/nandcore drivers/mtd/nand/raw/fsl_ifc_nand drivers/mtd/nand/raw/nand @@ -4906,6 +4906,8 @@ -!optional fs/omfs/omfs - fs/orangefs/orangefs +base fs/overlayfs/overlay +-!optional fs/pstore/pstore_blk +-!optional fs/pstore/pstore_zone fs/pstore/* # Log panic/oops to persistent storage -!optional fs/qnx4/qnx4 -!optional fs/qnx6/qnx6