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:   Xiaolei Wang <xiaolei.wang@windriver.com>
To:     peter.chen@kernel.org, pawell@cadence.com, rogerq@kernel.org,
        a-govindraju@ti.com, gregkh@linuxfoundation.org
Cc:     linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/1] usb: cdns3: Put the cdns set active part outside the spin lock
Date:   Thu,  4 May 2023 21:16:02 +0800
Message-Id: <20230504131602.3273835-1-xiaolei.wang@windriver.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?SQs6BZ6z57KEbCs0pRxe1hmpzZaguEmWcU5zMOLvRtlNP8JVtepsHKrV7+yt?=
 =?us-ascii?Q?a4pC21hZLFs2Z/ET+IjCEWBnIcHQjZNq0wDLI+prh+bXCjipKnl8ShUlSvCt?=
 =?us-ascii?Q?VHynIjT0XQ3o8mq6kRGrTTAmkJR6ZWk2FwF5p57id0dzL8NHHgQD9Ov38AHJ?=
 =?us-ascii?Q?pXXJie2m+akpBJs6HGILT3aoJoFxfOs1gZ+pAhjEt3GZNvYSg24nKTGFNTgh?=
 =?us-ascii?Q?WgPZQPuykAmFpBqUD9Zh26Zp/lZwc8d5PRo6faZstmd4q2egzeP/LiYyGe5i?=
 =?us-ascii?Q?w2m6OvTLaHfHcjjGpzXyksMbNcqsD03DXoTbqsX+48qiRQIlSFXbErRh4Bzb?=
 =?us-ascii?Q?SMbLWu1CRpVao50xXfd2pyd6cMpQRx2x1SiEpqVnPGe9QYoBf+kNmpJKrpOt?=
 =?us-ascii?Q?YWnuPFdL61CSfuAFS4tjz6rI4nG5xyO9VIzkukDnCDz/MqiB5yt8cmB2Ecit?=
 =?us-ascii?Q?AupICLtYW7iM0FpC8sdZaBLFHnODeoW3w/06TD7E4m7VoBmBk2cdZCqPJaEp?=
 =?us-ascii?Q?5Q9LHwwoNApQ/YaVDG+mGBfHKS17MWPbKoA3PxVbYMvKbzx9W3caX5PiEqYE?=
 =?us-ascii?Q?DZPTdyyQ2bbJQIu6IuoEA50u65iYXUbPKAgxivtrkum9UTShbA590sgxobsc?=
 =?us-ascii?Q?0KK/PGf+NmG9H3GGv/4a6ruZQflOgkiHaS7+BMaVADRuaWTdLhCdSG2f/KGH?=
 =?us-ascii?Q?pzH6ly4Zl1YFOmXGOhhWpStOSb0k9NuYJ5bLtfPI8F/AT7nwdXJm1IOmFi77?=
 =?us-ascii?Q?v/yOAWuzzhKEFwu19yqkEZcVttYRpoeqxp2YpCG/Ew2lO9YYpJK4u2pxd+wp?=
 =?us-ascii?Q?dPwgUiDjkGtpHdLFfuWeZ/GOCALDjyTEKsERLiqsbJ6nwpjy5mOmUshzPfa0?=
 =?us-ascii?Q?MsolQ2iLZjDe8q9mPAgvegHzKdwuXuOVOlNZtc2MGVGzIAV4mzcS4GrkKxae?=
 =?us-ascii?Q?7Jn3UfWzsxaBUV12j9NtPOfgQieZ3sujZR/5j2bQnIxzwLPTaQqkzRhI7EwA?=
 =?us-ascii?Q?l2NCG9RGShtJZjrJMxY1VEG+GeZwS0wU2Y3C2dlzArxOrSZ/QVhCQNdPgpKX?=
 =?us-ascii?Q?Ton+NNCRymQ0IJtaXXQ/jwTqwUG7sE5woCs7XuAi8+4Y5ke8eVBfzVvHKrnB?=
 =?us-ascii?Q?w5fi8BknBgZweKUPYBBqNLUZC7OSKtCmOTAl1YTQgOamY/LGBI18DZIAtYT1?=
 =?us-ascii?Q?vIuOVbx9Zn8Y63zzYxdS1T4ylWklFfgaFIn0ANgQVqINz5lPN3Fu1Fw0rBbN?=
 =?us-ascii?Q?KB3U7WDx8ttyaU5nLET1HZ2dFGz0kE5z0IbzCaMRaq38IwLw8spXKoxvtBHJ?=
 =?us-ascii?Q?9TfqPc8CKIQn1c1Z3rfrjNsO3bPYcYkO5bt6oZGBHMOFPRqjeNb+WRMR4g5X?=
 =?us-ascii?Q?+XOJUwuGC8d96RfMxu79GbVPZ5iJojq9Np9qj021aZe3Scwo41rPQi/hUgz0?=
 =?us-ascii?Q?+nOiYtpKdH8HWMNipvOLS7fLLcFnzyK89u8lbfeH8KltBn5Pa2bRFtcGwmRp?=
 =?us-ascii?Q?sO/kFFQ7gtZNCHp/56PuiZLZWyBwD3inzecfETZ1+O+QuTxv9T+8v1ivHUeG?=
 =?us-ascii?Q?d7ohssj3D5smyhjYnSO9bvti8+e5XR3JPAM8PzGv2lVUBhi9hEUTNcCxWTHs?=
 =?us-ascii?Q?TA=3D=3D?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0a761a84-ce4d-4c95-1aeb-08db4ca1bf64
