diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-09-04 17:55:53 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-09-04 17:55:53 +0300 |
| commit | 2bd84652053c03a503a2ae99685d9535b651d021 (patch) | |
| tree | 0bc87360828b379789cd7d7a9244dc56ef6d40be /drivers/net/ethernet/marvell/octeontx2/af/cgx.c | |
| parent | 2957975756291d8dbf4f744dbe68278f319b7de7 (diff) | |
| parent | 4645fefac0b24d509b962c096b0327e87f34b1d2 (diff) | |
| download | linux-rolling-stable.tar.xz | |
Merge v6.16.5linux-rolling-stable
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/marvell/octeontx2/af/cgx.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c index 971993586fb4..442305463cc0 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c @@ -1940,6 +1940,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); |