2022-05-30 08:13:15

by Krzysztof Kozlowski

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

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

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
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

2022-05-31 16:32:18

by Krzysztof Kozlowski

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

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 <[email protected]>
>> ---
>> 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

2022-06-01 20:46:49

by Paolo Abeni

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

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 <[email protected]>
> ---
> 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