From patchwork Sat Jun 27 06:01:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Laakso X-Patchwork-Id: 489009 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7BD2E1401DA for ; Sat, 27 Jun 2015 16:02:14 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 35CE928A70D; Sat, 27 Jun 2015 08:01:45 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id DE513280264 for ; Sat, 27 Jun 2015 08:01:38 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .elisanet. - helo: .vs19.mail.saunalahti. - helo-domain: .saunalahti.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from vs19.mail.saunalahti.fi (vs19.mail.saunalahti.fi [62.142.117.200]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sat, 27 Jun 2015 08:01:38 +0200 (CEST) Received: from vams (localhost [127.0.0.1]) by vs19.mail.saunalahti.fi (Postfix) with SMTP id 02724280075; Sat, 27 Jun 2015 09:01:48 +0300 (EEST) Received: from gw01.mail.saunalahti.fi (gw01.mail.saunalahti.fi [195.197.172.115]) by vs19.mail.saunalahti.fi (Postfix) with ESMTP id D379C280075; Sat, 27 Jun 2015 09:01:47 +0300 (EEST) Received: from Orion.lan (91-157-120-53.elisa-laajakaista.fi [91.157.120.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by gw01.mail.saunalahti.fi (Postfix) with ESMTPSA id C93BC40036; Sat, 27 Jun 2015 09:01:45 +0300 (EEST) From: Matti Laakso To: openwrt-devel@lists.openwrt.org Date: Sat, 27 Jun 2015 09:01:40 +0300 Message-Id: <1435384900-4494-2-git-send-email-malaakso@elisanet.fi> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1435384900-4494-1-git-send-email-malaakso@elisanet.fi> References: <1435384900-4494-1-git-send-email-malaakso@elisanet.fi> Cc: Matti Laakso Subject: [OpenWrt-Devel] [PATCH 2/2] mac80211: Drop ath10k workaround for providing calibration data X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Ath10k has now a proper method of providing calibration data via the kernel firmware API. This patch can be dropped as all boards now use the proper method. Signed-off-by: Matti Laakso --- ...w_fallback_to_board_bin_on_empty_otp_stream.patch | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch diff --git a/package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch b/package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch deleted file mode 100644 index 4c04d4f..0000000 --- a/package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/drivers/net/wireless/ath/ath10k/core.c -+++ b/drivers/net/wireless/ath/ath10k/core.c -@@ -387,9 +387,14 @@ static int ath10k_download_and_run_otp(s - - ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot otp execute result %d\n", result); - -- if (!skip_otp && result != 0) { -- ath10k_err(ar, "otp calibration failed: %d", result); -- return -EINVAL; -+ if (!skip_otp) { -+ if (result == 2) { -+ ath10k_warn(ar, "otp stream is empty, using board.bin contents"); -+ return 0; -+ } else if (result != 0) { -+ ath10k_err(ar, "otp calibration failed: %d", result); -+ return -EINVAL; -+ } - } - - return 0;