Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use mainline driver for WiFi on Flat S 2022 (REVPI-2882) #141

Merged
merged 9 commits into from
Feb 20, 2023
Merged

Use mainline driver for WiFi on Flat S 2022 (REVPI-2882) #141

merged 9 commits into from
Feb 20, 2023

Conversation

l1k
Copy link

@l1k l1k commented Jan 19, 2023

No description provided.

@l1k l1k added the snapshot-packages Build snapshot packages for ARM and ARM64 label Jan 19, 2023
@iluminat23
Copy link

iluminat23 commented Jan 20, 2023 •
edited
Loading

Please add your Signed-off-by to the commits back ported from upstream. This is the proper behavior for handling patches.

The patch 8dd8682 has a Signed-off-by: Sherry Sun <sherry.sun@nxp.com> which is misleading. For me it seems there is no relevant code which was authored by Sherry Sun to justify adding the DCO here. As the DCO would imply Sherry Sun did actually worked on the patch. From my point of view you did enough when you added the link to the commit in the nxp repo.

@iluminat23
Copy link

If you want to upstream this, you might want to split up this commit: 8abe48a
Sometimes they want to have (devicetree-)documentation changes in an extra commit.

claudiubeznea and others added 4 commits January 20, 2023 19:14
@claudiubeznea @l1k
mmc: pwrseq: add wilc1000_sdio dependency for pwrseq_sd8787
d29affa 
commit 09cedbd upstream.

pwseq_sd8787 could also be used with wilc1000_sdio driver. Add
a dependency for this.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20210820092803.78523-4-claudiu.beznea@microchip.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
@l1k
mmc: pwrseq_sd8787: Allow being built-in irrespective of dependencies
c2da700 
commit 18b8460 upstream.

pwrseq_sd8787 is forced to be built as a module if its dependencies are.

That's unnecessary, it's perfectly fine for it to be built-in even
though the wireless drivers that need it are modules.

Relax the depends definition in Kconfig accordingly.

Signed-off-by: Lukas Wunner <lukas@wunner.de>
Cc: Matt Ranostay <matt@ranostay.consulting>
Cc: Lubomir Rintel <lkundrak@v3.sk>
Cc: Claudiu Beznea <claudiu.beznea@microchip.com>
@l1k
bcm2835-mmc: Honor return value of mmc_of_parse()
2d20cf7 
commit raspberrypi/linux@5a16077 upstream.

bcm2835_mmc_probe() ignores errors returned by mmc_of_parse() and in
particular ignores -EPROBE_DEFER, which may be returned if the power
sequencing driver configured in the devicetree is compiled as a module.

The user-visible result is that access to the SDIO device fails because
its power sequencing requirements have not been observed.  Fix it.

Signed-off-by: Lukas Wunner <lukas@wunner.de>
@l1k
mwifiex: Select firmware based on strapping
1e89384 
commit 255ca28 upstream.

Some WiFi/Bluetooth modules might have different host connection
options, allowing to either use SDIO for both WiFi and Bluetooth,
or SDIO for WiFi and UART for Bluetooth. It is possible to detect
whether a module has SDIO-SDIO or SDIO-UART connection by reading
its host strap register.

This change introduces a way to automatically select appropriate
firmware depending of the connection method, and removes a need
of symlinking or overwriting the original firmware file with a
required one.

Host strap register used in this commit comes from the NXP driver [1]
hosted at Code Aurora.

[1] https://source.codeaurora.org/external/imx/linux-imx/tree/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_sdio_mmc.c?h=rel_imx_5.4.70_2.3.2&id=688b67b2c7220b01521ffe560da7eee33042c7bd#n1274

Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
Reviewed-by: Alvin Šipraga <alsi@bang-olufsen.dk>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220422090313.125857-2-andrejs.cainikovs@toradex.com
Signed-off-by: Lukas Wunner <lukas@wunner.de>
@l1k l1k force-pushed the mwifiex_5.10_dont-build branch 2 times, most recently from ac086dc to edac513 Compare January 20, 2023 18:25
@l1k
wifi: mwifiex: Add missing compatible string for SD8787
cf62521 
commit 36dd7a4 upstream.

