From patchwork Thu Mar 10 16:52:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 86310 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 714061007D3 for ; Fri, 11 Mar 2011 03:52:46 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753083Ab1CJQwl (ORCPT ); Thu, 10 Mar 2011 11:52:41 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:52412 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752487Ab1CJQwk (ORCPT ); Thu, 10 Mar 2011 11:52:40 -0500 Received: by wya21 with SMTP id 21so1629238wya.19 for ; Thu, 10 Mar 2011 08:52:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer; bh=V5usQNdWef7vc3A93unh0FBBX8IEwrUxt2/Em4L2swk=; b=tMw2FmIGu4xncIXi6570Y3FRpuFP2HMFr8G/vdfBsD+eS6F312+jTOB7AOnaQlgFtI kX7bX9SqLTz46OKr0Y6Yqm8sA9r0xvfx38NkxU8uSSzUKG5JolgPTSprrNYPQJo65U// 7gh4Ny5VZZJnMrejhK2UQGs7Ip9qxHxIncTFY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=YQlcc7QW5QpmRGPcf/qZg1BJpe2v8SWa5dH7RKfJBP4d8NEe3dXv0/m8N8Vzvaj3Dn ZPXWhhWb9amsCPE+Q9OES6qIRK7P6G8vu9nVFuRAyZNz1um+9AxYnj/3LUxqvfzXM1m1 5cYXhV/BS34S9cv2H+KfBAUZCymynjXLcWfj8= Received: by 10.216.188.201 with SMTP id a51mr5961646wen.60.1299775959319; Thu, 10 Mar 2011 08:52:39 -0800 (PST) Received: from macbook.be.48ers.dk (191.207-78-194.adsl-fix.skynet.be [194.78.207.191]) by mx.google.com with ESMTPS id b54sm1650883wer.21.2011.03.10.08.52.34 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 10 Mar 2011 08:52:38 -0800 (PST) Received: by macbook.be.48ers.dk (Postfix, from userid 1000) id 8A5F9C3CCE; Thu, 10 Mar 2011 17:52:27 +0100 (CET) From: Peter Korsgaard To: davem@davemloft.net, netdev@vger.kernel.org Cc: Peter Korsgaard Subject: [PATCH] phylib: SIOCGMIIREG/SIOCSMIIREG: allow access to all mdio addresses Date: Thu, 10 Mar 2011 17:52:13 +0100 Message-Id: <1299775933-26981-1-git-send-email-jacmet@sunsite.dk> X-Mailer: git-send-email 1.7.2.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org phylib would silently ignore the phy_id argument to these ioctls and perform the read/write with the active phydev address, whereas most non-phylib drivers seem to allow access to all mdio addresses (E.G. pcnet_cs). Signed-off-by: Peter Korsgaard --- drivers/net/phy/phy.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index a8445c7..f767033 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -319,7 +319,8 @@ int phy_mii_ioctl(struct phy_device *phydev, /* fall through */ case SIOCGMIIREG: - mii_data->val_out = phy_read(phydev, mii_data->reg_num); + mii_data->val_out = mdiobus_read(phydev->bus, mii_data->phy_id, + mii_data->reg_num); break; case SIOCSMIIREG: @@ -350,8 +351,9 @@ int phy_mii_ioctl(struct phy_device *phydev, } } - phy_write(phydev, mii_data->reg_num, val); - + mdiobus_write(phydev->bus, mii_data->phy_id, + mii_data->reg_num, val); + if (mii_data->reg_num == MII_BMCR && val & BMCR_RESET && phydev->drv->config_init) {