[PATCH 0/3] linux-firmware: update wfx

[PATCH 0/3] linux-firmware: update wfx

[Jerome Pouiller]

From: Jérôme Pouiller <jerome.pouiller@silabs.com>

The two first patches reflect changes made in the kernel.

Jérôme Pouiller (3):
  wfx: rename silabs/ into wfx/
  wfx: add antenna configuration files
  wfx: update to firmware 3.14

 WHENCE                        |  18 ++++++++++++++----
 silabs/wfm_wf200_C0.sec       | Bin 305232 -> 0 bytes
 {silabs => wfx}/LICENCE.wf200 |   0
 wfx/brd4001a.pds              | Bin 0 -> 625 bytes
 wfx/brd8022a.pds              | Bin 0 -> 584 bytes
 wfx/brd8023a.pds              | Bin 0 -> 625 bytes
 wfx/wfm_wf200_C0.sec          | Bin 0 -> 309328 bytes
 7 files changed, 14 insertions(+), 4 deletions(-)
 delete mode 100644 silabs/wfm_wf200_C0.sec
 rename {silabs => wfx}/LICENCE.wf200 (100%)
 create mode 100644 wfx/brd4001a.pds
 create mode 100644 wfx/brd8022a.pds
 create mode 100644 wfx/brd8023a.pds
 create mode 100644 wfx/wfm_wf200_C0.sec

-- 
2.34.1

[PATCH 1/3] wfx: rename silabs/ into wfx/

[Jerome Pouiller]

From: Jérôme Pouiller <jerome.pouiller@silabs.com>

WiFi device maintainer expressed he prefers to use the same name for the
driver and the firmware directory[1].

Since the driver is not yet merged, the renaming does not break
anything.

[1]: https://lore.kernel.org/netdev/87sfxlj6s1.fsf@codeaurora.org/

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
---
 WHENCE                           |   4 ++--
 {silabs => wfx}/LICENCE.wf200    |   0
 {silabs => wfx}/wfm_wf200_C0.sec | Bin
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename {silabs => wfx}/LICENCE.wf200 (100%)
 rename {silabs => wfx}/wfm_wf200_C0.sec (100%)

diff --git a/WHENCE b/WHENCE
index ae33372..0a6cb15 100644
--- a/WHENCE
+++ b/WHENCE
@@ -5842,10 +5842,10 @@ License: Redistributable. See LICENSE.Lontium for details.
 
 Driver: wfx - Silicon Labs Wi-Fi Transceiver
 
-File: silabs/wfm_wf200_C0.sec
+File: wfx/wfm_wf200_C0.sec
 Version: 3.12.1
 
-Licence: Redistributable. See silabs/LICENCE.wf200 for details.
+Licence: Redistributable. See wfx/LICENCE.wf200 for details.
 Originates from https://github.com/SiliconLabs/wfx-firmware
 
 --------------------------------------------------------------------------
diff --git a/silabs/LICENCE.wf200 b/wfx/LICENCE.wf200
similarity index 100%
rename from silabs/LICENCE.wf200
rename to wfx/LICENCE.wf200
diff --git a/silabs/wfm_wf200_C0.sec b/wfx/wfm_wf200_C0.sec
similarity index 100%
rename from silabs/wfm_wf200_C0.sec
rename to wfx/wfm_wf200_C0.sec
-- 
2.34.1

[PATCH 2/3] wfx: add antenna configuration files

[Jerome Pouiller]

From: Jérôme Pouiller <jerome.pouiller@silabs.com>

The wfx driver is now able load the antenna parameters (aka PDS file)
corresponding to the board declared in the device tree.

So, add these files to linux-firmware.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
---
 WHENCE           |  12 +++++++++++-
 wfx/brd4001a.pds | Bin 0 -> 625 bytes
 wfx/brd8022a.pds | Bin 0 -> 584 bytes
 wfx/brd8023a.pds | Bin 0 -> 625 bytes
 4 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 wfx/brd4001a.pds
 create mode 100644 wfx/brd8022a.pds
 create mode 100644 wfx/brd8023a.pds

