From patchwork Tue Feb 13 12:01:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amitkumar Karwar X-Patchwork-Id: 10216007 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0A6BC601C2 for ; Tue, 13 Feb 2018 12:13:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0C362898D for ; Tue, 13 Feb 2018 12:13:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E56A9289B1; Tue, 13 Feb 2018 12:13:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A6B82898D for ; Tue, 13 Feb 2018 12:13:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935106AbeBMMNr (ORCPT ); Tue, 13 Feb 2018 07:13:47 -0500 Received: from mail-it0-f65.google.com ([209.85.214.65]:56275 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934924AbeBMMNp (ORCPT ); Tue, 13 Feb 2018 07:13:45 -0500 Received: by mail-it0-f65.google.com with SMTP id b66so10796674itd.5; Tue, 13 Feb 2018 04:13:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=60Qq06LJERVLn6IU8x2x8EnuX+JfLgf4CNM+mIWNkDM=; b=jyAE3iyx4crMbOEjRqVEye0Sp98+j2FV4LAkg1I+BFExBe2HFvWwynA/mTepWMPKQu ZpeunA44ZJF9Mzce9TZWshY/dC11SWgEYlNKmnb31pvCzr/bXZdjcGZVtnyyyz2dVlHL epkwDBFnjPw6rpFgeQHrvanDdcqgIUnzrdCH/UtJUUtB4GzPTQ54fqy4VbwMPTvV5RRZ c92Gaq3RZQtdCKZaU++w/7pyrQg9yfyquBW6NWS6m9KJctaXZi58Mawt97UOAGwFTjuB 2r1GQ5E6M8WrzM7QtrAuJXLWD3mJRW3rxch+XWmVLbeZ+yf9finxoRBcaihebjDAPzx5 98tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=60Qq06LJERVLn6IU8x2x8EnuX+JfLgf4CNM+mIWNkDM=; b=llHBM+I7qLyyBjlZfaxS/nqBWGRSiE4AZZj6s7B0QBL9ooBZRuf+d5fWj+XM92KIL+ spUT5cLJRc2X+7k1amI8lx3LY1m86kdtcbBi8lrbsQg8VLpeJSCwy0Cuqd/Pwad8agb6 HWV9Hj/+73khl+wsoNXEEv5l/8dZAUe+84b1FKMLxb56xSPj0LF+cOIgGNDUG8tHY2Nj lt0J3WnbVrFNlDDQRUcaeB+w129QzXj64ttks0if7MCUeZxh6Qqd1nNLshX12BO368pG kBpOB+xXmMToqjV8PwAcgqsh8NGvHCA/AAM7EDIWgu9+YEaFjeoDFpRWmjUTJ/zw3843 vPFQ== X-Gm-Message-State: APf1xPAL7jYwkC2PwI93uBda1EprV9UGW7Xf723+MytxglEkYxxr/Epa nNu30//MO3q47GLIbVcu0X4= X-Google-Smtp-Source: AH8x225N16cgVXaV8ek/ht8fXnS5BA74Y94G9zDdN5yLaPHAT/AuE7wg+dC4f3j5a3zDWmF7U/5p6Q== X-Received: by 10.36.34.139 with SMTP id o133mr1338998ito.82.1518524025058; Tue, 13 Feb 2018 04:13:45 -0800 (PST) Received: from cpu185.redpinesignals.com ([203.196.161.90]) by smtp.gmail.com with ESMTPSA id y186sm15684994ioy.57.2018.02.13.04.13.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Feb 2018 04:13:44 -0800 (PST) From: Amitkumar Karwar To: Kalle Valo , marcel@holtmann.org Cc: linux-wireless@vger.kernel.org, Amitkumar Karwar , Prameela Rani Garnepudi , linux-bluetooth@vger.kernel.org Subject: [v6 8/8] rsi: sdio changes to support BT Date: Tue, 13 Feb 2018 17:31:44 +0530 Message-Id: <1518523304-3424-9-git-send-email-amitkarwar@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518523304-3424-1-git-send-email-amitkarwar@gmail.com> References: <1518523304-3424-1-git-send-email-amitkarwar@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Prameela Rani Garnepudi Queue number is correctly updated for BT traffic. Also, kzalloc instead of kmalloc is used for Rx packet allocation. Signed-off-by: Prameela Rani Garnepudi Signed-off-by: Amitkumar Karwar --- drivers/net/wireless/rsi/rsi_91x_sdio.c | 2 ++ drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c index 5722736..beb18d0 100644 --- a/drivers/net/wireless/rsi/rsi_91x_sdio.c +++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c @@ -763,6 +763,8 @@ static int rsi_sdio_host_intf_write_pkt(struct rsi_hw *adapter, int status; queueno = ((pkt[1] >> 4) & 0xf); + if (queueno == RSI_BT_MGMT_Q || queueno == RSI_BT_DATA_Q) + queueno = RSI_BT_Q; num_blocks = len / block_size; diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c b/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c index 169c981..6e74261 100644 --- a/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c +++ b/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c @@ -103,7 +103,7 @@ static int rsi_process_pkt(struct rsi_common *common) rcv_pkt_len = (num_blks * 256); - common->rx_data_pkt = kmalloc(rcv_pkt_len, GFP_KERNEL); + common->rx_data_pkt = kzalloc(rcv_pkt_len, GFP_KERNEL); if (!common->rx_data_pkt) { rsi_dbg(ERR_ZONE, "%s: Failed in memory allocation\n", __func__);