octeontx2-af: Sync NIX and NPA contexts from NDC to LLC/DRAM
Subsystems (4)
Subbaraya Sundeep
maintainerPATCH 1/1 octeontx2-af: Sync NIX and NPA contexts from NDC to LLC/DRAM
From: Nithin Dabilpuram <[email protected]>
Octeontx2 hardware uses Near Data Cache(NDC) block to cache contexts in it so that access to LLC/DRAM can be avoided. It is recommended in HRM to sync the NDC contents before releasing/resetting LF resources. Hence implement NDC_SYNC mailbox and sync contexts during driver teardown.
--- drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 8 +++ drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 66 ++++++++++++++++++++++ drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 1 + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 4 +- .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 2 + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 24 ++++++++ 6 files changed, 102 insertions(+), 3 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/mbox.h +8 -0
@@ -139,6 +139,7 @@ M(MSIX_OFFSET, 0x005, msix_offset, msg_req, msix_offset_rsp) \ M(VF_FLR, 0x006, vf_flr, msg_req, msg_rsp) \ M(PTP_OP, 0x007, ptp_op, ptp_req, ptp_rsp) \ M(GET_HW_CAP, 0x008, get_hw_cap, msg_req, get_hw_cap_rsp) \ +M(NDC_SYNC_OP, 0x009, ndc_sync_op, ndc_sync_op, msg_rsp) \M (LMTST_TBL_SETUP ,0x00a , lmtst_tbl_setup, lmtst_tbl_setup_req, \ msg_rsp) \M (SET_VF_PERM ,0x00b , set_vf_perm, set_vf_perm, msg_rsp) \
@@ -1716,6 +1717,13 @@ struct lmtst_tbl_setup_req {u64 rsvd[4 ]; }; +struct ndc_sync_op { +struct mbox_msghdr hdr; +u8 nix_lf_tx_sync; +u8 nix_lf_rx_sync; +u8 npa_lf_sync; +}; +/* CPT mailbox error codes * Range 901 - 1000. */
drivers/net/ethernet/marvell/octeontx2/af/rvu.c +66 -0
78 lines not on this page · raw message
drivers/net/ethernet/marvell/octeontx2/af/rvu.h +1 -0
@@ -800,6 +800,7 @@ int rvu_lf_reset(struct rvu *rvu, struct rvu_block *block, int lf);int rvu_get_blkaddr (struct rvu *rvu,int blktype,u16 pcifunc);int rvu_poll_reg (struct rvu *rvu,u64 block,u64 offset,u64 mask,bool zero);int rvu_get_num_lbk_chans (void ); +int rvu_ndc_sync (struct rvu *rvu,int lfblkid,int lfidx,u64 lfoffset);int rvu_get_blkaddr_from_slot (struct rvu *rvu,int blktype,u16 pcifunc,u16 global_slot,u16 *slot_in_block);
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +1 -3
@@ -2497,9 +2497,7 @@ static int nix_txschq_free(struct rvu *rvu, u16 pcifunc) }mutex_unlock (&rvu->rsrc_lock); -/* Sync cached info for this LF in NDC-TX to LLC/DRAM */ -rvu_write64 (rvu, blkaddr,NIX_AF_NDC_TX_SYNC ,BIT_ULL (12 ) | nixlf); - err =rvu_poll_reg (rvu, blkaddr,NIX_AF_NDC_TX_SYNC ,BIT_ULL (12 ), true); + err =rvu_ndc_sync (rvu, blkaddr, nixlf,NIX_AF_NDC_TX_SYNC );if (err)dev_err (rvu->dev,"NDC-TX sync failed for NIXLF %d\n" , nixlf);
drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.h +2 -0
@@ -121,6 +121,7 @@#define NPA_AF_LF_RST (0x0020)#define NPA_AF_GEN_CFG (0x0030)#define NPA_AF_NDC_CFG (0x0040) +#define NPA_AF_NDC_SYNC (0x0050)#define NPA_AF_INP_CTL (0x00D0)#define NPA_AF_ACTIVE_CYCLES_PC (0x00F0)#define NPA_AF_AVG_DELAY (0x0100)
@@ -239,6 +240,7 @@#define NIX_AF_RX_CPTX_INST_ADDR (0x0310)#define NIX_AF_RX_CPTX_INST_QSEL (a) (0x0320ull | (uint64_t)(a) << 3)#define NIX_AF_RX_CPTX_CREDIT (a) (0x0360ull | (uint64_t)(a) << 3) +#define NIX_AF_NDC_RX_SYNC (0x03E0)#define NIX_AF_NDC_TX_SYNC (0x03F0)#define NIX_AF_AQ_CFG (0x0400)#define NIX_AF_AQ_BASE (0x0410)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +24 -0
@@ -3245,6 +3245,29 @@ static int otx2_sriov_configure(struct pci_dev *pdev, int numvfs)return otx2_sriov_enable (pdev, numvfs); } +static void otx2_ndc_sync (struct otx2_nic *pf) +{ +struct mbox *mbox = &pf->mbox; +struct ndc_sync_op *req; + +mutex_lock (&mbox->lock); + + req =otx2_mbox_alloc_msg_ndc_sync_op (mbox); +if (!req) { +mutex_unlock (&mbox->lock); +return ; + } + + req->nix_lf_tx_sync =1 ; + req->nix_lf_rx_sync =1 ; + req->npa_lf_sync =1 ; + +if (!otx2_sync_mbox_msg (mbox)) +dev_err (pf->dev,"NDC sync operation failed\n" ); + +mutex_unlock (&mbox->lock); +} +static void otx2_remove (struct pci_dev *pdev) {struct net_device *netdev =pci_get_drvdata (pdev);
@@ -3293,6 +3316,7 @@ static void otx2_remove(struct pci_dev *pdev)otx2_mcam_flow_del (pf);otx2_shutdown_tc (pf);otx2_shutdown_qos (pf); +otx2_ndc_sync (pf);otx2_detach_resources (&pf->mbox);if (pf->hw.lmt_info)free_percpu (pf->hw.lmt_info);
Signature · 1 line
2.7.4
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Quoted 9 lines · On Fri, 28 Jun 2024 22:01:26 +0530 you wrote:
From: Nithin Dabilpuram <[email protected]>
Octeontx2 hardware uses Near Data Cache(NDC) block to cache contexts in it so that access to LLC/DRAM can be avoided. It is recommended in HRM to sync the NDC contents before releasing/resetting LF resources. Hence implement
NDC_SYNCmailbox and sync contexts during driver teardown.[...]
Here is the summary with links:
- [net-next] octeontx2-af: Sync NIX and NPA contexts from NDC to LLC/DRAM
https://git.kernel.org/netdev/net-next/c/42c45ac1419c
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html