Skip to content

net: axienet: Update error handling and add 64-bit DMA support

Andre Przywara linux-arm-kernel lkml netdev 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest14 patches 2 repliesIn review
  2. v214 patches 5 repliesSuperseded
  3. v114 patches 50 repliesSuperseded

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/14net: xilinx: temac: Relax Kconfig dependenciesdrivers/net/ethernet/xilinx/Kconfig+0 -10 replies
2/14net: axienet: Convert DMA error handler to a work queuedrivers/net/ethernet/xilinx/xilinx_axienet.h drivers/net/ethernet/xilinx/xilinx_axienet_main.c+13 -130 replies
3/14net: axienet: Propagate failure of DMA descriptor setupdrivers/net/ethernet/xilinx/xilinx_axienet_main.c+19 -70 replies
4/14net: axienet: Fix DMA descriptor cleanup pathdrivers/net/ethernet/xilinx/xilinx_axienet_main.c+28 -150 replies
5/14net: axienet: Improve DMA error handlingdrivers/net/ethernet/xilinx/xilinx_axienet_main.c+2 -20 replies
6/14net: axienet: Factor out TX descriptor chain cleanupdrivers/net/ethernet/xilinx/xilinx_axienet_main.c+57 -220 replies
7/14net: axienet: Check for DMA mapping errorsdrivers/net/ethernet/xilinx/xilinx_axienet_main.c+30 -10 replies
8/14net: axienet: Mark eth_irq as optionaldrivers/net/ethernet/xilinx/xilinx_axienet_main.c+2 -20 replies
9/14net: axienet: Drop MDIO interrupt registers from ethtools dumpdrivers/net/ethernet/xilinx/xilinx_axienet.h drivers/net/ethernet/xilinx/xilinx_axienet_main.c+0 -110 replies
10/14net: axienet: Add mii-tool supportdrivers/net/ethernet/xilinx/xilinx_axienet_main.c+11 -01 reply
11/14net: axienet: Wrap DMA pointer writes to prepare for 64 bitdrivers/net/ethernet/xilinx/xilinx_axienet_main.c+16 -100 replies
12/14net: axienet: Upgrade descriptors to hold 64-bit addressesdrivers/net/ethernet/xilinx/xilinx_axienet.h drivers/net/ethernet/xilinx/xilinx_axienet_main.c+83 -390 replies
13/14net: axienet: Autodetect 64-bit DMA capabilitydrivers/net/ethernet/xilinx/xilinx_axienet.h drivers/net/ethernet/xilinx/xilinx_axienet_main.c+27 -00 replies
14/14net: axienet: Allow DMA to beyond 4GBdrivers/net/ethernet/xilinx/xilinx_axienet_main.c+8 -00 replies

Reviews trailers per patch

5 of 14 patches have a Reviewed-by or Acked-by.

PatchRadhey Shyam PandeyAndrew Lunn
1/14R-b
2/14
3/14R-b
4/14
5/14R-b
6/14R-b
7/14
8/14
9/14
10/14R-b
11/14
12/14
13/14
14/14

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH v3 00/14] net: axienet: Update error handling and add 64-bit DMA support

Hi,

a minor update, fixing the 32-bit build breakage, and brightening up Dave's christmas tree. Rebased against latest net-next/master.

This series is based on net-next as of today (9970de8b013a), which includes Russell's fixes [1], solving the SGMII issues I have had.

A git branch is available at:
http://www.linux-arm.org/git?p=linux-ap.git;a=shortlog;h=refs/heads/axienet/v3
git://linux-arm.org/linux-ap.git branch axienet/v3

Thanks,
Andre

[1] https://lore.kernel.org/netdev/[email protected]/

Changelog v2 .. v3:
- Use two "left-shifts by 16" to fix builds with 32-bit phys_addr_t
- reorder variable declarations

Changelog v1 .. v2:
- Add Reviewed-by: tags from Radhey
- Extend kerndoc documentation
- Convert DMA error handler tasklet to work queue
- log DMA mapping errors
- mark DMA mapping error checks as unlikely (in "hot" paths)
- return NETDEV_TX_OK on TX DMA mapping error (increasing TX drop counter)
- Request eth IRQ as an optional IRQ
- Remove no longer needed MDIO IRQ register names
- Drop DT propery check for address width, assume full 64 bit

===============
This series updates the Xilinx Axienet driver to work on our board here. One big issue was broken SGMII support, which Russell fixed already (in net-next).
While debugging and understanding the driver, I found several problems in the error handling and cleanup paths, which patches 2-7 address. Patch 8 removes a annoying error message, patch 9 paves the way for newer revisions of the IP. The next patch adds mii-tool support, just for good measure.

The next four patches add support for 64-bit DMA. This is an integration option on newer IP revisions (>= v7.1), and expects MSB bits in formerly reserved registers. Without writing to those MSB registers, the state machine won't trigger, so it's mandatory to access them, even if they are zero. Patches 11 and 12 prepare the code by adding accessors, to wrap this properly and keep it working on older IP revisions. Patch 13 enables access to the MSB registers, by trying to write a non-zero value to them and checking if that sticks. Older IP revisions always read those registers as zero.
Patch 14 then adjusts the DMA mask, based on the autodetected MSB feature. It uses the full 64 bits in this case, the rest of the system (actual physical addresses in use) should provide a natural limit if the chip has connected fewer address lines. If not, the parent DT node can use a dma-range property.

The Xilinx PG138 and PG021 documents (in versions 7.1 in both cases) were used for this series.

Andre Przywara (14):
net: xilinx: temac: Relax Kconfig dependencies
net: axienet: Convert DMA error handler to a work queue
net: axienet: Propagate failure of DMA descriptor setup
net: axienet: Fix DMA descriptor cleanup path
net: axienet: Improve DMA error handling
net: axienet: Factor out TX descriptor chain cleanup
net: axienet: Check for DMA mapping errors
net: axienet: Mark eth_irq as optional
net: axienet: Drop MDIO interrupt registers from ethtools dump
net: axienet: Add mii-tool support
net: axienet: Wrap DMA pointer writes to prepare for 64 bit
net: axienet: Upgrade descriptors to hold 64-bit addresses
net: axienet: Autodetect 64-bit DMA capability
net: axienet: Allow DMA to beyond 4GB

 drivers/net/ethernet/xilinx/Kconfig           |   1 -
 drivers/net/ethernet/xilinx/xilinx_axienet.h  |  19 +-
 .../net/ethernet/xilinx/xilinx_axienet_main.c | 385 +++++++++++++-----
 3 files changed, 289 insertions(+), 116 deletions(-)
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel