Received: by 2002:a17:90a:9307:0:0:0:0 with SMTP id p7csp3946556pjo; Tue, 3 Mar 2020 09:54:34 -0800 (PST) X-Google-Smtp-Source: ADFU+vtgj8gH9CJY6cDBponlBHoNqwyN31GPYYmFmeNRZu/kWJIaIA/DE64ZN/MJ5IgcjDCkKoIf X-Received: by 2002:a9d:6205:: with SMTP id g5mr4468779otj.153.1583258074558; Tue, 03 Mar 2020 09:54:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583258074; cv=none; d=google.com; s=arc-20160816; b=peMmPTdm0chS81RD5qcwnge65/lUuwlu7AtjK1NtzBNqtLTgfKnf48azV7q8Cd7lHe EzXHt57uXkNVbdxVhWO3m1r0laiyHkOPlFRXeLlggvM3YuqVPv1xQrGcX1BqmzuhqYzp ZhOCieroQfXyUxOI0DtWbZ0SdUerk0ttXKPG7veMNkk72c3OMQ6V0TL7d50Fp0RbSJe7 PrzXqGU2L0+Q3uHwF1XtE7YpJ/Kn08NO2r227IcZB7tzNlwn7ZkgWbiJtP8Nw+VcbPX9 BOTvpk1RKXu35k/pBzxFqX2Nye32WYVSutn+vd38BhUT0spuU6My9rzj7+ckwxqd+AlU hNvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vOWihl3fZYze4lAMK8ydVAnbsT2NZVM9ivQxClZ92rw=; b=TkwB3gtqB84XWJmsGETxjHjpPiAoAFcN48Y0qRd6R4m4oFnySNmyf8Y0h2f3VUB2eg HtbUWLMGUqjw2hGYwrrwYyOjI5RIICa8zuQH3ml0pRZdxetNOIbLognqPBCcp2QPH/6/ IxmXhEu3QRMMXBTd7lUyZAoukcRxpuniqyy4vTOwo/cEPbX8yLlHXajK/nStzgDH9gZZ TjF2ybmmOFagrJtLs4ksQ3BMlTLIhprOvmS9FvOyFuwaRfWi0EJ6D+lHSmyvT3QkexNk u4vFUiD6Di44ggbwSp3b6KV8z4eD/6wEyEcAI7lWCLj7Qy6iBRUrGzlrHOCihl8prD7x bqsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SSfsAJGu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q11si6798627oti.270.2020.03.03.09.54.22; Tue, 03 Mar 2020 09:54:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SSfsAJGu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732176AbgCCRwe (ORCPT + 99 others); Tue, 3 Mar 2020 12:52:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:60944 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731387AbgCCRwc (ORCPT ); Tue, 3 Mar 2020 12:52:32 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C468820CC7; Tue, 3 Mar 2020 17:52:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583257951; bh=23q8wOej2CGk3XczCcVwpa2g7hpc7dm7DZVNhrIvC0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SSfsAJGuz5iSjb2NNMvlvAE+pc41mgE0N+vF22bBRiqpgYV7sjohXSgnKn634DCJB 4HK6Z9tgVEWI6F7qQJX57HUDmTa/hu1XhyYgdpiar5ZZSwovUoAmLeJe6cuth1xDm9 KckKVlsrGni9VqX6c9V+QQar99xJOwydmkLjtp/w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arun Parameswaran , Scott Branden , Andrew Lunn , Florian Fainelli , "David S. Miller" Subject: [PATCH 5.4 007/152] net: phy: restore mdio regs in the iproc mdio driver Date: Tue, 3 Mar 2020 18:41:45 +0100 Message-Id: <20200303174303.333828110@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174302.523080016@linuxfoundation.org> References: <20200303174302.523080016@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arun Parameswaran commit 6f08e98d62799e53c89dbf2c9a49d77e20ca648c upstream. The mii management register in iproc mdio block does not have a retention register so it is lost on suspend. Save and restore value of register while resuming from suspend. Fixes: bb1a619735b4 ("net: phy: Initialize mdio clock at probe function") Signed-off-by: Arun Parameswaran Signed-off-by: Scott Branden Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/phy/mdio-bcm-iproc.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) --- a/drivers/net/phy/mdio-bcm-iproc.c +++ b/drivers/net/phy/mdio-bcm-iproc.c @@ -178,6 +178,23 @@ static int iproc_mdio_remove(struct plat return 0; } +#ifdef CONFIG_PM_SLEEP +int iproc_mdio_resume(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct iproc_mdio_priv *priv = platform_get_drvdata(pdev); + + /* restore the mii clock configuration */ + iproc_mdio_config_clk(priv->base); + + return 0; +} + +static const struct dev_pm_ops iproc_mdio_pm_ops = { + .resume = iproc_mdio_resume +}; +#endif /* CONFIG_PM_SLEEP */ + static const struct of_device_id iproc_mdio_of_match[] = { { .compatible = "brcm,iproc-mdio", }, { /* sentinel */ }, @@ -188,6 +205,9 @@ static struct platform_driver iproc_mdio .driver = { .name = "iproc-mdio", .of_match_table = iproc_mdio_of_match, +#ifdef CONFIG_PM_SLEEP + .pm = &iproc_mdio_pm_ops, +#endif }, .probe = iproc_mdio_probe, .remove = iproc_mdio_remove,