From patchwork Fri Apr 17 20:24:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Toppins X-Patchwork-Id: 462187 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 E29AB140293 for ; Sat, 18 Apr 2015 06:24:22 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b=E0I6cjwz; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751927AbbDQUYS (ORCPT ); Fri, 17 Apr 2015 16:24:18 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:34265 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751768AbbDQUYR (ORCPT ); Fri, 17 Apr 2015 16:24:17 -0400 Received: by pacyx8 with SMTP id yx8so135837873pac.1 for ; Fri, 17 Apr 2015 13:24:16 -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=Wr7muAgoWD6kk9EwN7/r1t4pkJk+9r4vkUapVlniCfE=; b=E0I6cjwz2A0GCp3U/yUNs02m29kdyrkNPGg7E6cJtCBP+z7+QqOLksNDvm2fY2oQT+ DGLOce3EdgCFww0HsJP5k+wypgDYtbXf6VHJF9llI6Vkxouk5soeP1za4pEU5KDKy2Np wfO7Ol4t81HMN+OgdAKZvigIPUPCK9LuxuzNA= 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=Wr7muAgoWD6kk9EwN7/r1t4pkJk+9r4vkUapVlniCfE=; b=VzlxSTN+8dmwRXrMMPaofU6LQ0GBCYXrrNkgm+h8LDEYjr8nvgWwT/NYSNnTA2lvWv Wsh479lXtpdEEjjcJsUM5sstvrjuNmjSxTH0cwMLpQquOhYbWHN7xrHQOVWUT47MQFl6 SKPIm+bNUklLvif/fe0Csuj0SNPmNM38s4xvOhOECjmOWqcrPkKY23evt9pLGsC4N+wT J87CakdZWk3Gj29E1W8q6ErZOfWlIyB5RqWlpDXd71E4nvxbvtbGhro/9qFy/ID/1jlA jek+a1COx5CK5YIXEmrG/VTHYSKXDqhB3xRdDdDdpGP6ss04dxtACsMfWdkYYicNmXkV KuNw== X-Gm-Message-State: ALoCoQnjEVjpK4mjvxrKUptGo8ujPk8mbY1ab/fu+fB+tq880RaoAQLTXiGfny7DP+bDEYa30KTh X-Received: by 10.66.63.7 with SMTP id c7mr8564369pas.13.1429302256479; Fri, 17 Apr 2015 13:24:16 -0700 (PDT) Received: from monster-01.cumulusnetworks.com ([216.129.126.126]) by mx.google.com with ESMTPSA id nd3sm10951713pbc.9.2015.04.17.13.24.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Apr 2015 13:24:15 -0700 (PDT) From: Jonathan Toppins To: jeffrey.t.kirsher@intel.com Cc: jesse.brandeburg@intel.com, shannon.nelson@intel.com, carolyn.wyborny@intel.com, donald.c.skidmore@intel.com, matthew.vick@intel.com, john.ronciak@intel.com, mitch.a.williams@intel.com, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, gospo@cumulusnetworks.com, shm@cumulusnetworks.com, Alan Liebthal Subject: [PATCH v1 net-next 2/2] igb: support SIOCSMIIREG Date: Fri, 17 Apr 2015 13:24:00 -0700 Message-Id: <1429302240-654-2-git-send-email-jtoppins@cumulusnetworks.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1429302240-654-1-git-send-email-jtoppins@cumulusnetworks.com> References: <1429302240-654-1-git-send-email-jtoppins@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Alan Liebthal Support setting the MII register via SIOCSMIIREG. Signed-off-by: Alan Liebthal Signed-off-by: Jonathan Toppins Tested-by: Aaron Brown --- drivers/net/ethernet/intel/igb/igb_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 720b785..1071a71 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -7141,6 +7141,11 @@ static int igb_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) return -EIO; break; case SIOCSMIIREG: + adapter->hw.phy.addr = data->phy_id; + if (igb_write_phy_reg(&adapter->hw, data->reg_num & 0x1F, + data->val_in)) + return -EIO; + break; default: return -EOPNOTSUPP; }