From patchwork Fri Apr 10 23:03:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Toppins X-Patchwork-Id: 460269 X-Patchwork-Delegate: jeffrey.t.kirsher@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 7005A1402FA for ; Sat, 11 Apr 2015 09:11:08 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b=NwWPJR5r; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A1ED297462; Fri, 10 Apr 2015 23:11:07 +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 rfb3_xzHQwrp; Fri, 10 Apr 2015 23:11:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 505029492F; Fri, 10 Apr 2015 23:11:06 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id DCE161C1E95 for ; Fri, 10 Apr 2015 23:10:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D7D558B6D1 for ; Fri, 10 Apr 2015 23:10:18 +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 l+2UYjAm358o for ; Fri, 10 Apr 2015 23:10:18 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pd0-f177.google.com (mail-pd0-f177.google.com [209.85.192.177]) by whitealder.osuosl.org (Postfix) with ESMTPS id 025308B6C8 for ; Fri, 10 Apr 2015 23:10:17 +0000 (UTC) Received: by pddn5 with SMTP id n5so36787752pdd.2 for ; Fri, 10 Apr 2015 16:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dC8AqRqXd0eWnD89aNJDaFkLpFMDQ8lAPI6Wr9p+t6w=; b=NwWPJR5rCRedfBdvhizx60i7xxZYR56X/9MgJR55RBvn0vhlv/I75hqI5Fq2RBLY2X zBQhqUpClX844B8d/UxTntdij1aNkgn3uKqjnoWN9X7ROJb71R0CMZ/+XzvmTZ8SPhq+ YGuqDqhzAU5uBrvQxQL6MADo/mChYDfmvCIoU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dC8AqRqXd0eWnD89aNJDaFkLpFMDQ8lAPI6Wr9p+t6w=; b=AEy9ADlF2kcw0JszBjuIH9xxJZ8iTxXu3RO3MeHmTjtbRJwJI4vxha0RdVClsun1PL 3KJRNfQkm6R8f5oh7kPTTfmdbhpLHea5Gsyj6eMrQ1nHOVc2guj1/j/D3zQpfgsQT6ur WV21G2YYMypqn+D154XdRxKkIMzLxtkqfWyY8ALiYyWbKSqt3faOi4zF3b4H8LfUMGEH S9KNX5eb7KSG+Yrz0eQ9/plremtlnQ0OO5Y6v7idhnu6WmCnamqhRXoNppkFrky8sH4m isqOVKVNrgPrXcqLtb8/8ErN+lj/MXrPCOgGZXwTMevWA1PfLoTW5wFdtOwl+24BRUYK 9dQQ== X-Gm-Message-State: ALoCoQmNAvfPX24IFVMSIiTqCEIVCRpcLVpstd7EM+xzhVcZWCvnWCPzsiS34mXAzVa5veQMi8bN X-Received: by 10.70.89.237 with SMTP id br13mr6470656pdb.135.1428707028750; Fri, 10 Apr 2015 16:03:48 -0700 (PDT) Received: from monster-01.cumulusnetworks.com ([216.129.126.126]) by mx.google.com with ESMTPSA id ul8sm99132pab.36.2015.04.10.16.03.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2015 16:03:48 -0700 (PDT) From: Jonathan Toppins To: jeffrey.t.kirsher@intel.com Date: Fri, 10 Apr 2015 16:03:38 -0700 Message-Id: <1428707018-6405-3-git-send-email-jtoppins@cumulusnetworks.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1428707018-6405-1-git-send-email-jtoppins@cumulusnetworks.com> References: <1428707018-6405-1-git-send-email-jtoppins@cumulusnetworks.com> X-Mailman-Approved-At: Fri, 10 Apr 2015 23:11:05 +0000 Cc: shm@cumulusnetworks.com, gospo@cumulusnetworks.com, Alan Liebthal , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Subject: [Intel-wired-lan] [PATCH v1 net-next 3/3] igb: add PHY support for Broadcom 54616 X-BeenThere: intel-wired-lan@lists.osuosl.org X-Mailman-Version: 2.1.18-1 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@lists.osuosl.org Sender: "Intel-wired-lan" From: Alan Liebthal The Celestica Redstone-XP Ethernet management port uses a Broadcom 54616 chip for the PHY layer. This adds support for this PHY to the Intel igb e1000 driver. Signed-off-by: Alan Liebthal Signed-off-by: Jonathan Toppins Tested-by: Aaron Brown --- drivers/net/ethernet/intel/igb/e1000_82575.c | 5 +++++ drivers/net/ethernet/intel/igb/e1000_defines.h | 1 + drivers/net/ethernet/intel/igb/e1000_hw.h | 1 + 3 files changed, 7 insertions(+) diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c index 0f69ef8..2dcc808 100644 --- a/drivers/net/ethernet/intel/igb/e1000_82575.c +++ b/drivers/net/ethernet/intel/igb/e1000_82575.c @@ -286,6 +286,9 @@ static s32 igb_init_phy_params_82575(struct e1000_hw *hw) phy->ops.set_d3_lplu_state = igb_set_d3_lplu_state_82580; phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_m88; break; + case BCM54616_E_PHY_ID: + phy->type = e1000_phy_bcm54616; + break; default: ret_val = -E1000_ERR_PHY; goto out; @@ -1593,6 +1596,8 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw) case e1000_phy_82580: ret_val = igb_copper_link_setup_82580(hw); break; + case e1000_phy_bcm54616: + break; default: ret_val = -E1000_ERR_PHY; break; diff --git a/drivers/net/ethernet/intel/igb/e1000_defines.h b/drivers/net/ethernet/intel/igb/e1000_defines.h index 217f813..50d51e4 100644 --- a/drivers/net/ethernet/intel/igb/e1000_defines.h +++ b/drivers/net/ethernet/intel/igb/e1000_defines.h @@ -860,6 +860,7 @@ #define M88_VENDOR 0x0141 #define I210_I_PHY_ID 0x01410C00 #define M88E1543_E_PHY_ID 0x01410EA0 +#define BCM54616_E_PHY_ID 0x03625D10 /* M88E1000 Specific Registers */ #define M88E1000_PHY_SPEC_CTRL 0x10 /* PHY Specific Control Register */ diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h index 2003b37..d82c96b 100644 --- a/drivers/net/ethernet/intel/igb/e1000_hw.h +++ b/drivers/net/ethernet/intel/igb/e1000_hw.h @@ -128,6 +128,7 @@ enum e1000_phy_type { e1000_phy_ife, e1000_phy_82580, e1000_phy_i210, + e1000_phy_bcm54616, }; enum e1000_bus_type {