From patchwork Tue Sep 8 18:25:28 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: 249339 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp4792019ilg; Tue, 8 Sep 2020 11:24:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyC6Gh6IGTqiC3yT+hZVWZpaa75h+IrreRUh48bAF/MguhAXdz2PyFmfb2NYIWMaQPFZdV X-Received: by 2002:a05:6e02:690:: with SMTP id o16mr49782ils.220.1599589492110; Tue, 08 Sep 2020 11:24:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599589492; cv=none; d=google.com; s=arc-20160816; b=ykE1cNnf+V62wOkIEj5D1eMawh1kmJLd+85KzePrfBV64KAzlWbhzQ4O71nWi4ez/m b2bnIdN2a/jcWFNoIjNCHHMM482ejthvun9k3dsv9XvtVxf4LgVLAQubZDoDivUSvRu0 Bi3qDM2n2I/WIqCkhtAnwWNPG9bh4BSzBPe9RfP9tEVM6QQsqNSamNRNT9A9vZceia/+ ltnoqmKKbaLLTx1Z9FsjExtb4xzDvkkhAXmBVLky+JJ9aWNdBPPRDaZSD6t8LtcskR4W UBFo6rgpXEOfKzDFWYJiFAub2l6Zbu8NLh5gbFN1LMs1ijEwsFo4biqTT608i8pkRdoy 7N3w== 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=XZthyf+bbHmasxebVXX1PmmgnQk8O7X2NUnX50GxxYs=; b=c9mu8qeFBQ4o60GxLzBstwM1+wSvvnZ2lbLSVkoA7Xk/tWRmHPCyQCElSkN/cbPxej TGaci6fc3EDgNMBxrF5YCP1OuOsNhSuCv5IOAj1XjJPjq27IGxjMq+rlwYBEnlxdpZld YiyJ5jGXX1UVMv0iUUESVk+9exOIrRv4hX22N/q3DJTndFy8niqFOwRpGNgrNxrcX5EE BMmW9Dz9jqkPfeJJZ+SCMb5WCDIDD8/0EHCuldIsrZWjT8kZdm9/mmZH2Lw5bhfEKRIV Yi4scNWRtrCLTXZ6qJTuqi3exH2xuyJAKVM+jM5z1vdynUs6vLAYNBJ9HJ/NX6brkXVC VTVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.infradead.org header.s=merlin.20170209 header.b=a73WCppH; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=KaBUFp+V; 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 y12si14997582jao.41.2020.09.08.11.24.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 11:24:52 -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=a73WCppH; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=KaBUFp+V; 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=XZthyf+bbHmasxebVXX1PmmgnQk8O7X2NUnX50GxxYs=; b=a73WCppHgSMDxGA0rr0u5kVS2 jhYsvGMH1bvP0fVID09ek3XX8P9A/D95LHcMIwXX/7n0KD2LAV10Jyt1uAsRo4m3Q/DP+5ue3Xmc3 ez/Yzv8wWrAFcc6ncaSQNNxKGQP4esjEc+g7rDrOIM2BvpilSRf5N3bdutTYf7msfi9MdADVD9h6D ruFO9CzvrSzmAMWtnmUP41qfYKBlBGBzs2yXOveB455+BnwwbECzJi03ZcStx1GWpQhkvGSJe8oef ROTWZvw2S2aJNeeLszs9jwDXRwKISkyE4/DK0B3u6+PSKFGT5aKCbZ1phfDq9T4a+Qi4rLVMeL6tj T5+hAOyLQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFiIT-0005RD-9K; Tue, 08 Sep 2020 18:24:49 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFiIQ-0005P4-6k for wcn36xx@lists.infradead.org; Tue, 08 Sep 2020 18:24:47 +0000 Received: by mail-wr1-x443.google.com with SMTP id o5so181091wrn.13 for ; Tue, 08 Sep 2020 11:24:46 -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=+JwIjVcGYRQT3Xw48y+fSj0xhb+qvXWha1H9977tamg=; b=KaBUFp+V9mOhJ/EYVpaG+lc/M6pQjAU16MJ/iUZq9z/z02t3mTmC8kZvff/5zqcMa7 GQpSpdfUDVeYh/a1ZXjWrYV9UOapCWditLqCRwvyu/VVLzegJlFivg0GqX33f6rR+0qu UWL7xqmJVNwiw/KbYlQdoADvZfvv8JKXxB0DRWL7VQmMfKyzv74+eZ+EdkqsLW6tHTI3 TkGHG4t7j/0RvciD3AEQ1WV0nzT/2evLOBwbpn3F3iD6hAzl3YJ9T/Y4T5bz2bRKX9/a 2Y0o3a/FDPuJVMv72Uwm2aO4cdWCGLg7jzMtqY34AzLGQJ13NSXFyjMFBSwfGZd3R6fO 3E4A== 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=+JwIjVcGYRQT3Xw48y+fSj0xhb+qvXWha1H9977tamg=; b=Rfu1IJISp+gJ6H6OdxyUnzH4UffW5MXFY9Es/epw7CNgAJzrXBmi+8O8h/K2+pIUVu ZicWf307/XfUcXfR5rMCiifcY1vJDD/bBZmzB9RzyiQVGbtn7564OSsjcC9ihu9K1krb O96Vnv3leWa5ZWLJy7QXx4EEHPN8eaqMhd6zJq4HfsVJ9tDdmwrorLrpmPbZ3pZuTcaP ZhGvJfJbxPUX9OugYNnjkS487EvNYH3boR71h5ZhGaKY1+7t1cjrEhskAw2Q/uQ/ZOSq +PpMOdgKBCSGxq9ibeWi+8P0oobqH9DFtq/kI6cTwOUgRBG93MMMf4q90v9JitlBnEMl YmSg== X-Gm-Message-State: AOAM533n8clr/o1hiL33kGIYi+m8vxfnM5sTBgzwMzO5KdoFS38MYvA9 QHc4N6t4WYfxLYTBkrzFGswg9A== X-Received: by 2002:a05:6000:1c7:: with SMTP id t7mr953443wrx.95.1599589485273; Tue, 08 Sep 2020 11:24:45 -0700 (PDT) Received: from localhost.localdomain ([176.61.57.127]) by smtp.gmail.com with ESMTPSA id b84sm381427wmd.0.2020.09.08.11.24.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 11:24:44 -0700 (PDT) From: Bryan O'Donoghue To: kvalo@codeaurora.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org Subject: [PATCH v3 3/4] wcn36xx: Add ability to download wcn3680 specific firmware parameters Date: Tue, 8 Sep 2020 19:25:28 +0100 Message-Id: <20200908182529.2870478-4-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200908182529.2870478-1-bryan.odonoghue@linaro.org> References: <20200908182529.2870478-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-20200908_142446_256564_0945764F X-CRM114-Status: GOOD ( 14.36 ) 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:443 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 Message has at least one valid DKIM or DK signature -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 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 This commit modifies wcn36xx_smd_start() so that it can download wcn3680 specific firmware parameters if we are talking to the wcn3680. If not the original generic firmware parameter table should continue to be used for wcn3620 and wcn3660. Signed-off-by: Bryan O'Donoghue --- drivers/net/wireless/ath/wcn36xx/smd.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 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 4a53d4b515df..4672581a4354 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c @@ -610,6 +610,8 @@ int wcn36xx_smd_start(struct wcn36xx *wcn) int ret; int i; size_t len; + int cfg_elements; + static struct wcn36xx_cfg_val *cfg_vals; mutex_lock(&wcn->hal_mutex); INIT_HAL_MSG(msg_body, WCN36XX_HAL_START_REQ); @@ -622,9 +624,17 @@ int wcn36xx_smd_start(struct wcn36xx *wcn) body = (struct wcn36xx_hal_mac_start_req_msg *)wcn->hal_buf; len = body->header.len; - for (i = 0; i < ARRAY_SIZE(wcn36xx_cfg_vals); i++) { - ret = put_cfg_tlv_u32(wcn, &len, wcn36xx_cfg_vals[i].cfg_id, - wcn36xx_cfg_vals[i].value); + if (wcn->rf_id == RF_IRIS_WCN3680) { + cfg_vals = wcn3680_cfg_vals; + cfg_elements = ARRAY_SIZE(wcn3680_cfg_vals); + } else { + cfg_vals = wcn36xx_cfg_vals; + cfg_elements = ARRAY_SIZE(wcn36xx_cfg_vals); + } + + for (i = 0; i < cfg_elements; i++) { + ret = put_cfg_tlv_u32(wcn, &len, cfg_vals[i].cfg_id, + cfg_vals[i].value); if (ret) goto out; }