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 B13851E1037; Fri, 4 Oct 2024 18:31:34 +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=1728066694; cv=none; b=OalFI8IKSXom52j7/YfC6ijhGwgiIY9sgfk3sUQxwH64CMtodeEbxWn00FqOb3GN1SNwmT/9/Z++JnxTTJyWH92wmMsHFiF2IN0OHdKPG5bHE/DQq+yoPkfuyFl2eKOS96lLarf1lGtoYNn5Jwnd/Vb0idkEWezoN+0xoN0QuBo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728066694; c=relaxed/simple; bh=BONhHRPeU0lyvmtrNHEcn1k17RPOs+1TKUklvLNHDmw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S3uS4n40+bxzi3ItgsQLbxD/HXtZHMEKFzuc1JuOZKMstSjPd1fzOnG6hesCIcPeIkRbNRr3R1fZrURzTJgXzAgf+9BvGpF4QH3F1n+BQEfGVWlNMwIAS7/JePSUB94vFR4L2kE0SHWuQfcCd4tcb9S6R1DZDqnbOTay5ADaYJw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iZfzuWXO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iZfzuWXO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 993DFC4CECC; Fri, 4 Oct 2024 18:31:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728066694; bh=BONhHRPeU0lyvmtrNHEcn1k17RPOs+1TKUklvLNHDmw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iZfzuWXOyor5OJXdpb+T7HZKww0L4H0Z/3BYB6Khh5G40WyM0XIcfWMyDjiRmALhD MHKazuJbh6cB1jnd6KPMgS/ypPHYkUMlBM2kDB7cNFHWysX72NFY7HosyUf0GlGIGN QCfZYxvpABZiHc3G15f59pZhHu2O10YXVISm6IdTp2fvvySlJOvKwS+DIR7jbD5TP7 y0ogjkcqHTdJ+1XIJyRJuPN2Te9e4Mph1MSB/TSqdAcw782Q1h3VaN+4LCuWzQDrK2 Ze4IPaj9nnwwIWFt6Wbkc0WTOOEU0PWWc5py5VL4FoO+XAuebGHS7D7qprvHPBu4zf rb/gg1crkyOEw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xu Yang , Peter Chen , Greg Kroah-Hartman , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 16/21] usb: chipidea: udc: enable suspend interrupt after usb reset Date: Fri, 4 Oct 2024 14:30:51 -0400 Message-ID: <20241004183105.3675901-16-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241004183105.3675901-1-sashal@kernel.org> References: <20241004183105.3675901-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.284 Content-Transfer-Encoding: 8bit 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 21c299c85505d..72d62abb6f285 100644 --- a/drivers/usb/chipidea/udc.c +++ b/drivers/usb/chipidea/udc.c @@ -82,7 +82,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); } @@ -749,6 +749,7 @@ __releases(ci->lock) __acquires(ci->lock) { int retval; + u32 intr; spin_unlock(&ci->lock); if (ci->gadget.speed != USB_SPEED_UNKNOWN) @@ -762,6 +763,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