[PATCH 1/2] net/ncsi: use proper "mellanox" DT vendor prefix

[PATCH 1/2] net/ncsi: use proper "mellanox" DT vendor prefix

[Krzysztof Kozlowski]

"mlx" Devicetree vendor prefix is not documented and instead "mellanox"
should be used.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 net/ncsi/ncsi-manage.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c
index 78814417d753..80713febfac6 100644
--- a/net/ncsi/ncsi-manage.c
+++ b/net/ncsi/ncsi-manage.c
@@ -1803,7 +1803,8 @@ struct ncsi_dev *ncsi_register_dev(struct net_device *dev,
 	pdev = to_platform_device(dev->dev.parent);
 	if (pdev) {
 		np = pdev->dev.of_node;
-		if (np && of_get_property(np, "mlx,multi-host", NULL))
+		if (np && (of_get_property(np, "mellanox,multi-host", NULL) ||
+			   of_get_property(np, "mlx,multi-host", NULL)))
 			ndp->mlx_multi_host = true;
 	}
 
-- 
2.34.1

[PATCH 2/2] ARM: dts: aspeed: yosemitev2: use proper "mellanox" DT vendor prefix

[Krzysztof Kozlowski]

"mlx" Devicetree vendor prefix is not documented and instead "mellanox"
should be used:

  aspeed-bmc-facebook-yosemitev2.dtb: ethernet@1e660000: 'mlx,multi-host' does not match any of the regexes

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

---

The change depends on net/ncsi change.
---
 arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts
index 8864e9c312a8..26217bc652e7 100644
--- a/arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts
@@ -95,7 +95,7 @@ &mac0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_rmii1_default>;
 	use-ncsi;
-	mlx,multi-host;
+	mellanox,multi-host;
 };
 
 &adc {
-- 
2.34.1

Re: [PATCH 1/2] net/ncsi: use proper "mellanox" DT vendor prefix

[Paolo Abeni]

Hello,

On Sun, 2022-05-29 at 13:10 +0200, Krzysztof Kozlowski wrote:
> "mlx" Devicetree vendor prefix is not documented and instead "mellanox"
> should be used.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>  net/ncsi/ncsi-manage.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c
> index 78814417d753..80713febfac6 100644
> --- a/net/ncsi/ncsi-manage.c
> +++ b/net/ncsi/ncsi-manage.c
> @@ -1803,7 +1803,8 @@ struct ncsi_dev *ncsi_register_dev(struct net_device *dev,
>  	pdev = to_platform_device(dev->dev.parent);
>  	if (pdev) {
>  		np = pdev->dev.of_node;
> -		if (np && of_get_property(np, "mlx,multi-host", NULL))
> +		if (np && (of_get_property(np, "mellanox,multi-host", NULL) ||
> +			   of_get_property(np, "mlx,multi-host", NULL)))
>  			ndp->mlx_multi_host = true;
>  	}
> 

I can't guess which tree are you targeting, devicetree? net-next? could
you please specify?

thanks!

Paolo

Re: [PATCH 1/2] net/ncsi: use proper "mellanox" DT vendor prefix

[Krzysztof Kozlowski]

On 31/05/2022 10:21, Paolo Abeni wrote:
> Hello,
> 
> On Sun, 2022-05-29 at 13:10 +0200, Krzysztof Kozlowski wrote:
>> "mlx" Devicetree vendor prefix is not documented and instead "mellanox"
>> should be used.
>>
>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>> ---
>>  net/ncsi/ncsi-manage.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c
>> index 78814417d753..80713febfac6 100644
>> --- a/net/ncsi/ncsi-manage.c
>> +++ b/net/ncsi/ncsi-manage.c
>> @@ -1803,7 +1803,8 @@ struct ncsi_dev *ncsi_register_dev(struct net_device *dev,
>>  	pdev = to_platform_device(dev->dev.parent);
>>  	if (pdev) {
>>  		np = pdev->dev.of_node;
>> -		if (np && of_get_property(np, "mlx,multi-host", NULL))
>> +		if (np && (of_get_property(np, "mellanox,multi-host", NULL) ||
>> +			   of_get_property(np, "mlx,multi-host", NULL)))
>>  			ndp->mlx_multi_host = true;
>>  	}
>>
> 
> I can't guess which tree are you targeting, devicetree? net-next? could
> you please specify?

Both independently. The patch here for net-next (although it is closed
now). The DTS patch can come later via ARM SoC maintainer tree.


Best regards,
Krzysztof