net: dsa: mv88e6xxx: fix few issues in mv88e6390x_port_set_cmode
Subsystems (4)
PATCH 1/1 net: dsa: mv88e6xxx: fix few issues in mv88e6390x_port_set_cmode
This patches fixes few issues in mv88e6390x_port_set_cmode().
1. When entering the function the old cmode may be 0, in this case mv88e6390x_serdes_get_lane() returns -ENODEV. As result we bail out and have no chance to set a new mode. Therefore deal properly with -ENODEV.
2. Once we have disabled power and irq, let's set the cached cmode to 0. This reflects the actual status and is cleaner if we bail out with an error in the following function calls.
3. The cached cmode is used by mv88e6390x_serdes_get_lane(), mv88e6390_serdes_power_lane() and mv88e6390_serdes_irq_enable(). Currently we set the cached mode to the new one at the very end of the function only, means until then we use the old one what may be wrong.
4. When calling mv88e6390_serdes_irq_enable() we use the lane value belonging to the old cmode. Get the lane belonging to the new cmode before calling this function.
It's hard to provide a good "Fixes" tag because quite a few smaller changes have been done to the code in question recently.
--- drivers/net/dsa/mv88e6xxx/port.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
drivers/net/dsa/mv88e6xxx/port.c +16 -8
@@ -427,18 +427,22 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,return 0 ; lane =mv88e6390x_serdes_get_lane (chip, port); -if (lane <0 ) +if (lane <0 && lane != -ENODEV )return lane; -if (chip->ports[port].serdes_irq) { - err =mv88e6390_serdes_irq_disable (chip, port, lane); +if (lane >=0 ) { +if (chip->ports[port].serdes_irq) { + err =mv88e6390_serdes_irq_disable (chip, port, lane); +if (err) +return err; + } + + err =mv88e6390x_serdes_power (chip, port, false);if (err)return err; } - err =mv88e6390x_serdes_power (chip, port, false); -if (err) -return err; + chip->ports[port].cmode =0 ;if (cmode) { err =mv88e6xxx_port_read (chip, port,MV88E6XXX_PORT_STS , ®);
@@ -452,6 +456,12 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,if (err)return err; + chip->ports[port].cmode = cmode; + + lane =mv88e6390x_serdes_get_lane (chip, port); +if (lane <0 ) +return lane; + err =mv88e6390x_serdes_power (chip, port, true);if (err)return err;
@@ -463,8 +473,6 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port, } } - chip->ports[port].cmode = cmode; -return 0 ; }
Signature · 1 line
2.21.0
David Miller
maintainerFrom: Heiner Kallweit <[email protected]>
Date: Sat, 23 Mar 2019 19:41:32 +0100
Quoted 21 lines
This patches fixes few issues in
mv88e6390x_port_set_cmode().1. When entering the function the old cmode may be 0, in this case
mv88e6390x_serdes_get_lane()returns-ENODEV. As result we bail out and have no chance to set a new mode. Therefore deal properly with-ENODEV.2. Once we have disabled power and irq, let's set the cached cmode to 0. This reflects the actual status and is cleaner if we bail out with an error in the following function calls.
3. The cached cmode is used by
mv88e6390x_serdes_get_lane(),mv88e6390_serdes_power_lane()andmv88e6390_serdes_irq_enable(). Currently we set the cached mode to the new one at the very end of the function only, means until then we use the old one what may be wrong.4. When calling
mv88e6390_serdes_irq_enable()we use the lane value belonging to the old cmode. Get the lane belonging to the new cmode before calling this function.
Quoted 5 lines
It's hard to provide a good "Fixes" tag because quite a few smaller changes have been done to the code in question recently.
Fixes d235c48b40d3 ("net: dsa: mv88e6xxx: power serdes on/off for 10G interfaces on 6390X")Signed-off-by Heiner Kallweit <[email protected]>
Andrew et al., please review.
Thank you.
David Miller
maintainerFrom: Heiner Kallweit <[email protected]>
Date: Sat, 23 Mar 2019 19:41:32 +0100
Quoted 21 lines
This patches fixes few issues in
mv88e6390x_port_set_cmode().1. When entering the function the old cmode may be 0, in this case
mv88e6390x_serdes_get_lane()returns-ENODEV. As result we bail out and have no chance to set a new mode. Therefore deal properly with-ENODEV.2. Once we have disabled power and irq, let's set the cached cmode to 0. This reflects the actual status and is cleaner if we bail out with an error in the following function calls.
3. The cached cmode is used by
mv88e6390x_serdes_get_lane(),mv88e6390_serdes_power_lane()andmv88e6390_serdes_irq_enable(). Currently we set the cached mode to the new one at the very end of the function only, means until then we use the old one what may be wrong.4. When calling
mv88e6390_serdes_irq_enable()we use the lane value belonging to the old cmode. Get the lane belonging to the new cmode before calling this function.
Quoted 5 lines
It's hard to provide a good "Fixes" tag because quite a few smaller changes have been done to the code in question recently.
Fixes d235c48b40d3 ("net: dsa: mv88e6xxx: power serdes on/off for 10G interfaces on 6390X")Signed-off-by Heiner Kallweit <[email protected]>
Once again, Andrew, Florian, Vivien, et al., please review.
Quoted 35 lines · Heiner Kallweit
This patches fixes few issues in
mv88e6390x_port_set_cmode().1. When entering the function the old cmode may be 0, in this case
mv88e6390x_serdes_get_lane()returns-ENODEV. As result we bail out and have no chance to set a new mode. Therefore deal properly with-ENODEV.2. Once we have disabled power and irq, let's set the cached cmode to 0. This reflects the actual status and is cleaner if we bail out with an error in the following function calls.
3. The cached cmode is used by
mv88e6390x_serdes_get_lane(),mv88e6390_serdes_power_lane()andmv88e6390_serdes_irq_enable(). Currently we set the cached mode to the new one at the very end of the function only, means until then we use the old one what may be wrong.4. When calling
mv88e6390_serdes_irq_enable()we use the lane value belonging to the old cmode. Get the lane belonging to the new cmode before calling this function.It's hard to provide a good "Fixes" tag because quite a few smaller changes have been done to the code in question recently.
Fixes d235c48b40d3 ("net: dsa: mv88e6xxx: power serdes on/off for 10G interfaces on 6390X")Signed-off-by Heiner Kallweit <[email protected]>--- drivers/net/dsa/mv88e6xxx/port.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)drivers/net/dsa/mv88e6xxx/port.c +0
-0
drivers/net/dsa/mv88e6xxx/port.c int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port, · line 431
Quoted 6 lines
drivers/net/dsa/mv88e6xxx/port.c +1
-1@@ -427,18 +427,22 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,return 0 ; lane =mv88e6390x_serdes_get_lane (chip, port); -if (lane <0 ) +if (lane <0 && lane != -ENODEV )return lane;
It does not look like you can return a negative error code from mv88e6390x_serdes_get_lane() that is not -ENODEV?
Other than that:
Signature · 1 line
Florian
Quoted 38 lines · Florian Fainelli
Quoted 37 lines · Heiner Kallweit
This patches fixes few issues in
mv88e6390x_port_set_cmode().1. When entering the function the old cmode may be 0, in this case
mv88e6390x_serdes_get_lane()returns-ENODEV. As result we bail out and have no chance to set a new mode. Therefore deal properly with-ENODEV.2. Once we have disabled power and irq, let's set the cached cmode to 0. This reflects the actual status and is cleaner if we bail out with an error in the following function calls.
3. The cached cmode is used by
mv88e6390x_serdes_get_lane(),mv88e6390_serdes_power_lane()andmv88e6390_serdes_irq_enable(). Currently we set the cached mode to the new one at the very end of the function only, means until then we use the old one what may be wrong.4. When calling
mv88e6390_serdes_irq_enable()we use the lane value belonging to the old cmode. Get the lane belonging to the new cmode before calling this function.It's hard to provide a good "Fixes" tag because quite a few smaller changes have been done to the code in question recently.
Fixes d235c48b40d3 ("net: dsa: mv88e6xxx: power serdes on/off for 10G interfaces on 6390X")Signed-off-by Heiner Kallweit <[email protected]>--- drivers/net/dsa/mv88e6xxx/port.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)drivers/net/dsa/mv88e6xxx/port.c +0
-0@@ -427,18 +427,22 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,return 0 ;
Quoted 8 lines
drivers/net/dsa/mv88e6xxx/port.c int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port, · line 431
Quoted 4 lines
drivers/net/dsa/mv88e6xxx/port.c +1
-1lane =mv88e6390x_serdes_get_lane (chip, port); -if (lane <0 ) +if (lane <0 && lane != -ENODEV )return lane;It does not look like you can return a negative error code from
mv88e6390x_serdes_get_lane()that is not-ENODEV?
Thanks for reviewing, Florian. Right, at least for now mv88e6390x_serdes_get_lane() doesn't return any other errno. But that's not carved in stone, and if somebody comes and adds a check that returns -EINVAL to this function, then this person most likely won't update mv88e6390x_port_set_cmode().
Quoted 4 lines
Other than that:
Reviewed-by Florian Fainelli <[email protected]>
From: Heiner Kallweit <[email protected]>
Date: Sat, 23 Mar 2019 19:41:32 +0100
Quoted 21 lines
This patches fixes few issues in
mv88e6390x_port_set_cmode().1. When entering the function the old cmode may be 0, in this case
mv88e6390x_serdes_get_lane()returns-ENODEV. As result we bail out and have no chance to set a new mode. Therefore deal properly with-ENODEV.2. Once we have disabled power and irq, let's set the cached cmode to 0. This reflects the actual status and is cleaner if we bail out with an error in the following function calls.
3. The cached cmode is used by
mv88e6390x_serdes_get_lane(),mv88e6390_serdes_power_lane()andmv88e6390_serdes_irq_enable(). Currently we set the cached mode to the new one at the very end of the function only, means until then we use the old one what may be wrong.4. When calling
mv88e6390_serdes_irq_enable()we use the lane value belonging to the old cmode. Get the lane belonging to the new cmode before calling this function.
Quoted 5 lines
It's hard to provide a good "Fixes" tag because quite a few smaller changes have been done to the code in question recently.
Fixes d235c48b40d3 ("net: dsa: mv88e6xxx: power serdes on/off for 10G interfaces on 6390X")Signed-off-by Heiner Kallweit <[email protected]>
Applied, thanks.