From patchwork Thu Feb 7 05:45:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Fischer X-Patchwork-Id: 1037840 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43w6jk65GXz9s7h for ; Thu, 7 Feb 2019 16:45:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726775AbfBGFpk (ORCPT ); Thu, 7 Feb 2019 00:45:40 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:43454 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726585AbfBGFpk (ORCPT ); Thu, 7 Feb 2019 00:45:40 -0500 Received: by mail-pl1-f193.google.com with SMTP id gn14so4281969plb.10 for ; Wed, 06 Feb 2019 21:45:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1/XuKC06w0o2tfOG+IZnGnEkIbmY1Io4BgDh5iGJOPY=; b=Q4qs2L7+troxkYgNtz25n1NKGcMy/o+mPZ5yVgZqVu6Hb1jOPofHY1jZmyYZ0/MljZ 8qaWoG4LoSVBQR6CQT90cki9VSRwakfBHycqFN0BvpPLYOdSczpT3J6gwHtFC29xqXnc elEn6r0JK/W3s9o4FdN/4bYQ2G0hHA1ooHe0YqAtWySc++WsyBjdnW4b8lUE3rr/fmXE VfK7o/XnRIUHmT2VMKF2kL+CQO0bWwbHlehrGTSMY/n6fRh+SToh2ZQEMEUdbtnd++Bf KzzxOJKndT0kW8qX/3TtF+Vr4sNVzuUYFWhagVyykTWut2o3EsLssWokKmx7ucqUufTC qEjA== X-Gm-Message-State: AHQUAubb0vfCXxPPHYO700xqmUo/F/HwjBH7Q6lkpVo2/ycsEWkHxrSJ umMEVLb4ST4GOl9eR29hYdJB0cgOqjoYvg== X-Google-Smtp-Source: AHgI3IbUDAOfIEn43rGSI5w0tZaQ96eaAsFZkda7/euF95HRQPbL5Oc26Rpo0HSHB9LiOLPumuxuhA== X-Received: by 2002:a17:902:be11:: with SMTP id r17mr14824848pls.308.1549518338861; Wed, 06 Feb 2019 21:45:38 -0800 (PST) Received: from localhost ([2601:647:4700:93d:6db5:e35d:dacd:7872]) by smtp.gmail.com with ESMTPSA id t3sm11702771pfa.50.2019.02.06.21.45.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Feb 2019 21:45:38 -0800 (PST) From: Moritz Fischer To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, davem@davemloft.net, hkallweit1@gmail.com, f.fainelli@gmail.com, andrew@lunn.ch, moritz@ettus.com, Moritz Fischer Subject: [PATCH v2 net-next] net: phy: fixed_phy: Fix fixed_phy not checking GPIO Date: Wed, 6 Feb 2019 21:45:29 -0800 Message-Id: <20190207054529.2865-1-mdf@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- Changes from v1: - Added Andrew's Reviewed-by: tag - Added Fixes: tag (Thanks for digging, Andrew!) --- 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 f136a23c1a35..d810f914aaa4 100644 --- a/drivers/net/phy/fixed_phy.c +++ b/drivers/net/phy/fixed_phy.c @@ -85,11 +85,11 @@ static int fixed_mdio_read(struct mii_bus *bus, int phy_addr, int reg_num) s = read_seqcount_begin(&fp->seqcount); fp->status.link = !fp->no_carrier; /* 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));