QCA6174 invalid regulatory domain/country code 0x5f

Commit Message

.wav April 19, 2020, 5:38 p.m. UTC

Having the wifi-breaking error mentioned in the subject with Qualcomm Atheros QCA6174 802.11ac Wireless Network Adapter [168c:003e] (rev 32) (in a Samsung Galaxy Book if that's relevant).

dmesg output:
[ 4877.975464] ath10k_pci 0000:01:00.0: pci irq msi oper_irq_mode 2 irq_mode 0 reset_mode 0
[ 4878.250441] ath10k_pci 0000:01:00.0: firmware: failed to load ath10k/pre-cal-pci-0000:01:00.0.bin (-2)
[ 4878.250473] ath10k_pci 0000:01:00.0: firmware: failed to load ath10k/cal-pci-0000:01:00.0.bin (-2)
[ 4878.275378] ath10k_pci 0000:01:00.0: firmware: direct-loading firmware ath10k/QCA6174/hw3.0/firmware-6.bin
[ 4878.275399] ath10k_pci 0000:01:00.0: qca6174 hw3.2 target 0x05030000 chip_id 0x00340aff sub 144d:c150
[ 4878.275404] ath10k_pci 0000:01:00.0: kconfig debug 0 debugfs 0 tracing 0 dfs 0 testmode 0
[ 4878.277267] ath10k_pci 0000:01:00.0: firmware ver WLAN.RM.4.4.1-00151-QCARMSWPZ-2 api 6 features wowlan,ignore-otp,mfp crc32 64160d13
[ 4878.374074] ath10k_pci 0000:01:00.0: firmware: direct-loading firmware ath10k/QCA6174/hw3.0/board-2.bin
[ 4878.375656] ath10k_pci 0000:01:00.0: board_file api 2 bmi_id N/A crc32 e74847dc
[ 4878.448065] ath10k_pci 0000:01:00.0: unsupported HTC service id: 1536
[ 4878.466956] ath10k_pci 0000:01:00.0: htt-ver 3.60 wmi-op 4 htt-op 3 cal otp max-sta 32 raw 0 hwcrypto 1
[ 4878.554101] ath: EEPROM regdomain: 0x5f
[ 4878.554105] ath: EEPROM indicates we should expect a direct regpair map
[ 4878.554108] ath: invalid regulatory domain/country code 0x5f
[ 4878.554110] ath: Invalid EEPROM contents
[ 4878.554126] ath10k_pci 0000:01:00.0: failed to initialise regulatory: -22
[ 4878.554135] ath10k_pci 0000:01:00.0: could not register to mac80211 (-22)


With the following patch (suggested on this list in 2017 by Ryan Hsu), the wifi works.



After patching I still have the "failed to load pre-cal-pci.../cal-pci..." errors and the "unsupported HTC service id: 1536" warning, but wifi works.

Is there any reason this patch was never merged in to the ath10k kernel module? It'd be nice to not have to manually rebuild it every kernel update.

Cheers,
.wav

Patch

diff --git a/drivers/net/wireless/ath/regd_common.h b/regd_common.h
index c4bd26e..900452f 100644
--- a/../linux-kernel-wifi/drivers/net/wireless/ath/regd_common.h
+++ b/regd_common.h
@@ -76,6 +76,7 @@  enum EnumRd {
        APL7_FCCA = 0x5C,
        APL8_WORLD = 0x5D,
        APL9_WORLD = 0x5E,
+       APL10_WORLD = 0x5F,

        WOR0_WORLD = 0x60,
        WOR1_WORLD = 0x61,
@@ -204,6 +205,7 @@  static struct reg_dmn_pair_mapping regDomainPairs[] = {
        {APL6_WORLD, CTL_ETSI, CTL_ETSI},
        {APL8_WORLD, CTL_ETSI, CTL_ETSI},
        {APL9_WORLD, CTL_ETSI, CTL_ETSI},
+       {APL10_WORLD, CTL_ETSI, CTL_ETSI},

        {APL3_FCCA, CTL_FCC, CTL_FCC},
        {APL7_FCCA, CTL_FCC, CTL_FCC},
@@ -423,7 +425,7 @@  static struct country_code_to_enum_rd allCountries[] = {
        {CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ"},
        {CTRY_KENYA, APL1_WORLD, "KE"},
        {CTRY_KOREA_NORTH, APL9_WORLD, "KP"},
-       {CTRY_KOREA_ROC, APL9_WORLD, "KR"},
+       {CTRY_KOREA_ROC, APL10_WORLD, "KR"},
        {CTRY_KOREA_ROC2, APL2_WORLD, "K2"},
        {CTRY_KOREA_ROC3, APL9_WORLD, "K3"},
        {CTRY_KUWAIT, ETSI3_WORLD, "KW"},