From patchwork Tue Sep 4 21:57:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom Psyborg X-Patchwork-Id: 10588037 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-2.web.codeaurora.org (Postfix) with ESMTP id B0E5F920 for ; Tue, 4 Sep 2018 21:58:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A316429AB7 for ; Tue, 4 Sep 2018 21:58:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 976E329ABC; Tue, 4 Sep 2018 21:58:16 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,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 3246529AB7 for ; Tue, 4 Sep 2018 21:58:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727442AbeIECZS (ORCPT ); Tue, 4 Sep 2018 22:25:18 -0400 Received: from mail-wr1-f43.google.com ([209.85.221.43]:40496 "EHLO mail-wr1-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726909AbeIECZS (ORCPT ); Tue, 4 Sep 2018 22:25:18 -0400 Received: by mail-wr1-f43.google.com with SMTP id n2-v6so5492789wrw.7 for ; Tue, 04 Sep 2018 14:58:13 -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 :mime-version:content-transfer-encoding; bh=+66Xhx7L26jVZbC7vXziF+BNhgNiO0GIdFhfImtGLss=; b=ekPSS5A+XyGjxWyxnKBv2PtqrlUkSjg4rO59rvw/Pc2GElJSW/lnPbC1m55WVJBR8e gItkWnaJo6kxubE5Jfm+zqkt9e1Xf3gKgZZkS2ee1i+X/KHgPkH6RkiCmEIS9qmuPHRg X+E8Mmhlr6gJ1NCqWe2SsI3Qx0LGFWFhuBRNeAVdYNkC4ht8MO+GFcAK1fEjcr6fFhpF 8r2uw40x0iXADuvAI6TWIpVAgLXH00AFvoDN6KPz5wpodfxvqv7L17C7UTtyDQxa5mMI 7/bQFu1jSJkg6YUUEHhWMKeLdg7K7sNTqLP8pa9ZmztyE4Xbip8zSrnvvwSsmIDcvyH7 6l6g== 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:mime-version:content-transfer-encoding; bh=+66Xhx7L26jVZbC7vXziF+BNhgNiO0GIdFhfImtGLss=; b=R3hB01QSrR72P+UkZy8PzMa0QivzDIDYjnnxUL1EUPZ4ZZ+bT+9PS/EU2Yx1i39OoY d+aMbrZzAi+J8V3i0LOZbPWHSVMebjSZb5gnqlxuvHAR9p39LkClGRee7kZSkdZAc2GQ 8gu0dpby8P4aSorSfbbX2b2gzb7I89igNVO6NbQPL70eiE80siHKQPOBIMEB412CRIUe f+x+9DjLwZL3RrGvUfTStQhWEqXemk1XrJElQXhsV1X+8mLoIPwec8UXSFI0mW+z9q5Y uZ8EKPECCv2yxZui85cfxKXqRo9sk5lhIVUOSRvq12JnnGPci44e0Gcp7VO9TFBt327t 1HKA== X-Gm-Message-State: APzg51CBDwSYH9IbSaiyOYdT4Cv8Nh+y2E0N4xplGJG4jvWIve4rz5XY xBhbN2Y8RhmtGoVg27W0FuFodBH0 X-Google-Smtp-Source: ANB0VdboULpGgFRo+5NNp2kSOWovRuj1/6NKzQK0ZSpehP7uh/14q0VarMOuNC5E8jPd4mGf5en+IA== X-Received: by 2002:adf:ac6a:: with SMTP id v97-v6mr22727809wrc.7.1536098292836; Tue, 04 Sep 2018 14:58:12 -0700 (PDT) Received: from localhost.localdomain ([31.147.208.18]) by smtp.googlemail.com with ESMTPSA id x15-v6sm14351733wrt.53.2018.09.04.14.58.11 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 04 Sep 2018 14:58:12 -0700 (PDT) From: =?utf-8?q?Tomislav_Po=C5=BEega?= To: linux-wireless@vger.kernel.org Cc: kvalo@codeaurora.org, ath9k-devel@qca.qualcomm.com Subject: [PATCH v2 3/3] ath9k_htc: increase number of configurable virtual interfaces Date: Tue, 4 Sep 2018 23:57:59 +0200 Message-Id: <1536098279-3268-3-git-send-email-pozega.tomislav@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1536098279-3268-1-git-send-email-pozega.tomislav@gmail.com> References: <1536098279-3268-1-git-send-email-pozega.tomislav@gmail.com> MIME-Version: 1.0 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 Increase driver limit for various interface combinations. I was able to start 8 virtual APs and connect 5 clients to these. New firmware will be sent to linux-firmware mailing list too. Meanwhile, take a look here for changes it includes if you wish to build it yourself: https://github.com/qca/open-ath9k-htc-firmware/pull/149 Signed-off-by: Tomislav Požega --- drivers/net/wireless/ath/ath9k/hif_usb.c | 4 ++-- drivers/net/wireless/ath/ath9k/htc.h | 8 ++++---- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c index fb649d8..fdcf224 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c @@ -1131,10 +1131,10 @@ static int ath9k_hif_request_firmware(struct hif_device_usb *hif_dev, /* expected fw locations: * - ath9k_htc/htc_9271-1.dev.0.fw (development version) - * - ath9k_htc/htc_9271-1.4.0.fw (stable version) + * - ath9k_htc/htc_9271-1.4.1.fw (stable version) */ snprintf(hif_dev->fw_name, sizeof(hif_dev->fw_name), - "%s/htc_%s-%d.%s.0.fw", HTC_FW_PATH, + "%s/htc_%s-%d.%s.1.fw", HTC_FW_PATH, chip, MAJOR_VERSION_REQ, index); } diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index 5490c5f..b6c577b 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h @@ -197,8 +197,8 @@ struct ath9k_htc_target_rx_stats { __be32 host_done; } __packed; -#define ATH9K_HTC_MAX_VIF 2 -#define ATH9K_HTC_MAX_BCN_VIF 2 +#define ATH9K_HTC_MAX_VIF 8 +#define ATH9K_HTC_MAX_BCN_VIF 8 #define INC_VIF(_priv, _type) do { \ switch (_type) { \ @@ -251,8 +251,8 @@ struct ath9k_vif_iter_data { u8 mask[ETH_ALEN]; }; -#define ATH9K_HTC_MAX_STA 8 -#define ATH9K_HTC_MAX_TID 8 +#define ATH9K_HTC_MAX_STA 128 +#define ATH9K_HTC_MAX_TID 16 enum tid_aggr_state { AGGR_STOP = 0, diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c index 214c682..fa13ba9 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c @@ -697,9 +697,9 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv, } static const struct ieee80211_iface_limit if_limits[] = { - { .max = 2, .types = BIT(NL80211_IFTYPE_STATION) | + { .max = 8, .types = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_P2P_CLIENT) }, - { .max = 2, .types = BIT(NL80211_IFTYPE_AP) | + { .max = 8, .types = BIT(NL80211_IFTYPE_AP) | #ifdef CONFIG_MAC80211_MESH BIT(NL80211_IFTYPE_MESH_POINT) | #endif @@ -709,7 +709,7 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv, static const struct ieee80211_iface_combination if_comb = { .limits = if_limits, .n_limits = ARRAY_SIZE(if_limits), - .max_interfaces = 2, + .max_interfaces = 8, .num_different_channels = 1, };