Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   wei.fang@nxp.com
To:     davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
        pabeni@redhat.com
Cc:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net] net: fec: add pm_qos support on imx6q platform
Date:   Tue, 30 Aug 2022 15:01:48 +0800
Message-Id: <20220830070148.2021947-1-wei.fang@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9PWf+FKbpbNFL5R9faxSGyJ5dyQTy3W5K7/lg8tTpre/8pdACqa2ysnRdDau?=
 =?us-ascii?Q?OXjObOFqSIIouzOnCW0KaheETCA6t5sbHrdAiLR8XdyvJBunwEUDz4AmoHV0?=
 =?us-ascii?Q?rBa3zzDxh5xHNmCGi86g+2PgHaujH3sGxKMXrKpbyAnlT2NADiazbV3oJ7hx?=
 =?us-ascii?Q?ZY/lXCR/Q+zTRn4Atw91U6wbuKXvh30JzwWhQNRiqd8/fEnWw3jti+ngOTBh?=
 =?us-ascii?Q?ANf6c7hFuXGyKnpF/jQD6vpM8/I+7/TH4YS9Pj/cJfJQ3M4OWUSf10tDpv4j?=
 =?us-ascii?Q?AM6Gkmt+/jg6sh/ABLyUsoKmpiA9SVJQiLPmIQacu8GjuYdY0uE81WTpwD17?=
 =?us-ascii?Q?Nng8sdBWyr3JGfqYNP5b5ErN0WqJYhtYhV/GaC70ex7wvPwgRNI2u4qwJWPf?=
 =?us-ascii?Q?f80QFH9SH8si8q7qOtVbME9/FfV4LA1FAkq4Z0DOVPEILT5738rYla7S3GYG?=
 =?us-ascii?Q?W7E950UivYE0VuSC+FeqbDKEoTIjXW1aRqrRTQNYv/JEP5wmk2Xulrh5WGbO?=
 =?us-ascii?Q?kax1xK0fc4SkLb5UF2adwtFuWCT/i86iYmEuMhlc1m6pzNIH7c4IpM/bLPj+?=
 =?us-ascii?Q?AAJO8/ecWmsdvtsFowl1BzR7t08npDclKROOhVN1Mpok5fNqMvXot2+4jKSa?=
 =?us-ascii?Q?XNEdedosOtNH3X6QKHjefEJn1fwGQ+OlD1HVwd5+7miU6CibbMYP4u6/Dqs4?=
 =?us-ascii?Q?VHQhGa8RpHz+BgGdxdcgAz0DyLDnxKNvmqbYvkoh3GyYi0+NtseVAyL8rpf+?=
 =?us-ascii?Q?aaJ0Y7vVV7iHFaRc+P8pydHT/yK8UjFgKsh0pkE004IxMZ+ec09/xn7Z9jmm?=
 =?us-ascii?Q?2WRyu01ycN7MzZZfefTfai1pbz/lny1POmypljWFUFUVW+oD/wuI2/4gBwce?=
 =?us-ascii?Q?PUrUP6AtYgWTLgjN2V7zwUugffmQFBPb0m/KwkSVAxVuVQSEbttPT9nMbU41?=
 =?us-ascii?Q?Dto9YqpO2bacLh+zhynl3vKJLLlymWVwpPHXHIM12P2hJ2KYcCEBzgzJ9qR0?=
 =?us-ascii?Q?r2gPf8sEajhrxfW83uory+fMPTxQshTEo3Ix9/2zQVYUOSzXy8lvt0s5Bfo7?=
 =?us-ascii?Q?1RLQfCeDlcfXpUAu7EAEN9MI120S5X79vuCjP5avPH38y1xIn0gEFBYJCq/m?=
 =?us-ascii?Q?3fIbsjHzOaLUQVe9UHxIYePEU3MtgZORR4/AgBGfOnl3qnZ3wK0xc1E7sJA+?=
 =?us-ascii?Q?+zLuagae6PrIG1L5c962taQcNTEdKjrKSD2N4ApO4FYmejQ2HeivJSxZl6K4?=
 =?us-ascii?Q?WyX67Sn/VP6xBK4T5XwnGqMjACnE4G+/uSHNoQVLbaerbIhrnMgqUm3Y66gx?=
 =?us-ascii?Q?0yFgHDTO9rb+7WhPHCneS/eJLUwG+75PW4rTZtP2QBKzN4Xhkddvrrv6fVhr?=
 =?us-ascii?Q?rAzUxQ6UOSjTEM9Jr12IIAHdJnex69krMfPQTriLt3+MdGCs9g8uDezQSK3q?=
 =?us-ascii?Q?pZyomQHOYXGTEQ32suwyQdhaKfm182W6i+ZT7+fIiU9v+91MCuaUAVv9CI56?=
 =?us-ascii?Q?Nq/nFshq2OUKqS4eHw19SNLkfJX1SNz7iEDDejODpUXCxQkoRUpPSXfaq5fH?=
 =?us-ascii?Q?43Nh/tYyvvs5/ZqEF9gJlyZNPjZmsMqPjAgKkWbT?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 007b7c56-0fa2-43a0-43c0-08da8a5592be
