Message ID | 20220128094612.292599-1-vicamo.yang@canonical.com |
---|---|
State | New |
Headers | show |
Series | [SRU,linux-firmware,Focal,PULL] Include the QCA WCN 6856 v2.1 support | expand |
Applied to linux-firmware focal branch. ...Juerg > BugLink: https://bugs.launchpad.net/bugs/1954938 > > [Impact] > > WCN685x hw2.1 takes additional/updated firmware for both WiFi and > Bluetooth function. > > ath11k_pci 0000:71:00.0: BAR 0: assigned [mem 0xa6000000-0xa61fffff 64bit] > ath11k_pci 0000:71:00.0: enabling device (0000 -> 0002) > ath11k_pci 0000:71:00.0: Unsupported WCN6855 SOC hardware version: 18 17 > ath11k_pci: probe of 0000:71:00.0 failed with error -95 > > [Fix] > > WCN685x hw2.1 currently shares most WiFi firmware with hw2.0 except > for the directory path and a board-2.bin. > > For Bluetooth, updated revision of qca/nvm_usb_00130201_gf* from > mainline are neccessary for Focal. Jammy has all of them already. > > For kernel, many of the prerequisite works have been committed for > hw2.0 in bug 1945154, 1952215 and 1958850. Currently, while WiFi 6G > will be turned off for the lack of userspace support, the only fix > necessary is to correct read mask of version info register. > > [Test Case] > > WiFi and Bluetooth devices should be up and running, pass basic > operations. > > $ lspci -nnk|grep -A3 Network > 0000:71:00.0 Network controller [0280]: Qualcomm Device [17cb:1103] (rev 01) > Subsystem: Foxconn International, Inc. Device [105b:e0ce] > Kernel driver in use: ath11k_pci > Kernel modules: ath11k_pci > > $ lsusb > Bus 003 Device 004: ID 0489:e0e3 Foxconn / Hon Hai > > [Where problems could occur] > > At the time being, WCN685x WiFi 6G support will be turnef off > deliberately due to the lack of full support in the userspace > management tools. > > [Other Info] > > While this is a new hardware model from OEM program, it's only > nominated for Focal oem-5.14 kernel and the coming LTS Jammy. > > ---------------------------------------------------------------- > > The following changes since commit b7aaab9f78e6604adc3cc1dc43f180f37c34fba7: > > amdgpu: update yellow carp dmcub firmware (2022-01-27 09:24:13 +0100) > > are available in the Git repository at: > > https://git.launchpad.net/~vicamo/ubuntu/+source/linux-firmware bug-1954938/wcn6855-fw-for-hw2.1/focal-pull > > for you to fetch changes up to ddf12b8cdcbbc94dbf20e2a84e601cafea06f466: > > UBUNTU: SAUCE: WCN6855: add symbolic link for hw2.1 (2022-01-28 15:07:01 +0800) > > ---------------------------------------------------------------- > Kalle Valo (2): > UBUNTU: SAUCE: WCN6855 hw2.0: add board-2.bin > UBUNTU: SAUCE: WCN6855: add symbolic link for hw2.1 > > Zijun Hu (2): > QCA: Update Bluetooth WCN685x firmware to 2.1.0-00298 > QCA: Update Bluetooth WCN685x 2.1 firmware to 2.1.0-00324 > > WHENCE | 4 ++++ > WHENCE.ubuntu | 1 + > ath11k/WCN6855/hw2.0/board-2.bin | Bin 721328 -> 1142524 bytes > qca/nvm_usb_00130201.bin | Bin 6365 -> 6569 bytes > qca/nvm_usb_00130201_010a.bin | Bin 6365 -> 6569 bytes > qca/nvm_usb_00130201_010b.bin | Bin 0 -> 6569 bytes > qca/nvm_usb_00130201_gf.bin | Bin 0 -> 6409 bytes > qca/nvm_usb_00130201_gf_010a.bin | Bin 0 -> 6409 bytes > qca/nvm_usb_00130201_gf_010b.bin | Bin 0 -> 6409 bytes > qca/rampatch_usb_00130201.bin | Bin 104196 -> 114568 bytes > 10 files changed, 5 insertions(+) > create mode 100644 qca/nvm_usb_00130201_010b.bin > create mode 100644 qca/nvm_usb_00130201_gf.bin > create mode 100644 qca/nvm_usb_00130201_gf_010a.bin > create mode 100644 qca/nvm_usb_00130201_gf_010b.bin > > diff --git a/WHENCE b/WHENCE > index 46c83c5b88d8..aa269a232100 100644 > --- a/WHENCE > +++ b/WHENCE > @@ -3768,6 +3768,10 @@ File: qca/nvm_usb_00130200_0110.bin > File: qca/rampatch_usb_00130201.bin > File: qca/nvm_usb_00130201.bin > File: qca/nvm_usb_00130201_010a.bin > +File: qca/nvm_usb_00130201_010b.bin > +File: qca/nvm_usb_00130201_gf.bin > +File: qca/nvm_usb_00130201_gf_010a.bin > +File: qca/nvm_usb_00130201_gf_010b.bin > > Licence: Redistributable. See LICENSE.QualcommAtheros_ath10k and qca/NOTICE.txt for details > > diff --git a/WHENCE.ubuntu b/WHENCE.ubuntu > index 5fc5aff82a79..53aa3c49348b 100644 > --- a/WHENCE.ubuntu > +++ b/WHENCE.ubuntu > @@ -448,6 +448,7 @@ File: ath11k/WCN6855/hw2.0/1.1/WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE > File: ath11k/WCN6855/hw2.0/1.1/WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2/m3.bin > Link: ath11k/WCN6855/hw2.0/amss.bin -> 1.1/WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2/amss.bin > Link: ath11k/WCN6855/hw2.0/m3.bin -> 1.1/WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2/m3.bin > +Link: ath11k/WCN6855/hw2.1 -> hw2.0 > Version: WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2 > License: ath11k/WCN6855/hw2.0/1.1/WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2/Notice.txt > > diff --git a/ath11k/WCN6855/hw2.0/board-2.bin b/ath11k/WCN6855/hw2.0/board-2.bin > index e5d9fc1b1c3d..4fca41f5602a 100644 > Binary files a/ath11k/WCN6855/hw2.0/board-2.bin and b/ath11k/WCN6855/hw2.0/board-2.bin differ > diff --git a/qca/nvm_usb_00130201.bin b/qca/nvm_usb_00130201.bin > index d141a02c04b6..1ac4aedd4455 100644 > Binary files a/qca/nvm_usb_00130201.bin and b/qca/nvm_usb_00130201.bin differ > diff --git a/qca/nvm_usb_00130201_010a.bin b/qca/nvm_usb_00130201_010a.bin > index d141a02c04b6..1ac4aedd4455 100644 > Binary files a/qca/nvm_usb_00130201_010a.bin and b/qca/nvm_usb_00130201_010a.bin differ > diff --git a/qca/nvm_usb_00130201_010b.bin b/qca/nvm_usb_00130201_010b.bin > new file mode 100644 > index 000000000000..1ac4aedd4455 > Binary files /dev/null and b/qca/nvm_usb_00130201_010b.bin differ > diff --git a/qca/nvm_usb_00130201_gf.bin b/qca/nvm_usb_00130201_gf.bin > new file mode 100644 > index 000000000000..964cdd96ad7c > Binary files /dev/null and b/qca/nvm_usb_00130201_gf.bin differ > diff --git a/qca/nvm_usb_00130201_gf_010a.bin b/qca/nvm_usb_00130201_gf_010a.bin > new file mode 100644 > index 000000000000..964cdd96ad7c > Binary files /dev/null and b/qca/nvm_usb_00130201_gf_010a.bin differ > diff --git a/qca/nvm_usb_00130201_gf_010b.bin b/qca/nvm_usb_00130201_gf_010b.bin > new file mode 100644 > index 000000000000..964cdd96ad7c > Binary files /dev/null and b/qca/nvm_usb_00130201_gf_010b.bin differ > diff --git a/qca/rampatch_usb_00130201.bin b/qca/rampatch_usb_00130201.bin > index 961751d125e8..cadeb8159995 100644 > Binary files a/qca/rampatch_usb_00130201.bin and b/qca/rampatch_usb_00130201.bin differ >
diff --git a/WHENCE b/WHENCE index 46c83c5b88d8..aa269a232100 100644 --- a/WHENCE +++ b/WHENCE @@ -3768,6 +3768,10 @@ File: qca/nvm_usb_00130200_0110.bin File: qca/rampatch_usb_00130201.bin File: qca/nvm_usb_00130201.bin File: qca/nvm_usb_00130201_010a.bin +File: qca/nvm_usb_00130201_010b.bin +File: qca/nvm_usb_00130201_gf.bin +File: qca/nvm_usb_00130201_gf_010a.bin +File: qca/nvm_usb_00130201_gf_010b.bin Licence: Redistributable. See LICENSE.QualcommAtheros_ath10k and qca/NOTICE.txt for details diff --git a/WHENCE.ubuntu b/WHENCE.ubuntu index 5fc5aff82a79..53aa3c49348b 100644 --- a/WHENCE.ubuntu +++ b/WHENCE.ubuntu @@ -448,6 +448,7 @@ File: ath11k/WCN6855/hw2.0/1.1/WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE File: ath11k/WCN6855/hw2.0/1.1/WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2/m3.bin Link: ath11k/WCN6855/hw2.0/amss.bin -> 1.1/WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2/amss.bin Link: ath11k/WCN6855/hw2.0/m3.bin -> 1.1/WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2/m3.bin +Link: ath11k/WCN6855/hw2.1 -> hw2.0 Version: WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2 License: ath11k/WCN6855/hw2.0/1.1/WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2/Notice.txt diff --git a/ath11k/WCN6855/hw2.0/board-2.bin b/ath11k/WCN6855/hw2.0/board-2.bin index e5d9fc1b1c3d..4fca41f5602a 100644 Binary files a/ath11k/WCN6855/hw2.0/board-2.bin and b/ath11k/WCN6855/hw2.0/board-2.bin differ diff --git a/qca/nvm_usb_00130201.bin b/qca/nvm_usb_00130201.bin index d141a02c04b6..1ac4aedd4455 100644 Binary files a/qca/nvm_usb_00130201.bin and b/qca/nvm_usb_00130201.bin differ diff --git a/qca/nvm_usb_00130201_010a.bin b/qca/nvm_usb_00130201_010a.bin index d141a02c04b6..1ac4aedd4455 100644 Binary files a/qca/nvm_usb_00130201_010a.bin and b/qca/nvm_usb_00130201_010a.bin differ diff --git a/qca/nvm_usb_00130201_010b.bin b/qca/nvm_usb_00130201_010b.bin new file mode 100644 index 000000000000..1ac4aedd4455 Binary files /dev/null and b/qca/nvm_usb_00130201_010b.bin differ diff --git a/qca/nvm_usb_00130201_gf.bin b/qca/nvm_usb_00130201_gf.bin new file mode 100644 index 000000000000..964cdd96ad7c Binary files /dev/null and b/qca/nvm_usb_00130201_gf.bin differ diff --git a/qca/nvm_usb_00130201_gf_010a.bin b/qca/nvm_usb_00130201_gf_010a.bin new file mode 100644 index 000000000000..964cdd96ad7c Binary files /dev/null and b/qca/nvm_usb_00130201_gf_010a.bin differ diff --git a/qca/nvm_usb_00130201_gf_010b.bin b/qca/nvm_usb_00130201_gf_010b.bin new file mode 100644 index 000000000000..964cdd96ad7c