From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Viresh Kumar <viresh.linux@gmail.com>,
Vinod Koul <vinod.koul@intel.com>,
linux-kernel@vger.kernel.org
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCHv2 2/4] dmaengine: dw_dmac: Add PCI part of the driver
Date: Wed, 26 Sep 2012 15:40:35 +0300 [thread overview]
Message-ID: <1348663237-3237-3-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1348663237-3237-1-git-send-email-andriy.shevchenko@linux.intel.com>
From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
This is the PCI part of the DesignWare DMAC driver. The controller is usually
used in the Intel hardware such as Medfield.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/dma/Kconfig | 9 ++++
drivers/dma/Makefile | 1 +
drivers/dma/dw_dmac_pci.c | 127 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 137 insertions(+)
create mode 100644 drivers/dma/dw_dmac_pci.c
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 75cdcb5..fad6ed2 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -88,6 +88,15 @@ config DW_DMAC
Support the Synopsys DesignWare AHB DMA controller. This
can be integrated in chips such as the Atmel AT32ap7000.
+config DW_DMAC_PCI
+ tristate "Synopsys DesignWare AHB DMA support (PCI bus)"
+ depends on PCI
+ select DW_DMAC
+ help
+ Support the Synopsys DesignWare AHB DMA controller on the platfroms
+ that provide it as a PCI device. For example, Intel Medfield has
+ integrated this GPDMA controller.
+
config AT_HDMAC
tristate "Atmel AHB DMA support"
depends on ARCH_AT91
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index 7428fea..15eef5f 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_FSL_DMA) += fsldma.o
obj-$(CONFIG_MPC512X_DMA) += mpc512x_dma.o
obj-$(CONFIG_MV_XOR) += mv_xor.o
obj-$(CONFIG_DW_DMAC) += dw_dmac.o
+obj-$(CONFIG_DW_DMAC_PCI) += dw_dmac_pci.o
obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
obj-$(CONFIG_MX3_IPU) += ipu/
obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
diff --git a/drivers/dma/dw_dmac_pci.c b/drivers/dma/dw_dmac_pci.c
new file mode 100644
index 0000000..95570df
--- /dev/null
+++ b/drivers/dma/dw_dmac_pci.c
@@ -0,0 +1,127 @@
+/*
+ * PCI driver for the Synopsys DesignWare DMA Controller
+ *
+ * Copyright (C) 2012 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/platform_device.h>
+#include <linux/dw_dmac.h>
+
+#define DRIVER(_is_private, _chan_order, _chan_pri) \
+ ((kernel_ulong_t)&(struct dw_dma_platform_data) { \
+ .is_private = (_is_private), \
+ .chan_allocation_order = (_chan_order), \
+ .chan_priority = (_chan_pri), \
+ })
+
+static int __devinit dw_pci_probe(struct pci_dev *pdev,
+ const struct pci_device_id *id)
+{
+ struct platform_device *pd;
+ struct resource r[2];
+ struct dw_dma_platform_data *driver = (void *)id->driver_data;
+ static int instance;
+ int ret;
+
+ ret = pci_enable_device(pdev);
+ if (ret)
+ return ret;
+
+ pci_set_power_state(pdev, PCI_D0);
+ pci_set_master(pdev);
+ pci_try_set_mwi(pdev);
+
+ ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+ if (ret)
+ goto err0;
+
+ ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
+ if (ret)
+ goto err0;
+
+ pd = platform_device_alloc("dw_dmac", instance);
+ if (!pd) {
+ dev_err(&pdev->dev, "can't allocate dw_dmac platform device\n");
+ ret = -ENOMEM;
+ goto err0;
+ }
+
+ memset(r, 0, sizeof(r));
+
+ r[0].start = pci_resource_start(pdev, 0);
+ r[0].end = pci_resource_end(pdev, 0);
+ r[0].flags = IORESOURCE_MEM;
+
+ r[1].start = pdev->irq;
+ r[1].flags = IORESOURCE_IRQ;
+
+ ret = platform_device_add_resources(pd, r, ARRAY_SIZE(r));
+ if (ret) {
+ dev_err(&pdev->dev, "can't add resources to platform device\n");
+ goto err1;
+ }
+
+ ret = platform_device_add_data(pd, driver, sizeof(*driver));
+ if (ret)
+ goto err1;
+
+ dma_set_coherent_mask(&pd->dev, pdev->dev.coherent_dma_mask);
+ pd->dev.dma_mask = pdev->dev.dma_mask;
+ pd->dev.dma_parms = pdev->dev.dma_parms;
+ pd->dev.parent = &pdev->dev;
+
+ pci_set_drvdata(pdev, pd);
+
+ ret = platform_device_add(pd);
+ if (ret) {
+ dev_err(&pdev->dev, "platform_device_add failed\n");
+ goto err1;
+ }
+
+ instance++;
+ return 0;
+
+err1:
+ platform_device_put(pd);
+err0:
+ pci_disable_device(pdev);
+
+ return ret;
+}
+
+static void __devexit dw_pci_remove(struct pci_dev *pdev)
+{
+ struct platform_device *pd = pci_get_drvdata(pdev);
+
+ platform_device_unregister(pd);
+ pci_set_drvdata(pdev, NULL);
+ pci_disable_device(pdev);
+}
+
+static DEFINE_PCI_DEVICE_TABLE(dw_pci_id_table) = {
+ { PCI_VDEVICE(INTEL, 0x0827), DRIVER(1, 0, 0) },
+ { PCI_VDEVICE(INTEL, 0x0830), DRIVER(1, 0, 0) },
+ { PCI_VDEVICE(INTEL, 0x0f06), DRIVER(1, 0, 0) },
+ { 0, }
+};
+MODULE_DEVICE_TABLE(pci, dw_pci_id_table);
+
+static struct pci_driver dw_pci_driver = {
+ .name = "dw_dmac_pci",
+ .id_table = dw_pci_id_table,
+ .probe = dw_pci_probe,
+ .remove = __devexit_p(dw_pci_remove),
+};
+
+module_pci_driver(dw_pci_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("DesignWare DMAC PCI driver");
+MODULE_AUTHOR("Heikki Krogerus <heikki.krogerus@linux.intel.com>");
+MODULE_AUTHOR("Andy Shevchenko <andriy.shevchenko@linux.intel.com>");
--
1.7.10.4
next prev parent reply other threads:[~2012-09-26 12:40 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 12:13 [PATCHv1 0/6] dw_dmac: split the driver and introduce PCI part Andy Shevchenko
2012-09-25 12:13 ` [PATCHv1 1/6] dmaengine: dw_dmac: Remove clk API dependency Andy Shevchenko
2012-09-26 3:42 ` viresh kumar
2012-09-26 12:33 ` Andy Shevchenko
2012-09-25 12:13 ` [PATCHv1 2/6] dmaengine: dw_dmac: add driver for Atmel AT32 Andy Shevchenko
2012-09-26 3:50 ` viresh kumar
2012-09-26 6:47 ` Andy Shevchenko
2012-09-26 6:51 ` viresh kumar
2012-09-26 6:56 ` Andy Shevchenko
2012-09-26 3:52 ` viresh kumar
2012-09-25 12:13 ` [PATCHv1 3/6] dmaengine: dw_dmac: Add PCI part of the driver Andy Shevchenko
2012-09-26 4:00 ` viresh kumar
2012-09-26 7:48 ` Andy Shevchenko
2012-09-25 12:13 ` [PATCHv1 4/6] avr32: at32ap700x: rename DMA controller Andy Shevchenko
2012-09-25 12:13 ` [PATCHv1 5/6] MAINTAINERS: fix indentation for Viresh Kumar Andy Shevchenko
2012-09-26 3:36 ` viresh kumar
2012-09-26 7:10 ` Andy Shevchenko
2012-09-25 12:13 ` [PATCHv1 6/6] MAINTAINERS: add recently created files to dw_dmac section Andy Shevchenko
2012-09-25 13:19 ` Joe Perches
2012-09-25 13:37 ` Andy Shevchenko
2012-09-25 15:33 ` Vinod Koul
2012-09-25 16:57 ` Joe Perches
2012-09-26 6:44 ` Andy Shevchenko
2012-09-26 3:39 ` viresh kumar
2012-09-26 12:40 ` [PATCHv2 0/4] dw_dmac: split the driver and introduce PCI part Andy Shevchenko
2012-09-26 12:40 ` [PATCHv2 1/4] dmaengine: dw_dmac: convert to platform driver Andy Shevchenko
2012-09-26 14:13 ` viresh kumar
2012-09-26 18:00 ` Andy Shevchenko
2012-09-27 3:47 ` viresh kumar
2012-09-26 12:40 ` Andy Shevchenko [this message]
2012-09-26 14:33 ` [PATCHv2 2/4] dmaengine: dw_dmac: Add PCI part of the driver viresh kumar
2012-09-26 17:55 ` Andy Shevchenko
2012-09-26 19:41 ` Arnd Bergmann
2012-09-27 3:53 ` viresh kumar
2012-09-27 7:41 ` Arnd Bergmann
2012-09-27 14:22 ` Vinod Koul
2012-09-27 14:42 ` Arnd Bergmann
2012-09-26 12:40 ` [PATCHv2 3/4] dma: move dw_dmac driver to an own directory Andy Shevchenko
2012-09-26 14:53 ` viresh kumar
2012-09-26 17:50 ` Andy Shevchenko
2012-09-26 12:40 ` [PATCHv2 4/4] MAINTAINERS: add recently created files to dw_dmac section Andy Shevchenko
2012-09-26 14:45 ` viresh kumar
2012-09-26 14:48 ` viresh kumar
2012-09-26 17:49 ` Andy Shevchenko
2012-09-27 6:38 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348663237-3237-3-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=vinod.koul@intel.com \
--cc=viresh.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox