Re: [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents)

2015-12-08 Thread Yankejian (Hackim Yim) 


On 2015/12/7 22:12, Rob Herring wrote:
> On Sat, Dec 05, 2015 at 03:59:16PM +0800, yankejian wrote:
>> when enet specisies a reference to dsaf, the correlative config and
> s/when/When/
ok，i will pay attention to it on patch v3.
thanks.
>> documents needs to update. this patch updates the correlative dtsi file
> s/this/This/
ok，i will pay attention to it on patch v3.
thanks.
>> and bindings documents .
> ^
> extra space
>
> This change breaks compatibility with old dtbs. IIRC, this is all new, 
> so maybe it doesn't matter, but you should be explicit that you are 
> doing that.
>
ok，i will pay attention to it on patch v3.
thanks.
>> Signed-off-by: yankejian 
>> ---
>>  .../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@c700 {
>> +dsaf0: dsa@c700 {
>>  compatible = "hisilicon,hns-dsaf-v1";
>> -dsa_name = "dsaf0";
>>  mode = "6port-16rss";
>>  interrupt-parent = <_dsa>;
>>  reg = <0x0 0xC000 0x0 0x42
>> 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 = <>;
>>  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@0 {
>>  };
>>  };
>>  
>> -dsa: dsa@c700 {
>> +dsaf0: dsa@c700 {
>>  compatible = "hisilicon,hns-dsaf-v1";
>> -dsa_name = "dsaf0";
>>  mode = "6port-16rss";
>>  interrupt-parent = <_dsa>;
>>  
>> @@ -127,7 +126,7 @@ soc0: soc@0 {
>>  
>>  eth0: ethernet@0{
>>  compatible = "hisilicon,hns-nic-v1";
>> -ae-name = "dsaf0";
>> +ae-handle = <>;
>>  port-id = <0>;
>>  local-mac-address = [00 00 00 01 00 58];
>>  status = "disabled";
>> @@ -135,14 +134,14 @@ soc0: soc@0 {
>>  };
>>  eth1: ethernet@1{
>>  compatible = "hisilicon,hns-nic-v1";
>> -ae-name = "dsaf0";
>> +ae-handle = <>;
>>  port-id = <1>;
>>  status = "disabled";
>>  dma-coherent;
>>  };
>>  eth2: ethernet@2{
>>  compatible = "hisilicon,hns-nic-v1";
>> -ae-name = "dsaf0";
>> +ae-handle = <>;
>>  port-id = <2>;
>>  local-mac-address = [00 00 00 01 00 5a];
>>  status = "disabled";
>> @@ -150,7 +149,7 @@ soc0: soc@0 {
>>  };
>>  eth3: ethernet@3{
>>  compatible =

Re: [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents)

2015-12-07 Thread Rob Herring 
On Sat, Dec 05, 2015 at 03:59:16PM +0800, yankejian wrote:
> when enet specisies a reference to dsaf, the correlative config and

s/when/When/

> documents needs to update. this patch updates the correlative dtsi file

s/this/This/

> and bindings documents .
^
extra space

This change breaks compatibility with old dtbs. IIRC, this is all new, 
so maybe it doesn't matter, but you should be explicit that you are 
doing that.


> 
> Signed-off-by: yankejian 
> ---
>  .../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@c700 {
> +dsaf0: dsa@c700 {
>   compatible = "hisilicon,hns-dsaf-v1";
> - dsa_name = "dsaf0";
>   mode = "6port-16rss";
>   interrupt-parent = <_dsa>;
>   reg = <0x0 0xC000 0x0 0x42
> 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 = <>;
>   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@0 {
>   };
>   };
>  
> - dsa: dsa@c700 {
> + dsaf0: dsa@c700 {
>   compatible = "hisilicon,hns-dsaf-v1";
> - dsa_name = "dsaf0";
>   mode = "6port-16rss";
>   interrupt-parent = <_dsa>;
>  
> @@ -127,7 +126,7 @@ soc0: soc@0 {
>  
>   eth0: ethernet@0{
>   compatible = "hisilicon,hns-nic-v1";
> - ae-name = "dsaf0";
> + ae-handle = <>;
>   port-id = <0>;
>   local-mac-address = [00 00 00 01 00 58];
>   status = "disabled";
> @@ -135,14 +134,14 @@ soc0: soc@0 {
>   };
>   eth1: ethernet@1{
>   compatible = "hisilicon,hns-nic-v1";
> - ae-name = "dsaf0";
> + ae-handle = <>;
>   port-id = <1>;
>   status = "disabled";
>   dma-coherent;
>   };
>   eth2: ethernet@2{
>   compatible = "hisilicon,hns-nic-v1";
> - ae-name = "dsaf0";
> + ae-handle = <>;
>   port-id = <2>;
>   local-mac-address = [00 00 00 01 00 5a];
>   status = "disabled";
> @@ -150,7 +149,7 @@ soc0: soc@0 {
>   };
>   eth3: ethernet@3{
>   compatible = "hisilicon,hns-nic-v1";
> - ae-name = "dsaf0";
> + ae-handle = <>;
>   port-id = <3>;
>   local-mac-address = [00 00 00 01 00 5b];
>   status = "disabled";
> @@ -158,7 +157,7 @@ soc0: soc@0 {
>   };
>

Re: [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents)

2015-12-06 Thread Yankejian (Hackim Yim) 


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@c700 {
>> +dsaf0: dsa@c700 {
>> compatible = "hisilicon,hns-dsaf-v1";
>> -   dsa_name = "dsaf0";
>> mode = "6port-16rss";
>> interrupt-parent = <_dsa>;
>> reg = <0x0 0xC000 0x0 0x42
>> 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  's suggestions, that 
would solve associating
enet with a particular dsaf. so we discus the solution with Yisen Zhuang 
.
we decide to use the new way instead of the old one.

Best regards,
yankejian

>


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents)

2015-12-05 Thread Arnd Bergmann 
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@c700 {
> +dsaf0: dsa@c700 {
> compatible = "hisilicon,hns-dsaf-v1";
> -   dsa_name = "dsaf0";
> mode = "6port-16rss";
> interrupt-parent = <_dsa>;
> reg = <0x0 0xC000 0x0 0x42
> 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
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html