1 From patchwork Wed May 27 16:57:18 2020
2 Content-Type: text/plain; charset="utf-8"
4 Content-Transfer-Encoding: 7bit
5 X-Patchwork-Submitter: Brian Norris <briannorris@chromium.org>
6 X-Patchwork-Id: 11573587
8 <SRS0=GRS3=7J=lists.infradead.org=ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@kernel.org>
9 Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
11 by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 92EDE912
12 for <patchwork-ath10k@patchwork.kernel.org>;
13 Wed, 27 May 2020 16:57:49 +0000 (UTC)
14 Received: from bombadil.infradead.org (bombadil.infradead.org
16 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
17 (No client certificate requested)
18 by mail.kernel.org (Postfix) with ESMTPS id 709A020787
19 for <patchwork-ath10k@patchwork.kernel.org>;
20 Wed, 27 May 2020 16:57:49 +0000 (UTC)
21 Authentication-Results: mail.kernel.org;
22 dkim=pass (2048-bit key) header.d=lists.infradead.org
23 header.i=@lists.infradead.org header.b="Q9kuedxy";
24 dkim=fail reason="signature verification failed" (1024-bit key)
25 header.d=chromium.org header.i=@chromium.org header.b="DOPnF2Ut"
26 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 709A020787
27 Authentication-Results: mail.kernel.org;
28 dmarc=fail (p=none dis=none) header.from=chromium.org
29 Authentication-Results: mail.kernel.org;
31 smtp.mailfrom=ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org
32 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
33 d=lists.infradead.org; s=bombadil.20170209; h=Sender:
34 Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:
35 List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To
36 :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:
37 Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:
38 List-Owner; bh=tMtpBm6YuuXSiU+wmHifjt06qL4ATMxDl/ce+cou9GA=; b=Q9kuedxy8i91LL
39 3atjiw6JgeXGt68ftmX95419+2B6IzoE1XyWiYjDNIFzM5Zu/jCGOUJY+U3dx/IBdMz9jheG4Ulbt
40 4WBU4jDdB+rmdRmweoIAvL8L2af0M54bFf/ed+QsEZm2eRfH7xMXr0CcIUlq1hfNN1Wu/VCgQd+A+
41 QxBGE1RqDScGHR7Xj1AvmkDEG5I+TFAXgbKQdftI5i6SQi+l4tEUwqjuuHI7SGQ8IhkNOTRK2czV7
42 fqvTtP4PndH1r0XbIFK6x23TMZitW/4hItzeimQiTj0aJEI1vGDtIc/2GOMQiLEEjY/5a7d1FJChE
43 Wb8vhUnIHEJRGRAQ9ClA==;
44 Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
45 by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux))
46 id 1jdzND-0008UM-37; Wed, 27 May 2020 16:57:47 +0000
47 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044])
48 by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux))
50 for ath10k@lists.infradead.org; Wed, 27 May 2020 16:57:45 +0000
51 Received: by mail-pj1-x1044.google.com with SMTP id k2so723977pjs.2
52 for <ath10k@lists.infradead.org>; Wed, 27 May 2020 09:57:42 -0700 (PDT)
53 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;
55 h=from:to:cc:subject:date:message-id:mime-version
56 :content-transfer-encoding;
57 bh=DWPRa3kcV7dHK3sr3IH2Glel3aMfKYoMnIduKqYeTNo=;
58 b=DOPnF2Ut7cEJ7K2Xb6Y2Hq4IuCooIbhfWPKf+5i+gas4rdLOhy10q+Pogvx8rAtXOk
59 alWAH5LdFykoexEfG0SZYyJkILeAkNuJAB/duRacHeHIzoFLkckdsksSNgbCYHwnPB/m
60 v5y7siWrfi4mcTKLakMGlDHY5NQjySa22V3Jg=
61 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
62 d=1e100.net; s=20161025;
63 h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version
64 :content-transfer-encoding;
65 bh=DWPRa3kcV7dHK3sr3IH2Glel3aMfKYoMnIduKqYeTNo=;
66 b=qf0ACIIgN8cIyW1hg0IUQ09On6ANIhPKTd++vp0kAqeaklhj4eZ7qzpwF+m8mOogVE
67 8NHq0S/ZmGCGKaIHOHJ8j8xWV5XdgmXXX12gs5ZzIfqxtfoLhNu2Zx+0lkUQjFjbXoBM
68 dVEQSncqUa7ryL2/FbxnAY1bzekFq97Hz3tPCBczEO42J+/4teJH12zu8EXTv8IKVO1V
69 7buFm+NQo6L8FjLI3U2pVcntFyFEKo3TT4AQPBv0soxynJ5DdrH8KGbAvCSEO3wbo4jx
70 v8nzEu3AWknjIM+9hnJFDl2RI8p/OqFEU1pub6avda2ZkiQbGh14QX4TXSr+hPk5V7jI
72 X-Gm-Message-State: AOAM5326rmcUB5W25WigcOJN86XzMECPcK8TT3yuHgWoyzP4UQRdXp/j
73 XznCFTjshzSbmZp30JBmqEglZnyPU20=
75 ABdhPJzZCdWzARlTkkKCwUXMyf44S8pb9ACQrw4RiO+5MwqURsgvVmvJ0u5JwwN7oRQazLF1sJlpsA==
76 X-Received: by 2002:a17:90a:4e07:: with SMTP id
77 n7mr6410317pjh.34.1590598661609;
78 Wed, 27 May 2020 09:57:41 -0700 (PDT)
79 Received: from smtp.gmail.com ([2620:15c:202:1:534:b7c0:a63c:460c])
80 by smtp.gmail.com with ESMTPSA id x12sm2601829pfo.72.2020.05.27.09.57.40
81 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
82 Wed, 27 May 2020 09:57:40 -0700 (PDT)
83 From: Brian Norris <briannorris@chromium.org>
84 To: ath10k@lists.infradead.org
85 Subject: [PATCH] Revert "ath: add support for special 0x0 regulatory domain"
86 Date: Wed, 27 May 2020 09:57:18 -0700
87 Message-Id: <20200527165718.129307-1-briannorris@chromium.org>
88 X-Mailer: git-send-email 2.27.0.rc0.183.gde8f92d652-goog
90 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
91 X-CRM114-CacheID: sfid-20200527_095743_459728_5DD95BD1
92 X-CRM114-Status: GOOD ( 10.80 )
93 X-Spam-Score: -0.2 (/)
94 X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary:
95 Content analysis details: (-0.2 points)
96 pts rule name description
97 ---- ----------------------
98 --------------------------------------------------
99 -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
100 no trust [2607:f8b0:4864:20:0:0:0:1044 listed in]
102 -0.0 SPF_PASS SPF: sender matches SPF record
103 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
104 -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from
106 0.1 DKIM_SIGNED Message has a DKIM or DK signature,
109 -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature
110 -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from
112 -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender
113 X-BeenThere: ath10k@lists.infradead.org
114 X-Mailman-Version: 2.1.29
116 List-Id: <ath10k.lists.infradead.org>
117 List-Unsubscribe: <http://lists.infradead.org/mailman/options/ath10k>,
118 <mailto:ath10k-request@lists.infradead.org?subject=unsubscribe>
119 List-Archive: <http://lists.infradead.org/pipermail/ath10k/>
120 List-Post: <mailto:ath10k@lists.infradead.org>
121 List-Help: <mailto:ath10k-request@lists.infradead.org?subject=help>
122 List-Subscribe: <http://lists.infradead.org/mailman/listinfo/ath10k>,
123 <mailto:ath10k-request@lists.infradead.org?subject=subscribe>
124 Cc: Brian Norris <briannorris@chromium.org>, linux-wireless@vger.kernel.org,
125 linux-kernel@vger.kernel.org, stable@vger.kernel.org,
126 Wen Gong <wgong@codeaurora.org>
127 Sender: "ath10k" <ath10k-bounces@lists.infradead.org>
129 ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org
131 This reverts commit 2dc016599cfa9672a147528ca26d70c3654a5423.
133 Users are reporting regressions in regulatory domain detection and
134 channel availability.
136 The problem this was trying to resolve was fixed in firmware anyway:
138 QCA6174 hw3.0: sdio-4.4.1: add firmware.bin_WLAN.RMH.4.4.1-00042
139 https://github.com/kvalo/ath10k-firmware/commit/4d382787f0efa77dba40394e0bc604f8eff82552
141 Link: https://bbs.archlinux.org/viewtopic.php?id=254535
142 Link: http://lists.infradead.org/pipermail/ath10k/2020-April/014871.html
143 Link: http://lists.infradead.org/pipermail/ath10k/2020-May/015152.html
144 Fixes: 2dc016599cfa ("ath: add support for special 0x0 regulatory domain")
145 Cc: <stable@vger.kernel.org>
146 Cc: Wen Gong <wgong@codeaurora.org>
147 Signed-off-by: Brian Norris <briannorris@chromium.org>
149 drivers/net/wireless/ath/regd.c | 10 +++++-----
150 1 file changed, 5 insertions(+), 5 deletions(-)
152 diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
153 index bee9110b91f3..20f4f8ea9f89 100644
154 --- a/drivers/net/wireless/ath/regd.c
155 +++ b/drivers/net/wireless/ath/regd.c
156 @@ -666,14 +666,14 @@ ath_regd_init_wiphy(struct ath_regulatory *reg,
159 * Some users have reported their EEPROM programmed with
160 - * 0x8000 or 0x0 set, this is not a supported regulatory
161 - * domain but since we have more than one user with it we
162 - * need a solution for them. We default to 0x64, which is
163 - * the default Atheros world regulatory domain.
164 + * 0x8000 set, this is not a supported regulatory domain
165 + * but since we have more than one user with it we need
166 + * a solution for them. We default to 0x64, which is the
167 + * default Atheros world regulatory domain.
169 static void ath_regd_sanitize(struct ath_regulatory *reg)
171 - if (reg->current_rd != COUNTRY_ERD_FLAG && reg->current_rd != 0)
172 + if (reg->current_rd != COUNTRY_ERD_FLAG)
174 printk(KERN_DEBUG "ath: EEPROM regdomain sanitized\n");
175 reg->current_rd = 0x64;