Skip to content

aspeed: Add SCU interrupt controller and XDMA engine drivers

Eddie James linux-aspeed linux-devicetree lkml 6 versions – Applied

Status from this message: The following commit has been merged into the irq/core branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v6 Latest12 patches 10 repliesApplied
  2. v512 patches 0 repliesSuperseded
  3. v412 patches 8 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v312 patches8 repliesSuperseded
v212 patches14 repliesSuperseded
v112 patches11 repliesSuperseded

Changes in v6 from the cover letter

- Rework the XDMA locking completely; thanks Andrew Jeffrey for the help.

Patches in v6 Applied

#Subject and filesSizeRepliesApplied
1/12dt-bindings: interrupt-controller: Add Aspeed SCU interrupt controllerDocumentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt MAINTAINERS include/dt-bindings/interrupt-controller/aspeed-scu-ic.h+53 -00 replies
2/12irqchip: Add Aspeed SCU interrupt controllerMAINTAINERS drivers/irqchip/Makefile drivers/irqchip/irq-aspeed-scu-ic.c+241 -10 replies
3/12ARM: dts: aspeed: ast2500: Add SCU interrupt controllerarch/arm/boot/dts/aspeed-g5.dtsi+7 -00 replies
4/12ARM: dts: aspeed: ast2600: Add SCU interrupt controllersarch/arm/boot/dts/aspeed-g6.dtsi+14 -00 replies
5/12dt-bindings: soc: Add Aspeed XDMA EngineDocumentation/devicetree/bindings/soc/aspeed/xdma.txt MAINTAINERS+46 -01 reply
6/12soc: aspeed: Add XDMA Engine DriverMAINTAINERS drivers/soc/aspeed/Kconfig drivers/soc/aspeed/Makefile +2 more+842 -05 replies
7/12soc: aspeed: xdma: Add user interfacedrivers/soc/aspeed/aspeed-xdma.c+200 -01 reply
8/12soc: aspeed: xdma: Add reset ioctldrivers/soc/aspeed/aspeed-xdma.c include/uapi/linux/aspeed-xdma.h+36 -00 replies
9/12ARM: dts: aspeed: ast2500: Add XDMA Enginearch/arm/boot/dts/aspeed-g5.dtsi+12 -00 replies
10/12ARM: dts: aspeed: ast2600: Add XDMA Enginearch/arm/boot/dts/aspeed-g6.dtsi+13 -00 replies
11/12ARM: dts: aspeed: witherspoon: Enable XDMA Enginearch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts+6 -01 reply
12/12ARM: dts: aspeed: tacoma: Enable XDMA enginearch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts+6 -01 reply

Reviews trailers per patch

All 12 patches have a Reviewed-by or Acked-by.

PatchRob HerringAndrew Jeffery
1/12R-b A-b
2/12R-b
3/12R-b
4/12R-b
5/12R-b R-b
6/12R-b
7/12R-b
8/12A-b
9/12R-b
10/12R-b
11/12R-b
12/12R-b

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

Read the v6 thread

Cover letter [PATCH v6 00/12] aspeed: Add SCU interrupt controller and XDMA engine drivers

This series first adds a driver to control the interrupt controller provided by the System Control Unit (SCU) on the AST2500 and AST2600 SOCs. The interrupts made available are necessary for the control of the XDMA engine embedded in the same Aspeed SOCs.
This series then adds a driver to control the XDMA engine. This driver was previously sent to the list without support for the AST2600, and has been refactored significantly to enable that support. The XDMA engine performs automatic DMA operations between the Aspeed SOC (acting as a BMC) and a host processor.

Changes since v5:
- Rework the XDMA locking completely; thanks Andrew Jeffrey for the help.

Changes since v4:
- Fix dts documentation example for XDMA
- Add errno in warning for SCU failure in XDMA PCIe config
- Add a check for in_reset before proceeding in O_NONBLOCK case
- Add comments to memory sizes in the witherspoon/tacoma XDMA dts entries

Changes since v3:
- See individual patches; just clean-up items

Changes since v2:
- See individual patches
- Drop rainier dts patch
- In summary, remove references to VGA memory as the XDMA driver doesn't care where it is. Remove SDRAM controller reference. Move user reset functionality to a separate patch and make it an ioctl.

Changes since v1:
- See individual patches
- In summary, first the irqchip driver switched to use the parent SCU regmap rather than iomapping it's register. Secondly, the XDMA initialization switched to use properties from the device tree rather than dynamically calculate memory spaces, and system config.

Eddie James (12):
dt-bindings: interrupt-controller: Add Aspeed SCU interrupt controller
irqchip: Add Aspeed SCU interrupt controller
ARM: dts: aspeed: ast2500: Add SCU interrupt controller
ARM: dts: aspeed: ast2600: Add SCU interrupt controllers
dt-bindings: soc: Add Aspeed XDMA Engine
soc: aspeed: Add XDMA Engine Driver
soc: aspeed: xdma: Add user interface
soc: aspeed: xdma: Add reset ioctl
ARM: dts: aspeed: ast2500: Add XDMA Engine
ARM: dts: aspeed: ast2600: Add XDMA Engine
ARM: dts: aspeed: witherspoon: Enable XDMA Engine
ARM: dts: aspeed: tacoma: Enable XDMA engine

 .../interrupt-controller/aspeed,ast2xxx-scu-ic.txt |   23 +
 .../devicetree/bindings/soc/aspeed/xdma.txt        |   40 +
 MAINTAINERS                                        |   16 +
 arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts        |    6 +
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts   |    6 +
 arch/arm/boot/dts/aspeed-g5.dtsi                   |   19 +
 arch/arm/boot/dts/aspeed-g6.dtsi                   |   27 +
 drivers/irqchip/Makefile                           |    2 +-
 drivers/irqchip/irq-aspeed-scu-ic.c                |  239 +++++
 drivers/soc/aspeed/Kconfig                         |    8 +
 drivers/soc/aspeed/Makefile                        |    1 +
 drivers/soc/aspeed/aspeed-xdma.c                   | 1025 ++++++++++++++++++++
 .../interrupt-controller/aspeed-scu-ic.h           |   23 +
 include/uapi/linux/aspeed-xdma.h                   |   42 +
 14 files changed, 1476 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt
 create mode 100644 Documentation/devicetree/bindings/soc/aspeed/xdma.txt
 create mode 100644 drivers/irqchip/irq-aspeed-scu-ic.c
 create mode 100644 drivers/soc/aspeed/aspeed-xdma.c
 create mode 100644 include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
 create mode 100644 include/uapi/linux/aspeed-xdma.h
Signature · 1 line
1.8.3.1