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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CD1D6C54E58 for ; Thu, 21 Mar 2024 13:54:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Message-Id:MIME-Version:Subject: Date:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=08En1XialWWgIXUg2f9l6sztijhOE0tr+nH2J3s61nc=; b=LuVM4z39/71s6p UsmXI7P8YEuOADcFsCrGYXofXwpwHLN49hV6xm8vb9Y1vHshOQfyI14r6+5MSN9OurGgwyrghmvSy 9dS/pgZtfIj0t0WhFk4QUfAyzW7+5ufpZi8rRbw8lwymBLQAoqPawBAFYDRvCiQLTfWNQOxM8g/bT F7Vz4jpOQvJBnuJiE2WFsw6W1adJUy8IxCzxrwDUNb97bctzePm3mFOtgaBUQMCEbVzSRDCucmh6I P3dxm6BH1IqZCYN7BglxbWtfXIa/6UziMlDRjCvqu/GmzxhzphuN8kj+a2uO/VePP0RCCXVw5ajq1 ShP/kfDNyP03on3KKpeg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rnIsD-00000003AtJ-1ebS; Thu, 21 Mar 2024 13:54:25 +0000 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rnIs9-00000003Asb-3MEj for linux-arm-kernel@lists.infradead.org; Thu, 21 Mar 2024 13:54:23 +0000 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-56bc5a12a75so1121233a12.2 for ; Thu, 21 Mar 2024 06:54:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711029259; x=1711634059; darn=lists.infradead.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=RISJ51b+qHtZnF1GQnWK2y8jYm5bTJzD2sPnVFGaQwU=; b=fnPYBCJiMz53yHxPSe817HolBNcp20kmX/Q8PmYi1cN6aq9UC96LmrkoHuqo4qzn8h P3dhh+3iNbtRONCn4uirnKZbKYl6YGvMXg2GIr0HkNjXunBvpWyK214hJ3tcjG8nzxuw iCsVe/nQrx7PnLGZstIPNi/Tiaqy6koozuO/w0v7Hdx6grsU5jE0lOd8BUn/GV/KcstF 3RFaq9fSKlUUNRK8Oh365EHdJzfbqukw+8jNK+ocGVmydXlJuZBFnaadtdXRtjerxx1Z LlFDJxB/YaJ2cyRQC5R5GykE+MWX1Fr5h3WcEgR8vHAPJV1A0s65WOoehQ+YHZic48vL +G5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711029259; x=1711634059; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RISJ51b+qHtZnF1GQnWK2y8jYm5bTJzD2sPnVFGaQwU=; b=MhkGyUeAPTU4TZT380AM4qmPBBffAndvc4OwirlGoIwbkqfGbwZKLgSO7tWLMfPCaq EkPWI1TvA8CTtlP/q4nhl/HNjFjlHu6Xi0dDr1m0upuX/jAX2EhTd8uyZn3afI4YyNAO yBiRi32ko26aN1A+8IkcoxbbScfZtRvFWDeIQ8JWMUptia7LCzAawQL7/zo1ziyIY5JE 6KjcklupphiTjlY7vbxZdcFfW4tDcHijZ8E/we9Vkmk7PlhBvxJDCMUv0aRduompc7rz 6i1yB5JI4+c5ovSbhpIDlZKX7aBJ9osz54gmuuU7NcAb+U7FTmtpFzHO3kWuw9NeZXlB 1Ekg== X-Forwarded-Encrypted: i=1; AJvYcCW77RK2bU8buWJf0tMurIVr3GjZ9NkyHJJFR3fhpeJWNuMq7VrWHn/ggXkgp+nBcymErwlQxIVM7k685bxb5kUfPBR791dykFP8gzspj7KD92dUmDg= X-Gm-Message-State: AOJu0Yx30YWaL3sZhIG/QOqxWEL1bJLGsyqXzG6uCNYs957/FpmOnh0D /3vBaR//XnQDGMQT/RJtX8BHra27+36+Wgwx4jM2MKE5SLWvgOvO X-Google-Smtp-Source: AGHT+IGadgowPlBXY8+3yucdMCmheOCbVFSzXp6SgBTcViNNF5D6JaD0RNL1gKemJKrXc0/SJj8hbA== X-Received: by 2002:a50:c011:0:b0:567:3ed0:47ec with SMTP id r17-20020a50c011000000b005673ed047ecmr1405423edb.23.1711029258435; Thu, 21 Mar 2024 06:54:18 -0700 (PDT) Received: from [127.0.1.1] ([62.96.37.222]) by smtp.gmail.com with ESMTPSA id cb4-20020a0564020b6400b005663b0d7243sm8130749edb.83.2024.03.21.06.54.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 06:54:17 -0700 (PDT) From: Mikhail Malyshev Date: Thu, 21 Mar 2024 13:54:15 +0000 Subject: [PATCH] net: stmmac: Do not enable/disable runtime PM for PCI devices MIME-Version: 1.0 Message-Id: <20240321-stmmac-fix-v1-1-3aef470494c6@gmail.com> X-B4-Tracking: v=1; b=H4sIAAY8/GUC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDIxMDYyND3eKS3NzEZN20zArdNFMDsxRTIwsLoxQjJaCGgqJUoDDYsOjY2lo A6gFopFwAAAA= To: Alexandre Torgue , Jose Abreu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mikhail Malyshev X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1711029257; l=1598; i=mike.malyshev@gmail.com; s=20240321; h=from:subject:message-id; bh=yBIC1I5/CGJewUczVdGzE+xSoggq/bg+8ZYTCA2HupY=; b=NSMFpt+cRP1D2Zcz2GidQr5P61iTF4xy8bTCVVY7Ik9xa6MmzN2Jv5ofNejppMhHLNJEiTVvy uCDtXvBXHWvAkOkLQu70oxopzpwhZnTouzFZWRD8RpCfjH7H+sDM69Z X-Developer-Key: i=mike.malyshev@gmail.com; a=ed25519; pk=dEab2IpWMPzEiv9/nKbxaOgLTBJJfCpKN4FJcNIQk5k= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240321_065421_882885_36A4EC9A X-CRM114-Status: GOOD ( 12.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Common function stmmac_dvr_probe is called for both PCI and non-PCI device. For PCI devices pm_runtime_enable/disable are called by framework and should not be called by the driver. For PCI devices plat->pdev != NULL. Use this fact to detect PCI devices Signed-off-by: Mikhail Malyshev --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 24cd80490d19..db45d8dbc1eb 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -7743,7 +7743,9 @@ int stmmac_dvr_probe(struct device *device, pm_runtime_get_noresume(device); pm_runtime_set_active(device); - if (!pm_runtime_enabled(device)) + + /* For PCI devices PM is disabled/enabled by the framework */ + if (!priv->plat->pdev) pm_runtime_enable(device); if (priv->hw->pcs != STMMAC_PCS_TBI && @@ -7846,7 +7848,10 @@ void stmmac_dvr_remove(struct device *dev) mutex_destroy(&priv->lock); bitmap_free(priv->af_xdp_zc_qps); - pm_runtime_disable(dev); + /* For PCI devices PM is disabled/enabled by the framework */ + if (!priv->plat->pdev) + pm_runtime_disable(dev); + pm_runtime_put_noidle(dev); } EXPORT_SYMBOL_GPL(stmmac_dvr_remove); --- base-commit: 23956900041d968f9ad0f30db6dede4daccd7aa9 change-id: 20240321-stmmac-fix-f506d52882d2 Best regards, -- Mikhail Malyshev _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel