From patchwork Wed Feb 26 16:48:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 3726181 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F1312BF13A for ; Wed, 26 Feb 2014 16:48:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1BFAB20138 for ; Wed, 26 Feb 2014 16:48:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 39C3220166 for ; Wed, 26 Feb 2014 16:48:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753274AbaBZQss (ORCPT ); Wed, 26 Feb 2014 11:48:48 -0500 Received: from 82-68-191-81.dsl.posilan.com ([82.68.191.81]:37294 "EHLO rainbowdash.ducie.codethink.co.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751740AbaBZQsr (ORCPT ); Wed, 26 Feb 2014 11:48:47 -0500 Received: from ben by rainbowdash.ducie.codethink.co.uk with local (Exim 4.82) (envelope-from ) id 1WIhez-0005uS-ON; Wed, 26 Feb 2014 16:48:41 +0000 From: Ben Dooks To: netdev@vger.kernel.org Cc: linux-sh@vger.kernel.org, sergei.shtylyov@cogentembedded.com, nobuhiro.iwamatsu.yj@renesas.com, magnus.damn@opensource.se, horms@verge.net.au, Ben Dooks Subject: [PATCH] sh_net: runtime pm wrap mdio read and write Date: Wed, 26 Feb 2014 16:48:39 +0000 Message-Id: <1393433319-22685-1-git-send-email-ben.dooks@codethink.co.uk> X-Mailer: git-send-email 1.8.5.3 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On the R8A7790, if the device has been suspended by pm_runtime and the MII code tries to access the bus then there is a possiblity that it will fail to read any data from the MII bus. Change the MDIO read and write calls to be wrappered by calls to pm_runtime_{get,put}_sync so that the device will be enabled during these calls. It is put here to avoid having to enable and disable the clock for every bit that is sent by the MII bit-banging code. This has been exposed by the change to using OF and a fix to enable the pm_runtime clock management which seems to have been broken for some time for the device-tree booted Renesas kernels. Signed-off-by: Ben Dooks --- drivers/net/ethernet/renesas/sh_eth.c | 39 +++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index b92034c..8d1b84e 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -983,6 +983,8 @@ static unsigned long sh_eth_get_edtrr_trns(struct sh_eth_private *mdp) struct bb_info { void (*set_gate)(void *addr); + int (*mdio_read)(struct mii_bus *bus, int phy_id, int regnum); + int (*mdio_write)(struct mii_bus *bus, int phy_id, int regnum, u16 val); struct mdiobb_ctrl ctrl; void *addr; u32 mmd_msk;/* MMD */ @@ -1071,6 +1073,38 @@ static struct mdiobb_ops bb_ops = { .get_mdio_data = sh_get_mdio, }; +/* Wrapper to ensure bitbang ops have device runtime-pm enabled */ + +static inline struct bb_info *mii_to_bitbang(struct mii_bus *bus) +{ + struct mdiobb_ctrl *ctrl = bus->priv; + return container_of(ctrl, struct bb_info, ctrl); +} + +static int sh_mdio_read(struct mii_bus *bus, int phy_id, int regnum) +{ + struct bb_info *bitbang = mii_to_bitbang(bus); + int ret; + + pm_runtime_get_sync(bus->dev.parent->parent); + ret = bitbang->mdio_read(bus, phy_id, regnum); + pm_runtime_put_sync(bus->dev.parent->parent); + + return ret; +} + +static int sh_mdio_write(struct mii_bus *bus, int phy_id, int regnum, u16 val) +{ + struct bb_info *bitbang = mii_to_bitbang(bus); + int ret; + + pm_runtime_get_sync(bus->dev.parent->parent); + ret = bitbang->mdio_write(bus, phy_id, regnum, val); + pm_runtime_put_sync(bus->dev.parent->parent); + + return ret; +} + /* free skb and descriptor buffer */ static void sh_eth_ring_free(struct net_device *ndev) { @@ -2639,6 +2673,11 @@ static int sh_mdio_init(struct net_device *ndev, int id, goto out; } + bitbang->mdio_read = mdp->mii_bus->read; + bitbang->mdio_write = mdp->mii_bus->write; + mdp->mii_bus->read = sh_mdio_read; + mdp->mii_bus->write = sh_mdio_write; + /* Hook up MII support for ethtool */ mdp->mii_bus->name = "sh_mii"; mdp->mii_bus->parent = &ndev->dev;