Hi linux-firmware maintainers,
here's a pull request to update ath11k firmware images. We have new hardware support WCN6855 and QCN9074, but also updates to existing hardware.
Please let me know if there are any problems.
Kalle
The following changes since commit f682ecb015df087613f91872712eb6c0f6c998a8:
Merge https://github.com/pkshih/linux-firmware into main (2021-12-16 09:42:51 -0500)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/linux-firmware.git ath10k-20211223
for you to fetch changes up to 0f161f385f3854086b4fdae2dae786ab6bd3efa5:
ath11k: WCN6855 hw2.0: add to WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2 (2021-12-23 12:40:55 +0200)
----------------------------------------------------------------
Kalle Valo (5):
ath11k: IPQ6018 hw1.0: update to WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1
ath11k: IPQ8074 hw2.0: update to WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1
ath11k: QCN9074 hw1.0: add to WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1
ath11k: WCN6855 hw2.0: add board-2.bin and regdb.bin
ath11k: WCN6855 hw2.0: add to WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2
WHENCE | 14 +-
ath11k/IPQ6018/hw1.0/Notice.txt | 48 +-
ath11k/IPQ6018/hw1.0/m3_fw.b01 | Bin 6712 -> 6712 bytes
ath11k/IPQ6018/hw1.0/m3_fw.b02 | Bin 294912 -> 294912 bytes
ath11k/IPQ6018/hw1.0/m3_fw.mdt | Bin 6860 -> 6860 bytes
ath11k/IPQ6018/hw1.0/q6_fw.b00 | Bin 340 -> 340 bytes
ath11k/IPQ6018/hw1.0/q6_fw.b01 | Bin 7000 -> 7000 bytes
ath11k/IPQ6018/hw1.0/q6_fw.b02 | Bin 4696 -> 4696 bytes
ath11k/IPQ6018/hw1.0/q6_fw.b03 | Bin 2357712 -> 2557456 bytes
ath11k/IPQ6018/hw1.0/q6_fw.b04 | Bin 370560 -> 412192 bytes
ath11k/IPQ6018/hw1.0/q6_fw.b05 | Bin 175588 -> 197988 bytes
ath11k/IPQ6018/hw1.0/q6_fw.b07 | Bin 8936 -> 9408 bytes
ath11k/IPQ6018/hw1.0/q6_fw.b08 | Bin 409914 -> 452780 bytes
ath11k/IPQ6018/hw1.0/q6_fw.mdt | Bin 7340 -> 7340 bytes
ath11k/IPQ8074/hw2.0/Notice.txt | 48 +-
ath11k/IPQ8074/hw2.0/m3_fw.b01 | Bin 136 -> 136 bytes
ath11k/IPQ8074/hw2.0/m3_fw.b02 | Bin 327680 -> 327680 bytes
ath11k/IPQ8074/hw2.0/m3_fw.mdt | Bin 284 -> 284 bytes
ath11k/IPQ8074/hw2.0/q6_fw.b00 | Bin 340 -> 340 bytes
ath11k/IPQ8074/hw2.0/q6_fw.b01 | Bin 328 -> 328 bytes
ath11k/IPQ8074/hw2.0/q6_fw.b02 | Bin 4696 -> 4696 bytes
ath11k/IPQ8074/hw2.0/q6_fw.b03 | Bin 2589264 -> 2934416 bytes
ath11k/IPQ8074/hw2.0/q6_fw.b04 | Bin 985504 -> 1009760 bytes
ath11k/IPQ8074/hw2.0/q6_fw.b05 | Bin 387076 -> 243588 bytes
ath11k/IPQ8074/hw2.0/q6_fw.b07 | Bin 7048 -> 9816 bytes
ath11k/IPQ8074/hw2.0/q6_fw.b08 | Bin 424524 -> 485768 bytes
ath11k/IPQ8074/hw2.0/q6_fw.mdt | Bin 668 -> 668 bytes
ath11k/QCN9074/hw1.0/Notice.txt | 802 ++++++++++++++++++++
ath11k/QCN9074/hw1.0/amss.bin | Bin 0 -> 11897676 bytes
ath11k/QCN9074/hw1.0/m3.bin | Bin 0 -> 340108 bytes
ath11k/WCN6855/hw2.0/Notice.txt | 1504 ++++++++++++++++++++++++++++++++++++++
ath11k/WCN6855/hw2.0/amss.bin | Bin 0 -> 4984832 bytes
ath11k/WCN6855/hw2.0/board-2.bin | Bin 0 -> 721328 bytes
ath11k/WCN6855/hw2.0/m3.bin | Bin 0 -> 266684 bytes
ath11k/WCN6855/hw2.0/regdb.bin | Bin 0 -> 24310 bytes
35 files changed, 2382 insertions(+), 34 deletions(-)
create mode 100644 ath11k/QCN9074/hw1.0/Notice.txt
create mode 100644 ath11k/QCN9074/hw1.0/amss.bin
create mode 100644 ath11k/QCN9074/hw1.0/m3.bin
create mode 100644 ath11k/WCN6855/hw2.0/Notice.txt
create mode 100644 ath11k/WCN6855/hw2.0/amss.bin
create mode 100644 ath11k/WCN6855/hw2.0/board-2.bin
create mode 100644 ath11k/WCN6855/hw2.0/m3.bin
create mode 100644 ath11k/WCN6855/hw2.0/regdb.bin
On Thursday, 23 December 2021 15:03:04 CET Kalle Valo wrote:
> ath11k/QCN9074/hw1.0/Notice.txt | 802 ++++++++++++++++++++
> ath11k/QCN9074/hw1.0/amss.bin | Bin 0 -> 11897676 bytes
> ath11k/QCN9074/hw1.0/m3.bin | Bin 0 -> 340108 bytes
This pull adds the firmware for QCN9074 but not the board-2.bin. As result,
the initialization of the ath11k PHY will fail.
Kind regards,
Sven
On Fri, Feb 18, 2022 at 10:55:37AM -0500, Josh Boyer wrote:
> On Thu, Feb 10, 2022 at 5:45 AM Kalle Valo <[email protected]> wrote:
> > > On Thu, Dec 23, 2021 at 9:03 AM Kalle Valo <[email protected]> wrote:
> > >>
> > >> WHENCE | 14 +-
> > >> ath11k/IPQ6018/hw1.0/Notice.txt | 48 +-
> > > These Notice files seem problematic. They're clearly well intended,
> > > but they have language that alludes to an agreement with Atheros and a
> > > confidential nature to some of the files. Specifically:
> > >
> > > "...your use of these software
> > > components together with the Qualcomm Atheros software (Qualcomm
> > > Atheros software hereinafter referred to as “Software”) is
> > > subject to the terms of your agreement from Qualcomm Atheros."
> > >
> > > Nobody has an opportunity to agree to anything with Atheros when they
> > > consume the files from linux-firmware. There's also no explicit grant
> > > of redistribution for any of these files.
This is not the license; this is a description of the notice.txt file
containing the notices to cover the 3rd party license requirements for
attribution/notices included in redistribution of those parts.
> > So this file we are discussing is the notice.txt file. In the WHENCE
> > file the actual license for ath11k is:
> >
> > Licence: Redistributable. See LICENSE.QualcommAtheros_ath10k for details
And this is where the license is and this includes license to
redistribute.
> Then is the notice.txt file needed at all? If a user or distribution
> were to install this firmware, is the expectation that the notice.txt
> file also be installed?
Those 3rd party license might require various notifications to be
included for notification/attribution purposes, so I would expect the
notice.txt file to be redistributed whenever the firmware image is
redistributed.
> > Does that cover your concerns about redistribution?
>
> Not really. I understand the logic, but if the binding license for
> the firmware is LICENSE.QualcommAtheros_ath10k but we still need
> notice.txt for some reason, they conflict. It's ambiguous at best.
Could you please be more specific on where you see a conflict? Maybe
this would be clearer if the WHENCE file would not mark the notice.txt
files with the "License: <file>" lines since these are not the license
for the firmware binary and then there would be a single "License:" line
pointing out the exact license that applies?
Would the following in WHENCE work for you?
Driver: ath11k - Qualcomm Technologies 802.11ax chipset support
File: ath11k/IPQ6018/hw1.0/board-2.bin
...
Version: WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
Notice: ath11k/IPQ6018/hw1.0/Notice.txt
...
File: ath11k/QCA6390/hw2.0/m3.bin
Version: WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Notice: ath11k/QCA6390/hw2.0/Notice.txt
Licence: Redistributable. See LICENSE.QualcommAtheros_ath10k for details
In other words, there would be only a single "License:" line and one
"Notice:" line for each firmware version? The license itself (i.e.,
LICENSE.QualcommAtheros_ath10k) is same for all the versions while the
set of notices (i.e., those notice.txt files) can be different based on
what is included in the particular build.
> > I'm still working on your other comment about notice.txt, will get back
> > on that later.
This part about clearly identifying the files should be clear now, but
it would be good to resolve that part about the notice.txt files in
general before sending out an updated pull request.
--
Jouni Malinen PGP id EFC895FA
On Fri, Mar 04, 2022 at 08:04:26AM -0500, Josh Boyer wrote:
> On Wed, Mar 2, 2022 at 12:50 PM Jouni Malinen <[email protected]> wrote:
> > Would the following in WHENCE work for you?
> >
> > Driver: ath11k - Qualcomm Technologies 802.11ax chipset support
> >
> > File: ath11k/IPQ6018/hw1.0/board-2.bin
> > ...
> > Version: WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
> > Notice: ath11k/IPQ6018/hw1.0/Notice.txt
>
> We'd have to teach copy-firmware.sh what to do with a "Notice:" key.
> Is there a reason "File:" wouldn't work? The intention is to install
> the notices alongside the binaries, so that would accomplish it.
Yeah, that sounds reasonable to me. From copying/installing/distribution
view point, these can really be handled in the exact same way as the
actual firmware binaries in practice.
> > In other words, there would be only a single "License:" line and one
> > "Notice:" line for each firmware version? The license itself (i.e.,
> > LICENSE.QualcommAtheros_ath10k) is same for all the versions while the
> > set of notices (i.e., those notice.txt files) can be different based on
> > what is included in the particular build.
>
> Yes, that would help. Would you be able to adjust the existing
> entries for ath firmware in the same way?
Yes, I'll work with Kalle to update the existing ath* WLAN cases.
> > > > I'm still working on your other comment about notice.txt, will get back
> > > > on that later.
> >
> > This part about clearly identifying the files should be clear now, but
> > it would be good to resolve that part about the notice.txt files in
> > general before sending out an updated pull request.
>
> Given these were merged in the past, perhaps I'm being overly
> pedantic. If we can mark them as Files or Notices instead of
> Licenses, I won't hold it up. It leaves me slightly confused why
> attribution files need to reference agreements with Qualcomm, splatter
> Confidential and Proprietary throughout the file, and reference
> COPYING and README in reference to GPLv2 when the BSD license was
> clearly chosen. Perhaps that could be cleaned up in the future.
Thanks. We'll remove most of the unnecessary information from the new
notice.txt files and that should get rid of many of the potentially
confusing parts. If that cleanup leaves something confusing in place,
we are open to cleaning these up further in followup patches, but it
would be nice to be able to get the updated versions into
linux-firmware.git without much more additional delay and yes, this
would be with the File: instead of Licence: entries for the notice.txt
files.
--
Jouni Malinen PGP id EFC895FA
On Fri, 04 Mar 2022 17:14:30 +0100,
Jouni Malinen wrote:
>
> On Fri, Mar 04, 2022 at 08:04:26AM -0500, Josh Boyer wrote:
> > On Wed, Mar 2, 2022 at 12:50 PM Jouni Malinen <[email protected]> wrote:
> > > Would the following in WHENCE work for you?
> > >
> > > Driver: ath11k - Qualcomm Technologies 802.11ax chipset support
> > >
> > > File: ath11k/IPQ6018/hw1.0/board-2.bin
> > > ...
> > > Version: WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
> > > Notice: ath11k/IPQ6018/hw1.0/Notice.txt
> >
> > We'd have to teach copy-firmware.sh what to do with a "Notice:" key.
> > Is there a reason "File:" wouldn't work? The intention is to install
> > the notices alongside the binaries, so that would accomplish it.
>
> Yeah, that sounds reasonable to me. From copying/installing/distribution
> view point, these can really be handled in the exact same way as the
> actual firmware binaries in practice.
>
> > > In other words, there would be only a single "License:" line and one
> > > "Notice:" line for each firmware version? The license itself (i.e.,
> > > LICENSE.QualcommAtheros_ath10k) is same for all the versions while the
> > > set of notices (i.e., those notice.txt files) can be different based on
> > > what is included in the particular build.
> >
> > Yes, that would help. Would you be able to adjust the existing
> > entries for ath firmware in the same way?
>
> Yes, I'll work with Kalle to update the existing ath* WLAN cases.
>
> > > > > I'm still working on your other comment about notice.txt, will get back
> > > > > on that later.
> > >
> > > This part about clearly identifying the files should be clear now, but
> > > it would be good to resolve that part about the notice.txt files in
> > > general before sending out an updated pull request.
> >
> > Given these were merged in the past, perhaps I'm being overly
> > pedantic. If we can mark them as Files or Notices instead of
> > Licenses, I won't hold it up. It leaves me slightly confused why
> > attribution files need to reference agreements with Qualcomm, splatter
> > Confidential and Proprietary throughout the file, and reference
> > COPYING and README in reference to GPLv2 when the BSD license was
> > clearly chosen. Perhaps that could be cleaned up in the future.
>
> Thanks. We'll remove most of the unnecessary information from the new
> notice.txt files and that should get rid of many of the potentially
> confusing parts. If that cleanup leaves something confusing in place,
> we are open to cleaning these up further in followup patches, but it
> would be nice to be able to get the updated versions into
> linux-firmware.git without much more additional delay and yes, this
> would be with the File: instead of Licence: entries for the notice.txt
> files.
The problem of "File:" is that it's more or less intended to be
installed as the firmware files themselves, i.e. they are installed in
/lib/firmware/* that can be loaded to the kernel. Putting such a
random (document) file there makes me a bit nervous.
We may introduce another tag to list up misc document files
(e.g. "Doc:" or whatever)? Distros can pick up them and put to the
appropriate places in the package, too.
thanks,
Takashi
On Wed, 13 Apr 2022 10:26:43 +0200,
Kalle Valo wrote:
>
> Takashi Iwai <[email protected]> writes:
>
> > On Fri, 04 Mar 2022 17:14:30 +0100,
> > Jouni Malinen wrote:
> >>
> >> On Fri, Mar 04, 2022 at 08:04:26AM -0500, Josh Boyer wrote:
> >> > On Wed, Mar 2, 2022 at 12:50 PM Jouni Malinen <[email protected]> wrote:
> >> > > Would the following in WHENCE work for you?
> >> > >
> >> > > Driver: ath11k - Qualcomm Technologies 802.11ax chipset support
> >> > >
> >> > > File: ath11k/IPQ6018/hw1.0/board-2.bin
> >> > > ...
> >> > > Version: WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2
> >> > > Notice: ath11k/IPQ6018/hw1.0/Notice.txt
> >> >
> >> > We'd have to teach copy-firmware.sh what to do with a "Notice:" key.
> >> > Is there a reason "File:" wouldn't work? The intention is to install
> >> > the notices alongside the binaries, so that would accomplish it.
> >>
> >> Yeah, that sounds reasonable to me. From copying/installing/distribution
> >> view point, these can really be handled in the exact same way as the
> >> actual firmware binaries in practice.
> >>
> >> > > In other words, there would be only a single "License:" line and one
> >> > > "Notice:" line for each firmware version? The license itself (i.e.,
> >> > > LICENSE.QualcommAtheros_ath10k) is same for all the versions while the
> >> > > set of notices (i.e., those notice.txt files) can be different based on
> >> > > what is included in the particular build.
> >> >
> >> > Yes, that would help. Would you be able to adjust the existing
> >> > entries for ath firmware in the same way?
> >>
> >> Yes, I'll work with Kalle to update the existing ath* WLAN cases.
> >>
> >> > > > > I'm still working on your other comment about notice.txt, will get back
> >> > > > > on that later.
> >> > >
> >> > > This part about clearly identifying the files should be clear now, but
> >> > > it would be good to resolve that part about the notice.txt files in
> >> > > general before sending out an updated pull request.
> >> >
> >> > Given these were merged in the past, perhaps I'm being overly
> >> > pedantic. If we can mark them as Files or Notices instead of
> >> > Licenses, I won't hold it up. It leaves me slightly confused why
> >> > attribution files need to reference agreements with Qualcomm, splatter
> >> > Confidential and Proprietary throughout the file, and reference
> >> > COPYING and README in reference to GPLv2 when the BSD license was
> >> > clearly chosen. Perhaps that could be cleaned up in the future.
> >>
> >> Thanks. We'll remove most of the unnecessary information from the new
> >> notice.txt files and that should get rid of many of the potentially
> >> confusing parts. If that cleanup leaves something confusing in place,
> >> we are open to cleaning these up further in followup patches, but it
> >> would be nice to be able to get the updated versions into
> >> linux-firmware.git without much more additional delay and yes, this
> >> would be with the File: instead of Licence: entries for the notice.txt
> >> files.
> >
> > The problem of "File:" is that it's more or less intended to be
> > installed as the firmware files themselves, i.e. they are installed in
> > /lib/firmware/* that can be loaded to the kernel. Putting such a
> > random (document) file there makes me a bit nervous.
> >
> > We may introduce another tag to list up misc document files
> > (e.g. "Doc:" or whatever)? Distros can pick up them and put to the
> > appropriate places in the package, too.
>
> What about "Notice:" which I proposed above? To me "Doc:" sounds like an
> optional file, which notice.txt files are not. That's why I prefer
> "Notice:".
Sure, it'd work, too. Only a patch is missing :)
thanks,
Takashi