net: dsa: microchip: add MIB counters support
v4 cover net: dsa: microchip: add MIB counters support
From: Tristram Ha <[email protected]>
This series of patches is to modify the KSZ9477 DSA driver to read MIB counters periodically to avoid overflow.
The MIB counters should be read only when there is link. Otherwise it is a waste of time as hardware never increases the counters.
Functions are added to check the port link status so that MIB counters read call is used efficiently.
v4
- Use readx_poll_timeout
- Fix using mutex in a timer callback function problem
- use dp->slave directly instead of checking whether it is valid
- Add port_cleanup function in a separate patch
- Add a mutex so that changing device variables is safe
v3
- Use netif_carrier_ok instead of checking the phy device pointer
v2
- Create macro similar to readx_poll_timeout to use with switch
- Create ksz_port_cleanup function so that variables like on_ports and live_ports can be updated inside it
v1
- Use readx_poll_timeout
- Do not clear MIB counters when port is enabled
- Do not advertise 1000 half-duplex mode when port is enabled
- Do not use freeze function as MIB counters may miss counts
Tristram Ha (5):
net: dsa: microchip: prepare PHY for proper advertisement
net: dsa: microchip: add MIB counter reading support
net: dsa: microchip: get port link status
net: dsa: microchip: remove unnecessary include headers
net: dsa: microchip: add port_cleanup function
drivers/net/dsa/microchip/ksz9477.c | 147 ++++++++++++++++++++++----------- drivers/net/dsa/microchip/ksz_common.c | 142 ++++++++++++++++++++++++++++++- drivers/net/dsa/microchip/ksz_common.h | 21 ++++- drivers/net/dsa/microchip/ksz_priv.h | 15 ++-- 4 files changed, 270 insertions(+), 55 deletions(-)
Signature · 1 line
1.9.1
PATCH v4 1/5 net: dsa: microchip: prepare PHY for proper advertisement
From: Tristram Ha <[email protected]>
Prepare PHY for proper advertisement as sometimes the PHY in the switch has its own problems even though it may share the PHY id from regular PHY but the fixes in the PHY driver do not apply.
--- drivers/net/dsa/microchip/ksz9477.c | 13 ++++++++++++- drivers/net/dsa/microchip/ksz_common.c | 3 ++- drivers/net/dsa/microchip/ksz_priv.h | 4 +++- 3 files changed, 17 insertions(+), 3 deletions(-)
drivers/net/dsa/microchip/ksz9477.c +12 -1
@@ -2,7 +2,7 @@/* * Microchip KSZ9477 switch driver main logic * -* Copyright (C) 2017-2018 Microchip Technology Inc. +* Copyright (C) 2017-2019 Microchip Technology Inc. */ #include <linux/delay.h>
@@ -966,6 +966,16 @@ static void ksz9477_port_mirror_del(struct dsa_switch *ds, int port, PORT_MIRROR_SNIFFER, false); } +static void ksz9477_phy_setup (struct ksz_device *dev,int port, +struct phy_device *phy) +{ +if (port < dev->phy_port_cnt) { +/* The MAC actually cannot run in 1000 half-duplex mode. */ +phy_remove_link_mode (phy, + ETHTOOL_LINK_MODE_1000baseT_Half_BIT); + } +} +static void ksz9477_port_setup (struct ksz_device *dev,int port,bool cpu_port) {u8 data8;
@@ -1299,6 +1309,7 @@ static void ksz9477_switch_exit(struct ksz_device *dev) .get_port_addr = ksz9477_get_port_addr, .cfg_port_member = ksz9477_cfg_port_member, .flush_dyn_mac_table = ksz9477_flush_dyn_mac_table, + .phy_setup = ksz9477_phy_setup, .port_setup = ksz9477_port_setup, .shutdown = ksz9477_reset_switch, .detect = ksz9477_switch_detect,
drivers/net/dsa/microchip/ksz_common.c +2 -1
@@ -2,7 +2,7 @@/* * Microchip switch driver main logic * -* Copyright (C) 2017-2018 Microchip Technology Inc. +* Copyright (C) 2017-2019 Microchip Technology Inc. */ #include <linux/delay.h>
@@ -238,6 +238,7 @@ int ksz_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy)/* setup slave port */ dev->dev_ops->port_setup (dev, port, false); + dev->dev_ops->phy_setup (dev, port, phy);/* port_stp_state_set() will be called after to enable the port so * there is no need to do anything.
drivers/net/dsa/microchip/ksz_priv.h +3 -1
@@ -2,7 +2,7 @@* * Microchip KSZ series switch common definitions * -* Copyright (C) 2017-2018 Microchip Technology Inc. +* Copyright (C) 2017-2019 Microchip Technology Inc. */ #ifndef __KSZ_PRIV_H
@@ -137,6 +137,8 @@ struct ksz_dev_ops {u32 (*get_port_addr)(int port,int offset);void (*cfg_port_member)(struct ksz_device *dev,int port,u8 member);void (*flush_dyn_mac_table)(struct ksz_device *dev,int port); +void (*phy_setup)(struct ksz_device *dev,int port, +struct phy_device *phy);void (*port_setup)(struct ksz_device *dev,int port,bool cpu_port);void (*r_phy)(struct ksz_device *dev,u16 phy,u16 reg,u16 *val);void (*w_phy)(struct ksz_device *dev,u16 phy,u16 reg,u16 val);
Signature · 1 line
1.9.1
PATCH v4 2/5 net: dsa: microchip: add MIB counter reading support
In reply to [email protected]From: Tristram Ha <[email protected]>
Add background MIB counter reading support.
Port MIB counters should only be read when there is link. Otherwise it is a waste of time as hardware never increases those counters. There are exceptions as some switches keep track of dropped counts no matter what.
--- drivers/net/dsa/microchip/ksz9477.c | 123 ++++++++++++++++++++++----------- drivers/net/dsa/microchip/ksz_common.c | 103 +++++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 18 ++++- drivers/net/dsa/microchip/ksz_priv.h | 9 ++- 4 files changed, 205 insertions(+), 48 deletions(-)
drivers/net/dsa/microchip/ksz9477.c +81 -42
@@ -10,6 +10,7 @@#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/iopoll.h> #include <linux/platform_data/microchip-ksz.h> #include <linux/phy.h> #include <linux/etherdevice.h>
@@ -18,8 +19,8 @@#include <net/switchdev.h> #include "ksz_priv.h" -#include "ksz_common.h" #include "ksz9477_reg.h" +#include "ksz_common.h" static const struct { int index;
@@ -259,6 +260,75 @@ static int ksz9477_reset_switch(struct ksz_device *dev)return 0 ; } +static void ksz9477_r_mib_cnt (struct ksz_device *dev,int port,u16 addr, +u64 *cnt) +{ +struct ksz_poll_ctx ctx = { + .dev = dev, + .port = port, + .offset =REG_PORT_MIB_CTRL_STAT__4 , + }; +struct ksz_port *p = &dev->ports[port]; +u32 data; +int ret; + +/* retain the flush/freeze bit */ + data = p->freeze ?MIB_COUNTER_FLUSH_FREEZE :0 ; + data |=MIB_COUNTER_READ ; + data |= (addr <<MIB_COUNTER_INDEX_S ); +ksz_pwrite32 (dev, port,REG_PORT_MIB_CTRL_STAT__4 , data); + + ret =readx_poll_timeout (ksz_pread32_poll, &ctx, data, + !(data &MIB_COUNTER_READ ),10 ,1000 ); + +/* failed to read MIB. get out of loop */ +if (ret <0 ) { +dev_dbg (dev->dev,"Failed to get MIB\n" ); +return ; + } + +/* count resets upon read */ +ksz_pread32 (dev, port,REG_PORT_MIB_DATA , &data); + *cnt += data; +} + +static void ksz9477_r_mib_pkt (struct ksz_device *dev,int port,u16 addr, +u64 *dropped,u64 *cnt) +{ + addr = ksz9477_mib_names[addr].index; +ksz9477_r_mib_cnt (dev, port, addr, cnt); +} + +static void ksz9477_freeze_mib (struct ksz_device *dev,int port,bool freeze) +{ +u32 val = freeze ?MIB_COUNTER_FLUSH_FREEZE :0 ; +struct ksz_port *p = &dev->ports[port]; + +/* enable/disable the port for flush/freeze function */ +mutex_lock (&p->mib.cnt_mutex); +ksz_pwrite32 (dev, port,REG_PORT_MIB_CTRL_STAT__4 , val); + +/* used by MIB counter reading code to know freeze is enabled */ + p->freeze = freeze; +mutex_unlock (&p->mib.cnt_mutex); +} + +static void ksz9477_port_init_cnt (struct ksz_device *dev,int port) +{ +struct ksz_port_mib *mib = &dev->ports[port].mib; + +/* flush all enabled port MIB counters */ +mutex_lock (&mib->cnt_mutex); +ksz_pwrite32 (dev, port,REG_PORT_MIB_CTRL_STAT__4 , +MIB_COUNTER_FLUSH_FREEZE ); +ksz_write8 (dev,REG_SW_MAC_CTRL_6 ,SW_MIB_COUNTER_FLUSH ); +ksz_pwrite32 (dev, port,REG_PORT_MIB_CTRL_STAT__4 ,0 ); +mutex_unlock (&mib->cnt_mutex); + + mib->cnt_ptr =0 ; +memset (mib->counters,0 , dev->mib_cnt *sizeof (u64)); +} +static enum dsa_tag_protocol ksz9477_get_tag_protocol (struct dsa_switch *ds,int port) {
@@ -342,47 +412,6 @@ static void ksz9477_get_strings(struct dsa_switch *ds, int port, } } -static void ksz_get_ethtool_stats (struct dsa_switch *ds,int port, -uint64_t *buf) -{ -struct ksz_device *dev = ds->priv; -int i; -u32 data; -int timeout; - -mutex_lock (&dev->stats_mutex); - -for (i =0 ; i <TOTAL_SWITCH_COUNTER_NUM ; i++) { - data =MIB_COUNTER_READ ; - data |= ((ksz9477_mib_names[i].index &0xFF ) << -MIB_COUNTER_INDEX_S ); -ksz_pwrite32 (dev, port,REG_PORT_MIB_CTRL_STAT__4 , data); - - timeout =1000 ; -do { -ksz_pread32 (dev, port,REG_PORT_MIB_CTRL_STAT__4 , - &data); -usleep_range (1 ,10 ); -if (!(data &MIB_COUNTER_READ )) -break ; - }while (timeout-- >0 ); - -/* failed to read MIB. get out of loop */ -if (!timeout) { -dev_dbg (dev->dev,"Failed to get MIB\n" ); -break ; - } - -/* count resets upon read */ -ksz_pread32 (dev, port,REG_PORT_MIB_DATA , &data); - - dev->mib_value[i] += (uint64_t )data; - buf[i] = dev->mib_value[i]; - } - -mutex_unlock (&dev->stats_mutex); -} -static void ksz9477_cfg_port_member (struct ksz_device *dev,int port,u8 member) {
@@ -1151,9 +1180,14 @@ static int ksz9477_setup(struct dsa_switch *ds)/* queue based egress rate limit */ ksz_cfg (dev,REG_SW_MAC_CTRL_5 ,SW_OUT_RATE_LIMIT_QUEUE_BASED , true); +/* enable global MIB counter freeze function */ +ksz_cfg (dev,REG_SW_MAC_CTRL_6 ,SW_MIB_COUNTER_FREEZE , true); +/* start switch */ ksz_cfg (dev,REG_SW_OPERATION ,SW_START , true); +ksz_init_mib_timer (dev); +return 0 ; }
@@ -1287,6 +1321,7 @@ static int ksz9477_switch_init(struct ksz_device *dev)if (!dev->ports)return -ENOMEM ;for (i =0 ; i < dev->mib_port_cnt; i++) { +mutex_init (&dev->ports[i].mib.cnt_mutex); dev->ports[i].mib.counters = devm_kzalloc(dev->dev, sizeof(u64) *
@@ -1311,6 +1346,10 @@ static void ksz9477_switch_exit(struct ksz_device *dev) .flush_dyn_mac_table = ksz9477_flush_dyn_mac_table, .phy_setup = ksz9477_phy_setup, .port_setup = ksz9477_port_setup, + .r_mib_cnt = ksz9477_r_mib_cnt, + .r_mib_pkt = ksz9477_r_mib_pkt, + .freeze_mib = ksz9477_freeze_mib, + .port_init_cnt = ksz9477_port_init_cnt, .shutdown = ksz9477_reset_switch, .detect = ksz9477_switch_detect, .init = ksz9477_switch_init,
drivers/net/dsa/microchip/ksz_common.c +103 -0
121 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_common.h +17 -1
@@ -1,19 +1,21 @@/* SPDX-License-Identifier: GPL-2.0 * Microchip switch driver common header * -* Copyright (C) 2017-2018 Microchip Technology Inc. +* Copyright (C) 2017-2019 Microchip Technology Inc. */ #ifndef __KSZ_COMMON_H#define __KSZ_COMMON_Hvoid ksz_update_port_member (struct ksz_device *dev,int port); +void ksz_init_mib_timer (struct ksz_device *dev);/* Common DSA access functions */ int ksz_phy_read16 (struct dsa_switch *ds,int addr,int reg);int ksz_phy_write16 (struct dsa_switch *ds,int addr,int reg,u16 val);int ksz_sset_count (struct dsa_switch *ds,int port,int sset); +void ksz_get_ethtool_stats (struct dsa_switch *ds,int port,uint64_t *buf);int ksz_port_bridge_join (struct dsa_switch *ds,int port,struct net_device *br); void ksz_port_bridge_leave(struct dsa_switch *ds, int port,
@@ -211,4 +213,18 @@ static void ksz_port_cfg(struct ksz_device *dev, int port, int offset, u8 bits, ksz_write8(dev, addr, data); } +struct ksz_poll_ctx { +struct ksz_device *dev; +int port; +int offset; +}; + +static inline u32 ksz_pread32_poll (struct ksz_poll_ctx *ctx) +{ +u32 data; + +ksz_pread32 (ctx->dev, ctx->port, ctx->offset, &data); +return data; +} +#endif
drivers/net/dsa/microchip/ksz_priv.h +4 -5
@@ -14,8 +14,6 @@#include <linux/etherdevice.h> #include <net/dsa.h> -#include "ksz9477_reg.h" -struct ksz_io_ops ;struct vlan_table {
@@ -23,6 +21,7 @@ struct vlan_table { };struct ksz_port_mib { +struct mutex cnt_mutex;/* structure access */ u8 cnt_ptr;u64 *counters; };
@@ -38,7 +37,8 @@ struct ksz_port { u32 fiber:1; /* port is fiber */ u32 sgmii:1; /* port is SGMII */ u32 force:1; - u32 link_just_down:1; /* link just goes down */ + u32 read:1; /* read MIB counters in background */ + u32 freeze:1; /* MIB counter freeze is enabled */struct ksz_port_mib mib; };
@@ -79,8 +79,6 @@ struct ksz_device {struct vlan_table *vlan_cache; -u64 mib_value[TOTAL_SWITCH_COUNTER_NUM ]; -u8 *txbuf;struct ksz_port *ports;
@@ -153,6 +151,7 @@ struct ksz_dev_ops { u64 *cnt);void (*r_mib_pkt)(struct ksz_device *dev,int port,u16 addr,u64 *dropped,u64 *cnt); +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);int (*detect)(struct ksz_device *dev);
Signature · 1 line
1.9.1
Re: [PATCH v4 net-next 2/5] net: dsa: microchip: add MIB counter reading support
Le 2/22/19 à 4:36 PM, [email protected] a écrit :
Quoted 10 lines
From: Tristram Ha <[email protected]>
Add background MIB counter reading support.
Port MIB counters should only be read when there is link. Otherwise it is a waste of time as hardware never increases those counters. There are exceptions as some switches keep track of dropped counts no matter what.
Signed-off-by Tristram Ha <[email protected]>Reviewed-by Andrew Lunn <[email protected]>
Thanks for the quick turn around in addressing feedback, this does look good now!
Signature · 1 line
Florian
PATCH v4 3/5 net: dsa: microchip: get port link status
In reply to [email protected]From: Tristram Ha <[email protected]>
Get port link status to know whether to read MIB counters when the link is going down.
--- drivers/net/dsa/microchip/ksz9477.c | 1 + drivers/net/dsa/microchip/ksz_common.c | 14 ++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 2 ++ 3 files changed, 17 insertions(+)
drivers/net/dsa/microchip/ksz9477.c +1 -0
@@ -1196,6 +1196,7 @@ static int ksz9477_setup(struct dsa_switch *ds) .setup = ksz9477_setup, .phy_read = ksz9477_phy_read16, .phy_write = ksz9477_phy_write16, + .adjust_link = ksz_adjust_link, .port_enable = ksz_enable_port, .port_disable = ksz_disable_port, .get_strings = ksz9477_get_strings,
drivers/net/dsa/microchip/ksz_common.c +14 -0
@@ -140,6 +140,20 @@ int ksz_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val) }EXPORT_SYMBOL_GPL (ksz_phy_write16); +void ksz_adjust_link (struct dsa_switch *ds,int port, +struct phy_device *phydev) +{ +struct ksz_device *dev = ds->priv; +struct ksz_port *p = &dev->ports[port]; + +/* Read all MIB counters when the link is going down. */ +if (!phydev->link) { + p->read = true; +schedule_work (&dev->mib_read); + } +} +EXPORT_SYMBOL_GPL (ksz_adjust_link); +int ksz_sset_count (struct dsa_switch *ds,int port,int sset) {struct ksz_device *dev = ds->priv;
drivers/net/dsa/microchip/ksz_common.h +2 -0
@@ -14,6 +14,8 @@int ksz_phy_read16 (struct dsa_switch *ds,int addr,int reg);int ksz_phy_write16 (struct dsa_switch *ds,int addr,int reg,u16 val); +void ksz_adjust_link (struct dsa_switch *ds,int port, +struct phy_device *phydev);int ksz_sset_count (struct dsa_switch *ds,int port,int sset);void ksz_get_ethtool_stats (struct dsa_switch *ds,int port,uint64_t *buf); int ksz_port_bridge_join(struct dsa_switch *ds, int port,
Signature · 1 line
1.9.1
Re: [PATCH v4 net-next 3/5] net: dsa: microchip: get port link status
Le 2/22/19 à 4:36 PM, [email protected] a écrit :
Quoted 7 lines
From: Tristram Ha <[email protected]>
Get port link status to know whether to read MIB counters when the link is going down.
Signed-off-by Tristram Ha <[email protected]>Reviewed-by Andrew Lunn <[email protected]>
Signature · 1 line
Florian
PATCH v4 4/5 net: dsa: microchip: remove unnecessary include headers
In reply to [email protected]From: Tristram Ha <[email protected]>
Remove unnecessary header include.
--- drivers/net/dsa/microchip/ksz9477.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/net/dsa/microchip/ksz9477.c +0 -4
@@ -5,15 +5,11 @@* Copyright (C) 2017-2019 Microchip Technology Inc. */ -#include <linux/delay.h> -#include <linux/export.h> -#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/iopoll.h> #include <linux/platform_data/microchip-ksz.h> #include <linux/phy.h> -#include <linux/etherdevice.h> #include <linux/if_bridge.h> #include <net/dsa.h> #include <net/switchdev.h>
Signature · 1 line
1.9.1
Re: [PATCH v4 net-next 4/5] net: dsa: microchip: remove unnecessary include headers
Le 2/22/19 à 4:36 PM, [email protected] a écrit :
Quoted 6 lines
From: Tristram Ha <[email protected]>
Remove unnecessary header include.
Signed-off-by Tristram Ha <[email protected]>Reviewed-by Andrew Lunn <[email protected]>
Signature · 1 line
Florian
PATCH v4 5/5 net: dsa: microchip: add port_cleanup function
In reply to [email protected]From: Tristram Ha <[email protected]>
Add port_cleanup function to reset some device variables when the port is disabled. Add a mutex to make sure changing those variables is thread-safe.
--- drivers/net/dsa/microchip/ksz9477.c | 6 ++++++ drivers/net/dsa/microchip/ksz_common.c | 22 ++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 1 + drivers/net/dsa/microchip/ksz_priv.h | 2 ++ 4 files changed, 31 insertions(+)
drivers/net/dsa/microchip/ksz9477.c +6 -0
@@ -450,12 +450,14 @@ static void ksz9477_port_stp_state_set(struct dsa_switch *ds, int port,break ; member = dev->host_mask | p->vid_member; +mutex_lock (&dev->dev_mutex);/* Port is a member of a bridge. */ if (dev->br_member & (1 << port)) { dev->member |= (1 << port); member = dev->member; } +mutex_unlock (&dev->dev_mutex);break ;case BR_STATE_BLOCKING : data |=PORT_LEARN_DISABLE ;
@@ -470,6 +472,7 @@ static void ksz9477_port_stp_state_set(struct dsa_switch *ds, int port,ksz_pwrite8 (dev, port,P_STP_CTRL , data); p->stp_state = state; +mutex_lock (&dev->dev_mutex);if (data &PORT_RX_ENABLE ) dev->rx_ports |= (1 << port);else
@@ -494,6 +497,7 @@ static void ksz9477_port_stp_state_set(struct dsa_switch *ds, int port,*/ if (forward != dev->member)ksz_update_port_member (dev, port); +mutex_unlock (&dev->dev_mutex); }static void ksz9477_flush_dyn_mac_table (struct ksz_device *dev,int port)
@@ -1080,6 +1084,7 @@ static void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)ksz_pwrite8 (dev, port,REG_PORT_XMII_CTRL_1 , data8); p->phydev.duplex =1 ; } +mutex_lock (&dev->dev_mutex);if (cpu_port) { member = dev->port_mask; dev->on_ports = dev->host_mask;
@@ -1092,6 +1097,7 @@ static void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)if (p->phydev.link) dev->live_ports |= (1 << port); } +mutex_unlock (&dev->dev_mutex);ksz9477_cfg_port_member (dev, port, member);/* clear pending interrupts */
drivers/net/dsa/microchip/ksz_common.c +22 -0
@@ -20,6 +20,16 @@#include "ksz_priv.h" +void ksz_port_cleanup (struct ksz_device *dev,int port) +{ +/* Common code for port cleanup. */ +mutex_lock (&dev->dev_mutex); + dev->on_ports &= ~(1 << port); + dev->live_ports &= ~(1 << port); +mutex_unlock (&dev->dev_mutex); +} +EXPORT_SYMBOL_GPL (ksz_port_cleanup); +void ksz_update_port_member (struct ksz_device *dev,int port) {struct ksz_port *p;
@@ -151,6 +161,13 @@ void ksz_adjust_link(struct dsa_switch *ds, int port, p->read = true;schedule_work (&dev->mib_read); } +mutex_lock (&dev->dev_mutex); +if (!phydev->link) + dev->live_ports &= ~(1 << port); +else +/* Remember which port is connected and active. */ + dev->live_ports |= (1 << port) & dev->on_ports; +mutex_unlock (&dev->dev_mutex); }EXPORT_SYMBOL_GPL (ksz_adjust_link);
@@ -188,7 +205,9 @@ int ksz_port_bridge_join(struct dsa_switch *ds, int port, {struct ksz_device *dev = ds->priv; +mutex_lock (&dev->dev_mutex); dev->br_member |= (1 << port); +mutex_unlock (&dev->dev_mutex);/* port_stp_state_set() will be called after to put the port in * appropriate state so there is no need to do anything.
@@ -203,8 +222,10 @@ void ksz_port_bridge_leave(struct dsa_switch *ds, int port, {struct ksz_device *dev = ds->priv; +mutex_lock (&dev->dev_mutex); dev->br_member &= ~(1 << port); dev->member &= ~(1 << port); +mutex_unlock (&dev->dev_mutex);/* port_stp_state_set() will be called after to put the port in * forwarding state so there is no need to do anything.
@@ -417,6 +438,7 @@ int ksz_switch_register(struct ksz_device *dev,gpiod_set_value (dev->reset_gpio,0 ); } +mutex_init (&dev->dev_mutex);mutex_init (&dev->reg_mutex);mutex_init (&dev->stats_mutex);mutex_init (&dev->alu_mutex);
drivers/net/dsa/microchip/ksz_common.h +1 -0
@@ -7,6 +7,7 @@#ifndef __KSZ_COMMON_H#define __KSZ_COMMON_H +void ksz_port_cleanup (struct ksz_device *dev,int port);void ksz_update_port_member (struct ksz_device *dev,int port);void ksz_init_mib_timer (struct ksz_device *dev);
drivers/net/dsa/microchip/ksz_priv.h +2 -0
@@ -48,6 +48,7 @@ struct ksz_device {struct ksz_platform_data *pdata;const char *name; +struct mutex dev_mutex;/* device access */ struct mutex reg_mutex;/* register access */ struct mutex stats_mutex;/* status access */ struct mutex alu_mutex;/* ALU access */
@@ -137,6 +138,7 @@ struct ksz_dev_ops {void (*flush_dyn_mac_table)(struct ksz_device *dev,int port);void (*phy_setup)(struct ksz_device *dev,int port,struct phy_device *phy); +void (*port_cleanup)(struct ksz_device *dev,int port);void (*port_setup)(struct ksz_device *dev,int port,bool cpu_port);void (*r_phy)(struct ksz_device *dev,u16 phy,u16 reg,u16 *val);void (*w_phy)(struct ksz_device *dev,u16 phy,u16 reg,u16 val);
Signature · 1 line
1.9.1
Re: [PATCH v4 net-next 5/5] net: dsa: microchip: add port_cleanup function
Le 2/22/19 à 4:36 PM, [email protected] a écrit :
Quoted 7 lines
From: Tristram Ha <[email protected]>
Add
port_cleanupfunction to reset some device variables when the port is disabled. Add a mutex to make sure changing those variables is thread-safe.Signed-off-by Tristram Ha <[email protected]>
Signature · 1 line
Florian
David Miller
maintainerFrom: <[email protected]>
Date: Fri, 22 Feb 2019 16:36:46 -0800
Quoted 2 lines
This series of patches is to modify the KSZ9477 DSA driver to read MIB counters periodically to avoid overflow.
Series applied.