X-MS-Exchange-CrossTenant-AuthSource: MW5PR11MB5764.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2023 13:16:19.0046
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: D09OmX0KH0NFZOv+k37pkMfa2zBLaS2MI5eyLo1X5bsTH/9hA9rjgBA7MN8aNZLWhzWnQwmNUELBbyUXeSH9ycAqVsX60foz9r0RQERCKso=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7961
X-Proofpoint-ORIG-GUID: ej1BYPRj7d6WZWPz6AdP7lr1FXv7X7bE
X-Proofpoint-GUID: ej1BYPRj7d6WZWPz6AdP7lr1FXv7X7bE
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-04_09,2023-05-04_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 malwarescore=0
 bulkscore=0 clxscore=1011 mlxlogscore=999 adultscore=0 lowpriorityscore=0
 mlxscore=0 suspectscore=0 phishscore=0 impostorscore=0 priorityscore=1501
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2305040109
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED 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

The device may be scheduled during the resume process,
so this cannot appear in atomic operations. Since
pm_runtime_set_active will resume suppliers, put set
active outside the spin lock, which is only used to
protect the struct cdns data structure, otherwise the
kernel will report the following warning:

  BUG: sleeping function called from invalid context at drivers/base/power/runtime.c:1163
  in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 651, name: sh
  preempt_count: 1, expected: 0
  RCU nest depth: 0, expected: 0
  CPU: 0 PID: 651 Comm: sh Tainted: G        WC         6.1.20 #1
  Hardware name: Freescale i.MX8QM MEK (DT)
  Call trace:
    dump_backtrace.part.0+0xe0/0xf0
    show_stack+0x18/0x30
    dump_stack_lvl+0x64/0x80
    dump_stack+0x1c/0x38
    __might_resched+0x1fc/0x240
    __might_sleep+0x68/0xc0
    __pm_runtime_resume+0x9c/0xe0
    rpm_get_suppliers+0x68/0x1b0
    __pm_runtime_set_status+0x298/0x560
    cdns_resume+0xb0/0x1c0
    cdns3_controller_resume.isra.0+0x1e0/0x250
    cdns3_plat_resume+0x28/0x40

Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
---
 drivers/usb/cdns3/cdns3-plat.c |  3 ++-
 drivers/usb/cdns3/cdnsp-pci.c  |  3 ++-
 drivers/usb/cdns3/core.c       | 14 +++++++++++---
 drivers/usb/cdns3/core.h       |  3 ++-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/cdns3/cdns3-plat.c b/drivers/usb/cdns3/cdns3-plat.c
