tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'net-stmmac-remove-unused-and-unimplemented-axi-properties'

Russell King says:

====================
net: stmmac: remove unused and unimplemented AXI properties

commit afea03656add ("stmmac: rework DMA bus setting and introduce new
platform AXI structure") added support for parsing all the stmmac AXI
attributes, and added code to set most of the appropriate register bits
with three exceptions:

snps,kbbe
snps,mb
snps,rb

These were parsed by the driver, but the result of parsing was never
used by any of the cores.

Moreover, no DTS in the kernel makes use of these properties.

Thus, it doesn't make sense for the driver to parse these, so let's
remove them. Also remove them from the DT binding document.
====================

Link: https://patch.msgid.link/acJh4z3pRKkeaFbR@shell.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Jakub Kicinski 5fffa6fe f8844dfe

-25
-18
Documentation/devicetree/bindings/net/snps,dwmac.yaml
··· 204 204 * snps,xit_frm, unlock on WoL 205 205 * snps,wr_osr_lmt, max write outstanding req. limit 206 206 * snps,rd_osr_lmt, max read outstanding req. limit 207 - * snps,kbbe, do not cross 1KiB boundary. 208 207 * snps,blen, this is a vector of supported burst length. 209 208 * snps,fb, fixed-burst 210 - * snps,mb, mixed-burst 211 - * snps,rb, rebuild INCRx Burst 212 209 213 210 snps,mtl-rx-config: 214 211 $ref: /schemas/types.yaml#/definitions/phandle ··· 585 588 description: 586 589 max read outstanding req. limit 587 590 588 - snps,kbbe: 589 - $ref: /schemas/types.yaml#/definitions/flag 590 - description: 591 - do not cross 1KiB boundary. 592 - 593 591 snps,blen: 594 592 $ref: /schemas/types.yaml#/definitions/uint32-array 595 593 description: ··· 596 604 $ref: /schemas/types.yaml#/definitions/flag 597 605 description: 598 606 fixed-burst 599 - 600 - snps,mb: 601 - $ref: /schemas/types.yaml#/definitions/flag 602 - description: 603 - mixed-burst 604 - 605 - snps,rb: 606 - $ref: /schemas/types.yaml#/definitions/flag 607 - description: 608 - rebuild INCRx Burst 609 607 610 608 required: 611 609 - compatible
-1
drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c
··· 231 231 232 232 plat->axi->axi_wr_osr_lmt = 1; 233 233 plat->axi->axi_rd_osr_lmt = 1; 234 - plat->axi->axi_mb = true; 235 234 plat->axi->axi_blen_regval = DMA_AXI_BLEN4 | DMA_AXI_BLEN8 | 236 235 DMA_AXI_BLEN16 | DMA_AXI_BLEN32; 237 236
-3
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
··· 109 109 110 110 axi->axi_lpi_en = of_property_read_bool(np, "snps,lpi_en"); 111 111 axi->axi_xit_frm = of_property_read_bool(np, "snps,xit_frm"); 112 - axi->axi_kbbe = of_property_read_bool(np, "snps,kbbe"); 113 112 axi->axi_fb = of_property_read_bool(np, "snps,fb"); 114 - axi->axi_mb = of_property_read_bool(np, "snps,mb"); 115 - axi->axi_rb = of_property_read_bool(np, "snps,rb"); 116 113 117 114 if (of_property_read_u32(np, "snps,wr_osr_lmt", &axi->axi_wr_osr_lmt)) 118 115 axi->axi_wr_osr_lmt = 1;
-3
include/linux/stmmac.h
··· 133 133 u32 axi_blen_regval; 134 134 bool axi_lpi_en; 135 135 bool axi_xit_frm; 136 - bool axi_kbbe; 137 136 bool axi_fb; 138 - bool axi_mb; 139 - bool axi_rb; 140 137 }; 141 138 142 139 struct stmmac_rxq_cfg {