aspeed: Add SCU interrupt controller and XDMA engine drivers
Subsystems (4)
Eddie James
maintainerv6 cover 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
Eddie James
maintainerPATCH v6 1/12 dt-bindings: interrupt-controller: Add Aspeed SCU interrupt controller
Document the Aspeed SCU interrupt controller and add an include file for the interrupts it provides.
--- .../interrupt-controller/aspeed,ast2xxx-scu-ic.txt | 23 ++++++++++++++++++++++ MAINTAINERS | 7 +++++++ .../interrupt-controller/aspeed-scu-ic.h | 23 ++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt create mode 100644 include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt new file +23 -0
@@ -0,0 +1,23 @@ +Aspeed AST25XX and AST26XX SCU Interrupt Controller + +Required Properties: + - #interrupt-cells : must be 1 + - compatible : must be "aspeed,ast2500-scu-ic", + "aspeed,ast2600-scu-ic0" or + "aspeed,ast2600-scu-ic1" + - interrupts : interrupt from the parent controller + - interrupt-controller : indicates that the controller receives and + fires new interrupts for child busses + +Example: + + syscon at 1e6e2000 { + ranges = <0 0x1e6e2000 0x1a8>; + + scu_ic: interrupt-controller at 18 { + #interrupt-cells = <1>; + compatible = "aspeed,ast2500-scu-ic"; + interrupts = <21>; + interrupt-controller; + }; + };
MAINTAINERS +7 -0
@@ -2728,6 +2728,13 @@ S: Maintained F: drivers/pinctrl/aspeed/ F: Documentation/devicetree/bindings/pinctrl/aspeed,* +ASPEED SCU INTERRUPT CONTROLLER DRIVER +M: Eddie James <[email protected]> +L: linux-aspeed at lists.ozlabs.org (moderated for non-subscribers) +S: Maintained +F: Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt +F: include/dt-bindings/interrupt-controller/aspeed-scu-ic.h + ASPEED VIDEO ENGINE DRIVER M: Eddie James <[email protected]> L: linux-media at vger.kernel.org
include/dt-bindings/interrupt-controller/aspeed-scu-ic.h new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#ifndef _DT_BINDINGS_INTERRUPT_CONTROLLER_ASPEED_SCU_IC_H_ +#define _DT_BINDINGS_INTERRUPT_CONTROLLER_ASPEED_SCU_IC_H_ + +#define ASPEED_SCU_IC_VGA_CURSOR_CHANGE 0 +#define ASPEED_SCU_IC_VGA_SCRATCH_REG_CHANGE 1 + +#define ASPEED_AST2500_SCU_IC_PCIE_RESET_LO_TO_HI 2 +#define ASPEED_AST2500_SCU_IC_PCIE_RESET_HI_TO_LO 3 +#define ASPEED_AST2500_SCU_IC_LPC_RESET_LO_TO_HI 4 +#define ASPEED_AST2500_SCU_IC_LPC_RESET_HI_TO_LO 5 +#define ASPEED_AST2500_SCU_IC_ISSUE_MSI 6 + +#define ASPEED_AST2600_SCU_IC0_PCIE_PERST_LO_TO_HI 2 +#define ASPEED_AST2600_SCU_IC0_PCIE_PERST_HI_TO_LO 3 +#define ASPEED_AST2600_SCU_IC0_PCIE_RCRST_LO_TO_HI 4 +#define ASPEED_AST2600_SCU_IC0_PCIE_RCRST_HI_TO_LO 5 + +#define ASPEED_AST2600_SCU_IC1_LPC_RESET_LO_TO_HI 0 +#define ASPEED_AST2600_SCU_IC1_LPC_RESET_HI_TO_LO 1 + +#endif /* _DT_BINDINGS_INTERRUPT_CONTROLLER_ASPEED_SCU_IC_H_ */
Signature · 1 line
1.8.3.1
[tip: irq/core] dt-bindings: interrupt-controller: Add Aspeed SCU interrupt controller
The following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 5350a237b4525ad12170f16239c9e9c7797df02f Gitweb: https://git.kernel.org/tip/5350a237b4525ad12170f16239c9e9c7797df02f Author: Eddie James <[email protected]> AuthorDate: Wed, 15 Jan 2020 15:29:39 -06:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Mon, 20 Jan 2020 19:10:03
dt-bindings: interrupt-controller: Add Aspeed SCU interrupt controller
Document the Aspeed SCU interrupt controller and add an include file for the interrupts it provides.
--- Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt | 23 +++++++++++++++++++++++ MAINTAINERS | 7 +++++++ include/dt-bindings/interrupt-controller/aspeed-scu-ic.h | 23 +++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt create mode 100644 include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt new file +23 -0
@@ -0,0 +1,23 @@ +Aspeed AST25XX and AST26XX SCU Interrupt Controller + +Required Properties: + - #interrupt-cells : must be 1 + - compatible : must be "aspeed,ast2500-scu-ic", + "aspeed,ast2600-scu-ic0" or + "aspeed,ast2600-scu-ic1" + - interrupts : interrupt from the parent controller + - interrupt-controller : indicates that the controller receives and + fires new interrupts for child busses + +Example: + + syscon@1e6e2000 { + ranges = <0 0x1e6e2000 0x1a8>; + + scu_ic: interrupt-controller@18 { + #interrupt-cells = <1>; + compatible = "aspeed,ast2500-scu-ic"; + interrupts = <21>; + interrupt-controller; + }; + };
MAINTAINERS +7 -0
@@ -2692,6 +2692,13 @@ S: Maintained F: drivers/pinctrl/aspeed/ F: Documentation/devicetree/bindings/pinctrl/aspeed,* +ASPEED SCU INTERRUPT CONTROLLER DRIVER +M: Eddie James <[email protected]> +L: [email protected] (moderated for non-subscribers) +S: Maintained +F: Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt +F: include/dt-bindings/interrupt-controller/aspeed-scu-ic.h + ASPEED VIDEO ENGINE DRIVER M: Eddie James <[email protected]> L: [email protected]
include/dt-bindings/interrupt-controller/aspeed-scu-ic.h new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#ifndef _DT_BINDINGS_INTERRUPT_CONTROLLER_ASPEED_SCU_IC_H_ +#define _DT_BINDINGS_INTERRUPT_CONTROLLER_ASPEED_SCU_IC_H_ + +#define ASPEED_SCU_IC_VGA_CURSOR_CHANGE 0 +#define ASPEED_SCU_IC_VGA_SCRATCH_REG_CHANGE 1 + +#define ASPEED_AST2500_SCU_IC_PCIE_RESET_LO_TO_HI 2 +#define ASPEED_AST2500_SCU_IC_PCIE_RESET_HI_TO_LO 3 +#define ASPEED_AST2500_SCU_IC_LPC_RESET_LO_TO_HI 4 +#define ASPEED_AST2500_SCU_IC_LPC_RESET_HI_TO_LO 5 +#define ASPEED_AST2500_SCU_IC_ISSUE_MSI 6 + +#define ASPEED_AST2600_SCU_IC0_PCIE_PERST_LO_TO_HI 2 +#define ASPEED_AST2600_SCU_IC0_PCIE_PERST_HI_TO_LO 3 +#define ASPEED_AST2600_SCU_IC0_PCIE_RCRST_LO_TO_HI 4 +#define ASPEED_AST2600_SCU_IC0_PCIE_RCRST_HI_TO_LO 5 + +#define ASPEED_AST2600_SCU_IC1_LPC_RESET_LO_TO_HI 0 +#define ASPEED_AST2600_SCU_IC1_LPC_RESET_HI_TO_LO 1 + +#endif /* _DT_BINDINGS_INTERRUPT_CONTROLLER_ASPEED_SCU_IC_H_ */
Eddie James
maintainerPATCH v6 2/12 irqchip: Add Aspeed SCU interrupt controller
In reply to Eddie JamesThe Aspeed SOCs provide some interrupts through the System Control Unit registers. Add an interrupt controller that provides these interrupts to the system.
--- MAINTAINERS | 1 + drivers/irqchip/Makefile | 2 +- drivers/irqchip/irq-aspeed-scu-ic.c | 239 ++++++++++++++++++++++++++++++++++++ 3 files changed, 241 insertions(+), 1 deletion(-) create mode 100644 drivers/irqchip/irq-aspeed-scu-ic.c
MAINTAINERS +1 -0
@@ -2733,6 +2733,7 @@ M: Eddie James <[email protected]> L: linux-aspeed at lists.ozlabs.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt +F: drivers/irqchip/irq-aspeed-scu-ic.c F: include/dt-bindings/interrupt-controller/aspeed-scu-ic.h ASPEED VIDEO ENGINE DRIVER
drivers/irqchip/Makefile +1 -1
@@ -87,7 +87,7 @@ obj-$(CONFIG_MVEBU_SEI) += irq-mvebu-sei.o obj-$(CONFIG_LS_EXTIRQ) += irq-ls-extirq.o obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o -obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o irq-aspeed-i2c-ic.o +obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o irq-aspeed-i2c-ic.o irq-aspeed-scu-ic.o obj-$(CONFIG_STM32_EXTI) += irq-stm32-exti.o obj-$(CONFIG_QCOM_IRQ_COMBINER) += qcom-irq-combiner.o obj-$(CONFIG_IRQ_UNIPHIER_AIDET) += irq-uniphier-aidet.o
drivers/irqchip/irq-aspeed-scu-ic.c new file +239 -0
239 lines not on this page · raw message
Signature · 1 line
1.8.3.1
[tip: irq/core] irqchip: Add Aspeed SCU interrupt controller
The following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 04f605906ff00c649751519ca73d3058372cdc78 Gitweb: https://git.kernel.org/tip/04f605906ff00c649751519ca73d3058372cdc78 Author: Eddie James <[email protected]> AuthorDate: Wed, 15 Jan 2020 15:29:40 -06:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Mon, 20 Jan 2020 19:10:04
irqchip: Add Aspeed SCU interrupt controller
The Aspeed SOCs provide some interrupts through the System Control Unit registers. Add an interrupt controller that provides these interrupts to the system.
--- MAINTAINERS | 1 +- drivers/irqchip/Makefile | 2 +- drivers/irqchip/irq-aspeed-scu-ic.c | 239 +++++++++++++++++++++++++++- 3 files changed, 241 insertions(+), 1 deletion(-) create mode 100644 drivers/irqchip/irq-aspeed-scu-ic.c
MAINTAINERS +1 -0
@@ -2697,6 +2697,7 @@ M: Eddie James <[email protected]> L: [email protected] (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt +F: drivers/irqchip/irq-aspeed-scu-ic.c F: include/dt-bindings/interrupt-controller/aspeed-scu-ic.h ASPEED VIDEO ENGINE DRIVER
drivers/irqchip/Makefile +1 -1
@@ -87,7 +87,7 @@ obj-$(CONFIG_MVEBU_SEI) += irq-mvebu-sei.o obj-$(CONFIG_LS_EXTIRQ) += irq-ls-extirq.o obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o -obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o irq-aspeed-i2c-ic.o +obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o irq-aspeed-i2c-ic.o irq-aspeed-scu-ic.o obj-$(CONFIG_STM32_EXTI) += irq-stm32-exti.o obj-$(CONFIG_QCOM_IRQ_COMBINER) += qcom-irq-combiner.o obj-$(CONFIG_IRQ_UNIPHIER_AIDET) += irq-uniphier-aidet.o
drivers/irqchip/irq-aspeed-scu-ic.c new file +239 -0
239 lines not on this page · raw message
Eddie James
maintainerPATCH v6 3/12 ARM: dts: aspeed: ast2500: Add SCU interrupt controller
In reply to Eddie JamesAdd a node for the interrupt controller provided by the SCU.
--- arch/arm/boot/dts/aspeed-g5.dtsi | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/boot/dts/aspeed-g5.dtsi +7 -0
@@ -222,6 +222,13 @@ #clock-cells = <1>; #reset-cells = <1>; + scu_ic: interrupt-controller at 18 { + #interrupt-cells = <1>; + compatible = "aspeed,ast2500-scu-ic"; + interrupts = <21>; + interrupt-controller; + }; + p2a: p2a-control at 2c { compatible = "aspeed,ast2500-p2a-ctrl"; reg = <0x2c 0x4>;
Signature · 1 line
1.8.3.1
Eddie James
maintainerPATCH v6 4/12 ARM: dts: aspeed: ast2600: Add SCU interrupt controllers
In reply to Eddie JamesAdd nodes for the interrupt controllers provided by the SCU.
--- arch/arm/boot/dts/aspeed-g6.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/arm/boot/dts/aspeed-g6.dtsi +14 -0
@@ -268,6 +268,20 @@ compatible = "aspeed,ast2600-smpmem"; reg = <0x180 0x40>; }; + + scu_ic0: interrupt-controller at 0 { + #interrupt-cells = <1>; + compatible = "aspeed,ast2600-scu-ic0"; + interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + }; + + scu_ic1: interrupt-controller at 1 { + #interrupt-cells = <1>; + compatible = "aspeed,ast2600-scu-ic1"; + interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + }; }; rng: hwrng at 1e6e2524 {
Signature · 1 line
1.8.3.1
Eddie James
maintainerPATCH v6 5/12 dt-bindings: soc: Add Aspeed XDMA Engine
In reply to Eddie JamesDocument the bindings for the Aspeed AST25XX and AST26XX XDMA engine.
--- .../devicetree/bindings/soc/aspeed/xdma.txt | 40 ++++++++++++++++++++++ MAINTAINERS | 6 ++++ 2 files changed, 46 insertions(+) create mode 100644 Documentation/devicetree/bindings/soc/aspeed/xdma.txt
Documentation/devicetree/bindings/soc/aspeed/xdma.txt new file +40 -0
@@ -0,0 +1,40 @@ +Aspeed AST25XX and AST26XX XDMA Engine + +The XDMA Engine embedded in the AST2500 and AST2600 SOCs can perform automatic +DMA operations over PCI between the SOC (acting as a BMC) and a host processor. + +Required properties: + - compatible : must be "aspeed,ast2500-xdma" or + "aspeed,ast2600-xdma" + - reg : contains the address and size of the memory region + associated with the XDMA engine registers + - clocks : clock specifier for the clock associated with the + XDMA engine + - resets : reset specifier for the syscon reset associated with + the XDMA engine + - interrupts-extended : two interrupt cells; the first specifies the global + interrupt for the XDMA engine and the second + specifies the PCI-E reset or PERST interrupt. + - aspeed,scu : a phandle to the syscon node for the system control + unit of the SOC + - memory : contains the address and size of the memory area to + be used by the XDMA engine for DMA operations + +Optional properties: + - pcie-device : should be either "bmc" or "vga", corresponding to + which device should be used by the XDMA engine for + DMA operations. If this property is not set, the XDMA + engine will use the BMC PCI-E device. + +Example: + + xdma at 1e6e7000 { + compatible = "aspeed,ast2500-xdma"; + reg = <0x1e6e7000 0x100>; + clocks = <&syscon ASPEED_CLK_GATE_BCLK>; + resets = <&syscon ASPEED_RESET_XDMA>; + interrupts-extended = <&vic 6>, <&scu_ic ASPEED_AST2500_SCU_IC_PCIE_RESET_LO_TO_HI>; + aspeed,scu = <&syscon>; + pcie-device = "bmc"; + memory = <0x9f000000 0x01000000>; + };
MAINTAINERS +6 -0
@@ -2744,6 +2744,12 @@ S: Maintained F: drivers/media/platform/aspeed-video.c F: Documentation/devicetree/bindings/media/aspeed-video.txt +ASPEED XDMA ENGINE DRIVER +M: Eddie James <[email protected]> +L: linux-aspeed at lists.ozlabs.org (moderated for non-subscribers) +S: Maintained +F: Documentation/devicetree/bindings/soc/aspeed/xdma.txt + ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS M: Corentin Chary <[email protected]> L: acpi4asus-user at lists.sourceforge.net
Signature · 1 line
1.8.3.1
Re: [PATCH v6 05/12] dt-bindings: soc: Add Aspeed XDMA Engine
Quoted 4 lines · Eddie James
Document the bindings for the Aspeed AST25XX and AST26XX XDMA engine.
Signed-off-by Eddie James <[email protected]>Reviewed-by Rob Herring <[email protected]>
Eddie James
maintainerPATCH v6 6/12 soc: aspeed: Add XDMA Engine Driver
In reply to Eddie JamesThe XDMA engine embedded in the AST2500 and AST2600 SOCs performs PCI DMA operations between the SOC (acting as a BMC) and a host processor in a server.
This commit adds a driver to control the XDMA engine and adds functions to initialize the hardware and memory and start DMA operations.
--- MAINTAINERS | 2 + drivers/soc/aspeed/Kconfig | 8 + drivers/soc/aspeed/Makefile | 1 + drivers/soc/aspeed/aspeed-xdma.c | 793 +++++++++++++++++++++++++++++++++++++++ include/uapi/linux/aspeed-xdma.h | 38 ++ 5 files changed, 842 insertions(+) create mode 100644 drivers/soc/aspeed/aspeed-xdma.c create mode 100644 include/uapi/linux/aspeed-xdma.h
MAINTAINERS +2 -0
@@ -2749,6 +2749,8 @@ M: Eddie James <[email protected]> L: linux-aspeed at lists.ozlabs.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/soc/aspeed/xdma.txt +F: drivers/soc/aspeed/aspeed-xdma.c +F: include/uapi/linux/aspeed-xdma.h ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS M: Corentin Chary <[email protected]>
drivers/soc/aspeed/Kconfig +8 -0
@@ -29,4 +29,12 @@ config ASPEED_P2A_CTRL ioctl()s, the driver also provides an interface for userspace mappings to a pre-defined region. +config ASPEED_XDMA + tristate "Aspeed XDMA Engine Driver" + depends on SOC_ASPEED && REGMAP && MFD_SYSCON && HAS_DMA + help + Enable support for the Aspeed XDMA Engine found on the Aspeed AST2XXX + SOCs. The XDMA engine can perform automatic PCI DMA operations + between the AST2XXX (acting as a BMC) and a host processor. + endmenu
drivers/soc/aspeed/Makefile +1 -0
@@ -2,3 +2,4 @@ obj-$(CONFIG_ASPEED_LPC_CTRL) += aspeed-lpc-ctrl.o obj-$(CONFIG_ASPEED_LPC_SNOOP) += aspeed-lpc-snoop.o obj-$(CONFIG_ASPEED_P2A_CTRL) += aspeed-p2a-ctrl.o +obj-$(CONFIG_ASPEED_XDMA) += aspeed-xdma.o
drivers/soc/aspeed/aspeed-xdma.c new file +793 -0
793 lines not on this page · raw message
include/uapi/linux/aspeed-xdma.h new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ +/* Copyright IBM Corp 2019 */ + +#ifndef _UAPI_LINUX_ASPEED_XDMA_H_ +#define _UAPI_LINUX_ASPEED_XDMA_H_ + +#include <linux/types.h> + +/* +* aspeed_xdma_direction +* +* ASPEED_XDMA_DIRECTION_DOWNSTREAM: transfers data from the host to the BMC +* +* ASPEED_XDMA_DIRECTION_UPSTREAM: transfers data from the BMC to the host +*/ +enum aspeed_xdma_direction { +ASPEED_XDMA_DIRECTION_DOWNSTREAM =0 , +ASPEED_XDMA_DIRECTION_UPSTREAM , +}; + +/* +* aspeed_xdma_op +* +* host_addr: the DMA address on the host side, typically configured by PCI +* subsystem +* +* len: the size of the transfer in bytes +* +* direction: an enumerator indicating the direction of the DMA operation; see +* enum aspeed_xdma_direction +*/ +struct aspeed_xdma_op { +__u64 host_addr; +__u32 len; +__u32 direction; +}; + +#endif /* _UAPI_LINUX_ASPEED_XDMA_H_ */
Signature · 1 line
1.8.3.1
Re: [PATCH v6 06/12] soc: aspeed: Add XDMA Engine Driver
Quoted 8 lines · Eddie James
The XDMA engine embedded in the AST2500 and AST2600 SOCs performs PCI DMA operations between the SOC (acting as a BMC) and a host processor in a server.
This commit adds a driver to control the XDMA engine and adds functions to initialize the hardware and memory and start DMA operations.
Signed-off-by Eddie James <[email protected]>
Re: [PATCH v6 06/12] soc: aspeed: Add XDMA Engine Driver
In reply to Eddie JamesQuoted 9 lines · Eddie James
The XDMA engine embedded in the AST2500 and AST2600 SOCs performs PCI DMA operations between the SOC (acting as a BMC) and a host processor in a server.
This commit adds a driver to control the XDMA engine and adds functions to initialize the hardware and memory and start DMA operations.
Signed-off-by Eddie James <[email protected]>
Hi Eddie,
I'm missing the bigger picture in the description here, how does this fit into the PCIe endpoint framework and the dmaengine subsystem?
Does the AST2500 show up as a PCIe device in the host, or do you just inject DMAs into the host and hope that bypasses the IOMMU? If it shows up as an endpoint, how does the endpoint driver link into the dma driver?
Arnd
Re: [PATCH v6 06/12] soc: aspeed: Add XDMA Engine Driver
Quoted 5 lines · Arnd Bergmann
Quoted 4 lines · Eddie James
The XDMA engine embedded in the AST2500 and AST2600 SOCs performs PCI DMA operations between the SOC (acting as a BMC) and a host processor in a server.
Quoted 8 lines
Quoted 4 lines
This commit adds a driver to control the XDMA engine and adds functions to initialize the hardware and memory and start DMA operations.
Signed-off-by Eddie James <[email protected]>Hi Eddie,
I'm missing the bigger picture in the description here, how does this fit into the PCIe endpoint framework and the dmaengine subsystem?
Hi,
It doesn't fit into the PCIe endpoint framework. The XDMA engine abstracts all the PCIe details away so the BMC cannot configure any of the things the PCIe endpoint exposes.
It also doesn't fit into the dmaengine subsystem due to the restriction on the ast2500 (and maybe the ast2600) that the XDMA engine can only access certain areas of physical memory. Also problematic would be pausing/resuming/terminating transfers because the XDMA engine can't do those things.
Quoted 5 lines
Does the AST2500 show up as a PCIe device in the host, or do you just inject DMAs into the host and hope that bypasses the IOMMU? If it shows up as an endpoint, how does the endpoint driver link into the dma driver?
The AST2500 and AST2600 have two PCIe devices on them, so these will show up on the host if the BMC enables both of them. Either or both can also be disabled and therefore will not show up. On the host side, in order to receive DMA transfers, its simply a matter of registering a PCI device driver and allocating some coherent DMA.... Not sure about the details of endpoints/dma client driver?
Hopefully this answers your questions. Thanks,
Eddie
Quoted 2 lines
Arnd
Joel Stanley
maintainerRe: [PATCH v6 06/12] soc: aspeed: Add XDMA Engine Driver
Quoted 46 lines · Eddie James
Quoted 5 lines · Arnd Bergmann
Quoted 4 lines · Eddie James
The XDMA engine embedded in the AST2500 and AST2600 SOCs performs PCI DMA operations between the SOC (acting as a BMC) and a host processor in a server.
Quoted 8 lines
Quoted 4 lines
This commit adds a driver to control the XDMA engine and adds functions to initialize the hardware and memory and start DMA operations.
Signed-off-by Eddie James <[email protected]>Hi Eddie,
I'm missing the bigger picture in the description here, how does this fit into the PCIe endpoint framework and the dmaengine subsystem?
Hi,
It doesn't fit into the PCIe endpoint framework. The XDMA engine abstracts all the PCIe details away so the BMC cannot configure any of the things the PCIe endpoint exposes.
It also doesn't fit into the dmaengine subsystem due to the restriction on the ast2500 (and maybe the ast2600) that the XDMA engine can only access certain areas of physical memory. Also problematic would be pausing/resuming/terminating transfers because the XDMA engine can't do those things.
Quoted 5 lines
Does the AST2500 show up as a PCIe device in the host, or do you just inject DMAs into the host and hope that bypasses the IOMMU? If it shows up as an endpoint, how does the endpoint driver link into the dma driver?
The AST2500 and AST2600 have two PCIe devices on them, so these will show up on the host if the BMC enables both of them. Either or both can also be disabled and therefore will not show up. On the host side, in order to receive DMA transfers, its simply a matter of registering a PCI device driver and allocating some coherent DMA.... Not sure about the details of endpoints/dma client driver?
Quoted 1 line
Hopefully this answers your questions. Thanks,
Arnd, did you have further questions about this driver?
Re: [PATCH v6 06/12] soc: aspeed: Add XDMA Engine Driver
In reply to Arnd BergmannQuoted 11 lines · Arnd Bergmann
Quoted 9 lines · Eddie James
The XDMA engine embedded in the AST2500 and AST2600 SOCs performs PCI DMA operations between the SOC (acting as a BMC) and a host processor in a server.
This commit adds a driver to control the XDMA engine and adds functions to initialize the hardware and memory and start DMA operations.
Signed-off-by Eddie James <[email protected]>
Quoted 7 lines
Hi Eddie,
I'm missing the bigger picture in the description here, how does this fit into the PCIe endpoint framework and the dmaengine subsystem?
Does the AST2500 show up as a PCIe device in the host, or do you just inject DMAs into the host and hope that bypasses the IOMMU?
The host needs to coordinate out-of-band with the BMC to communicate host addresses to be used. The host should configure the IOMMU as required before triggering transfers (either from it's own XDMA interface or requesting the BMC queue the transfer).
Andrew
Eddie James
maintainerPATCH v6 7/12 soc: aspeed: xdma: Add user interface
In reply to Eddie JamesThis commits adds a miscdevice to provide a user interface to the XDMA engine. The interface provides the write operation to start DMA operations. The DMA parameters are passed as the data to the write call. The actual data to transfer is NOT passed through write. Note that both directions of DMA operation are accomplished through the write command; BMC to host and host to BMC.
The XDMA driver reserves an area of physical memory for DMA operations, as the XDMA engine is restricted to accessing certain physical memory areas on some platforms. This memory forms a pool from which users can allocate pages for their usage with calls to mmap. The space allocated by a client will be the space used in the DMA operation. For an "upstream" (BMC to host) operation, the data in the client's area will be transferred to the host. For a "downstream" (host to BMC) operation, the host data will be placed in the client's memory area.
Poll is also provided in order to determine when the DMA operation is complete for non-blocking IO.
--- drivers/soc/aspeed/aspeed-xdma.c | 200 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+)
drivers/soc/aspeed/aspeed-xdma.c +200 -0
@@ -13,6 +13,7 @@#include <linux/io.h> #include <linux/jiffies.h> #include <linux/mfd/syscon.h> +#include <linux/miscdevice.h> #include <linux/module.h> #include <linux/mutex.h> #include <linux/of_device.h>
@@ -222,6 +223,8 @@ struct aspeed_xdma {void __iomem *mem_virt;dma_addr_t cmdq_phys;struct gen_pool *pool; + +struct miscdevice misc; };struct aspeed_xdma_client {
@@ -530,6 +533,186 @@ static irqreturn_t aspeed_xdma_pcie_irq(int irq, void *arg)return IRQ_HANDLED ; } +static ssize_t aspeed_xdma_write (struct file *file,const char __user *buf, +size_t len,loff_t *offset) +{ +int rc; +unsigned int num_cmds; +struct aspeed_xdma_op op; +struct aspeed_xdma_cmd cmds[2 ]; +struct aspeed_xdma_client *client = file->private_data; +struct aspeed_xdma *ctx = client->ctx; + +if (len !=sizeof (op)) +return -EINVAL ; + + rc =copy_from_user (&op, buf, len); +if (rc) +return rc; + +if (!op.len || op.len > client->size || + op.direction >ASPEED_XDMA_DIRECTION_UPSTREAM ) +return -EINVAL ; + + num_cmds = ctx->chip->set_cmd (ctx, cmds, &op, client->phys); +do { + rc =aspeed_xdma_start (ctx, num_cmds, cmds, !!op.direction, + client); +if (!rc) +break ; + +if ((file->f_flags &O_NONBLOCK ) || rc != -EBUSY ) +return rc; + + rc =wait_event_interruptible (ctx->wait, + !(ctx->current_client || + ctx->in_reset)); + }while (!rc); + +if (rc) +return -EINTR ; + +if (!(file->f_flags &O_NONBLOCK )) { + rc =wait_event_interruptible (ctx->wait, !client->in_progress); +if (rc) +return -EINTR ; + +if (client->error) +return -EIO ; + } + +return len; +} + +static __poll_t aspeed_xdma_poll (struct file *file, +struct poll_table_struct *wait) +{ +__poll_t mask =0 ; +__poll_t req =poll_requested_events (wait); +struct aspeed_xdma_client *client = file->private_data; +struct aspeed_xdma *ctx = client->ctx; + +if (req & (EPOLLIN |EPOLLRDNORM )) { +if (READ_ONCE (client->in_progress)) +poll_wait (file, &ctx->wait, wait); + +if (!READ_ONCE (client->in_progress)) { +if (READ_ONCE (client->error)) + mask |=EPOLLERR ; +else + mask |=EPOLLIN |EPOLLRDNORM ; + } + } + +if (req & (EPOLLOUT |EPOLLWRNORM )) { +if (READ_ONCE (ctx->current_client)) +poll_wait (file, &ctx->wait, wait); + +if (!READ_ONCE (ctx->current_client)) + mask |=EPOLLOUT |EPOLLWRNORM ; + } + +return mask; +} + +static void aspeed_xdma_vma_close (struct vm_area_struct *vma) +{ +int rc; +struct aspeed_xdma_client *client = vma->vm_private_data; + + rc =wait_event_interruptible (client->ctx->wait, !client->in_progress); +if (rc) +return ; + +gen_pool_free (client->ctx->pool, (unsigned long )client->virt, + client->size); + + client->virt =NULL ; + client->phys =0 ; + client->size =0 ; +} + +static const struct vm_operations_struct aspeed_xdma_vm_ops = { + .close = aspeed_xdma_vma_close, +}; + +static int aspeed_xdma_mmap (struct file *file,struct vm_area_struct *vma) +{ +int rc; +struct aspeed_xdma_client *client = file->private_data; +struct aspeed_xdma *ctx = client->ctx; + +/* restrict file to one mapping */ +if (client->size) +return -EBUSY ; + + client->size = vma->vm_end - vma->vm_start; + client->virt =gen_pool_dma_alloc (ctx->pool, client->size, + &client->phys); +if (!client->virt) { + client->phys =0 ; + client->size =0 ; +return -ENOMEM ; + } + + vma->vm_pgoff = (client->phys - ctx->mem_phys) >>PAGE_SHIFT ; + vma->vm_ops = &aspeed_xdma_vm_ops; + vma->vm_private_data = client; + vma->vm_page_prot =pgprot_noncached (vma->vm_page_prot); + + rc =io_remap_pfn_range (vma, vma->vm_start, client->phys >>PAGE_SHIFT , + client->size, vma->vm_page_prot); +if (rc) { +dev_warn (ctx->dev,"mmap err: v[%08lx] to p[%08x], s[%08x]\n" , + vma->vm_start, (u32 )client->phys, client->size); + +gen_pool_free (ctx->pool, (unsigned long )client->virt, + client->size); + + client->virt =NULL ; + client->phys =0 ; + client->size =0 ; +return rc; + } + +dev_dbg (ctx->dev,"mmap: v[%08lx] to p[%08x], s[%08x]\n" , + vma->vm_start, (u32 )client->phys, client->size); + +return 0 ; +} + +static int aspeed_xdma_open (struct inode *inode,struct file *file) +{ +struct miscdevice *misc = file->private_data; + struct aspeed_xdma *ctx = container_of(misc, struct aspeed_xdma, misc); +struct aspeed_xdma_client *client =kzalloc (sizeof (*client), +GFP_KERNEL ); + +if (!client) +return -ENOMEM ; + + client->ctx = ctx; + file->private_data = client; +return 0 ; +} + +static int aspeed_xdma_release (struct inode *inode,struct file *file) +{ +struct aspeed_xdma_client *client = file->private_data; + +kfree (client); +return 0 ; +} + +static const struct file_operations aspeed_xdma_fops = { + .owner =THIS_MODULE , + .write = aspeed_xdma_write, + .poll = aspeed_xdma_poll, + .mmap = aspeed_xdma_mmap, + .open = aspeed_xdma_open, + .release = aspeed_xdma_release, +}; +static int aspeed_xdma_init_scu (struct aspeed_xdma *ctx,struct device *dev) { struct regmap *scu = syscon_regmap_lookup_by_phandle(dev->of_node,
@@ -691,6 +874,22 @@ static int aspeed_xdma_probe(struct platform_device *pdev)aspeed_xdma_init_eng (ctx); + ctx->misc.minor =MISC_DYNAMIC_MINOR ; + ctx->misc.fops = &aspeed_xdma_fops; + ctx->misc.name ="aspeed-xdma" ; + ctx->misc.parent = dev; + rc =misc_register (&ctx->misc); +if (rc) { +dev_err (dev,"Failed to register xdma miscdevice.\n" ); + +gen_pool_free (ctx->pool, (unsigned long )ctx->cmdq, +XDMA_CMDQ_SIZE ); + +reset_control_assert (ctx->reset); +clk_disable_unprepare (ctx->clock); +return rc; + } +/* * This interrupt could fire immediately so only request it once the * engine and driver are initialized.
@@ -712,6 +911,7 @@ static int aspeed_xdma_remove(struct platform_device *pdev) {struct aspeed_xdma *ctx =platform_get_drvdata (pdev); +misc_deregister (&ctx->misc);gen_pool_free (ctx->pool, (unsigned long )ctx->cmdq,XDMA_CMDQ_SIZE );reset_control_assert (ctx->reset);
Signature · 1 line
1.8.3.1
Re: [PATCH v6 07/12] soc: aspeed: xdma: Add user interface
Quoted 16 lines · Eddie James
This commits adds a miscdevice to provide a user interface to the XDMA engine. The interface provides the write operation to start DMA operations. The DMA parameters are passed as the data to the write call. The actual data to transfer is NOT passed through write. Note that both directions of DMA operation are accomplished through the write command; BMC to host and host to BMC.
The XDMA driver reserves an area of physical memory for DMA operations, as the XDMA engine is restricted to accessing certain physical memory areas on some platforms. This memory forms a pool from which users can allocate pages for their usage with calls to mmap. The space allocated by a client will be the space used in the DMA operation. For an "upstream" (BMC to host) operation, the data in the client's area will be transferred to the host. For a "downstream" (host to BMC) operation, the host data will be placed in the client's memory area.
Quoted 4 lines
Poll is also provided in order to determine when the DMA operation is complete for non-blocking IO.
Signed-off-by Eddie James <[email protected]>
Eddie James
maintainerPATCH v6 8/12 soc: aspeed: xdma: Add reset ioctl
In reply to Eddie JamesUsers of the XDMA engine need a way to reset it if something goes wrong. Problems on the host side, or user error, such as incorrect host address, may result in the DMA operation never completing and no way to determine what went wrong. Therefore, add an ioctl to reset the engine so that users can recover in this situation.
--- drivers/soc/aspeed/aspeed-xdma.c | 32 ++++++++++++++++++++++++++++++++ include/uapi/linux/aspeed-xdma.h | 4 ++++ 2 files changed, 36 insertions(+)
drivers/soc/aspeed/aspeed-xdma.c +32 -0
@@ -615,6 +615,37 @@ static __poll_t aspeed_xdma_poll(struct file *file,return mask; } +static long aspeed_xdma_ioctl (struct file *file,unsigned int cmd, +unsigned long param) +{ +unsigned long flags; +struct aspeed_xdma_client *client = file->private_data; +struct aspeed_xdma *ctx = client->ctx; + +switch (cmd) { +case ASPEED_XDMA_IOCTL_RESET : +spin_lock_irqsave (&ctx->engine_lock, flags); +if (ctx->in_reset) { +spin_unlock_irqrestore (&ctx->engine_lock, flags); +return 0 ; + } + + ctx->in_reset = true; +spin_unlock_irqrestore (&ctx->engine_lock, flags); + +if (READ_ONCE (ctx->current_client)) +dev_warn (ctx->dev, +"User reset with transfer in progress.\n" ); + +aspeed_xdma_reset (ctx); +break ; +default : +return -EINVAL ; + } + +return 0 ; +} +static void aspeed_xdma_vma_close (struct vm_area_struct *vma) {int rc;
@@ -708,6 +739,7 @@ static int aspeed_xdma_release(struct inode *inode, struct file *file) .owner = THIS_MODULE, .write = aspeed_xdma_write, .poll = aspeed_xdma_poll, + .unlocked_ioctl = aspeed_xdma_ioctl, .mmap = aspeed_xdma_mmap, .open = aspeed_xdma_open, .release = aspeed_xdma_release,
include/uapi/linux/aspeed-xdma.h +4 -0
@@ -4,8 +4,12 @@#ifndef _UAPI_LINUX_ASPEED_XDMA_H_#define _UAPI_LINUX_ASPEED_XDMA_H_ +#include <linux/ioctl.h> #include <linux/types.h> +#define __ASPEED_XDMA_IOCTL_MAGIC 0xb7 +#define ASPEED_XDMA_IOCTL_RESET _IO(__ASPEED_XDMA_IOCTL_MAGIC, 0) +/* * aspeed_xdma_direction *
Signature · 1 line
1.8.3.1
Eddie James
maintainerPATCH v6 9/12 ARM: dts: aspeed: ast2500: Add XDMA Engine
In reply to Eddie JamesAdd a node for the XDMA engine with all the necessary information.
--- arch/arm/boot/dts/aspeed-g5.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm/boot/dts/aspeed-g5.dtsi +12 -0
@@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ #include <dt-bindings/clock/aspeed-clock.h> +#include <dt-bindings/interrupt-controller/aspeed-scu-ic.h> / { model = "Aspeed BMC";
@@ -259,6 +260,17 @@ interrupts = <0x19>; }; + xdma: xdma at 1e6e7000 { + compatible = "aspeed,ast2500-xdma"; + reg = <0x1e6e7000 0x100>; + clocks = <&syscon ASPEED_CLK_GATE_BCLK>; + resets = <&syscon ASPEED_RESET_XDMA>; + interrupts-extended = <&vic 6>, <&scu_ic ASPEED_AST2500_SCU_IC_PCIE_RESET_LO_TO_HI>; + pcie-device = "bmc"; + aspeed,scu = <&syscon>; + status = "disabled"; + }; + adc: adc at 1e6e9000 { compatible = "aspeed,ast2500-adc"; reg = <0x1e6e9000 0xb0>;
Signature · 1 line
1.8.3.1
Eddie James
maintainerPATCH v6 10/12 ARM: dts: aspeed: ast2600: Add XDMA Engine
In reply to Eddie JamesAdd a node for the XDMA engine with all the necessary information.
--- arch/arm/boot/dts/aspeed-g6.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/arm/boot/dts/aspeed-g6.dtsi +13 -0
@@ -3,6 +3,7 @@ #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/clock/ast2600-clock.h> +#include <dt-bindings/interrupt-controller/aspeed-scu-ic.h> / { model = "Aspeed BMC";
@@ -291,6 +292,18 @@ quality = <100>; }; + xdma: xdma at 1e6e7000 { + compatible = "aspeed,ast2600-xdma"; + reg = <0x1e6e7000 0x100>; + clocks = <&syscon ASPEED_CLK_GATE_BCLK>; + resets = <&syscon ASPEED_RESET_DEV_XDMA>; + interrupts-extended = <&gic GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, + <&scu_ic0 ASPEED_AST2600_SCU_IC0_PCIE_PERST_LO_TO_HI>; + pcie-device = "bmc"; + aspeed,scu = <&syscon>; + status = "disabled"; + }; + gpio0: gpio at 1e780000 { #gpio-cells = <2>; gpio-controller;
Signature · 1 line
1.8.3.1
Eddie James
maintainerPATCH v6 11/12 ARM: dts: aspeed: witherspoon: Enable XDMA Engine
In reply to Eddie JamesEnable the XDMA engine node.
--- arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +6 -0
@@ -656,4 +656,10 @@ memory-region = <&video_engine_memory>; }; +&xdma { + status = "okay"; + /* 512M DRAM with 16M VRAM which is reserved at the top. */ + memory = <0x9f000000 0x01000000>; +}; + #include "ibm-power9-dual.dtsi"
Signature · 1 line
1.8.3.1
Re: [PATCH v6 11/12] ARM: dts: aspeed: witherspoon: Enable XDMA Engine
Quoted 3 lines · Eddie James
Enable the XDMA engine node.
Signed-off-by Eddie James <[email protected]>
Eddie James
maintainerPATCH v6 12/12 ARM: dts: aspeed: tacoma: Enable XDMA engine
In reply to Eddie JamesEnable the XDMA engine node.
--- arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts +6 -0
@@ -800,3 +800,9 @@ pinctrl-0 = <&pinctrl_lpc_default>, <&pinctrl_lsirq_default>; }; + +&xdma { + status = "okay"; + /* 1G DRAM with 8M VRAM which is reserved at the top. */ + memory = <0xbf800000 0x00800000>; +};
Signature · 1 line
1.8.3.1
Re: [PATCH v6 12/12] ARM: dts: aspeed: tacoma: Enable XDMA engine
Quoted 3 lines · Eddie James
Enable the XDMA engine node.
Signed-off-by Eddie James <[email protected]>
Quoted 49 lines · Eddie James
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 forin_resetbefore proceeding inO_NONBLOCKcase
- Add comments to memory sizes in the witherspoon/tacoma XDMA dts
entriesChanges since v3:
- See individual patches; just clean-up itemsChanges 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.
Quoted 4 lines
Eddie James (12):
dt-bindings: interrupt-controller: Add Aspeed SCU interrupt
controller
irqchip: Add Aspeed SCU interrupt controller
I've now queued these two patches in the irqchip tree.
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...