From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 186101F8F0A; Tue, 15 Oct 2024 12:08:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728994134; cv=none; b=VR8qc1VgR3NaiwhCart5oJot0Y4jlr/iamNPYQZ3qKmlBLtLXj/xpgsVPYoFqQq9G5mZjnJ9cJCApcwla3HKg2RJ3c11yw8qIEXOrCsj+mFQjf8WfGq8VDEuzfxA5wQgoiDv1GfiGAveu5Bt0ved8MD1nSfKYRJRirDWo0swOLE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728994134; c=relaxed/simple; bh=AchQNfo0Tw8QX223uI+83Qa0JBQw5lSW2/EJTSEImw8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ru8sHsAiDOGSshwKvdNUe5K1X6zH9sNnIRJof3wd3P0Osbim4kHoXMASUT2HXK4XuwBC7fpD9XvyS0iefCDlsMwNGc+jg/LCeTAGedv3Xj8VEN8togEzMtgtNaZ3YLP3pC2M2w6ZPd5KWpMM/M5O/nHmvxG6rgFj8ChwxwmBwqo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Utu9oSs3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Utu9oSs3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75F18C4CEC6; Tue, 15 Oct 2024 12:08:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728994133; bh=AchQNfo0Tw8QX223uI+83Qa0JBQw5lSW2/EJTSEImw8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Utu9oSs3pWJVGvqvgb+7Pw0yvBpwxCngnwb13rMeHAsboPq1pySA1yzBFdTZcb2Os LMaarpX2pNepb8TKeEtIj05Y86PuHAhA1WDaZGYtUiESDLpCsk/0rgRH0dh/XAbwEQ u1BGZfhijcKLtXM2NDl+ijfjhPoi1xM5NNGGWwyQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Xu Yang , Peter Chen , Sasha Levin Subject: [PATCH 5.15 615/691] usb: chipidea: udc: enable suspend interrupt after usb reset Date: Tue, 15 Oct 2024 13:29:23 +0200 Message-ID: <20241015112504.743641162@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241015112440.309539031@linuxfoundation.org> References: <20241015112440.309539031@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xu Yang [ Upstream commit e4fdcc10092fb244218013bfe8ff01c55d54e8e4 ] Currently, suspend interrupt is enabled before pullup enable operation. This will cause a suspend interrupt assert right after pullup DP. This suspend interrupt is meaningless, so this will ignore such interrupt by enable it after usb reset completed. Signed-off-by: Xu Yang Acked-by: Peter Chen Link: https://lore.kernel.org/r/20240823073832.1702135-1-xu.yang_2@nxp.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/chipidea/udc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c index aacc37736db6e..8b6745b7588c7 100644 --- a/drivers/usb/chipidea/udc.c +++ b/drivers/usb/chipidea/udc.c @@ -84,7 +84,7 @@ static int hw_device_state(struct ci_hdrc *ci, u32 dma) hw_write(ci, OP_ENDPTLISTADDR, ~0, dma); /* interrupt, error, port change, reset, sleep/suspend */ hw_write(ci, OP_USBINTR, ~0, - USBi_UI|USBi_UEI|USBi_PCI|USBi_URI|USBi_SLI); + USBi_UI|USBi_UEI|USBi_PCI|USBi_URI); } else { hw_write(ci, OP_USBINTR, ~0, 0); } @@ -868,6 +868,7 @@ __releases(ci->lock) __acquires(ci->lock) { int retval; + u32 intr; spin_unlock(&ci->lock); if (ci->gadget.speed != USB_SPEED_UNKNOWN) @@ -881,6 +882,11 @@ __acquires(ci->lock) if (retval) goto done; + /* clear SLI */ + hw_write(ci, OP_USBSTS, USBi_SLI, USBi_SLI); + intr = hw_read(ci, OP_USBINTR, ~0); + hw_write(ci, OP_USBINTR, ~0, intr | USBi_SLI); + ci->status = usb_ep_alloc_request(&ci->ep0in->ep, GFP_ATOMIC); if (ci->status == NULL) retval = -ENOMEM; -- 2.43.0