Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1400579 > unrolled thread
| Started by | Yisen Zhuang <Yisen.Zhuang@huawei.com> |
|---|---|
| First post | 2016-05-13 10:10 +0200 |
| Last post | 2016-05-13 15:10 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[patch net-next 04/11] net: hns: enet specify a reference to dsaf by fwnode_handle Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-05-13 10:10 +0200
Re: [patch net-next 04/11] net: hns: enet specify a reference to dsaf by fwnode_handle Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-05-13 15:10 +0200
| From | Yisen Zhuang <Yisen.Zhuang@huawei.com> |
|---|---|
| Date | 2016-05-13 10:10 +0200 |
| Subject | [patch net-next 04/11] net: hns: enet specify a reference to dsaf by fwnode_handle |
| Message-ID | <rygkx-7Xv-1@gated-at.bofh.it> |
From: Kejian Yan <yankejian@huawei.com>
As device_node is only used by OF case, it is expected to find uniform
ways. So fwnode_handle is the suitable method.
Signed-off-by: Kejian Yan <yankejian@huawei.com>
Signed-off-by: Yisen Zhuang <Yisen.Zhuang@huawei.com>
---
drivers/net/ethernet/hisilicon/hns/hnae.c | 18 ++++++++++++------
drivers/net/ethernet/hisilicon/hns/hnae.h | 3 ++-
drivers/net/ethernet/hisilicon/hns/hns_enet.c | 15 ++++++++-------
drivers/net/ethernet/hisilicon/hns/hns_enet.h | 2 +-
4 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.c b/drivers/net/ethernet/hisilicon/hns/hnae.c
index 3bfe36f..b5bf12a 100644
--- a/drivers/net/ethernet/hisilicon/hns/hnae.c
+++ b/drivers/net/ethernet/hisilicon/hns/hnae.c
@@ -96,16 +96,22 @@ static int __ae_match(struct device *dev, const void *data)
{
struct hnae_ae_dev *hdev = cls_to_ae_dev(dev);
- return hdev->dev->of_node == data;
+ if (IS_ENABLED(CONFIG_OF) && hdev->dev->of_node)
+ return (data == &hdev->dev->of_node->fwnode);
+ else if (ACPI_COMPANION(hdev->dev))
+ return (data == hdev->dev->fwnode);
+
+ dev_err(dev, "__ae_match cannot read cfg data from OF or acpi\n");
+ return 0;
}
-static struct hnae_ae_dev *find_ae(const struct device_node *ae_node)
+static struct hnae_ae_dev *find_ae(const struct fwnode_handle *fwnode)
{
struct device *dev;
- WARN_ON(!ae_node);
+ WARN_ON(!fwnode);
- dev = class_find_device(hnae_class, NULL, ae_node, __ae_match);
+ dev = class_find_device(hnae_class, NULL, fwnode, __ae_match);
return dev ? cls_to_ae_dev(dev) : NULL;
}
@@ -312,7 +318,7 @@ EXPORT_SYMBOL(hnae_reinit_handle);
* return handle ptr or ERR_PTR
*/
struct hnae_handle *hnae_get_handle(struct device *owner_dev,
- const struct device_node *ae_node,
+ const struct fwnode_handle *fwnode,
u32 port_id,
struct hnae_buf_ops *bops)
{
@@ -321,7 +327,7 @@ struct hnae_handle *hnae_get_handle(struct device *owner_dev,
int i, j;
int ret;
- dev = find_ae(ae_node);
+ dev = find_ae(fwnode);
if (!dev)
return ERR_PTR(-ENODEV);
diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.h b/drivers/net/ethernet/hisilicon/hns/hnae.h
index e8d36aa..3ad3e55 100644
--- a/drivers/net/ethernet/hisilicon/hns/hnae.h
+++ b/drivers/net/ethernet/hisilicon/hns/hnae.h
@@ -27,6 +27,7 @@
* "cb" means control block
*/
+#include <linux/acpi.h>
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/module.h>
@@ -528,7 +529,7 @@ struct hnae_handle {
#define ring_to_dev(ring) ((ring)->q->dev->dev)
struct hnae_handle *hnae_get_handle(struct device *owner_dev,
- const struct device_node *ae_node,
+ const struct fwnode_handle *fwnode,
u32 port_id,
struct hnae_buf_ops *bops);
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
index 8851420..4fa9c21 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -1807,7 +1807,7 @@ static int hns_nic_try_get_ae(struct net_device *ndev)
int ret;
h = hnae_get_handle(&priv->netdev->dev,
- priv->ae_node, priv->port_id, NULL);
+ priv->fwnode, priv->port_id, NULL);
if (IS_ERR_OR_NULL(h)) {
ret = -ENODEV;
dev_dbg(priv->dev, "has not handle, register notifier!\n");
@@ -1867,7 +1867,7 @@ static int hns_nic_dev_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct net_device *ndev;
struct hns_nic_priv *priv;
- struct device_node *node = dev->of_node;
+ struct device_node *ae_node;
u32 port_id;
int ret;
@@ -1881,18 +1881,19 @@ static int hns_nic_dev_probe(struct platform_device *pdev)
priv->dev = dev;
priv->netdev = ndev;
- if (of_device_is_compatible(node, "hisilicon,hns-nic-v1"))
+ if (of_device_is_compatible(dev->of_node, "hisilicon,hns-nic-v1"))
priv->enet_ver = AE_VERSION_1;
else
priv->enet_ver = AE_VERSION_2;
- priv->ae_node = (void *)of_parse_phandle(node, "ae-handle", 0);
- if (IS_ERR_OR_NULL(priv->ae_node)) {
- ret = PTR_ERR(priv->ae_node);
+ 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;
}
- /* try to find port-idx-in-ae first */
+ priv->fwnode = &ae_node->fwnode;
+
ret = device_property_read_u32(dev, "port-idx-in-ae", &port_id);
if (ret) {
/* only for old code compatible */
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.h b/drivers/net/ethernet/hisilicon/hns/hns_enet.h
index 337efa5..44bb301 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.h
@@ -54,7 +54,7 @@ struct hns_nic_ops {
};
struct hns_nic_priv {
- const struct device_node *ae_node;
+ const struct fwnode_handle *fwnode;
u32 enet_ver;
u32 port_id;
int phy_mode;
--
1.9.1
[toc] | [next] | [standalone]
| From | Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
|---|---|
| Date | 2016-05-13 15:10 +0200 |
| Subject | Re: [patch net-next 04/11] net: hns: enet specify a reference to dsaf by fwnode_handle |
| Message-ID | <ryl0S-3QE-7@gated-at.bofh.it> |
| In reply to | #1400579 |
On Fri, 2016-05-13 at 16:19 +0800, Yisen Zhuang wrote:
> From: Kejian Yan <yankejian@huawei.com>
>
> As device_node is only used by OF case, it is expected to find uniform
> ways. So fwnode_handle is the suitable method.
Yeah, and this is part of conversion to fwnode, see previous comment.
>
> Signed-off-by: Kejian Yan <yankejian@huawei.com>
> Signed-off-by: Yisen Zhuang <Yisen.Zhuang@huawei.com>
> ---
> drivers/net/ethernet/hisilicon/hns/hnae.c | 18 ++++++++++++------
> drivers/net/ethernet/hisilicon/hns/hnae.h | 3 ++-
> drivers/net/ethernet/hisilicon/hns/hns_enet.c | 15 ++++++++-------
> drivers/net/ethernet/hisilicon/hns/hns_enet.h | 2 +-
> 4 files changed, 23 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.c
> b/drivers/net/ethernet/hisilicon/hns/hnae.c
> index 3bfe36f..b5bf12a 100644
> --- a/drivers/net/ethernet/hisilicon/hns/hnae.c
> +++ b/drivers/net/ethernet/hisilicon/hns/hnae.c
> @@ -96,16 +96,22 @@ static int __ae_match(struct device *dev, const
> void *data)
> {
> struct hnae_ae_dev *hdev = cls_to_ae_dev(dev);
>
> - return hdev->dev->of_node == data;
> + if (IS_ENABLED(CONFIG_OF) && hdev->dev->of_node)
> + return (data == &hdev->dev->of_node->fwnode);
> + else if (ACPI_COMPANION(hdev->dev))
> + return (data == hdev->dev->fwnode);
> +
> + dev_err(dev, "__ae_match cannot read cfg data from OF or
> acpi\n");
> + return 0;
> }
>
> -static struct hnae_ae_dev *find_ae(const struct device_node *ae_node)
> +static struct hnae_ae_dev *find_ae(const struct fwnode_handle
> *fwnode)
> {
> struct device *dev;
>
> - WARN_ON(!ae_node);
> + WARN_ON(!fwnode);
>
> - dev = class_find_device(hnae_class, NULL, ae_node,
> __ae_match);
> + dev = class_find_device(hnae_class, NULL, fwnode,
> __ae_match);
>
> return dev ? cls_to_ae_dev(dev) : NULL;
> }
> @@ -312,7 +318,7 @@ EXPORT_SYMBOL(hnae_reinit_handle);
> * return handle ptr or ERR_PTR
> */
> struct hnae_handle *hnae_get_handle(struct device *owner_dev,
> - const struct device_node
> *ae_node,
> + const struct fwnode_handle
> *fwnode,
> u32 port_id,
> struct hnae_buf_ops *bops)
> {
> @@ -321,7 +327,7 @@ struct hnae_handle *hnae_get_handle(struct device
> *owner_dev,
> int i, j;
> int ret;
>
> - dev = find_ae(ae_node);
> + dev = find_ae(fwnode);
> if (!dev)
> return ERR_PTR(-ENODEV);
>
> diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.h
> b/drivers/net/ethernet/hisilicon/hns/hnae.h
> index e8d36aa..3ad3e55 100644
> --- a/drivers/net/ethernet/hisilicon/hns/hnae.h
> +++ b/drivers/net/ethernet/hisilicon/hns/hnae.h
> @@ -27,6 +27,7 @@
> * "cb" means control block
> */
>
> +#include <linux/acpi.h>
> #include <linux/delay.h>
> #include <linux/device.h>
> #include <linux/module.h>
> @@ -528,7 +529,7 @@ struct hnae_handle {
> #define ring_to_dev(ring) ((ring)->q->dev->dev)
>
> struct hnae_handle *hnae_get_handle(struct device *owner_dev,
> - const struct device_node
> *ae_node,
> + const struct fwnode_handle
> *fwnode,
> u32 port_id,
> struct hnae_buf_ops *bops);
>
> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
> b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
> index 8851420..4fa9c21 100644
> --- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
> +++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
> @@ -1807,7 +1807,7 @@ static int hns_nic_try_get_ae(struct net_device
> *ndev)
> int ret;
>
> h = hnae_get_handle(&priv->netdev->dev,
> - priv->ae_node, priv->port_id, NULL);
> + priv->fwnode, priv->port_id, NULL);
> if (IS_ERR_OR_NULL(h)) {
> ret = -ENODEV;
> dev_dbg(priv->dev, "has not handle, register
> notifier!\n");
> @@ -1867,7 +1867,7 @@ static int hns_nic_dev_probe(struct
> platform_device *pdev)
> struct device *dev = &pdev->dev;
> struct net_device *ndev;
> struct hns_nic_priv *priv;
> - struct device_node *node = dev->of_node;
> + struct device_node *ae_node;
> u32 port_id;
> int ret;
>
> @@ -1881,18 +1881,19 @@ static int hns_nic_dev_probe(struct
> platform_device *pdev)
> priv->dev = dev;
> priv->netdev = ndev;
>
> - if (of_device_is_compatible(node, "hisilicon,hns-nic-v1"))
> + if (of_device_is_compatible(dev->of_node, "hisilicon,hns-nic-
> v1"))
> priv->enet_ver = AE_VERSION_1;
> else
> priv->enet_ver = AE_VERSION_2;
>
> - priv->ae_node = (void *)of_parse_phandle(node, "ae-handle",
> 0);
> - if (IS_ERR_OR_NULL(priv->ae_node)) {
> - ret = PTR_ERR(priv->ae_node);
> + 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;
> }
> - /* try to find port-idx-in-ae first */
> + priv->fwnode = &ae_node->fwnode;
> +
> ret = device_property_read_u32(dev, "port-idx-in-ae",
> &port_id);
> if (ret) {
> /* only for old code compatible */
> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.h
> b/drivers/net/ethernet/hisilicon/hns/hns_enet.h
> index 337efa5..44bb301 100644
> --- a/drivers/net/ethernet/hisilicon/hns/hns_enet.h
> +++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.h
> @@ -54,7 +54,7 @@ struct hns_nic_ops {
> };
>
> struct hns_nic_priv {
> - const struct device_node *ae_node;
> + const struct fwnode_handle *fwnode;
> u32 enet_ver;
> u32 port_id;
> int phy_mode;
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web