Commit e3fffc1 ("devicetree: document new marvell-8xxx and
pwrseq-sd8787 options") documented a compatible string for SD8787 in
the devicetree bindings, but neglected to add it to the mwifiex driver.

Fixes: e3fffc1 ("devicetree: document new marvell-8xxx and pwrseq-sd8787 options")
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Cc: stable@vger.kernel.org # v4.11+
Cc: Matt Ranostay <mranostay@ti.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/320de5005ff3b8fd76be2d2b859fd021689c3681.1674827105.git.lukas@wunner.de
@l1k
wifi: mwifiex: Support SD8978 chipset
dd3d79d 
commit bba047f upstream.

The Marvell SD8978 (aka NXP IW416) uses identical registers as SD8987,
so reuse the existing mwifiex_reg_sd8987 definition.

Note that mwifiex_reg_sd8977 and mwifiex_reg_sd8997 are likewise
identical, save for the fw_dump_ctrl register:  They define it as 0xf0
whereas mwifiex_reg_sd8987 defines it as 0xf9.  I've verified that
0xf9 is the correct value on SD8978.  NXP's out-of-tree driver uses
0xf9 for all of them, so there's a chance that 0xf0 is not correct
in the mwifiex_reg_sd8977 and mwifiex_reg_sd8997 definitions.  I cannot
test that for lack of hardware, hence am leaving it as is.

NXP has only released a firmware which runs Bluetooth over UART.
Perhaps Bluetooth over SDIO is unsupported by this chipset.
Consequently, only an "sdiouart" firmware image is referenced, not an
alternative "sdsd" image.

Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/536b4f17a72ca460ad1b07045757043fb0778988.1674827105.git.lukas@wunner.de
@l1k
wifi: mwifiex: Support firmware hotfix version in GET_HW_SPEC responses
119ed85 
commit 7715d79 upstream.

Support the firmware hotfix version in GET_HW_SPEC responses to avoid an
irritating "Unknown api_id: 5" message on probe.

Based on this commit in NXP's GPLv2-licensed out-of-tree driver:
nxp-imx/mwifiex@27fd8ecca504

Signed-off-by: Lukas Wunner <lukas@wunner.de>
Cc: Sherry Sun <sherry.sun@nxp.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/111c7ee895f12d951e95a2edcd06d87ca26a7d0f.1674827105.git.lukas@wunner.de
@l1k
arm*/configs/revpi-*: Enable PWRSEQ_SD8787 for Flat S 2022 WiFi
a870bee 
pwrseq_sd8787 allows proper handling of Reset and Powerdown GPIOs for
the Maya WiFi module which is built into RevPi Flat S 2022.

So enable that driver in all relevant configs.

Signed-off-by: Lukas Wunner <lukas@wunner.de>
@l1k
ARM: dts: revpi-flat-s-2022: Use mainline driver for WiFi
a593899 
We've just amended the mwifiex mainline driver to support IW416,
the chipset on which Maya WiFi modules are based.

So use the mainline driver instead of NXP's out-of-tree driver in the
RevPi Flat S 2022 devicetree overlay.

While at it, take advantage of the existing SD8787 power sequencing
driver in the mainline kernel.

Signed-off-by: Lukas Wunner <lukas@wunner.de>
@l1k l1k marked this pull request as ready for review February 14, 2023 17:56
@l1k
Copy link
Author

l1k commented Feb 14, 2023

All of these patches are now upstream, so should be ready to go into the revpi-5.10 branch.

@nbuchwitz nbuchwitz added snapshot-packages Build snapshot packages for ARM and ARM64 and removed snapshot-packages Build snapshot packages for ARM and ARM64 labels Feb 16, 2023
nbuchwitz
nbuchwitz approved these changes Feb 17, 2023
View reviewed changes
Copy link
Member

@nbuchwitz nbuchwitz left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Package builds for arm and arm64 were successful. Setup of the packages on a Flat / Flat S worked -> LGTM

@l1k l1k merged commit 25b03e4 into RevolutionPi:revpi-5.10 Feb 20, 2023
@l1k l1k deleted the mwifiex_5.10_dont-build branch February 27, 2023 12:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iluminat23 iluminat23 iluminat23 approved these changes

@nbuchwitz nbuchwitz nbuchwitz approved these changes

@linosanfilippo-kunbus linosanfilippo-kunbus Awaiting requested review from linosanfilippo-kunbus

Assignees
No one assigned
Labels
snapshot-packages Build snapshot packages for ARM and ARM64
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@l1k @iluminat23 @nbuchwitz @claudiubeznea