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=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS 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 14213C43387 for ; Thu, 17 Jan 2019 19:09:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D928420657 for ; Thu, 17 Jan 2019 19:09:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PkUYVdmB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728479AbfAQTJw (ORCPT ); Thu, 17 Jan 2019 14:09:52 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:40832 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728347AbfAQTJu (ORCPT ); Thu, 17 Jan 2019 14:09:50 -0500 Received: by mail-wm1-f66.google.com with SMTP id f188so2206597wmf.5 for ; Thu, 17 Jan 2019 11:09:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=I+hMe03WAWR76IOppbw3NxdtA260XPhRGsSP/V8JwjQ=; b=PkUYVdmB52hZSiy6jLVjiOE8GxeBisHQ0do8ngtpH3A7CgUAIH6e4TkFHZ0RMu0Zs4 jysSnZCoK/XZs96n0S/14XP3++44l9XQWTYfG7D6YLd6ff5IF9l4cfFqe/4VBAybLdA4 +U7ayoKEmi0Cq1c/O0SEyo++Xhp11F0aR/mDXh3xuUzEK6Hyz954/CyPkZhVqZvDDMc7 MPrtwJ2hvUTIMsv1bRXZm/uo+aQhP4LYWY+ISiZEpnF6bPLDEJmvL1CLY5XZwpZpQ5wC CZXB5qtZhwyNeTA5bFGeL3IMHOAJP1Ub/xPdIo8mjBe7s+NlpZ95pWNuPglX4gsv1uj8 OtKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=I+hMe03WAWR76IOppbw3NxdtA260XPhRGsSP/V8JwjQ=; b=YconTq17ajSGwwuxiFbbZeXDGpdUVuji7BYm08nKIM7hllLLiWlOkzBxWUJzSezHfo D6qCRW9WA+oN611Pxl70sHooWZCisqAX4QZYzB2/n5fhiAk+JpL28Gwl0XA57OUW/d8k BKC5aK7viXw1ePlsZ3eavUTj1e1CEKbj7mJoTWRXnt/bDh3zj0z9V6a9ocN54o8/W0a8 Yoz4o6zKTgJNUGze/x7cWRggdTSXtUXd2WCv0/cLwOkEXonxsgaFuHMTuFI+ap6ZhuTx utqMFZfN3UnK3K20DQTzYqvaG3zkgbsJyMnml8vb7rt2lxX1ozPdNDKtwZ9zYmgqxTy1 +27g== X-Gm-Message-State: AJcUukc77Wglc4RAoaEYZE3WAQTF3593Vjte5HzdaGTh01VF0GfFAU5v jKEGN42cPHCgzT9PKL/0WDqHbiXo X-Google-Smtp-Source: ALg8bN63zgsFMyn+QPa7qYjlcgRjRgtiO/hxvuzst7OBP6oyJYDTW9jqamz9zlPTiwmGulQwsPwZAg== X-Received: by 2002:a1c:2408:: with SMTP id k8mr12467514wmk.110.1547752188813; Thu, 17 Jan 2019 11:09:48 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:e16f:df31:daf0:b736? (p200300EA8BF1E200E16FDF31DAF0B736.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:e16f:df31:daf0:b736]) by smtp.googlemail.com with ESMTPSA id e9sm68495016wro.16.2019.01.17.11.09.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jan 2019 11:09:48 -0800 (PST) Subject: [PATCH v3 net-next 2/3] net: phy: ensure phylib state machine is stopped after calling phy_stop From: Heiner Kallweit To: Florian Fainelli , Andrew Lunn , David Miller Cc: "netdev@vger.kernel.org" References: <317e1806-c820-9a2a-dadd-5d7121b3047a@gmail.com> Message-ID: <93ca68b3-0004-db14-4ae1-4f47eab0b17d@gmail.com> Date: Thu, 17 Jan 2019 20:08:39 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <317e1806-c820-9a2a-dadd-5d7121b3047a@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The call to the phylib state machine in phy_stop() just ensures that the state machine isn't re-triggered, but a state machine call may be scheduled already. So lets's call phy_stop_machine(). This also allows to get rid of the call to phy_stop_machine() in phy_disconnect(). Signed-off-by: Heiner Kallweit Reviewed-by: Andrew Lunn --- drivers/net/phy/phy.c | 1 + drivers/net/phy/phy_device.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 2ffe08537..96e9ec252 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -853,6 +853,7 @@ void phy_stop(struct phy_device *phydev) mutex_unlock(&phydev->lock); phy_state_machine(&phydev->state_queue.work); + phy_stop_machine(phydev); /* Cannot call flush_scheduled_work() here as desired because * of rtnl_lock(), but PHY_HALTED shall guarantee irq handler diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 9e588f03e..839e3247f 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1005,8 +1005,6 @@ void phy_disconnect(struct phy_device *phydev) if (phydev->irq > 0) phy_stop_interrupts(phydev); - phy_stop_machine(phydev); - phydev->adjust_link = NULL; phy_detach(phydev); -- 2.20.1