From patchwork Wed Jan 16 15:55:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 1025991 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43fsHr1p0jz9sD9; Thu, 17 Jan 2019 02:55:52 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1gjnXb-000677-7k; Wed, 16 Jan 2019 15:55:43 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gjnXZ-00066S-3C for kernel-team@lists.ubuntu.com; Wed, 16 Jan 2019 15:55:41 +0000 Received: from 1.general.ppisati.uk.vpn ([10.172.193.134] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1gjnXY-0001MI-Qw for kernel-team@lists.ubuntu.com; Wed, 16 Jan 2019 15:55:40 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] UBUNTU: SAUCE: btqcomsmd: introduce BT_QCOMSMD_HACK Date: Wed, 16 Jan 2019 16:55:38 +0100 Message-Id: <1547654139-18487-2-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547654139-18487-1-git-send-email-paolo.pisati@canonical.com> References: <1547654139-18487-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1810797 Signed-off-by: Paolo Pisati --- drivers/bluetooth/Kconfig | 7 +++++++ drivers/bluetooth/btqcomsmd.c | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig index 60e1c7d6986d..78f38d927e5c 100644 --- a/drivers/bluetooth/Kconfig +++ b/drivers/bluetooth/Kconfig @@ -378,4 +378,11 @@ config BT_QCOMSMD Say Y here to compile support for HCI over Qualcomm SMD into the kernel or say M to compile as a module. +config BT_QCOMSMD_HACK + bool "Don't forcefully hook hci setup()" + default n + help + Don't forcefully hook hci setup() in case a BD address wasn't + assigned to hcidev during qcomsmd_probe(). + endmenu diff --git a/drivers/bluetooth/btqcomsmd.c b/drivers/bluetooth/btqcomsmd.c index 2c9a5fc9137d..e77a7ab7e532 100644 --- a/drivers/bluetooth/btqcomsmd.c +++ b/drivers/bluetooth/btqcomsmd.c @@ -180,7 +180,12 @@ static int btqcomsmd_probe(struct platform_device *pdev) hdev->open = btqcomsmd_open; hdev->close = btqcomsmd_close; hdev->send = btqcomsmd_send; +#ifdef CONFIG_BT_QCOMSMD_HACK + if (bacmp(&btq->bdaddr, BDADDR_ANY)) + hdev->setup = btqcomsmd_setup; +#else hdev->setup = btqcomsmd_setup; +#endif hdev->set_bdaddr = qca_set_bdaddr_rome; ret = hci_register_dev(hdev); From patchwork Wed Jan 16 15:55:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 1025990 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43fsHq5lgkz9sD4; Thu, 17 Jan 2019 02:55:51 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1gjnXb-00066t-3L; Wed, 16 Jan 2019 15:55:43 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gjnXZ-00066Y-Jh for kernel-team@lists.ubuntu.com; Wed, 16 Jan 2019 15:55:41 +0000 Received: from 1.general.ppisati.uk.vpn ([10.172.193.134] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1gjnXZ-0001ML-B4 for kernel-team@lists.ubuntu.com; Wed, 16 Jan 2019 15:55:41 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] UBUNTU: [Config] arm64: snapdragon: BT_QCOMSMD_HACK=y Date: Wed, 16 Jan 2019 16:55:39 +0100 Message-Id: <1547654139-18487-3-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547654139-18487-1-git-send-email-paolo.pisati@canonical.com> References: <1547654139-18487-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1810797 Signed-off-by: Paolo Pisati --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/arm64/config.flavour.generic | 1 + debian.master/config/arm64/config.flavour.snapdragon | 1 + debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/i386/config.common.i386 | 1 + debian.master/config/ppc64el/config.common.ppc64el | 1 + 6 files changed, 6 insertions(+) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 042d09e68648..be26c080edeb 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -66,6 +66,7 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_UMEM=m CONFIG_BOUNCE=y CONFIG_BSD_DISKLABEL=y +# CONFIG_BT_QCOMSMD_HACK is not set CONFIG_C2PORT=m CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m diff --git a/debian.master/config/arm64/config.flavour.generic b/debian.master/config/arm64/config.flavour.generic index 4f774826a138..92b20b2ff086 100644 --- a/debian.master/config/arm64/config.flavour.generic +++ b/debian.master/config/arm64/config.flavour.generic @@ -3,6 +3,7 @@ # # CONFIG_ADV7511_SNAPDRAGON_HACKS is not set CONFIG_ARM_SDE_INTERFACE=y +# CONFIG_BT_QCOMSMD_HACK is not set CONFIG_COMMON_CLK_QCOM=m CONFIG_DRM=m CONFIG_DRM_I2C_ADV7511=m diff --git a/debian.master/config/arm64/config.flavour.snapdragon b/debian.master/config/arm64/config.flavour.snapdragon index dfb04bd286ea..c8d18d353ecc 100644 --- a/debian.master/config/arm64/config.flavour.snapdragon +++ b/debian.master/config/arm64/config.flavour.snapdragon @@ -3,6 +3,7 @@ # CONFIG_ADV7511_SNAPDRAGON_HACKS=y # CONFIG_ARM_SDE_INTERFACE is not set +CONFIG_BT_QCOMSMD_HACK=y CONFIG_COMMON_CLK_QCOM=y CONFIG_DRM=y CONFIG_DRM_I2C_ADV7511=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 30abd24e2ea3..cf93750d1243 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -64,6 +64,7 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_UMEM=m CONFIG_BOUNCE=y CONFIG_BSD_DISKLABEL=y +# CONFIG_BT_QCOMSMD_HACK is not set CONFIG_C2PORT=m CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 6029c21a8218..c7a6d60c543b 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -63,6 +63,7 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_UMEM=m CONFIG_BOUNCE=y CONFIG_BSD_DISKLABEL=y +# CONFIG_BT_QCOMSMD_HACK is not set CONFIG_C2PORT=m CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 21bdd552a16c..d050fc5c75c5 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -61,6 +61,7 @@ CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_UMEM=m CONFIG_BOUNCE=y CONFIG_BSD_DISKLABEL=y +# CONFIG_BT_QCOMSMD_HACK is not set CONFIG_C2PORT=m CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m