On Thu, Oct 3, 2024 at 7:19 PM Vamsi Krishna <[email protected]> wrote: > > From: Vamsi Attunuru <[email protected]> > > Allow configuration of dpi dma queue priority through dpi > dev open mbox request.
dpi-> DPI dma -> DMA dpi dev open mbox request-> mailbox request. > > Signed-off-by: Vamsi Attunuru <[email protected]> > --- > Depends-on: patch-144960 ("dmadev: support priority configuration") > > drivers/common/cnxk/roc_dpi.c | 2 ++ > drivers/common/cnxk/roc_dpi.h | 1 + > drivers/common/cnxk/roc_dpi_priv.h | 2 ++ > drivers/dma/cnxk/cnxk_dmadev.c | 6 ++++++ > drivers/dma/cnxk/cnxk_dmadev.h | 1 + > 5 files changed, 12 insertions(+) > > diff --git a/drivers/common/cnxk/roc_dpi.c b/drivers/common/cnxk/roc_dpi.c > index 892685d185..71edfcbf9b 100644 > --- a/drivers/common/cnxk/roc_dpi.c > +++ b/drivers/common/cnxk/roc_dpi.c > @@ -95,6 +95,7 @@ roc_dpi_configure(struct roc_dpi *roc_dpi, uint32_t > chunk_sz, uint64_t aura, uin > mbox_msg.u[1] = 0; > /* DPI PF driver expects vfid starts from index 0 */ > mbox_msg.s.vfid = roc_dpi->vfid; > + mbox_msg.s.pri = roc_dpi->priority; > mbox_msg.s.cmd = DPI_QUEUE_OPEN; > mbox_msg.s.csize = chunk_sz; > mbox_msg.s.aura = aura; > @@ -137,6 +138,7 @@ roc_dpi_configure_v2(struct roc_dpi *roc_dpi, uint32_t > chunk_sz, uint64_t aura, > mbox_msg.u[1] = 0; > /* DPI PF driver expects vfid starts from index 0 */ > mbox_msg.s.vfid = roc_dpi->vfid; > + mbox_msg.s.pri = roc_dpi->priority; > mbox_msg.s.cmd = DPI_QUEUE_OPEN_V2; > mbox_msg.s.csize = chunk_sz / 8; > mbox_msg.s.aura = aura; > diff --git a/drivers/common/cnxk/roc_dpi.h b/drivers/common/cnxk/roc_dpi.h > index 7b4f9d4f4f..3a11559df9 100644 > --- a/drivers/common/cnxk/roc_dpi.h > +++ b/drivers/common/cnxk/roc_dpi.h > @@ -9,6 +9,7 @@ struct roc_dpi { > struct plt_pci_device *pci_dev; > uint8_t *rbase; > uint16_t vfid; > + uint8_t priority; > } __plt_cache_aligned; > > int __roc_api roc_dpi_dev_init(struct roc_dpi *roc_dpi, uint8_t offset); > diff --git a/drivers/common/cnxk/roc_dpi_priv.h > b/drivers/common/cnxk/roc_dpi_priv.h > index 844e5f37ee..1f975915f7 100644 > --- a/drivers/common/cnxk/roc_dpi_priv.h > +++ b/drivers/common/cnxk/roc_dpi_priv.h > @@ -38,6 +38,8 @@ typedef union dpi_mbox_msg_t { > uint64_t wqecs : 1; > /* WQE queue DMA completion status offset */ > uint64_t wqecsoff : 8; > + /* Priority */ > + uint64_t pri : 1; > } s; > } dpi_mbox_msg_t; > > diff --git a/drivers/dma/cnxk/cnxk_dmadev.c b/drivers/dma/cnxk/cnxk_dmadev.c > index 2d5307b22e..9437c48a82 100644 > --- a/drivers/dma/cnxk/cnxk_dmadev.c > +++ b/drivers/dma/cnxk/cnxk_dmadev.c > @@ -20,6 +20,10 @@ cnxk_dmadev_info_get(const struct rte_dma_dev *dev, struct > rte_dma_info *dev_inf > RTE_DMA_CAPA_DEV_TO_MEM | > RTE_DMA_CAPA_DEV_TO_DEV | > RTE_DMA_CAPA_OPS_COPY | RTE_DMA_CAPA_OPS_COPY_SG > | > RTE_DMA_CAPA_M2D_AUTO_FREE; > + if (roc_model_is_cn10k()) { Add new to roc_feature_dpi_has_priority() to support in CN20K like other features. > + dev_info->dev_capa |= RTE_DMA_CAPA_PRI_POLICY_SP; > + dev_info->nb_priorities = CNXK_DPI_MAX_PRI; > + } > dev_info->max_desc = CNXK_DPI_MAX_DESC; > dev_info->min_desc = CNXK_DPI_MIN_DESC; > dev_info->max_sges = CNXK_DPI_MAX_POINTER; > @@ -107,6 +111,8 @@ cnxk_dmadev_configure(struct rte_dma_dev *dev, const > struct rte_dma_conf *conf, > */ > cnxk_dmadev_vchan_free(dpivf, RTE_DMA_ALL_VCHAN); > dpivf->num_vchans = conf->nb_vchans; > + if (roc_model_is_cn10k()) > + dpivf->rdpi.priority = conf->priority; > > return 0; > } > diff --git a/drivers/dma/cnxk/cnxk_dmadev.h b/drivers/dma/cnxk/cnxk_dmadev.h > index 15af1d64dc..64c9a94c0d 100644 > --- a/drivers/dma/cnxk/cnxk_dmadev.h > +++ b/drivers/dma/cnxk/cnxk_dmadev.h > @@ -28,6 +28,7 @@ > ((s).var - 1)) > #define CNXK_DPI_MAX_DESC 32768 > #define CNXK_DPI_MIN_DESC 2 > +#define CNXK_DPI_MAX_PRI 2 if it is different for CN20k, Use _CN10K_ after DPI or so. With that change: Acked-by: Jerin Jacob <[email protected]> > #define CNXK_DPI_MAX_VCHANS_PER_QUEUE 4 > #define CNXK_DPI_QUEUE_BUF_SIZE 16256 > #define CNXK_DPI_QUEUE_BUF_SIZE_V2 130944 > -- > 2.34.1 >
