Skip to content

Commit

Permalink
net: thunderx: Unembed netdev structure
Browse files Browse the repository at this point in the history
Embedding net_device into structures prohibits the usage of flexible
arrays in the net_device structure. For more details, see the discussion
at [1].

Un-embed the net_devices from struct lmac by converting them
into pointers, and allocating them dynamically. Use the leverage
alloc_netdev() to allocate the net_device object at
bgx_lmac_enable().

The free of the device occurs at bgx_lmac_disable().

 Do not free_netdevice() if bgx_lmac_enable() fails after lmac->netdev
is allocated, since bgx_lmac_disable() is called if bgx_lmac_enable()
fails, and lmac->netdev will be freed there (similarly to lmac->dmacs).

Link: https://lore.kernel.org/all/[email protected]/ [1]
Signed-off-by: Breno Leitao <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
  • Loading branch information
leitao authored and kuba-moo committed Jun 27, 2024
1 parent 2d5f680 commit 94833ad
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions drivers/net/ethernet/cavium/thunder/thunder_bgx.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ struct lmac {
bool link_up;
int lmacid; /* ID within BGX */
int lmacid_bd; /* ID on board */
struct net_device netdev;
struct net_device *netdev;
struct phy_device *phydev;
unsigned int last_duplex;
unsigned int last_link;
Expand Down Expand Up @@ -590,10 +590,12 @@ static void bgx_sgmii_change_link_state(struct lmac *lmac)

static void bgx_lmac_handler(struct net_device *netdev)
{
struct lmac *lmac = container_of(netdev, struct lmac, netdev);
struct phy_device *phydev;
struct lmac *lmac, **priv;
int link_changed = 0;

priv = netdev_priv(netdev);
lmac = *priv;
phydev = lmac->phydev;

if (!phydev->link && lmac->last_link)
Expand Down Expand Up @@ -1052,12 +1054,18 @@ static int phy_interface_mode(u8 lmac_type)

static int bgx_lmac_enable(struct bgx *bgx, u8 lmacid)
{
struct lmac *lmac;
struct lmac *lmac, **priv;
u64 cfg;

lmac = &bgx->lmac[lmacid];
lmac->bgx = bgx;

lmac->netdev = alloc_netdev_dummy(sizeof(struct lmac *));
if (!lmac->netdev)
return -ENOMEM;
priv = netdev_priv(lmac->netdev);
*priv = lmac;

if ((lmac->lmac_type == BGX_MODE_SGMII) ||
(lmac->lmac_type == BGX_MODE_QSGMII) ||
(lmac->lmac_type == BGX_MODE_RGMII)) {
Expand Down Expand Up @@ -1116,7 +1124,7 @@ static int bgx_lmac_enable(struct bgx *bgx, u8 lmacid)
}
lmac->phydev->dev_flags = 0;

if (phy_connect_direct(&lmac->netdev, lmac->phydev,
if (phy_connect_direct(lmac->netdev, lmac->phydev,
bgx_lmac_handler,
phy_interface_mode(lmac->lmac_type)))
return -ENODEV;
Expand Down Expand Up @@ -1183,6 +1191,7 @@ static void bgx_lmac_disable(struct bgx *bgx, u8 lmacid)
(lmac->lmac_type != BGX_MODE_10G_KR) && lmac->phydev)
phy_disconnect(lmac->phydev);

free_netdev(lmac->netdev);
lmac->phydev = NULL;
}

Expand Down Expand Up @@ -1414,7 +1423,7 @@ static acpi_status bgx_acpi_register_phy(acpi_handle handle,

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

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

bgx->lmac[bgx->acpi_lmac_idx].lmacid = bgx->acpi_lmac_idx;
bgx->acpi_lmac_idx++; /* move to next LMAC */
Expand Down Expand Up @@ -1483,7 +1492,7 @@ static int bgx_init_of_phy(struct bgx *bgx)

of_get_mac_address(node, bgx->lmac[lmac].mac);

SET_NETDEV_DEV(&bgx->lmac[lmac].netdev, &bgx->pdev->dev);
SET_NETDEV_DEV(bgx->lmac[lmac].netdev, &bgx->pdev->dev);
bgx->lmac[lmac].lmacid = lmac;

phy_np = of_parse_phandle(node, "phy-handle", 0);
Expand Down

0 comments on commit 94833ad

Please sign in to comment.