diff --git a/WHENCE b/WHENCE
index 0a6cb15..96f67f7 100644
--- a/WHENCE
+++ b/WHENCE
@@ -5845,8 +5845,18 @@ Driver: wfx - Silicon Labs Wi-Fi Transceiver
 File: wfx/wfm_wf200_C0.sec
 Version: 3.12.1
 
+File: wfx/brd4001a.pds not listed in WHENCE
+File: wfx/brd8022a.pds not listed in WHENCE
+File: wfx/brd8023a.pds not listed in WHENCE
+
 Licence: Redistributable. See wfx/LICENCE.wf200 for details.
-Originates from https://github.com/SiliconLabs/wfx-firmware
+
+The firmware itself originates from https://github.com/SiliconLabs/wfx-firmware
+
+The *.pds files come from https://github.com/SiliconLabs/wfx-pds
+
+They have been processed with the tool "pds_compress" available on
+https://github.com/SiliconLabs/wfx-linux-tools
 
 --------------------------------------------------------------------------
 
diff --git a/wfx/brd4001a.pds b/wfx/brd4001a.pds
new file mode 100644
index 0000000000000000000000000000000000000000..9765d132c28bdd1c3c78cdd6a876a04818a3e25f
GIT binary patch
literal 625
zcmZwENe+TQ5Cu>?g7>HeIFQ(h3nph1_Jjo>&Ypn$yLmK!H^hZjfDj(lm9F1;I`+EC
z@SaI+0w7PLQCC|S%$LUaa^lmP2rN=O28$F=z=evZU^B%t$XW9h<f8c+a@BkTxoN(I
z+%?}p9-8kV&tDI?^#kOk`4Kk2rPsMM?0`dH;Sf-0!yH1Pxe)kvLx*lLkAqq>?xsJE
zx7TsTmQb0w&;0wtXiUNW0ly1hzE=sMPE;+XvMAL*k*cw(MIx!*CHt!{Z5kZNW$v~P
Fd;t0Utj7QV

literal 0
HcmV?d00001

diff --git a/wfx/brd8022a.pds b/wfx/brd8022a.pds
new file mode 100644
index 0000000000000000000000000000000000000000..737286f323615c1d07ec1a972fc97908a21fb6bf
GIT binary patch
literal 584
zcmZvZIS#@w5JgRkM8O$orw9ZhVTl5gup_09Qn2qQu>RdR8s8?OfKja2c{5|pycAi>
zxUJ>t14Y(sxSe%-zalx<UMfeMf+wFKJHk&OBG15=!gI(;<5S34<1@%b<8#PW;|s`5
z<4ee0<15JHmv`Cv8uHZm2HwQTcn!4~PR?TjPVaXwp_W1xBybNyC!x4wT%b&jS)1gn
zNa&>&=<k0S$ElAry0wESL=Hi3$)Ya5%SgUY1tIOJw2Wm~sgbctCn_yd$@E+Dzx>Mg
M-!?A%h0r?i21vxA{r~^~

literal 0
HcmV?d00001

diff --git a/wfx/brd8023a.pds b/wfx/brd8023a.pds
new file mode 100644
index 0000000000000000000000000000000000000000..9765d132c28bdd1c3c78cdd6a876a04818a3e25f
GIT binary patch
literal 625
zcmZwENe+TQ5Cu>?g7>HeIFQ(h3nph1_Jjo>&Ypn$yLmK!H^hZjfDj(lm9F1;I`+EC
z@SaI+0w7PLQCC|S%$LUaa^lmP2rN=O28$F=z=evZU^B%t$XW9h<f8c+a@BkTxoN(I
z+%?}p9-8kV&tDI?^#kOk`4Kk2rPsMM?0`dH;Sf-0!yH1Pxe)kvLx*lLkAqq>?xsJE
zx7TsTmQb0w&;0wtXiUNW0ly1hzE=sMPE;+XvMAL*k*cw(MIx!*CHt!{Z5kZNW$v~P
Fd;t0Utj7QV

literal 0
HcmV?d00001

-- 
2.34.1

Re: [PATCH 2/3] wfx: add antenna configuration files

[Ben Brown]

On 21/02/2022 16:37, Jerome Pouiller wrote:
> From: Jérôme Pouiller <jerome.pouiller@silabs.com>
<snip>
> diff --git a/WHENCE b/WHENCE
> index 0a6cb15..96f67f7 100644
> --- a/WHENCE
> +++ b/WHENCE
> @@ -5845,8 +5845,18 @@ Driver: wfx - Silicon Labs Wi-Fi Transceiver
>  File: wfx/wfm_wf200_C0.sec
>  Version: 3.12.1
>  
> +File: wfx/brd4001a.pds not listed in WHENCE
> +File: wfx/brd8022a.pds not listed in WHENCE
> +File: wfx/brd8023a.pds not listed in WHENCE

This format does not appear to be correct. While this will seemingly
pass the `check_whence.py` check, it will be completely ignored by
`copy-firmware.sh`, as that takes the full line after 'File: ' (e.g.
'wfx/brd4001a.pds not listed in WHENCE', which of course does not exist).

I'm assuming the trailing ' not listed in WHENCE' needs to be removed
from each of these lines. Otherwise these are likely not being picked up
by distros (they are missing from Arch, for example). This may have been
the intention, but that seems odd (and unclear if so).


Regards,
Ben

Re: [PATCH 2/3] wfx: add antenna configuration files

[Jérôme Pouiller]

On Thursday 7 July 2022 19:40:27 CEST Josh Boyer wrote:
> On Thu, Jul 7, 2022 at 1:04 PM Ben Brown <ben@demerara.io> wrote:
> > On 21/02/2022 16:37, Jerome Pouiller wrote:
> > > From: Jérôme Pouiller <jerome.pouiller@silabs.com>
> > <snip>
> > > diff --git a/WHENCE b/WHENCE
> > > index 0a6cb15..96f67f7 100644
> > > --- a/WHENCE
> > > +++ b/WHENCE
> > > @@ -5845,8 +5845,18 @@ Driver: wfx - Silicon Labs Wi-Fi Transceiver
> > >  File: wfx/wfm_wf200_C0.sec
> > >  Version: 3.12.1
> > >
> > > +File: wfx/brd4001a.pds not listed in WHENCE
> > > +File: wfx/brd8022a.pds not listed in WHENCE
> > > +File: wfx/brd8023a.pds not listed in WHENCE
> >
> > This format does not appear to be correct. While this will seemingly
> > pass the `check_whence.py` check, it will be completely ignored by
> > `copy-firmware.sh`, as that takes the full line after 'File: ' (e.g.
> > 'wfx/brd4001a.pds not listed in WHENCE', which of course does not exist).
> 
> Oh, indeed.
> 
> > I'm assuming the trailing ' not listed in WHENCE' needs to be removed
> > from each of these lines. Otherwise these are likely not being picked up
> > by distros (they are missing from Arch, for example). This may have been
> > the intention, but that seems odd (and unclear if so).
> 
> I doubt that was the intention.  I'll correct WHENCE in a separate
> commit.  Thank you for reporting the issue.

It seems I had copy-pasted the output of check_whence.py. I was probably not
very awake. Sorry for the disturb.

Do you think the change below could be useful?

---------8<-------------8<----------------

diff --git i/check_whence.py w/check_whence.py
index 8805e99..8244288 100755
--- i/check_whence.py
+++ w/check_whence.py
@@ -6,11 +6,11 @@
 def list_whence():
     with open('WHENCE', encoding='utf-8') as whence:
         for line in whence:
-            match = re.match(r'(?:File|Source):\s*"(.*)"', line)
+            match = re.match(r'(?:File|Source):\s*"(.*)"\s*$', line)
             if match:
                 yield match.group(1)
                 continue
-            match = re.match(r'(?:File|Source):\s*(\S*)', line)
+            match = re.match(r'(?:File|Source):\s*(\S*)\s*$', line)
             if match:
                 yield match.group(1)
                 continue



-- 
Jérôme Pouiller