From patchwork Fri Jun 23 14:07:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amitkumar Karwar X-Patchwork-Id: 9806689 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 A108D6086C for ; Fri, 23 Jun 2017 14:11:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90EB32876C for ; Fri, 23 Jun 2017 14:11:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8595D28773; Fri, 23 Jun 2017 14:11:06 +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 262D72876C for ; Fri, 23 Jun 2017 14:11:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754193AbdFWOLE (ORCPT ); Fri, 23 Jun 2017 10:11:04 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:32818 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754080AbdFWOLD (ORCPT ); Fri, 23 Jun 2017 10:11:03 -0400 Received: by mail-pf0-f194.google.com with SMTP id w12so7547517pfk.0 for ; Fri, 23 Jun 2017 07:11:03 -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=XeMM9B4CQ6FK7TgUWODqQyPK7DqPUIdKYmL5s0nf1Og=; b=hm8YHwyHy64pazBDpEUYylsFTv14/Yi4dWbzCq0dxqpNpcSHv38UzbvqoDgAOX1/VP 8Y1YRJi0TDRuvh0y9ft4rTASWqHOL8OEvskJiAh7Xua3Rd4Ih5nCfZKDvczBqVeCMzqi TfCYJH6AJTM0JidUBtFb4zT7xcP3QCyAIfvEOr0KBGsIpbHkOPQNAcidlKsPm1ZOup78 yVTUqFyNAtZOgxFR8vcpMBNTAgpbKfOYNn6W4k7OKL5wdEj2RSgzPaXwb4vMaO4W6EWd hy/+3ju7kkMMZx4wIrJBWNaGbQBXsajytokf6P9FZWGM5VB7tTYPn0pjxZQDP/nwarr/ V74A== 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=XeMM9B4CQ6FK7TgUWODqQyPK7DqPUIdKYmL5s0nf1Og=; b=qwhrQLbqiJqrpcrtJ/ekI+1mdvwDwAqVG6lbiFt2vhLBMdGr4Bj6MmWL/A5qJhQEGD dBPbt2oZHqSv2c02nq2WcseyU7d4HR433qbOXWsEfU2K3hVlyMEImV5MXvvCwFcijqtx KdwwGnxK7g34c7luDowwa4m0LE7MHtk91rKJoIEHeLNlvHByLrz3NZ/g+LB8P4hvXXZy JRKmwWClmhEox4T9or1B+BqBxOVSsvwksSbk0RvJdxJOkKytmHYSe5B5Hwac4EUV6gg0 A39SqGLF/Hzu4WGVSyi37zbsME8qO7P/Ebr3uKcW9MoBgxWFURV5p68tgGJ/5hm4ytwO bdOw== X-Gm-Message-State: AKS2vOwW3VAia4ESOEny0cN3l10eR+j/j8ReZPMU7IKT6bh78tqH6xii U50fkxn16Zb3/Q== X-Received: by 10.99.173.6 with SMTP id g6mr8591168pgf.1.1498227062367; Fri, 23 Jun 2017 07:11:02 -0700 (PDT) Received: from cpu185.redpinesignals.com ([203.196.161.90]) by smtp.gmail.com with ESMTPSA id z70sm9435917pgz.3.2017.06.23.07.11.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Jun 2017 07:11:01 -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 14/17] rsi: update tx command frame block/unblock data Date: Fri, 23 Jun 2017 19:37:33 +0530 Message-Id: <1498226856-6305-15-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 block/unblock data is modified to use common descriptor structure. Signed-off-by: Prameela Rani Garnepudi Signed-off-by: Amitkumar Karwar --- drivers/net/wireless/rsi/rsi_91x_mgmt.c | 16 +++++++++------- drivers/net/wireless/rsi/rsi_mgmt.h | 13 +++++++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_mgmt.c b/drivers/net/wireless/rsi/rsi_91x_mgmt.c index 3b1e4e4..c7f4964 100644 --- a/drivers/net/wireless/rsi/rsi_91x_mgmt.c +++ b/drivers/net/wireless/rsi/rsi_91x_mgmt.c @@ -1331,7 +1331,7 @@ static int rsi_eeprom_read(struct rsi_common *common) */ int rsi_send_block_unblock_frame(struct rsi_common *common, bool block_event) { - struct rsi_mac_frame *mgmt_frame; + struct rsi_block_unblock_data *mgmt_frame; struct sk_buff *skb; rsi_dbg(MGMT_TX_ZONE, "%s: Sending block/unblock frame\n", __func__); @@ -1344,23 +1344,25 @@ int rsi_send_block_unblock_frame(struct rsi_common *common, bool block_event) } memset(skb->data, 0, FRAME_DESC_SZ); - mgmt_frame = (struct rsi_mac_frame *)skb->data; + mgmt_frame = (struct rsi_block_unblock_data *)skb->data; - mgmt_frame->desc_word[0] = cpu_to_le16(RSI_WIFI_MGMT_Q << 12); - mgmt_frame->desc_word[1] = cpu_to_le16(BLOCK_HW_QUEUE); + rsi_set_len_qno(&mgmt_frame->desc_dword0.len_qno, 0, RSI_WIFI_MGMT_Q); + mgmt_frame->desc_dword0.frame_type = BLOCK_HW_QUEUE; + mgmt_frame->host_quiet_info = QUIET_INFO_VALID; if (block_event) { rsi_dbg(INFO_ZONE, "blocking the data qs\n"); - mgmt_frame->desc_word[4] = cpu_to_le16(0xf); + mgmt_frame->block_q_bitmap = cpu_to_le16(0xf); + mgmt_frame->block_q_bitmap |= cpu_to_le16(0xf << 4); } else { rsi_dbg(INFO_ZONE, "unblocking the data qs\n"); - mgmt_frame->desc_word[5] = cpu_to_le16(0xf); + mgmt_frame->unblock_q_bitmap = cpu_to_le16(0xf); + mgmt_frame->unblock_q_bitmap |= cpu_to_le16(0xf << 4); } skb_put(skb, FRAME_DESC_SZ); 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 5df64d3..cb0b17e 100644 --- a/drivers/net/wireless/rsi/rsi_mgmt.h +++ b/drivers/net/wireless/rsi/rsi_mgmt.h @@ -381,6 +381,19 @@ struct rsi_auto_rate { __le16 supported_rates[40]; } __packed; +#define QUIET_INFO_VALID BIT(0) +#define QUIET_ENABLE BIT(1) +struct rsi_block_unblock_data { + struct rsi_cmd_desc_dword0 desc_dword0; + u8 xtend_desc_size; + u8 host_quiet_info; + __le16 reserved; + __le16 block_q_bitmap; + __le16 unblock_q_bitmap; + __le16 token; + __le16 flush_q_bitmap; +} __packed; + struct qos_params { __le16 cont_win_min_q; __le16 cont_win_max_q;