From patchwork Fri Sep 18 16:29:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 11785401 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B582F92C for ; Fri, 18 Sep 2020 16:30:33 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 52C9B2067C for ; Fri, 18 Sep 2020 16:30:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Eoxun10I"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fNH63PJd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 52C9B2067C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.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: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:In-Reply-To:References:List-Owner; bh=73cxvQC0P4fp2iEfqzsIDjaXip259NGiS2TVI5dCuww=; b=Eoxun10ImIKwl6EStwZUjwTX+/ YaApqNS6I0HatUSJnK1UjjKU4v55gGhL5GLL19alN4ybAVswkWshQNksO3/iubWWzOHtGaw4pFg1n RZ5Pf2ZeNIr4MGnhTV4uU/KjtRmm333Mcfwkbtci2eB8M5KyFTtp4cPhYJ8EMZGtdI6L14FklNc7P lTSDwJa69SOEYeEKBSeLHQEZPO2fxIwpce+q1R3Tcos0jH4++F9yEq2ZU+LMNzMdUE0m5fFTD1tcP 1iuZEUUkVlUtDwlpPYMTHCVBhQxWwzXG4GCPgjtcwhndS5xKUslGe9IaH1Ka4hE20oTagrUGbvhq0 9NqQJY1w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kJJGW-0004wX-7U; Fri, 18 Sep 2020 16:29:40 +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 1kJJGS-0004uq-U9 for ath10k@lists.infradead.org; Fri, 18 Sep 2020 16:29:37 +0000 Received: by mail-wr1-x443.google.com with SMTP id j2so6252248wrx.7 for ; Fri, 18 Sep 2020 09:29:35 -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:mime-version :content-transfer-encoding; bh=S49aIuYLpT+2JYfKysryYvgN235gurfGFJHDPWL3QzE=; b=fNH63PJdbtii5p28SJargFVtP29JBMqu4VRxmdKvPFyOkSjLgc4EnArJAxzT7iRYRG 6Z6DqQADU16LveutJ0fL10Alcjr96VTtQwK/5vz6eJHBxPPV4w4Da8RX6d2u2WizDjf/ D6rn2lvsQS5KrnMTUmqEf8WzyZnN4YEugFrrJSISst5VrZ3ixIC9+pWWevaRoM9+lOKH 477U0HNJdiqVxsbEG2VhnAwlOvYfZpCCum3IvjAleQInirKCIwSs1Gh4/i1I2TLgO2qE 7dMIfXM+hCyB1ttA/11ZAyUTU9POcCLOFV8edA1GL4PxPcIoxX0zXUye314LTwKgy5A3 9ZFQ== 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:mime-version :content-transfer-encoding; bh=S49aIuYLpT+2JYfKysryYvgN235gurfGFJHDPWL3QzE=; b=AhsfDIvnoQm1Vgo1pN6FrDAhdhuKni//5mpdcY26wVBudfamFJ45qW7sIwrWGOZ/1W xSG79VnIDppKf2fTCBixBQSnMDup1/2012Hmj3h9D8FPM28a2SZSUrUCdlJQ9fjk39uS X5HX81NUWWfZmSFYM645K9hqCm5RCuXsNzDKL9r2kW+iujvwwuZ6eYMHqcwfS1HDRa1l mUJDKgBbi3MKigpRld2k6UenZMgB91tT2dn5dqB2tErXV61Y3hikkzGW1p/6s2p9voSb mHAN85TCAS/fYJ4mLRnra0BloDtKmOlX6bqhIQA7BBZtp4lHaBsLV1f42Wf6hE8bgIaO yeig== X-Gm-Message-State: AOAM533KGnV+ZVRX4iZ4V9TGYTjdXZxtYGwZFU6ToIIKee9+aUlkQAW6 51gXGXf2UtRm4CGkpFavFRo= X-Google-Smtp-Source: ABdhPJw4wGg1+Wn7ryPfoWJp2mkPbx+vkCKrpZOZh7g3Lg8TmO6D2tc0OYSc0+e2jdBwIiC1DuF/XQ== X-Received: by 2002:adf:c3cc:: with SMTP id d12mr39463130wrg.399.1600446574306; Fri, 18 Sep 2020 09:29:34 -0700 (PDT) Received: from Ansuel-XPS.localdomain (93-39-149-95.ip76.fastwebnet.it. [93.39.149.95]) by smtp.googlemail.com with ESMTPSA id b11sm6028921wrt.38.2020.09.18.09.29.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2020 09:29:33 -0700 (PDT) From: Ansuel Smith To: Kalle Valo Subject: [PATCH] ath10k: Introduce download cal from mtd Date: Fri, 18 Sep 2020 18:29:27 +0200 Message-Id: <20200918162928.14335-1-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200918_122937_001546_1AFA6E10 X-CRM114-Status: GOOD ( 18.48 ) 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_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [ansuelsmth[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an 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 Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, ath10k@lists.infradead.org, "David S. Miller" , Rob Herring , Jakub Kicinski , Ansuel Smith Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org Most of routers that have the ath10k wifi chip integrated in the Soc have the pre-cal data stored in the art (or equivalent) mtd partition. Introduce a new function to directly extract and use it based on what is set in the dt if the system have mtd support. Pre-cal file have still priority to everything else. Tested-on: QCA9984 hw1.0 PCI 10.4 Signed-off-by: Ansuel Smith --- drivers/net/wireless/ath/ath10k/core.c | 74 ++++++++++++++++++++++++++ drivers/net/wireless/ath/ath10k/core.h | 3 ++ 2 files changed, 77 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 5f4e12196..eef00d657 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "core.h" #include "mac.h" @@ -1701,6 +1702,69 @@ static int ath10k_download_and_run_otp(struct ath10k *ar) return 0; } +static int ath10k_download_cal_mtd(struct ath10k *ar) +{ +#ifdef CONFIG_MTD + struct device_node *node, *mtd_node = NULL; + struct mtd_info *mtd; + const __be32 *list; + u32 offset, size; + const char *part; + phandle phandle; + size_t retlen; + char *file; + int ret; + + node = ar->dev->of_node; + if (!node) + return -ENOENT; + + list = of_get_property(node, "qcom,ath10k-pre-calibration-data-mtd", &size); + if (!list || (size != (3 * sizeof(*list)))) + return -EINVAL; + + phandle = be32_to_cpup(list++); + if (phandle) + mtd_node = of_find_node_by_phandle(phandle); + + if (!mtd_node) + return -ENODEV; + + part = of_get_property(mtd_node, "label", NULL); + if (!part) + part = mtd_node->name; + + mtd = get_mtd_device_nm(part); + if (IS_ERR(mtd)) + return -ENODEV; + + offset = be32_to_cpup(list++); + size = be32_to_cpup(list); + + file = kzalloc(size, GFP_KERNEL); + if (!file) + return -ENOMEM; + + ret = mtd_read(mtd, offset, size, &retlen, file); + put_mtd_device(mtd); + + ret = ath10k_download_board_data(ar, file, size); + if (ret) { + ath10k_err(ar, "failed to download cal_file data: %d\n", ret); + goto err; + } + + ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot cal file downloaded\n"); + + return 0; + +err: + kfree(file); + return ret; +#endif + return -EOPNOTSUPP; +} + static int ath10k_download_cal_file(struct ath10k *ar, const struct firmware *file) { @@ -2047,6 +2111,16 @@ static int ath10k_core_pre_cal_download(struct ath10k *ar) goto success; } + ath10k_dbg(ar, ATH10K_DBG_BOOT, + "boot did not find a pre calibration file, try MTD next: %d\n", + ret); + + ret = ath10k_download_cal_mtd(ar); + if (ret == 0) { + ar->cal_mode = ATH10K_PRE_CAL_MODE_MTD; + goto success; + } + ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot did not find a pre calibration file, try DT next: %d\n", ret); diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 4cf5bd489..3ca158605 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -864,6 +864,7 @@ enum ath10k_cal_mode { ATH10K_CAL_MODE_OTP, ATH10K_CAL_MODE_DT, ATH10K_PRE_CAL_MODE_FILE, + ATH10K_PRE_CAL_MODE_MTD, ATH10K_PRE_CAL_MODE_DT, ATH10K_CAL_MODE_EEPROM, }; @@ -886,6 +887,8 @@ static inline const char *ath10k_cal_mode_str(enum ath10k_cal_mode mode) return "dt"; case ATH10K_PRE_CAL_MODE_FILE: return "pre-cal-file"; + case ATH10K_PRE_CAL_MODE_MTD: + return "pre-cal-mtd"; case ATH10K_PRE_CAL_MODE_DT: return "pre-cal-dt"; case ATH10K_CAL_MODE_EEPROM: