* [PATCH v3] brcmfmac: Transform compatible string for FW loading
@ 2020-07-01 11:22 matthias.bgg
2020-07-01 12:12 ` Hans de Goede
2020-07-14 9:50 ` Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: matthias.bgg @ 2020-07-01 11:22 UTC (permalink / raw)
To: arend.vanspriel, kvalo, davem, kuba
Cc: brcm80211-dev-list.pdl, mbrugger, netdev, chi-hsien.lin,
linux-wireless, hante.meuleman, linux-kernel, hdegoede,
wright.feng, matthias.bgg, brcm80211-dev-list, franky.lin
From: Matthias Brugger <mbrugger@suse.com>
The driver relies on the compatible string from DT to determine which
FW configuration file it should load. The DTS spec allows for '/' as
part of the compatible string. We change this to '-' so that we will
still be able to load the config file, even when the compatible has a
'/'. This fixes explicitly the firmware loading for
"solidrun,cubox-i/q".
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---
Changes in v3:
- use len variable to store length of string (Hans de Goede)
- fix for loop to stop on first NULL-byte (Hans de Goede)
Changes in v2:
- use strscpy instead of strncpy (Hans de Goede)
- use strlen(tmp) + 1 for allocation (Hans de Goede, kernel test robot)
.../wireless/broadcom/brcm80211/brcmfmac/of.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
index b886b56a5e5a..a7554265f95f 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
@@ -17,7 +17,6 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
{
struct brcmfmac_sdio_pd *sdio = &settings->bus.sdio;
struct device_node *root, *np = dev->of_node;
- struct property *prop;
int irq;
u32 irqf;
u32 val;
@@ -25,8 +24,22 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
/* Set board-type to the first string of the machine compatible prop */
root = of_find_node_by_path("/");
if (root) {
- prop = of_find_property(root, "compatible", NULL);
- settings->board_type = of_prop_next_string(prop, NULL);
+ int i, len;
+ char *board_type;
+ const char *tmp;
+
+ of_property_read_string_index(root, "compatible", 0, &tmp);
+
+ /* get rid of '/' in the compatible string to be able to find the FW */
+ len = strlen(tmp) + 1;
+ board_type = devm_kzalloc(dev, len, GFP_KERNEL);
+ strscpy(board_type, tmp, len);
+ for (i = 0; i < board_type[i]; i++) {
+ if (board_type[i] == '/')
+ board_type[i] = '-';
+ }
+ settings->board_type = board_type;
+
of_node_put(root);
}
--
2.27.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v3] brcmfmac: Transform compatible string for FW loading
2020-07-01 11:22 [PATCH v3] brcmfmac: Transform compatible string for FW loading matthias.bgg
@ 2020-07-01 12:12 ` Hans de Goede
2020-07-14 9:50 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Hans de Goede @ 2020-07-01 12:12 UTC (permalink / raw)
To: matthias.bgg, arend.vanspriel, kvalo, davem, kuba
Cc: brcm80211-dev-list.pdl, mbrugger, netdev, chi-hsien.lin,
linux-wireless, hante.meuleman, linux-kernel, wright.feng,
brcm80211-dev-list, franky.lin
Hi,
On 7/1/20 1:22 PM, matthias.bgg@kernel.org wrote:
> From: Matthias Brugger <mbrugger@suse.com>
>
> The driver relies on the compatible string from DT to determine which
> FW configuration file it should load. The DTS spec allows for '/' as
> part of the compatible string. We change this to '-' so that we will
> still be able to load the config file, even when the compatible has a
> '/'. This fixes explicitly the firmware loading for
> "solidrun,cubox-i/q".
>
> Signed-off-by: Matthias Brugger <mbrugger@suse.com>
>
> ---
>
> Changes in v3:
> - use len variable to store length of string (Hans de Goede)
> - fix for loop to stop on first NULL-byte (Hans de Goede)
>
> Changes in v2:
> - use strscpy instead of strncpy (Hans de Goede)
> - use strlen(tmp) + 1 for allocation (Hans de Goede, kernel test robot)
v3 looks good to me:
Reviewed-by: Hans deGoede <hdegoede@redhat.com>
Regards,
Hans
>
> .../wireless/broadcom/brcm80211/brcmfmac/of.c | 19 ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> index b886b56a5e5a..a7554265f95f 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> @@ -17,7 +17,6 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
> {
> struct brcmfmac_sdio_pd *sdio = &settings->bus.sdio;
> struct device_node *root, *np = dev->of_node;
> - struct property *prop;
> int irq;
> u32 irqf;
> u32 val;
> @@ -25,8 +24,22 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
> /* Set board-type to the first string of the machine compatible prop */
> root = of_find_node_by_path("/");
> if (root) {
> - prop = of_find_property(root, "compatible", NULL);
> - settings->board_type = of_prop_next_string(prop, NULL);
> + int i, len;
> + char *board_type;
> + const char *tmp;
> +
> + of_property_read_string_index(root, "compatible", 0, &tmp);
> +
> + /* get rid of '/' in the compatible string to be able to find the FW */
> + len = strlen(tmp) + 1;
> + board_type = devm_kzalloc(dev, len, GFP_KERNEL);
> + strscpy(board_type, tmp, len);
> + for (i = 0; i < board_type[i]; i++) {
> + if (board_type[i] == '/')
> + board_type[i] = '-';
> + }
> + settings->board_type = board_type;
> +
> of_node_put(root);
> }
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v3] brcmfmac: Transform compatible string for FW loading
2020-07-01 11:22 [PATCH v3] brcmfmac: Transform compatible string for FW loading matthias.bgg
2020-07-01 12:12 ` Hans de Goede
@ 2020-07-14 9:50 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2020-07-14 9:50 UTC (permalink / raw)
To: matthias.bgg
Cc: arend.vanspriel, davem, kuba, brcm80211-dev-list.pdl, mbrugger,
netdev, chi-hsien.lin, linux-wireless, hante.meuleman,
linux-kernel, hdegoede, wright.feng, matthias.bgg,
brcm80211-dev-list, franky.lin
matthias.bgg@kernel.org wrote:
> From: Matthias Brugger <mbrugger@suse.com>
>
> The driver relies on the compatible string from DT to determine which
> FW configuration file it should load. The DTS spec allows for '/' as
> part of the compatible string. We change this to '-' so that we will
> still be able to load the config file, even when the compatible has a
> '/'. This fixes explicitly the firmware loading for
> "solidrun,cubox-i/q".
>
> Signed-off-by: Matthias Brugger <mbrugger@suse.com>
> Reviewed-by: Hans deGoede <hdegoede@redhat.com>
Patch applied to wireless-drivers-next.git, thanks.
29e354ebeeec brcmfmac: Transform compatible string for FW loading
--
https://patchwork.kernel.org/patch/11636153/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-14 9:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-01 11:22 [PATCH v3] brcmfmac: Transform compatible string for FW loading matthias.bgg
2020-07-01 12:12 ` Hans de Goede
2020-07-14 9:50 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).