From patchwork Mon Oct 22 10:32:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jose Abreu X-Patchwork-Id: 987567 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=pass (p=none dis=none) header.from=synopsys.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=synopsys.com header.i=@synopsys.com header.b="ABr5Dnp9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42dtC74ZDTz9sD4 for ; Mon, 22 Oct 2018 21:33:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728524AbeJVSvE (ORCPT ); Mon, 22 Oct 2018 14:51:04 -0400 Received: from us01smtprelay-2.synopsys.com ([198.182.47.9]:39896 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728101AbeJVSvD (ORCPT ); Mon, 22 Oct 2018 14:51:03 -0400 Received: from mailhost.synopsys.com (mailhost1.synopsys.com [10.12.238.239]) by smtprelay.synopsys.com (Postfix) with ESMTP id 0E1D224E1599; Mon, 22 Oct 2018 03:33:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1540204385; bh=ImWlQLmluFlurCYbLX1IPm1kdG9l0QmEPDExqyjqKJ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=ABr5Dnp96T+aayTdCPQsuBcZSV3poczG34CifjZP3E0+ukFuwKsmh0ovKZOnritSg gOfq6GJCOE7h1d8Pnt6SE4i12d+/Jz85awRzbPYV8xggJkeXE2KEIBQbjlvLOUXtIt rIAn0nrTEjfYCJmK5Wv6oZCLn0/9hzL3AY+swNlKVCra4qiflBO7QqOqqcsZuNJ6pa 4GjGdGset5jmk4hjoa1NqBoMbRSW8w+rvMb1FGsnX4EqWmPLiUIVWKGOXcgh6UuvTp 9y/yQcLaZVv+hN6VSTM/4SK0rMz+U5nY/d2WAEI/7VXYEZIrQmQ5oNX0xSu4HzeV46 Zt5WTV3g4eJ7A== Received: from joabreu-VirtualBox.internal.synopsys.com (joabreu-e7440.internal.synopsys.com [10.107.19.15]) by mailhost.synopsys.com (Postfix) with ESMTP id 9BA955074; Mon, 22 Oct 2018 03:33:03 -0700 (PDT) From: Jose Abreu To: netdev@vger.kernel.org Cc: Jose Abreu , Andrew Lunn , Florian Fainelli , "David S. Miller" , Joao Pinto Subject: [PATCH net-next 1/4] net: phy: Use C45 Helpers when forcing PHY Date: Mon, 22 Oct 2018 11:32:46 +0100 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If PHY is in force state and we have a C45 phy we need to use the standard C45 helpers and not the C22 ones. Signed-off-by: Jose Abreu Cc: Andrew Lunn Cc: Florian Fainelli Cc: "David S. Miller" Cc: Joao Pinto --- drivers/net/phy/phy.c | 2 +- include/linux/phy.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 1d73ac3309ce..0ff4946e208e 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -995,7 +995,7 @@ void phy_state_machine(struct work_struct *work) } break; case PHY_FORCING: - err = genphy_update_link(phydev); + err = phy_update_link(phydev); if (err) break; diff --git a/include/linux/phy.h b/include/linux/phy.h index 3ea87f774a76..02c2ee8bc05b 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1044,6 +1044,14 @@ static inline int phy_read_status(struct phy_device *phydev) return genphy_read_status(phydev); } +static inline int phy_update_link(struct phy_device *phydev) +{ + if (phydev->is_c45) + return gen10g_read_status(phydev); + else + return genphy_update_link(phydev); +} + void phy_driver_unregister(struct phy_driver *drv); void phy_drivers_unregister(struct phy_driver *drv, int n); int phy_driver_register(struct phy_driver *new_driver, struct module *owner);