From patchwork Wed Sep 9 15:37:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 249500 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp524915ilg; Wed, 9 Sep 2020 08:36:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrAldWL6LOlSsDaLyct4QRnHIEAsuByQhN+cUfQSfPVJ1YtQqe3INkNwL3tIL/tH5fMTFR X-Received: by 2002:a5e:9613:: with SMTP id a19mr3761329ioq.116.1599665817338; Wed, 09 Sep 2020 08:36:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599665817; cv=none; d=google.com; s=arc-20160816; b=bINnG5l7sSLnJ9WfSXUgRs3NoXXeCNr7PF2A3Nhlbl6cu8o1MH1l/v0Pd+ZaX39uUx xDPBNpKCCKPQYKTjOq/BpEczlacnqsG4vvJsXH3wWoa4K6QOhX/6A7wJfUm4oUF7fLj/ 1QBgkWW724Gvd/1rEgLRmOow0Gu0hhQgj1t/X57r0tiww7d2cHY2evJKhvAQjOywMLNM L4cYDxd5Is7SPWxiqkQMOI/8QH5WyGjB1Pvolm1kCemHdYpzbr5JPIkjUOYE6Zlmw+7q Zjoz/DEZb2GIkKyEe8BSdht59tKeCSxY0BT2xIkIuaAOeamqdY26A7l4mkYt2J+mmqYt L6zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:dkim-signature; bh=rv0VI/+BDQkFmNe27ocJmnqraNvMVVjlBHkRa6qaB68=; b=osGgeHMLhgoL77P8F9DiUmpbmQsBDMKMt4ZVhYEVjK12a0FQYBzNWox3ygVoXTYjnK wKDCP/XObgAZxaI9vUfkcmJA1q45blIo+Mn5TS7lYh0jfBk+fQ/qtqTwrn846/AtGJF8 Ei9HyXyiGHH+3VxmJ85K7lEUWE4JibhzkNkJ8x7R10eKW7uzc1ViVn+yTJf6SG1s+yPu laHNAEX2KpuQPu1jXCNI9tFTIPuGIlwW2raRgcVUyloGP6H/vU4H9JUbhsXRRPxaBlKL HnqLx8/39zqdrAkeYkio4keSo+3+OjwP4O4FF1KEM8DA4VR27VAFabhuG5orsL/GC1h5 kpaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.infradead.org header.s=merlin.20170209 header.b=j8LaKcL2; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=eelOjz49; spf=pass (google.com: best guess record for domain of wcn36xx-bounces+patch=linaro.org@lists.infradead.org designates 2001:8b0:10b:1231::1 as permitted sender) smtp.mailfrom="wcn36xx-bounces+patch=linaro.org@lists.infradead.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from merlin.infradead.org (merlin.infradead.org. [2001:8b0:10b:1231::1]) by mx.google.com with ESMTPS id k15si2390072ilc.101.2020.09.09.08.36.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 08:36:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of wcn36xx-bounces+patch=linaro.org@lists.infradead.org designates 2001:8b0:10b:1231::1 as permitted sender) client-ip=2001:8b0:10b:1231::1; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.infradead.org header.s=merlin.20170209 header.b=j8LaKcL2; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=eelOjz49; spf=pass (google.com: best guess record for domain of wcn36xx-bounces+patch=linaro.org@lists.infradead.org designates 2001:8b0:10b:1231::1 as permitted sender) smtp.mailfrom="wcn36xx-bounces+patch=linaro.org@lists.infradead.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rv0VI/+BDQkFmNe27ocJmnqraNvMVVjlBHkRa6qaB68=; b=j8LaKcL2EBeTVfAEIfdC9Uyez XZUCBeZBnduNmlTst6xUHG95E6jt8eVyVz5dJ6NNqTBl7VGiRdJwru2DPjDCGzACI4r2UQpA5SLoa c3ve9vguc0PXGedNBTc9ZFaXSJKRAPr5OCgqQtqCinX52gI0eEO8JYtLR6772o+e1C5OBqBHxo16c wt5ID1W/6Rl79ELPZv7qkCJ1E0fXj3G72eckiL7PrIR4ZPwBLxcsHXmmEGu8eS+Zhk1/ow/nV0vPU woMyaQJMajgnnRUGe+llaavqAYBCDvRjmFc+rgoLM8eeuVJeItgChvQu+0Ty47D/rq/+rELXU13Hc jAtxiN3jQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kG29W-0006ll-3H; Wed, 09 Sep 2020 15:36:54 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kG29S-0006k7-VD for wcn36xx@lists.infradead.org; Wed, 09 Sep 2020 15:36:52 +0000 Received: by mail-wm1-x342.google.com with SMTP id q9so2735616wmj.2 for ; Wed, 09 Sep 2020 08:36:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AjQwO8wviPzTyqnqo9pD+Eau9aX3yRTC3bFkrO7cETg=; b=eelOjz49ycNtuy76Di5/qOZNhOmSPzkl6XdJwnLN+FwtTVRLmbrS/i5zY8wAcoqpB7 hTxl+lJ2Hv/bs5sTcaNvQtov9SyI74XJ5juD1KnHPT/2bK45OjF3+DhmL9G0jXjKS7tO k30YyB2pI6e4LUDrtVar5l6937e9GPozftNeRlebJm91im6xsjsMENlb0riTaDzBbCCY faxoLoVk3ucTuGoX/2lxySoJg+rsXvDuIzV7qa7VnmINErq0uAh3iG/EUwFCiUOu51/M Nd0uUnrMm+cGonpoRH2NLXfnLx78yJ1bVVw0mlV76S3Sze7LkBDbb9ic/tqVDcy35noY wkOw== 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=AjQwO8wviPzTyqnqo9pD+Eau9aX3yRTC3bFkrO7cETg=; b=aRw43VpTCB0VsHQ5YixnRsVUEMr88Tq0aCe7Jt9ZAxKgwOlLujbf/yfR6WYnan5oxB uHxy1A45t4dN7fLGW96LFHJsPtZrsMWUUdjxzqRYWirBkGzCDYSyHS/ri+hnpf9VcuDY ipIK8BkxNhzK/qBUHcDc7ryxLH0QcNsLVzCh+f+bM+xZXyFYpFjsXfGXYMb2kc7SpWaT CHC4leFRQ8zY7gFaZK9h/b0/j8lc6vdjDjTUNdhH5fYe/vKlnozkxozYhY9zX5jupEw+ +f5uKuWVW4PUi18WZLjeitp40c7xtBOtyflSgvZUvz4BotxbdQ/ONja9FYbltnntnN6y vrDA== X-Gm-Message-State: AOAM530MphMMLm9wDguaN7PEhVyb49kJA3kI6F0OE22bSNeAGAzHlyT2 gEZqRLOyOVmrrAP5n9RYXb10Aw== X-Received: by 2002:a1c:66c4:: with SMTP id a187mr3996033wmc.148.1599665810107; Wed, 09 Sep 2020 08:36:50 -0700 (PDT) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id 128sm4470602wmz.43.2020.09.09.08.36.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 08:36:49 -0700 (PDT) From: Bryan O'Donoghue To: kvalo@codeaurora.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org Subject: [PATCH v4 2/4] wcn36xx: Convert to VHT parameter structure on wcn3680 Date: Wed, 9 Sep 2020 16:37:34 +0100 Message-Id: <20200909153736.2905114-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909153736.2905114-1-bryan.odonoghue@linaro.org> References: <20200909153736.2905114-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200909_113651_033376_7F038E61 X-CRM114-Status: GOOD ( 13.89 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:342 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: wcn36xx@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bryan.odonoghue@linaro.org, shawn.guo@linaro.org, loic.poulain@linaro.org Sender: "wcn36xx" Errors-To: wcn36xx-bounces+patch=linaro.org@lists.infradead.org In order to send VHT parameters to wcn3680 we need to pass the extended V1 parameter structures to the firmware. These commands need to have the version number set to 1. This patch makes the conversion. The conversion consists of 1. Setting the version number for wcn3680 or leaving it at 0 otherwise 2. Setting the size of the packet header lower for wcn3620 and wcn3660 Once done all three chips can continue to use the same code to pass parameters to their respective firmware. In the case of the wcn3680 the passed structures will be slightly larger to accommodate communication of VHT descriptors. Signed-off-by: Bryan O'Donoghue --- drivers/net/wireless/ath/wcn36xx/smd.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) -- 2.27.0 _______________________________________________ wcn36xx mailing list wcn36xx@lists.infradead.org http://lists.infradead.org/mailman/listinfo/wcn36xx diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c index 3adb744b093d..18507b4d3681 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c @@ -1428,8 +1428,12 @@ static int wcn36xx_smd_config_sta_v1(struct wcn36xx *wcn, struct wcn36xx_hal_config_sta_req_msg_v1 msg_body; struct wcn36xx_hal_config_sta_params_v1 *sta_params; - INIT_HAL_MSG(msg_body, WCN36XX_HAL_CONFIG_STA_REQ); - msg_body.header.len -= WCN36XX_DIFF_STA_PARAMS_V1_NOVHT; + if (wcn->rf_id == RF_IRIS_WCN3680) { + INIT_HAL_MSG_V1(msg_body, WCN36XX_HAL_CONFIG_STA_REQ); + } else { + INIT_HAL_MSG(msg_body, WCN36XX_HAL_CONFIG_STA_REQ); + msg_body.header.len -= WCN36XX_DIFF_STA_PARAMS_V1_NOVHT; + } sta_params = &msg_body.sta_params; @@ -1606,8 +1610,12 @@ static int wcn36xx_smd_config_bss_v1(struct wcn36xx *wcn, if (!msg_body) return -ENOMEM; - INIT_HAL_MSG((*msg_body), WCN36XX_HAL_CONFIG_BSS_REQ); - msg_body->header.len -= WCN36XX_DIFF_BSS_PARAMS_V1_NOVHT; + if (wcn->rf_id == RF_IRIS_WCN3680) { + INIT_HAL_MSG_V1((*msg_body), WCN36XX_HAL_CONFIG_BSS_REQ); + } else { + INIT_HAL_MSG((*msg_body), WCN36XX_HAL_CONFIG_BSS_REQ); + msg_body->header.len -= WCN36XX_DIFF_BSS_PARAMS_V1_NOVHT; + } bss = &msg_body->bss_params; sta = &bss->sta;