ibmvnic: Warn unknown speed message only when carrier is present
PATCH 1/1 ibmvnic: Warn unknown speed message only when carrier is present
With commit 0655f9943df2 ("net/ibmvnic: Update carrier state after link state change") we are now able to detect when the carrier is properly present in the device, so only report an unexpected unknown speed when it is properly detected. Unknown speed is expected to be seen by the device in case the backing device has no link detected.
--- drivers/net/ethernet/ibm/ibmvnic.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +4 -3
@@ -4312,13 +4312,14 @@ static int handle_query_phys_parms_rsp(union ibmvnic_crq *crq, {struct net_device *netdev = adapter->netdev;int rc; +__be32 rspeed =cpu_to_be32 (crq->query_phys_parms_rsp.speed); rc = crq->query_phys_parms_rsp.rc.code;if (rc) {netdev_err (netdev,"Error %d in QUERY_PHYS_PARMS\n" , rc);return rc; } -switch (cpu_to_be32 (crq->query_phys_parms_rsp.speed)) { +switch (rspeed) {case IBMVNIC_10MBPS : adapter->speed =SPEED_10 ;break ;
@@ -4344,8 +4345,8 @@ static int handle_query_phys_parms_rsp(union ibmvnic_crq *crq, adapter->speed =SPEED_100000 ;break ;default : -netdev_warn (netdev,"Unknown speed 0x%08x\n" , -cpu_to_be32 (crq->query_phys_parms_rsp.speed)); +if (netif_carrier_ok (netdev)) +netdev_warn (netdev,"Unknown speed 0x%08x\n" , rspeed); adapter->speed =SPEED_UNKNOWN ; }if (crq->query_phys_parms_rsp.flags1 &IBMVNIC_FULL_DUPLEX )
Signature · 1 line
2.20.1 (Apple Git-117)
Quoted 10 lines · Murilo Fossa Vicentini
With commit
0655f9943df2("net/ibmvnic: Update carrier state after link state change") we are now able to detect when the carrier is properly present in the device, so only report an unexpected unknown speed when it is properly detected. Unknown speed is expected to be seen by the device in case the backing device has no link detected.Reported-by Abdul Haleem <[email protected]>Tested-by Abdul Haleem <[email protected]>Signed-off-by Murilo Fossa Vicentini <[email protected]>---
Thanks, Murilo!
Quoted 34 lines
drivers/net/ethernet/ibm/ibmvnic.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/net/ethernet/ibm/ibmvnic.c +4
-3@@ -4312,13 +4312,14 @@ static int handle_query_phys_parms_rsp(union ibmvnic_crq *crq, {struct net_device *netdev = adapter->netdev;int rc; +__be32 rspeed =cpu_to_be32 (crq->query_phys_parms_rsp.speed); rc = crq->query_phys_parms_rsp.rc.code;if (rc) {netdev_err (netdev,"Error %d in QUERY_PHYS_PARMS\n" , rc);return rc; } -switch (cpu_to_be32 (crq->query_phys_parms_rsp.speed)) { +switch (rspeed) {case IBMVNIC_10MBPS : adapter->speed =SPEED_10 ;break ;@@ -4344,8 +4345,8 @@ static int handle_query_phys_parms_rsp(union ibmvnic_crq *crq, adapter->speed =SPEED_100000 ;break ;default : -netdev_warn (netdev,"Unknown speed 0x%08x\n" , -cpu_to_be32 (crq->query_phys_parms_rsp.speed)); +if (netif_carrier_ok (netdev)) +netdev_warn (netdev,"Unknown speed 0x%08x\n" , rspeed); adapter->speed =SPEED_UNKNOWN ; }if (crq->query_phys_parms_rsp.flags1 &IBMVNIC_FULL_DUPLEX )
Jakub Kicinski
AppliedQuoted 9 lines · Murilo Fossa Vicentini
With commit
0655f9943df2("net/ibmvnic: Update carrier state after link state change") we are now able to detect when the carrier is properly present in the device, so only report an unexpected unknown speed when it is properly detected. Unknown speed is expected to be seen by the device in case the backing device has no link detected.Reported-by Abdul Haleem <[email protected]>Tested-by Abdul Haleem <[email protected]>Signed-off-by Murilo Fossa Vicentini <[email protected]>
Applied, thanks!