2020-02-01 07:48:39

by Jeremy Linton

Subject: [PATCH 4/6] net: bcmgenet: Initial bcmgenet ACPI support

The rpi4 is capable of booting in ACPI mode with the latest
edk2-platform commits. As such it would be helpful if the genet
platform device were usable.

To achieve this we add a new MODULE_DEVICE_TABLE, and convert
a few dt specific methods to their generic device_ calls. Until
the next patch, ACPI based machines will fallback on random
mac addresses.

Signed-off-by: Jeremy Linton <[email protected]>
---
.../net/ethernet/broadcom/genet/bcmgenet.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 120fa05a39ff..c736700f829e 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -7,6 +7,7 @@

#define pr_fmt(fmt) "bcmgenet: " fmt

+#include <linux/acpi.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/sched.h>
@@ -3476,7 +3477,7 @@ static int bcmgenet_probe(struct platform_device *pdev)
const struct bcmgenet_plat_data *pdata;
struct bcmgenet_priv *priv;
struct net_device *dev;
- const void *macaddr;
+ const void *macaddr = NULL;
unsigned int i;
int err = -EIO;
const char *phy_mode_str;
@@ -3510,7 +3511,7 @@ static int bcmgenet_probe(struct platform_device *pdev)

if (dn)
macaddr = of_get_mac_address(dn);
- else
+ else if (pd)
macaddr = pd->mac_address;

priv->base = devm_platform_ioremap_resource(pdev, 0);
@@ -3555,8 +3556,9 @@ static int bcmgenet_probe(struct platform_device *pdev)

priv->dev = dev;
priv->pdev = pdev;
- if (of_id) {
- pdata = of_id->data;
+
+ pdata = device_get_match_data(&pdev->dev);
+ if (pdata) {
priv->version = pdata->version;
priv->dma_max_burst_length = pdata->dma_max_burst_length;
} else {
@@ -3595,7 +3597,7 @@ static int bcmgenet_probe(struct platform_device *pdev)
/* If this is an internal GPHY, power it on now, before UniMAC is
* brought out of reset as absolutely no UniMAC activity is allowed
*/
- if (dn && !of_property_read_string(dn, "phy-mode", &phy_mode_str) &&
+ if (!device_property_read_string(&pdev->dev, "phy-mode", &phy_mode_str) &&
!strcasecmp(phy_mode_str, "internal"))
bcmgenet_power_up(priv, GENET_POWER_PASSIVE);

@@ -3768,6 +3770,12 @@ static int bcmgenet_suspend(struct device *d)

static SIMPLE_DEV_PM_OPS(bcmgenet_pm_ops, bcmgenet_suspend, bcmgenet_resume);

+static const struct acpi_device_id genet_acpi_match[] = {
+ { "BCM6E4E", (kernel_ulong_t)&bcm2711_plat_data },
+ { },
+};
+MODULE_DEVICE_TABLE(acpi, genet_acpi_match);
+
static struct platform_driver bcmgenet_driver = {
.probe = bcmgenet_probe,
.remove = bcmgenet_remove,
@@ -3776,6 +3784,7 @@ static struct platform_driver bcmgenet_driver = {
.name = "bcmgenet",
.of_match_table = bcmgenet_match,
.pm = &bcmgenet_pm_ops,
+ .acpi_match_table = ACPI_PTR(genet_acpi_match),
},
};
module_platform_driver(bcmgenet_driver);
--
2.24.1

2020-02-01 15:34:27

by Andrew Lunn

Subject: Re: [PATCH 4/6] net: bcmgenet: Initial bcmgenet ACPI support

> @@ -3595,7 +3597,7 @@ static int bcmgenet_probe(struct platform_device *pdev)
> /* If this is an internal GPHY, power it on now, before UniMAC is
> * brought out of reset as absolutely no UniMAC activity is allowed
> */
> - if (dn && !of_property_read_string(dn, "phy-mode", &phy_mode_str) &&
> + if (!device_property_read_string(&pdev->dev, "phy-mode", &phy_mode_str) &&
> !strcasecmp(phy_mode_str, "internal"))
> bcmgenet_power_up(priv, GENET_POWER_PASSIVE);

The code you are modifying appears to be old and out of date. For a
long time there has been a helper, of_get_phy_mode(). You should look
at fwnode_get_phy_mode().

Andrew

2020-02-01 19:10:27

by Jeremy Linton

Subject: Re: [PATCH 4/6] net: bcmgenet: Initial bcmgenet ACPI support

Hi,

On 2/1/20 9:33 AM, Andrew Lunn wrote:
>> @@ -3595,7 +3597,7 @@ static int bcmgenet_probe(struct platform_device *pdev)
>> /* If this is an internal GPHY, power it on now, before UniMAC is
>> * brought out of reset as absolutely no UniMAC activity is allowed
>> */
>> - if (dn && !of_property_read_string(dn, "phy-mode", &phy_mode_str) &&
>> + if (!device_property_read_string(&pdev->dev, "phy-mode", &phy_mode_str) &&
>> !strcasecmp(phy_mode_str, "internal"))
>> bcmgenet_power_up(priv, GENET_POWER_PASSIVE);
>
> The code you are modifying appears to be old and out of date. For a
> long time there has been a helper, of_get_phy_mode(). You should look
> at fwnode_get_phy_mode().

Yes, thanks, I did that in the other phy path but not here.