From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E16FEC33CB7 for ; Thu, 16 Jan 2020 17:37:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B18602468C for ; Thu, 16 Jan 2020 17:37:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196231; bh=54xeeJt3oi2IZTScEVdGI/xjrie/0xH7YLIooRyhRns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EDpeKwu6524Bk/uzJbcS2dYZPDC0DfkT7H7yK1u05g1NQZbiSJ/zThGZgm369KuWT NRQF2VD5ckkYerI049yvfIx9XxX7x9xuvfOgXmTyCRIO96nzbUnCTJbmvlQlTFS6l+ trZJMAZ6f1j3qTbnQ7wfG8w/a2xPmSkEHpFVpiCc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405320AbgAPRhK (ORCPT ); Thu, 16 Jan 2020 12:37:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:52174 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405292AbgAPRhH (ORCPT ); Thu, 16 Jan 2020 12:37:07 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 932072468C; Thu, 16 Jan 2020 17:37:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196226; bh=54xeeJt3oi2IZTScEVdGI/xjrie/0xH7YLIooRyhRns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ej+07r44qtZRxuQRX0uaM0lmUtfzEe4mhaf4DSi0HrZUkM0sF5UDaTtlsoJDoxXmH lcef4UXve2ACrleoUZ1Rgm5lvEI2tfVvywZd9acnM2k57d3XCp/eXKBnGNOfEi79yh xg4By5+meeiWcfsYXB0V4eLzQu7Bj/e5x4O/IHeg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Moritz Fischer , Andrew Lunn , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 059/251] net: phy: fixed_phy: Fix fixed_phy not checking GPIO Date: Thu, 16 Jan 2020 12:33:28 -0500 Message-Id: <20200116173641.22137-19-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Moritz Fischer [ Upstream commit 8f289805616e81f7c1690931aa8a586c76f4fa88 ] Fix fixed_phy not checking GPIO if no link_update callback is registered. In the original version all users registered a link_update callback so the issue was masked. Fixes: a5597008dbc2 ("phy: fixed_phy: Add gpio to determine link up/down.") Reviewed-by: Andrew Lunn Signed-off-by: Moritz Fischer Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/fixed_phy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c index eb5167210681..3ab2eb677a59 100644 --- a/drivers/net/phy/fixed_phy.c +++ b/drivers/net/phy/fixed_phy.c @@ -67,11 +67,11 @@ static int fixed_mdio_read(struct mii_bus *bus, int phy_addr, int reg_num) do { s = read_seqcount_begin(&fp->seqcount); /* Issue callback if user registered it. */ - if (fp->link_update) { + if (fp->link_update) fp->link_update(fp->phydev->attached_dev, &fp->status); - fixed_phy_update(fp); - } + /* Check the GPIO for change in status */ + fixed_phy_update(fp); state = fp->status; } while (read_seqcount_retry(&fp->seqcount, s)); -- 2.20.1