Commit d280233f authored by Hariprasad Kelam's avatar Hariprasad Kelam Committed by Jakub Kicinski
Browse files

Octeontx2-af: Fix NIX X2P calibration failures 



Before configuring the NIX block, the AF driver initiates the
"NIX block X2P bus calibration" and verifies that NIX interfaces
such as CGX and LBK are active and functioning correctly.

On few silicon variants(CNF10KA and CNF10KB), X2P calibration failures
have been observed on some CGX blocks that are not mapped to the NIX block.

Since both NIX-mapped and non-NIX-mapped CGX blocks share the same
VENDOR,DEVICE,SUBSYS_DEVID, it's not possible to skip probe based on
these parameters.

This patch introuduces "is_cgx_mapped_to_nix" API to detect and skip
probe of non NIX mapped CGX blocks.

Fixes: aba53d5d ("octeontx2-af: NIX block admin queue init")
Signed-off-by: default avatarHariprasad Kelam <hkelam@marvell.com>
Link: https://patch.msgid.link/20250822105805.2236528-1-hkelam@marvell.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ec79003c

drivers/net/ethernet/marvell/octeontx2/af/cgx.c

+7 −0
Original line number Diff line number Diff line
@@ -1978,6 +1978,13 @@ static int cgx_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		goto err_release_regions;

	}



	if (!is_cn20k(pdev) &&

	    !is_cgx_mapped_to_nix(pdev->subsystem_device, cgx->cgx_id)) {

		dev_notice(dev, "CGX %d not mapped to NIX, skipping probe\n",

			   cgx->cgx_id);

		goto err_release_regions;

	}



	cgx->lmac_count = cgx->mac_ops->get_nr_lmacs(cgx);

	if (!cgx->lmac_count) {

		dev_notice(dev, "CGX %d LMAC count is zero, skipping probe\n", cgx->cgx_id);

drivers/net/ethernet/marvell/octeontx2/af/rvu.h

+14 −0
Original line number Diff line number Diff line
@@ -783,6 +783,20 @@ static inline bool is_cn10kb(struct rvu *rvu) 
	return false;

}



static inline bool is_cgx_mapped_to_nix(unsigned short id, u8 cgx_id)

{

	/* On CNF10KA and CNF10KB silicons only two CGX blocks are connected

	 * to NIX.

	 */

	if (id == PCI_SUBSYS_DEVID_CNF10K_A || id == PCI_SUBSYS_DEVID_CNF10K_B)

		return cgx_id <= 1;



	return !(cgx_id && !(id == PCI_SUBSYS_DEVID_96XX ||

			     id == PCI_SUBSYS_DEVID_98XX ||

			     id == PCI_SUBSYS_DEVID_CN10K_A ||

			     id == PCI_SUBSYS_DEVID_CN10K_B));

}



static inline bool is_rvu_npc_hash_extract_en(struct rvu *rvu)

{

	u64 npc_const3;