* [PATCH net-next 0/2] net: hns: enet specisies a reference to dsaf @ 2015-12-05 6:10 yankejian 2015-12-05 6:10 ` [PATCH net-next 1/2] " yankejian 2015-12-05 6:10 ` [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents) yankejian 0 siblings, 2 replies; 9+ messages in thread From: yankejian @ 2015-12-05 6:10 UTC (permalink / raw) To: davem-fT/PcQaiUtIeIZ0/mPfg9Q, arnd-r2nGTMty4D4, fengguang.wu-ral2JQCrhuEAvxtiuMwx3w, robh+dt-DgEjT+Ai2ygdnm+yROfE0A, pawel.moll-5wv7dgnIgG8, mark.rutland-5wv7dgnIgG8, ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg, galak-sgV2jX0FEOL9JmXXK+q4OQ, catalin.marinas-5wv7dgnIgG8, will.deacon-5wv7dgnIgG8, salil.mehta-hv44wF8Li93QT0dZR+AlfA, Yisen.Zhuang-hv44wF8Li93QT0dZR+AlfA, liguozhu-hv44wF8Li93QT0dZR+AlfA, lisheng011-hv44wF8Li93QT0dZR+AlfA, huangdaode-C8/M+/jPZTeaMJb+Lgu22Q, xuwei5-C8/M+/jPZTeaMJb+Lgu22Q Cc: haifeng.wei-hv44wF8Li93QT0dZR+AlfA, netdev-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r in this patchset, enet specifies a reference to dsaf. and delete the ae-name in enet, and adds parsing the ae-handle from DT to set the associating with dsaf. the patchset updates the dtsi and bindings documents as well. yankejian (2): net: hns: enet specisies a reference to dsaf net: hns: enet specisies a reference to dsaf (config and documents) .../devicetree/bindings/net/hisilicon-hns-dsaf.txt | 5 +---- .../devicetree/bindings/net/hisilicon-hns-nic.txt | 7 ++++--- arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi | 19 +++++++++---------- drivers/net/ethernet/hisilicon/hns/hnae.c | 17 +++++++---------- drivers/net/ethernet/hisilicon/hns/hnae.h | 7 +++++-- drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 4 ++++ drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 10 +--------- drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 1 + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 13 +++++++++---- drivers/net/ethernet/hisilicon/hns/hns_enet.h | 2 +- 10 files changed, 42 insertions(+), 43 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH net-next 1/2] net: hns: enet specisies a reference to dsaf 2015-12-05 6:10 [PATCH net-next 0/2] net: hns: enet specisies a reference to dsaf yankejian @ 2015-12-05 6:10 ` yankejian 2015-12-05 6:10 ` [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents) yankejian 1 sibling, 0 replies; 9+ messages in thread From: yankejian @ 2015-12-05 6:10 UTC (permalink / raw) To: davem, arnd, fengguang.wu, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, catalin.marinas, will.deacon, salil.mehta, Yisen.Zhuang, liguozhu, lisheng011, huangdaode, xuwei5 Cc: haifeng.wei, netdev, linux-kernel, devicetree, linux-arm-kernel enet is associating with dasf. before this patch, the association is the same strings between ae-name and dsa-name. in a general way, enet specifies a reference to dsaf should be a good idea. so this patch deletes the ae-name in enet, and adds parsing the ae-handle from DT to set the associating with dsaf. Signed-off-by: yankejian <yankejian@huawei.com> --- drivers/net/ethernet/hisilicon/hns/hnae.c | 17 +++++++---------- drivers/net/ethernet/hisilicon/hns/hnae.h | 7 +++++-- drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 4 ++++ drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 10 +--------- drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 1 + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 13 +++++++++---- drivers/net/ethernet/hisilicon/hns/hns_enet.h | 2 +- 7 files changed, 28 insertions(+), 26 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.c b/drivers/net/ethernet/hisilicon/hns/hnae.c index b364529..3bfe36f 100644 --- a/drivers/net/ethernet/hisilicon/hns/hnae.c +++ b/drivers/net/ethernet/hisilicon/hns/hnae.c @@ -95,21 +95,17 @@ static struct hnae_buf_ops hnae_bops = { static int __ae_match(struct device *dev, const void *data) { struct hnae_ae_dev *hdev = cls_to_ae_dev(dev); - const char *ae_id = data; - if (!strncmp(ae_id, hdev->name, AE_NAME_SIZE)) - return 1; - - return 0; + return hdev->dev->of_node == data; } -static struct hnae_ae_dev *find_ae(const char *ae_id) +static struct hnae_ae_dev *find_ae(const struct device_node *ae_node) { struct device *dev; - WARN_ON(!ae_id); + WARN_ON(!ae_node); - dev = class_find_device(hnae_class, NULL, ae_id, __ae_match); + dev = class_find_device(hnae_class, NULL, ae_node, __ae_match); return dev ? cls_to_ae_dev(dev) : NULL; } @@ -316,7 +312,8 @@ EXPORT_SYMBOL(hnae_reinit_handle); * return handle ptr or ERR_PTR */ struct hnae_handle *hnae_get_handle(struct device *owner_dev, - const char *ae_id, u32 port_id, + const struct device_node *ae_node, + u32 port_id, struct hnae_buf_ops *bops) { struct hnae_ae_dev *dev; @@ -324,7 +321,7 @@ struct hnae_handle *hnae_get_handle(struct device *owner_dev, int i, j; int ret; - dev = find_ae(ae_id); + dev = find_ae(ae_node); 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 d1f3316..0012664 100644 --- a/drivers/net/ethernet/hisilicon/hns/hnae.h +++ b/drivers/net/ethernet/hisilicon/hns/hnae.h @@ -523,8 +523,11 @@ struct hnae_handle { #define ring_to_dev(ring) ((ring)->q->dev->dev) -struct hnae_handle *hnae_get_handle(struct device *owner_dev, const char *ae_id, - u32 port_id, struct hnae_buf_ops *bops); +struct hnae_handle *hnae_get_handle(struct device *owner_dev, + const struct device_node *ae_node, + u32 port_id, + struct hnae_buf_ops *bops); + void hnae_put_handle(struct hnae_handle *handle); int hnae_ae_register(struct hnae_ae_dev *dev, struct module *owner); void hnae_ae_unregister(struct hnae_ae_dev *dev); diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c index 77c6edb..ed9a72c 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c @@ -848,6 +848,7 @@ static struct hnae_ae_ops hns_dsaf_ops = { int hns_dsaf_ae_init(struct dsaf_device *dsaf_dev) { struct hnae_ae_dev *ae_dev = &dsaf_dev->ae_dev; + static atomic_t id = ATOMIC_INIT(-1); switch (dsaf_dev->dsaf_ver) { case AE_VERSION_1: @@ -859,6 +860,9 @@ int hns_dsaf_ae_init(struct dsaf_device *dsaf_dev) default: break; } + + snprintf(ae_dev->name, AE_NAME_SIZE, "%s%d", DSAF_DEVICE_NAME, + (int)atomic_inc_return(&id)); ae_dev->ops = &hns_dsaf_ops; ae_dev->dev = dsaf_dev->dev; diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c index 636b205..f3de749 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c @@ -35,7 +35,7 @@ int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev) int ret, i; u32 desc_num; u32 buf_size; - const char *name, *mode_str; + const char *mode_str; struct device_node *np = dsaf_dev->dev->of_node; if (of_device_is_compatible(np, "hisilicon,hns-dsaf-v1")) @@ -43,14 +43,6 @@ int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev) else dsaf_dev->dsaf_ver = AE_VERSION_2; - ret = of_property_read_string(np, "dsa_name", &name); - if (ret) { - dev_err(dsaf_dev->dev, "get dsaf name fail, ret=%d!\n", ret); - return ret; - } - strncpy(dsaf_dev->ae_dev.name, name, AE_NAME_SIZE); - dsaf_dev->ae_dev.name[AE_NAME_SIZE - 1] = '\0'; - ret = of_property_read_string(np, "mode", &mode_str); if (ret) { dev_err(dsaf_dev->dev, "get dsaf mode fail, ret=%d!\n", ret); diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h index 31c312f..40205b9 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h @@ -18,6 +18,7 @@ struct hns_mac_cb; #define DSAF_DRV_NAME "hns_dsaf" #define DSAF_MOD_VERSION "v1.0" +#define DSAF_DEVICE_NAME "dsaf" #define HNS_DSAF_DEBUG_NW_REG_OFFSET 0x100000 diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c index cad2663..33b9aab 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c @@ -1778,7 +1778,7 @@ static int hns_nic_try_get_ae(struct net_device *ndev) int ret; h = hnae_get_handle(&priv->netdev->dev, - priv->ae_name, priv->port_id, NULL); + priv->ae_node, priv->port_id, NULL); if (IS_ERR_OR_NULL(h)) { ret = PTR_ERR(h); dev_dbg(priv->dev, "has not handle, register notifier!\n"); @@ -1856,9 +1856,12 @@ static int hns_nic_dev_probe(struct platform_device *pdev) else priv->enet_ver = AE_VERSION_2; - ret = of_property_read_string(node, "ae-name", &priv->ae_name); - if (ret) - goto out_read_string_fail; + 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); + dev_err(dev, "not find ae-handle\n"); + goto out_read_handle_fai; + } ret = of_property_read_u32(node, "port-id", &priv->port_id); if (ret) @@ -1921,6 +1924,8 @@ static int hns_nic_dev_probe(struct platform_device *pdev) out_notify_fail: (void)cancel_work_sync(&priv->service_task); +out_read_handle_fai: + out_read_string_fail: free_netdev(ndev); return ret; diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.h b/drivers/net/ethernet/hisilicon/hns/hns_enet.h index 4b75270..c68ab3d 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_enet.h +++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.h @@ -51,7 +51,7 @@ struct hns_nic_ops { }; struct hns_nic_priv { - const char *ae_name; + const struct device_node *ae_node; u32 enet_ver; u32 port_id; int phy_mode; -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents) 2015-12-05 6:10 [PATCH net-next 0/2] net: hns: enet specisies a reference to dsaf yankejian 2015-12-05 6:10 ` [PATCH net-next 1/2] " yankejian @ 2015-12-05 6:10 ` yankejian 2015-12-05 22:19 ` Arnd Bergmann 1 sibling, 1 reply; 9+ messages in thread From: yankejian @ 2015-12-05 6:10 UTC (permalink / raw) To: davem, arnd, fengguang.wu, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, catalin.marinas, will.deacon, salil.mehta, Yisen.Zhuang, liguozhu, lisheng011, huangdaode, xuwei5 Cc: haifeng.wei, netdev, linux-kernel, devicetree, linux-arm-kernel when enet specisies a reference to dsaf, the correlative config and documents needs to update. this patch updates the correlative dtsi file and bindings documents . Signed-off-by: yankejian <yankejian@huawei.com> --- .../devicetree/bindings/net/hisilicon-hns-dsaf.txt | 5 +---- .../devicetree/bindings/net/hisilicon-hns-nic.txt | 7 ++++--- arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi | 19 +++++++++---------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt b/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt index 80411b2..ecacfa4 100644 --- a/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt @@ -4,8 +4,6 @@ Required properties: - compatible: should be "hisilicon,hns-dsaf-v1" or "hisilicon,hns-dsaf-v2". "hisilicon,hns-dsaf-v1" is for hip05. "hisilicon,hns-dsaf-v2" is for Hi1610 and Hi1612. -- dsa-name: dsa fabric name who provide this interface. - should be "dsafX", X is the dsaf id. - mode: dsa fabric mode string. only support one of dsaf modes like these: "2port-64vf", "6port-16rss", @@ -26,9 +24,8 @@ Required properties: Example: -dsa: dsa@c7000000 { +dsaf0: dsa@c7000000 { compatible = "hisilicon,hns-dsaf-v1"; - dsa_name = "dsaf0"; mode = "6port-16rss"; interrupt-parent = <&mbigen_dsa>; reg = <0x0 0xC0000000 0x0 0x420000 diff --git a/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt b/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt index 41d19be..e6a9d1c 100644 --- a/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt @@ -4,8 +4,9 @@ Required properties: - compatible: "hisilicon,hns-nic-v1" or "hisilicon,hns-nic-v2". "hisilicon,hns-nic-v1" is for hip05. "hisilicon,hns-nic-v2" is for Hi1610 and Hi1612. -- ae-name: accelerator name who provides this interface, - is simply a name referring to the name of name in the accelerator node. +- ae-handle: accelerator engine handle for hns, + specifies a reference to the associating hardware driver node. + see Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt - port-id: is the index of port provided by DSAF (the accelerator). DSAF can connect to 8 PHYs. Port 0 to 1 are both used for adminstration purpose. They are called debug ports. @@ -41,7 +42,7 @@ Example: ethernet@0{ compatible = "hisilicon,hns-nic-v1"; - ae-name = "dsaf0"; + ae-handle = <&dsaf0>; port-id = <0>; local-mac-address = [a2 14 e4 4b 56 76]; }; diff --git a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi index 606dd5a..89c883e 100644 --- a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi @@ -23,9 +23,8 @@ soc0: soc@000000000 { }; }; - dsa: dsa@c7000000 { + dsaf0: dsa@c7000000 { compatible = "hisilicon,hns-dsaf-v1"; - dsa_name = "dsaf0"; mode = "6port-16rss"; interrupt-parent = <&mbigen_dsa>; @@ -127,7 +126,7 @@ soc0: soc@000000000 { eth0: ethernet@0{ compatible = "hisilicon,hns-nic-v1"; - ae-name = "dsaf0"; + ae-handle = <&dsaf0>; port-id = <0>; local-mac-address = [00 00 00 01 00 58]; status = "disabled"; @@ -135,14 +134,14 @@ soc0: soc@000000000 { }; eth1: ethernet@1{ compatible = "hisilicon,hns-nic-v1"; - ae-name = "dsaf0"; + ae-handle = <&dsaf0>; port-id = <1>; status = "disabled"; dma-coherent; }; eth2: ethernet@2{ compatible = "hisilicon,hns-nic-v1"; - ae-name = "dsaf0"; + ae-handle = <&dsaf0>; port-id = <2>; local-mac-address = [00 00 00 01 00 5a]; status = "disabled"; @@ -150,7 +149,7 @@ soc0: soc@000000000 { }; eth3: ethernet@3{ compatible = "hisilicon,hns-nic-v1"; - ae-name = "dsaf0"; + ae-handle = <&dsaf0>; port-id = <3>; local-mac-address = [00 00 00 01 00 5b]; status = "disabled"; @@ -158,7 +157,7 @@ soc0: soc@000000000 { }; eth4: ethernet@4{ compatible = "hisilicon,hns-nic-v1"; - ae-name = "dsaf0"; + ae-handle = <&dsaf0>; port-id = <4>; local-mac-address = [00 00 00 01 00 5c]; status = "disabled"; @@ -166,7 +165,7 @@ soc0: soc@000000000 { }; eth5: ethernet@5{ compatible = "hisilicon,hns-nic-v1"; - ae-name = "dsaf0"; + ae-handle = <&dsaf0>; port-id = <5>; local-mac-address = [00 00 00 01 00 5d]; status = "disabled"; @@ -174,7 +173,7 @@ soc0: soc@000000000 { }; eth6: ethernet@6{ compatible = "hisilicon,hns-nic-v1"; - ae-name = "dsaf0"; + ae-handle = <&dsaf0>; port-id = <6>; local-mac-address = [00 00 00 01 00 5e]; status = "disabled"; @@ -182,7 +181,7 @@ soc0: soc@000000000 { }; eth7: ethernet@7{ compatible = "hisilicon,hns-nic-v1"; - ae-name = "dsaf0"; + ae-handle = <&dsaf0>; port-id = <7>; local-mac-address = [00 00 00 01 00 5f]; status = "disabled"; -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents) 2015-12-05 6:10 ` [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents) yankejian @ 2015-12-05 22:19 ` Arnd Bergmann 2015-12-07 7:14 ` Yankejian (Hackim Yim) 0 siblings, 1 reply; 9+ messages in thread From: Arnd Bergmann @ 2015-12-05 22:19 UTC (permalink / raw) To: yankejian Cc: davem, fengguang.wu, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, catalin.marinas, will.deacon, salil.mehta, Yisen.Zhuang, liguozhu, lisheng011, huangdaode, xuwei5, haifeng.wei, netdev, linux-kernel, devicetree, linux-arm-kernel On Saturday 05 December 2015 14:10:56 yankejian wrote: > diff --git a/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt b/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt > index 80411b2..ecacfa4 100644 > --- a/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt > +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt > @@ -4,8 +4,6 @@ Required properties: > - compatible: should be "hisilicon,hns-dsaf-v1" or "hisilicon,hns-dsaf-v2". > "hisilicon,hns-dsaf-v1" is for hip05. > "hisilicon,hns-dsaf-v2" is for Hi1610 and Hi1612. > -- dsa-name: dsa fabric name who provide this interface. > - should be "dsafX", X is the dsaf id. > - mode: dsa fabric mode string. only support one of dsaf modes like these: > "2port-64vf", > "6port-16rss", > @@ -26,9 +24,8 @@ Required properties: > > Example: > > -dsa: dsa@c7000000 { > +dsaf0: dsa@c7000000 { > compatible = "hisilicon,hns-dsaf-v1"; > - dsa_name = "dsaf0"; > mode = "6port-16rss"; > interrupt-parent = <&mbigen_dsa>; > reg = <0x0 0xC0000000 0x0 0x420000 > diff --git a/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt b/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt > index 41d19be..e6a9d1c 100644 > --- a/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt > +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt > @@ -4,8 +4,9 @@ Required properties: > - compatible: "hisilicon,hns-nic-v1" or "hisilicon,hns-nic-v2". > "hisilicon,hns-nic-v1" is for hip05. > "hisilicon,hns-nic-v2" is for Hi1610 and Hi1612. > -- ae-name: accelerator name who provides this interface, > - is simply a name referring to the name of name in the accelerator node. > +- ae-handle: accelerator engine handle for hns, > + specifies a reference to the associating hardware driver node. > + see Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt > - port-id: is the index of port provided by DSAF (the accelerator). DSAF can > connect to 8 PHYs. Port 0 to 1 are both used for adminstration purpose. They > are called debug ports. > @@ -41,7 +42,7 @@ Example: > > This looks like an incompatible change, as you add and remove required properties. Is there a way to support both the old and the new style? Arnd ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents) 2015-12-05 22:19 ` Arnd Bergmann @ 2015-12-07 7:14 ` Yankejian (Hackim Yim) 2015-12-07 9:40 ` arRe: " Arnd Bergmann 0 siblings, 1 reply; 9+ messages in thread From: Yankejian (Hackim Yim) @ 2015-12-07 7:14 UTC (permalink / raw) To: Arnd Bergmann Cc: davem-fT/PcQaiUtIeIZ0/mPfg9Q, fengguang.wu-ral2JQCrhuEAvxtiuMwx3w, robh+dt-DgEjT+Ai2ygdnm+yROfE0A, pawel.moll-5wv7dgnIgG8, mark.rutland-5wv7dgnIgG8, ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg, galak-sgV2jX0FEOL9JmXXK+q4OQ, catalin.marinas-5wv7dgnIgG8, will.deacon-5wv7dgnIgG8, salil.mehta-hv44wF8Li93QT0dZR+AlfA, Yisen.Zhuang-hv44wF8Li93QT0dZR+AlfA, liguozhu-hv44wF8Li93QT0dZR+AlfA, lisheng011-hv44wF8Li93QT0dZR+AlfA, huangdaode-C8/M+/jPZTeaMJb+Lgu22Q, xuwei5-C8/M+/jPZTeaMJb+Lgu22Q, haifeng.wei-hv44wF8Li93QT0dZR+AlfA, netdev-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r On 2015/12/6 6:19, Arnd Bergmann wrote: > On Saturday 05 December 2015 14:10:56 yankejian wrote: >> diff --git a/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt b/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt >> index 80411b2..ecacfa4 100644 >> --- a/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt >> +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt >> @@ -4,8 +4,6 @@ Required properties: >> - compatible: should be "hisilicon,hns-dsaf-v1" or "hisilicon,hns-dsaf-v2". >> "hisilicon,hns-dsaf-v1" is for hip05. >> "hisilicon,hns-dsaf-v2" is for Hi1610 and Hi1612. >> -- dsa-name: dsa fabric name who provide this interface. >> - should be "dsafX", X is the dsaf id. >> - mode: dsa fabric mode string. only support one of dsaf modes like these: >> "2port-64vf", >> "6port-16rss", >> @@ -26,9 +24,8 @@ Required properties: >> >> Example: >> >> -dsa: dsa@c7000000 { >> +dsaf0: dsa@c7000000 { >> compatible = "hisilicon,hns-dsaf-v1"; >> - dsa_name = "dsaf0"; >> mode = "6port-16rss"; >> interrupt-parent = <&mbigen_dsa>; >> reg = <0x0 0xC0000000 0x0 0x420000 >> diff --git a/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt b/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt >> index 41d19be..e6a9d1c 100644 >> --- a/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt >> +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt >> @@ -4,8 +4,9 @@ Required properties: >> - compatible: "hisilicon,hns-nic-v1" or "hisilicon,hns-nic-v2". >> "hisilicon,hns-nic-v1" is for hip05. >> "hisilicon,hns-nic-v2" is for Hi1610 and Hi1612. >> -- ae-name: accelerator name who provides this interface, >> - is simply a name referring to the name of name in the accelerator node. >> +- ae-handle: accelerator engine handle for hns, >> + specifies a reference to the associating hardware driver node. >> + see Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt >> - port-id: is the index of port provided by DSAF (the accelerator). DSAF can >> connect to 8 PHYs. Port 0 to 1 are both used for adminstration purpose. They >> are called debug ports. >> @@ -41,7 +42,7 @@ Example: >> >> > This looks like an incompatible change, as you add and remove > required properties. Is there a way to support both the old and > the new style? > > Arnd > > . Hi Arnd, Thanks for your suggestions. it must be set the same strings in dsaf node and every enet node before. it seems inappropriate. as Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> 's suggestions, that would solve associating enet with a particular dsaf. so we discus the solution with Yisen Zhuang <yisen.zhuang-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>. we decide to use the new way instead of the old one. Best regards, yankejian > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 9+ messages in thread
* arRe: [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents) 2015-12-07 7:14 ` Yankejian (Hackim Yim) @ 2015-12-07 9:40 ` Arnd Bergmann 2015-12-09 9:25 ` Yankejian (Hackim Yim) 0 siblings, 1 reply; 9+ messages in thread From: Arnd Bergmann @ 2015-12-07 9:40 UTC (permalink / raw) To: Yankejian (Hackim Yim) Cc: davem, fengguang.wu, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, catalin.marinas, will.deacon, salil.mehta, Yisen.Zhuang, liguozhu, lisheng011, huangdaode, xuwei5, haifeng.wei, netdev, linux-kernel, devicetree, linux-arm-kernel On Monday 07 December 2015 15:14:13 Yankejian wrote: > On 2015/12/6 6:19, Arnd Bergmann wrote: > > On Saturday 05 December 2015 14:10:56 yankejian wrote: > >> diff --git a/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt b/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt > >> index 80411b2..ecacfa4 100644 > >> --- a/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt > >> +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt > >> @@ -4,8 +4,6 @@ Required properties: > >> - compatible: should be "hisilicon,hns-dsaf-v1" or "hisilicon,hns-dsaf-v2". > >> "hisilicon,hns-dsaf-v1" is for hip05. > >> "hisilicon,hns-dsaf-v2" is for Hi1610 and Hi1612. > >> -- dsa-name: dsa fabric name who provide this interface. > >> - should be "dsafX", X is the dsaf id. > >> - mode: dsa fabric mode string. only support one of dsaf modes like these: > >> "2port-64vf", > >> "6port-16rss", > >> @@ -26,9 +24,8 @@ Required properties: > >> > >> Example: > >> > >> -dsa: dsa@c7000000 { > >> +dsaf0: dsa@c7000000 { > >> compatible = "hisilicon,hns-dsaf-v1"; > >> - dsa_name = "dsaf0"; > >> mode = "6port-16rss"; > >> interrupt-parent = <&mbigen_dsa>; > >> reg = <0x0 0xC0000000 0x0 0x420000 > >> diff --git a/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt b/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt > >> index 41d19be..e6a9d1c 100644 > >> --- a/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt > >> +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt > >> @@ -4,8 +4,9 @@ Required properties: > >> - compatible: "hisilicon,hns-nic-v1" or "hisilicon,hns-nic-v2". > >> "hisilicon,hns-nic-v1" is for hip05. > >> "hisilicon,hns-nic-v2" is for Hi1610 and Hi1612. > >> -- ae-name: accelerator name who provides this interface, > >> - is simply a name referring to the name of name in the accelerator node. > >> +- ae-handle: accelerator engine handle for hns, > >> + specifies a reference to the associating hardware driver node. > >> + see Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt > >> - port-id: is the index of port provided by DSAF (the accelerator). DSAF can > >> connect to 8 PHYs. Port 0 to 1 are both used for adminstration purpose. They > >> are called debug ports. > >> @@ -41,7 +42,7 @@ Example: > >> > >> > > This looks like an incompatible change, as you add and remove > > required properties. Is there a way to support both the old and > > the new style? > > > > Arnd > > > > . > > Hi Arnd, > Thanks for your suggestions. it must be set the same strings in dsaf node and every enet node before. > it seems inappropriate. as Rob Herring <robh@kernel.org> 's suggestions, that would solve associating > enet with a particular dsaf. so we discus the solution with Yisen Zhuang <yisen.zhuang@huawei.com>. > we decide to use the new way instead of the old one. I agree the new form looks better than the original way, but I'm worried about the migration path. You don't explain in the patch description how you want to ensure that nothing breaks for existing systems. We generally try to avoid doing incompatible changes altogether and prefer to keep backwards compatibility, unless we can prove that no other systems exist that would get impacted by the change. Are you sure that nobody ships a DTB file for this hardware with their firmware that would now require an incompatible update which in turn breaks old kernels? Are you sure that there is no hardware using the same dsa hardware with out-of-tree dts files that need to make the same change but might not be aware of the change? Arnd ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: arRe: [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents) 2015-12-07 9:40 ` arRe: " Arnd Bergmann @ 2015-12-09 9:25 ` Yankejian (Hackim Yim) 2015-12-09 10:00 ` Arnd Bergmann 0 siblings, 1 reply; 9+ messages in thread From: Yankejian (Hackim Yim) @ 2015-12-09 9:25 UTC (permalink / raw) To: Arnd Bergmann Cc: davem, fengguang.wu, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, catalin.marinas, will.deacon, salil.mehta, Yisen.Zhuang, liguozhu, lisheng011, huangdaode, xuwei5, haifeng.wei, netdev, linux-kernel, devicetree, linux-arm-kernel On 2015/12/7 17:40, Arnd Bergmann wrote: > On Monday 07 December 2015 15:14:13 Yankejian wrote: >> On 2015/12/6 6:19, Arnd Bergmann wrote: >>> On Saturday 05 December 2015 14:10:56 yankejian wrote: >>>> diff --git a/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt b/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt >>>> index 80411b2..ecacfa4 100644 >>>> --- a/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt >>>> +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt >>>> @@ -4,8 +4,6 @@ Required properties: >>>> - compatible: should be "hisilicon,hns-dsaf-v1" or "hisilicon,hns-dsaf-v2". >>>> "hisilicon,hns-dsaf-v1" is for hip05. >>>> "hisilicon,hns-dsaf-v2" is for Hi1610 and Hi1612. >>>> -- dsa-name: dsa fabric name who provide this interface. >>>> - should be "dsafX", X is the dsaf id. >>>> - mode: dsa fabric mode string. only support one of dsaf modes like these: >>>> "2port-64vf", >>>> "6port-16rss", >>>> @@ -26,9 +24,8 @@ Required properties: >>>> >>>> Example: >>>> >>>> -dsa: dsa@c7000000 { >>>> +dsaf0: dsa@c7000000 { >>>> compatible = "hisilicon,hns-dsaf-v1"; >>>> - dsa_name = "dsaf0"; >>>> mode = "6port-16rss"; >>>> interrupt-parent = <&mbigen_dsa>; >>>> reg = <0x0 0xC0000000 0x0 0x420000 >>>> diff --git a/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt b/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt >>>> index 41d19be..e6a9d1c 100644 >>>> --- a/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt >>>> +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt >>>> @@ -4,8 +4,9 @@ Required properties: >>>> - compatible: "hisilicon,hns-nic-v1" or "hisilicon,hns-nic-v2". >>>> "hisilicon,hns-nic-v1" is for hip05. >>>> "hisilicon,hns-nic-v2" is for Hi1610 and Hi1612. >>>> -- ae-name: accelerator name who provides this interface, >>>> - is simply a name referring to the name of name in the accelerator node. >>>> +- ae-handle: accelerator engine handle for hns, >>>> + specifies a reference to the associating hardware driver node. >>>> + see Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt >>>> - port-id: is the index of port provided by DSAF (the accelerator). DSAF can >>>> connect to 8 PHYs. Port 0 to 1 are both used for adminstration purpose. They >>>> are called debug ports. >>>> @@ -41,7 +42,7 @@ Example: >>>> >>>> >>> This looks like an incompatible change, as you add and remove >>> required properties. Is there a way to support both the old and >>> the new style? >>> >>> Arnd >>> >>> . >> Hi Arnd, >> Thanks for your suggestions. it must be set the same strings in dsaf node and every enet node before. >> it seems inappropriate. as Rob Herring <robh@kernel.org> 's suggestions, that would solve associating >> enet with a particular dsaf. so we discus the solution with Yisen Zhuang <yisen.zhuang@huawei.com>. >> we decide to use the new way instead of the old one. > I agree the new form looks better than the original way, but I'm worried > about the migration path. You don't explain in the patch description > how you want to ensure that nothing breaks for existing systems. > > We generally try to avoid doing incompatible changes altogether and > prefer to keep backwards compatibility, unless we can prove that no > other systems exist that would get impacted by the change. > > Are you sure that nobody ships a DTB file for this hardware with their > firmware that would now require an incompatible update which in turn > breaks old kernels? > > Are you sure that there is no hardware using the same dsa hardware > with out-of-tree dts files that need to make the same change but might > not be aware of the change? > > Arnd > > . hi Arnd. thanks a lot for pointing it out. It is great regret that this change breaks compatibility with old dtbs. this is a new driver which is run on developing boards, and all the clients' boards are developing boards. So we provide them a method to update the firmware on the board, once we update the dtsi and kernel, we require our clients to update the existed firmware and kernel. Therefore, these changes is actually under control. Shall we treat this by this way? thanks very much. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: arRe: [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents) 2015-12-09 9:25 ` Yankejian (Hackim Yim) @ 2015-12-09 10:00 ` Arnd Bergmann 2015-12-09 10:23 ` Yankejian (Hackim Yim) 0 siblings, 1 reply; 9+ messages in thread From: Arnd Bergmann @ 2015-12-09 10:00 UTC (permalink / raw) To: linux-arm-kernel Cc: Yankejian (Hackim Yim), mark.rutland, lisheng011, salil.mehta, liguozhu, haifeng.wei, pawel.moll, ijc+devicetree, catalin.marinas, will.deacon, linux-kernel, xuwei5, devicetree, robh+dt, huangdaode, galak, netdev, fengguang.wu, Yisen.Zhuang, davem On Wednesday 09 December 2015 17:25:13 Yankejian wrote: > thanks a lot for pointing it out. > > It is great regret that this change breaks compatibility with old dtbs. > this is a new driver which is run on developing boards, and all the > clients' boards are developing boards. So we provide them a method to > update the firmware on the board, once we update the dtsi and kernel, > we require our clients to update the existed firmware and kernel. > Therefore, these changes is actually under control. Shall we treat this > by this way? Ok, if you can show that the incompatible change is safe to do, that's fine. Just put the explanation above into the patch description to document that you have considered the effects of the change, and to ensure that it gets done atomically. Also, you have to merge the two patches into one to allow bisection, or do a series of three patches that need to be applied in order: 1. add ae-handle property 2. change driver to use that property 3. remove ae-name property Arnd ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: arRe: [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents) 2015-12-09 10:00 ` Arnd Bergmann @ 2015-12-09 10:23 ` Yankejian (Hackim Yim) 0 siblings, 0 replies; 9+ messages in thread From: Yankejian (Hackim Yim) @ 2015-12-09 10:23 UTC (permalink / raw) To: Arnd Bergmann, linux-arm-kernel Cc: mark.rutland, lisheng011, salil.mehta, liguozhu, haifeng.wei, pawel.moll, ijc+devicetree, catalin.marinas, will.deacon, linux-kernel, xuwei5, devicetree, robh+dt, huangdaode, galak, netdev, fengguang.wu, Yisen.Zhuang, davem On 2015/12/9 18:00, Arnd Bergmann wrote: > On Wednesday 09 December 2015 17:25:13 Yankejian wrote: >> thanks a lot for pointing it out. >> >> It is great regret that this change breaks compatibility with old dtbs. >> this is a new driver which is run on developing boards, and all the >> clients' boards are developing boards. So we provide them a method to >> update the firmware on the board, once we update the dtsi and kernel, >> we require our clients to update the existed firmware and kernel. >> Therefore, these changes is actually under control. Shall we treat this >> by this way? > Ok, if you can show that the incompatible change is safe to do, that's > fine. Just put the explanation above into the patch description to > document that you have considered the effects of the change, and > to ensure that it gets done atomically. > > Also, you have to merge the two patches into one to allow bisection, > or do a series of three patches that need to be applied in order: > > 1. add ae-handle property > 2. change driver to use that property > 3. remove ae-name property > > Arnd > > . > Ok, thanks for your good advices. i will change it in V2 PATCH. Bset Regards yankejian ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-12-09 10:23 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-12-05 6:10 [PATCH net-next 0/2] net: hns: enet specisies a reference to dsaf yankejian 2015-12-05 6:10 ` [PATCH net-next 1/2] " yankejian 2015-12-05 6:10 ` [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents) yankejian 2015-12-05 22:19 ` Arnd Bergmann 2015-12-07 7:14 ` Yankejian (Hackim Yim) 2015-12-07 9:40 ` arRe: " Arnd Bergmann 2015-12-09 9:25 ` Yankejian (Hackim Yim) 2015-12-09 10:00 ` Arnd Bergmann 2015-12-09 10:23 ` Yankejian (Hackim Yim)
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).