Commit 63434888 authored by Kejian Yan's avatar Kejian Yan Committed by David S. Miller

net: hns: net: hns: enet adds support of acpi

Enet needs to get configration parameter by acpi. This patch
adds support of ACPI for enet. The configuration parameter will
be configed in BIOS.
Signed-off-by: default avatarKejian Yan <yankejian@huawei.com>
Signed-off-by: default avatarYisen Zhuang <Yisen.Zhuang@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f00ef863
...@@ -132,6 +132,13 @@ static void fill_v2_desc(struct hnae_ring *ring, void *priv, ...@@ -132,6 +132,13 @@ static void fill_v2_desc(struct hnae_ring *ring, void *priv,
ring_ptr_move_fw(ring, next_to_use); ring_ptr_move_fw(ring, next_to_use);
} }
static const struct acpi_device_id hns_enet_acpi_match[] = {
{ "HISI00C1", 0 },
{ "HISI00C2", 0 },
{ },
};
MODULE_DEVICE_TABLE(acpi, hns_enet_acpi_match);
static void fill_desc(struct hnae_ring *ring, void *priv, static void fill_desc(struct hnae_ring *ring, void *priv,
int size, dma_addr_t dma, int frag_end, int size, dma_addr_t dma, int frag_end,
int buf_num, enum hns_desc_type type, int mtu) int buf_num, enum hns_desc_type type, int mtu)
...@@ -1870,7 +1877,6 @@ static int hns_nic_dev_probe(struct platform_device *pdev) ...@@ -1870,7 +1877,6 @@ static int hns_nic_dev_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct net_device *ndev; struct net_device *ndev;
struct hns_nic_priv *priv; struct hns_nic_priv *priv;
struct device_node *ae_node;
u32 port_id; u32 port_id;
int ret; int ret;
...@@ -1884,20 +1890,45 @@ static int hns_nic_dev_probe(struct platform_device *pdev) ...@@ -1884,20 +1890,45 @@ static int hns_nic_dev_probe(struct platform_device *pdev)
priv->dev = dev; priv->dev = dev;
priv->netdev = ndev; priv->netdev = ndev;
if (of_device_is_compatible(dev->of_node, "hisilicon,hns-nic-v1")) if (dev_of_node(dev)) {
priv->enet_ver = AE_VERSION_1; struct device_node *ae_node;
else
priv->enet_ver = AE_VERSION_2;
ae_node = of_parse_phandle(dev->of_node, "ae-handle", 0); if (of_device_is_compatible(dev->of_node,
if (IS_ERR_OR_NULL(ae_node)) { "hisilicon,hns-nic-v1"))
ret = PTR_ERR(ae_node); priv->enet_ver = AE_VERSION_1;
dev_err(dev, "not find ae-handle\n"); else
goto out_read_prop_fail; priv->enet_ver = AE_VERSION_2;
ae_node = of_parse_phandle(dev->of_node, "ae-handle", 0);
if (IS_ERR_OR_NULL(ae_node)) {
ret = PTR_ERR(ae_node);
dev_err(dev, "not find ae-handle\n");
goto out_read_prop_fail;
}
priv->fwnode = &ae_node->fwnode;
} else if (is_acpi_node(dev->fwnode)) {
struct acpi_reference_args args;
if (acpi_dev_found(hns_enet_acpi_match[0].id))
priv->enet_ver = AE_VERSION_1;
else if (acpi_dev_found(hns_enet_acpi_match[1].id))
priv->enet_ver = AE_VERSION_2;
else
return -ENXIO;
/* try to find port-idx-in-ae first */
ret = acpi_node_get_property_reference(dev->fwnode,
"ae-handle", 0, &args);
if (ret) {
dev_err(dev, "not find ae-handle\n");
goto out_read_prop_fail;
}
priv->fwnode = acpi_fwnode_handle(args.adev);
} else {
dev_err(dev, "cannot read cfg data from OF or acpi\n");
return -ENXIO;
} }
priv->fwnode = &ae_node->fwnode;
/* try to find port-idx-in-ae first */
ret = device_property_read_u32(dev, "port-idx-in-ae", &port_id); ret = device_property_read_u32(dev, "port-idx-in-ae", &port_id);
if (ret) { if (ret) {
/* only for old code compatible */ /* only for old code compatible */
...@@ -2014,6 +2045,7 @@ static struct platform_driver hns_nic_dev_driver = { ...@@ -2014,6 +2045,7 @@ static struct platform_driver hns_nic_dev_driver = {
.driver = { .driver = {
.name = "hns-nic", .name = "hns-nic",
.of_match_table = hns_enet_of_match, .of_match_table = hns_enet_of_match,
.acpi_match_table = ACPI_PTR(hns_enet_acpi_match),
}, },
.probe = hns_nic_dev_probe, .probe = hns_nic_dev_probe,
.remove = hns_nic_dev_remove, .remove = hns_nic_dev_remove,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment