Skip to content

Stream Patches

[email protected] qemu-devel 2 versions – Applied

Status from this message: Applied, thanks Peter.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v6 Latest16 patches 1 replyApplied
  2. v516 patches 0 repliesSuperseded

Changes in v6 from the cover letter

rebased against hw ro-organisation

Patches in v6 Applied

#Subject and filesSizeRepliesApplied
1/16xilinx_axienet: typedef XilinxAXIEnet structhw/net/xilinx_axienet.c+23 -210 replies
2/16xilinx_axienet: Defined and use type cast macrohw/net/xilinx_axienet.c+8 -30 replies
3/16xilinx_axienet: Register reset properlyhw/net/xilinx_axienet.c+4 -20 replies
4/16xilinx_axienet: converted init->realizehw/net/xilinx_axienet.c+11 -130 replies
5/16xilinx_axidma: typedef XilinxAXIDMA structhw/dma/xilinx_axidma.c+9 -70 replies
6/16xilinx_axidma: Defined and use type cast macrohw/dma/xilinx_axidma.c+9 -40 replies
7/16xilinx_axidma: Register reset properlyhw/dma/xilinx_axidma.c+11 -10 replies
8/16xilinx_axidma: converted init->realizehw/dma/xilinx_axidma.c+13 -130 replies
9/16petalogix_ml605_mmu: Fix machine node attachmenthw/microblaze/petalogix_ml605_mmu.c+2 -20 replies
10/16petalogix_ml605_mmu: Attach ethernet to machinehw/microblaze/petalogix_ml605_mmu.c+2 -00 replies
11/16xilinx_axienet: Create Proxy object for streamhw/microblaze/petalogix_ml605_mmu.c hw/net/xilinx_axienet.c+60 -50 replies
12/16xilinx_axidma: Create Proxy object for streamhw/dma/xilinx_axidma.c hw/microblaze/petalogix_ml605_mmu.c+62 -70 replies
13/16xilinx_axidma: Fix rx/tx halted bit.hw/dma/xilinx_axidma.c+2 -20 replies
14/16stream: Add flow control APIhw/core/stream.c hw/dma/xilinx_axidma.c hw/net/xilinx_axienet.c +1 more+48 -90 replies
15/16xilinx_axienet/dma: Implement rx path flow controlhw/dma/xilinx_axidma.c hw/net/xilinx_axienet.c+66 -110 replies
16/16stream: Remove app argument hackhw/core/stream.c hw/dma/xilinx_axidma.c hw/microblaze/petalogix_ml605_mmu.c +3 more+187 -670 replies

Reviews trailers per patch

11 of 16 patches have a Reviewed-by or Acked-by.

PatchAndreas FärberEdgar E. Iglesias
1/16R-b A-b
2/16R-b A-b
3/16R-b A-b
4/16R-b A-b
5/16A-b
6/16A-b
7/16A-b
8/16A-b
9/16R-b A-b
10/16R-b A-b
11/16
12/16
13/16A-b
14/16
15/16
16/16

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

Read the v6 thread

Cover letter [Qemu-devel] [PATCH v6 00/16] Stream Patches

From: Peter Crosthwaite <[email protected]>

Hi all. The Xilinx AXIEnet and DMA devices have two AXI stream connections (control and data), only one of which is currently modelled (data). AXI stream is modelled using the stream QOM interface described in stream.h. Unfortunately, interfaces have no nice way of modelling multiple connections of the same type. So to overcome this I created a secondary object which acts as a proxy for the stream connection. Multiple connections can be implemented using multiple proxies and stream masters link to the relevant proxy, rather than the ethernet device itself. This Series changes AXI Enet and DMA to be connected as such.

Also changed the stream interface to implement flow control handshaking. This is needed for the AXIEnet to be be able to implement the net can_receive() flow control.

Patches 1-10 are low-impact cleanup of axienet/dma as per the current QOM styling guidelines and can be cherry-picked off the front.

changed from v5:
rebased against hw ro-organisation
changed from v4:
resynchronized control flow stream API
reordered series for better consistency.
Folded patch 17 in 16 (app array length fix)
Fixed DMA tx path halted bit
changed from v3:
Changed from asynchronous flow control to synchronous (Edgar review) changed from v2:
Reordered patches (from low impact -> high impact)
Added styling refactoring of AXIDMA
Added asynchronous patches
Removed dummy second stream connection patch (former patch 8) Added (functional) second stream connection
changed from v1:
Removed former P1&2 (already merged)
Address Andreas review
Refactor axienet to be more QOM friendly.

Peter Crosthwaite (16):
xilinx_axienet: typedef XilinxAXIEnet struct
xilinx_axienet: Defined and use type cast macro
xilinx_axienet: Register reset properly
xilinx_axienet: converted init->realize
xilinx_axidma: typedef XilinxAXIDMA struct
xilinx_axidma: Defined and use type cast macro
xilinx_axidma: Register reset properly
xilinx_axidma: converted init->realize
petalogix_ml605_mmu: Fix machine node attachment
petalogix_ml605_mmu: Attach ethernet to machine
xilinx_axienet: Create Proxy object for stream
xilinx_axidma: Create Proxy object for stream
xilinx_axidma: Fix rx/tx halted bit.
stream: Add flow control API xilinx_axienet/dma: Implement rx path flow control
stream: Remove app argument hack

 hw/core/stream.c                    |   15 ++-
 hw/dma/xilinx_axidma.c              |  261 +++++++++++++++++++++++++++--------
 hw/microblaze/petalogix_ml605_mmu.c |   28 +++-
 hw/net/xilinx_axienet.c             |  255 +++++++++++++++++++++++++++-------
 include/hw/stream.h                 |   36 ++++-
 include/hw/xilinx.h                 |   21 ++-
 6 files changed, 483 insertions(+), 133 deletions(-)