lkml.org 
[lkml]   [2022]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 020/112] net: lan966x: hardcode the number of external ports
    Date
    From: Michael Walle <michael@walle.cc>

    commit e6fa930f73a15238f3cb0c204e2f786c919b815c 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: db8bcaad5393 ("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>
    ---
    drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 8 ++------
    drivers/net/ethernet/microchip/lan966x/lan966x_main.h | 1 +
    2 files changed, 3 insertions(+), 6 deletions(-)

    --- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
    +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
    @@ -979,7 +979,7 @@ static int lan966x_probe(struct platform
    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
    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);
    --- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.h
    +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.h
    @@ -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 */

    \
     
     \ /
      Last update: 2022-07-11 11:26    [W:4.174 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site