From patchwork Thu Feb 9 03:03:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yanjun X-Patchwork-Id: 725954 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vJmRg0fKDz9s4s for ; Thu, 9 Feb 2017 16:12:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751377AbdBIFMo (ORCPT ); Thu, 9 Feb 2017 00:12:44 -0500 Received: from aserp1050.oracle.com ([141.146.126.70]:27993 "EHLO aserp1050.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751218AbdBIFMm (ORCPT ); Thu, 9 Feb 2017 00:12:42 -0500 Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) by aserp1050.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v19345iv029880 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 9 Feb 2017 03:04:05 GMT Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v1932t83021934 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 9 Feb 2017 03:02:55 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v1932r13018655 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 9 Feb 2017 03:02:54 GMT Received: from abhmp0006.oracle.com (abhmp0006.oracle.com [141.146.116.12]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id v1932p3F028435; Thu, 9 Feb 2017 03:02:52 GMT Received: from dhcp-cn-10-182-70-94.cn.oracle.com (/10.182.70.94) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 08 Feb 2017 19:02:50 -0800 From: Zhu Yanjun To: jeffrey.t.kirsher@intel.com, broonie@kernel.org, davem@davemloft.net, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Subject: [PATCH 1/1] ixgbe: add the external ixgbe fiber transceiver status Date: Wed, 8 Feb 2017 22:03:27 -0500 Message-Id: <1486609408-6770-1-git-send-email-yanjun.zhu@oracle.com> X-Mailer: git-send-email 2.7.4 X-Source-IP: aserp1040.oracle.com [141.146.126.69] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When the ixgbe fiber transceiver is external, it is necessary to get the present/absent status of this external ixgbe fiber transceiver. The steps to get the present/absent status: The enp1s0f0 is an external ixgbe fiber NIC. ethtool enp1s0f0 ... Port: FIBRE PHYAD: 0 Transceiver: external(present) <---The transceiver is present. Auto-negotiation: on Supports Wake-on: d ... Or ... Port: FIBRE PHYAD: 0 Transceiver: external(absent) <---The transceiver is absent Auto-negotiation: on Supports Wake-on: d ... Signed-off-by: Zhu Yanjun --- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 15 +++++++++++++++ include/uapi/linux/ethtool.h | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c index fd192bf..b3f86f4 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c @@ -313,6 +313,21 @@ static int ixgbe_get_settings(struct net_device *netdev, break; } + /* When the tranceiver is external, the following is meaningful. + * ecmd->reserved[0] has 3 values: + * 0x0: tranceiver absent + * 0x4: tranceiver present + * others: not support + */ + if (ecmd->port == PORT_FIBRE) { + u32 status = IXGBE_READ_REG(hw, IXGBE_ESDP) & IXGBE_ESDP_SDP2; + + if (status == 0x4) + ecmd->transceiver = XCVR_EXTERNAL_PRESENT; + if (status == 0x0) + ecmd->transceiver = XCVR_EXTERNAL_ABSENT; + } + /* Indicate pause support */ ecmd->supported |= SUPPORTED_Pause; diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index 3dc91a4..8e8225a 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -1541,6 +1541,10 @@ static inline int ethtool_validate_duplex(__u8 duplex) #define XCVR_DUMMY2 0x03 #define XCVR_DUMMY3 0x04 +/* The fiber transceiver status */ +#define XCVR_EXTERNAL_ABSENT 0x05 +#define XCVR_EXTERNAL_PRESENT 0x06 + /* Enable or disable autonegotiation. */ #define AUTONEG_DISABLE 0x00 #define AUTONEG_ENABLE 0x01