From patchwork Fri Jan 4 13:31:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan-Marek Glogowski X-Patchwork-Id: 1020734 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=osuosl.org (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=fbihome.de Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43WQg14BHnz9s9G for ; Sat, 5 Jan 2019 00:31:41 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3BE6685E03; Fri, 4 Jan 2019 13:31:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KieheGk7avKB; Fri, 4 Jan 2019 13:31:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1DC2C85DEC; Fri, 4 Jan 2019 13:31:39 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id ADDFF1C0C36 for ; Fri, 4 Jan 2019 13:31:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A9C2E864B8 for ; Fri, 4 Jan 2019 13:31:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zU-NjpakBNOY for ; Fri, 4 Jan 2019 13:31:33 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from ironchief.h-da.de (ironchief.h-da.de [141.100.10.235]) by whitealder.osuosl.org (Postfix) with ESMTPS id A82AC865C4 for ; Fri, 4 Jan 2019 13:31:32 +0000 (UTC) IronPort-SDR: FuH7UfvaM/56jMJFMEDREngu814EIi+C99ZmnGVN6mmTmVZIaKYj6OBNgOcwtO11iGqqCfc9Fo LWhXvKAtuqsA== X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2EqAgBEXy9c/2soZI1jHgEGBwaBUwcLAQGCAoFWEieYAFIFAYExl2yBezmBS4J1AoIAIjYHDQEDAQECAQECAgJpKEIBDgGEegYnYhg5VxmDIoF1Ead6MxoChSWEZYd+hEEXeIEHjwMCoVcJgRaQWBaKChkDh0ScAQEygVZNJBSDJ5BcPjOBH4E4iBIBAQ X-IPAS-Result: A2EqAgBEXy9c/2soZI1jHgEGBwaBUwcLAQGCAoFWEieYAFIFAYExl2yBezmBS4J1AoIAIjYHDQEDAQECAQECAgJpKEIBDgGEegYnYhg5VxmDIoF1Ead6MxoChSWEZYd+hEEXeIEHjwMCoVcJgRaQWBaKChkDh0ScAQEygVZNJBSDJ5BcPjOBH4E4iBIBAQ Received: from unknown (HELO mail.fbihome.de) ([141.100.40.107]) by ironchief.h-da.de with ESMTP; 04 Jan 2019 14:31:28 +0100 Received: from kvm-sbuild2.tvc.muenchen.de. (unknown [194.113.41.246]) by mail.fbihome.de (Postfix) with ESMTPSA id DD74442D6F for ; Fri, 4 Jan 2019 14:30:45 +0100 (CET) From: Jan-Marek Glogowski To: intel-wired-lan@lists.osuosl.org Date: Fri, 4 Jan 2019 14:31:07 +0100 Message-Id: <1546608667-25498-4-git-send-email-glogow@fbihome.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1546608667-25498-1-git-send-email-glogow@fbihome.de> References: <1546608667-25498-1-git-send-email-glogow@fbihome.de> Subject: [Intel-wired-lan] [PATCH 3/3] e1000e: add some status debug output X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" Add dynamic debug info for flow control advertising and dump the status when extracting speed and duplex from it. Signed-off-by: Jan-Marek Glogowski --- drivers/net/ethernet/intel/e1000e/mac.c | 10 +++++++--- drivers/net/ethernet/intel/e1000e/phy.c | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c index ada8fbb..daa7be8 100644 --- a/drivers/net/ethernet/intel/e1000e/mac.c +++ b/drivers/net/ethernet/intel/e1000e/mac.c @@ -1310,10 +1310,14 @@ s32 e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed, status = er32(STATUS); - if (status & E1000_STATUS_AUTONEG) + if (status & E1000_STATUS_AUTONEG) { + e_dbg("status 0x%x => in auto-neg, no valid config\n", status); return 1; - if (!(status & E1000_STATUS_LU)) + } + if (!(status & E1000_STATUS_LU)) { + e_dbg("status 0x%x => no link, no valid config\n", status); return 1; + } if (status & E1000_STATUS_SPEED_1000) *speed = SPEED_1000; @@ -1327,7 +1331,7 @@ s32 e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed, else *duplex = HALF_DUPLEX; - e_dbg("%u Mbps, %s Duplex\n", + e_dbg("status 0x%x => %u Mbps, %s Duplex\n", status, *speed == SPEED_1000 ? 1000 : *speed == SPEED_100 ? 100 : 10, *duplex == FULL_DUPLEX ? "Full" : "Half"); diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c index 4223301..91da35c 100644 --- a/drivers/net/ethernet/intel/e1000e/phy.c +++ b/drivers/net/ethernet/intel/e1000e/phy.c @@ -1011,6 +1011,7 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw) */ mii_autoneg_adv_reg &= ~(ADVERTISE_PAUSE_ASYM | ADVERTISE_PAUSE_CAP); + e_dbg("Advertise no flow control\n"); break; case e1000_fc_rx_pause: /* Rx Flow control is enabled, and Tx Flow control is @@ -1024,6 +1025,7 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw) */ mii_autoneg_adv_reg |= (ADVERTISE_PAUSE_ASYM | ADVERTISE_PAUSE_CAP); + e_dbg("Advertise no flow control\n"); break; case e1000_fc_tx_pause: /* Tx Flow control is enabled, and Rx Flow control is @@ -1031,6 +1033,7 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw) */ mii_autoneg_adv_reg |= ADVERTISE_PAUSE_ASYM; mii_autoneg_adv_reg &= ~ADVERTISE_PAUSE_CAP; + e_dbg("Advertise Tx flow control\n"); break; case e1000_fc_full: /* Flow control (both Rx and Tx) is enabled by a software @@ -1038,6 +1041,7 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw) */ mii_autoneg_adv_reg |= (ADVERTISE_PAUSE_ASYM | ADVERTISE_PAUSE_CAP); + e_dbg("Advertise Tx and Rx flow control\n"); break; default: e_dbg("Flow control param set incorrectly\n"); @@ -1048,7 +1052,7 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw) if (ret_val) return ret_val; - e_dbg("Auto-Neg Advertising %x\n", mii_autoneg_adv_reg); + e_dbg("Auto-Neg Advertising 0x%x\n", mii_autoneg_adv_reg); if (phy->autoneg_mask & ADVERTISE_1000_FULL) ret_val = e1e_wphy(hw, MII_CTRL1000, mii_1000t_ctrl_reg);