From patchwork Mon Aug 23 14:37:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Riesch X-Patchwork-Id: 502202 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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, 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 4D5BDC4338F for ; Mon, 23 Aug 2021 14:38:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2569761073 for ; Mon, 23 Aug 2021 14:38:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230245AbhHWOix (ORCPT ); Mon, 23 Aug 2021 10:38:53 -0400 Received: from mail-eopbgr140057.outbound.protection.outlook.com ([40.107.14.57]:21378 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230032AbhHWOiv (ORCPT ); Mon, 23 Aug 2021 10:38:51 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nQ/bc0bT7sFG848lQ9zrb2GYGABu/wkPtU39SUADNiD0KRegQNe58pBVOdB95CsuFBEH8GE/MSGrHUx130GtdKSUPb6zmllxY6JP8E/inc+gb0Jj11SB84/pjnK3qxuwnB0lAzv4rHR+ETuGmW5wlGIUT1EuyE4SALJTPu6BQLRw7r8cUGEqDc3z6rMPWLEg7R5wexahjGylCZbgntRO/kGSYkoo39E2/qAashxBiP7b88knx/0jhBU2FQudM+bgu+nbiso2O91Kja4eprBLd9zrFe/G5Ta96n/FuX9RifkKTGldtUScYM54kjy0fM6ZYpf4Z/pKSE3S6wmDPYlTKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R8cpMIoWHwSDzb4iIqYAoq5D5VsP30B/G1kHippQ/vA=; b=kwxmKiuYgbwm6/RHPyTl5LHuDDY0KdS4EoBK5MyhVcVAeY762b7IOZQmsf0bgWj6RYinr5KO1CAUnKX4fl1kF8YO2nzlcSNunU+GBp7GGFFNo6AP1XRfoVTJD7hM178Cbc1buvqps08vE+QHRcrARkgtdY3JeY7oPFJzsRKUNo0KdNNME1W6NapLxeePMu521YsHCmK25XOhDHbneboZ1Uhr26vbxQjegUQfgI2giJJpOigu8Q7QCqESMiyoDguREujTxLRyvGNHWFZKMDTX85TcxJwjuyzT2QOun2As4B+fKqpcQglpdawUBkm9Q9N4GbO0LRVLSqq8XR4sAfxlWQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R8cpMIoWHwSDzb4iIqYAoq5D5VsP30B/G1kHippQ/vA=; b=yrAVXQdUbRGB7LT0yWV1h6WMe9Ls4YHZtqQi+oKDeX32NAzAbOGuxMHcnkXYPx9v93+lZXO3pr16mebgl1d3SG9elNtMCtrhruKsxz46pJK1eaYo/BXG0IoFWjuF/91XoxsfAtqaWQlgBTrqEU4dVroMCiTvlojKk2yBoLcU9to= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=wolfvision.net; Received: from DBBPR08MB4523.eurprd08.prod.outlook.com (2603:10a6:10:c8::19) by DB6PR0801MB1942.eurprd08.prod.outlook.com (2603:10a6:4:75::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.22; Mon, 23 Aug 2021 14:38:06 +0000 Received: from DBBPR08MB4523.eurprd08.prod.outlook.com ([fe80::ade3:93e2:735c:c10b]) by DBBPR08MB4523.eurprd08.prod.outlook.com ([fe80::ade3:93e2:735c:c10b%7]) with mapi id 15.20.4436.024; Mon, 23 Aug 2021 14:38:06 +0000 From: Michael Riesch To: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S . Miller" , Jakub Kicinski , Maxime Coquelin , Michael Riesch Subject: [PATCH] net: stmmac: dwmac-rk: fix unbalanced pm_runtime_enable warnings Date: Mon, 23 Aug 2021 16:37:54 +0200 Message-Id: <20210823143754.14294-1-michael.riesch@wolfvision.net> X-Mailer: git-send-email 2.20.1 X-ClientProxiedBy: VI1P18901CA0009.EURP189.PROD.OUTLOOK.COM (2603:10a6:801::19) To DBBPR08MB4523.eurprd08.prod.outlook.com (2603:10a6:10:c8::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from carlos.wolfvision-at.intra (91.118.163.37) by VI1P18901CA0009.EURP189.PROD.OUTLOOK.COM (2603:10a6:801::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19 via Frontend Transport; Mon, 23 Aug 2021 14:38:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b8155f33-7fd3-4e40-d0c2-08d966439e85 X-MS-TrafficTypeDiagnostic: DB6PR0801MB1942: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1775; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: flD+FgqoLMgLGBC/FSRxPEOFy0eoMhoPE7IP+jqwFgTHmyUJlb5OV7MjtNpNf3hrLg98ZDDhOFbeKQT/VmV2XZj8K92m3zW03R6uXbRMdDH0ImBVcXAKxwc1o6T1ebvXdq7EMxjc3iTRJxwreH+BN2ip8TIyeeuCGEVGqxuq2IoCWBGAtY9cur3TX9BPqNFveYL3cmgXbtSGBf7Pan8TYW8XuvXUobqmMNeKAiZF56cCgKd8Ta+VZaiDOcyFf0kwCYZ8NXmY4TwIH63lyQmQP7bLIlV/c9xbLBkq1cH0zVfw6+0Wufxo2JAO0TkSErfkPUpn/vegwrFBB7FjF9lanc75SRMk3mpki9r53o+ArIBOjOcyyTsrZ3KaMLduqaQ8LbmTpNe2JHnl3BtS8EorbiVvoCFzwlaDEIY+sk0JAxkoI7hfQPL4MV06FqrSXBcjaL5eMuEQsNxXhNfoJlze2fGIfloHXp6Bn3/YZZIk3UBjKFkVAyIIud+iZ3Jnpu4yoEX2GvAEiRz7sVzyktg8dkI3XH3ARUpGer+A4Ns/vRF9SsUKmat3/MSgFLW6tO2NuhkR+dwXwNmpxD3ZlXgd7Q50nKz6utNE+z6BJWBfQ4pRyMC0tfFjSodJCxv/OUMaYOIKWqU6BxoYtwH2WNX3fJ0yQqiZOkK+H87qG2Ns6wx+4Kmhif7NPChR8iZ4G46dHQVNyk0bEqNp1zYIXKBTwQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR08MB4523.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(366004)(396003)(136003)(39840400004)(346002)(107886003)(44832011)(5660300002)(6666004)(4326008)(83380400001)(6506007)(6486002)(8936002)(956004)(2616005)(2906002)(66946007)(66556008)(66476007)(8676002)(36756003)(26005)(186003)(478600001)(316002)(86362001)(52116002)(38100700002)(38350700002)(1076003)(54906003)(7416002)(6512007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: s4zJOn4uBWQEpx6uqDLMRXUGzDtFaYWxpCggpO0X3WgqdQbPhTj66HgIMpiQEKCsxmPJspcUEv8VOc4B5AQuouARoG1EtzGbyeDlatNpQdfpTF8JGZVsU3tBv5EyZxEhJhmiAN9AeibMzwaxG/Bl13OgxHUihG/ERy/ANfWjBuLQEp/7TC4CMmwSEjSiNeX5zsuSU2P+pKnnTNSxQ/OMABzffS497dbcO5juIHkHoaXtFL2+xSoxNReffsuTYJGCHaGyevkucmgQ/XwAKvCxx9K5DFb6r4LcHIl0ygISu+8EmEmS9n2o8pRumjDOqrI0NN1BWvewhB0hFFTLtXCsKP9XLEWziL/OhcBYGMaUmte+P7yc69iRo/t4CqfY6eMW9APyGyB573SYL6DXXp9sBvmaBypl5hnhMK5AWF/zKMKOHotbg3fKGvo6VGhByUtmgY4iHQ9b1SCdeL87LylGlnrDZyrN6uQy/JPpymfxrR4wFxLQQ9MfaFCcoYHrCxdBejxXmLCzUF9PJo7LtdV7ao1BkC8c++qSS3ew1rYQeH3Nl4MHxYV3As4ztVkesBn6Np9X64XKOFSPgCAG8MVPJBamBenCIApe2ARmae6u9Si+b6L27rPIsKbmcu27SnjHVgKDgtPe0N60t8NN1JJuXORCqbtoiKA+i9CTib3zmR68ONCS6iVB5pzwRUhaXipCjdnd38TCXuu4yqPGXB5seYxEhaDWK0uITadLv7c/vCf9Vcz2zUbjgxVb57YRatglQtW0pgTB8R7joLwHZ16UWIc4/Q4WXChXdWps2Or+TNljJOfMM1xdzZEygiHVGUfVdH+GPL4O+EVumfCfrfbS4q1kIIz3GXa9YBg4vzUslXkyAYeqtzmNPo1pw0Bp002zSUdd7NZ8qJmOI02WNWvRVT5OToeKIw5UCquXkbOknCe4yB5EeM55v3M+TSlIPNILAQGqrzIndKV3awsHHlBJT3oOUcI4rV7pkSUKgvoK77DnYQJ9Z4PgblXU0RX6m9cGBe8V7x4R9JkiG5+5tON/db7Y+MnNoTIrjOijLsrSYbeoj9ezhx2SG/v7q0kJkWE1odLt/nBUDagmtj5T+TFlWJSiG94qhxNNNAxggJOlqRgt/xk/VB/W05hT1DdGHkKUtEoIOW+jwMYlNOIkJfGfpLBsqIheOxePlrsqXlaoZDeQ5Ffxgnfoe7USbKBLwwGq06SAk6v1y/v/IRlCgyHyrLMolhulp8qiI519Mbp7J93ZKQ7NXFFNs6XZsyL5LvHH6fmu64J8EamyGMJ8S46sdUOBHL8MGbqBOiEiYTknZky1w6Cq21JnnYcj3vwSDhNn X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: b8155f33-7fd3-4e40-d0c2-08d966439e85 X-MS-Exchange-CrossTenant-AuthSource: DBBPR08MB4523.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2021 14:38:05.9526 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e94ec9da-9183-471e-83b3-51baa8eb804f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zPVRJdB/gC3dH8isJrlJliw+tLmKxTBi1lEpauM/1sNn9/HSbJzSzis5GqSxMLRKWSomRDj3em99Rt/Zt7BptxTSyaNhSBS67rKBiTcGtLs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1942 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This reverts commit 2c896fb02e7f65299646f295a007bda043e0f382 "net: stmmac: dwmac-rk: add pd_gmac support for rk3399" and fixes unbalanced pm_runtime_enable warnings. In the commit to be reverted, support for power management was introduced to the Rockchip glue code. Later, power management support was introduced to the stmmac core code, resulting in multiple invocations of pm_runtime_{enable,disable,get_sync,put_sync}. The multiple invocations happen in rk_gmac_powerup and stmmac_{dvr_probe, resume} as well as in rk_gmac_powerdown and stmmac_{dvr_remove, suspend}, respectively, which are always called in conjunction. Signed-off-by: Michael Riesch --- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 280ac0129572..ed817011a94a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -21,7 +21,6 @@ #include #include #include -#include #include "stmmac_platform.h" @@ -1529,9 +1528,6 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) return ret; } - pm_runtime_enable(dev); - pm_runtime_get_sync(dev); - if (bsp_priv->integrated_phy) rk_gmac_integrated_phy_powerup(bsp_priv); @@ -1540,14 +1536,9 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) static void rk_gmac_powerdown(struct rk_priv_data *gmac) { - struct device *dev = &gmac->pdev->dev; - if (gmac->integrated_phy) rk_gmac_integrated_phy_powerdown(gmac); - pm_runtime_put_sync(dev); - pm_runtime_disable(dev); - phy_power_on(gmac, false); gmac_clk_enable(gmac, false); }