common/octeontx2: introduce irq handling functions
All PCIe drivers(ethdev, mempool, cryptodev and eventdev) in octeontx2, needs to handle interrupt for mailbox and error handling. Create a helper function over rte interrupt API to register, unregister, disable interrupts. Signed-off-by: Jerin Jacob <jerinj@marvell.com> Signed-off-by: Vamsi Attunuru <vattunuru@marvell.com> Signed-off-by: Krzysztof Kanas <kkanas@marvell.com>
This commit is contained in:
parent
e1d9a02ad8
commit
5868ccdbf1
drivers/common/octeontx2
@ -26,6 +26,7 @@ LIBABIVER := 1
|
||||
# all source are stored in SRCS-y
|
||||
#
|
||||
SRCS-y += otx2_dev.c
|
||||
SRCS-y += otx2_irq.c
|
||||
SRCS-y += otx2_mbox.c
|
||||
SRCS-y += otx2_common.c
|
||||
|
||||
|
@ -3,6 +3,7 @@
|
||||
#
|
||||
|
||||
sources= files('otx2_dev.c',
|
||||
'otx2_irq.c',
|
||||
'otx2_mbox.c',
|
||||
'otx2_common.c',
|
||||
)
|
||||
|
254
drivers/common/octeontx2/otx2_irq.c
Normal file
254
drivers/common/octeontx2/otx2_irq.c
Normal file
@ -0,0 +1,254 @@
|
||||
/* SPDX-License-Identifier: BSD-3-Clause
|
||||
* Copyright(C) 2019 Marvell International Ltd.
|
||||
*/
|
||||
|
||||
#include <rte_alarm.h>
|
||||
#include <rte_common.h>
|
||||
#include <rte_eal.h>
|
||||
#include <rte_interrupts.h>
|
||||
|
||||
#include "otx2_common.h"
|
||||
#include "otx2_irq.h"
|
||||
|
||||
#ifdef RTE_EAL_VFIO
|
||||
|
||||
#include <inttypes.h>
|
||||
#include <linux/vfio.h>
|
||||
#include <sys/eventfd.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#define MAX_INTR_VEC_ID RTE_MAX_RXTX_INTR_VEC_ID
|
||||
#define MSIX_IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + \
|
||||
sizeof(int) * (MAX_INTR_VEC_ID))
|
||||
|
||||
static int
|
||||
irq_get_info(struct rte_intr_handle *intr_handle)
|
||||
{
|
||||
struct vfio_irq_info irq = { .argsz = sizeof(irq) };
|
||||
int rc;
|
||||
|
||||
irq.index = VFIO_PCI_MSIX_IRQ_INDEX;
|
||||
|
||||
rc = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_GET_IRQ_INFO, &irq);
|
||||
if (rc < 0) {
|
||||
otx2_err("Failed to get IRQ info rc=%d errno=%d", rc, errno);
|
||||
return rc;
|
||||
}
|
||||
|
||||
otx2_base_dbg("Flags=0x%x index=0x%x count=0x%x max_intr_vec_id=0x%x",
|
||||
irq.flags, irq.index, irq.count, MAX_INTR_VEC_ID);
|
||||
|
||||
if (irq.count > MAX_INTR_VEC_ID) {
|
||||
otx2_err("HW max=%d > MAX_INTR_VEC_ID: %d",
|
||||
intr_handle->max_intr, MAX_INTR_VEC_ID);
|
||||
intr_handle->max_intr = MAX_INTR_VEC_ID;
|
||||
} else {
|
||||
intr_handle->max_intr = irq.count;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
irq_config(struct rte_intr_handle *intr_handle, unsigned int vec)
|
||||
{
|
||||
char irq_set_buf[MSIX_IRQ_SET_BUF_LEN];
|
||||
struct vfio_irq_set *irq_set;
|
||||
int32_t *fd_ptr;
|
||||
int len, rc;
|
||||
|
||||
if (vec > intr_handle->max_intr) {
|
||||
otx2_err("vector=%d greater than max_intr=%d", vec,
|
||||
intr_handle->max_intr);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
len = sizeof(struct vfio_irq_set) + sizeof(int32_t);
|
||||
|
||||
irq_set = (struct vfio_irq_set *)irq_set_buf;
|
||||
irq_set->argsz = len;
|
||||
|
||||
irq_set->start = vec;
|
||||
irq_set->count = 1;
|
||||
irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD |
|
||||
VFIO_IRQ_SET_ACTION_TRIGGER;
|
||||
irq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;
|
||||
|
||||
/* Use vec fd to set interrupt vectors */
|
||||
fd_ptr = (int32_t *)&irq_set->data[0];
|
||||
fd_ptr[0] = intr_handle->efds[vec];
|
||||
|
||||
rc = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
|
||||
if (rc)
|
||||
otx2_err("Failed to set_irqs vector=0x%x rc=%d", vec, rc);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int
|
||||
irq_init(struct rte_intr_handle *intr_handle)
|
||||
{
|
||||
char irq_set_buf[MSIX_IRQ_SET_BUF_LEN];
|
||||
struct vfio_irq_set *irq_set;
|
||||
int32_t *fd_ptr;
|
||||
int len, rc;
|
||||
uint32_t i;
|
||||
|
||||
if (intr_handle->max_intr > MAX_INTR_VEC_ID) {
|
||||
otx2_err("Max_intr=%d greater than MAX_INTR_VEC_ID=%d",
|
||||
intr_handle->max_intr, MAX_INTR_VEC_ID);
|
||||
return -ERANGE;
|
||||
}
|
||||
|
||||
len = sizeof(struct vfio_irq_set) +
|
||||
sizeof(int32_t) * intr_handle->max_intr;
|
||||
|
||||
irq_set = (struct vfio_irq_set *)irq_set_buf;
|
||||
irq_set->argsz = len;
|
||||
irq_set->start = 0;
|
||||
irq_set->count = intr_handle->max_intr;
|
||||
irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD |
|
||||
VFIO_IRQ_SET_ACTION_TRIGGER;
|
||||
irq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;
|
||||
|
||||
fd_ptr = (int32_t *)&irq_set->data[0];
|
||||
for (i = 0; i < irq_set->count; i++)
|
||||
fd_ptr[i] = -1;
|
||||
|
||||
rc = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
|
||||
if (rc)
|
||||
otx2_err("Failed to set irqs vector rc=%d", rc);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
/**
|
||||
* @internal
|
||||
* Disable IRQ
|
||||
*/
|
||||
int
|
||||
otx2_disable_irqs(struct rte_intr_handle *intr_handle)
|
||||
{
|
||||
/* Clear max_intr to indicate re-init next time */
|
||||
intr_handle->max_intr = 0;
|
||||
return rte_intr_disable(intr_handle);
|
||||
}
|
||||
|
||||
/**
|
||||
* @internal
|
||||
* Register IRQ
|
||||
*/
|
||||
int
|
||||
otx2_register_irq(struct rte_intr_handle *intr_handle,
|
||||
rte_intr_callback_fn cb, void *data, unsigned int vec)
|
||||
{
|
||||
struct rte_intr_handle tmp_handle;
|
||||
int rc;
|
||||
|
||||
/* If no max_intr read from VFIO */
|
||||
if (intr_handle->max_intr == 0) {
|
||||
irq_get_info(intr_handle);
|
||||
irq_init(intr_handle);
|
||||
}
|
||||
|
||||
if (vec > intr_handle->max_intr) {
|
||||
otx2_err("Vector=%d greater than max_intr=%d", vec,
|
||||
intr_handle->max_intr);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
tmp_handle = *intr_handle;
|
||||
/* Create new eventfd for interrupt vector */
|
||||
tmp_handle.fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
|
||||
if (tmp_handle.fd == -1)
|
||||
return -ENODEV;
|
||||
|
||||
/* Register vector interrupt callback */
|
||||
rc = rte_intr_callback_register(&tmp_handle, cb, data);
|
||||
if (rc) {
|
||||
otx2_err("Failed to register vector:0x%x irq callback.", vec);
|
||||
return rc;
|
||||
}
|
||||
|
||||
intr_handle->efds[vec] = tmp_handle.fd;
|
||||
intr_handle->nb_efd = (vec > intr_handle->nb_efd) ?
|
||||
vec : intr_handle->nb_efd;
|
||||
if ((intr_handle->nb_efd + 1) > intr_handle->max_intr)
|
||||
intr_handle->max_intr = intr_handle->nb_efd + 1;
|
||||
|
||||
otx2_base_dbg("Enable vector:0x%x for vfio (efds: %d, max:%d)",
|
||||
vec, intr_handle->nb_efd, intr_handle->max_intr);
|
||||
|
||||
/* Enable MSIX vectors to VFIO */
|
||||
return irq_config(intr_handle, vec);
|
||||
}
|
||||
|
||||
/**
|
||||
* @internal
|
||||
* Unregister IRQ
|
||||
*/
|
||||
void
|
||||
otx2_unregister_irq(struct rte_intr_handle *intr_handle,
|
||||
rte_intr_callback_fn cb, void *data, unsigned int vec)
|
||||
{
|
||||
struct rte_intr_handle tmp_handle;
|
||||
|
||||
if (vec > intr_handle->max_intr) {
|
||||
otx2_err("Error unregistering MSI-X interrupts vec:%d > %d",
|
||||
vec, intr_handle->max_intr);
|
||||
return;
|
||||
}
|
||||
|
||||
tmp_handle = *intr_handle;
|
||||
tmp_handle.fd = intr_handle->efds[vec];
|
||||
if (tmp_handle.fd == -1)
|
||||
return;
|
||||
|
||||
/* Un-register callback func from eal lib */
|
||||
rte_intr_callback_unregister(&tmp_handle, cb, data);
|
||||
|
||||
otx2_base_dbg("Disable vector:0x%x for vfio (efds: %d, max:%d)",
|
||||
vec, intr_handle->nb_efd, intr_handle->max_intr);
|
||||
|
||||
if (intr_handle->efds[vec] != -1)
|
||||
close(intr_handle->efds[vec]);
|
||||
/* Disable MSIX vectors from VFIO */
|
||||
intr_handle->efds[vec] = -1;
|
||||
irq_config(intr_handle, vec);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
/**
|
||||
* @internal
|
||||
* Register IRQ
|
||||
*/
|
||||
int otx2_register_irq(__rte_unused struct rte_intr_handle *intr_handle,
|
||||
__rte_unused rte_intr_callback_fn cb,
|
||||
__rte_unused void *data, __rte_unused unsigned int vec)
|
||||
{
|
||||
return -ENOTSUP;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @internal
|
||||
* Unregister IRQ
|
||||
*/
|
||||
void otx2_unregister_irq(__rte_unused struct rte_intr_handle *intr_handle,
|
||||
__rte_unused rte_intr_callback_fn cb,
|
||||
__rte_unused void *data, __rte_unused unsigned int vec)
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* @internal
|
||||
* Disable IRQ
|
||||
*/
|
||||
int otx2_disable_irqs(__rte_unused struct rte_intr_handle *intr_handle)
|
||||
{
|
||||
return -ENOTSUP;
|
||||
}
|
||||
|
||||
#endif /* RTE_EAL_VFIO */
|
@ -16,4 +16,10 @@ typedef struct {
|
||||
uint64_t bits[MAX_VFPF_DWORD_BITS];
|
||||
} otx2_intr_t;
|
||||
|
||||
int otx2_register_irq(struct rte_intr_handle *intr_handle,
|
||||
rte_intr_callback_fn cb, void *data, unsigned int vec);
|
||||
void otx2_unregister_irq(struct rte_intr_handle *intr_handle,
|
||||
rte_intr_callback_fn cb, void *data, unsigned int vec);
|
||||
int otx2_disable_irqs(struct rte_intr_handle *intr_handle);
|
||||
|
||||
#endif /* _OTX2_IRQ_H_ */
|
||||
|
@ -21,5 +21,9 @@ DPDK_19.08 {
|
||||
otx2_mbox_msg_send;
|
||||
otx2_mbox_wait_for_rsp;
|
||||
|
||||
otx2_disable_irqs;
|
||||
otx2_unregister_irq;
|
||||
otx2_register_irq;
|
||||
|
||||
local: *;
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user