* [PATCH net-next] net: dsa: mv88e6xxx: get serdes lane after lock
@ 2019-08-28 16:26 Vivien Didelot
2019-08-28 16:48 ` Marek Behún
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Vivien Didelot @ 2019-08-28 16:26 UTC (permalink / raw)
To: netdev; +Cc: davem, Marek Behún, f.fainelli, andrew, Vivien Didelot
This is a follow-up patch for commit 17deaf5cb37a ("net: dsa:
mv88e6xxx: create serdes_get_lane chip operation").
The .serdes_get_lane implementations access the CMODE of a port,
even though it is cached at the moment, it is safer to call them
after the mutex is locked, not before.
At the same time, check for an eventual error and return IRQ_DONE,
instead of blindly ignoring it.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
---
drivers/net/dsa/mv88e6xxx/serdes.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c b/drivers/net/dsa/mv88e6xxx/serdes.c
index 9424e401dbc7..38c0da2492c0 100644
--- a/drivers/net/dsa/mv88e6xxx/serdes.c
+++ b/drivers/net/dsa/mv88e6xxx/serdes.c
@@ -646,10 +646,12 @@ static irqreturn_t mv88e6390_serdes_thread_fn(int irq, void *dev_id)
int err;
u8 lane;
- mv88e6xxx_serdes_get_lane(chip, port->port, &lane);
-
mv88e6xxx_reg_lock(chip);
+ err = mv88e6xxx_serdes_get_lane(chip, port->port, &lane);
+ if (err)
+ goto out;
+
switch (cmode) {
case MV88E6XXX_PORT_STS_CMODE_SGMII:
case MV88E6XXX_PORT_STS_CMODE_1000BASEX:
--
2.23.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] net: dsa: mv88e6xxx: get serdes lane after lock
2019-08-28 16:26 [PATCH net-next] net: dsa: mv88e6xxx: get serdes lane after lock Vivien Didelot
@ 2019-08-28 16:48 ` Marek Behún
2019-08-28 16:49 ` Andrew Lunn
2019-08-30 0:20 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Marek Behún @ 2019-08-28 16:48 UTC (permalink / raw)
To: Vivien Didelot; +Cc: netdev, davem, f.fainelli, andrew
On Wed, 28 Aug 2019 12:26:11 -0400
Vivien Didelot <vivien.didelot@gmail.com> wrote:
> This is a follow-up patch for commit 17deaf5cb37a ("net: dsa:
> mv88e6xxx: create serdes_get_lane chip operation").
>
> The .serdes_get_lane implementations access the CMODE of a port,
> even though it is cached at the moment, it is safer to call them
> after the mutex is locked, not before.
>
> At the same time, check for an eventual error and return IRQ_DONE,
> instead of blindly ignoring it.
>
> Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
> ---
> drivers/net/dsa/mv88e6xxx/serdes.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c
> b/drivers/net/dsa/mv88e6xxx/serdes.c index 9424e401dbc7..38c0da2492c0
> 100644 --- a/drivers/net/dsa/mv88e6xxx/serdes.c
> +++ b/drivers/net/dsa/mv88e6xxx/serdes.c
> @@ -646,10 +646,12 @@ static irqreturn_t
> mv88e6390_serdes_thread_fn(int irq, void *dev_id) int err;
> u8 lane;
>
> - mv88e6xxx_serdes_get_lane(chip, port->port, &lane);
> -
> mv88e6xxx_reg_lock(chip);
>
> + err = mv88e6xxx_serdes_get_lane(chip, port->port, &lane);
> + if (err)
> + goto out;
> +
> switch (cmode) {
> case MV88E6XXX_PORT_STS_CMODE_SGMII:
> case MV88E6XXX_PORT_STS_CMODE_1000BASEX:
Reviewed-by: Marek Behún <marek.behun@nic.cz>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] net: dsa: mv88e6xxx: get serdes lane after lock
2019-08-28 16:26 [PATCH net-next] net: dsa: mv88e6xxx: get serdes lane after lock Vivien Didelot
2019-08-28 16:48 ` Marek Behún
@ 2019-08-28 16:49 ` Andrew Lunn
2019-08-30 0:20 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Andrew Lunn @ 2019-08-28 16:49 UTC (permalink / raw)
To: Vivien Didelot; +Cc: netdev, davem, Marek Behún, f.fainelli
On Wed, Aug 28, 2019 at 12:26:11PM -0400, Vivien Didelot wrote:
> This is a follow-up patch for commit 17deaf5cb37a ("net: dsa:
> mv88e6xxx: create serdes_get_lane chip operation").
>
> The .serdes_get_lane implementations access the CMODE of a port,
> even though it is cached at the moment, it is safer to call them
> after the mutex is locked, not before.
>
> At the same time, check for an eventual error and return IRQ_DONE,
> instead of blindly ignoring it.
>
> Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] net: dsa: mv88e6xxx: get serdes lane after lock
2019-08-28 16:26 [PATCH net-next] net: dsa: mv88e6xxx: get serdes lane after lock Vivien Didelot
2019-08-28 16:48 ` Marek Behún
2019-08-28 16:49 ` Andrew Lunn
@ 2019-08-30 0:20 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2019-08-30 0:20 UTC (permalink / raw)
To: vivien.didelot; +Cc: netdev, marek.behun, f.fainelli, andrew
From: Vivien Didelot <vivien.didelot@gmail.com>
Date: Wed, 28 Aug 2019 12:26:11 -0400
> This is a follow-up patch for commit 17deaf5cb37a ("net: dsa:
> mv88e6xxx: create serdes_get_lane chip operation").
>
> The .serdes_get_lane implementations access the CMODE of a port,
> even though it is cached at the moment, it is safer to call them
> after the mutex is locked, not before.
>
> At the same time, check for an eventual error and return IRQ_DONE,
> instead of blindly ignoring it.
>
> Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-08-30 0:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-28 16:26 [PATCH net-next] net: dsa: mv88e6xxx: get serdes lane after lock Vivien Didelot
2019-08-28 16:48 ` Marek Behún
2019-08-28 16:49 ` Andrew Lunn
2019-08-30 0:20 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).