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

Commit 4ae8dc6a authored by Vadim Lomovtsev's avatar Vadim Lomovtsev Committed by Greg Kroah-Hartman
Browse files

net: thunderx: acpi: fix LMAC initialization 




[ Upstream commit 7aa4865506a26c607e00bd9794a85785b55ebca7 ]

While probing BGX we requesting appropriate QLM for it's configuration
and get LMAC count by that request. Then, while reading configured
MAC values from SSDT table we need to save them in proper mapping:
  BGX[i]->lmac[j].mac = <MAC value>
to later provide for initialization stuff. In order to fill
such mapping properly we need to add lmac index to be used while
acpi initialization since at this moment bgx->lmac_count already contains
actual value.

Signed-off-by: default avatarVadim Lomovtsev <Vadim.Lomovtsev@caviumnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f88f06e1

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

+6 −5
Original line number Diff line number Diff line
@@ -48,8 +48,9 @@ struct lmac { 
struct bgx {

	u8			bgx_id;

	struct	lmac		lmac[MAX_LMAC_PER_BGX];

	int			lmac_count;

	u8			lmac_count;

	u8			max_lmac;

	u8                      acpi_lmac_idx;

	void __iomem		*reg_base;

	struct pci_dev		*pdev;

	bool                    is_dlm;
@@ -1159,13 +1160,13 @@ static acpi_status bgx_acpi_register_phy(acpi_handle handle, 
	if (acpi_bus_get_device(handle, &adev))

		goto out;



	acpi_get_mac_address(dev, adev, bgx->lmac[bgx->lmac_count].mac);

	acpi_get_mac_address(dev, adev, bgx->lmac[bgx->acpi_lmac_idx].mac);



	SET_NETDEV_DEV(&bgx->lmac[bgx->lmac_count].netdev, dev);

	SET_NETDEV_DEV(&bgx->lmac[bgx->acpi_lmac_idx].netdev, dev);



	bgx->lmac[bgx->lmac_count].lmacid = bgx->lmac_count;

	bgx->lmac[bgx->acpi_lmac_idx].lmacid = bgx->acpi_lmac_idx;

	bgx->acpi_lmac_idx++; /* move to next LMAC */

out:

	bgx->lmac_count++;

	return AE_OK;

}