From patchwork Fri Jun 23 14:07:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amitkumar Karwar X-Patchwork-Id: 9806677 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 958226086C for ; Fri, 23 Jun 2017 14:10:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 83B832876C for ; Fri, 23 Jun 2017 14:10:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7762628773; Fri, 23 Jun 2017 14:10:46 +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 DB61F2876C for ; Fri, 23 Jun 2017 14:10:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753820AbdFWOKo (ORCPT ); Fri, 23 Jun 2017 10:10:44 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:35326 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750932AbdFWOKn (ORCPT ); Fri, 23 Jun 2017 10:10:43 -0400 Received: by mail-pg0-f68.google.com with SMTP id f127so6276403pgc.2 for ; Fri, 23 Jun 2017 07:10:43 -0700 (PDT) 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=COB5/x213jqdzwJejra72DWS0+1sGpN8grvvdtXIaP0=; b=kM2Bu+Fz1CYwpbnsY1BI5ZwMv3RU2f4+srS8+7ZnLjyQgURYNfKvQ5Dd2ZQjBqYQo6 SbTBy69sNXIJu2njrXb3XM4v5mKfsl3UxTUfiXpvKA57wzuzoz/RWwdMmQS1Gx/YfLcP zivIuTJD5W+Zom14NbrNk/0hpSEhx2oQCn6D6VqwsrSBMhRQiGPB0rTOxZd6LCT2Aneo pQ9Bx34wFfVos9jEYoj2zQWTCQBaSxygxFB7NeVNFe3yJzP2y0B+m6TBGzpzHT02gi2n RH3ILF4xkwl1J6lXnV4OB4kUKEb3qsu8uUU5vlgRPhtBWr37dLzWRZbHxgn5VtiOw+Se wZ9Q== 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=COB5/x213jqdzwJejra72DWS0+1sGpN8grvvdtXIaP0=; b=UrcKEKoEXtgqHzOcq7/HG00WOKK/0TOYoUmn/ZL78+k4AjIB7Yicvs754aucQaCXQC d/h5nTZQ7jkaC+Bt+hM+cXc2Shev3a11X2jQA5cd6L8VKdjx/UKADrA+C2ZHHpTPxeO2 3VpGgB06WDAxOu2srisDT4jpNeDpgbufkAZbTTPPWEgjvL4biTXspMiQ0DLOA78HAVwd MTx0RYbKab23nnGA2ddiNQOkSOfRcfGEw5HfuQidjyfOhdzHn3r4w9I8pADfDAu1t4Wx 0MhpR4oBGVAy1K+K8NjVAjLwDeuLGvOvM7eFBNheBKIH2680EqtRb4cQoyFvR9dB2tW5 0edw== X-Gm-Message-State: AKS2vOz+aGfJTWYxR10GuzGajTLIZeuPnSXhzkhKNMfa08pxeNGNqWDO XV0DSQH1giD6NA== X-Received: by 10.98.202.21 with SMTP id n21mr8460696pfg.158.1498227042460; Fri, 23 Jun 2017 07:10:42 -0700 (PDT) Received: from cpu185.redpinesignals.com ([203.196.161.90]) by smtp.gmail.com with ESMTPSA id z70sm9435917pgz.3.2017.06.23.07.10.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Jun 2017 07:10:42 -0700 (PDT) From: Amitkumar Karwar X-Google-Original-From: Amitkumar Karwar To: Kalle Valo Cc: linux-wireless@vger.kernel.org, Amitkumar Karwar , Prameela Rani Garnepudi , Amitkumar Karwar Subject: [PATCH 08/17] rsi: update set_channel command frame Date: Fri, 23 Jun 2017 19:37:27 +0530 Message-Id: <1498226856-6305-9-git-send-email-amit.karwar@redpinesignals.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498226856-6305-1-git-send-email-amit.karwar@redpinesignals.com> References: <1498226856-6305-1-git-send-email-amit.karwar@redpinesignals.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 TX command frame set_channel is modified to use common descriptor structure. Also DFS channel indication to firmware is added in the descriptor for dfs channels configuration. Signed-off-by: Prameela Rani Garnepudi Signed-off-by: Amitkumar Karwar --- drivers/net/wireless/rsi/rsi_91x_mgmt.c | 47 +++++++++++++++------------------ drivers/net/wireless/rsi/rsi_mgmt.h | 13 +++++++++ 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_mgmt.c b/drivers/net/wireless/rsi/rsi_91x_mgmt.c index a1616d7..c7945ea 100644 --- a/drivers/net/wireless/rsi/rsi_91x_mgmt.c +++ b/drivers/net/wireless/rsi/rsi_91x_mgmt.c @@ -969,12 +969,13 @@ int rsi_set_channel(struct rsi_common *common, struct ieee80211_channel *channel) { struct sk_buff *skb = NULL; - struct rsi_mac_frame *mgmt_frame; + struct rsi_chan_config *chan_cfg; + u16 frame_len = sizeof(struct rsi_chan_config); rsi_dbg(MGMT_TX_ZONE, "%s: Sending scan req frame\n", __func__); - skb = dev_alloc_skb(FRAME_DESC_SZ); + skb = dev_alloc_skb(frame_len); if (!skb) { rsi_dbg(ERR_ZONE, "%s: Failed in allocation of skb\n", __func__); @@ -985,37 +986,33 @@ int rsi_set_channel(struct rsi_common *common, dev_kfree_skb(skb); return 0; } - memset(skb->data, 0, FRAME_DESC_SZ); - mgmt_frame = (struct rsi_mac_frame *)skb->data; - - mgmt_frame->desc_word[0] = cpu_to_le16(RSI_WIFI_MGMT_Q << 12); - mgmt_frame->desc_word[1] = cpu_to_le16(SCAN_REQUEST); - mgmt_frame->desc_word[4] = cpu_to_le16(channel->hw_value); - - mgmt_frame->desc_word[4] |= - cpu_to_le16(((char)(channel->max_antenna_gain)) << 8); - mgmt_frame->desc_word[5] = - cpu_to_le16((char)(channel->max_antenna_gain)); - - mgmt_frame->desc_word[7] = cpu_to_le16(PUT_BBP_RESET | - BBP_REG_WRITE | - (RSI_RF_TYPE << 4)); - - if (!(channel->flags & IEEE80211_CHAN_NO_IR) && - !(channel->flags & IEEE80211_CHAN_RADAR)) { + memset(skb->data, 0, frame_len); + chan_cfg = (struct rsi_chan_config *)skb->data; + + rsi_set_len_qno(&chan_cfg->desc_dword0.len_qno, 0, RSI_WIFI_MGMT_Q); + chan_cfg->desc_dword0.frame_type = SCAN_REQUEST; + chan_cfg->channel_number = channel->hw_value; + chan_cfg->antenna_gain_offset_2g = channel->max_antenna_gain; + chan_cfg->antenna_gain_offset_5g = channel->max_antenna_gain; + chan_cfg->region_rftype = (RSI_RF_TYPE & 0xf) << 4; + + if ((channel->flags & IEEE80211_CHAN_NO_IR) || + (channel->flags & IEEE80211_CHAN_RADAR)) { + chan_cfg->antenna_gain_offset_2g |= RSI_CHAN_RADAR; + } else { if (common->tx_power < channel->max_power) - mgmt_frame->desc_word[6] = cpu_to_le16(common->tx_power); + chan_cfg->tx_power = cpu_to_le16(common->tx_power); else - mgmt_frame->desc_word[6] = cpu_to_le16(channel->max_power); + chan_cfg->tx_power = cpu_to_le16(channel->max_power); } - mgmt_frame->desc_word[7] = cpu_to_le16(common->priv->dfs_region); + chan_cfg->region_rftype |= (common->priv->dfs_region & 0xf); if (common->channel_width == BW_40MHZ) - mgmt_frame->desc_word[5] |= cpu_to_le16(0x1 << 8); + chan_cfg->channel_width = 0x1; common->channel = channel->hw_value; - skb_put(skb, FRAME_DESC_SZ); + skb_put(skb, frame_len); return rsi_send_internal_mgmt_frame(common, skb); } diff --git a/drivers/net/wireless/rsi/rsi_mgmt.h b/drivers/net/wireless/rsi/rsi_mgmt.h index d44c79f..2f49e55 100644 --- a/drivers/net/wireless/rsi/rsi_mgmt.h +++ b/drivers/net/wireless/rsi/rsi_mgmt.h @@ -166,6 +166,7 @@ #define DISALLOW_BROADCAST_DATA BIT(6) #define RSI_MPDU_DENSITY 0x8 +#define RSI_CHAN_RADAR BIT(7) enum opmode { STA_OPMODE = 1, @@ -306,6 +307,18 @@ struct rsi_bb_rf_prog { __le16 flags; } __packed; +struct rsi_chan_config { + struct rsi_cmd_desc_dword0 desc_dword0; + struct rsi_cmd_desc_dword1 desc_dword1; + u8 channel_number; + u8 antenna_gain_offset_2g; + u8 antenna_gain_offset_5g; + u8 channel_width; + __le16 tx_power; + u8 region_rftype; + u8 flags; +} __packed; + struct rsi_vap_caps { __le16 desc_word[8]; u8 mac_addr[6];