diff --git a/lib/remoteproc/drivers/zynqmp_remoteproc_a53.c b/lib/remoteproc/drivers/zynqmp_remoteproc_a53.c
index 5f67bf5bfb1f09a3459016f8a340706c215e8d21..92a7fa1b7bebb7fc6069767eb8ff06c10ab74c64 100644 (file)
#include "metal/utilities.h"
#include "metal/atomic.h"
#include "metal/irq.h"
+#include "metal/alloc.h"
#include "openamp/hil.h"
-#include "openamp/remoteproc_plat.h"
#include "openamp/virtqueue.h"
/* IPI REGs OFFSET */
/* -- FIX ME: ipi info is to be defined -- */
struct ipi_info {
+ const char *name;
+ const char *bus_name;
+ struct metal_device *dev;
+ struct metal_io_region *io;
+ metal_phys_addr_t paddr;
uint32_t ipi_chn_mask;
int need_reg;
atomic_int sync;
/*--------------------------- Declare Functions ------------------------ */
static int _enable_interrupt(struct proc_vring *vring_hw);
-static void _notify(int cpu_id, struct proc_intr *intr_info);
-static int _boot_cpu(int cpu_id, unsigned int load_addr);
-static void _shutdown_cpu(int cpu_id);
+static void _notify(struct hil_proc *proc, struct proc_intr *intr_info);
+static int _boot_cpu(struct hil_proc *proc, unsigned int load_addr);
+static void _shutdown_cpu(struct hil_proc *proc);
static int _poll(struct hil_proc *proc, int nonblock);
-static struct hil_proc *_initialize(void *pdata, int cpu_id);
+static int _initialize(struct hil_proc *proc);
static void _release(struct hil_proc *proc);
static int _ipi_handler(int vect_id, void *data);
struct proc_vring *vring_hw = (struct proc_vring *)(data);
struct ipi_info *ipi =
(struct ipi_info *)(vring_hw->intr_info.data);
- struct metal_io_region *io = vring_hw->intr_info.io;
+ struct metal_io_region *io = ipi->io;
unsigned int ipi_intr_status =
(unsigned int)metal_io_read32(io, IPI_ISR_OFFSET);
if (ipi_intr_status & ipi->ipi_chn_mask) {
{
struct ipi_info *ipi =
(struct ipi_info *)(vring_hw->intr_info.data);
- struct metal_io_region *io = vring_hw->intr_info.io;
+ struct metal_io_region *io = ipi->io;
if (!ipi->need_reg) {
return 0;
metal_irq_register(vring_hw->intr_info.vect_id, _ipi_handler,
vring_hw->intr_info.dev, vring_hw);
/* Enable IPI interrupt */
-#if 0
- env_enable_interrupt(vring_hw->intr_info.vect_id,
- vring_hw->intr_info.priority,
- vring_hw->intr_info.trigger_type);
-#endif
+ metal_irq_enable(vring_hw->intr_info.vect_id);
metal_io_write32(io, IPI_IER_OFFSET, ipi->ipi_chn_mask);
return 0;
}
-static void _notify(int cpu_id, struct proc_intr *intr_info)
+static void _notify(struct hil_proc *proc, struct proc_intr *intr_info)
{
- (void)cpu_id;
+ (void)proc;
struct ipi_info *ipi = (struct ipi_info *)(intr_info->data);
if (ipi == NULL)
return;
/* Trigger IPI */
- metal_io_write32(intr_info->io, IPI_TRIG_OFFSET, ipi->ipi_chn_mask);
+ metal_io_write32(ipi->io, IPI_TRIG_OFFSET, ipi->ipi_chn_mask);
}
-static int _boot_cpu(int cpu_id, unsigned int load_addr)
+static int _boot_cpu(struct hil_proc *proc, unsigned int load_addr)
{
- (void)cpu_id;
+ (void)proc;
(void)load_addr;
return -1;
}
-static void _shutdown_cpu(int cpu_id)
+static void _shutdown_cpu(struct hil_proc *proc)
{
- (void)cpu_id;
+ (void)proc;
return;
}
}
}
-static struct hil_proc * _initialize(void *pdata, int cpu_id)
+static int _initialize(struct hil_proc *proc)
{
- (void) cpu_id;
-
- struct hil_proc *proc;
int ret;
- struct metal_io_region *io;
struct proc_intr *intr_info;
struct ipi_info *ipi;
unsigned int ipi_intr_status;
+ int i;
- /* Allocate memory for proc instance */
- proc = env_allocate_memory(sizeof(struct hil_proc));
- if (!proc) {
- return NULL;
- }
- memset(proc, 0, sizeof(struct hil_proc));
-
- ret = rproc_init_plat_data(pdata, proc);
- if (ret)
- goto error;
- intr_info = &(proc->vdev.vring_info[1].intr_info);
- io = intr_info->io;
- ipi = (struct ipi_info *)(intr_info->data);
- ipi_intr_status =
- (unsigned int)metal_io_read32(io, IPI_ISR_OFFSET);
- if (ipi_intr_status & ipi->ipi_chn_mask) {
- metal_io_write32(io, IPI_ISR_OFFSET, ipi->ipi_chn_mask);
+ if (!proc)
+ return -1;
+
+ for (i = 0; i < HIL_MAX_NUM_VRINGS; i++) {
+ intr_info = &(proc->vdev.vring_info[i].intr_info);
+ ipi = intr_info->data;
+
+ if (ipi && ipi->name && ipi->bus_name) {
+ ret = metal_device_open(ipi->bus_name, ipi->name,
+ &ipi->dev);
+ if (ret)
+ return -ENODEV;
+ ipi->io = metal_device_io_region(ipi->dev, 0);
+ } else if (ipi->paddr) {
+ ipi->io = metal_allocate_memory(
+ sizeof(struct metal_io_region));
+ if (!ipi->io)
+ goto error;
+ metal_io_init(ipi->io, (void *)ipi->paddr,
+ &ipi->paddr, 0x1000,
+ (unsigned)(-1),
+ METAL_UNCACHED | METAL_IO_MAPPED,
+ NULL);
+ }
+
+ if (ipi->io) {
+ ipi_intr_status = (unsigned int)metal_io_read32(
+ ipi->io, IPI_ISR_OFFSET);
+ if (ipi_intr_status & ipi->ipi_chn_mask)
+ metal_io_write32(ipi->io, IPI_ISR_OFFSET,
+ ipi->ipi_chn_mask);
+ metal_io_write32(ipi->io, IPI_IDR_OFFSET,
+ ipi->ipi_chn_mask);
+ atomic_store(&ipi->sync, 1);
+ }
}
- metal_io_write32(io, IPI_IDR_OFFSET, ipi->ipi_chn_mask);
- atomic_store(&ipi->sync, 1);
- /* Enable mapping for the shared memory region */
- if (proc->sh_buff.size)
- metal_io_mem_map((metal_phys_addr_t)proc->sh_buff.start_addr,
- proc->sh_buff.io,
- proc->sh_buff.size);
- return proc;
+ return 0;
+
error:
- if (proc) {
- rproc_close_plat(proc);
- env_free_memory(proc);
- }
- return NULL;
+ _release(proc);
+ return -1;
}
static void _release(struct hil_proc *proc)
{
- if (proc) {
- struct proc_intr *intr_info =
- &(proc->vdev.vring_info[1].intr_info);
- struct metal_io_region *io = intr_info->io;
- struct ipi_info *ipi = (struct ipi_info *)(intr_info->data);
- metal_io_write32(io, IPI_IDR_OFFSET, ipi->ipi_chn_mask);
-
- rproc_close_plat(proc);
- env_free_memory(proc);
+ int i;
+ struct proc_intr *intr_info;
+ struct ipi_info *ipi;
+
+ if (!proc)
+ return;
+ for (i = 0; i < HIL_MAX_NUM_VRINGS; i++) {
+ intr_info = &(proc->vdev.vring_info[1].intr_info);
+ ipi = (struct ipi_info *)(intr_info->data);
+ if (ipi) {
+ if (ipi->io) {
+ metal_io_write32(ipi->io, IPI_IDR_OFFSET,
+ ipi->ipi_chn_mask);
+ if (ipi->dev) {
+ metal_device_close(ipi->dev);
+ ipi->dev = NULL;
+ } else {
+ metal_free_memory(ipi->io);
+ }
+ ipi->io = NULL;
+ }
+ }
+
}
}