From patchwork Mon May 9 15:59:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ash Benz X-Patchwork-Id: 619947 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3r3Rvc4tQgz9t3c for ; Tue, 10 May 2016 02:01:32 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bk.ru header.i=@bk.ru header.b=m4WyoJD5; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aznbv-0007MD-0k; Mon, 09 May 2016 16:00:43 +0000 Received: from smtp17.mail.ru ([94.100.176.154]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aznbt-0006r6-IQ for lede-dev@lists.infradead.org; Mon, 09 May 2016 16:00:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=bk.ru; s=mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=6/wEOydACOSTmriTIekapPVf9hjsIHeZUpKMoIK1iVA=; b=m4WyoJD55h55M9S7R0lpBXiuMcN/S3Z4fAa5KkPmixDi+8HGX0lYhVNQiBSJpui2/AdFh6RnQCxS0KhtvVzhxvO+dLTvCc/yjuxYBdo7Q4IqdIL3EMXnjYWbiqvc/OayVldhL4HFY1Iy0Va00HkQ+Y/ubvMXeobL2rkznTLSe9U=; Received: from [175.136.149.93] (port=36867 helo=builder.lan) by smtp17.mail.ru with esmtpa (envelope-from ) id 1aznbY-0000wC-Dq; Mon, 09 May 2016 19:00:21 +0300 From: Ash Benz To: lede-dev@lists.infradead.org Date: Mon, 9 May 2016 23:59:53 +0800 Message-Id: <1462809594-5462-10-git-send-email-ash.benz@bk.ru> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1462809594-5462-1-git-send-email-ash.benz@bk.ru> References: <1462809594-5462-1-git-send-email-ash.benz@bk.ru> X-Mras: OK X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160509_090042_038785_6B8FC45A X-CRM114-Status: UNSURE ( 9.76 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [94.100.176.154 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 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 Subject: [LEDE-DEV] [PATCH v2 09/10] kernel/mac80211: skip ath10k OTP check if caldata found X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ash Benz MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Ash Benz --- .../patches/941-ath10k_skip_otp_check.patch | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/kernel/mac80211/patches/941-ath10k_skip_otp_check.patch diff --git a/package/kernel/mac80211/patches/941-ath10k_skip_otp_check.patch b/package/kernel/mac80211/patches/941-ath10k_skip_otp_check.patch new file mode 100644 index 0000000..1465ec7 --- /dev/null +++ b/package/kernel/mac80211/patches/941-ath10k_skip_otp_check.patch @@ -0,0 +1,44 @@ +Index: compat-wireless-2016-01-10/drivers/net/wireless/ath/ath10k/core.c +=================================================================== +--- compat-wireless-2016-01-10.orig/drivers/net/wireless/ath/ath10k/core.c ++++ compat-wireless-2016-01-10/drivers/net/wireless/ath/ath10k/core.c +@@ -1183,9 +1183,6 @@ static int ath10k_core_fetch_firmware_fi + { + int ret; + +- /* calibration file is optional, don't check for any errors */ +- ath10k_fetch_cal_file(ar); +- + ar->fw_api = 5; + ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api); + +@@ -1790,6 +1787,9 @@ static int ath10k_core_probe_fw(struct a + goto err_power_down; + } + ++ /* calibration file is optional, don't check for any errors */ ++ int calret = ath10k_fetch_cal_file(ar); ++ + ret = ath10k_core_fetch_firmware_files(ar); + if (ret) { + ath10k_err(ar, "could not fetch firmware files (%d)\n", ret); +@@ -1798,11 +1798,14 @@ static int ath10k_core_probe_fw(struct a + + ath10k_debug_print_hwfw_info(ar); + +- ret = ath10k_core_get_board_id_from_otp(ar); +- if (ret && ret != -EOPNOTSUPP) { +- ath10k_err(ar, "failed to get board id from otp: %d\n", +- ret); +- return ret; ++ /* otp and board file not needed if calibration data is present */ ++ if (calret) { ++ ret = ath10k_core_get_board_id_from_otp(ar); ++ if (ret && ret != -EOPNOTSUPP) { ++ ath10k_err(ar, "failed to get board id from otp: %d\n", ++ ret); ++ return ret; ++ } + } + + ret = ath10k_core_fetch_board_file(ar);