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 0B821155329; Sun, 28 Jul 2024 16:08:20 +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=1722182900; cv=none; b=oVK/VTAbN1zccbGYN3cbOs7YsaGSUtY7KH/c2bjH9wH/ie5wsdM375K0XUmElJtnOEnWyPNACt83co3296cnpaGg3qs7Negg4IhM/smNXm4t8ZPy+gedtXWI0fz7s3mKpLzqr0ZAWycMgtFAvRCJUFKmoduIj1Mjxz+yOqSxZZE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722182900; c=relaxed/simple; bh=3xXAsaNlBPMxuizqtcXYFxx1tZGMSLZ6qKy5JrSOBfw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KJKVQ3ALCoXtG5dL70KKGTg8Ao85UDsuwrX3DQMbHkcLzNv0QDLPSCNlmMEk5yBGcC3Qw1L34l5mDLEZc+EyWueycwZEqx06k0NX4sLFxyIMFEriLVMzNZBfPMFbk1PxF4CbgBGi4feGrHa33X96lUP4wXYMTDfh6g6/0xaozZc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Lw+raIeu; 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="Lw+raIeu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99861C32782; Sun, 28 Jul 2024 16:08:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722182899; bh=3xXAsaNlBPMxuizqtcXYFxx1tZGMSLZ6qKy5JrSOBfw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lw+raIeur+/mZ/PsjGHrMPXdQakDep7e/zB1l+dRmKUOYCQ/NQVDrOQa6f+mIL77r BCGvRjAK9PRSGL4Sog85ATstSZp4iGIiRrpEzIIYDtuUQ0X3Ad8FIAxU1XXPnXDHvu +REAR2qWC0hDiBhOSjJB9lvFhJ71wycTboNMXZOzEu8GqWuQvjkJ7ZLds2U1rsJN72 5JMTwElEvEU4UKDs9h80BTY+WkvrTWGSPlSSNRktaaZyB9G/DvkndyvPZaeyPjUcHz 8oHnmhI4u7r1DuP4wBPOnIZxUTIc/Hyk903KudB8hNo8jXeidEOon8jj6vrJxM6F7G qjMr54OMrPHbg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Roger Quadros , Ravi Gunasekaran , Peter Chen , Greg Kroah-Hartman , Sasha Levin , pawell@cadence.com, linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 03/15] usb: cdns3: Add quirk flag to enable suspend residency Date: Sun, 28 Jul 2024 12:07:47 -0400 Message-ID: <20240728160813.2053107-3-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240728160813.2053107-1-sashal@kernel.org> References: <20240728160813.2053107-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 6.1.102 Content-Transfer-Encoding: 8bit From: Roger Quadros [ Upstream commit 0aca19e4037a4143273e90f1b44666b78b4dde9b ] Some platforms (e.g. ti,j721e-usb, ti,am64-usb) require this bit to be set to workaround a lockup issue with PHY short suspend intervals [1]. Add a platform quirk flag to indicate if Suspend Residency should be enabled. [1] - https://www.ti.com/lit/er/sprz457h/sprz457h.pdf i2409 - USB: USB2 PHY locks up due to short suspend Signed-off-by: Roger Quadros Signed-off-by: Ravi Gunasekaran Acked-by: Peter Chen Link: https://lore.kernel.org/r/20240516044537.16801-2-r-gunasekaran@ti.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/cdns3/core.h | 1 + drivers/usb/cdns3/drd.c | 10 +++++++++- drivers/usb/cdns3/drd.h | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/usb/cdns3/core.h b/drivers/usb/cdns3/core.h index 81a9c9d6be08b..57d47348dc193 100644 --- a/drivers/usb/cdns3/core.h +++ b/drivers/usb/cdns3/core.h @@ -44,6 +44,7 @@ struct cdns3_platform_data { bool suspend, bool wakeup); unsigned long quirks; #define CDNS3_DEFAULT_PM_RUNTIME_ALLOW BIT(0) +#define CDNS3_DRD_SUSPEND_RESIDENCY_ENABLE BIT(1) }; /** diff --git a/drivers/usb/cdns3/drd.c b/drivers/usb/cdns3/drd.c index 33ba30f79b337..8e19ee72c1207 100644 --- a/drivers/usb/cdns3/drd.c +++ b/drivers/usb/cdns3/drd.c @@ -385,7 +385,7 @@ static irqreturn_t cdns_drd_irq(int irq, void *data) int cdns_drd_init(struct cdns *cdns) { void __iomem *regs; - u32 state; + u32 state, reg; int ret; regs = devm_ioremap_resource(cdns->dev, &cdns->otg_res); @@ -429,6 +429,14 @@ int cdns_drd_init(struct cdns *cdns) cdns->otg_irq_regs = (struct cdns_otg_irq_regs __iomem *) &cdns->otg_v1_regs->ien; writel(1, &cdns->otg_v1_regs->simulate); + + if (cdns->pdata && + (cdns->pdata->quirks & CDNS3_DRD_SUSPEND_RESIDENCY_ENABLE)) { + reg = readl(&cdns->otg_v1_regs->susp_ctrl); + reg |= SUSP_CTRL_SUSPEND_RESIDENCY_ENABLE; + writel(reg, &cdns->otg_v1_regs->susp_ctrl); + } + cdns->version = CDNS3_CONTROLLER_V1; } else { dev_err(cdns->dev, "not supporte DID=0x%08x\n", state); diff --git a/drivers/usb/cdns3/drd.h b/drivers/usb/cdns3/drd.h index d72370c321d39..1e2aee14d6293 100644 --- a/drivers/usb/cdns3/drd.h +++ b/drivers/usb/cdns3/drd.h @@ -193,6 +193,9 @@ struct cdns_otg_irq_regs { /* OTGREFCLK - bitmasks */ #define OTGREFCLK_STB_CLK_SWITCH_EN BIT(31) +/* SUPS_CTRL - bitmasks */ +#define SUSP_CTRL_SUSPEND_RESIDENCY_ENABLE BIT(17) + /* OVERRIDE - bitmasks */ #define OVERRIDE_IDPULLUP BIT(0) /* Only for CDNS3_CONTROLLER_V0 version */ -- 2.43.0