The description of some properties in stmmac-axi-config don't match the
behavior of the corresponding driver. Fix the inconsistencies by fixing
the dt-schema.
Fixes: 5361660af6d3 ("dt-bindings: net: snps,dwmac: Document stmmac-axi-config subnode")
Fixes: afea03656add ("stmmac: rework DMA bus setting and introduce new platform AXI structure")
Signed-off-by: Kunihiko Hayashi <[email protected]>
---
.../devicetree/bindings/net/snps,dwmac.yaml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
In this patch the definition of the corresponding driver is applied.
If applying the definition of the devicetree, we need to change the driver
instead of this patch.
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
index e88a86623fce..2332bf7cfcd4 100644
--- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
@@ -158,11 +158,11 @@ properties:
* snps,xit_frm, unlock on WoL
* snps,wr_osr_lmt, max write outstanding req. limit
* snps,rd_osr_lmt, max read outstanding req. limit
- * snps,kbbe, do not cross 1KiB boundary.
+ * snps,axi_kbbe, do not cross 1KiB boundary.
* snps,blen, this is a vector of supported burst length.
- * snps,fb, fixed-burst
- * snps,mb, mixed-burst
- * snps,rb, rebuild INCRx Burst
+ * snps,axi_fb, fixed-burst
+ * snps,axi_mb, mixed-burst
+ * snps,axi_rb, rebuild INCRx Burst
snps,mtl-rx-config:
$ref: /schemas/types.yaml#/definitions/phandle
@@ -516,7 +516,7 @@ properties:
description:
max read outstanding req. limit
- snps,kbbe:
+ snps,axi_kbbe:
$ref: /schemas/types.yaml#/definitions/uint32
description:
do not cross 1KiB boundary.
@@ -528,17 +528,17 @@ properties:
minItems: 7
maxItems: 7
- snps,fb:
+ snps,axi_fb:
$ref: /schemas/types.yaml#/definitions/flag
description:
fixed-burst
- snps,mb:
+ snps,axi_mb:
$ref: /schemas/types.yaml#/definitions/flag
description:
mixed-burst
- snps,rb:
+ snps,axi_rb:
$ref: /schemas/types.yaml#/definitions/flag
description:
rebuild INCRx Burst
--
2.25.1
On 11/01/2023 03:26, Kunihiko Hayashi wrote:
> The description of some properties in stmmac-axi-config don't match the
> behavior of the corresponding driver. Fix the inconsistencies by fixing
> the dt-schema.
>
> Fixes: 5361660af6d3 ("dt-bindings: net: snps,dwmac: Document stmmac-axi-config subnode")
> Fixes: afea03656add ("stmmac: rework DMA bus setting and introduce new platform AXI structure")
> Signed-off-by: Kunihiko Hayashi <[email protected]>
NAK.
I don't understand what do you mean by "corresponding driver". Driver
uses existing properties in current next.
> ---
> .../devicetree/bindings/net/snps,dwmac.yaml | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> In this patch the definition of the corresponding driver is applied.
> If applying the definition of the devicetree, we need to change the driver
> instead of this patch.
>
> diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> index e88a86623fce..2332bf7cfcd4 100644
> --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
> @@ -158,11 +158,11 @@ properties:
> * snps,xit_frm, unlock on WoL
> * snps,wr_osr_lmt, max write outstanding req. limit
> * snps,rd_osr_lmt, max read outstanding req. limit
> - * snps,kbbe, do not cross 1KiB boundary.
> + * snps,axi_kbbe, do not cross 1KiB boundary.
> * snps,blen, this is a vector of supported burst length.
> - * snps,fb, fixed-burst
> - * snps,mb, mixed-burst
> - * snps,rb, rebuild INCRx Burst
> + * snps,axi_fb, fixed-burst
> + * snps,axi_mb, mixed-burst
> + * snps,axi_rb, rebuild INCRx Burst
>
> snps,mtl-rx-config:
> $ref: /schemas/types.yaml#/definitions/phandle
> @@ -516,7 +516,7 @@ properties:
> description:
> max read outstanding req. limit
>
> - snps,kbbe:
> + snps,axi_kbbe:
There is no such property. Driver parses snps,kbbe. What's more you
introduce invalid character - underscore - for property name.
Best regards,
Krzysztof
Hi Krzysztof,
On 2023/01/11 18:19, Krzysztof Kozlowski wrote:
> On 11/01/2023 03:26, Kunihiko Hayashi wrote:
>> The description of some properties in stmmac-axi-config don't match the
>> behavior of the corresponding driver. Fix the inconsistencies by fixing
>> the dt-schema.
>>
>> Fixes: 5361660af6d3 ("dt-bindings: net: snps,dwmac: Document
>> stmmac-axi-config subnode")
>> Fixes: afea03656add ("stmmac: rework DMA bus setting and introduce new
>> platform AXI structure")
>> Signed-off-by: Kunihiko Hayashi <[email protected]>
>
> NAK.
>
> I don't understand what do you mean by "corresponding driver". Driver
> uses existing properties in current next.
Sorry for my mistake.
I found my local repository was out of date and
the commit 61d4f140943c ("net: stmmac: fix "snps,axi-config" node property parsing")
had already solved the issue to fix the driver.
>> ---
>> .../devicetree/bindings/net/snps,dwmac.yaml | 16 ++++++++--------
>> 1 file changed, 8 insertions(+), 8 deletions(-)
>>
>> In this patch the definition of the corresponding driver is applied.
>> If applying the definition of the devicetree, we need to change the driver
>> instead of this patch.
>>
>> diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
>> b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
>> index e88a86623fce..2332bf7cfcd4 100644
>> --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
>> +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
>> @@ -158,11 +158,11 @@ properties:
>> * snps,xit_frm, unlock on WoL
>> * snps,wr_osr_lmt, max write outstanding req. limit
>> * snps,rd_osr_lmt, max read outstanding req. limit
>> - * snps,kbbe, do not cross 1KiB boundary.
>> + * snps,axi_kbbe, do not cross 1KiB boundary.
>> * snps,blen, this is a vector of supported burst length.
>> - * snps,fb, fixed-burst
>> - * snps,mb, mixed-burst
>> - * snps,rb, rebuild INCRx Burst
>> + * snps,axi_fb, fixed-burst
>> + * snps,axi_mb, mixed-burst
>> + * snps,axi_rb, rebuild INCRx Burst
>>
>> snps,mtl-rx-config:
>> $ref: /schemas/types.yaml#/definitions/phandle
>> @@ -516,7 +516,7 @@ properties:
>> description:
>> max read outstanding req. limit
>>
>> - snps,kbbe:
>> + snps,axi_kbbe:
>
> There is no such property. Driver parses snps,kbbe. What's more you
> introduce invalid character - underscore - for property name.
I understand the invalid character. This issue should have been fixed
in the driver parsing and was already fixed.
Thank you,
---
Best Regards
Kunihiko Hayashi