From patchwork Tue May 22 10:49:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shrirang Bagul X-Patchwork-Id: 918157 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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40qspf5JNcz9s7G; Tue, 22 May 2018 20:49:30 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fL4r0-0006OR-SC; Tue, 22 May 2018 10:49:18 +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 1fL4qz-0006OA-Sa for kernel-team@lists.ubuntu.com; Tue, 22 May 2018 10:49:17 +0000 Received: from 1.general.shrirang--bagul.uk.vpn ([10.172.198.4] helo=snb-ubuntu.taipei.internal) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fL4qz-0007OD-3G for kernel-team@lists.ubuntu.com; Tue, 22 May 2018 10:49:17 +0000 From: Shrirang Bagul To: kernel-team@lists.ubuntu.com Subject: [SRU OEM-B][PATCH 1/3] UBUNTU: SAUCE: Bluetooth: btrsi: add hci detach for hibernation and poweroff Date: Tue, 22 May 2018 18:49:10 +0800 Message-Id: <20180522104912.22203-2-shrirang.bagul@canonical.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180522104912.22203-1-shrirang.bagul@canonical.com> References: <20180522104912.22203-1-shrirang.bagul@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" From: Ganapathi Raju BugLink: http://bugs.launchpad.net/bugs/1772626 As we missed to detach HCI, while entering power off or hibernation, an extra hci interface gets created whenever system is woken up, to avoid this we added hci_detach() in rsi_disconnect(), rsi_freeze(), and rsi_shutdown() functions which are invoked for these tests. This patch fixes the issue Signed-off-by: Ganapathi Raju Signed-off-by: Shrirang Bagul --- drivers/net/wireless/rsi/rsi_91x_sdio.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c index 27e2b07ef9c7..a38580ef3c27 100644 --- a/drivers/net/wireless/rsi/rsi_91x_sdio.c +++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c @@ -1142,7 +1142,12 @@ static void rsi_disconnect(struct sdio_func *pfunction) rsi_mac80211_detach(adapter); mdelay(10); - +#ifdef CONFIG_RSI_COEX + if (adapter->priv->coex_mode > 1 && adapter->priv->bt_adapter) { + rsi_bt_ops.detach(adapter->priv->bt_adapter); + adapter->priv->bt_adapter = NULL; + } +#endif /* Reset Chip */ rsi_reset_chip(adapter); @@ -1325,6 +1330,13 @@ static int rsi_freeze(struct device *dev) rsi_dbg(ERR_ZONE, "##### Device can not wake up through WLAN\n"); +#ifdef CONFIG_RSI_COEX + if (common->coex_mode > 1 && common->bt_adapter) { + rsi_bt_ops.detach(common->bt_adapter); + common->bt_adapter = NULL; + } +#endif + ret = rsi_sdio_disable_interrupts(pfunction); if (sdev->write_fail) @@ -1371,7 +1383,12 @@ static void rsi_shutdown(struct device *dev) if (rsi_config_wowlan(adapter, wowlan)) rsi_dbg(ERR_ZONE, "Failed to configure WoWLAN\n"); - +#ifdef CONFIG_RSI_COEX + if (adapter->priv->coex_mode > 1 && adapter->priv->bt_adapter) { + rsi_bt_ops.detach(adapter->priv->bt_adapter); + adapter->priv->bt_adapter = NULL; + } +#endif rsi_sdio_disable_interrupts(sdev->pfunction); if (sdev->write_fail) From patchwork Tue May 22 10:49:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shrirang Bagul X-Patchwork-Id: 918155 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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40qspf34qSz9s70; Tue, 22 May 2018 20:49:30 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fL4r4-0006Oy-4D; Tue, 22 May 2018 10:49:22 +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 1fL4r2-0006Oi-MB for kernel-team@lists.ubuntu.com; Tue, 22 May 2018 10:49:20 +0000 Received: from 1.general.shrirang--bagul.uk.vpn ([10.172.198.4] helo=snb-ubuntu.taipei.internal) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fL4r1-0007OD-TW for kernel-team@lists.ubuntu.com; Tue, 22 May 2018 10:49:20 +0000 From: Shrirang Bagul To: kernel-team@lists.ubuntu.com Subject: [SRU OEM-B][PATCH 3/3] UBUNTU: SAUCE: Bluetooth:btrsi: fix bt cmd timeout issue Date: Tue, 22 May 2018 18:49:12 +0800 Message-Id: <20180522104912.22203-4-shrirang.bagul@canonical.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180522104912.22203-1-shrirang.bagul@canonical.com> References: <20180522104912.22203-1-shrirang.bagul@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" From: Ganapathi Raju BugLink: http://bugs.launchpad.net/bugs/1772626 Sometimes data is coming with unaligned address from kernel BT stack, if unaligned address is passed, some data in payload is stripped when packet is loaded to firmware. Fixed this by moving the data to aligned address. Signed-off-by: Ganapathi Raju Signed-off-by: Shrirang Bagul --- drivers/bluetooth/btrsi.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/bluetooth/btrsi.c b/drivers/bluetooth/btrsi.c index 5dfb2f462f42..3ef62b906576 100644 --- a/drivers/bluetooth/btrsi.c +++ b/drivers/bluetooth/btrsi.c @@ -22,8 +22,9 @@ #include #include -#define RSI_HEADROOM_FOR_BT_HAL 16 +#define RSI_SDIO_DMA_ALIGN 8 #define RSI_FRAME_DESC_SIZE 16 +#define RSI_HEADROOM_FOR_BT_HAL (RSI_FRAME_DESC_SIZE + RSI_SDIO_DMA_ALIGN) struct rsi_hci_adapter { void *priv; @@ -74,6 +75,15 @@ static int rsi_hci_send_pkt(struct hci_dev *hdev, struct sk_buff *skb) bt_cb(new_skb)->pkt_type = hci_skb_pkt_type(skb); kfree_skb(skb); skb = new_skb; + if (!IS_ALIGNED((unsigned long)skb->data, RSI_SDIO_DMA_ALIGN)) { + u8 *skb_data = skb->data; + int skb_len = skb->len; + + skb_push(skb, RSI_SDIO_DMA_ALIGN); + skb_pull(skb, PTR_ALIGN(skb->data, + RSI_SDIO_DMA_ALIGN) - skb->data); + memmove(skb->data, skb_data, skb_len); + } } return h_adapter->proto_ops->coex_send_pkt(h_adapter->priv, skb,