- remoteproc fixes/cleanups from Suman Anna
- new remoteproc TI Wakeup M3 driver from Dave Gerlach - remoteproc core support for TI's Wakeup M3 driver from both Dave and Suman - tiny remoteproc build fix from myself -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJVk/P5AAoJELLolMlTRIoMdU0QAIB4xxWKsWQwDa9v6S65qe3Z rnUqRcs4spxNjUt/qZmCGlK19Y9mO5+HptIt+IdOcdExb/bQ7zTbqKLL21FlsH+l PZ9uZEM9bVeBmmuIpdqJhbzX7lutuo7JTYHS4Cw81XAWn4c+yJ4WRaAxCQ+/QH7h D/Ejg6nYz9t4lUl2aDjKjVv41Jhq+doS5QpyWceIIZ8OijTPVFwCwBDI/P688Cp4 +XPUJ+S0WX/N09QDlKPHOlK40OCVxSgGTRes5lPVO3kYQV0HfCVKU68uETs67LTx u4Jz06JoBvPMe6Uv6egKaUVeIA8oVGmzDFvpIUImf5INp8iDfv8DAdjXOn/egccg GagZiAQpsr19386EboEvFPS7oSR0kkGkhXoiebEGxKbCjXZAC5YPLOBfbFb5K9bE nwL435yuV2LiCYVXUELE2nq1o8W0qv8n1TtwBRwo+cQgp7NCKj8GhDbWa5nwRBNe N7PjmW9OQQxCGEbMLjz2tQhw6U4lDduRUIpwGvXytf4QML/0cArwQHsqkCP/M3a2 Lonc7wzaAruJN5mUR/4y2p4GiQXYR1dezaOvSmsCaCzmTS7f6rQUJgQ0FavyFkWv orT/MBXpPhif2dbOZIZXdpiqhJDTCiMU2OfeJ+oLJKY8qY+rxzRANaygqRUltaYo hG9O2gpgDd81JNzzHa/G =OM/v -----END PGP SIGNATURE----- Merge tag 'remoteproc-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc Pull remoteproc updates from Ohad Ben-Cohen: - remoteproc fixes/cleanups from Suman Anna - new remoteproc TI Wakeup M3 driver from Dave Gerlach - remoteproc core support for TI's Wakeup M3 driver from both Dave and Suman - tiny remoteproc build fix from myself * tag 'remoteproc-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc: remoteproc: fix !CONFIG_OF build breakage remoteproc/wkup_m3: add a remoteproc driver for TI Wakeup M3 Documentation: dt: add bindings for TI Wakeup M3 processor remoteproc: add a rproc ops for performing address translation remoteproc: introduce rproc_get_by_phandle API remoteproc: fix various checkpatch warnings remoteproc/davinci: fix quoted split string checkpatch warning remoteproc/ste: add blank lines after declarationshifive-unleashed-5.1
Linus Torvalds
commit
2fee94b74b
|
|
@ -0,0 +1,52 @@
|
|||
TI Wakeup M3 Remoteproc Driver
|
||||
==============================
|
||||
|
||||
The TI AM33xx and AM43xx family of devices use a small Cortex M3 co-processor
|
||||
(commonly referred to as Wakeup M3 or CM3) to help with various low power tasks
|
||||
that cannot be controlled from the MPU. This CM3 processor requires a firmware
|
||||
binary to accomplish this. The wkup_m3 remoteproc driver handles the loading of
|
||||
the firmware and booting of the CM3.
|
||||
|
||||
Wkup M3 Device Node:
|
||||
====================
|
||||
A wkup_m3 device node is used to represent the Wakeup M3 processor instance
|
||||
within the SoC. It is added as a child node of the parent interconnect bus
|
||||
(l4_wkup) through which it is accessible to the MPU.
|
||||
|
||||
Required properties:
|
||||
--------------------
|
||||
- compatible: Should be one of,
|
||||
"ti,am3352-wkup-m3" for AM33xx SoCs
|
||||
"ti,am4372-wkup-m3" for AM43xx SoCs
|
||||
- reg: Should contain the address ranges for the two internal
|
||||
memory regions, UMEM and DMEM. The parent node should
|
||||
provide an appropriate ranges property for properly
|
||||
translating these into bus addresses.
|
||||
- reg-names: Contains the corresponding names for the two memory
|
||||
regions. These should be named "umem" & "dmem".
|
||||
- ti,hwmods: Name of the hwmod associated with the wkupm3 device.
|
||||
- ti,pm-firmware: Name of firmware file to be used for loading and
|
||||
booting the wkup_m3 remote processor.
|
||||
|
||||
Example:
|
||||
--------
|
||||
/* AM33xx */
|
||||
ocp {
|
||||
l4_wkup: l4_wkup@44c00000 {
|
||||
compatible = "am335-l4-wkup", "simple-bus";
|
||||
ranges = <0 0x44c00000 0x400000>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
wkup_m3: wkup_m3@100000 {
|
||||
compatible = "ti,am3352-wkup-m3";
|
||||
reg = <0x100000 0x4000>,
|
||||
<0x180000 0x2000>;
|
||||
reg-names = "umem", "dmem";
|
||||
ti,hwmods = "wkup_m3";
|
||||
ti,pm-firmware = "am335x-pm-firmware.elf";
|
||||
};
|
||||
};
|
||||
|
||||
...
|
||||
};
|
||||
|
|
@ -51,6 +51,12 @@ cost.
|
|||
rproc_shutdown() returns, and users can still use it with a subsequent
|
||||
rproc_boot(), if needed.
|
||||
|
||||
struct rproc *rproc_get_by_phandle(phandle phandle)
|
||||
- Find an rproc handle using a device tree phandle. Returns the rproc
|
||||
handle on success, and NULL on failure. This function increments
|
||||
the remote processor's refcount, so always use rproc_put() to
|
||||
decrement it back once rproc isn't needed anymore.
|
||||
|
||||
3. Typical usage
|
||||
|
||||
#include <linux/remoteproc.h>
|
||||
|
|
|
|||
|
|
@ -41,6 +41,19 @@ config STE_MODEM_RPROC
|
|||
This can be either built-in or a loadable module.
|
||||
If unsure say N.
|
||||
|
||||
config WKUP_M3_RPROC
|
||||
tristate "AMx3xx Wakeup M3 remoteproc support"
|
||||
depends on SOC_AM33XX || SOC_AM43XX
|
||||
select REMOTEPROC
|
||||
help
|
||||
Say y here to support Wakeup M3 remote processor on TI AM33xx
|
||||
and AM43xx family of SoCs.
|
||||
|
||||
Required for Suspend-to-RAM on AM33xx and AM43xx SoCs. Also needed
|
||||
for deep CPUIdle states on AM33xx SoCs. Allows for loading of the
|
||||
firmware onto these remote processors.
|
||||
If unsure say N.
|
||||
|
||||
config DA8XX_REMOTEPROC
|
||||
tristate "DA8xx/OMAP-L13x remoteproc support"
|
||||
depends on ARCH_DAVINCI_DA8XX
|
||||
|
|
|
|||
|
|
@ -9,4 +9,5 @@ remoteproc-y += remoteproc_virtio.o
|
|||
remoteproc-y += remoteproc_elf_loader.o
|
||||
obj-$(CONFIG_OMAP_REMOTEPROC) += omap_remoteproc.o
|
||||
obj-$(CONFIG_STE_MODEM_RPROC) += ste_modem_rproc.o
|
||||
obj-$(CONFIG_WKUP_M3_RPROC) += wkup_m3_rproc.o
|
||||
obj-$(CONFIG_DA8XX_REMOTEPROC) += da8xx_remoteproc.o
|
||||
|
|
|
|||
|
|
@ -26,8 +26,7 @@
|
|||
static char *da8xx_fw_name;
|
||||
module_param(da8xx_fw_name, charp, S_IRUGO);
|
||||
MODULE_PARM_DESC(da8xx_fw_name,
|
||||
"\n\t\tName of DSP firmware file in /lib/firmware"
|
||||
" (if not specified defaults to 'rproc-dsp-fw')");
|
||||
"Name of DSP firmware file in /lib/firmware (if not specified defaults to 'rproc-dsp-fw')");
|
||||
|
||||
/*
|
||||
* OMAP-L138 Technical References:
|
||||
|
|
|
|||
|
|
@ -44,6 +44,9 @@
|
|||
|
||||
#include "remoteproc_internal.h"
|
||||
|
||||
static DEFINE_MUTEX(rproc_list_mutex);
|
||||
static LIST_HEAD(rproc_list);
|
||||
|
||||
typedef int (*rproc_handle_resources_t)(struct rproc *rproc,
|
||||
struct resource_table *table, int len);
|
||||
typedef int (*rproc_handle_resource_t)(struct rproc *rproc,
|
||||
|
|
@ -132,32 +135,48 @@ static void rproc_disable_iommu(struct rproc *rproc)
|
|||
|
||||
iommu_detach_device(domain, dev);
|
||||
iommu_domain_free(domain);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
/**
|
||||
* rproc_da_to_va() - lookup the kernel virtual address for a remoteproc address
|
||||
* @rproc: handle of a remote processor
|
||||
* @da: remoteproc device address to translate
|
||||
* @len: length of the memory region @da is pointing to
|
||||
*
|
||||
* Some remote processors will ask us to allocate them physically contiguous
|
||||
* memory regions (which we call "carveouts"), and map them to specific
|
||||
* device addresses (which are hardcoded in the firmware).
|
||||
* device addresses (which are hardcoded in the firmware). They may also have
|
||||
* dedicated memory regions internal to the processors, and use them either
|
||||
* exclusively or alongside carveouts.
|
||||
*
|
||||
* They may then ask us to copy objects into specific device addresses (e.g.
|
||||
* code/data sections) or expose us certain symbols in other device address
|
||||
* (e.g. their trace buffer).
|
||||
*
|
||||
* This function is an internal helper with which we can go over the allocated
|
||||
* carveouts and translate specific device address to kernel virtual addresses
|
||||
* so we can access the referenced memory.
|
||||
* This function is a helper function with which we can go over the allocated
|
||||
* carveouts and translate specific device addresses to kernel virtual addresses
|
||||
* so we can access the referenced memory. This function also allows to perform
|
||||
* translations on the internal remoteproc memory regions through a platform
|
||||
* implementation specific da_to_va ops, if present.
|
||||
*
|
||||
* The function returns a valid kernel address on success or NULL on failure.
|
||||
*
|
||||
* Note: phys_to_virt(iommu_iova_to_phys(rproc->domain, da)) will work too,
|
||||
* but only on kernel direct mapped RAM memory. Instead, we're just using
|
||||
* here the output of the DMA API, which should be more correct.
|
||||
* here the output of the DMA API for the carveouts, which should be more
|
||||
* correct.
|
||||
*/
|
||||
void *rproc_da_to_va(struct rproc *rproc, u64 da, int len)
|
||||
{
|
||||
struct rproc_mem_entry *carveout;
|
||||
void *ptr = NULL;
|
||||
|
||||
if (rproc->ops->da_to_va) {
|
||||
ptr = rproc->ops->da_to_va(rproc, da, len);
|
||||
if (ptr)
|
||||
goto out;
|
||||
}
|
||||
|
||||
list_for_each_entry(carveout, &rproc->carveouts, node) {
|
||||
int offset = da - carveout->da;
|
||||
|
||||
|
|
@ -174,6 +193,7 @@ void *rproc_da_to_va(struct rproc *rproc, u64 da, int len)
|
|||
break;
|
||||
}
|
||||
|
||||
out:
|
||||
return ptr;
|
||||
}
|
||||
EXPORT_SYMBOL(rproc_da_to_va);
|
||||
|
|
@ -411,10 +431,8 @@ static int rproc_handle_trace(struct rproc *rproc, struct fw_rsc_trace *rsc,
|
|||
}
|
||||
|
||||
trace = kzalloc(sizeof(*trace), GFP_KERNEL);
|
||||
if (!trace) {
|
||||
dev_err(dev, "kzalloc trace failed\n");
|
||||
if (!trace)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
/* set the trace buffer dma properties */
|
||||
trace->len = rsc->len;
|
||||
|
|
@ -489,10 +507,8 @@ static int rproc_handle_devmem(struct rproc *rproc, struct fw_rsc_devmem *rsc,
|
|||
}
|
||||
|
||||
mapping = kzalloc(sizeof(*mapping), GFP_KERNEL);
|
||||
if (!mapping) {
|
||||
dev_err(dev, "kzalloc mapping failed\n");
|
||||
if (!mapping)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
ret = iommu_map(rproc->domain, rsc->da, rsc->pa, rsc->len, rsc->flags);
|
||||
if (ret) {
|
||||
|
|
@ -565,10 +581,8 @@ static int rproc_handle_carveout(struct rproc *rproc,
|
|||
rsc->da, rsc->pa, rsc->len, rsc->flags);
|
||||
|
||||
carveout = kzalloc(sizeof(*carveout), GFP_KERNEL);
|
||||
if (!carveout) {
|
||||
dev_err(dev, "kzalloc carveout failed\n");
|
||||
if (!carveout)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
va = dma_alloc_coherent(dev->parent, rsc->len, &dma, GFP_KERNEL);
|
||||
if (!va) {
|
||||
|
|
@ -768,7 +782,8 @@ static void rproc_resource_cleanup(struct rproc *rproc)
|
|||
|
||||
/* clean up carveout allocations */
|
||||
list_for_each_entry_safe(entry, tmp, &rproc->carveouts, node) {
|
||||
dma_free_coherent(dev->parent, entry->len, entry->va, entry->dma);
|
||||
dma_free_coherent(dev->parent, entry->len, entry->va,
|
||||
entry->dma);
|
||||
list_del(&entry->node);
|
||||
kfree(entry);
|
||||
}
|
||||
|
|
@ -808,9 +823,8 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
|
|||
|
||||
/* look for the resource table */
|
||||
table = rproc_find_rsc_table(rproc, fw, &tablesz);
|
||||
if (!table) {
|
||||
if (!table)
|
||||
goto clean_up;
|
||||
}
|
||||
|
||||
/* Verify that resource table in loaded fw is unchanged */
|
||||
if (rproc->table_csum != crc32(0, table, tablesz)) {
|
||||
|
|
@ -911,7 +925,8 @@ static void rproc_fw_config_virtio(const struct firmware *fw, void *context)
|
|||
|
||||
/* count the number of notify-ids */
|
||||
rproc->max_notifyid = -1;
|
||||
ret = rproc_handle_resources(rproc, tablesz, rproc_count_vrings_handler);
|
||||
ret = rproc_handle_resources(rproc, tablesz,
|
||||
rproc_count_vrings_handler);
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
|
|
@ -1151,6 +1166,50 @@ out:
|
|||
}
|
||||
EXPORT_SYMBOL(rproc_shutdown);
|
||||
|
||||
/**
|
||||
* rproc_get_by_phandle() - find a remote processor by phandle
|
||||
* @phandle: phandle to the rproc
|
||||
*
|
||||
* Finds an rproc handle using the remote processor's phandle, and then
|
||||
* return a handle to the rproc.
|
||||
*
|
||||
* This function increments the remote processor's refcount, so always
|
||||
* use rproc_put() to decrement it back once rproc isn't needed anymore.
|
||||
*
|
||||
* Returns the rproc handle on success, and NULL on failure.
|
||||
*/
|
||||
#ifdef CONFIG_OF
|
||||
struct rproc *rproc_get_by_phandle(phandle phandle)
|
||||
{
|
||||
struct rproc *rproc = NULL, *r;
|
||||
struct device_node *np;
|
||||
|
||||
np = of_find_node_by_phandle(phandle);
|
||||
if (!np)
|
||||
return NULL;
|
||||
|
||||
mutex_lock(&rproc_list_mutex);
|
||||
list_for_each_entry(r, &rproc_list, node) {
|
||||
if (r->dev.parent && r->dev.parent->of_node == np) {
|
||||
rproc = r;
|
||||
get_device(&rproc->dev);
|
||||
break;
|
||||
}
|
||||
}
|
||||
mutex_unlock(&rproc_list_mutex);
|
||||
|
||||
of_node_put(np);
|
||||
|
||||
return rproc;
|
||||
}
|
||||
#else
|
||||
struct rproc *rproc_get_by_phandle(phandle phandle)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
EXPORT_SYMBOL(rproc_get_by_phandle);
|
||||
|
||||
/**
|
||||
* rproc_add() - register a remote processor
|
||||
* @rproc: the remote processor handle to register
|
||||
|
|
@ -1180,6 +1239,11 @@ int rproc_add(struct rproc *rproc)
|
|||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
/* expose to rproc_get_by_phandle users */
|
||||
mutex_lock(&rproc_list_mutex);
|
||||
list_add(&rproc->node, &rproc_list);
|
||||
mutex_unlock(&rproc_list_mutex);
|
||||
|
||||
dev_info(dev, "%s is available\n", rproc->name);
|
||||
|
||||
dev_info(dev, "Note: remoteproc is still under development and considered experimental.\n");
|
||||
|
|
@ -1268,10 +1332,8 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
|
|||
name_len = strlen(name) + strlen(template) - 2 + 1;
|
||||
|
||||
rproc = kzalloc(sizeof(struct rproc) + len + name_len, GFP_KERNEL);
|
||||
if (!rproc) {
|
||||
dev_err(dev, "%s: kzalloc failed\n", __func__);
|
||||
if (!rproc)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (!firmware) {
|
||||
p = (char *)rproc + sizeof(struct rproc) + len;
|
||||
|
|
@ -1369,6 +1431,11 @@ int rproc_del(struct rproc *rproc)
|
|||
/* Free the copy of the resource table */
|
||||
kfree(rproc->cached_table);
|
||||
|
||||
/* the rproc is downref'ed as soon as it's removed from the klist */
|
||||
mutex_lock(&rproc_list_mutex);
|
||||
list_del(&rproc->node);
|
||||
mutex_unlock(&rproc_list_mutex);
|
||||
|
||||
device_del(&rproc->dev);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ struct rproc;
|
|||
* @get_boot_addr: get boot address to entry point specified in firmware
|
||||
*/
|
||||
struct rproc_fw_ops {
|
||||
struct resource_table *(*find_rsc_table) (struct rproc *rproc,
|
||||
struct resource_table *(*find_rsc_table)(struct rproc *rproc,
|
||||
const struct firmware *fw,
|
||||
int *tablesz);
|
||||
struct resource_table *(*find_loaded_rsc_table)(struct rproc *rproc,
|
||||
|
|
|
|||
|
|
@ -67,8 +67,7 @@ static int sproc_load_segments(struct rproc *rproc, const struct firmware *fw)
|
|||
static const struct ste_toc_entry *sproc_find_rsc_entry(const void *data)
|
||||
{
|
||||
int i;
|
||||
const struct ste_toc *toc;
|
||||
toc = data;
|
||||
const struct ste_toc *toc = data;
|
||||
|
||||
/* Search the table for the resource table */
|
||||
for (i = 0; i < SPROC_MAX_TOC_ENTRIES &&
|
||||
|
|
@ -230,6 +229,7 @@ static int sproc_start(struct rproc *rproc)
|
|||
static int sproc_stop(struct rproc *rproc)
|
||||
{
|
||||
struct sproc *sproc = rproc->priv;
|
||||
|
||||
sproc_dbg(sproc, "stop ste-modem\n");
|
||||
|
||||
return sproc->mdev->ops.power(sproc->mdev, false);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,257 @@
|
|||
/*
|
||||
* TI AMx3 Wakeup M3 Remote Processor driver
|
||||
*
|
||||
* Copyright (C) 2014-2015 Texas Instruments, Inc.
|
||||
*
|
||||
* Dave Gerlach <d-gerlach@ti.com>
|
||||
* Suman Anna <s-anna@ti.com>
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#include <linux/err.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/remoteproc.h>
|
||||
|
||||
#include <linux/platform_data/wkup_m3.h>
|
||||
|
||||
#include "remoteproc_internal.h"
|
||||
|
||||
#define WKUPM3_MEM_MAX 2
|
||||
|
||||
/**
|
||||
* struct wkup_m3_mem - WkupM3 internal memory structure
|
||||
* @cpu_addr: MPU virtual address of the memory region
|
||||
* @bus_addr: Bus address used to access the memory region
|
||||
* @dev_addr: Device address from Wakeup M3 view
|
||||
* @size: Size of the memory region
|
||||
*/
|
||||
struct wkup_m3_mem {
|
||||
void __iomem *cpu_addr;
|
||||
phys_addr_t bus_addr;
|
||||
u32 dev_addr;
|
||||
size_t size;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct wkup_m3_rproc - WkupM3 remote processor state
|
||||
* @rproc: rproc handle
|
||||
* @pdev: pointer to platform device
|
||||
* @mem: WkupM3 memory information
|
||||
*/
|
||||
struct wkup_m3_rproc {
|
||||
struct rproc *rproc;
|
||||
struct platform_device *pdev;
|
||||
struct wkup_m3_mem mem[WKUPM3_MEM_MAX];
|
||||
};
|
||||
|
||||
static int wkup_m3_rproc_start(struct rproc *rproc)
|
||||
{
|
||||
struct wkup_m3_rproc *wkupm3 = rproc->priv;
|
||||
struct platform_device *pdev = wkupm3->pdev;
|
||||
struct device *dev = &pdev->dev;
|
||||
struct wkup_m3_platform_data *pdata = dev_get_platdata(dev);
|
||||
|
||||
if (pdata->deassert_reset(pdev, pdata->reset_name)) {
|
||||
dev_err(dev, "Unable to reset wkup_m3!\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int wkup_m3_rproc_stop(struct rproc *rproc)
|
||||
{
|
||||
struct wkup_m3_rproc *wkupm3 = rproc->priv;
|
||||
struct platform_device *pdev = wkupm3->pdev;
|
||||
struct device *dev = &pdev->dev;
|
||||
struct wkup_m3_platform_data *pdata = dev_get_platdata(dev);
|
||||
|
||||
if (pdata->assert_reset(pdev, pdata->reset_name)) {
|
||||
dev_err(dev, "Unable to assert reset of wkup_m3!\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void *wkup_m3_rproc_da_to_va(struct rproc *rproc, u64 da, int len)
|
||||
{
|
||||
struct wkup_m3_rproc *wkupm3 = rproc->priv;
|
||||
void *va = NULL;
|
||||
int i;
|
||||
u32 offset;
|
||||
|
||||
if (len <= 0)
|
||||
return NULL;
|
||||
|
||||
for (i = 0; i < WKUPM3_MEM_MAX; i++) {
|
||||
if (da >= wkupm3->mem[i].dev_addr && da + len <=
|
||||
wkupm3->mem[i].dev_addr + wkupm3->mem[i].size) {
|
||||
offset = da - wkupm3->mem[i].dev_addr;
|
||||
/* __force to make sparse happy with type conversion */
|
||||
va = (__force void *)(wkupm3->mem[i].cpu_addr + offset);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return va;
|
||||
}
|
||||
|
||||
static struct rproc_ops wkup_m3_rproc_ops = {
|
||||
.start = wkup_m3_rproc_start,
|
||||
.stop = wkup_m3_rproc_stop,
|
||||
.da_to_va = wkup_m3_rproc_da_to_va,
|
||||
};
|
||||
|
||||
static const struct of_device_id wkup_m3_rproc_of_match[] = {
|
||||
{ .compatible = "ti,am3352-wkup-m3", },
|
||||
{ .compatible = "ti,am4372-wkup-m3", },
|
||||
{},
|
||||
};
|
||||
|
||||
static int wkup_m3_rproc_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct wkup_m3_platform_data *pdata = dev->platform_data;
|
||||
/* umem always needs to be processed first */
|
||||
const char *mem_names[WKUPM3_MEM_MAX] = { "umem", "dmem" };
|
||||
struct wkup_m3_rproc *wkupm3;
|
||||
const char *fw_name;
|
||||
struct rproc *rproc;
|
||||
struct resource *res;
|
||||
const __be32 *addrp;
|
||||
u32 l4_offset = 0;
|
||||
u64 size;
|
||||
int ret;
|
||||
int i;
|
||||
|
||||
if (!(pdata && pdata->deassert_reset && pdata->assert_reset &&
|
||||
pdata->reset_name)) {
|
||||
dev_err(dev, "Platform data missing!\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
ret = of_property_read_string(dev->of_node, "ti,pm-firmware",
|
||||
&fw_name);
|
||||
if (ret) {
|
||||
dev_err(dev, "No firmware filename given\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
pm_runtime_enable(&pdev->dev);
|
||||
ret = pm_runtime_get_sync(&pdev->dev);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "pm_runtime_get_sync() failed\n");
|
||||
goto err;
|
||||
}
|
||||
|
||||
rproc = rproc_alloc(dev, "wkup_m3", &wkup_m3_rproc_ops,
|
||||
fw_name, sizeof(*wkupm3));
|
||||
if (!rproc) {
|
||||
ret = -ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
|
||||
wkupm3 = rproc->priv;
|
||||
wkupm3->rproc = rproc;
|
||||
wkupm3->pdev = pdev;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(mem_names); i++) {
|
||||
res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
|
||||
mem_names[i]);
|
||||
wkupm3->mem[i].cpu_addr = devm_ioremap_resource(dev, res);
|
||||
if (IS_ERR(wkupm3->mem[i].cpu_addr)) {
|
||||
dev_err(&pdev->dev, "devm_ioremap_resource failed for resource %d\n",
|
||||
i);
|
||||
ret = PTR_ERR(wkupm3->mem[i].cpu_addr);
|
||||
goto err;
|
||||
}
|
||||
wkupm3->mem[i].bus_addr = res->start;
|
||||
wkupm3->mem[i].size = resource_size(res);
|
||||
addrp = of_get_address(dev->of_node, i, &size, NULL);
|
||||
/*
|
||||
* The wkupm3 has umem at address 0 in its view, so the device
|
||||
* addresses for each memory region is computed as a relative
|
||||
* offset of the bus address for umem, and therefore needs to be
|
||||
* processed first.
|
||||
*/
|
||||
if (!strcmp(mem_names[i], "umem"))
|
||||
l4_offset = be32_to_cpu(*addrp);
|
||||
wkupm3->mem[i].dev_addr = be32_to_cpu(*addrp) - l4_offset;
|
||||
}
|
||||
|
||||
dev_set_drvdata(dev, rproc);
|
||||
|
||||
ret = rproc_add(rproc);
|
||||
if (ret) {
|
||||
dev_err(dev, "rproc_add failed\n");
|
||||
goto err_put_rproc;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_put_rproc:
|
||||
rproc_put(rproc);
|
||||
err:
|
||||
pm_runtime_put_noidle(dev);
|
||||
pm_runtime_disable(dev);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int wkup_m3_rproc_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct rproc *rproc = platform_get_drvdata(pdev);
|
||||
|
||||
rproc_del(rproc);
|
||||
rproc_put(rproc);
|
||||
pm_runtime_put_sync(&pdev->dev);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int wkup_m3_rpm_suspend(struct device *dev)
|
||||
{
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
static int wkup_m3_rpm_resume(struct device *dev)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static const struct dev_pm_ops wkup_m3_rproc_pm_ops = {
|
||||
SET_RUNTIME_PM_OPS(wkup_m3_rpm_suspend, wkup_m3_rpm_resume, NULL)
|
||||
};
|
||||
|
||||
static struct platform_driver wkup_m3_rproc_driver = {
|
||||
.probe = wkup_m3_rproc_probe,
|
||||
.remove = wkup_m3_rproc_remove,
|
||||
.driver = {
|
||||
.name = "wkup_m3_rproc",
|
||||
.of_match_table = wkup_m3_rproc_of_match,
|
||||
.pm = &wkup_m3_rproc_pm_ops,
|
||||
},
|
||||
};
|
||||
|
||||
module_platform_driver(wkup_m3_rproc_driver);
|
||||
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_DESCRIPTION("TI Wakeup M3 remote processor control driver");
|
||||
MODULE_AUTHOR("Dave Gerlach <d-gerlach@ti.com>");
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
/*
|
||||
* TI Wakeup M3 remote processor platform data
|
||||
*
|
||||
* Copyright (C) 2014-2015 Texas Instruments, Inc.
|
||||
*
|
||||
* Dave Gerlach <d-gerlach@ti.com>
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#ifndef _LINUX_PLATFORM_DATA_WKUP_M3_H
|
||||
#define _LINUX_PLATFORM_DATA_WKUP_M3_H
|
||||
|
||||
struct platform_device;
|
||||
|
||||
struct wkup_m3_platform_data {
|
||||
const char *reset_name;
|
||||
|
||||
int (*assert_reset)(struct platform_device *pdev, const char *name);
|
||||
int (*deassert_reset)(struct platform_device *pdev, const char *name);
|
||||
};
|
||||
|
||||
#endif /* _LINUX_PLATFORM_DATA_WKUP_M3_H */
|
||||
|
|
@ -36,11 +36,11 @@
|
|||
#define REMOTEPROC_H
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/klist.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/virtio.h>
|
||||
#include <linux/completion.h>
|
||||
#include <linux/idr.h>
|
||||
#include <linux/of.h>
|
||||
|
||||
/**
|
||||
* struct resource_table - firmware resource table header
|
||||
|
|
@ -330,11 +330,13 @@ struct rproc;
|
|||
* @start: power on the device and boot it
|
||||
* @stop: power off the device
|
||||
* @kick: kick a virtqueue (virtqueue id given as a parameter)
|
||||
* @da_to_va: optional platform hook to perform address translations
|
||||
*/
|
||||
struct rproc_ops {
|
||||
int (*start)(struct rproc *rproc);
|
||||
int (*stop)(struct rproc *rproc);
|
||||
void (*kick)(struct rproc *rproc, int vqid);
|
||||
void * (*da_to_va)(struct rproc *rproc, u64 da, int len);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -375,7 +377,7 @@ enum rproc_crash_type {
|
|||
|
||||
/**
|
||||
* struct rproc - represents a physical remote processor device
|
||||
* @node: klist node of this rproc object
|
||||
* @node: list node of this rproc object
|
||||
* @domain: iommu domain
|
||||
* @name: human readable name of the rproc
|
||||
* @firmware: name of firmware file to be loaded
|
||||
|
|
@ -407,7 +409,7 @@ enum rproc_crash_type {
|
|||
* @has_iommu: flag to indicate if remote processor is behind an MMU
|
||||
*/
|
||||
struct rproc {
|
||||
struct klist_node node;
|
||||
struct list_head node;
|
||||
struct iommu_domain *domain;
|
||||
const char *name;
|
||||
const char *firmware;
|
||||
|
|
@ -481,6 +483,7 @@ struct rproc_vdev {
|
|||
u32 rsc_offset;
|
||||
};
|
||||
|
||||
struct rproc *rproc_get_by_phandle(phandle phandle);
|
||||
struct rproc *rproc_alloc(struct device *dev, const char *name,
|
||||
const struct rproc_ops *ops,
|
||||
const char *firmware, int len);
|
||||
|
|
|
|||
Loading…
Reference in New Issue