mv88e6xxx Watchdog support
Subsystems (4)
Andrew Lunn
maintainerv3 cover mv88e6xxx Watchdog support
The Marvell switches have an in built watchdog over some of the internal state machine. The watchdog can be configured to raise an interrupt on error. The problem the watchdog found is then logged to the kernel log.
The older switches can automagically perform a software reset when the watchdog triggers. This just resets the internal state machine, but leaves the switch configuration unchanged.
The 6390 family of switches cannot both raise an interrupt and automagically perform a software reset. So the interrupt handler has to perform the switch reset, and then re-enable the watchdog interrupts.
This has been tested using hacked together debugfs code which allows the "force" bit to be set, so cause a watchdog interrupt.
v2: Remove g2_prefix
Andrew Lunn (2):
net: dsa: mv88e6xxx: Add watchdog interrupt handler
net: dsa: mv88e6xxx: Add mv88e6390 watchdog interrupt support
drivers/net/dsa/mv88e6xxx/chip.c | 23 ++++++ drivers/net/dsa/mv88e6xxx/global2.c | 137 +++++++++++++++++++++++++++++++++- drivers/net/dsa/mv88e6xxx/global2.h | 6 ++ drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 33 ++++++++ 4 files changed, 198 insertions(+), 1 deletion(-)
Signature · 1 line
2.11.0
Andrew Lunn
maintainerPATCH v3 1/2 net: dsa: mv88e6xxx: Add watchdog interrupt handler
The switch contains a watchdog looking for issues with the internal gubbins of the switch. Hook the interrupt the watchdog triggers and log the value of the control register indicating why the watchdog fired. The watchdog can only be cleared with a switch reset, which will destroy the current configuration. Rather than doing this, just disable the interrupt.
The mv88e6390 family has different watchdog registers. So use an ops structure, so support for the mv88e6390 family can be added later.
---
v2:
Use ops and exclude the 6390 family
Add missing locks in the IRQ handler
v3:
remove g2_ from ops name.
--- drivers/net/dsa/mv88e6xxx/chip.c | 14 ++++++ drivers/net/dsa/mv88e6xxx/global2.c | 89 ++++++++++++++++++++++++++++++++++- drivers/net/dsa/mv88e6xxx/global2.h | 4 ++ drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 21 +++++++++ 4 files changed, 127 insertions(+), 1 deletion(-)
drivers/net/dsa/mv88e6xxx/chip.c +14 -0
@@ -3111,6 +3111,7 @@ static const struct mv88e6xxx_ops mv88e6085_ops = { .stats_get_stats = mv88e6095_stats_get_stats, .g1_set_cpu_port = mv88e6095_g1_set_cpu_port, .g1_set_egress_port = mv88e6095_g1_set_egress_port, + .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu, .ppu_enable = mv88e6185_g1_ppu_enable, .ppu_disable = mv88e6185_g1_ppu_disable,
@@ -3179,6 +3180,7 @@ static const struct mv88e6xxx_ops mv88e6123_ops = { .stats_get_stats = mv88e6095_stats_get_stats, .g1_set_cpu_port = mv88e6095_g1_set_cpu_port, .g1_set_egress_port = mv88e6095_g1_set_egress_port, + .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3205,6 +3207,7 @@ static const struct mv88e6xxx_ops mv88e6131_ops = { .stats_get_stats = mv88e6095_stats_get_stats, .g1_set_cpu_port = mv88e6095_g1_set_cpu_port, .g1_set_egress_port = mv88e6095_g1_set_egress_port, + .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu, .ppu_enable = mv88e6185_g1_ppu_enable, .ppu_disable = mv88e6185_g1_ppu_disable,
@@ -3232,6 +3235,7 @@ static const struct mv88e6xxx_ops mv88e6161_ops = { .stats_get_stats = mv88e6095_stats_get_stats, .g1_set_cpu_port = mv88e6095_g1_set_cpu_port, .g1_set_egress_port = mv88e6095_g1_set_egress_port, + .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3250,6 +3254,7 @@ static const struct mv88e6xxx_ops mv88e6165_ops = { .stats_get_stats = mv88e6095_stats_get_stats, .g1_set_cpu_port = mv88e6095_g1_set_cpu_port, .g1_set_egress_port = mv88e6095_g1_set_egress_port, + .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3276,6 +3281,7 @@ static const struct mv88e6xxx_ops mv88e6171_ops = { .stats_get_stats = mv88e6095_stats_get_stats, .g1_set_cpu_port = mv88e6095_g1_set_cpu_port, .g1_set_egress_port = mv88e6095_g1_set_egress_port, + .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3304,6 +3310,7 @@ static const struct mv88e6xxx_ops mv88e6172_ops = { .stats_get_stats = mv88e6095_stats_get_stats, .g1_set_cpu_port = mv88e6095_g1_set_cpu_port, .g1_set_egress_port = mv88e6095_g1_set_egress_port, + .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3330,6 +3337,7 @@ static const struct mv88e6xxx_ops mv88e6175_ops = { .stats_get_stats = mv88e6095_stats_get_stats, .g1_set_cpu_port = mv88e6095_g1_set_cpu_port, .g1_set_egress_port = mv88e6095_g1_set_egress_port, + .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3358,6 +3366,7 @@ static const struct mv88e6xxx_ops mv88e6176_ops = { .stats_get_stats = mv88e6095_stats_get_stats, .g1_set_cpu_port = mv88e6095_g1_set_cpu_port, .g1_set_egress_port = mv88e6095_g1_set_egress_port, + .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3380,6 +3389,7 @@ static const struct mv88e6xxx_ops mv88e6185_ops = { .stats_get_stats = mv88e6095_stats_get_stats, .g1_set_cpu_port = mv88e6095_g1_set_cpu_port, .g1_set_egress_port = mv88e6095_g1_set_egress_port, + .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu, .ppu_enable = mv88e6185_g1_ppu_enable, .ppu_disable = mv88e6185_g1_ppu_disable,
@@ -3491,6 +3501,7 @@ static const struct mv88e6xxx_ops mv88e6240_ops = { .stats_get_stats = mv88e6095_stats_get_stats, .g1_set_cpu_port = mv88e6095_g1_set_cpu_port, .g1_set_egress_port = mv88e6095_g1_set_egress_port, + .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3598,6 +3609,7 @@ static const struct mv88e6xxx_ops mv88e6350_ops = { .stats_get_stats = mv88e6095_stats_get_stats, .g1_set_cpu_port = mv88e6095_g1_set_cpu_port, .g1_set_egress_port = mv88e6095_g1_set_egress_port, + .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3624,6 +3636,7 @@ static const struct mv88e6xxx_ops mv88e6351_ops = { .stats_get_stats = mv88e6095_stats_get_stats, .g1_set_cpu_port = mv88e6095_g1_set_cpu_port, .g1_set_egress_port = mv88e6095_g1_set_egress_port, + .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3652,6 +3665,7 @@ static const struct mv88e6xxx_ops mv88e6352_ops = { .stats_get_stats = mv88e6095_stats_get_stats, .g1_set_cpu_port = mv88e6095_g1_set_cpu_port, .g1_set_egress_port = mv88e6095_g1_set_egress_port, + .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
drivers/net/dsa/mv88e6xxx/global2.c +88 -1
107 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/global2.h +4 -0
@@ -46,6 +46,8 @@ int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *chip);void mv88e6xxx_g2_irq_free (struct mv88e6xxx_chip *chip);int mv88e6095_g2_mgmt_rsvd2cpu (struct mv88e6xxx_chip *chip); +extern const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops; +#else /* !CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 */ static inline int mv88e6xxx_g2_require (struct mv88e6xxx_chip *chip)
@@ -125,6 +127,8 @@ static inline int mv88e6095_g2_mgmt_rsvd2cpu(struct mv88e6xxx_chip *chip)return -EOPNOTSUPP ; } +static const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops = {}; +#endif /* CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 */ #endif /* _MV88E6XXX_GLOBAL2_H */
drivers/net/dsa/mv88e6xxx/mv88e6xxx.h +21 -0
@@ -338,6 +338,7 @@#define GLOBAL_STATS_COUNTER_01 0x1f#define GLOBAL2_INT_SOURCE 0x00 +#define GLOBAL2_INT_SOURCE_WATCHDOG 15#define GLOBAL2_INT_MASK 0x01#define GLOBAL2_MGMT_EN_2X 0x02#define GLOBAL2_MGMT_EN_0X 0x03
@@ -414,6 +415,14 @@#define GLOBAL2_SCRATCH_REGISTER_SHIFT 8#define GLOBAL2_SCRATCH_VALUE_MASK 0xff#define GLOBAL2_WDOG_CONTROL 0x1b +#define GLOBAL2_WDOG_CONTROL_EGRESS_EVENT BIT(7) +#define GLOBAL2_WDOG_CONTROL_RMU_TIMEOUT BIT(6) +#define GLOBAL2_WDOG_CONTROL_QC_ENABLE BIT(5) +#define GLOBAL2_WDOG_CONTROL_EGRESS_HISTORY BIT(4) +#define GLOBAL2_WDOG_CONTROL_EGRESS_ENABLE BIT(3) +#define GLOBAL2_WDOG_CONTROL_FORCE_IRQ BIT(2) +#define GLOBAL2_WDOG_CONTROL_HISTORY BIT(1) +#define GLOBAL2_WDOG_CONTROL_SWRESET BIT(0)#define GLOBAL2_QOS_WEIGHT 0x1c#define GLOBAL2_MISC 0x1d
@@ -705,6 +714,7 @@ struct mv88e6xxx_vtu_entry { };struct mv88e6xxx_bus_ops ; +struct mv88e6xxx_irq_ops ;struct mv88e6xxx_irq {u16 masked;
@@ -765,6 +775,7 @@ struct mv88e6xxx_chip {struct mv88e6xxx_irq g2_irq;int irq;int device_irq; +int watchdog_irq; };struct mv88e6xxx_bus_ops {
@@ -878,11 +889,21 @@ struct mv88e6xxx_ops { uint64_t *data);int (*g1_set_cpu_port)(struct mv88e6xxx_chip *chip,int port);int (*g1_set_egress_port)(struct mv88e6xxx_chip *chip,int port); +const struct mv88e6xxx_irq_ops *watchdog_ops;/* Can be either in g1 or g2, so don't use a prefix */ int (*mgmt_rsvd2cpu)(struct mv88e6xxx_chip *chip); }; +struct mv88e6xxx_irq_ops { +/* Action to be performed when the interrupt happens */ +int (*irq_action)(struct mv88e6xxx_chip *chip,int irq); +/* Setup the hardware to generate the interrupt */ +int (*irq_setup)(struct mv88e6xxx_chip *chip); +/* Reset the hardware to stop generating the interrupt */ +void (*irq_free)(struct mv88e6xxx_chip *chip); +}; +#define STATS_TYPE_PORT BIT(0)#define STATS_TYPE_BANK0 BIT(1)#define STATS_TYPE_BANK1 BIT(2)
Signature · 1 line
2.11.0
Re: [PATCH v3 net-next 1/2] net: dsa: mv88e6xxx: Add watchdog interrupt handler
Hi Andrew,
drivers/net/dsa/mv88e6xxx/global2.c int mv88e6xxx_g2_smi_phy_write(struct mv88e6xxx_chip *chip, · line 656
Quoted 5 lines · Andrew Lunn
drivers/net/dsa/mv88e6xxx/global2.c +5
-0+static int mv88e6097_watchdog_action (struct mv88e6xxx_chip *chip,int irq) +{ +u16 reg; + +mv88e6xxx_g2_read (chip,GLOBAL2_WDOG_CONTROL , ®);
We should not ignore read errors.
Quoted 6 lines
drivers/net/dsa/mv88e6xxx/global2.c +6
-0+ +dev_info (chip->dev,"Watchdog event: 0x%04x" , reg); + +return IRQ_HANDLED ; +} +
drivers/net/dsa/mv88e6xxx/global2.c int mv88e6xxx_g2_smi_phy_write(struct mv88e6xxx_chip *chip, · line 672
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/global2.c +10
-0+static void mv88e6097_watchdog_free (struct mv88e6xxx_chip *chip) +{ +u16 reg; + +mv88e6xxx_g2_read (chip,GLOBAL2_WDOG_CONTROL , ®); + + reg &= ~(GLOBAL2_WDOG_CONTROL_EGRESS_ENABLE | +GLOBAL2_WDOG_CONTROL_QC_ENABLE ); + +mv88e6xxx_g2_write (chip,GLOBAL2_WDOG_CONTROL , reg);
Same here.
drivers/net/dsa/mv88e6xxx/global2.c int mv88e6xxx_g2_smi_phy_write(struct mv88e6xxx_chip *chip, · line 681
Quoted 9 lines
drivers/net/dsa/mv88e6xxx/global2.c +9
-0+} + +static int mv88e6097_watchdog_setup (struct mv88e6xxx_chip *chip) +{ +return mv88e6xxx_g2_write (chip,GLOBAL2_WDOG_CONTROL , +GLOBAL2_WDOG_CONTROL_EGRESS_ENABLE | +GLOBAL2_WDOG_CONTROL_QC_ENABLE | +GLOBAL2_WDOG_CONTROL_SWRESET ); +}
Those above should be simple Global 2 routines to access the WDOG_CONTROL register data and functions.
Quoted 43 lines
drivers/net/dsa/mv88e6xxx/global2.c +43
-0+const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops = { + .irq_action = mv88e6097_watchdog_action, + .irq_setup = mv88e6097_watchdog_setup, + .irq_free = mv88e6097_watchdog_free, +}; + +static irqreturn_t mv88e6xxx_g2_watchdog_thread_fn (int irq,void *dev_id) +{ +struct mv88e6xxx_chip *chip = dev_id; +irqreturn_t ret =IRQ_NONE ; + +mutex_lock (&chip->reg_lock); +if (chip->info->ops->watchdog_ops->irq_action) + ret = chip->info->ops->watchdog_ops->irq_action (chip, irq); +mutex_unlock (&chip->reg_lock); + +return ret; +} + +static void mv88e6xxx_g2_watchdog_free (struct mv88e6xxx_chip *chip) +{ +mutex_lock (&chip->reg_lock); +if (chip->info->ops->watchdog_ops->irq_free) + chip->info->ops->watchdog_ops->irq_free (chip); +mutex_unlock (&chip->reg_lock); + +free_irq (chip->watchdog_irq, chip); +irq_dispose_mapping (chip->watchdog_irq); +} + +static int mv88e6xxx_g2_watchdog_setup (struct mv88e6xxx_chip *chip) +{ +int err; + + chip->watchdog_irq =irq_find_mapping (chip->g2_irq.domain, +GLOBAL2_INT_SOURCE_WATCHDOG ); +if (chip->watchdog_irq <0 ) +return chip->watchdog_irq; + + err =request_threaded_irq (chip->watchdog_irq,NULL , + mv88e6xxx_g2_watchdog_thread_fn, +IRQF_ONESHOT |IRQF_TRIGGER_FALLING , +"mv88e6xxx-watchdog" , chip);
drivers/net/dsa/mv88e6xxx/global2.c int mv88e6xxx_g2_smi_phy_write(struct mv88e6xxx_chip *chip, · line 735
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/global2.c +10
-0+if (err) +return err; + +mutex_lock (&chip->reg_lock); +if (chip->info->ops->watchdog_ops->irq_setup) + err = chip->info->ops->watchdog_ops->irq_setup (chip); +mutex_unlock (&chip->reg_lock); + +return err; +}
We should not mix routines to access the chip registers with driver logic. That makes the code hard to read and maintain and lead us to drop error checkings for instance.
The above boilerplate for watchdog/irq access can be added in chip.c wrapping simple chip->info->ops->watchdog_* functions.
See my comments in 2/2.
Thanks,
Vivien
Andrew Lunn
maintainerRe: [PATCH v3 net-next 1/2] net: dsa: mv88e6xxx: Add watchdog interrupt handler
Quoted 11 lines · Vivien Didelot
Hi Andrew,
drivers/net/dsa/mv88e6xxx/global2.c int mv88e6xxx_g2_smi_phy_write(struct mv88e6xxx_chip *chip, · line 656
Quoted 5 lines · Andrew Lunn
drivers/net/dsa/mv88e6xxx/global2.c +5
-0+static int mv88e6097_watchdog_action (struct mv88e6xxx_chip *chip,int irq) +{ +u16 reg; + +mv88e6xxx_g2_read (chip,GLOBAL2_WDOG_CONTROL , ®);We should not ignore read errors.
Hi Vivien
We are in the middle of an interrupt handler. If we get a read error here, we are probable one step from a "Kernel Panic -- not syncing:
attempted to kill idle task".
About the only thing which makes sense is to print a warning message. But that really should happen in one central place, mv88e6xxx_smi_read(), so it covers all reads everywhere.
Quoted 9 lines
Quoted 9 lines
drivers/net/dsa/mv88e6xxx/global2.c +9
-0+dev_info (chip->dev,"Watchdog event: 0x%04x" , reg); + +return IRQ_HANDLED ; +} + +static void mv88e6097_watchdog_free (struct mv88e6xxx_chip *chip) +{ +u16 reg; +
Quoted 8 lines
drivers/net/dsa/mv88e6xxx/global2.c int mv88e6xxx_g2_smi_phy_write(struct mv88e6xxx_chip *chip, · line 672
Quoted 6 lines
drivers/net/dsa/mv88e6xxx/global2.c +6
-0+mv88e6xxx_g2_read (chip,GLOBAL2_WDOG_CONTROL , ®); + + reg &= ~(GLOBAL2_WDOG_CONTROL_EGRESS_ENABLE | +GLOBAL2_WDOG_CONTROL_QC_ENABLE ); + +mv88e6xxx_g2_write (chip,GLOBAL2_WDOG_CONTROL , reg);Same here.
Again, and do what? We are in the process of unbinding/unloading the kernel module. We are going to keep going whatever, and there is no mechanism to say an error occurred at this point, other than a printk. Again, such a printk should be in mv88e6xxx_smi_write().
Andrew
Re: [PATCH v3 net-next 1/2] net: dsa: mv88e6xxx: Add watchdog interrupt handler
Hi Andrew,
Quoted 34 lines · Andrew Lunn
Quoted 7 lines
drivers/net/dsa/mv88e6xxx/global2.c int mv88e6xxx_g2_smi_phy_write(struct mv88e6xxx_chip *chip, · line 656
Quoted 5 lines
drivers/net/dsa/mv88e6xxx/global2.c +5
-0+static int mv88e6097_watchdog_action (struct mv88e6xxx_chip *chip,int irq) +{ +u16 reg; + +mv88e6xxx_g2_read (chip,GLOBAL2_WDOG_CONTROL , ®);We should not ignore read errors.
We are in the middle of an interrupt handler. If we get a read error here, we are probable one step from a "Kernel Panic -- not syncing:
attempted to kill idle task".About the only thing which makes sense is to print a warning message. But that really should happen in one central place,
mv88e6xxx_smi_read(), so it covers all reads everywhere.Quoted 9 lines
Quoted 9 lines
drivers/net/dsa/mv88e6xxx/global2.c +9
-0+dev_info (chip->dev,"Watchdog event: 0x%04x" , reg); + +return IRQ_HANDLED ; +} + +static void mv88e6097_watchdog_free (struct mv88e6xxx_chip *chip) +{ +u16 reg; +Quoted 8 lines
drivers/net/dsa/mv88e6xxx/global2.c int mv88e6xxx_g2_smi_phy_write(struct mv88e6xxx_chip *chip, · line 672
Quoted 6 lines
drivers/net/dsa/mv88e6xxx/global2.c +6
-0+mv88e6xxx_g2_read (chip,GLOBAL2_WDOG_CONTROL , ®); + + reg &= ~(GLOBAL2_WDOG_CONTROL_EGRESS_ENABLE | +GLOBAL2_WDOG_CONTROL_QC_ENABLE ); + +mv88e6xxx_g2_write (chip,GLOBAL2_WDOG_CONTROL , reg);Same here.
Quoted 4 lines
Again, and do what? We are in the process of unbinding/unloading the kernel module. We are going to keep going whatever, and there is no mechanism to say an error occurred at this point, other than a printk. Again, such a printk should be in
mv88e6xxx_smi_write().
I do agree with the fact that there is not much left to do if such error occurs in that context. But still, functions implemented in global2.c (or whatever internal SMI device file) should be written regardless when or how they will be used, in an interrupt handler, in driver probe, etc.
These should be just self-documented basic access functions to Marvell chip registers. chip.c then implements the interface and glue with DSA, watchdog class, etc.
Mixing this with other layers logic results in losing the robust and self documented code that we are trying to implement here.
Thanks,
Vivien
Andrew Lunn
maintainerPATCH v3 2/2 net: dsa: mv88e6xxx: Add mv88e6390 watchdog interrupt support
In reply to Andrew LunnImplement the ops needed to support the watchdog for the MV88E6390 family.
---
v2:
All new
v3:
Remove g2_ prefix from ops.
--- drivers/net/dsa/mv88e6xxx/chip.c | 9 +++++++ drivers/net/dsa/mv88e6xxx/global2.c | 48 +++++++++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/global2.h | 2 ++ drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 12 +++++++++ 4 files changed, 71 insertions(+)
drivers/net/dsa/mv88e6xxx/chip.c +9 -0
@@ -3419,6 +3419,7 @@ static const struct mv88e6xxx_ops mv88e6190_ops = { .stats_get_stats = mv88e6390_stats_get_stats, .g1_set_cpu_port = mv88e6390_g1_set_cpu_port, .g1_set_egress_port = mv88e6390_g1_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3446,6 +3447,7 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = { .stats_get_stats = mv88e6390_stats_get_stats, .g1_set_cpu_port = mv88e6390_g1_set_cpu_port, .g1_set_egress_port = mv88e6390_g1_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3473,6 +3475,7 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { .stats_get_stats = mv88e6390_stats_get_stats, .g1_set_cpu_port = mv88e6390_g1_set_cpu_port, .g1_set_egress_port = mv88e6390_g1_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3530,6 +3533,7 @@ static const struct mv88e6xxx_ops mv88e6290_ops = { .stats_get_stats = mv88e6390_stats_get_stats, .g1_set_cpu_port = mv88e6390_g1_set_cpu_port, .g1_set_egress_port = mv88e6390_g1_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3694,6 +3698,7 @@ static const struct mv88e6xxx_ops mv88e6141_ops = { .stats_get_stats = mv88e6390_stats_get_stats, .g1_set_cpu_port = mv88e6390_g1_set_cpu_port, .g1_set_egress_port = mv88e6390_g1_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3722,6 +3727,7 @@ static const struct mv88e6xxx_ops mv88e6341_ops = { .stats_get_stats = mv88e6390_stats_get_stats, .g1_set_cpu_port = mv88e6390_g1_set_cpu_port, .g1_set_egress_port = mv88e6390_g1_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3752,6 +3758,7 @@ static const struct mv88e6xxx_ops mv88e6390_ops = { .stats_get_stats = mv88e6390_stats_get_stats, .g1_set_cpu_port = mv88e6390_g1_set_cpu_port, .g1_set_egress_port = mv88e6390_g1_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3781,6 +3788,7 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = { .stats_get_stats = mv88e6390_stats_get_stats, .g1_set_cpu_port = mv88e6390_g1_set_cpu_port, .g1_set_egress_port = mv88e6390_g1_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
@@ -3808,6 +3816,7 @@ static const struct mv88e6xxx_ops mv88e6391_ops = { .stats_get_stats = mv88e6390_stats_get_stats, .g1_set_cpu_port = mv88e6390_g1_set_cpu_port, .g1_set_egress_port = mv88e6390_g1_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, };
drivers/net/dsa/mv88e6xxx/global2.c +48 -0
54 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/global2.h +2 -0
@@ -47,6 +47,7 @@ void mv88e6xxx_g2_irq_free(struct mv88e6xxx_chip *chip);int mv88e6095_g2_mgmt_rsvd2cpu (struct mv88e6xxx_chip *chip);extern const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops; +extern const struct mv88e6xxx_irq_ops mv88e6390_watchdog_ops;#else /* !CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 */
@@ -128,6 +129,7 @@ static inline int mv88e6095_g2_mgmt_rsvd2cpu(struct mv88e6xxx_chip *chip) }static const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops = {}; +static const struct mv88e6xxx_irq_ops mv88e6390_watchdog_ops = {};#endif /* CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 */
drivers/net/dsa/mv88e6xxx/mv88e6xxx.h +12 -0
@@ -423,6 +423,17 @@#define GLOBAL2_WDOG_CONTROL_FORCE_IRQ BIT(2)#define GLOBAL2_WDOG_CONTROL_HISTORY BIT(1)#define GLOBAL2_WDOG_CONTROL_SWRESET BIT(0) +#define GLOBAL2_WDOG_UPDATE BIT(15) +#define GLOBAL2_WDOG_INT_SOURCE (0x00 << 8) +#define GLOBAL2_WDOG_INT_STATUS (0x10 << 8) +#define GLOBAL2_WDOG_INT_ENABLE (0x11 << 8) +#define GLOBAL2_WDOG_EVENT (0x12 << 8) +#define GLOBAL2_WDOG_HISTORY (0x13 << 8) +#define GLOBAL2_WDOG_DATA_MASK 0xff +#define GLOBAL2_WDOG_CUT_THROUGH BIT(3) +#define GLOBAL2_WDOG_QUEUE_CONTROLLER BIT(2) +#define GLOBAL2_WDOG_EGRESS BIT(1) +#define GLOBAL2_WDOG_FORCE_IRQ BIT(0)#define GLOBAL2_QOS_WEIGHT 0x1c#define GLOBAL2_MISC 0x1d
@@ -674,6 +685,7 @@ enum mv88e6xxx_cap {#define MV88E6XXX_FLAGS_FAMILY_6390 \ (MV88E6XXX_FLAG_EEE | \ MV88E6XXX_FLAG_GLOBAL2 | \ + MV88E6XXX_FLAG_G2_INT | \ MV88E6XXX_FLAG_STU | \ MV88E6XXX_FLAG_VTU | \ MV88E6XXX_FLAGS_IRL | \
Signature · 1 line
2.11.0
Re: [PATCH v3 net-next 2/2] net: dsa: mv88e6xxx: Add mv88e6390 watchdog interrupt support
Hi Andrew,
Thanks for the v3.
Quoted 7 lines · Andrew Lunn
drivers/net/dsa/mv88e6xxx/global2.c +7
-0+static int mv88e6390_watchdog_setup (struct mv88e6xxx_chip *chip) +{ + return mv88e6xxx_g2_update(chip, GLOBAL2_WDOG_CONTROL, + GLOBAL2_WDOG_INT_ENABLE | + GLOBAL2_WDOG_CUT_THROUGH | + GLOBAL2_WDOG_QUEUE_CONTROLLER | + GLOBAL2_WDOG_EGRESS |
drivers/net/dsa/mv88e6xxx/global2.c const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops = { · line 705
Quoted 10 lines
drivers/net/dsa/mv88e6xxx/global2.c +10
-0+ GLOBAL2_WDOG_FORCE_IRQ); +} + +static int mv88e6390_watchdog_action (struct mv88e6xxx_chip *chip,int irq) +{ +int err; +u16 reg; + +mv88e6xxx_g2_write (chip,GLOBAL2_WDOG_CONTROL ,GLOBAL2_WDOG_EVENT ); + err =mv88e6xxx_g2_read (chip,GLOBAL2_WDOG_CONTROL , ®);
You don't check for errors when reading or writing.
drivers/net/dsa/mv88e6xxx/global2.c const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops = { · line 718
Quoted 13 lines
drivers/net/dsa/mv88e6xxx/global2.c +13
-0+ +dev_info (chip->dev,"Watchdog event: 0x%04x" , + reg &GLOBAL2_WDOG_DATA_MASK ); + +mv88e6xxx_g2_write (chip,GLOBAL2_WDOG_CONTROL ,GLOBAL2_WDOG_HISTORY ); + err =mv88e6xxx_g2_read (chip,GLOBAL2_WDOG_CONTROL , ®); + +dev_info (chip->dev,"Watchdog history: 0x%04x" , + reg &GLOBAL2_WDOG_DATA_MASK ); + +/* Trigger a software reset to try to recover the switch */ +if (chip->info->ops->reset) + chip->info->ops->reset (chip);
A SMI device (here Global2) should not need to deal with other ops.
drivers/net/dsa/mv88e6xxx/global2.c const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops = { · line 729
Quoted 11 lines
drivers/net/dsa/mv88e6xxx/global2.c +11
-0+ +mv88e6390_watchdog_setup (chip); + +return IRQ_HANDLED ; +} + +static void mv88e6390_watchdog_free (struct mv88e6xxx_chip *chip) +{ +mv88e6xxx_g2_update (chip,GLOBAL2_WDOG_CONTROL , +GLOBAL2_WDOG_INT_ENABLE ); +}
Sorry but this is a bit cluttered. We are mixing library routines to access a chip register with the watchdog/irq logic.
It looks like all you need in global2.c is library functions to access the watchdog register (indirect, in case of 88E6390).
/* Offset 0x1B: Watch Dog Control Register */
int mv88e6097_g2_watchdog_read(...)
int mv88e6097_g2_watchdog_enable(...)
int mv88e6097_g2_watchdog_disable(...)
int mv88e6390_g2_watchdog_read(...)
int mv88e6390_g2_watchdog_enable(...)
int mv88e6390_g2_watchdog_disable(...)The above seems to be all we need to have implemented in global2.c.
Then chip.c can glue all that nicely together, playing with ops and irq threads.
Thanks,
Vivien
Andrew Lunn
maintainerRe: [PATCH v3 net-next 2/2] net: dsa: mv88e6xxx: Add mv88e6390 watchdog interrupt support
Hi Vivien
Quoted 8 lines
/* Offset 0x1B: Watch Dog Control Register */
int mv88e6097_g2_watchdog_read(...)
int mv88e6097_g2_watchdog_enable(...)
int mv88e6097_g2_watchdog_disable(...)
int mv88e6390_g2_watchdog_read(...)
int mv88e6390_g2_watchdog_enable(...)
int mv88e6390_g2_watchdog_disable(...)O.K. Please take a look at my code, and give a detailed description of what you expect these to do.
Andrew
David Miller
maintainerFrom: Andrew Lunn <[email protected]>
Date: Thu, 9 Feb 2017 00:03:41 +0100
Quoted 14 lines
The Marvell switches have an in built watchdog over some of the internal state machine. The watchdog can be configured to raise an interrupt on error. The problem the watchdog found is then logged to the kernel log.
The older switches can automagically perform a software reset when the watchdog triggers. This just resets the internal state machine, but leaves the switch configuration unchanged.
The 6390 family of switches cannot both raise an interrupt and automagically perform a software reset. So the interrupt handler has to perform the switch reset, and then re-enable the watchdog interrupts.
Quoted 4 lines
This has been tested using hacked together debugfs code which allows the "force" bit to be set, so cause a watchdog interrupt.
v2: Remove
g2_prefix
Series applied, thanks Andrew.