Since 2b0996c7646 , all of this platform code became no-op with no OF
replacement. Not only that, there are no users of AHB here. Add an OF
match table that mostly mirrors the original platform device id table.
Use a qca prefix as is done for the only other property: qca,no-eeprom.
Also used qca prefix for ar9530 as the latter seems to be a mistake.
This will be used to add ath9k support for the various ath79 devices
here.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
drivers/net/wireless/ath/ath9k/ahb.c | 49 +++++++++-------------------
1 file changed, 15 insertions(+), 34 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c
index 1ffec827ed87..27eaad8c96a4 100644
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -19,35 +19,18 @@
#include <linux/mod_devicetable.h>
#include <linux/module.h>
#include <linux/nl80211.h>
+#include <linux/of_device.h>
#include <linux/platform_device.h>
#include "ath9k.h"
-static const struct platform_device_id ath9k_platform_id_table[] = {
- {
- .name = "ath9k",
- .driver_data = AR5416_AR9100_DEVID,
- },
- {
- .name = "ar933x_wmac",
- .driver_data = AR9300_DEVID_AR9330,
- },
- {
- .name = "ar934x_wmac",
- .driver_data = AR9300_DEVID_AR9340,
- },
- {
- .name = "qca955x_wmac",
- .driver_data = AR9300_DEVID_QCA955X,
- },
- {
- .name = "qca953x_wmac",
- .driver_data = AR9300_DEVID_AR953X,
- },
- {
- .name = "qca956x_wmac",
- .driver_data = AR9300_DEVID_QCA956X,
- },
+static const struct of_device_id ath9k_of_match_table[] = {
+ { .compatible = "qca,ar9130-wmac", .data = (void *)AR5416_AR9100_DEVID },
+ { .compatible = "qca,ar9330-wmac", .data = (void *)AR9300_DEVID_AR9330 },
+ { .compatible = "qca,ar9340-wmac", .data = (void *)AR9300_DEVID_AR9340 },
+ { .compatible = "qca,qca9530-wmac", .data = (void *)AR9300_DEVID_AR953X },
+ { .compatible = "qca,qca9550-wmac", .data = (void *)AR9300_DEVID_QCA955X },
+ { .compatible = "qca,qca9560-wmac", .data = (void *)AR9300_DEVID_QCA956X },
{},
};
@@ -72,20 +55,16 @@ static const struct ath_bus_ops ath_ahb_bus_ops = {
static int ath_ahb_probe(struct platform_device *pdev)
{
- const struct platform_device_id *id = platform_get_device_id(pdev);
+ const struct of_device_id *match;
struct ieee80211_hw *hw;
struct ath_softc *sc;
struct ath_hw *ah;
void __iomem *mem;
char hw_name[64];
+ u16 dev_id;
int irq;
int ret;
- if (!dev_get_platdata(&pdev->dev)) {
- dev_err(&pdev->dev, "no platform data specified\n");
- return -EINVAL;
- }
-
mem = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(mem)) {
dev_err(&pdev->dev, "ioremap failed\n");
@@ -118,7 +97,9 @@ static int ath_ahb_probe(struct platform_device *pdev)
goto err_free_hw;
}
- ret = ath9k_init_device(id->driver_data, sc, &ath_ahb_bus_ops);
+ match = of_match_device(ath9k_of_match_table, &pdev->dev);
+ dev_id = (uintptr_t)match->data;
+ ret = ath9k_init_device(dev_id, sc, &ath_ahb_bus_ops);
if (ret) {
dev_err(&pdev->dev, "failed to initialize device\n");
goto err_irq;
@@ -156,11 +137,11 @@ static struct platform_driver ath_ahb_driver = {
.remove = ath_ahb_remove,
.driver = {
.name = "ath9k",
+ .of_match_table = ath9k_of_match_table,
},
- .id_table = ath9k_platform_id_table,
};
-MODULE_DEVICE_TABLE(platform, ath9k_platform_id_table);
+MODULE_DEVICE_TABLE(of, ath9k_of_match_table);
int ath_ahb_init(void)
{
--
2.49.0On 21/05/2025 04:15, Rosen Penev wrote:
> - .name = "qca955x_wmac",
> - .driver_data = AR9300_DEVID_QCA955X,
> - },
> - {
> - .name = "qca953x_wmac",
> - .driver_data = AR9300_DEVID_AR953X,
> - },
> - {
> - .name = "qca956x_wmac",
> - .driver_data = AR9300_DEVID_QCA956X,
> - },
> +static const struct of_device_id ath9k_of_match_table[] = {
> + { .compatible = "qca,ar9130-wmac", .data = (void *)AR5416_AR9100_DEVID },
> + { .compatible = "qca,ar9330-wmac", .data = (void *)AR9300_DEVID_AR9330 },
> + { .compatible = "qca,ar9340-wmac", .data = (void *)AR9300_DEVID_AR9340 },
> + { .compatible = "qca,qca9530-wmac", .data = (void *)AR9300_DEVID_AR953X },
> + { .compatible = "qca,qca9550-wmac", .data = (void *)AR9300_DEVID_QCA955X },
> + { .compatible = "qca,qca9560-wmac", .data = (void *)AR9300_DEVID_QCA956X },
Undocumented ABI.
Please run scripts/checkpatch.pl on the patches and fix reported
warnings. After that, run also 'scripts/checkpatch.pl --strict' on the
patches and (probably) fix more warnings. Some warnings can be ignored,
especially from --strict run, but the code here looks like it needs a
fix. Feel free to get in touch if the warning is not clear.
> {},
> };
>
> @@ -72,20 +55,16 @@ static const struct ath_bus_ops ath_ahb_bus_ops = {
>
> static int ath_ahb_probe(struct platform_device *pdev)
> {
> - const struct platform_device_id *id = platform_get_device_id(pdev);
> + const struct of_device_id *match;
> struct ieee80211_hw *hw;
> struct ath_softc *sc;
> struct ath_hw *ah;
> void __iomem *mem;
> char hw_name[64];
> + u16 dev_id;
> int irq;
> int ret;
>
> - if (!dev_get_platdata(&pdev->dev)) {
> - dev_err(&pdev->dev, "no platform data specified\n");
> - return -EINVAL;
> - }
> -
> mem = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(mem)) {
> dev_err(&pdev->dev, "ioremap failed\n");
> @@ -118,7 +97,9 @@ static int ath_ahb_probe(struct platform_device *pdev)
> goto err_free_hw;
> }
>
> - ret = ath9k_init_device(id->driver_data, sc, &ath_ahb_bus_ops);
> + match = of_match_device(ath9k_of_match_table, &pdev->dev);
There is a wrapper for getting data, use it.
> + dev_id = (uintptr_t)match->data;
And dev_id is enum? Then you want kernel_ulong_t.
Best regards,
Krzysztof
On Wed, May 21, 2025 at 4:08 AM Krzysztof Kozlowski <krzk@kernel.org> wrote:
>
> On 21/05/2025 04:15, Rosen Penev wrote:
> > - .name = "qca955x_wmac",
> > - .driver_data = AR9300_DEVID_QCA955X,
> > - },
> > - {
> > - .name = "qca953x_wmac",
> > - .driver_data = AR9300_DEVID_AR953X,
> > - },
> > - {
> > - .name = "qca956x_wmac",
> > - .driver_data = AR9300_DEVID_QCA956X,
> > - },
> > +static const struct of_device_id ath9k_of_match_table[] = {
> > + { .compatible = "qca,ar9130-wmac", .data = (void *)AR5416_AR9100_DEVID },
> > + { .compatible = "qca,ar9330-wmac", .data = (void *)AR9300_DEVID_AR9330 },
> > + { .compatible = "qca,ar9340-wmac", .data = (void *)AR9300_DEVID_AR9340 },
> > + { .compatible = "qca,qca9530-wmac", .data = (void *)AR9300_DEVID_AR953X },
> > + { .compatible = "qca,qca9550-wmac", .data = (void *)AR9300_DEVID_QCA955X },
> > + { .compatible = "qca,qca9560-wmac", .data = (void *)AR9300_DEVID_QCA956X },
>
> Undocumented ABI.
Hrm wonder where to document.
Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml
sounds like the place but that file looks like it's for pci(e) only.
This patch adds the bindings to ahb, not pci(e).
>
> Please run scripts/checkpatch.pl on the patches and fix reported
> warnings. After that, run also 'scripts/checkpatch.pl --strict' on the
> patches and (probably) fix more warnings. Some warnings can be ignored,
> especially from --strict run, but the code here looks like it needs a
> fix. Feel free to get in touch if the warning is not clear.
>
>
> > {},
> > };
> >
> > @@ -72,20 +55,16 @@ static const struct ath_bus_ops ath_ahb_bus_ops = {
> >
> > static int ath_ahb_probe(struct platform_device *pdev)
> > {
> > - const struct platform_device_id *id = platform_get_device_id(pdev);
> > + const struct of_device_id *match;
> > struct ieee80211_hw *hw;
> > struct ath_softc *sc;
> > struct ath_hw *ah;
> > void __iomem *mem;
> > char hw_name[64];
> > + u16 dev_id;
> > int irq;
> > int ret;
> >
> > - if (!dev_get_platdata(&pdev->dev)) {
> > - dev_err(&pdev->dev, "no platform data specified\n");
> > - return -EINVAL;
> > - }
> > -
> > mem = devm_platform_ioremap_resource(pdev, 0);
> > if (IS_ERR(mem)) {
> > dev_err(&pdev->dev, "ioremap failed\n");
> > @@ -118,7 +97,9 @@ static int ath_ahb_probe(struct platform_device *pdev)
> > goto err_free_hw;
> > }
> >
> > - ret = ath9k_init_device(id->driver_data, sc, &ath_ahb_bus_ops);
> > + match = of_match_device(ath9k_of_match_table, &pdev->dev);
>
> There is a wrapper for getting data, use it.
I assume you mean of_device_get_match_data. Will do.
>
> > + dev_id = (uintptr_t)match->data;
>
> And dev_id is enum? Then you want kernel_ulong_t.
The entries specified in data are macros in the form of 0xYYYY. This
is why I used u16. The ath9k_init_device takes an int here.
Interestingly enough in the newer ath drivers, it looks like these
macros are placed in an enum. ath9k uses a u16 field in the struct.
As for kernel_ulong_t, ath12k uses that, ath10k uintptr_t. I assume
the former is more appropriate.
>
>
>
>
> Best regards,
> Krzysztof
On 21/05/2025 22:43, Rosen Penev wrote:
>>> - if (!dev_get_platdata(&pdev->dev)) {
>>> - dev_err(&pdev->dev, "no platform data specified\n");
>>> - return -EINVAL;
>>> - }
>>> -
>>> mem = devm_platform_ioremap_resource(pdev, 0);
>>> if (IS_ERR(mem)) {
>>> dev_err(&pdev->dev, "ioremap failed\n");
>>> @@ -118,7 +97,9 @@ static int ath_ahb_probe(struct platform_device *pdev)
>>> goto err_free_hw;
>>> }
>>>
>>> - ret = ath9k_init_device(id->driver_data, sc, &ath_ahb_bus_ops);
>>> + match = of_match_device(ath9k_of_match_table, &pdev->dev);
>>
>> There is a wrapper for getting data, use it.
> I assume you mean of_device_get_match_data. Will do.
>>
>>> + dev_id = (uintptr_t)match->data;
>>
>> And dev_id is enum? Then you want kernel_ulong_t.
> The entries specified in data are macros in the form of 0xYYYY. This
> is why I used u16. The ath9k_init_device takes an int here.
You did not use u16, but uintptr_t. My comment was about the cast.
Best regards,
Krzysztof
© 2016 - 2025 Red Hat, Inc.