From patchwork Wed Sep 9 15:35:53 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: 249469 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp523445ilg; Wed, 9 Sep 2020 08:35:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJziFFJBIP4EWQNO7qkIoYvIv8d31Ixff5fPO7FWn+nVQv1fa22ACpNehPC1r+dQkWn91Chc X-Received: by 2002:a02:cd2e:: with SMTP id h14mr4623861jaq.6.1599665714743; Wed, 09 Sep 2020 08:35:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599665714; cv=none; d=google.com; s=arc-20160816; b=t8UwI6yX+M5tdXmv02m6Gt57e8TebE8ePUTh4ahS1kz4NQqerehlgBYWc1JJlDC8Wb 1kbAuPb93KaO/hJ2oDExmYXKeFwHveDrYbq6888otdpvUec3EyPIK9uYLpN1aHCaU4UX gs0FTUijvUrlVytg/pBsVB9QmcFzORSnhDfNHFb88xCxqJxQTY5mgddLJzXASpKq9ay+ avmfCpto1yb0bN9AFslOR8Lng3gie1+9l7g2BoBaQC3h0iD25grJ4V8MOp2BBfIHwudM +4IHasWwwbvcpStFdCLzUgmoWyvfk/2KmdPng1tN+Wk3KK5oW4phLT6yPDreQQxm6hoH ZBlA== 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=mrHQXYgOzGrE5OAhUl3GjkI12DsuBI9GCRW5xszef4U=; b=oBder/5G3SGEyOLuZU8HvIJX+q89g4Z9tZ81lpgwlbAanoGTUtB45cgh/8rgXATnnh joeYcqQtOnuY2v1fK631uYs6Se0JWH6HbfuITz2fOi/5v3M7lYaRqwZRxesKQ4Y0nEvk Efk9Tt4j0W7/ZXgQBRcLg6jLcoIsVM1zc2Yioj7ZCtrk/yM8CdesZmGe7XrrJMwvtxxs S8SfxuioGd7crfZs9Hna+1FOBhnKzSUkY90E/X/f+SpQ+j2oH+r2lYBO1KyFBOdUEjvy +ZjWVVdvA1WICdF+wOlDDPBkoDqCxtTvR/YUDynHQ+HQnb12WJrtfsmEg11SsAbgX+V0 UHbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.infradead.org header.s=merlin.20170209 header.b=H2rkGCfr; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=I8waGxoj; 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 f7si2364266ils.80.2020.09.09.08.35.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 08:35:14 -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=H2rkGCfr; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=I8waGxoj; 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=mrHQXYgOzGrE5OAhUl3GjkI12DsuBI9GCRW5xszef4U=; b=H2rkGCfro9f/znPKtSFs6NvQH 8URBjkESrXzUMvGlkazzZHzYyYSDzcVB9A53w9LjHCUGBtFsLSrObIbnCEiqJPVDFVSxpWc+1YnsH PX0SBJIRMv/2G0VAgpCjB/ZMKQHRvIgwQoDV+J5UOXrqMSJ+lZS2iSl++vmPCh0GULHSbGgEXdjcj PSaNIrcWkARAwiVAOMMcnHSvq+Zu9IBXKfa3pfQpdvFEppR8NPE2Ru4I1f5ckEV5U2+BhKH4dlpLJ iymPnrkYC791ESkdtLtloqoi2B4hixtD+4/5lLYQyrxhBmH0M577wOQrj3uvau2R51A1Jy0H8nHmU UxFISlHng==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kG27r-0006Ho-9P; Wed, 09 Sep 2020 15:35:11 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kG27o-0006Gh-1N for wcn36xx@lists.infradead.org; Wed, 09 Sep 2020 15:35:09 +0000 Received: by mail-wm1-x343.google.com with SMTP id b79so2818717wmb.4 for ; Wed, 09 Sep 2020 08:35:07 -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=RqOhclRRIqI97WuGHZsdvXxzhC2mxsIcVlTbaDy3Bdg=; b=I8waGxojlzkRIl6Ew8JGRtxReXZpz0VU+jHluWkVETFxLkMTVb4sJRk3I9ZNkrD2L2 Cfc/3HFNgR6X6LKixBdbgHauFjurngCXFVUYGqp/QFdA4ZD4Xiez5XMdOf434hlPjWlW /MlQ6wU9gOVsWdvXpsr7U69zlcWYwX5ajbnF78hzgNdZP41yODTP8dCZMSSG5VzNgQM5 h7QtSDa/G3vFK2lItUMIDEppvbo7xul1v0315zkZFk1Aknh79juP6XsV7pYHAKEiuswO 11EkkU/l0iPosmmDerUQ0c9AOTYfREvGHyOyaLCnasVCWsagRjIIqFfNmTKF/j/o0DGL Jorg== 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=RqOhclRRIqI97WuGHZsdvXxzhC2mxsIcVlTbaDy3Bdg=; b=Xj5J9CBNEE6Ugge+0bLiKYKQIOcfJ/MP508fIaPoPVK75T9LPcmg8122B77S5zT0H6 NnmblKFJ9vdlErH8Be7XduqU/piXThmeeNU9Xmc0eZpXUt3H8umA0+yKknTlRT/oj28J KoVN2wrTCV3MB4gTRuWfJLqaHMRxdRH32VP2bwF8/pEepBAWtd4vP369T9KrcpGc8NaL JlPY7DJ/qq6ogxwzdm0BF/zuqSPsehhd9U6VrsAOmURu2JDKQ8fW7S+9M+oqoemeVXIs ldh4ynrfk/dIGbBSwZ534Tiu0aXYL4DsEQgNkrlaZrc4PIfJigGun3E26BCNW4XMDhB0 7kvw== X-Gm-Message-State: AOAM533RE5ui9Q7cjpCtbyiWFVSibjbPDz4YvQRo98jwVW0WuewUCiY6 7MrQQYh+h99efTqY3F2UFpXX0Q== X-Received: by 2002:a1c:5a87:: with SMTP id o129mr4237839wmb.145.1599665707121; Wed, 09 Sep 2020 08:35:07 -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 c4sm4922120wrp.85.2020.09.09.08.35.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 08:35:06 -0700 (PDT) From: Bryan O'Donoghue To: kvalo@codeaurora.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org Subject: [PATCH v4 1/2] wcn36xx: Add VHT fields to parameter data structures Date: Wed, 9 Sep 2020 16:35:53 +0100 Message-Id: <20200909153554.2904762-2-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909153554.2904762-1-bryan.odonoghue@linaro.org> References: <20200909153554.2904762-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_113508_412783_8610EAE0 X-CRM114-Status: GOOD ( 14.81 ) 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:343 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 pass VHT parameters to wcn3680 we need to use a super-set of the V1 data-structures with additional VHT parameters tacked on. This patch adds the additional fields to the STA and BSS parameter structures. Since neither wcn3620 nor wcn3660 support VHT the size of the passed message is fixed to the previous message length. Subsequent changes will differentiate between wcn3620/wcn3660 and wcn3680 which does use the larger message size. Signed-off-by: Bryan O'Donoghue --- drivers/net/wireless/ath/wcn36xx/hal.h | 14 +++++++++++++- drivers/net/wireless/ath/wcn36xx/smd.c | 2 ++ 2 files changed, 15 insertions(+), 1 deletion(-) -- 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/hal.h b/drivers/net/wireless/ath/wcn36xx/hal.h index 573799274a02..3cceeaf0136f 100644 --- a/drivers/net/wireless/ath/wcn36xx/hal.h +++ b/drivers/net/wireless/ath/wcn36xx/hal.h @@ -1592,9 +1592,15 @@ struct wcn36xx_hal_config_sta_params_v1 { u8 reserved:4; /* These rates are the intersection of peer and self capabilities. */ - struct wcn36xx_hal_supported_rates supported_rates; + struct wcn36xx_hal_supported_rates_v1 supported_rates; + + u8 vht_capable; + u8 vht_tx_channel_width_set; + } __packed; +#define WCN36XX_DIFF_STA_PARAMS_V1_NOVHT 10 + struct wcn36xx_hal_config_sta_req_msg_v1 { struct wcn36xx_hal_msg_header header; struct wcn36xx_hal_config_sta_params_v1 sta_params; @@ -2015,8 +2021,14 @@ struct wcn36xx_hal_config_bss_params_v1 { * "STA context" */ struct wcn36xx_hal_config_sta_params_v1 sta; + + u8 vht_capable; + u8 vht_tx_channel_width_set; + } __packed; +#define WCN36XX_DIFF_BSS_PARAMS_V1_NOVHT (WCN36XX_DIFF_STA_PARAMS_V1_NOVHT + 2) + struct wcn36xx_hal_config_bss_req_msg_v1 { struct wcn36xx_hal_msg_header header; struct wcn36xx_hal_config_bss_params_v1 bss_params; diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c index 4c30036e2e56..55aaaeb78b14 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c @@ -1223,6 +1223,7 @@ static int wcn36xx_smd_config_sta_v1(struct wcn36xx *wcn, struct wcn36xx_hal_config_sta_params_v1 *sta = &msg_body.sta_params; INIT_HAL_MSG(msg_body, WCN36XX_HAL_CONFIG_STA_REQ); + msg_body.header.len -= WCN36XX_DIFF_STA_PARAMS_V1_NOVHT; wcn36xx_smd_convert_sta_to_v1(wcn, &orig->sta_params, &msg_body.sta_params); @@ -1294,6 +1295,7 @@ static int wcn36xx_smd_config_bss_v1(struct wcn36xx *wcn, return -ENOMEM; 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;