Skip to contentSkip to conversation

ibmvnic: Warn unknown speed message only when carrier is present

PATCH Applied Murilo Fossa Vicentini 3 participants 3 messages Sep 16, 2019 – Sep 20, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

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
index 5cb55ea671e3..3a6725daf7dc 100644
@@ -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)
Reviewed-by on v1 1/1
#1 lore raw
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.

---

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
index 5cb55ea671e3..3a6725daf7dc 100644
@@ -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)
#2 lore raw
In reply to Murilo Fossa Vicentini
Quoted 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.

Applied, thanks!