Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0738c54d authored by Suman Tripathi's avatar Suman Tripathi Committed by David S. Miller
Browse files

drivers: net: xgene: Fix the ACPI support for RGMII/SGMII0/XFI interface of... 


drivers: net: xgene: Fix the ACPI support for RGMII/SGMII0/XFI interface of APM X-Gene SoC ethernet controller.

This patch implements couple of fixes to support ACPI for RGMII/SGMII0/XFI
interface of APM X-Gene SoC ethernet controller driver. This patch uses
the _SUN acpi object to fetch the port-id information whereas the FDT uses
port-id binding for port-id information.

Signed-off-by: default avatarIyappan Subramanian <isubramanian@apm.com>
Signed-off-by: default avatarSuman Tripathi <stripathi@apm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0dd07709

drivers/net/ethernet/apm/xgene/xgene_enet_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ static int xgene_mdiobus_register(struct xgene_enet_pdata *pdata, 
	if (ret)

		return -EINVAL;



	phy = get_phy_device(mdio, phy_id, true);

	phy = get_phy_device(mdio, phy_id, false);

	if (!phy || IS_ERR(phy))

		return -EIO;

drivers/net/ethernet/apm/xgene/xgene_enet_main.c

+42 −22
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#define RES_RING_CMD	2



static const struct of_device_id xgene_enet_of_match[];

static const struct acpi_device_id xgene_enet_acpi_match[];



static void xgene_enet_init_bufpool(struct xgene_enet_desc_ring *buf_pool)

{
@@ -870,24 +871,33 @@ static const struct net_device_ops xgene_ndev_ops = { 
	.ndo_set_mac_address = xgene_enet_set_mac_address,

};



static int xgene_get_port_id(struct device *dev, struct xgene_enet_pdata *pdata)

static int xgene_get_port_id_acpi(struct device *dev,

				  struct xgene_enet_pdata *pdata)

{

	acpi_status status;

	u64 temp;



	status = acpi_evaluate_integer(ACPI_HANDLE(dev), "_SUN", NULL, &temp);

	if (ACPI_FAILURE(status)) {

		pdata->port_id = 0;

	} else {

		pdata->port_id = temp;

	}



	return 0;

}



static int xgene_get_port_id_dt(struct device *dev, struct xgene_enet_pdata *pdata)

{

	u32 id = 0;

	int ret;



	ret = device_property_read_u32(dev, "port-id", &id);



	switch (ret) {

	case -EINVAL:

	ret = of_property_read_u32(dev->of_node, "port-id", &id);

	if (ret) {

		pdata->port_id = 0;

		ret = 0;

		break;

	case 0:

	} else {

		pdata->port_id = id & BIT(0);

		break;

	default:

		dev_err(dev, "Incorrect port-id specified: errno: %d\n", ret);

		break;

	}



	return ret;
@@ -977,7 +987,12 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata) 
		return -ENOMEM;

	}



	ret = xgene_get_port_id(dev, pdata);

	if (dev->of_node)

		ret = xgene_get_port_id_dt(dev, pdata);

#ifdef CONFIG_ACPI

	else

		ret = xgene_get_port_id_acpi(dev, pdata);

#endif

	if (ret)

		return ret;
@@ -1173,9 +1188,7 @@ static int xgene_enet_probe(struct platform_device *pdev) 
	struct xgene_enet_pdata *pdata;

	struct device *dev = &pdev->dev;

	struct xgene_mac_ops *mac_ops;

#ifdef CONFIG_OF

	const struct of_device_id *of_id;

#endif

	int ret;



	ndev = alloc_etherdev(sizeof(struct xgene_enet_pdata));
@@ -1194,16 +1207,23 @@ static int xgene_enet_probe(struct platform_device *pdev) 
			  NETIF_F_GSO |

			  NETIF_F_GRO;



#ifdef CONFIG_OF

	of_id = of_match_device(xgene_enet_of_match, &pdev->dev);

	if (of_id) {

		pdata->enet_id = (enum xgene_enet_id)of_id->data;

	}

#ifdef CONFIG_ACPI

	else {

		const struct acpi_device_id *acpi_id;



		acpi_id = acpi_match_device(xgene_enet_acpi_match, &pdev->dev);

		if (acpi_id)

			pdata->enet_id = (enum xgene_enet_id) acpi_id->driver_data;

	}

#endif

	if (!pdata->enet_id) {

		free_netdev(ndev);

		return -ENODEV;

	}

	}

#endif



	ret = xgene_enet_get_resources(pdata);

	if (ret)
@@ -1266,9 +1286,9 @@ static int xgene_enet_remove(struct platform_device *pdev) 


#ifdef CONFIG_ACPI

static const struct acpi_device_id xgene_enet_acpi_match[] = {

	{ "APMC0D05", },

	{ "APMC0D30", },

	{ "APMC0D31", },

	{ "APMC0D05", XGENE_ENET1},

	{ "APMC0D30", XGENE_ENET1},

	{ "APMC0D31", XGENE_ENET1},

	{ }

};

MODULE_DEVICE_TABLE(acpi, xgene_enet_acpi_match);