From patchwork Tue Apr 2 18:17:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 1074803 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=candelatech.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=candelatech.com header.i=@candelatech.com header.b="EWdHkbB5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44Ycrd0VmXz9sN4 for ; Wed, 3 Apr 2019 05:17:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730583AbfDBSRw (ORCPT ); Tue, 2 Apr 2019 14:17:52 -0400 Received: from [208.74.158.174] ([208.74.158.174]:52774 "EHLO mail3.candelatech.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1725991AbfDBSRv (ORCPT ); Tue, 2 Apr 2019 14:17:51 -0400 Received: from ben-dt4.candelatech.com (50-251-239-81-static.hfc.comcastbusiness.net [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id D73B713755A; Tue, 2 Apr 2019 11:17:50 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com D73B713755A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1554229070; bh=69BgnPefCFV6nwepuqpHtsq6+c+FZlT6M6bnqx94cFo=; h=From:To:Cc:Subject:Date:From; b=EWdHkbB5vIdddndpJUNZ66URijEa2Y8vltImWLflF99ipkbZd2qQ1cpt94mcLE+Nd Zr0ZASZ4c36y7QGN8s6DOhIeU8Xr9jgA4mI0sRiAu3z5mTImiDAHYSlk+b0syNG2xH MASy4Q4zx4Rq6LqZDk9pp1qHTlfgV3BSxEcsu6K8= From: greearb@candelatech.com To: netdev@vger.kernel.org Cc: Ben Greear Subject: [PATCH] igb: Debugging for setting rate negotiation settings. Date: Tue, 2 Apr 2019 11:17:47 -0700 Message-Id: <20190402181747.2899-1-greearb@candelatech.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ben Greear I found this useful while debugging an issue setting igb to fixed rates. Signed-off-by: Ben Greear --- drivers/net/ethernet/intel/igb/igb_main.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 350a2f120fc4..0f86b4eb5e30 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -8711,8 +8711,11 @@ int igb_set_spd_dplx(struct igb_adapter *adapter, u32 spd, u8 dplx) /* Make sure dplx is at most 1 bit and lsb of speed is not set * for the switch() below to work */ - if ((spd & 1) || (dplx & ~1)) + if ((spd & 1) || (dplx & ~1)) { + dev_err(&pdev->dev, "Unsupported Speed/Duplex configuration, bit-mismatch, spd: 0x%x dplx: 0x%x\n", + spd, dplx); goto err_inval; + } /* Fiber NIC's only allow 1000 gbps Full duplex * and 100Mbps Full duplex for 100baseFx sfp @@ -8722,6 +8725,8 @@ int igb_set_spd_dplx(struct igb_adapter *adapter, u32 spd, u8 dplx) case SPEED_10 + DUPLEX_HALF: case SPEED_10 + DUPLEX_FULL: case SPEED_100 + DUPLEX_HALF: + dev_err(&pdev->dev, "Unsupported Speed/Duplex configuration, fiber does not support HD, spd: 0x%x dplx: 0x%x\n", + spd, dplx); goto err_inval; default: break; @@ -8746,17 +8751,24 @@ int igb_set_spd_dplx(struct igb_adapter *adapter, u32 spd, u8 dplx) adapter->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL; break; case SPEED_1000 + DUPLEX_HALF: /* not supported */ + dev_err(&pdev->dev, "Unsupported Speed/Duplex configuration: 1Gbps HD not supported\n", + spd, dplx); + goto err_inval; default: + dev_err(&pdev->dev, "Unsupported Speed/Duplex configuration, case not handled, spd: 0x%x dplx: 0x%x\n", + spd, dplx); goto err_inval; } + dev_info(&pdev->dev, "Set Speed: %d dplx: %d autoneg: %d forced-speed-duplex: %d\n", + spd, dplx, mac->autoneg, mac->forced_speed_duplex); + /* clear MDI, MDI(-X) override is only allowed when autoneg enabled */ adapter->hw.phy.mdix = AUTO_ALL_MODES; return 0; err_inval: - dev_err(&pdev->dev, "Unsupported Speed/Duplex configuration\n"); return -EINVAL; }