* [PATCH] brcmfmac: Transform compatible string for FW loading
@ 2020-06-25 16:07 matthias.bgg
2020-06-25 17:09 ` Hans de Goede
0 siblings, 1 reply; 2+ messages in thread
From: matthias.bgg @ 2020-06-25 16:07 UTC (permalink / raw)
To: arend.vanspriel, kvalo, davem, kuba
Cc: franky.lin, hante.meuleman, chi-hsien.lin, wright.feng, mbrugger,
linux-wireless, brcm80211-dev-list.pdl, brcm80211-dev-list,
netdev, linux-kernel, matthias.bgg, hdegoede
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>
---
.../wireless/broadcom/brcm80211/brcmfmac/of.c | 18 +++++++++++++++---
1 file changed, 15 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..8a41b7f9cad3 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,21 @@ 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;
+ 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 */
+ board_type = devm_kzalloc(dev, strlen(tmp), GFP_KERNEL);
+ strncpy(board_type, tmp, strlen(tmp));
+ for (i = 0; i < strlen(board_type); 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] 2+ messages in thread
* Re: [PATCH] brcmfmac: Transform compatible string for FW loading
2020-06-25 16:07 [PATCH] brcmfmac: Transform compatible string for FW loading matthias.bgg
@ 2020-06-25 17:09 ` Hans de Goede
0 siblings, 0 replies; 2+ messages in thread
From: Hans de Goede @ 2020-06-25 17:09 UTC (permalink / raw)
To: matthias.bgg, arend.vanspriel, kvalo, davem, kuba
Cc: franky.lin, hante.meuleman, chi-hsien.lin, wright.feng, mbrugger,
linux-wireless, brcm80211-dev-list.pdl, brcm80211-dev-list,
netdev, linux-kernel
Hi,
On 6/25/20 6:07 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>
> ---
> .../wireless/broadcom/brcm80211/brcmfmac/of.c | 18 +++++++++++++++---
> 1 file changed, 15 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..8a41b7f9cad3 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,21 @@ 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;
> + 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 */
> + board_type = devm_kzalloc(dev, strlen(tmp), GFP_KERNEL);
strlen() needs to be strlen() + 1 here to make place for the terminating zero.
> + strncpy(board_type, tmp, strlen(tmp));
Please do not us strncpy, it is THE worst strcpy function
in existence, it does not guarantee 0 termination, so
it sucks, it sucks a lot do not use, thanks.
Instead use strlcpy or snprintf(..., "%s", ...)
> + for (i = 0; i < strlen(board_type); i++) {
(The strlen here relies on there being a 0 behind the memory you
allocated because of the missing + 1)
> + if (board_type[i] == '/')
> + board_type[i] = '-';
> + }
> + settings->board_type = board_type;
> +
> of_node_put(root);
> }
>
>
Otherwise this looks good to me.
Regards,
Hans
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-25 17:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-25 16:07 [PATCH] brcmfmac: Transform compatible string for FW loading matthias.bgg
2020-06-25 17:09 ` Hans de Goede
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).