From 2b8fc08eebdd84852c7cc1abc4322dd88fa9ca03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sun, 16 Jan 2022 14:53:14 +0100 Subject: [PATCH] Adjust broken patches and remove deprecated (#3403) --- config/kernel/linux-media-edge.config | 2 +- config/kernel/linux-meson64-edge.config | 9 ++++- config/kernel/linux-rockchip64-edge.config | 26 +++++++----- config/kernel/linux-sunxi-edge.config | 10 ++++- ...kchip-Disable-CDN-DP-on-Pinebook-Pro.patch | 40 ------------------- .../general-bluetooth-add-new-quirk.patch | 4 +- .../rk3328-dtsi-fix-mali-node.patch | 13 ------ ...w-quirk-for-broken-local-ext-feature.patch | 21 +++++----- .../general-bluetooth-add-new-quirk.patch | 4 +- 9 files changed, 47 insertions(+), 82 deletions(-) delete mode 100644 patch/kernel/archive/rockchip64-5.15/board-pbp-arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch delete mode 100644 patch/kernel/archive/rockchip64-5.15/rk3328-dtsi-fix-mali-node.patch diff --git a/config/kernel/linux-media-edge.config b/config/kernel/linux-media-edge.config index 71c5ebe8c5..86494986f5 100644 --- a/config/kernel/linux-media-edge.config +++ b/config/kernel/linux-media-edge.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.16.0-rc8 Kernel Configuration +# Linux/arm64 5.16.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y diff --git a/config/kernel/linux-meson64-edge.config b/config/kernel/linux-meson64-edge.config index 817fd2dd82..d6a0985f2f 100644 --- a/config/kernel/linux-meson64-edge.config +++ b/config/kernel/linux-meson64-edge.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.15.1 Kernel Configuration +# Linux/arm64 5.15.15 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y @@ -2227,6 +2227,7 @@ CONFIG_MTD_BLOCK=y # 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 is not set # CONFIG_MTD_PARTITIONED_MASTER is not set @@ -9120,6 +9121,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_PMSG is not set 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_SYSV_FS=m CONFIG_UFS_FS=m CONFIG_UFS_FS_WRITE=y @@ -9192,7 +9198,6 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m -CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS_COMMON=m diff --git a/config/kernel/linux-rockchip64-edge.config b/config/kernel/linux-rockchip64-edge.config index 85999e3247..d2ebe5e843 100644 --- a/config/kernel/linux-rockchip64-edge.config +++ b/config/kernel/linux-rockchip64-edge.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.15.2 Kernel Configuration +# Linux/arm64 5.15.15 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y @@ -2157,6 +2157,7 @@ CONFIG_MTD_BLOCK=y # CONFIG_SSFDC is not set # CONFIG_SM_FTL is not set # CONFIG_MTD_OOPS is not set +CONFIG_MTD_PSTORE=m # CONFIG_MTD_SWAP is not set # CONFIG_MTD_PARTITIONED_MASTER is not set @@ -2844,6 +2845,9 @@ CONFIG_IGB_HWMON=y CONFIG_IGBVF=y # CONFIG_IXGB is not set CONFIG_IXGBE=m +CONFIG_IXGBE_HWMON=y +# CONFIG_IXGBE_DCB is not set +CONFIG_IXGBE_IPSEC=y # CONFIG_IXGBEVF is not set # CONFIG_I40E is not set # CONFIG_I40EVF is not set @@ -4807,10 +4811,9 @@ CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SIR=m CONFIG_RC_XBOX_DVD=m # CONFIG_IR_TOY is not set -CONFIG_CEC_CORE=m +CONFIG_CEC_CORE=y CONFIG_CEC_NOTIFIER=y CONFIG_CEC_PIN=y -CONFIG_MEDIA_CEC_RC=y CONFIG_CEC_PIN_ERROR_INJ=y CONFIG_MEDIA_CEC_SUPPORT=y # CONFIG_CEC_CH7322 is not set @@ -5548,8 +5551,9 @@ CONFIG_DRM_MIPI_DBI=m CONFIG_DRM_MIPI_DSI=y CONFIG_DRM_DP_AUX_BUS=m # CONFIG_DRM_DP_AUX_CHARDEV is not set +# CONFIG_DRM_DEBUG_MM is not set # CONFIG_DRM_DEBUG_SELFTEST is not set -CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_KMS_HELPER=y # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 @@ -5719,17 +5723,17 @@ CONFIG_DRM_TI_SN65DSI83=m CONFIG_DRM_TI_TPD12S015=m CONFIG_DRM_ANALOGIX_ANX6345=m CONFIG_DRM_ANALOGIX_ANX78XX=m -CONFIG_DRM_ANALOGIX_DP=m +CONFIG_DRM_ANALOGIX_DP=y # CONFIG_DRM_ANALOGIX_ANX7625 is not set CONFIG_DRM_I2C_ADV7511=m # CONFIG_DRM_I2C_ADV7511_AUDIO is not set CONFIG_DRM_I2C_ADV7511_CEC=y # CONFIG_DRM_CDNS_MHDP8546 is not set -CONFIG_DRM_DW_HDMI=m +CONFIG_DRM_DW_HDMI=y # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set CONFIG_DRM_DW_HDMI_I2S_AUDIO=m CONFIG_DRM_DW_HDMI_CEC=m -CONFIG_DRM_DW_MIPI_DSI=m +CONFIG_DRM_DW_MIPI_DSI=y # end of Display Interface Bridges CONFIG_DRM_ETNAVIV=m @@ -5765,7 +5769,7 @@ CONFIG_DRM_LEGACY=y # CONFIG_DRM_MGA is not set # CONFIG_DRM_VIA is not set # CONFIG_DRM_SAVAGE is not set -CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m +CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y # # Frame buffer Devices @@ -8595,6 +8599,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_PMSG is not set 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_SYSV_FS=m CONFIG_UFS_FS=m CONFIG_UFS_FS_WRITE=y @@ -8667,7 +8676,6 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m -CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS_COMMON=m diff --git a/config/kernel/linux-sunxi-edge.config b/config/kernel/linux-sunxi-edge.config index fe73763e5e..86126c06c3 100644 --- a/config/kernel/linux-sunxi-edge.config +++ b/config/kernel/linux-sunxi-edge.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.15.0 Kernel Configuration +# Linux/arm 5.15.15 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y @@ -846,6 +846,7 @@ CONFIG_IDLE_PAGE_TRACKING=y # CONFIG_PERCPU_STATS is not set # CONFIG_GUP_TEST is not set CONFIG_KMAP_LOCAL=y +CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y # # Data Access Monitoring @@ -1949,6 +1950,7 @@ CONFIG_MTD_BLOCK_RO=m # CONFIG_SSFDC is not set # CONFIG_SM_FTL is not set # CONFIG_MTD_OOPS is not set +CONFIG_MTD_PSTORE=m # CONFIG_MTD_SWAP is not set # CONFIG_MTD_PARTITIONED_MASTER is not set @@ -7367,6 +7369,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" # CONFIG_PSTORE_PMSG is not set # CONFIG_PSTORE_FTRACE is not set 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_SYSV_FS=m CONFIG_UFS_FS=m # CONFIG_UFS_FS_WRITE is not set @@ -7439,7 +7446,6 @@ CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y CONFIG_SMB_SERVER=m -CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMBFS_COMMON=m diff --git a/patch/kernel/archive/rockchip64-5.15/board-pbp-arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch b/patch/kernel/archive/rockchip64-5.15/board-pbp-arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch deleted file mode 100644 index 5e74bfcfac..0000000000 --- a/patch/kernel/archive/rockchip64-5.15/board-pbp-arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch +++ /dev/null @@ -1,40 +0,0 @@ -arm64: dts: rockchip: Disable CDN DP on Pinebook Pro -Message ID 20210715164101.11486-1-matthias.bgg@kernel.org (mailing list archive) -State New -Headers show -Series arm64: dts: rockchip: Disable CDN DP on Pinebook Pro | expand -Commit Message -Matthias Brugger July 15, 2021, 4:41 p.m. UTC - -From: Matthias Brugger - -The CDN DP needs a PHY and a extcon to work correctly. But no extcon is -provided by the device-tree, which leads to an error: -cdn-dp fec00000.dp: [drm:cdn_dp_probe [rockchipdrm]] *ERROR* missing extcon or phy -cdn-dp: probe of fec00000.dp failed with error -22 - -Disable the CDN DP to make graphic work on the Pinebook Pro. - -Reported-by: Guillaume Gardet -Signed-off-by: Matthias Brugger - ---- - - arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts -index 2b5f001ff4a6..9e5d07f5712e 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts -@@ -385,10 +385,6 @@ mains_charger: dc-charger { - }; - }; - --&cdn_dp { -- status = "okay"; --}; -- - &cpu_b0 { - cpu-supply = <&vdd_cpu_b>; - }; diff --git a/patch/kernel/archive/rockchip64-5.15/general-bluetooth-add-new-quirk.patch b/patch/kernel/archive/rockchip64-5.15/general-bluetooth-add-new-quirk.patch index c2e57fe5eb..a4614e12b3 100644 --- a/patch/kernel/archive/rockchip64-5.15/general-bluetooth-add-new-quirk.patch +++ b/patch/kernel/archive/rockchip64-5.15/general-bluetooth-add-new-quirk.patch @@ -30,9 +30,9 @@ index 16ab6ce87883..8e4c16210d18 100644 + * don't actually support features declared there. + */ + HCI_QUIRK_BROKEN_LOCAL_EXT_FTR_MAX_PAGE, - }; - /* HCI device flags */ + /* + * When this quirk is set, LE tx power is not queried on startup diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index cfeaee347db3..df3232828978 100644 --- a/net/bluetooth/hci_event.c diff --git a/patch/kernel/archive/rockchip64-5.15/rk3328-dtsi-fix-mali-node.patch b/patch/kernel/archive/rockchip64-5.15/rk3328-dtsi-fix-mali-node.patch deleted file mode 100644 index beb707d170..0000000000 --- a/patch/kernel/archive/rockchip64-5.15/rk3328-dtsi-fix-mali-node.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index bbdb19a3e..f623d5fd9 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -603,7 +603,7 @@ - - gpu: gpu@ff300000 { - compatible = "rockchip,rk3328-mali", "arm,mali-450"; -- reg = <0x0 0xff300000 0x0 0x40000>; -+ reg = <0x0 0xff300000 0x0 0x30000>; - interrupts = , - , - , diff --git a/patch/kernel/archive/sunxi-5.15/megous/Bluetooth-Add-new-quirk-for-broken-local-ext-feature.patch b/patch/kernel/archive/sunxi-5.15/megous/Bluetooth-Add-new-quirk-for-broken-local-ext-feature.patch index 662a263a67..a4614e12b3 100644 --- a/patch/kernel/archive/sunxi-5.15/megous/Bluetooth-Add-new-quirk-for-broken-local-ext-feature.patch +++ b/patch/kernel/archive/sunxi-5.15/megous/Bluetooth-Add-new-quirk-for-broken-local-ext-feature.patch @@ -1,8 +1,7 @@ -From b3509370bbff7edd3fb7399e08f3ac8030067f05 Mon Sep 17 00:00:00 2001 -From: Vasily Khoruzhick +From f60f1605f5056d543e49fc625ffeeb05621f2ad3 Mon Sep 17 00:00:00 2001 +From: Vasily Khoruzhick Date: Wed, 31 Oct 2018 19:40:18 -0700 -Subject: [PATCH 299/467] Bluetooth: Add new quirk for broken local ext - features max_page +Subject: Bluetooth: Add new quirk for broken local ext features max_page Some adapters (e.g. RTL8723CS) advertise that they have more than 2 pages for local ext features, but they don't support any features @@ -17,10 +16,10 @@ Signed-off-by: Vasily Khoruzhick 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h -index b80415011..715577a60 100644 +index 16ab6ce87883..8e4c16210d18 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h -@@ -246,6 +246,13 @@ enum { +@@ -238,6 +238,13 @@ enum { * HCI after resume. */ HCI_QUIRK_NO_SUSPEND_NOTIFIER, @@ -31,14 +30,14 @@ index b80415011..715577a60 100644 + * don't actually support features declared there. + */ + HCI_QUIRK_BROKEN_LOCAL_EXT_FTR_MAX_PAGE, - }; - /* HCI device flags */ + /* + * When this quirk is set, LE tx power is not queried on startup diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c -index 0bca035bf..095889890 100644 +index cfeaee347db3..df3232828978 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c -@@ -725,7 +725,9 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev, +@@ -700,7 +700,9 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev, if (rp->status) return; @@ -50,5 +49,5 @@ index 0bca035bf..095889890 100644 if (rp->page < HCI_MAX_PAGES) -- -2.34.0 +cgit v1.2.3 diff --git a/patch/kernel/media-edge/general-bluetooth-add-new-quirk.patch b/patch/kernel/media-edge/general-bluetooth-add-new-quirk.patch index c2e57fe5eb..a4614e12b3 100644 --- a/patch/kernel/media-edge/general-bluetooth-add-new-quirk.patch +++ b/patch/kernel/media-edge/general-bluetooth-add-new-quirk.patch @@ -30,9 +30,9 @@ index 16ab6ce87883..8e4c16210d18 100644 + * don't actually support features declared there. + */ + HCI_QUIRK_BROKEN_LOCAL_EXT_FTR_MAX_PAGE, - }; - /* HCI device flags */ + /* + * When this quirk is set, LE tx power is not queried on startup diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index cfeaee347db3..df3232828978 100644 --- a/net/bluetooth/hci_event.c