| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 30 May 2024 10:37:01 +0000
From: Hariprasad Kelam <hkelam@...vell.com>
To: Enguerrand de Ribaucourt <enguerrand.de-ribaucourt@...oirfairelinux.com>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>
CC: "andrew@...n.ch" <andrew@...n.ch>,
"hkallweit1@...il.com"
<hkallweit1@...il.com>,
"linux@...linux.org.uk" <linux@...linux.org.uk>,
"woojung.huh@...rochip.com" <woojung.huh@...rochip.com>,
"embedded-discuss@...ts.savoirfairelinux.net"
<embedded-discuss@...ts.savoirfairelinux.net>
Subject: [PATCH v3 5/5] net: dsa: microchip: monitor potential faults in
half-duplex mode
> ----------------------------------------------------------------------
> The errata DS80000754 recommends monitoring potential faults in half-
> duplex mode for the KSZ9477 familly.
>
> half-duplex is not very common so I just added a critical message when the
> fault conditions are detected. The switch can be expected to be unable to
> communicate anymore in these states and a software reset of the switch
> would be required which I did not implement.
>
> Signed-off-by: Enguerrand de Ribaucourt <enguerrand.de-
> ribaucourt@...oirfairelinux.com>
> ---
> drivers/net/dsa/microchip/ksz9477.c | 34 +++++++++++++++++++++++++
> drivers/net/dsa/microchip/ksz9477.h | 2 ++
> drivers/net/dsa/microchip/ksz9477_reg.h | 8 ++++--
> drivers/net/dsa/microchip/ksz_common.c | 7 +++++
> drivers/net/dsa/microchip/ksz_common.h | 1 +
> 5 files changed, 50 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/dsa/microchip/ksz9477.c
> b/drivers/net/dsa/microchip/ksz9477.c
> index 343b9d7538e9..ea1c12304f7f 100644
> --- a/drivers/net/dsa/microchip/ksz9477.c
> +++ b/drivers/net/dsa/microchip/ksz9477.c
> @@ -429,6 +429,40 @@ void ksz9477_freeze_mib(struct ksz_device *dev, int
> port, bool freeze)
> mutex_unlock(&p->mib.cnt_mutex);
> }
>
> +void ksz9477_errata_monitor(struct ksz_device *dev, int port,
> + u64 tx_late_col)
> +{
> + u8 status;
> + u16 pqm;
> + u32 pmavbc;
> +
Follow reverse x-mas tree notation.
> + ksz_pread8(dev, port, REG_PORT_STATUS_0, &status);
> + if (!((status & PORT_INTF_SPEED_MASK) ==
> PORT_INTF_SPEED_MASK) &&
> + !(status & PORT_INTF_FULL_DUPLEX)) {
> + dev_warn_once(dev->dev,
> + "Half-duplex detected on port %d, transmission
> halt may occur\n",
> + port);
> + /* Errata DS80000754 recommends monitoring potential
> faults in
> + * half-duplex mode. The switch might not be able to
> communicate anymore
> + * in these states.
> + */
> + if (tx_late_col != 0) {
> + /* Transmission halt with late collisions */
> + dev_crit_ratelimited(dev->dev,
> + "TX late collisions detected,
> transmission may be halted on port %d\n",
> + port);
> + }
> + ksz_pread16(dev, port, REG_PORT_QM_TX_CNT_0__4,
> &pqm);
> + ksz_read32(dev, REG_PMAVBC, &pmavbc);
> + if (((pmavbc & PMAVBC_MASK) >> PMAVBC_SHIFT <= 0x580)
> ||
> + ((pqm & PORT_QM_TX_CNT_M) >= 0x200)) {
> + /* Transmission halt with Half-Duplex and VLAN */
> + dev_crit_ratelimited(dev->dev,
> + "resources out of limits,
> transmission may be halted\n");
> + }
> + }
> +}
> +
> void ksz9477_port_init_cnt(struct ksz_device *dev, int port) {
> struct ksz_port_mib *mib = &dev->ports[port].mib; diff --git
> a/drivers/net/dsa/microchip/ksz9477.h
> b/drivers/net/dsa/microchip/ksz9477.h
> index ce1e656b800b..3312ef28e99c 100644
> --- a/drivers/net/dsa/microchip/ksz9477.h
> +++ b/drivers/net/dsa/microchip/ksz9477.h
> @@ -36,6 +36,8 @@ int ksz9477_port_mirror_add(struct ksz_device *dev, int
> port,
> bool ingress, struct netlink_ext_ack *extack); void
> ksz9477_port_mirror_del(struct ksz_device *dev, int port,
> struct dsa_mall_mirror_tc_entry *mirror);
> +void ksz9477_errata_monitor(struct ksz_device *dev, int port,
> + u64 tx_late_col);
> void ksz9477_get_caps(struct ksz_device *dev, int port,
> struct phylink_config *config); int
> ksz9477_fdb_dump(struct ksz_device *dev, int port, diff --git
> a/drivers/net/dsa/microchip/ksz9477_reg.h
> b/drivers/net/dsa/microchip/ksz9477_reg.h
> index f3a205ee483f..3238b9748d0f 100644
> --- a/drivers/net/dsa/microchip/ksz9477_reg.h
> +++ b/drivers/net/dsa/microchip/ksz9477_reg.h
> @@ -842,8 +842,7 @@
>
> #define REG_PORT_STATUS_0 0x0030
>
> -#define PORT_INTF_SPEED_M 0x3
> -#define PORT_INTF_SPEED_S 3
> +#define PORT_INTF_SPEED_MASK 0x0018
> #define PORT_INTF_FULL_DUPLEX BIT(2)
> #define PORT_TX_FLOW_CTRL BIT(1)
> #define PORT_RX_FLOW_CTRL BIT(0)
> @@ -1167,6 +1166,11 @@
> #define PORT_RMII_CLK_SEL BIT(7)
> #define PORT_MII_SEL_EDGE BIT(5)
>
> +#define REG_PMAVBC 0x03AC
> +
> +#define PMAVBC_MASK 0x7ff0000
> +#define PMAVBC_SHIFT 16
> +
> /* 4 - MAC */
> #define REG_PORT_MAC_CTRL_0 0x0400
>
> diff --git a/drivers/net/dsa/microchip/ksz_common.c
> b/drivers/net/dsa/microchip/ksz_common.c
> index 1e0085cd9a9a..26e2fcd74ba8 100644
> --- a/drivers/net/dsa/microchip/ksz_common.c
> +++ b/drivers/net/dsa/microchip/ksz_common.c
> @@ -1382,6 +1382,7 @@ const struct ksz_chip_data ksz_switch_chips[] = {
> .tc_cbs_supported = true,
> .ops = &ksz9477_dev_ops,
> .phylink_mac_ops = &ksz9477_phylink_mac_ops,
> + .phy_errata_9477 = true,
> .mib_names = ksz9477_mib_names,
> .mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
> .reg_mib_cnt = MIB_COUNTER_NUM,
> @@ -1416,6 +1417,7 @@ const struct ksz_chip_data ksz_switch_chips[] = {
> .num_ipms = 8,
> .ops = &ksz9477_dev_ops,
> .phylink_mac_ops = &ksz9477_phylink_mac_ops,
> + .phy_errata_9477 = true,
> .mib_names = ksz9477_mib_names,
> .mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
> .reg_mib_cnt = MIB_COUNTER_NUM,
> @@ -1450,6 +1452,7 @@ const struct ksz_chip_data ksz_switch_chips[] = {
> .num_ipms = 8,
> .ops = &ksz9477_dev_ops,
> .phylink_mac_ops = &ksz9477_phylink_mac_ops,
> + .phy_errata_9477 = true,
> .mib_names = ksz9477_mib_names,
> .mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
> .reg_mib_cnt = MIB_COUNTER_NUM,
> @@ -1540,6 +1543,7 @@ const struct ksz_chip_data ksz_switch_chips[] = {
> .tc_cbs_supported = true,
> .ops = &ksz9477_dev_ops,
> .phylink_mac_ops = &ksz9477_phylink_mac_ops,
> + .phy_errata_9477 = true,
> .mib_names = ksz9477_mib_names,
> .mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
> .reg_mib_cnt = MIB_COUNTER_NUM,
> @@ -1861,6 +1865,9 @@ void ksz_r_mib_stats64(struct ksz_device *dev, int
> port)
> pstats->rx_pause_frames = raw->rx_pause;
>
> spin_unlock(&mib->stats64_lock);
> +
> + if (dev->info->phy_errata_9477)
> + ksz9477_errata_monitor(dev, port, raw->tx_late_col);
> }
>
> void ksz88xx_r_mib_stats64(struct ksz_device *dev, int port) diff --git
> a/drivers/net/dsa/microchip/ksz_common.h
> b/drivers/net/dsa/microchip/ksz_common.h
> index c784fd23a993..ee7db46e469d 100644
> --- a/drivers/net/dsa/microchip/ksz_common.h
> +++ b/drivers/net/dsa/microchip/ksz_common.h
> @@ -66,6 +66,7 @@ struct ksz_chip_data {
> bool tc_cbs_supported;
> const struct ksz_dev_ops *ops;
> const struct phylink_mac_ops *phylink_mac_ops;
> + bool phy_errata_9477;
> bool ksz87xx_eee_link_erratum;
> const struct ksz_mib_names *mib_names;
> int mib_cnt;
> --
> 2.34.1
>
Powered by blists - more mailing lists