drivers/soc: Add Aspeed XDMA Engine Driver
Subsystems (2)
v4 cover drivers/soc: Add Aspeed XDMA Engine Driver
The XDMA engine embedded in the AST2500 SOC performs PCI DMA operations between the SOC (acting as a BMC) and a host processor in a server.
This series adds a driver to control the XDMA engine in order to easily perform DMA operations to and from the host processor.
Changes since v3:
- Added a few comments.
- Change DMA reservation/allocation/mmap to iomap operations.
- Change miscdevice to "aspeed-xdma".
- Change default PCI device to the BMC device, not the VGA.
- Use length-limited string functions (strncpy, strncasecmp)
- Added more debugfs registers
Changes since v2:
- Switch to one pci device config sysfs file
- Add documentation for pci device config sysfs file
- Add module parameter for pci device config
- Switch to genalloc instead of custom allocator
- Fix alignment of user structure
- Cleaned up debugfs functions
I previously sent this series v1 to drivers/misc, but I'm now fairly certain it belongs in drivers/soc, especially since the other Aspeed drivers have been moved to soc.
Changes since v1:
- Correct the XDMA command pitch
- Don't use packed for the aspeed_xdma_op structure
- Correct the SCU PCI config change
Eddie James (8):
dt-bindings: soc: Add Aspeed XDMA engine binding documentation drivers/soc: Add Aspeed XDMA Engine Driver drivers/soc: xdma: Add user interface
Documentation: ABI: Add aspeed-xdma sysfs documentation drivers/soc: xdma: Add PCI device configuration sysfs drivers/soc: xdma: Add debugfs entries
ARM: dts: aspeed: Add XDMA Engine
ARM: dts: aspeed: witherspoon: Enable XDMA Engine
.../ABI/testing/sysfs-devices-platform-aspeed-xdma | 11 + .../devicetree/bindings/soc/aspeed/xdma.txt | 23 + MAINTAINERS | 9 + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 4 + arch/arm/boot/dts/aspeed-g5.dtsi | 8 + drivers/soc/aspeed/Kconfig | 8 + drivers/soc/aspeed/Makefile | 1 + drivers/soc/aspeed/aspeed-xdma.c | 953 +++++++++++++++++++++ include/uapi/linux/aspeed-xdma.h | 26 + 9 files changed, 1043 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-devices-platform-aspeed-xdma create mode 100644 Documentation/devicetree/bindings/soc/aspeed/xdma.txt create mode 100644 drivers/soc/aspeed/aspeed-xdma.c create mode 100644 include/uapi/linux/aspeed-xdma.h
Signature · 1 line
1.8.3.1
PATCH v4 1/8 dt-bindings: soc: Add Aspeed XDMA engine binding documentation
Document the bindings.
--- .../devicetree/bindings/soc/aspeed/xdma.txt | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Documentation/devicetree/bindings/soc/aspeed/xdma.txt
Documentation/devicetree/bindings/soc/aspeed/xdma.txt new file +23 -0
@@ -0,0 +1,23 @@ +* Device tree bindings for the Aspeed XDMA Engine + +The XDMA Engine embedded in the AST2500 SOC can perform automatic DMA +operations over PCI between the AST2500 (acting as a BMC) and a host processor. + +Required properties: + + - compatible "aspeed,ast2500-xdma" + - reg contains the offset and length of the memory region + assigned to the XDMA registers + - resets reset specifier for the syscon reset associated with + the XDMA engine + - interrupts the interrupt associated with the XDMA engine on this + platform + +Example: + + xdma at 1e6e7000 { + compatible = "aspeed,ast2500-xdma"; + reg = <0x1e6e7000 0x100>; + resets = <&syscon ASPEED_RESET_XDMA>; + interrupts = <6>; + };
Signature · 1 line
1.8.3.1
Re: [PATCH v4 1/8] dt-bindings: soc: Add Aspeed XDMA engine binding documentation
Quoted 9 lines · Eddie James
Document the bindings.
Reviewed-by Andrew Jeffrey <[email protected]>Signed-off-by Eddie James <[email protected]>--- .../devicetree/bindings/soc/aspeed/xdma.txt | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Documentation/devicetree/bindings/soc/aspeed/xdma.txt
PATCH v4 2/8 drivers/soc: Add Aspeed XDMA Engine Driver
In reply to Eddie JamesThe XDMA engine embedded in the AST2500 SOC 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 | 9 + drivers/soc/aspeed/Kconfig | 8 + drivers/soc/aspeed/Makefile | 1 + drivers/soc/aspeed/aspeed-xdma.c | 528 +++++++++++++++++++++++++++++++++++++++ include/uapi/linux/aspeed-xdma.h | 26 ++ 5 files changed, 572 insertions(+) create mode 100644 drivers/soc/aspeed/aspeed-xdma.c create mode 100644 include/uapi/linux/aspeed-xdma.h
MAINTAINERS +9 -0
@@ -2612,6 +2612,15 @@ 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) +L: linux-kernel at vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/misc/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]> L: acpi4asus-user at lists.sourceforge.net
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 (ARCH_ASPEED || COMPILE_TEST) && REGMAP && MFD_SYSCON && HAS_DMA + help + Enable support for the Aspeed XDMA Engine found on the Aspeed AST2500 + SOC. The XDMA engine can perform automatic PCI DMA operations between + the AST2500 (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 +528 -0
528 lines not on this page · raw message
include/uapi/linux/aspeed-xdma.h new file +26 -0
@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* Copyright IBM Corp 2019 */ + +#ifndef _UAPI_LINUX_ASPEED_XDMA_H_ +#define _UAPI_LINUX_ASPEED_XDMA_H_ + +#include <linux/types.h> + +/* +* 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; it should be a multiple of 16 bytes +* +* upstream: boolean indicating the direction of the DMA operation; upstream +* means a transfer from the BMC to the host +*/ +struct aspeed_xdma_op { +__u64 host_addr; +__u32 len; +__u32 upstream; +}; + +#endif /* _UAPI_LINUX_ASPEED_XDMA_H_ */
Signature · 1 line
1.8.3.1
PATCH v4 3/8 drivers/soc: 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 engine is restricted to only accessing the reserved memory space on the AST2500, typically used by the VGA. For this reason, the VGA memory space is pooled and allocated with genalloc. Users calling mmap allocate pages from this pool for their usage. 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
@@ -157,6 +157,8 @@ struct aspeed_xdma {unsigned long flags;unsigned int cmd_idx; +struct mutex list_lock; +struct mutex start_lock;wait_queue_head_t wait;struct aspeed_xdma_client *current_client;
@@ -167,6 +169,8 @@ struct aspeed_xdma {dma_addr_t cmdq_vga_phys;void *cmdq_vga_virt;struct gen_pool *vga_pool; + +struct miscdevice misc; };struct aspeed_xdma_client {
@@ -358,6 +362,184 @@ static irqreturn_t aspeed_xdma_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; +struct aspeed_xdma_op op; +struct aspeed_xdma_client *client = file->private_data; +struct aspeed_xdma *ctx = client->ctx; +u32 offs = client->phys ? (client->phys - ctx->vga_phys) : +XDMA_CMDQ_SIZE ; + +if (len !=sizeof (struct aspeed_xdma_op )) +return -EINVAL ; + + rc =copy_from_user (&op, buf, len); +if (rc) +return rc; + +if (op.len > (ctx->vga_size - offs) || op.len <XDMA_BYTE_ALIGN ) +return -EINVAL ; + +if (file->f_flags &O_NONBLOCK ) { +if (!mutex_trylock (&ctx->start_lock)) +return -EAGAIN ; + +if (test_bit (XDMA_IN_PRG , &ctx->flags)) { +mutex_unlock (&ctx->start_lock); +return -EAGAIN ; + } + }else { +mutex_lock (&ctx->start_lock); + + rc =wait_event_interruptible (ctx->wait, + !test_bit (XDMA_IN_PRG , + &ctx->flags)); +if (rc) { +mutex_unlock (&ctx->start_lock); +return -EINTR ; + } + } + + ctx->current_client = client; +set_bit (XDMA_IN_PRG , &client->flags); + +aspeed_xdma_start (ctx, &op, ctx->vga_phys + offs); + +mutex_unlock (&ctx->start_lock); + +if (!(file->f_flags &O_NONBLOCK )) { + rc =wait_event_interruptible (ctx->wait, + !test_bit (XDMA_IN_PRG , + &ctx->flags)); +if (rc) +return -EINTR ; + } + +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 (test_bit (XDMA_IN_PRG , &client->flags)) +poll_wait (file, &ctx->wait, wait); + +if (!test_bit (XDMA_IN_PRG , &client->flags)) + mask |=EPOLLIN |EPOLLRDNORM ; + } + +if (req & (EPOLLOUT |EPOLLWRNORM )) { +if (test_bit (XDMA_IN_PRG , &ctx->flags)) +poll_wait (file, &ctx->wait, wait); + +if (!test_bit (XDMA_IN_PRG , &ctx->flags)) + mask |=EPOLLOUT |EPOLLWRNORM ; + } + +return mask; +} + +static void aspeed_xdma_vma_close (struct vm_area_struct *vma) +{ +struct aspeed_xdma_client *client = vma->vm_private_data; + +gen_pool_free (client->ctx->vga_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 -ENOMEM ; + + client->size = vma->vm_end - vma->vm_start; + client->virt =gen_pool_dma_alloc (ctx->vga_pool, client->size, + &client->phys); +if (!client->virt) { + client->phys =0 ; + client->size =0 ; +return -ENOMEM ; + } + + vma->vm_pgoff = (client->phys - ctx->vga_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) { +gen_pool_free (ctx->vga_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; + +if (client->ctx->current_client == client) + client->ctx->current_client =NULL ; + +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_mem (struct aspeed_xdma *ctx) {int rc;
@@ -441,6 +623,8 @@ static int aspeed_xdma_probe(struct platform_device *pdev) ctx->dev = dev;platform_set_drvdata (pdev, ctx);init_waitqueue_head (&ctx->wait); +mutex_init (&ctx->list_lock); +mutex_init (&ctx->start_lock); res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); ctx->base =devm_ioremap_resource (dev, res);
@@ -492,6 +676,21 @@ 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,"Unable to register xdma miscdevice.\n" ); + +gen_pool_free (ctx->vga_pool, (unsigned long )ctx->cmdq_vga_virt, +XDMA_CMDQ_SIZE ); +iounmap (ctx->vga_virt); +reset_control_assert (ctx->reset); +return rc; + } +return 0 ; }
@@ -499,6 +698,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->vga_pool, (unsigned long )ctx->cmdq_vga_virt,XDMA_CMDQ_SIZE );iounmap (ctx->vga_virt);
Signature · 1 line
1.8.3.1
PATCH v4 4/8 Documentation: ABI: Add aspeed-xdma sysfs documentation
In reply to Eddie JamesDocument the pcidev sysfs attribute used by the aspeed-xdma driver.
--- Documentation/ABI/testing/sysfs-devices-platform-aspeed-xdma | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-devices-platform-aspeed-xdma
Documentation/ABI/testing/sysfs-devices-platform-aspeed-xdma new file +11 -0
@@ -0,0 +1,11 @@ +What: /sys/bus/platform/devices/1e6e7000.xdma/pcidev +Date: May 2019 +KernelVersion: 5.2 +Contact: Eddie James <[email protected]> +Description: When written, this file sets the PCI device that will be used + for DMA operations by the XDMA engine. When read, it provides + the current PCI device being used by the XDMA engine. + Valid values: vga or bmc. + Default bmc, can be set by aspeed-xdma.pcidev= module + parameter. +Users: aspeed-xdma driver
Signature · 1 line
1.8.3.1
PATCH v4 5/8 drivers/soc: xdma: Add PCI device configuration sysfs
In reply to Eddie JamesThe AST2500 has two PCI devices embedded. The XDMA engine can use either device to perform DMA transfers. Users need the capability to choose which device to use. This commit therefore adds a sysfs file that can toggle the AST2500 and XDMA engine between the two PCI devices.
--- drivers/soc/aspeed/aspeed-xdma.c | 103 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 100 insertions(+), 3 deletions(-)
drivers/soc/aspeed/aspeed-xdma.c +100 -3
@@ -170,6 +170,7 @@ struct aspeed_xdma {void *cmdq_vga_virt;struct gen_pool *vga_pool; +char pcidev[4 ];struct miscdevice misc; };
@@ -192,6 +193,10 @@ struct aspeed_xdma_client {SCU_PCIE_CONF_VGA_EN_IRQ |SCU_PCIE_CONF_VGA_EN_DMA |SCU_PCIE_CONF_RSVD ; +static char *_pcidev ="bmc" ; +module_param_named (pcidev, _pcidev, charp,0600 ); +MODULE_PARM_DESC (pcidev,"Default PCI device used by XDMA engine for DMA ops" ); +static void aspeed_scu_pcie_write (struct aspeed_xdma *ctx,u32 conf) {u32 v =0 ;
@@ -540,7 +545,7 @@ static int aspeed_xdma_release(struct inode *inode, struct file *file) .release = aspeed_xdma_release, }; -static int aspeed_xdma_init_mem (struct aspeed_xdma *ctx) +static int aspeed_xdma_init_mem (struct aspeed_xdma *ctx,u32 conf) {int rc;u32 scu_conf =0 ;
@@ -550,7 +555,7 @@ static int aspeed_xdma_init_mem(struct aspeed_xdma *ctx)const u32 vga_sizes[4 ] = {0x800000 ,0x1000000 ,0x2000000 ,0x4000000 };void __iomem *sdmc_base =ioremap (0x1e6e0000 ,0x100 ); -aspeed_scu_pcie_write (ctx, aspeed_xdma_bmc_pcie_conf); +aspeed_scu_pcie_write (ctx, conf);regmap_write (ctx->scu,SCU_BMC_CLASS_REV ,SCU_BMC_CLASS_REV_XDMA );
@@ -609,10 +614,91 @@ static int aspeed_xdma_init_mem(struct aspeed_xdma *ctx)return 0 ; } +static int aspeed_xdma_change_pcie_conf (struct aspeed_xdma *ctx,u32 conf) +{ +int rc; + +mutex_lock (&ctx->start_lock); + rc =wait_event_interruptible_timeout (ctx->wait, + !test_bit (XDMA_IN_PRG , + &ctx->flags), +msecs_to_jiffies (1000 )); +if (rc <0 ) { +mutex_unlock (&ctx->start_lock); +return -EINTR ; + } + +/* Previous operation didn't complete; wake up waiters anyway. */ +if (!rc) +wake_up_interruptible_all (&ctx->wait); + +reset_control_assert (ctx->reset); +msleep (XDMA_RESET_TIME_MS ); + +aspeed_scu_pcie_write (ctx, conf); +msleep (XDMA_RESET_TIME_MS ); + +reset_control_deassert (ctx->reset); +msleep (XDMA_RESET_TIME_MS ); + +aspeed_xdma_init_eng (ctx); + +mutex_unlock (&ctx->start_lock); + +return 0 ; +} + +static int aspeed_xdma_pcidev_to_conf (struct aspeed_xdma *ctx, +const char *pcidev,u32 *conf) +{ +if (!strncasecmp (pcidev,"vga" ,3 )) { + *conf = aspeed_xdma_vga_pcie_conf; +return 0 ; + } + +if (!strncasecmp (pcidev,"bmc" ,3 )) { + *conf = aspeed_xdma_bmc_pcie_conf; +return 0 ; + } + +return -EINVAL ; +} + +static ssize_t aspeed_xdma_show_pcidev (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct aspeed_xdma *ctx =dev_get_drvdata (dev); + +return snprintf (buf,PAGE_SIZE -1 ,"%s\n" , ctx->pcidev); +} + +static ssize_t aspeed_xdma_store_pcidev (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t count) +{ +u32 conf; +struct aspeed_xdma *ctx =dev_get_drvdata (dev); +int rc =aspeed_xdma_pcidev_to_conf (ctx, buf, &conf); + +if (rc) +return rc; + + rc =aspeed_xdma_change_pcie_conf (ctx, conf); +if (rc) +return rc; + +strncpy (ctx->pcidev, buf,3 ); +return count; +} +static DEVICE_ATTR(pcidev, 0644, aspeed_xdma_show_pcidev, + aspeed_xdma_store_pcidev); +static int aspeed_xdma_probe (struct platform_device *pdev) {int irq;int rc; +u32 conf;struct resource *res;struct device *dev = &pdev->dev;struct aspeed_xdma *ctx =devm_kzalloc (dev,sizeof (*ctx),GFP_KERNEL );
@@ -668,7 +754,14 @@ static int aspeed_xdma_probe(struct platform_device *pdev)msleep (XDMA_RESET_TIME_MS ); - rc =aspeed_xdma_init_mem (ctx); +if (aspeed_xdma_pcidev_to_conf (ctx, _pcidev, &conf)) { + conf = aspeed_xdma_bmc_pcie_conf; +strncpy (ctx->pcidev,"bmc" ,3 ); + }else { +strncpy (ctx->pcidev, _pcidev,3 ); + } + + rc =aspeed_xdma_init_mem (ctx, conf);if (rc) {reset_control_assert (ctx->reset);return rc;
@@ -691,6 +784,8 @@ static int aspeed_xdma_probe(struct platform_device *pdev)return rc; } +device_create_file (dev, &dev_attr_pcidev); +return 0 ; }
@@ -698,6 +793,8 @@ static int aspeed_xdma_remove(struct platform_device *pdev) {struct aspeed_xdma *ctx =platform_get_drvdata (pdev); +device_remove_file (ctx->dev, &dev_attr_pcidev); +misc_deregister (&ctx->misc);gen_pool_free (ctx->vga_pool, (unsigned long )ctx->cmdq_vga_virt,XDMA_CMDQ_SIZE );
Signature · 1 line
1.8.3.1
PATCH v4 6/8 drivers/soc: xdma: Add debugfs entries
In reply to Eddie JamesAdd debugfs entries for the relevant XDMA engine registers and for dumping the AST2500 reserved memory space.
--- drivers/soc/aspeed/aspeed-xdma.c | 128 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+)
drivers/soc/aspeed/aspeed-xdma.c +128 -0
@@ -172,6 +172,12 @@ struct aspeed_xdma {char pcidev[4 ];struct miscdevice misc; +struct dentry *debugfs_dir; + +#if IS_ENABLED (CONFIG_DEBUG_FS ) +struct debugfs_regset32 regset; +struct debugfs_reg32 regs[XDMA_NUM_DEBUGFS_REGS ]; +#endif /* IS_ENABLED(CONFIG_DEBUG_FS) */ };struct aspeed_xdma_client {
@@ -614,6 +620,126 @@ static int aspeed_xdma_init_mem(struct aspeed_xdma *ctx, u32 conf)return 0 ; } +static ssize_t aspeed_xdma_debugfs_vga_read (struct file *file, +char __user *buf,size_t len, +loff_t *offset) +{ +int rc = -ENOMEM ; +struct inode *inode =file_inode (file); +struct aspeed_xdma *ctx = inode->i_private; +loff_t offs = *offset; +void *tmp; + +if (len + offs > ctx->vga_size) { +if (offs < ctx->vga_size) + len = ctx->vga_size - offs; +else +return 0 ; + } + + tmp =kzalloc (len,GFP_KERNEL ); +if (!tmp) +return rc; + +memcpy_fromio (tmp, ctx->vga_virt + offs, len); + + rc =copy_to_user (buf, tmp, len); +if (rc) + goto free; + + *offset = offs + len; + rc = len; + +free: +kfree (tmp); + +return rc; +} + +static const struct file_operations aspeed_xdma_debugfs_vga_fops = { + .owner =THIS_MODULE , + .llseek = generic_file_llseek, + .read = aspeed_xdma_debugfs_vga_read, +}; + +static void aspeed_xdma_init_debugfs (struct aspeed_xdma *ctx) +{ +if (!IS_ENABLED (CONFIG_DEBUG_FS )) +return ; + + ctx->debugfs_dir =debugfs_create_dir (DEVICE_NAME ,NULL ); +if (IS_ERR (ctx->debugfs_dir)) { +dev_warn (ctx->dev,"Failed to create debugfs directory.\n" ); +return ; + } + +debugfs_create_file ("vga" ,0444 , ctx->debugfs_dir, ctx, + &aspeed_xdma_debugfs_vga_fops); + + ctx->regs[0 ].name ="host_q_addr31" ; + ctx->regs[0 ].offset =XDMA_HOST_CMD_QUEUE_ADDR0 ; + ctx->regs[1 ].name ="host_q_addr63" ; + ctx->regs[1 ].offset =XDMA_HOST_CMD_QUEUE_ADDR1 ; + ctx->regs[2 ].name ="host_q_endp" ; + ctx->regs[2 ].offset =XDMA_HOST_CMD_QUEUE_ENDP ; + ctx->regs[3 ].name ="host_q_writep" ; + ctx->regs[3 ].offset =XDMA_HOST_CMD_QUEUE_WRITEP ; + ctx->regs[4 ].name ="host_q_readp" ; + ctx->regs[4 ].offset =XDMA_HOST_CMD_QUEUE_READP ; + ctx->regs[5 ].name ="bmc_q_addr" ; + ctx->regs[5 ].offset =XDMA_BMC_CMD_QUEUE_ADDR ; + ctx->regs[6 ].name ="bmc_q_endp" ; + ctx->regs[6 ].offset =XDMA_BMC_CMD_QUEUE_ENDP ; + ctx->regs[7 ].name ="bmc_q_writep" ; + ctx->regs[7 ].offset =XDMA_BMC_CMD_QUEUE_WRITEP ; + ctx->regs[8 ].name ="bmc_q_readp" ; + ctx->regs[8 ].offset =XDMA_BMC_CMD_QUEUE_READP ; + ctx->regs[9 ].name ="control" ; + ctx->regs[9 ].offset =XDMA_CTRL ; + ctx->regs[10 ].name ="status" ; + ctx->regs[10 ].offset =XDMA_STATUS ; + ctx->regs[11 ].name ="ds_frame_size" ; + ctx->regs[11 ].offset =XDMA_DS_FRAME_SIZE ; + ctx->regs[12 ].name ="probe_ds_pcie" ; + ctx->regs[12 ].offset =XDMA_PROBE_DS_PCIE ; + ctx->regs[13 ].name ="probe_us_pcie" ; + ctx->regs[13 ].offset =XDMA_PROBE_US_PCIE ; + ctx->regs[14 ].name ="inprg_ds1" ; + ctx->regs[14 ].offset =XDMA_INPRG_DS_CMD1 ; + ctx->regs[15 ].name ="inprg_ds2" ; + ctx->regs[15 ].offset =XDMA_INPRG_DS_CMD2 ; + ctx->regs[16 ].name ="inprg_us031" ; + ctx->regs[16 ].offset =XDMA_INPRG_US_CMD00 ; + ctx->regs[17 ].name ="inprg_us063" ; + ctx->regs[17 ].offset =XDMA_INPRG_US_CMD01 ; + ctx->regs[18 ].name ="inprg_us131" ; + ctx->regs[18 ].offset =XDMA_INPRG_US_CMD10 ; + ctx->regs[19 ].name ="inprg_us163" ; + ctx->regs[19 ].offset =XDMA_INPRG_US_CMD11 ; + ctx->regs[20 ].name ="inprg_us231" ; + ctx->regs[20 ].offset =XDMA_INPRG_US_CMD20 ; + ctx->regs[21 ].name ="inprg_us263" ; + ctx->regs[21 ].offset =XDMA_INPRG_US_CMD21 ; + ctx->regs[22 ].name ="vga_q_addr31" ; + ctx->regs[22 ].offset =XDMA_VGA_CMD_QUEUE_ADDR0 ; + ctx->regs[23 ].name ="vga_q_addr63" ; + ctx->regs[23 ].offset =XDMA_VGA_CMD_QUEUE_ADDR1 ; + ctx->regs[24 ].name ="vga_q_endp" ; + ctx->regs[24 ].offset =XDMA_VGA_CMD_QUEUE_ENDP ; + ctx->regs[25 ].name ="vga_q_writep" ; + ctx->regs[25 ].offset =XDMA_VGA_CMD_QUEUE_WRITEP ; + ctx->regs[26 ].name ="vga_q_readp" ; + ctx->regs[26 ].offset =XDMA_VGA_CMD_QUEUE_READP ; + ctx->regs[27 ].name ="vga_cmd_status" ; + ctx->regs[27 ].offset =XDMA_VGA_CMD_STATUS ; + + ctx->regset.regs = ctx->regs; + ctx->regset.nregs =XDMA_NUM_DEBUGFS_REGS ; + ctx->regset.base = ctx->base; + +debugfs_create_regset32 ("regs" ,0444 , ctx->debugfs_dir, &ctx->regset); +} +static int aspeed_xdma_change_pcie_conf (struct aspeed_xdma *ctx,u32 conf) {int rc;
@@ -785,6 +911,7 @@ static int aspeed_xdma_probe(struct platform_device *pdev) }device_create_file (dev, &dev_attr_pcidev); +aspeed_xdma_init_debugfs (ctx);return 0 ; }
@@ -793,6 +920,7 @@ static int aspeed_xdma_remove(struct platform_device *pdev) {struct aspeed_xdma *ctx =platform_get_drvdata (pdev); +debugfs_remove_recursive (ctx->debugfs_dir);device_remove_file (ctx->dev, &dev_attr_pcidev);misc_deregister (&ctx->misc);
Signature · 1 line
1.8.3.1
PATCH v4 7/8 ARM: dts: aspeed: 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 | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/boot/dts/aspeed-g5.dtsi +8 -0
@@ -243,6 +243,14 @@ interrupts = <0x19>; }; + xdma: xdma at 1e6e7000 { + compatible = "aspeed,ast2500-xdma"; + reg = <0x1e6e7000 0x100>; + resets = <&syscon ASPEED_RESET_XDMA>; + interrupts = <6>; + status = "disabled"; + }; + adc: adc at 1e6e9000 { compatible = "aspeed,ast2500-adc"; reg = <0x1e6e9000 0xb0>;
Signature · 1 line
1.8.3.1
PATCH v4 8/8 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 | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +4 -0
@@ -653,4 +653,8 @@ memory-region = <&video_engine_memory>; }; +&xdma { + status = "okay"; +}; + #include "ibm-power9-dual.dtsi"
Signature · 1 line
1.8.3.1