lkml.org 
[lkml]   [2022]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC Patch net-next 08/17] net: dsa: microchip: update the ksz_phylink_get_caps
    Date
    This patch assigns the phylink_get_caps in ksz8795 and ksz9477 to
    ksz_phylink_get_caps. And update their mac_capabilities in the
    respective ksz_dev_ops.

    Signed-off-by: Arun Ramadoss <arun.ramadoss@microchip.com>
    ---
    drivers/net/dsa/microchip/ksz8795.c | 9 +++------
    drivers/net/dsa/microchip/ksz9477.c | 7 +++----
    drivers/net/dsa/microchip/ksz_common.c | 3 +++
    drivers/net/dsa/microchip/ksz_common.h | 2 ++
    4 files changed, 11 insertions(+), 10 deletions(-)

    diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
    index e6982fa9d382..25763d89c67a 100644
    --- a/drivers/net/dsa/microchip/ksz8795.c
    +++ b/drivers/net/dsa/microchip/ksz8795.c
    @@ -1353,13 +1353,9 @@ static int ksz8_setup(struct dsa_switch *ds)
    return ksz8_handle_global_errata(ds);
    }

    -static void ksz8_get_caps(struct dsa_switch *ds, int port,
    +static void ksz8_get_caps(struct ksz_device *dev, int port,
    struct phylink_config *config)
    {
    - struct ksz_device *dev = ds->priv;
    -
    - ksz_phylink_get_caps(ds, port, config);
    -
    config->mac_capabilities = MAC_10 | MAC_100;

    /* Silicon Errata Sheet (DS80000830A):
    @@ -1381,7 +1377,7 @@ static const struct dsa_switch_ops ksz8_switch_ops = {
    .setup = ksz8_setup,
    .phy_read = ksz_phy_read16,
    .phy_write = ksz_phy_write16,
    - .phylink_get_caps = ksz8_get_caps,
    + .phylink_get_caps = ksz_phylink_get_caps,
    .phylink_mac_link_down = ksz_mac_link_down,
    .port_enable = ksz_enable_port,
    .get_strings = ksz_get_strings,
    @@ -1464,6 +1460,7 @@ static const struct ksz_dev_ops ksz8_dev_ops = {
    .mirror_add = ksz8_port_mirror_add,
    .mirror_del = ksz8_port_mirror_del,
    .get_stp_reg = ksz8_get_stp_reg,
    + .get_caps = ksz8_get_caps,
    .shutdown = ksz8_reset_switch,
    .init = ksz8_switch_init,
    .exit = ksz8_switch_exit,
    diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
    index f08694aba6bb..494f93e4c7f8 100644
    --- a/drivers/net/dsa/microchip/ksz9477.c
    +++ b/drivers/net/dsa/microchip/ksz9477.c
    @@ -1073,11 +1073,9 @@ static void ksz9477_phy_errata_setup(struct ksz_device *dev, int port)
    ksz9477_port_mmd_write(dev, port, 0x1c, 0x20, 0xeeee);
    }

    -static void ksz9477_get_caps(struct dsa_switch *ds, int port,
    +static void ksz9477_get_caps(struct ksz_device *dev, int port,
    struct phylink_config *config)
    {
    - ksz_phylink_get_caps(ds, port, config);
    -
    config->mac_capabilities = MAC_10 | MAC_100 | MAC_1000FD |
    MAC_ASYM_PAUSE | MAC_SYM_PAUSE;
    }
    @@ -1307,7 +1305,7 @@ static const struct dsa_switch_ops ksz9477_switch_ops = {
    .phy_read = ksz_phy_read16,
    .phy_write = ksz_phy_write16,
    .phylink_mac_link_down = ksz_mac_link_down,
    - .phylink_get_caps = ksz9477_get_caps,
    + .phylink_get_caps = ksz_phylink_get_caps,
    .port_enable = ksz_enable_port,
    .get_strings = ksz_get_strings,
    .get_ethtool_stats = ksz_get_ethtool_stats,
    @@ -1406,6 +1404,7 @@ static const struct ksz_dev_ops ksz9477_dev_ops = {
    .mirror_add = ksz9477_port_mirror_add,
    .mirror_del = ksz9477_port_mirror_del,
    .get_stp_reg = ksz9477_get_stp_reg,
    + .get_caps = ksz9477_get_caps,
    .shutdown = ksz9477_reset_switch,
    .init = ksz9477_switch_init,
    .exit = ksz9477_switch_exit,
    diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
    index 5cf183f753d9..c1303a46a9b7 100644
    --- a/drivers/net/dsa/microchip/ksz_common.c
    +++ b/drivers/net/dsa/microchip/ksz_common.c
    @@ -456,6 +456,9 @@ void ksz_phylink_get_caps(struct dsa_switch *ds, int port,
    if (dev->info->internal_phy[port])
    __set_bit(PHY_INTERFACE_MODE_INTERNAL,
    config->supported_interfaces);
    +
    + if (dev->dev_ops->get_caps)
    + dev->dev_ops->get_caps(dev, port, config);
    }
    EXPORT_SYMBOL_GPL(ksz_phylink_get_caps);

    diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
    index 2727934b7171..8124737a1170 100644
    --- a/drivers/net/dsa/microchip/ksz_common.h
    +++ b/drivers/net/dsa/microchip/ksz_common.h
    @@ -193,6 +193,8 @@ struct ksz_dev_ops {
    void (*mirror_del)(struct ksz_device *dev, int port,
    struct dsa_mall_mirror_tc_entry *mirror);
    int (*get_stp_reg)(void);
    + void (*get_caps)(struct ksz_device *dev, int port,
    + struct phylink_config *config);
    void (*freeze_mib)(struct ksz_device *dev, int port, bool freeze);
    void (*port_init_cnt)(struct ksz_device *dev, int port);
    int (*shutdown)(struct ksz_device *dev);
    --
    2.36.1
    \
     
     \ /
      Last update: 2022-05-27 09:08    [W:4.135 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site