Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 23 Jun 2020 15:41:37 +0800
From:   Jisheng Zhang <Jisheng.Zhang@synaptics.com>
To:     Andrew Lunn <andrew@lunn.ch>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>
Cc:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/2] net: phy: call phy_disable_interrupts() in
 phy_init_hw()
Message-ID: <20200623154137.728d8ae8@xhacker.debian>
In-Reply-To: <20200623154031.736123a6@xhacker.debian>
References: <20200623154031.736123a6@xhacker.debian>
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from xhacker.debian (124.74.246.114) by TYAPR01CA0205.jpnprd01.prod.outlook.com (2603:1096:404:29::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.21 via Frontend Transport; Tue, 23 Jun 2020 07:42:46 +0000
X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu)
X-Originating-IP: [124.74.246.114]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 8a7fc19f-44b3-49ea-4be8-08d81749077f
X-MS-TrafficTypeDiagnostic: BY5PR03MB4949:
X-Microsoft-Antispam-PRVS: <BY5PR03MB4949DE035B3DA44C84B16F11ED940@BY5PR03MB4949.namprd03.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:8273;
X-Forefront-PRVS: 04433051BF
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: N3zR+xwJbb7h2UEbKrg8f7Nktnsz6jcRDXH0o5fqw2VVoCrmq0zXEhdnw9wFcdIg666M3lSicNrTkGYvn1ahb9iNvxPwSiSy5edEitEDGy2uA6pJ5Ahthor1gANOZu+WxVeNso2Xszy7l5cJ61i5sjcWYYcwTA0d57FKbLK/LjMVI5Yu9jLLaw+j3xlYhbZvdm134zqf8uihuIq1NNZH2zmuThSnD3WDXHoJDbo7j8YxGUxwHoV3ck9E4jW8F2RXExe+gD0MOkj9JZWj7ibLVnfkjIhnpizdAtRS8ZgDwVyodavNMe9bTYDO1WMp46qg
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR03MB3573.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(376002)(396003)(366004)(136003)(346002)(39860400002)(9686003)(316002)(66946007)(956004)(478600001)(26005)(83380400001)(6506007)(52116002)(6666004)(8936002)(4326008)(5660300002)(7696005)(86362001)(8676002)(16526019)(186003)(66476007)(66556008)(1076003)(55016002)(110136005)(2906002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: JsYzPgWcI8r/nHSF1n3UFq+KgrxS2fxVDm6f0ezmn78KYo39xG2xfZ1+qSU2WTX7EEyRFmKqocauWiEuKGpPKo2EF2D5EC4vjBq8H7K7IzOgFnyhPy4wyhDTB8q9kqiplyw4+9KWhTk0TYud0+0r0C8ehgQkOCJRxkB7kBP7/ADDjRM/YrRvgj8sUeU/y4A3pglvv412xQTdL0oKQKJ8sbNXg9KgyV9IJ9d+0aBD4HtArtHbWUBqUO/8vR4qgILEvpiCKTC4TNnXAMUm2Ca3mLAtyMUYmzSWfj1AoPpCwhdw926t5TUydzyY+iT5vNdqgs7qCZDi1T51Ec0TrRXc9yWPQGDXSBy6mPPDEUryx1o9egdGfStlhZVhzNzTyQLhZn0Yc8paGvEqUZANHyugteXC9I/OCdX/UAjTsLXf3oPcHU2/ZkO/m7Ao7AUvYh4A6XPlHTWLww/+BcbrFD8Nhk9iboRmsNUHcmcc1k0kbdCVRYpPYkOr0vNX1oDrjSru
X-OriginatorOrg: synaptics.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8a7fc19f-44b3-49ea-4be8-08d81749077f
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2020 07:42:50.4416
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: K4UL3f5DUx8eXQXJEdtdcsM5DMpMm0YkAcxv9/xwBmCjE+rvW+I8zzKugWNz0oYlaOEwWANT5n99RYYZu/mH7Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR03MB4949
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Call phy_disable_interrupts() in phy_init_hw() to "have a defined init
state as we don't know in which state the PHY is if the PHY driver is
loaded. We shouldn't assume that it's the chip power-on defaults, BIOS
or boot loader could have changed this. Or in case of dual-boot
systems the other OS could leave the PHY in whatever state." as pointed
out by Heiner.

Suggested-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
---
 drivers/net/phy/phy_device.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 04946de74fa0..f17d397ba689 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1090,10 +1090,13 @@ int phy_init_hw(struct phy_device *phydev)
 	if (ret < 0)
 		return ret;
 
-	if (phydev->drv->config_init)
+	if (phydev->drv->config_init) {
 		ret = phydev->drv->config_init(phydev);
+		if (ret < 0)
+			return ret;
+	}
 
-	return ret;
+	return phy_disable_interrupts(phydev);
 }
 EXPORT_SYMBOL(phy_init_hw);
 
-- 
2.27.0