From ce71c433395e040d83c77e39f1d98cd813d1f6af Mon Sep 17 00:00:00 2001 From: Jiangshan Yi Date: Thu, 10 Sep 2026 18:41:02 +0800 Subject: [PATCH] octeontx2-af: consolidate RVU AFVF device id definitions commit f695390ea639 ("octeontx2-af: Fix limiting SRIOV VF count logic") added a local PCI_DEVID_OCTEONTX2_RVU_AFVF define in rvu.c, although the same value was already defined twice elsewhere: as RVU_LBK_VF_DEVID in af/rvu.h and as PCI_DEVID_OCTEONTX2_RVU_AFVF in nic/otx2_common.h. Move the definition into the "PCI device IDs" block in af/rvu.h, rename RVU_LBK_VF_DEVID to match the PCI_DEVID_* naming convention of its peers, and drop the redundant copies in rvu.c and nic/otx2_common.h, the latter already including through the af include path. No functional change. Signed-off-by: Jiangshan Yi Acked-by: Ratheesh Kannoth Reviewed-by: Simon Horman Link: https://patch.msgid.link/20260910104102.590989-1-yijiangshan@kylinos.cn Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 2 -- drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 4 ++-- drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c index b8f81e068f53..30e148291581 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c @@ -3468,8 +3468,6 @@ err: return ret; } -#define PCI_DEVID_OCTEONTX2_RVU_AFVF 0xA0F8 - static int rvu_enable_sriov(struct rvu *rvu) { struct pci_dev *pdev = rvu->pdev; diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h index 9afb7ac8969b..fb4870cd18e9 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h @@ -22,6 +22,7 @@ /* PCI device IDs */ #define PCI_DEVID_OCTEONTX2_RVU_AF 0xA065 +#define PCI_DEVID_OCTEONTX2_RVU_AFVF 0xA0F8 #define PCI_DEVID_OCTEONTX2_LBK 0xA061 /* Subsystem Device ID */ @@ -882,11 +883,10 @@ static inline bool is_rvu_supports_nix1(struct rvu *rvu) /* Function Prototypes * RVU */ -#define RVU_LBK_VF_DEVID 0xA0F8 static inline bool is_lbk_vf(struct rvu *rvu, u16 pcifunc) { return (!(pcifunc & ~RVU_PFVF_FUNC_MASK) && - (rvu->vf_devid == RVU_LBK_VF_DEVID)); + (rvu->vf_devid == PCI_DEVID_OCTEONTX2_RVU_AFVF)); } static inline bool is_vf(u16 pcifunc) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h index eecee612b7b2..5850bc1870a1 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h @@ -42,7 +42,6 @@ /* PCI device IDs */ #define PCI_DEVID_OCTEONTX2_RVU_PF 0xA063 #define PCI_DEVID_OCTEONTX2_RVU_VF 0xA064 -#define PCI_DEVID_OCTEONTX2_RVU_AFVF 0xA0F8 #define PCI_SUBSYS_DEVID_96XX_RVU_PFVF 0xB200 #define PCI_SUBSYS_DEVID_CN10K_A_RVU_PFVF 0xB900