* [PATCH 1/2] staging: wfx: WF200 has no official SDIO IDs
2022-02-16 9:31 [PATCH 0/2] staging: wfx: apply SDIO suggestions Jerome Pouiller
@ 2022-02-16 9:31 ` Jerome Pouiller
2022-02-16 9:50 ` Pali Rohár
2022-02-16 9:31 ` [PATCH 2/2] staging: wfx: apply the necessary SDIO quirks for the Silabs WF200 Jerome Pouiller
2022-02-16 10:35 ` [PATCH 0/2] staging: wfx: apply SDIO suggestions Ulf Hansson
2 siblings, 1 reply; 11+ messages in thread
From: Jerome Pouiller @ 2022-02-16 9:31 UTC (permalink / raw)
To: linux-wireless, netdev, Kalle Valo
Cc: devel, linux-kernel, Greg Kroah-Hartman, David S . Miller,
linux-mmc, Pali Rohár, Ulf Hansson,
Jérôme Pouiller
From: Jérôme Pouiller <jerome.pouiller@silabs.com>
Some may think that SDIO_VENDOR_ID_SILABS / SDIO_DEVICE_ID_SILABS_WF200
are official SDIO IDs. However, it is not the case, the values used by
WF200 are not official (BTW, the driver rely on the DT rather than on
the SDIO IDs to probe the device).
To avoid any confusion, remove the definitions SDIO_*_ID_SILABS* and use
raw values.
Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
---
drivers/staging/wfx/bus_sdio.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wfx/bus_sdio.c b/drivers/staging/wfx/bus_sdio.c
index bc3df85a05b6..312d2d391a24 100644
--- a/drivers/staging/wfx/bus_sdio.c
+++ b/drivers/staging/wfx/bus_sdio.c
@@ -257,10 +257,9 @@ static void wfx_sdio_remove(struct sdio_func *func)
sdio_release_host(func);
}
-#define SDIO_VENDOR_ID_SILABS 0x0000
-#define SDIO_DEVICE_ID_SILABS_WF200 0x1000
static const struct sdio_device_id wfx_sdio_ids[] = {
- { SDIO_DEVICE(SDIO_VENDOR_ID_SILABS, SDIO_DEVICE_ID_SILABS_WF200) },
+ /* WF200 does not have official VID/PID */
+ { SDIO_DEVICE(0x0000, 0x1000) },
{ },
};
MODULE_DEVICE_TABLE(sdio, wfx_sdio_ids);
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 1/2] staging: wfx: WF200 has no official SDIO IDs
2022-02-16 9:31 ` [PATCH 1/2] staging: wfx: WF200 has no official SDIO IDs Jerome Pouiller
@ 2022-02-16 9:50 ` Pali Rohár
0 siblings, 0 replies; 11+ messages in thread
From: Pali Rohár @ 2022-02-16 9:50 UTC (permalink / raw)
To: Jerome Pouiller
Cc: linux-wireless, netdev, Kalle Valo, devel, linux-kernel,
Greg Kroah-Hartman, David S . Miller, linux-mmc, Ulf Hansson
On Wednesday 16 February 2022 10:31:11 Jerome Pouiller wrote:
> From: Jérôme Pouiller <jerome.pouiller@silabs.com>
>
> Some may think that SDIO_VENDOR_ID_SILABS / SDIO_DEVICE_ID_SILABS_WF200
> are official SDIO IDs. However, it is not the case, the values used by
> WF200 are not official (BTW, the driver rely on the DT rather than on
> the SDIO IDs to probe the device).
>
> To avoid any confusion, remove the definitions SDIO_*_ID_SILABS* and use
> raw values.
>
> Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Reviewed-by: Pali Rohár <pali@kernel.org>
> ---
> drivers/staging/wfx/bus_sdio.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/wfx/bus_sdio.c b/drivers/staging/wfx/bus_sdio.c
> index bc3df85a05b6..312d2d391a24 100644
> --- a/drivers/staging/wfx/bus_sdio.c
> +++ b/drivers/staging/wfx/bus_sdio.c
> @@ -257,10 +257,9 @@ static void wfx_sdio_remove(struct sdio_func *func)
> sdio_release_host(func);
> }
>
> -#define SDIO_VENDOR_ID_SILABS 0x0000
> -#define SDIO_DEVICE_ID_SILABS_WF200 0x1000
> static const struct sdio_device_id wfx_sdio_ids[] = {
> - { SDIO_DEVICE(SDIO_VENDOR_ID_SILABS, SDIO_DEVICE_ID_SILABS_WF200) },
> + /* WF200 does not have official VID/PID */
> + { SDIO_DEVICE(0x0000, 0x1000) },
> { },
> };
> MODULE_DEVICE_TABLE(sdio, wfx_sdio_ids);
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/2] staging: wfx: apply the necessary SDIO quirks for the Silabs WF200
2022-02-16 9:31 [PATCH 0/2] staging: wfx: apply SDIO suggestions Jerome Pouiller
2022-02-16 9:31 ` [PATCH 1/2] staging: wfx: WF200 has no official SDIO IDs Jerome Pouiller
@ 2022-02-16 9:31 ` Jerome Pouiller
2022-02-16 9:51 ` Pali Rohár
2022-02-17 9:59 ` Kalle Valo
2022-02-16 10:35 ` [PATCH 0/2] staging: wfx: apply SDIO suggestions Ulf Hansson
2 siblings, 2 replies; 11+ messages in thread
From: Jerome Pouiller @ 2022-02-16 9:31 UTC (permalink / raw)
To: linux-wireless, netdev, Kalle Valo
Cc: devel, linux-kernel, Greg Kroah-Hartman, David S . Miller,
linux-mmc, Pali Rohár, Ulf Hansson,
Jérôme Pouiller
From: Jérôme Pouiller <jerome.pouiller@silabs.com>
Until now, the SDIO quirks are applied directly from the driver.
However, it is better to apply the quirks before driver probing. So,
this patch relocate the quirks in the MMC framework.
Note that the WF200 has no valid SDIO VID/PID. Therefore, we match DT
rather than on the SDIO VID/PID.
Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
---
drivers/mmc/core/quirks.h | 5 +++++
drivers/staging/wfx/bus_sdio.c | 3 ---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h
index 20f568727277..f879dc63d936 100644
--- a/drivers/mmc/core/quirks.h
+++ b/drivers/mmc/core/quirks.h
@@ -149,6 +149,11 @@ static const struct mmc_fixup __maybe_unused sdio_fixup_methods[] = {
static const struct mmc_fixup __maybe_unused sdio_card_init_methods[] = {
SDIO_FIXUP_COMPATIBLE("ti,wl1251", wl1251_quirk, 0),
+ SDIO_FIXUP_COMPATIBLE("silabs,wf200", add_quirk,
+ MMC_QUIRK_BROKEN_BYTE_MODE_512 |
+ MMC_QUIRK_LENIENT_FN0 |
+ MMC_QUIRK_BLKSZ_FOR_BYTE_MODE),
+
END_FIXUP
};
diff --git a/drivers/staging/wfx/bus_sdio.c b/drivers/staging/wfx/bus_sdio.c
index 312d2d391a24..51a0d58a9070 100644
--- a/drivers/staging/wfx/bus_sdio.c
+++ b/drivers/staging/wfx/bus_sdio.c
@@ -216,9 +216,6 @@ static int wfx_sdio_probe(struct sdio_func *func, const struct sdio_device_id *i
bus->func = func;
bus->of_irq = irq_of_parse_and_map(np, 0);
sdio_set_drvdata(func, bus);
- func->card->quirks |= MMC_QUIRK_LENIENT_FN0 |
- MMC_QUIRK_BLKSZ_FOR_BYTE_MODE |
- MMC_QUIRK_BROKEN_BYTE_MODE_512;
sdio_claim_host(func);
ret = sdio_enable_func(func);
--
2.34.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 2/2] staging: wfx: apply the necessary SDIO quirks for the Silabs WF200
2022-02-16 9:31 ` [PATCH 2/2] staging: wfx: apply the necessary SDIO quirks for the Silabs WF200 Jerome Pouiller
@ 2022-02-16 9:51 ` Pali Rohár
2022-02-17 9:59 ` Kalle Valo
1 sibling, 0 replies; 11+ messages in thread
From: Pali Rohár @ 2022-02-16 9:51 UTC (permalink / raw)
To: Jerome Pouiller
Cc: linux-wireless, netdev, Kalle Valo, devel, linux-kernel,
Greg Kroah-Hartman, David S . Miller, linux-mmc, Ulf Hansson
On Wednesday 16 February 2022 10:31:12 Jerome Pouiller wrote:
> From: Jérôme Pouiller <jerome.pouiller@silabs.com>
>
> Until now, the SDIO quirks are applied directly from the driver.
> However, it is better to apply the quirks before driver probing. So,
> this patch relocate the quirks in the MMC framework.
>
> Note that the WF200 has no valid SDIO VID/PID. Therefore, we match DT
> rather than on the SDIO VID/PID.
>
> Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Reviewed-by: Pali Rohár <pali@kernel.org>
> ---
> drivers/mmc/core/quirks.h | 5 +++++
> drivers/staging/wfx/bus_sdio.c | 3 ---
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h
> index 20f568727277..f879dc63d936 100644
> --- a/drivers/mmc/core/quirks.h
> +++ b/drivers/mmc/core/quirks.h
> @@ -149,6 +149,11 @@ static const struct mmc_fixup __maybe_unused sdio_fixup_methods[] = {
> static const struct mmc_fixup __maybe_unused sdio_card_init_methods[] = {
> SDIO_FIXUP_COMPATIBLE("ti,wl1251", wl1251_quirk, 0),
>
> + SDIO_FIXUP_COMPATIBLE("silabs,wf200", add_quirk,
> + MMC_QUIRK_BROKEN_BYTE_MODE_512 |
> + MMC_QUIRK_LENIENT_FN0 |
> + MMC_QUIRK_BLKSZ_FOR_BYTE_MODE),
> +
> END_FIXUP
> };
>
> diff --git a/drivers/staging/wfx/bus_sdio.c b/drivers/staging/wfx/bus_sdio.c
> index 312d2d391a24..51a0d58a9070 100644
> --- a/drivers/staging/wfx/bus_sdio.c
> +++ b/drivers/staging/wfx/bus_sdio.c
> @@ -216,9 +216,6 @@ static int wfx_sdio_probe(struct sdio_func *func, const struct sdio_device_id *i
> bus->func = func;
> bus->of_irq = irq_of_parse_and_map(np, 0);
> sdio_set_drvdata(func, bus);
> - func->card->quirks |= MMC_QUIRK_LENIENT_FN0 |
> - MMC_QUIRK_BLKSZ_FOR_BYTE_MODE |
> - MMC_QUIRK_BROKEN_BYTE_MODE_512;
>
> sdio_claim_host(func);
> ret = sdio_enable_func(func);
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 2/2] staging: wfx: apply the necessary SDIO quirks for the Silabs WF200
2022-02-16 9:31 ` [PATCH 2/2] staging: wfx: apply the necessary SDIO quirks for the Silabs WF200 Jerome Pouiller
2022-02-16 9:51 ` Pali Rohár
@ 2022-02-17 9:59 ` Kalle Valo
2022-02-17 14:54 ` Ulf Hansson
1 sibling, 1 reply; 11+ messages in thread
From: Kalle Valo @ 2022-02-17 9:59 UTC (permalink / raw)
To: Jerome Pouiller
Cc: linux-wireless, netdev, devel, linux-kernel, Greg Kroah-Hartman,
David S . Miller, linux-mmc, Pali Rohár, Ulf Hansson
Jerome Pouiller <Jerome.Pouiller@silabs.com> writes:
> From: Jérôme Pouiller <jerome.pouiller@silabs.com>
>
> Until now, the SDIO quirks are applied directly from the driver.
> However, it is better to apply the quirks before driver probing. So,
> this patch relocate the quirks in the MMC framework.
It would be good to know how this is better, what's the concrete
advantage?
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] staging: wfx: apply the necessary SDIO quirks for the Silabs WF200
2022-02-17 9:59 ` Kalle Valo
@ 2022-02-17 14:54 ` Ulf Hansson
2022-02-17 15:04 ` Kalle Valo
0 siblings, 1 reply; 11+ messages in thread
From: Ulf Hansson @ 2022-02-17 14:54 UTC (permalink / raw)
To: Kalle Valo
Cc: Jerome Pouiller, linux-wireless, netdev, devel, linux-kernel,
Greg Kroah-Hartman, David S . Miller, linux-mmc, Pali Rohár
On Thu, 17 Feb 2022 at 10:59, Kalle Valo <kvalo@kernel.org> wrote:
>
> Jerome Pouiller <Jerome.Pouiller@silabs.com> writes:
>
> > From: Jérôme Pouiller <jerome.pouiller@silabs.com>
> >
> > Until now, the SDIO quirks are applied directly from the driver.
> > However, it is better to apply the quirks before driver probing. So,
> > this patch relocate the quirks in the MMC framework.
>
> It would be good to know how this is better, what's the concrete
> advantage?
The mmc core has a quirk interface for all types of cards
(eMMC/SD/SDIO), which thus keeps these things from sprinkling to
drivers. In some cases, the quirk needs to be applied already during
card initialization, which is earlier than when probing an SDIO func
driver or the MMC block device driver.
Perhaps it's a good idea to explain a bit about this in the commit message.
Kind regards
Uffe
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] staging: wfx: apply the necessary SDIO quirks for the Silabs WF200
2022-02-17 14:54 ` Ulf Hansson
@ 2022-02-17 15:04 ` Kalle Valo
2022-02-17 15:41 ` Jérôme Pouiller
0 siblings, 1 reply; 11+ messages in thread
From: Kalle Valo @ 2022-02-17 15:04 UTC (permalink / raw)
To: Ulf Hansson
Cc: Jerome Pouiller, linux-wireless, netdev, devel, linux-kernel,
Greg Kroah-Hartman, David S . Miller, linux-mmc, Pali Rohár
Ulf Hansson <ulf.hansson@linaro.org> writes:
> On Thu, 17 Feb 2022 at 10:59, Kalle Valo <kvalo@kernel.org> wrote:
>>
>> Jerome Pouiller <Jerome.Pouiller@silabs.com> writes:
>>
>> > From: Jérôme Pouiller <jerome.pouiller@silabs.com>
>> >
>> > Until now, the SDIO quirks are applied directly from the driver.
>> > However, it is better to apply the quirks before driver probing. So,
>> > this patch relocate the quirks in the MMC framework.
>>
>> It would be good to know how this is better, what's the concrete
>> advantage?
>
> The mmc core has a quirk interface for all types of cards
> (eMMC/SD/SDIO), which thus keeps these things from sprinkling to
> drivers. In some cases, the quirk needs to be applied already during
> card initialization, which is earlier than when probing an SDIO func
> driver or the MMC block device driver.
>
> Perhaps it's a good idea to explain a bit about this in the commit message.
I would add the whole paragraph to the commit log :)
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] staging: wfx: apply the necessary SDIO quirks for the Silabs WF200
2022-02-17 15:04 ` Kalle Valo
@ 2022-02-17 15:41 ` Jérôme Pouiller
2022-02-17 15:58 ` Greg Kroah-Hartman
0 siblings, 1 reply; 11+ messages in thread
From: Jérôme Pouiller @ 2022-02-17 15:41 UTC (permalink / raw)
To: Ulf Hansson, Kalle Valo
Cc: linux-wireless, netdev, devel, linux-kernel, Greg Kroah-Hartman,
David S . Miller, linux-mmc, Pali Rohár
On Thursday 17 February 2022 16:04:51 CET Kalle Valo wrote:
> Ulf Hansson <ulf.hansson@linaro.org> writes:
> > On Thu, 17 Feb 2022 at 10:59, Kalle Valo <kvalo@kernel.org> wrote:
> >> Jerome Pouiller <Jerome.Pouiller@silabs.com> writes:
> >> > From: Jérôme Pouiller <jerome.pouiller@silabs.com>
> >> >
> >> > Until now, the SDIO quirks are applied directly from the driver.
> >> > However, it is better to apply the quirks before driver probing. So,
> >> > this patch relocate the quirks in the MMC framework.
> >>
> >> It would be good to know how this is better, what's the concrete
> >> advantage?
> >
> > The mmc core has a quirk interface for all types of cards
> > (eMMC/SD/SDIO), which thus keeps these things from sprinkling to
> > drivers. In some cases, the quirk needs to be applied already during
> > card initialization, which is earlier than when probing an SDIO func
> > driver or the MMC block device driver.
> >
> > Perhaps it's a good idea to explain a bit about this in the commit message.
>
> I would add the whole paragraph to the commit log :)
Arf, Greg has just pulled this patch into staging-testing. I assume it is
too late to change the commit message.
--
Jérôme Pouiller
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] staging: wfx: apply the necessary SDIO quirks for the Silabs WF200
2022-02-17 15:41 ` Jérôme Pouiller
@ 2022-02-17 15:58 ` Greg Kroah-Hartman
0 siblings, 0 replies; 11+ messages in thread
From: Greg Kroah-Hartman @ 2022-02-17 15:58 UTC (permalink / raw)
To: Jérôme Pouiller
Cc: Ulf Hansson, Kalle Valo, devel, netdev, linux-wireless,
linux-kernel, linux-mmc, Pali Rohár, David S . Miller
On Thu, Feb 17, 2022 at 04:41:38PM +0100, Jérôme Pouiller wrote:
> On Thursday 17 February 2022 16:04:51 CET Kalle Valo wrote:
> > Ulf Hansson <ulf.hansson@linaro.org> writes:
> > > On Thu, 17 Feb 2022 at 10:59, Kalle Valo <kvalo@kernel.org> wrote:
> > >> Jerome Pouiller <Jerome.Pouiller@silabs.com> writes:
> > >> > From: Jérôme Pouiller <jerome.pouiller@silabs.com>
> > >> >
> > >> > Until now, the SDIO quirks are applied directly from the driver.
> > >> > However, it is better to apply the quirks before driver probing. So,
> > >> > this patch relocate the quirks in the MMC framework.
> > >>
> > >> It would be good to know how this is better, what's the concrete
> > >> advantage?
> > >
> > > The mmc core has a quirk interface for all types of cards
> > > (eMMC/SD/SDIO), which thus keeps these things from sprinkling to
> > > drivers. In some cases, the quirk needs to be applied already during
> > > card initialization, which is earlier than when probing an SDIO func
> > > driver or the MMC block device driver.
> > >
> > > Perhaps it's a good idea to explain a bit about this in the commit message.
> >
> > I would add the whole paragraph to the commit log :)
>
> Arf, Greg has just pulled this patch into staging-testing. I assume it is
> too late to change the commit message.
I can drop it, but really, it's fine as-is.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] staging: wfx: apply SDIO suggestions
2022-02-16 9:31 [PATCH 0/2] staging: wfx: apply SDIO suggestions Jerome Pouiller
2022-02-16 9:31 ` [PATCH 1/2] staging: wfx: WF200 has no official SDIO IDs Jerome Pouiller
2022-02-16 9:31 ` [PATCH 2/2] staging: wfx: apply the necessary SDIO quirks for the Silabs WF200 Jerome Pouiller
@ 2022-02-16 10:35 ` Ulf Hansson
2 siblings, 0 replies; 11+ messages in thread
From: Ulf Hansson @ 2022-02-16 10:35 UTC (permalink / raw)
To: Jerome Pouiller
Cc: linux-wireless, netdev, Kalle Valo, devel, linux-kernel,
Greg Kroah-Hartman, David S . Miller, linux-mmc, Pali Rohár
On Wed, 16 Feb 2022 at 10:31, Jerome Pouiller
<Jerome.Pouiller@silabs.com> wrote:
>
> From: Jérôme Pouiller <jerome.pouiller@silabs.com>
>
> Hi Ulf, Greg,
>
> The second patch of this series touch to the staging tree and to the MMC
> framework. I don't know what is the rule for these cases, but I think it
> makes more sense to carry this patch with the staging tree.
I don't believe the changes to the mmc core will cause any merge
conflict, so feel free to funnel this through whatever tree makes best
sense.
For the series:
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Kind regards
Uffe
>
>
> Jérôme Pouiller (2):
> staging: wfx: WF200 has no official SDIO IDs
> staging: wfx: apply the necessary SDIO quirks for the Silabs WF200
>
> drivers/mmc/core/quirks.h | 5 +++++
> drivers/staging/wfx/bus_sdio.c | 8 ++------
> 2 files changed, 7 insertions(+), 6 deletions(-)
>
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 11+ messages in thread