| Message ID | 20210312003318.3273536-3-bjorn.andersson@linaro.org |
|---|---|
| State | Accepted |
| Commit | b7f96d5c79cd9584bb1193a3c9008bd1e2683906 |
| Headers | show |
| Series | qcom: wcnss: Allow overriding firmware form DT | expand |
On 12/03/2021 00:33, Bjorn Andersson wrote: > The WLAN NV firmware blob differs between platforms, and possibly > devices, so add support in the wcn36xx driver for reading the path of > this file from DT in order to allow these files to live in a generic > file system (or linux-firmware). > > For some reason the parent (wcnss_ctrl) also needs to upload this blob, > so rather than specifying the same information in both nodes wcn36xx > reads the string from the parent's of_node. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > --- > > This patch can be applied independently of the others, but relates to the > acceptance of the addition to the DT binding (in patch 1/5). So my suggestion > is that this one goes through the ath tree and the others through the Qualcomm > SoC tree. > > drivers/net/wireless/ath/wcn36xx/main.c | 7 +++++++ > drivers/net/wireless/ath/wcn36xx/smd.c | 4 ++-- > drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 + > 3 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c > index afb4877eaad8..87b5c0ff16c0 100644 > --- a/drivers/net/wireless/ath/wcn36xx/main.c > +++ b/drivers/net/wireless/ath/wcn36xx/main.c > @@ -1407,6 +1407,13 @@ static int wcn36xx_probe(struct platform_device *pdev) > goto out_wq; > } > > + wcn->nv_file = WLAN_NV_FILE; > + ret = of_property_read_string(wcn->dev->parent->of_node, "firmware-name", &wcn->nv_file); > + if (ret < 0 && ret != -EINVAL) { > + wcn36xx_err("failed to read \"firmware-name\" property\n"); > + goto out_wq; > + } > + > wcn->smd_channel = qcom_wcnss_open_channel(wcnss, "WLAN_CTRL", wcn36xx_smd_rsp_process, hw); > if (IS_ERR(wcn->smd_channel)) { > wcn36xx_err("failed to open WLAN_CTRL channel\n"); > diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c > index d0c3a1557e8d..7b928f988068 100644 > --- a/drivers/net/wireless/ath/wcn36xx/smd.c > +++ b/drivers/net/wireless/ath/wcn36xx/smd.c > @@ -514,10 +514,10 @@ int wcn36xx_smd_load_nv(struct wcn36xx *wcn) > u16 fm_offset = 0; > > if (!wcn->nv) { > - ret = request_firmware(&wcn->nv, WLAN_NV_FILE, wcn->dev); > + ret = request_firmware(&wcn->nv, wcn->nv_file, wcn->dev); > if (ret) { > wcn36xx_err("Failed to load nv file %s: %d\n", > - WLAN_NV_FILE, ret); > + wcn->nv_file, ret); > goto out; > } > } > diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h > index 71fa9992b118..5977af2116e3 100644 > --- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h > +++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h > @@ -185,6 +185,7 @@ struct wcn36xx { > struct device *dev; > struct list_head vif_list; > > + const char *nv_file; > const struct firmware *nv; > > u8 fw_revision; > Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
On 3/11/21 6:33 PM, Bjorn Andersson wrote: > The WLAN NV firmware blob differs between platforms, and possibly > devices, so add support in the wcn36xx driver for reading the path of > this file from DT in order to allow these files to live in a generic > file system (or linux-firmware). > > For some reason the parent (wcnss_ctrl) also needs to upload this blob, > so rather than specifying the same information in both nodes wcn36xx > reads the string from the parent's of_node. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Tested-by: Aníbal Limón <anibal.limon@linaro.org> > --- > > This patch can be applied independently of the others, but relates to the > acceptance of the addition to the DT binding (in patch 1/5). So my suggestion > is that this one goes through the ath tree and the others through the Qualcomm > SoC tree. > > drivers/net/wireless/ath/wcn36xx/main.c | 7 +++++++ > drivers/net/wireless/ath/wcn36xx/smd.c | 4 ++-- > drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 + > 3 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c > index afb4877eaad8..87b5c0ff16c0 100644 > --- a/drivers/net/wireless/ath/wcn36xx/main.c > +++ b/drivers/net/wireless/ath/wcn36xx/main.c > @@ -1407,6 +1407,13 @@ static int wcn36xx_probe(struct platform_device *pdev) > goto out_wq; > } > > + wcn->nv_file = WLAN_NV_FILE; > + ret = of_property_read_string(wcn->dev->parent->of_node, "firmware-name", &wcn->nv_file); > + if (ret < 0 && ret != -EINVAL) { > + wcn36xx_err("failed to read \"firmware-name\" property\n"); > + goto out_wq; > + } > + > wcn->smd_channel = qcom_wcnss_open_channel(wcnss, "WLAN_CTRL", wcn36xx_smd_rsp_process, hw); > if (IS_ERR(wcn->smd_channel)) { > wcn36xx_err("failed to open WLAN_CTRL channel\n"); > diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c > index d0c3a1557e8d..7b928f988068 100644 > --- a/drivers/net/wireless/ath/wcn36xx/smd.c > +++ b/drivers/net/wireless/ath/wcn36xx/smd.c > @@ -514,10 +514,10 @@ int wcn36xx_smd_load_nv(struct wcn36xx *wcn) > u16 fm_offset = 0; > > if (!wcn->nv) { > - ret = request_firmware(&wcn->nv, WLAN_NV_FILE, wcn->dev); > + ret = request_firmware(&wcn->nv, wcn->nv_file, wcn->dev); > if (ret) { > wcn36xx_err("Failed to load nv file %s: %d\n", > - WLAN_NV_FILE, ret); > + wcn->nv_file, ret); > goto out; > } > } > diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h > index 71fa9992b118..5977af2116e3 100644 > --- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h > +++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h > @@ -185,6 +185,7 @@ struct wcn36xx { > struct device *dev; > struct list_head vif_list; > > + const char *nv_file; > const struct firmware *nv; > > u8 fw_revision; >
diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c index afb4877eaad8..87b5c0ff16c0 100644 --- a/drivers/net/wireless/ath/wcn36xx/main.c +++ b/drivers/net/wireless/ath/wcn36xx/main.c @@ -1407,6 +1407,13 @@ static int wcn36xx_probe(struct platform_device *pdev) goto out_wq; } + wcn->nv_file = WLAN_NV_FILE; + ret = of_property_read_string(wcn->dev->parent->of_node, "firmware-name", &wcn->nv_file); + if (ret < 0 && ret != -EINVAL) { + wcn36xx_err("failed to read \"firmware-name\" property\n"); + goto out_wq; + } + wcn->smd_channel = qcom_wcnss_open_channel(wcnss, "WLAN_CTRL", wcn36xx_smd_rsp_process, hw); if (IS_ERR(wcn->smd_channel)) { wcn36xx_err("failed to open WLAN_CTRL channel\n"); diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c index d0c3a1557e8d..7b928f988068 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c @@ -514,10 +514,10 @@ int wcn36xx_smd_load_nv(struct wcn36xx *wcn) u16 fm_offset = 0; if (!wcn->nv) { - ret = request_firmware(&wcn->nv, WLAN_NV_FILE, wcn->dev); + ret = request_firmware(&wcn->nv, wcn->nv_file, wcn->dev); if (ret) { wcn36xx_err("Failed to load nv file %s: %d\n", - WLAN_NV_FILE, ret); + wcn->nv_file, ret); goto out; } } diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h index 71fa9992b118..5977af2116e3 100644 --- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h +++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h @@ -185,6 +185,7 @@ struct wcn36xx { struct device *dev; struct list_head vif_list; + const char *nv_file; const struct firmware *nv; u8 fw_revision;
The WLAN NV firmware blob differs between platforms, and possibly devices, so add support in the wcn36xx driver for reading the path of this file from DT in order to allow these files to live in a generic file system (or linux-firmware). For some reason the parent (wcnss_ctrl) also needs to upload this blob, so rather than specifying the same information in both nodes wcn36xx reads the string from the parent's of_node. Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> --- This patch can be applied independently of the others, but relates to the acceptance of the addition to the DT binding (in patch 1/5). So my suggestion is that this one goes through the ath tree and the others through the Qualcomm SoC tree. drivers/net/wireless/ath/wcn36xx/main.c | 7 +++++++ drivers/net/wireless/ath/wcn36xx/smd.c | 4 ++-- drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 + 3 files changed, 10 insertions(+), 2 deletions(-)