From patchwork Fri Sep 29 19:47:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9978601 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 2E1AE60329 for ; Fri, 29 Sep 2017 19:48:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20524298AD for ; Fri, 29 Sep 2017 19:48:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 155DB298AF; Fri, 29 Sep 2017 19:48:35 +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=-4.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID, URIBL_BLACK 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 06355298AD for ; Fri, 29 Sep 2017 19:48:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752599AbdI2Tsc (ORCPT ); Fri, 29 Sep 2017 15:48:32 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:38791 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752486AbdI2TsN (ORCPT ); Fri, 29 Sep 2017 15:48:13 -0400 Received: by mail-oi0-f66.google.com with SMTP id s145so284313oie.5 for ; Fri, 29 Sep 2017 12:48:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=7cNPlq2oR2iGNSkUbTEh4MotaTElHyDBi8lzvHnbTKM=; b=PpFhLo0uhA0Tzz4plg7JWq9LBE2IL27kCAczuqgsTRkHoE6kS1f216EmrQjbexdRrD ypzUNHH/ZwsuwafsdDvMOYB1WtU8NEBz6K8rCatcpCmTH0Arh1xpDS9lzep8fhXvakkW nUCrdHy8paN4kOZvVHw5eLU/DdBlsDdtjvq8rk+4RY6MLbJTy3i1mRIvfR4wYVu4S15c +x8E6bRJJgehHtD9ewtrkxi7HtzwVJFGCiWG4MIYxtnZ4vbxzQ2fJlXgOJXqmMpVeMAX TEq9sNN6sh+iOJAVAv6RvKBwr//L10BaFg4owF6Zi08Frn+CNnf3SzO/ASvLrLT8rrjt K24w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=7cNPlq2oR2iGNSkUbTEh4MotaTElHyDBi8lzvHnbTKM=; b=IhkAjFnUoDOlXHnFmdEI3iCjsUmQUN5SQBEzy3nBPTDY3XH6jvLuFsjkZyER0VvJkw OoZZYxk2se9lELyv4kfwsq9xxoHC3wZPTFb8N61G4jXMurdGJDPXuQAFxRIrMYHa05zV lAWeD9ZZtmCaCaqH1pAlNTGEVTw2wQlnwryeDOBqhOdf97B7XEn2m2jHP2wTmYPYXAzS q9RbtDMMWUpYMmP7kInrR8kMj7rtBM1PeyalBDy6nxQ51/1TqTvldqJfY5MqNVbsqwbe GpkhYoq2QsCfnZl15BqtOdYQdj/nJxDC9lwWs8IOQ7A4oVMVOC95WJVPuo1d9nVF6D0y Gkmg== X-Gm-Message-State: AMCzsaXehJBkOEUGBgq+L8gRWYJTSf+Ij6QKxshZEm8ftv1tyYoxRf7e llE3+WiAF9JvgpOu0nDvEy8= X-Google-Smtp-Source: AOwi7QAjZAGyMMdYCOVUwDULbTAGVK0xr1pA15jSDnKml/Hj/NRrzWAoFhOWk2KiY3GwREdTF2kzeA== X-Received: by 10.157.68.67 with SMTP id f3mr1614681otj.104.1506714492492; Fri, 29 Sep 2017 12:48:12 -0700 (PDT) Received: from Larrylap.localdomain (cpe-24-31-251-255.kc.res.rr.com. [24.31.251.255]) by smtp.gmail.com with ESMTPSA id v14sm2311062oif.39.2017.09.29.12.48.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Sep 2017 12:48:12 -0700 (PDT) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, Ping-Ke Shih , Larry Finger , Yan-Hsuan Chuang , Birming Chiu , Shaofu , Steven Ting Subject: [PATCH 05/10] rtlwifi: Add rtl_get_hal_edca_param() to generate register's format of EDCA. Date: Fri, 29 Sep 2017 14:47:55 -0500 Message-Id: <20170929194800.15617-6-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170929194800.15617-1-Larry.Finger@lwfinger.net> References: <20170929194800.15617-1-Larry.Finger@lwfinger.net> 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: Ping-Ke Shih Convert from the value of ieee80211_tx_queue_params to Realtek's register value. Signed-off-by: Ping-Ke Shih Signed-off-by: Larry Finger Cc: Yan-Hsuan Chuang Cc: Birming Chiu Cc: Shaofu Cc: Steven Ting --- drivers/net/wireless/realtek/rtlwifi/base.c | 36 +++++++++++++++++++++++++++++ drivers/net/wireless/realtek/rtlwifi/base.h | 4 ++++ 2 files changed, 40 insertions(+) diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c index e37d4c765f87..081b9507e02e 100644 --- a/drivers/net/wireless/realtek/rtlwifi/base.c +++ b/drivers/net/wireless/realtek/rtlwifi/base.c @@ -1557,6 +1557,42 @@ void rtl_wait_tx_report_acked(struct ieee80211_hw *hw, u32 wait_ms) "Wait 1ms (%d/%d) to disable key.\n", i, wait_ms); } } + +u32 rtl_get_hal_edca_param(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + enum wireless_mode wirelessmode, + struct ieee80211_tx_queue_params *param) +{ + u32 reg = 0; + u8 sifstime = 10; + u8 slottime = 20; + + /* AIFS = AIFSN * slot time + SIFS */ + switch (wirelessmode) { + case WIRELESS_MODE_A: + case WIRELESS_MODE_N_24G: + case WIRELESS_MODE_N_5G: + case WIRELESS_MODE_AC_5G: + case WIRELESS_MODE_AC_24G: + sifstime = 16; + slottime = 9; + break; + case WIRELESS_MODE_G: + slottime = (vif->bss_conf.use_short_slot ? 9 : 20); + break; + default: + break; + } + + reg |= (param->txop & 0x7FF) << 16; + reg |= (fls(param->cw_max) & 0xF) << 12; + reg |= (fls(param->cw_min) & 0xF) << 8; + reg |= (param->aifs & 0x0F) * slottime + sifstime; + + return reg; +} +EXPORT_SYMBOL_GPL(rtl_get_hal_edca_param); + /********************************************************* * * functions called by core.c diff --git a/drivers/net/wireless/realtek/rtlwifi/base.h b/drivers/net/wireless/realtek/rtlwifi/base.h index b56d1b7f5567..cfea9fc39a9f 100644 --- a/drivers/net/wireless/realtek/rtlwifi/base.h +++ b/drivers/net/wireless/realtek/rtlwifi/base.h @@ -137,6 +137,10 @@ void rtl_tx_report_handler(struct ieee80211_hw *hw, u8 *tmp_buf, u8 c2h_cmd_len); bool rtl_check_tx_report_acked(struct ieee80211_hw *hw); void rtl_wait_tx_report_acked(struct ieee80211_hw *hw, u32 wait_ms); +u32 rtl_get_hal_edca_param(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + enum wireless_mode wirelessmode, + struct ieee80211_tx_queue_params *param); void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb); void rtl_collect_scan_list(struct ieee80211_hw *hw, struct sk_buff *skb);