X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB8106.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2022 07:02:16.7329
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: yz2LKvqyO8VWgqQZbBJxKHFoV5T4jhygoqdllkhIwMIVZe5nxgmlSzT8d11AP3qWaXaSZaXqO9lBxEctVGUgnQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7729
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Wei Fang <wei.fang@nxp.com>

There is a very low probability that tx timeout will occur during
suspend and resume stress test on imx6q platform. So we add pm_qos
support to prevent system from entering low level idles which may
affect the transmission of tx.

Signed-off-by: Wei Fang <wei.fang@nxp.com>
---
 drivers/net/ethernet/freescale/fec.h      | 5 +++++
 drivers/net/ethernet/freescale/fec_main.c | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index ed7301b69169..a5fed00cb971 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -16,6 +16,7 @@
 
 #include <linux/clocksource.h>
 #include <linux/net_tstamp.h>
+#include <linux/pm_qos.h>
 #include <linux/ptp_clock_kernel.h>
 #include <linux/timecounter.h>
 
@@ -498,6 +499,9 @@ struct bufdesc_ex {
 /* i.MX8MQ SoC integration mix wakeup interrupt signal into "int2" interrupt line. */
 #define FEC_QUIRK_WAKEUP_FROM_INT2	(1 << 22)
 
+/* i.MX6Q adds pm_qos support */
+#define FEC_QUIRK_HAS_PMQOS			BIT(23)
+
 struct bufdesc_prop {
 	int qid;
 	/* Address of Rx and Tx buffers */
@@ -608,6 +612,7 @@ struct fec_enet_private {
 	struct delayed_work time_keep;
 	struct regulator *reg_phy;
 	struct fec_stop_mode_gpr stop_gpr;
+	struct pm_qos_request pm_qos_req;
 
 	unsigned int tx_align;
 	unsigned int rx_align;
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index f5f34cdba131..bcc441d9a499 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -111,7 +111,8 @@ static const struct fec_devinfo fec_imx6q_info = {
 	.quirks = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT |
 		  FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM |
 		  FEC_QUIRK_HAS_VLAN | FEC_QUIRK_ERR006358 |
-		  FEC_QUIRK_HAS_RACC | FEC_QUIRK_CLEAR_SETUP_MII,
+		  FEC_QUIRK_HAS_RACC | FEC_QUIRK_CLEAR_SETUP_MII |
+		  FEC_QUIRK_HAS_PMQOS,
 };
 
 static const struct fec_devinfo fec_mvf600_info = {
@@ -3218,6 +3219,9 @@ fec_enet_open(struct net_device *ndev)
 	if (fep->quirks & FEC_QUIRK_ERR006687)
 		imx6q_cpuidle_fec_irqs_used();
 
+	if (fep->quirks & FEC_QUIRK_HAS_PMQOS)
+		cpu_latency_qos_add_request(&fep->pm_qos_req, 0);
+
 	napi_enable(&fep->napi);
 	phy_start(ndev->phydev);
 	netif_tx_start_all_queues(ndev);
@@ -3259,6 +3263,9 @@ fec_enet_close(struct net_device *ndev)
 	fec_enet_update_ethtool_stats(ndev);
 
 	fec_enet_clk_enable(ndev, false);
+	if (fep->quirks & FEC_QUIRK_HAS_PMQOS)
+		cpu_latency_qos_remove_request(&fep->pm_qos_req);
+
 	pinctrl_pm_select_sleep_state(&fep->pdev->dev);
 	pm_runtime_mark_last_busy(&fep->pdev->dev);
 	pm_runtime_put_autosuspend(&fep->pdev->dev);
-- 
2.25.1