From cec324a838cb3e8f08aaa7e710a62c9b800df364 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Fri, 1 Mar 2024 09:09:32 -0800 Subject: [PATCH] linux-lenovo-21bx: upgrade to 6.8 (MR 4914) - kconfig changes from `pmb kconfig migrate` - also enabled some USB serial drivers I wanted - Reverts 7dcd3e014aa7, fixing bluetooth connections. This commit was added after 6.8-rc6 and causes a regression. A revert was sent upstream: https://lore.kernel.org/all/ZfMStHjwtCT1SW3z@hovoldconsulting.com/ [ci:skip-build] already built successfully in CI --- ...-hci_qca-Set-BDA-quirk-bit-if-fwnode.patch | 45 +++++++++++++++++++ device/testing/linux-lenovo-21bx/APKBUILD | 10 +++-- .../config-lenovo-21bx.aarch64 | 23 ++++++---- 3 files changed, 65 insertions(+), 13 deletions(-) create mode 100644 device/testing/linux-lenovo-21bx/0001-Revert-Bluetooth-hci_qca-Set-BDA-quirk-bit-if-fwnode.patch diff --git a/device/testing/linux-lenovo-21bx/0001-Revert-Bluetooth-hci_qca-Set-BDA-quirk-bit-if-fwnode.patch b/device/testing/linux-lenovo-21bx/0001-Revert-Bluetooth-hci_qca-Set-BDA-quirk-bit-if-fwnode.patch new file mode 100644 index 000000000..c3765f755 --- /dev/null +++ b/device/testing/linux-lenovo-21bx/0001-Revert-Bluetooth-hci_qca-Set-BDA-quirk-bit-if-fwnode.patch @@ -0,0 +1,45 @@ +From 878e850ce509e875624c703e4cf3c5ae0b66aa15 Mon Sep 17 00:00:00 2001 +From: Clayton Craft +Date: Wed, 13 Mar 2024 09:31:55 -0700 +Subject: [PATCH] Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode + exists in DT" + +This reverts commit 7dcd3e014aa7faeeaf4047190b22d8a19a0db696. +--- + drivers/bluetooth/hci_qca.c | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c +index edd2a81b4d5e..f989c05f8177 100644 +--- a/drivers/bluetooth/hci_qca.c ++++ b/drivers/bluetooth/hci_qca.c +@@ -7,7 +7,6 @@ + * + * Copyright (C) 2007 Texas Instruments, Inc. + * Copyright (c) 2010, 2012, 2018 The Linux Foundation. All rights reserved. +- * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * + * Acknowledgements: + * This file is based on hci_ll.c, which was... +@@ -1904,17 +1903,7 @@ static int qca_setup(struct hci_uart *hu) + case QCA_WCN6750: + case QCA_WCN6855: + case QCA_WCN7850: +- +- /* Set BDA quirk bit for reading BDA value from fwnode property +- * only if that property exist in DT. +- */ +- if (fwnode_property_present(dev_fwnode(hdev->dev.parent), "local-bd-address")) { +- set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); +- bt_dev_info(hdev, "setting quirk bit to read BDA from fwnode later"); +- } else { +- bt_dev_dbg(hdev, "local-bd-address` is not present in the devicetree so not setting quirk bit for BDA"); +- } +- ++ set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); + hci_set_aosp_capable(hdev); + + ret = qca_read_soc_version(hdev, &ver, soc_type); +-- +2.44.0 + diff --git a/device/testing/linux-lenovo-21bx/APKBUILD b/device/testing/linux-lenovo-21bx/APKBUILD index 19c28170a..1ffb5b1ee 100644 --- a/device/testing/linux-lenovo-21bx/APKBUILD +++ b/device/testing/linux-lenovo-21bx/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: Konrad Dybcio # Co-Maintainer: Clayton Craft pkgname=linux-lenovo-21bx -pkgver=6.8_rc6 +pkgver=6.8 pkgrel=0 -_commit="693828cc4c48f5b1088aaf44d413634c365dd422" +_commit="935f2e13e13d2dcfb923d3b0881c905861a7a9ce" pkgdesc="Lenovo ThinkPad X13s kernel fork" arch="aarch64" _carch="arm64" @@ -34,6 +34,7 @@ source=" $pkgname-$_commit.tar.gz::https://github.com/jhovold/$_repository/archive/$_commit.tar.gz $_config 0001-drm-panel-edp-Add-timings-for-BOE-NV133WUM-N63.patch + 0001-Revert-Bluetooth-hci_qca-Set-BDA-quirk-bit-if-fwnode.patch " builddir="$srcdir/linux-$_commit" _outdir="out" @@ -64,7 +65,8 @@ package() { } sha512sums=" -bf18ece5d138205c182c184a6a4f8881988a7b1bbe1b904636b27806f1f7fc3c6d30b93ba36f558cccdc158d2b71ad0b2cfbcb3a8ad0bcc4b7f9b5abcce5bec0 linux-lenovo-21bx-693828cc4c48f5b1088aaf44d413634c365dd422.tar.gz -60d22eedee8b267d73bcae053ff76aa2b9111b53cf48819feb97806044a5538103ff975975583829ed848d9d911d22832d0dbcd8a4dbfc1b116de9537b7b1558 config-lenovo-21bx.aarch64 +1df1bb75597376aacf7edc80e47f7c06c6aa5b4cc1da1fc1ca62ecc1be6a3c59a17a5034a8391e5c9e60443cd353be6e8ca7487df141263404e15877bcba3c60 linux-lenovo-21bx-935f2e13e13d2dcfb923d3b0881c905861a7a9ce.tar.gz +908fb5923c3d191dd3137d69e249c649b070cf25375134f921d8bf46c335e8b43942785ba59b9083e45103a957ba5897906e35f936ee6980cc21dbfb42bc3c9d config-lenovo-21bx.aarch64 fac2fc6cd033c30d1abea6ac77c173945f77e7c3db9e547b6e2a68969e731d4d69f6093fbc3a0b7068dddffe224692edb7175a953bc28f9449b8018c91835d31 0001-drm-panel-edp-Add-timings-for-BOE-NV133WUM-N63.patch +24d29ebf94650ba70af133f67d0f9e3c64265d051e14797d4c712f96c213cabf3c8035a788b9c2ae1f9351ed61910ff302908ff51dfbb4b26fa944b861aa7838 0001-Revert-Bluetooth-hci_qca-Set-BDA-quirk-bit-if-fwnode.patch " diff --git a/device/testing/linux-lenovo-21bx/config-lenovo-21bx.aarch64 b/device/testing/linux-lenovo-21bx/config-lenovo-21bx.aarch64 index 5ba31c498..cc8f92945 100644 --- a/device/testing/linux-lenovo-21bx/config-lenovo-21bx.aarch64 +++ b/device/testing/linux-lenovo-21bx/config-lenovo-21bx.aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.8.0-rc6 Kernel Configuration +# Linux/arm64 6.8.0 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014" CONFIG_CC_IS_GCC=y @@ -175,7 +175,7 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" -CONFIG_GCC11_NO_ARRAY_BOUNDS=y +CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_GCC_NO_STRINGOP_OVERFLOW=y CONFIG_CC_NO_STRINGOP_OVERFLOW=y @@ -4485,7 +4485,11 @@ CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_DBGCAP is not set # CONFIG_USB_XHCI_PCI_RENESAS is not set CONFIG_USB_XHCI_PLATFORM=y -# CONFIG_USB_EHCI_HCD is not set +CONFIG_USB_EHCI_HCD=m +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +CONFIG_USB_EHCI_TT_NEWSCHED=y +# CONFIG_USB_EHCI_FSL is not set +# CONFIG_USB_EHCI_HCD_PLATFORM is not set # CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_MAX3421_HCD is not set @@ -4497,8 +4501,8 @@ CONFIG_USB_XHCI_PLATFORM=y # # USB Device Class drivers # -# CONFIG_USB_ACM is not set -# CONFIG_USB_PRINTER is not set +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m # CONFIG_USB_WDM is not set # CONFIG_USB_TMC is not set @@ -4557,18 +4561,18 @@ CONFIG_USB_DWC3_QCOM=y # CONFIG_USB_SERIAL=y # CONFIG_USB_SERIAL_CONSOLE is not set -# CONFIG_USB_SERIAL_GENERIC is not set -# CONFIG_USB_SERIAL_SIMPLE is not set +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_SIMPLE=m # CONFIG_USB_SERIAL_AIRCABLE is not set # CONFIG_USB_SERIAL_ARK3116 is not set # CONFIG_USB_SERIAL_BELKIN is not set # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set -# CONFIG_USB_SERIAL_CP210X is not set +CONFIG_USB_SERIAL_CP210X=m # CONFIG_USB_SERIAL_CYPRESS_M8 is not set # CONFIG_USB_SERIAL_EMPEG is not set -CONFIG_USB_SERIAL_FTDI_SIO=y +CONFIG_USB_SERIAL_FTDI_SIO=m # CONFIG_USB_SERIAL_VISOR is not set # CONFIG_USB_SERIAL_IPAQ is not set # CONFIG_USB_SERIAL_IR is not set @@ -4625,6 +4629,7 @@ CONFIG_USB_SERIAL_PL2303=m # CONFIG_USB_APPLEDISPLAY is not set # CONFIG_USB_QCOM_EUD is not set # CONFIG_APPLE_MFI_FASTCHARGE is not set +# CONFIG_USB_SISUSBVGA is not set # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_IOWARRIOR is not set