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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 E882FC432C0 for ; Tue, 3 Dec 2019 22:37:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B16AD207DD for ; Tue, 3 Dec 2019 22:37:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575412671; bh=Ye4jR+CkRjrPNFX6t5EZnz+G8uSEfUhD99Mv+tsNazs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YFNcEgGSENMIQNO/DQNSxhR8WuQN7XWET388f/SImoaOx57n6FWIkSLHAACp9zzPh 2qbnDwXkEiwoj+i7V4f2o3PJv4wbp9cvmY/Qz7WFNhwFwUN9lKJHhakN4MT/vVfkKU Q58LYeRL4GbMlHGGPvuB3uctoGzeA8Xd0miZa2AM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727817AbfLCWhu (ORCPT ); Tue, 3 Dec 2019 17:37:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:46240 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727792AbfLCWhr (ORCPT ); Tue, 3 Dec 2019 17:37:47 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D6BED207DD; Tue, 3 Dec 2019 22:37:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575412667; bh=Ye4jR+CkRjrPNFX6t5EZnz+G8uSEfUhD99Mv+tsNazs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KkvvJz4zOka0I9AcLZwERWAqaDSX0nx+vg0CnVsY+oZXH9K3Xw2WH9G2yBX8KZ9nk vf5mxWZKrLRHoVuc2tag5ddZjyAwAmXyROxGqHuKYTGL3gVEK+MQOB5LTTJp789861 PCXpsg3sGtQVCyFCqNgfx/zoAQrzPnOaFLqvCUIQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Geert Uytterhoeven , Andrew Lunn , David Bauer , "David S. Miller" Subject: [PATCH 5.4 18/46] mdio_bus: dont use managed reset-controller Date: Tue, 3 Dec 2019 23:35:38 +0100 Message-Id: <20191203212734.825000265@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203212705.175425505@linuxfoundation.org> References: <20191203212705.175425505@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Bauer [ Upstream commit 32085f25d7b68404055f3525c780142fc72e543f ] Geert Uytterhoeven reported that using devm_reset_controller_get leads to a WARNING when probing a reset-controlled PHY. This is because the device devm_reset_controller_get gets supplied is not actually the one being probed. Acquire an unmanaged reset-control as well as free the reset_control on unregister to fix this. Reported-by: Geert Uytterhoeven CC: Andrew Lunn Signed-off-by: David Bauer Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/phy/mdio_bus.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -62,8 +62,8 @@ static int mdiobus_register_reset(struct struct reset_control *reset = NULL; if (mdiodev->dev.of_node) - reset = devm_reset_control_get_exclusive(&mdiodev->dev, - "phy"); + reset = of_reset_control_get_exclusive(mdiodev->dev.of_node, + "phy"); if (IS_ERR(reset)) { if (PTR_ERR(reset) == -ENOENT || PTR_ERR(reset) == -ENOTSUPP) reset = NULL; @@ -107,6 +107,8 @@ int mdiobus_unregister_device(struct mdi if (mdiodev->bus->mdio_map[mdiodev->addr] != mdiodev) return -EINVAL; + reset_control_put(mdiodev->reset_ctrl); + mdiodev->bus->mdio_map[mdiodev->addr] = NULL; return 0;