From: Ruiqiang Hao <[email protected]>
commit ec0db81883b4(octeontx2-pf: Use hardware register for CQE count)
introduced duplicate function definition 'otx2_nix_cq_op_status', this
function already available in SDK11's patches, so delete one to solve
the following compiling issue.
drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c:57:12: error:
redefinition of 'otx2_nix_cq_op_status'
57 | static int otx2_nix_cq_op_status(struct otx2_nic *pfvf,
| ^~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c:28:19: note: previous
definition of 'otx2_nix_cq_op_status' with type 'int(struct otx2_nic *, struct
otx2_cq_queue *)'
28 | static inline int otx2_nix_cq_op_status(struct otx2_nic *pfvf,
| ^~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Ruiqiang Hao <[email protected]>
---
.../marvell/octeontx2/nic/otx2_txrx.c | 25 -------------------
1 file changed, 25 deletions(-)
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c
b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c
index 7751db3b1daf..84813fbea855 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c
@@ -25,31 +25,6 @@
*/
#define PTP_SYNC_SEC_OFFSET 34
-static inline int otx2_nix_cq_op_status(struct otx2_nic *pfvf,
- struct otx2_cq_queue *cq)
-{
- u64 incr = (u64)(cq->cq_idx) << 32;
- u64 status;
-
- status = otx2_atomic64_fetch_add(incr, pfvf->cq_op_addr);
-
- if (unlikely(status & BIT_ULL(CQ_OP_STAT_OP_ERR) ||
- status & BIT_ULL(CQ_OP_STAT_CQ_ERR))) {
- dev_err(pfvf->dev, "CQ stopped due to error");
- return -EINVAL;
- }
-
- cq->cq_tail = status & 0xFFFFF;
- cq->cq_head = (status >> 20) & 0xFFFFF;
- if (cq->cq_tail < cq->cq_head)
- cq->pend_cqe = (cq->cqe_cnt - cq->cq_head) +
- cq->cq_tail;
- else
- cq->pend_cqe = cq->cq_tail - cq->cq_head;
-
- return 0;
-}
-
static inline bool otx2_xdp_rcv_pkt_handler(struct otx2_nic *pfvf,
struct nix_cqe_rx_s *cqe,
struct otx2_cq_queue *cq);
--
2.38.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11989):
https://lists.yoctoproject.org/g/linux-yocto/message/11989
Mute This Topic: https://lists.yoctoproject.org/mt/95459471/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