index 2bc5d094548b..726b2e4f67e4 100644
--- a/drivers/usb/cdns3/cdns3-plat.c
+++ b/drivers/usb/cdns3/cdns3-plat.c
@@ -256,9 +256,10 @@ static int cdns3_controller_resume(struct device *dev, pm_message_t msg)
 	cdns3_set_platform_suspend(cdns->dev, false, false);
 
 	spin_lock_irqsave(&cdns->lock, flags);
-	cdns_resume(cdns, !PMSG_IS_AUTO(msg));
+	cdns_resume(cdns);
 	cdns->in_lpm = false;
 	spin_unlock_irqrestore(&cdns->lock, flags);
+	cdns_set_active(cdns, !PMSG_IS_AUTO(msg));
 	if (cdns->wakeup_pending) {
 		cdns->wakeup_pending = false;
 		enable_irq(cdns->wakeup_irq);
diff --git a/drivers/usb/cdns3/cdnsp-pci.c b/drivers/usb/cdns3/cdnsp-pci.c
index 7b151f5af3cc..0725668ffea4 100644
--- a/drivers/usb/cdns3/cdnsp-pci.c
+++ b/drivers/usb/cdns3/cdnsp-pci.c
@@ -208,8 +208,9 @@ static int __maybe_unused cdnsp_pci_resume(struct device *dev)
 	int ret;
 
 	spin_lock_irqsave(&cdns->lock, flags);
-	ret = cdns_resume(cdns, 1);
+	ret = cdns_resume(cdns);
 	spin_unlock_irqrestore(&cdns->lock, flags);
+	cdns_set_active(cdns, 1);
 
 	return ret;
 }
diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index dbcdf3b24b47..661d5597fb68 100644
--- a/drivers/usb/cdns3/core.c
+++ b/drivers/usb/cdns3/core.c
@@ -522,7 +522,7 @@ int cdns_suspend(struct cdns *cdns)
 }
 EXPORT_SYMBOL_GPL(cdns_suspend);
 
-int cdns_resume(struct cdns *cdns, u8 set_active)
+int cdns_resume(struct cdns *cdns)
 {
 	struct device *dev = cdns->dev;
 	enum usb_role real_role;
@@ -556,15 +556,23 @@ int cdns_resume(struct cdns *cdns, u8 set_active)
 	if (cdns->roles[cdns->role]->resume)
 		cdns->roles[cdns->role]->resume(cdns, cdns_power_is_lost(cdns));
 
+	return 0;
+}
+EXPORT_SYMBOL_GPL(cdns_resume);
+
+void cdns_set_active(struct cdns *cdns, u8 set_active)
+{
+	struct device *dev = cdns->dev;
+
 	if (set_active) {
 		pm_runtime_disable(dev);
 		pm_runtime_set_active(dev);
 		pm_runtime_enable(dev);
 	}
 
-	return 0;
+	return;
 }
-EXPORT_SYMBOL_GPL(cdns_resume);
+EXPORT_SYMBOL_GPL(cdns_set_active);
 #endif /* CONFIG_PM_SLEEP */
 
 MODULE_AUTHOR("Peter Chen <peter.chen@nxp.com>");
diff --git a/drivers/usb/cdns3/core.h b/drivers/usb/cdns3/core.h
index 2d332a788871..0f429042f997 100644
--- a/drivers/usb/cdns3/core.h
+++ b/drivers/usb/cdns3/core.h
@@ -125,8 +125,9 @@ int cdns_init(struct cdns *cdns);
 int cdns_remove(struct cdns *cdns);
 
 #ifdef CONFIG_PM_SLEEP
-int cdns_resume(struct cdns *cdns, u8 set_active);
+int cdns_resume(struct cdns *cdns);
 int cdns_suspend(struct cdns *cdns);
+void cdns_set_active(struct cdns *cdns, u8 set_active);
 #else /* CONFIG_PM_SLEEP */
 static inline int cdns_resume(struct cdns *cdns, u8 set_active)
 { return 0; }
-- 
2.25.1