Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 612e94bd authored by Radha Mohan Chintakuntla's avatar Radha Mohan Chintakuntla Committed by David S. Miller
Browse files

net: thunderx: Introduce BGX_ID_MASK macro to extract bgx_id 



This patch fixes the 'bgx_id' determination on 83xx where there are
4 BGX blocks instead of 2 on other platforms.

Signed-off-by: default avatarRadha Mohan Chintakuntla <rchintakuntla@cavium.com>
Signed-off-by: default avatarSunil Goutham <sgoutham@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b71de936

drivers/net/ethernet/cavium/thunder/thunder_bgx.c

+2 −2
Original line number Diff line number Diff line
@@ -1242,8 +1242,8 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	pci_read_config_word(pdev, PCI_DEVICE_ID, &sdevid);

	if (sdevid != PCI_DEVICE_ID_THUNDER_RGX) {

		bgx->bgx_id =

		    (pci_resource_start(pdev, PCI_CFG_REG_BAR_NUM) >> 24) & 1;

		bgx->bgx_id = (pci_resource_start(pdev,

			PCI_CFG_REG_BAR_NUM) >> 24) & BGX_ID_MASK;

		bgx->bgx_id += nic_get_node_id(pdev) * MAX_BGX_PER_NODE;

		bgx->max_lmac = MAX_LMAC_PER_BGX;

		bgx_vnic[bgx->bgx_id] = bgx;

drivers/net/ethernet/cavium/thunder/thunder_bgx.h

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#define    MAX_DMAC_PER_LMAC			8

#define    MAX_FRAME_SIZE			9216



#define	   BGX_ID_MASK				0x3



#define    MAX_DMAC_PER_LMAC_TNS_BYPASS_MODE	2



/* Registers */