mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-07 09:09:23 +00:00
net: lan966x: hardcode the number of external ports
commite6fa930f73
upstream. Instead of counting the child nodes in the device tree, hardcode the number of ports in the driver itself. The counting won't work at all if an ethernet port is marked as disabled, e.g. because it is not connected on the board at all. It turns out that the LAN9662 and LAN9668 use the same switching IP with the same synthesis parameters. The only difference is that the output ports are not connected. Thus, we can just hardcode the number of physical ports to 8. Fixes:db8bcaad53
("net: lan966x: add the basic lan966x driver") Signed-off-by: Michael Walle <michael@walle.cc> Reviewed-by: Horatiu Vultur <horatiu.vultur@microchip.com> Link: https://lore.kernel.org/r/20220704153654.1167886-1-michael@walle.cc Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
df049dad18
commit
33ab04a1f3
2 changed files with 3 additions and 6 deletions
|
@ -979,7 +979,7 @@ static int lan966x_probe(struct platform_device *pdev)
|
|||
struct fwnode_handle *ports, *portnp;
|
||||
struct lan966x *lan966x;
|
||||
u8 mac_addr[ETH_ALEN];
|
||||
int err, i;
|
||||
int err;
|
||||
|
||||
lan966x = devm_kzalloc(&pdev->dev, sizeof(*lan966x), GFP_KERNEL);
|
||||
if (!lan966x)
|
||||
|
@ -1010,11 +1010,7 @@ static int lan966x_probe(struct platform_device *pdev)
|
|||
if (err)
|
||||
return dev_err_probe(&pdev->dev, err, "Reset failed");
|
||||
|
||||
i = 0;
|
||||
fwnode_for_each_available_child_node(ports, portnp)
|
||||
++i;
|
||||
|
||||
lan966x->num_phys_ports = i;
|
||||
lan966x->num_phys_ports = NUM_PHYS_PORTS;
|
||||
lan966x->ports = devm_kcalloc(&pdev->dev, lan966x->num_phys_ports,
|
||||
sizeof(struct lan966x_port *),
|
||||
GFP_KERNEL);
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
/* Reserved amount for (SRC, PRIO) at index 8*SRC + PRIO */
|
||||
#define QSYS_Q_RSRV 95
|
||||
|
||||
#define NUM_PHYS_PORTS 8
|
||||
#define CPU_PORT 8
|
||||
|
||||
/* Reserved PGIDs */
|
||||
|
|
Loading…
Reference in a new issue