From patchwork Thu Apr 18 23:30:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 237759 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 894382C0203 for ; Fri, 19 Apr 2013 09:31:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936719Ab3DRXay (ORCPT ); Thu, 18 Apr 2013 19:30:54 -0400 Received: from mga03.intel.com ([143.182.124.21]:61465 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936695Ab3DRXau (ORCPT ); Thu, 18 Apr 2013 19:30:50 -0400 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 18 Apr 2013 16:30:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,504,1363158000"; d="scan'208";a="229047846" Received: from unknown (HELO jtkirshe-mobl.amr.corp.intel.com) ([10.255.14.14]) by AZSMGA002.ch.intel.com with ESMTP; 18 Apr 2013 16:30:28 -0700 From: Jeff Kirsher To: davem@davemloft.net Cc: "Akeem G. Abodunrin" , netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com, =?UTF-8?q?Aur=C3=A9lien=20Guillaume?= , Jeff Kirsher Subject: [net-next 06/15] igb: Implement support to power sfp cage and turn on I2C Date: Thu, 18 Apr 2013 16:30:13 -0700 Message-Id: <1366327822-10741-7-git-send-email-jeffrey.t.kirsher@intel.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1366327822-10741-1-git-send-email-jeffrey.t.kirsher@intel.com> References: <1366327822-10741-1-git-send-email-jeffrey.t.kirsher@intel.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: "Akeem G. Abodunrin" Based on original patch from Aurélien Guillaume This patch adds support to turn on I2C, with sfp cage powered. CC: Aurélien Guillaume Signed-off-by: Akeem G Abodunrin Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher --- drivers/net/ethernet/intel/igb/e1000_82575.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c index 12b1d84..856364a 100644 --- a/drivers/net/ethernet/intel/igb/e1000_82575.c +++ b/drivers/net/ethernet/intel/igb/e1000_82575.c @@ -1420,9 +1420,10 @@ static s32 igb_setup_serdes_link_82575(struct e1000_hw *hw) */ wr32(E1000_SCTL, E1000_SCTL_DISABLE_SERDES_LOOPBACK); - /* power on the sfp cage if present */ + /* power on the sfp cage if present and turn on I2C */ ctrl_ext = rd32(E1000_CTRL_EXT); ctrl_ext &= ~E1000_CTRL_EXT_SDP3_DATA; + ctrl_ext |= E1000_CTRL_I2C_ENA; wr32(E1000_CTRL_EXT, ctrl_ext); ctrl_reg = rd32(E1000_CTRL);