Re: [PATCH v5 7/9] ARM: davinci: Remoteproc platform device creation data/code
On 1/11/2013 5:53 AM, Robert Tivy wrote:
Added a new remoteproc platform device for DA8XX. Contains CMA-based
reservation of physical memory block. A new kernel command-line
parameter has been added to allow boot-time specification of the
physical memory block.
Signed-off-by: Robert Tivy rt...@ti.com
---
Documentation/kernel-parameters.txt|7 +++
arch/arm/mach-davinci/devices-da8xx.c | 93
+++-
arch/arm/mach-davinci/include/mach/da8xx.h |4 ++
3 files changed, 103 insertions(+), 1 deletion(-)
diff --git a/Documentation/kernel-parameters.txt
b/Documentation/kernel-parameters.txt
index 363e348..e95afb1 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -44,6 +44,7 @@ parameter is applicable:
AVR32 AVR32 architecture is enabled.
AX25Appropriate AX.25 support is enabled.
BLACKFIN Blackfin architecture is enabled.
+ CMA Contiguous Memory Area support is enabled.
DRM Direct Rendering Management support is enabled.
DYNAMIC_DEBUG Build in debug messages and enable them at runtime
EDD BIOS Enhanced Disk Drive Services (EDD) is enabled
@@ -2634,6 +2635,12 @@ bytes respectively. Such letter suffixes can also be
entirely omitted.
Useful for devices that are detected asynchronously
(e.g. USB and MMC devices).
+ rproc_mem=nn[KMG][@address]
+ [KNL,ARM,CMA] Remoteproc physical memory block.
+ Memory area to be used by remote processor image,
+ managed by CMA. Suitable defaults exist if not
+ specified.
There are no defaults now, right?
+
rw [KNL] Mount root device read-write on boot
S [KNL] Run init in single mode
diff --git a/arch/arm/mach-davinci/devices-da8xx.c
b/arch/arm/mach-davinci/devices-da8xx.c
index fb2f51b..e8016ca 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -12,10 +12,11 @@
*/
#include linux/init.h
#include linux/platform_device.h
-#include linux/dma-mapping.h
+#include linux/dma-contiguous.h
#include linux/serial_8250.h
#include linux/ahci_platform.h
#include linux/clk.h
+#include linux/platform_data/da8xx-remoteproc.h
#include mach/cputype.h
#include mach/common.h
@@ -706,6 +707,96 @@ int __init da850_register_mmcsd1(struct
davinci_mmc_config *config)
}
#endif
+static struct resource da8xx_rproc_resources[] = {
+ { /* DSP boot address */
+ .start = DA8XX_SYSCFG0_BASE + DA8XX_HOST1CFG_REG,
+ .end= DA8XX_SYSCFG0_BASE + DA8XX_HOST1CFG_REG + 3,
+ .flags = IORESOURCE_MEM,
+ },
+ { /* dsp irq */
+ .start = IRQ_DA8XX_CHIPINT0,
+ .end= IRQ_DA8XX_CHIPINT0,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct da8xx_rproc_pdata rproc_pdata = {
+ .name = dsp,
+};
Since the driver is only for da850 so the name of the remote processor
is fixed and can probably be hardcoded in the driver itself.
+
+static struct platform_device da8xx_dsp = {
+ .name = davinci-rproc,
+ .id = 0,
+ .dev= {
+ .platform_data = rproc_pdata,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ },
+ .num_resources = ARRAY_SIZE(da8xx_rproc_resources),
+ .resource = da8xx_rproc_resources,
+};
+
+#if IS_ENABLED(CONFIG_DAVINCI_REMOTEPROC)
+
+static phys_addr_t rproc_base __initdata;
+static unsigned long rproc_size __initdata;
+
+static int __init early_rproc_mem(char *p)
+{
+ char *endp;
+
+ if (p == NULL)
+ return 0;
+
+ rproc_size = memparse(p, endp);
+ if (*endp == '@')
+ rproc_base = memparse(endp + 1, NULL);
+
+ return 0;
+}
+early_param(rproc_mem, early_rproc_mem);
+
+void __init da8xx_rproc_reserve_cma(void)
+{
+ int ret;
+
+ if (!rproc_base || !rproc_size) {
+ pr_err(%s: 'rproc_mem=nn@address' badly specified\n
+'nn' and 'address' must both be non-zero\n,
+__func__);
+
+ return;
+ }
+
+ pr_info(%s: reserving 0x%lx @ 0x%lx...\n,
+ __func__, rproc_size, (unsigned long)rproc_base);
+
+ ret = dma_declare_contiguous(da8xx_dsp.dev, rproc_size, rproc_base, 0);
+ if (ret)
+ pr_err(%s: dma_declare_contiguous failed %d\n, __func__, ret);
+}
+
+#else
+
+void __init da8xx_rproc_reserve_cma(void)
+{
+}
+
+#endif
+
+int __init da8xx_register_rproc(void)
+{
+ int ret;
+
+ ret = platform_device_register(da8xx_dsp);
+ if (ret) {
+ pr_err(%s: platform_device_register: %d\n, __func__, ret);
+
+
RE: [PATCH v5 7/9] ARM: davinci: Remoteproc platform device creation data/code
-Original Message-
From: Nori, Sekhar
Sent: Monday, January 21, 2013 12:34 AM
To: Tivy, Robert
Cc: davinci-linux-open-source@linux.davincidsp.com; linux-arm-
ker...@lists.infradead.org; Ring, Chris; Grosen, Mark; o...@wizery.com;
r...@landley.net; linux-...@vger.kernel.org
Subject: Re: [PATCH v5 7/9] ARM: davinci: Remoteproc platform device
creation data/code
On 1/11/2013 5:53 AM, Robert Tivy wrote:
Added a new remoteproc platform device for DA8XX. Contains CMA-based
reservation of physical memory block. A new kernel command-line
parameter has been added to allow boot-time specification of the
physical memory block.
Signed-off-by: Robert Tivy rt...@ti.com
---
Documentation/kernel-parameters.txt|7 +++
arch/arm/mach-davinci/devices-da8xx.c | 93
+++-
arch/arm/mach-davinci/include/mach/da8xx.h |4 ++
3 files changed, 103 insertions(+), 1 deletion(-)
diff --git a/Documentation/kernel-parameters.txt
b/Documentation/kernel-parameters.txt
index 363e348..e95afb1 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -44,6 +44,7 @@ parameter is applicable:
AVR32 AVR32 architecture is enabled.
AX25Appropriate AX.25 support is enabled.
BLACKFIN Blackfin architecture is enabled.
+ CMA Contiguous Memory Area support is enabled.
DRM Direct Rendering Management support is enabled.
DYNAMIC_DEBUG Build in debug messages and enable them at runtime
EDD BIOS Enhanced Disk Drive Services (EDD) is enabled
@@ -2634,6 +2635,12 @@ bytes respectively. Such letter suffixes can
also be entirely omitted.
Useful for devices that are detected asynchronously
(e.g. USB and MMC devices).
+ rproc_mem=nn[KMG][@address]
+ [KNL,ARM,CMA] Remoteproc physical memory block.
+ Memory area to be used by remote processor image,
+ managed by CMA. Suitable defaults exist if not
+ specified.
There are no defaults now, right?
That's right, booter must specify rproc_mem in u-boot bootargs.
+
rw [KNL] Mount root device read-write on boot
S [KNL] Run init in single mode
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-
davinci/devices-da8xx.c
index fb2f51b..e8016ca 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -12,10 +12,11 @@
*/
#include linux/init.h
#include linux/platform_device.h
-#include linux/dma-mapping.h
+#include linux/dma-contiguous.h
#include linux/serial_8250.h
#include linux/ahci_platform.h
#include linux/clk.h
+#include linux/platform_data/da8xx-remoteproc.h
#include mach/cputype.h
#include mach/common.h
@@ -706,6 +707,96 @@ int __init da850_register_mmcsd1(struct
davinci_mmc_config *config)
}
#endif
+static struct resource da8xx_rproc_resources[] = {
+ { /* DSP boot address */
+ .start = DA8XX_SYSCFG0_BASE +
DA8XX_HOST1CFG_REG,
+ .end= DA8XX_SYSCFG0_BASE + DA8XX_HOST1CFG_REG + 3,
+ .flags = IORESOURCE_MEM,
+ },
+ { /* dsp irq */
+ .start = IRQ_DA8XX_CHIPINT0,
+ .end= IRQ_DA8XX_CHIPINT0,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct da8xx_rproc_pdata rproc_pdata = {
+ .name = dsp,
+};
Since the driver is only for da850 so the name of the remote processor
is fixed and can probably be hardcoded in the driver itself.
In which case I wouldn't even need the da8xx_rproc_pdata at all, which would be
nice.
+
+static struct platform_device da8xx_dsp = {
+ .name = davinci-rproc,
+ .id = 0,
+ .dev= {
+ .platform_data = rproc_pdata,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ },
+ .num_resources = ARRAY_SIZE(da8xx_rproc_resources),
+ .resource = da8xx_rproc_resources,
+};
+
+#if IS_ENABLED(CONFIG_DAVINCI_REMOTEPROC)
+
+static phys_addr_t rproc_base __initdata;
+static unsigned long rproc_size __initdata;
+
+static int __init early_rproc_mem(char *p)
+{
+ char *endp;
+
+ if (p == NULL)
+ return 0;
+
+ rproc_size = memparse(p, endp);
+ if (*endp == '@')
+ rproc_base = memparse(endp + 1, NULL);
+
+ return 0;
+}
+early_param(rproc_mem, early_rproc_mem);
+
+void __init da8xx_rproc_reserve_cma(void)
+{
+ int ret;
+
+ if (!rproc_base || !rproc_size) {
+ pr_err(%s: 'rproc_mem=nn@address' badly specified\n
+ 'nn' and 'address' must both be non-zero\n,
+ __func__);
+
+ return;
+ }
+
+ pr_info(%s: reserving 0x%lx @ 0x%lx...\n
