From: Mahipal Challa <mchalla@marvell.com>
To: <dev@dpdk.org>
Cc: <jerinj@marvell.com>, <pathreya@marvell.com>
Subject: [dpdk-dev] [PATCH v1 1/1] compress/octeontx: add octeontx2 SoC family support
Date: Mon, 28 Feb 2022 09:10:35 +0530 [thread overview]
Message-ID: <20220228034035.635651-1-mchalla@marvell.com> (raw)
The octeontx2 9xxx SoC family support is added.
Signed-off-by: Mahipal Challa <mchalla@marvell.com>
---
drivers/compress/octeontx/include/zip_regs.h | 12 ++++++++++++
drivers/compress/octeontx/otx_zip.c | 6 +++++-
drivers/compress/octeontx/otx_zip.h | 1 +
drivers/compress/octeontx/otx_zip_pmd.c | 6 ++++++
4 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/drivers/compress/octeontx/include/zip_regs.h b/drivers/compress/octeontx/include/zip_regs.h
index 94a48cde66..a7fcccc055 100644
--- a/drivers/compress/octeontx/include/zip_regs.h
+++ b/drivers/compress/octeontx/include/zip_regs.h
@@ -63,6 +63,18 @@ typedef union {
uint64_t reserved_49_63 : 15;
#endif /* Word 0 - End */
} s;
+
+ struct zip_vqx_sbuf_addr_s9x {
+#if defined(__BIG_ENDIAN_BITFIELD) /* Word 0 - Big Endian */
+ uint64_t reserved_53_63 : 11;
+ uint64_t ptr : 46;
+ uint64_t off : 7;
+#else /* Word 0 - Little Endian */
+ uint64_t off : 7;
+ uint64_t ptr : 46;
+ uint64_t reserved_53_63 : 11;
+#endif /* Word 0 - End */
+ } s9x;
} zip_vqx_sbuf_addr_t;
/**
diff --git a/drivers/compress/octeontx/otx_zip.c b/drivers/compress/octeontx/otx_zip.c
index a9046ff351..11471dcbb4 100644
--- a/drivers/compress/octeontx/otx_zip.c
+++ b/drivers/compress/octeontx/otx_zip.c
@@ -58,7 +58,11 @@ zipvf_q_init(struct zipvf_qp *qp)
cmdq->iova = iova;
que_sbuf_addr.u = 0ull;
- que_sbuf_addr.s.ptr = (cmdq->iova >> 7);
+ if (vf->pdev->id.device_id == PCI_DEVICE_ID_OCTEONTX2_ZIPVF)
+ que_sbuf_addr.s9x.ptr = (cmdq->iova >> 7);
+ else
+ que_sbuf_addr.s.ptr = (cmdq->iova >> 7);
+
zip_reg_write64(vf->vbar0, ZIP_VQ_SBUF_ADDR, que_sbuf_addr.u);
zip_q_enable(qp);
diff --git a/drivers/compress/octeontx/otx_zip.h b/drivers/compress/octeontx/otx_zip.h
index 118a95d738..46c80c8dc2 100644
--- a/drivers/compress/octeontx/otx_zip.h
+++ b/drivers/compress/octeontx/otx_zip.h
@@ -30,6 +30,7 @@ extern int octtx_zip_logtype_driver;
#define PCI_VENDOR_ID_CAVIUM 0x177D
/**< PCI device id of ZIP VF */
#define PCI_DEVICE_ID_OCTEONTX_ZIPVF 0xA037
+#define PCI_DEVICE_ID_OCTEONTX2_ZIPVF 0xA083
/* maximum number of zip vf devices */
#define ZIP_MAX_VFS 8
diff --git a/drivers/compress/octeontx/otx_zip_pmd.c b/drivers/compress/octeontx/otx_zip_pmd.c
index f9b8f7a1ec..dff188e223 100644
--- a/drivers/compress/octeontx/otx_zip_pmd.c
+++ b/drivers/compress/octeontx/otx_zip_pmd.c
@@ -85,7 +85,9 @@ zip_process_op(struct rte_comp_op *op,
op->status = RTE_COMP_OP_STATUS_ERROR;
}
+#ifdef ZIP_DBG
ZIP_PMD_INFO("written %d\n", zresult->s.totalbyteswritten);
+#endif
/* Update op stats */
switch (op->status) {
@@ -630,6 +632,10 @@ static struct rte_pci_id pci_id_octtx_zipvf_table[] = {
RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM,
PCI_DEVICE_ID_OCTEONTX_ZIPVF),
},
+ {
+ RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM,
+ PCI_DEVICE_ID_OCTEONTX2_ZIPVF),
+ },
{
.device_id = 0
},
--
2.25.1
next reply other threads:[~2022-02-28 3:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-28 3:40 Mahipal Challa [this message]
2022-04-28 10:17 ` [EXT] " Akhil Goyal
2022-04-28 15:50 ` Ashish Gupta
2022-04-29 9:42 ` Akhil Goyal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220228034035.635651-1-mchalla@marvell.com \
--to=mchalla@marvell.com \
--cc=dev@dpdk.org \
--cc=jerinj@marvell.com \
--cc=pathreya@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).