From: Jon Hunter <jonathanh@nvidia.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Thierry Reding <thierry.reding@kernel.org>,
"Nagarjuna Kristam" <nkristam@nvidia.com>,
JC Kuo <jckuo@nvidia.com>,
Mathias Nyman <mathias.nyman@intel.com>
Cc: Thierry Reding <thierry.reding@gmail.com>,
<linux-usb@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-tegra@vger.kernel.org>,
Thierry Reding <treding@nvidia.com>,
Wayne Chang <waynec@nvidia.com>,
Jon Hunter <jonathanh@nvidia.com>
Subject: [PATCH 7/9] usb: gadget: tegra-xudc: Add SSPX register offset to SoC data
Date: Mon, 21 Sep 2026 13:19:07 +0100 [thread overview]
Message-ID: <20260921-tegra-usb-v1-7-74a925a35d82@nvidia.com> (raw)
In-Reply-To: <20260921-tegra-usb-v1-0-74a925a35d82@nvidia.com>
The SuperSpeed Port (SSPX) register offsets for Tegra264 (0x4000) are
different to the existing Tegra devices (0x600). In preparation for
adding support for Tegra264, add the SSPX register offset into the SoC
data and update the register definitions and register accesses to use
the offset from the SoC data.
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
---
drivers/usb/gadget/udc/tegra-xudc.c | 90 ++++++++++++++++++++-----------------
1 file changed, 48 insertions(+), 42 deletions(-)
diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c
index 0b88c1610f27..c97cacb7e416 100644
--- a/drivers/usb/gadget/udc/tegra-xudc.c
+++ b/drivers/usb/gadget/udc/tegra-xudc.c
@@ -143,42 +143,42 @@
#define HSFSPI_COUNT13_U2_RESUME_K_DURATION(x) ((x) & \
HSFSPI_COUNT13_U2_RESUME_K_DURATION_MASK)
#define BLCG 0x840
-#define SSPX_CORE_CNT0 0x610
+#define SSPX_CORE_CNT0 0x10
#define SSPX_CORE_CNT0_PING_TBURST_MASK GENMASK(7, 0)
#define SSPX_CORE_CNT0_PING_TBURST(x) ((x) & SSPX_CORE_CNT0_PING_TBURST_MASK)
-#define SSPX_CORE_CNT30 0x688
+#define SSPX_CORE_CNT30 0x88
#define SSPX_CORE_CNT30_LMPITP_TIMER_MASK GENMASK(19, 0)
#define SSPX_CORE_CNT30_LMPITP_TIMER(x) ((x) & \
SSPX_CORE_CNT30_LMPITP_TIMER_MASK)
-#define SSPX_CORE_CNT32 0x690
+#define SSPX_CORE_CNT32 0x90
#define SSPX_CORE_CNT32_POLL_TBURST_MAX_MASK GENMASK(7, 0)
#define SSPX_CORE_CNT32_POLL_TBURST_MAX(x) ((x) & \
SSPX_CORE_CNT32_POLL_TBURST_MAX_MASK)
-#define SSPX_CORE_CNT56 0x6fc
+#define SSPX_CORE_CNT56 0xfc
#define SSPX_CORE_CNT56_SCD_BIT0_TRPT_MAX_MASK GENMASK(19, 0)
#define SSPX_CORE_CNT56_SCD_BIT0_TRPT_MAX(x) ((x) & \
SSPX_CORE_CNT56_SCD_BIT0_TRPT_MAX_MASK)
-#define SSPX_CORE_CNT57 0x700
+#define SSPX_CORE_CNT57 0x100
#define SSPX_CORE_CNT57_SCD_BIT1_TRPT_MAX_MASK GENMASK(19, 0)
#define SSPX_CORE_CNT57_SCD_BIT1_TRPT_MAX(x) ((x) & \
SSPX_CORE_CNT57_SCD_BIT1_TRPT_MAX_MASK)
-#define SSPX_CORE_CNT65 0x720
+#define SSPX_CORE_CNT65 0x120
#define SSPX_CORE_CNT65_TX_SCD_END_TRPT_MID_MASK GENMASK(19, 0)
#define SSPX_CORE_CNT65_TX_SCD_END_TRPT_MID(x) ((x) & \
SSPX_CORE_CNT65_TX_SCD_END_TRPT_MID_MASK)
-#define SSPX_CORE_CNT66 0x724
+#define SSPX_CORE_CNT66 0x124
#define SSPX_CORE_CNT66_TX_SCD_BIT0_TRPT_MID_MASK GENMASK(19, 0)
#define SSPX_CORE_CNT66_TX_SCD_BIT0_TRPT_MID(x) ((x) & \
SSPX_CORE_CNT66_TX_SCD_BIT0_TRPT_MID_MASK)
-#define SSPX_CORE_CNT67 0x728
+#define SSPX_CORE_CNT67 0x128
#define SSPX_CORE_CNT67_TX_SCD_BIT1_TRPT_MID_MASK GENMASK(19, 0)
#define SSPX_CORE_CNT67_TX_SCD_BIT1_TRPT_MID(x) ((x) & \
SSPX_CORE_CNT67_TX_SCD_BIT1_TRPT_MID_MASK)
-#define SSPX_CORE_CNT72 0x73c
+#define SSPX_CORE_CNT72 0x13c
#define SSPX_CORE_CNT72_SCD_LFPS_TIMEOUT_MASK GENMASK(19, 0)
#define SSPX_CORE_CNT72_SCD_LFPS_TIMEOUT(x) ((x) & \
SSPX_CORE_CNT72_SCD_LFPS_TIMEOUT_MASK)
-#define SSPX_CORE_PADCTL4 0x750
+#define SSPX_CORE_PADCTL4 0x150
#define SSPX_CORE_PADCTL4_RXDAT_VLD_TIMEOUT_U3_MASK GENMASK(19, 0)
#define SSPX_CORE_PADCTL4_RXDAT_VLD_TIMEOUT_U3(x) ((x) & \
SSPX_CORE_PADCTL4_RXDAT_VLD_TIMEOUT_U3_MASK)
@@ -548,6 +548,7 @@ struct tegra_xudc_soc {
const char * const *clock_names;
unsigned int num_clks;
unsigned int num_phys;
+ unsigned int sspx_offset;
bool u1_enable;
bool u2_enable;
bool lpm_enable;
@@ -629,35 +630,35 @@ static void tegra_xudc_limit_port_speed(struct tegra_xudc *xudc)
u32 val;
/* limit port speed to gen 1 */
- val = xudc_readl(xudc, SSPX_CORE_CNT56);
+ val = xudc_readl(xudc, xudc->soc->sspx_offset + SSPX_CORE_CNT56);
val &= ~(SSPX_CORE_CNT56_SCD_BIT0_TRPT_MAX_MASK);
val |= SSPX_CORE_CNT56_SCD_BIT0_TRPT_MAX(0x260);
- xudc_writel(xudc, val, SSPX_CORE_CNT56);
+ xudc_writel(xudc, val, xudc->soc->sspx_offset + SSPX_CORE_CNT56);
- val = xudc_readl(xudc, SSPX_CORE_CNT57);
+ val = xudc_readl(xudc, xudc->soc->sspx_offset + SSPX_CORE_CNT57);
val &= ~(SSPX_CORE_CNT57_SCD_BIT1_TRPT_MAX_MASK);
val |= SSPX_CORE_CNT57_SCD_BIT1_TRPT_MAX(0x6D6);
- xudc_writel(xudc, val, SSPX_CORE_CNT57);
+ xudc_writel(xudc, val, xudc->soc->sspx_offset + SSPX_CORE_CNT57);
- val = xudc_readl(xudc, SSPX_CORE_CNT65);
+ val = xudc_readl(xudc, xudc->soc->sspx_offset + SSPX_CORE_CNT65);
val &= ~(SSPX_CORE_CNT65_TX_SCD_END_TRPT_MID_MASK);
val |= SSPX_CORE_CNT65_TX_SCD_END_TRPT_MID(0x4B0);
- xudc_writel(xudc, val, SSPX_CORE_CNT65);
+ xudc_writel(xudc, val, xudc->soc->sspx_offset + SSPX_CORE_CNT65);
- val = xudc_readl(xudc, SSPX_CORE_CNT66);
+ val = xudc_readl(xudc, xudc->soc->sspx_offset + SSPX_CORE_CNT66);
val &= ~(SSPX_CORE_CNT66_TX_SCD_BIT0_TRPT_MID_MASK);
val |= SSPX_CORE_CNT66_TX_SCD_BIT0_TRPT_MID(0x4B0);
- xudc_writel(xudc, val, SSPX_CORE_CNT66);
+ xudc_writel(xudc, val, xudc->soc->sspx_offset + SSPX_CORE_CNT66);
- val = xudc_readl(xudc, SSPX_CORE_CNT67);
+ val = xudc_readl(xudc, xudc->soc->sspx_offset + SSPX_CORE_CNT67);
val &= ~(SSPX_CORE_CNT67_TX_SCD_BIT1_TRPT_MID_MASK);
val |= SSPX_CORE_CNT67_TX_SCD_BIT1_TRPT_MID(0x4B0);
- xudc_writel(xudc, val, SSPX_CORE_CNT67);
+ xudc_writel(xudc, val, xudc->soc->sspx_offset + SSPX_CORE_CNT67);
- val = xudc_readl(xudc, SSPX_CORE_CNT72);
+ val = xudc_readl(xudc, xudc->soc->sspx_offset + SSPX_CORE_CNT72);
val &= ~(SSPX_CORE_CNT72_SCD_LFPS_TIMEOUT_MASK);
val |= SSPX_CORE_CNT72_SCD_LFPS_TIMEOUT(0x10);
- xudc_writel(xudc, val, SSPX_CORE_CNT72);
+ xudc_writel(xudc, val, xudc->soc->sspx_offset + SSPX_CORE_CNT72);
}
static void tegra_xudc_restore_port_speed(struct tegra_xudc *xudc)
@@ -665,35 +666,35 @@ static void tegra_xudc_restore_port_speed(struct tegra_xudc *xudc)
u32 val;
/* restore port speed to gen2 */
- val = xudc_readl(xudc, SSPX_CORE_CNT56);
+ val = xudc_readl(xudc, xudc->soc->sspx_offset + SSPX_CORE_CNT56);
val &= ~(SSPX_CORE_CNT56_SCD_BIT0_TRPT_MAX_MASK);
val |= SSPX_CORE_CNT56_SCD_BIT0_TRPT_MAX(0x438);
- xudc_writel(xudc, val, SSPX_CORE_CNT56);
+ xudc_writel(xudc, val, xudc->soc->sspx_offset + SSPX_CORE_CNT56);
- val = xudc_readl(xudc, SSPX_CORE_CNT57);
+ val = xudc_readl(xudc, xudc->soc->sspx_offset + SSPX_CORE_CNT57);
val &= ~(SSPX_CORE_CNT57_SCD_BIT1_TRPT_MAX_MASK);
val |= SSPX_CORE_CNT57_SCD_BIT1_TRPT_MAX(0x528);
- xudc_writel(xudc, val, SSPX_CORE_CNT57);
+ xudc_writel(xudc, val, xudc->soc->sspx_offset + SSPX_CORE_CNT57);
- val = xudc_readl(xudc, SSPX_CORE_CNT65);
+ val = xudc_readl(xudc, xudc->soc->sspx_offset + SSPX_CORE_CNT65);
val &= ~(SSPX_CORE_CNT65_TX_SCD_END_TRPT_MID_MASK);
val |= SSPX_CORE_CNT65_TX_SCD_END_TRPT_MID(0xE10);
- xudc_writel(xudc, val, SSPX_CORE_CNT66);
+ xudc_writel(xudc, val, xudc->soc->sspx_offset + SSPX_CORE_CNT66);
- val = xudc_readl(xudc, SSPX_CORE_CNT66);
+ val = xudc_readl(xudc, xudc->soc->sspx_offset + SSPX_CORE_CNT66);
val &= ~(SSPX_CORE_CNT66_TX_SCD_BIT0_TRPT_MID_MASK);
val |= SSPX_CORE_CNT66_TX_SCD_BIT0_TRPT_MID(0x348);
- xudc_writel(xudc, val, SSPX_CORE_CNT66);
+ xudc_writel(xudc, val, xudc->soc->sspx_offset + SSPX_CORE_CNT66);
- val = xudc_readl(xudc, SSPX_CORE_CNT67);
+ val = xudc_readl(xudc, xudc->soc->sspx_offset + SSPX_CORE_CNT67);
val &= ~(SSPX_CORE_CNT67_TX_SCD_BIT1_TRPT_MID_MASK);
val |= SSPX_CORE_CNT67_TX_SCD_BIT1_TRPT_MID(0x5a0);
- xudc_writel(xudc, val, SSPX_CORE_CNT67);
+ xudc_writel(xudc, val, xudc->soc->sspx_offset + SSPX_CORE_CNT67);
- val = xudc_readl(xudc, SSPX_CORE_CNT72);
+ val = xudc_readl(xudc, xudc->soc->sspx_offset + SSPX_CORE_CNT72);
val &= ~(SSPX_CORE_CNT72_SCD_LFPS_TIMEOUT_MASK);
val |= SSPX_CORE_CNT72_SCD_LFPS_TIMEOUT(0x1c21);
- xudc_writel(xudc, val, SSPX_CORE_CNT72);
+ xudc_writel(xudc, val, xudc->soc->sspx_offset + SSPX_CORE_CNT72);
}
static void tegra_xudc_device_mode_on(struct tegra_xudc *xudc)
@@ -3409,22 +3410,22 @@ static void tegra_xudc_device_params_init(struct tegra_xudc *xudc)
tegra_xudc_limit_port_speed(xudc);
/* Set a reasonable U3 exit timer value. */
- val = xudc_readl(xudc, SSPX_CORE_PADCTL4);
+ val = xudc_readl(xudc, xudc->soc->sspx_offset + SSPX_CORE_PADCTL4);
val &= ~(SSPX_CORE_PADCTL4_RXDAT_VLD_TIMEOUT_U3_MASK);
val |= SSPX_CORE_PADCTL4_RXDAT_VLD_TIMEOUT_U3(0x5dc0);
- xudc_writel(xudc, val, SSPX_CORE_PADCTL4);
+ xudc_writel(xudc, val, xudc->soc->sspx_offset + SSPX_CORE_PADCTL4);
/* Default ping LFPS tBurst is too large. */
- val = xudc_readl(xudc, SSPX_CORE_CNT0);
+ val = xudc_readl(xudc, xudc->soc->sspx_offset + SSPX_CORE_CNT0);
val &= ~(SSPX_CORE_CNT0_PING_TBURST_MASK);
val |= SSPX_CORE_CNT0_PING_TBURST(0xa);
- xudc_writel(xudc, val, SSPX_CORE_CNT0);
+ xudc_writel(xudc, val, xudc->soc->sspx_offset + SSPX_CORE_CNT0);
/* Default tPortConfiguration timeout is too small. */
- val = xudc_readl(xudc, SSPX_CORE_CNT30);
+ val = xudc_readl(xudc, xudc->soc->sspx_offset + SSPX_CORE_CNT30);
val &= ~(SSPX_CORE_CNT30_LMPITP_TIMER_MASK);
val |= SSPX_CORE_CNT30_LMPITP_TIMER(0x978);
- xudc_writel(xudc, val, SSPX_CORE_CNT30);
+ xudc_writel(xudc, val, xudc->soc->sspx_offset + SSPX_CORE_CNT30);
if (xudc->soc->lpm_enable) {
/* Set L1 resume duration to 95 us. */
@@ -3438,10 +3439,10 @@ static void tegra_xudc_device_params_init(struct tegra_xudc *xudc)
* Compliance suite appears to be violating polling LFPS tBurst max
* of 1.4us. Send 1.45us instead.
*/
- val = xudc_readl(xudc, SSPX_CORE_CNT32);
+ val = xudc_readl(xudc, xudc->soc->sspx_offset + SSPX_CORE_CNT32);
val &= ~(SSPX_CORE_CNT32_POLL_TBURST_MAX_MASK);
val |= SSPX_CORE_CNT32_POLL_TBURST_MAX(0xb0);
- xudc_writel(xudc, val, SSPX_CORE_CNT32);
+ xudc_writel(xudc, val, xudc->soc->sspx_offset + SSPX_CORE_CNT32);
/* Direct HS/FS port instance to RxDetect. */
val = xudc_readl(xudc, CFG_DEV_FE);
@@ -3641,6 +3642,7 @@ static struct tegra_xudc_soc tegra210_xudc_soc_data = {
.clock_names = tegra210_xudc_clock_names,
.num_clks = ARRAY_SIZE(tegra210_xudc_clock_names),
.num_phys = 4,
+ .sspx_offset = 0x600,
.u1_enable = false,
.u2_enable = true,
.lpm_enable = false,
@@ -3655,6 +3657,7 @@ static struct tegra_xudc_soc tegra186_xudc_soc_data = {
.clock_names = tegra186_xudc_clock_names,
.num_clks = ARRAY_SIZE(tegra186_xudc_clock_names),
.num_phys = 4,
+ .sspx_offset = 0x600,
.u1_enable = true,
.u2_enable = true,
.lpm_enable = false,
@@ -3669,6 +3672,7 @@ static struct tegra_xudc_soc tegra194_xudc_soc_data = {
.clock_names = tegra186_xudc_clock_names,
.num_clks = ARRAY_SIZE(tegra186_xudc_clock_names),
.num_phys = 4,
+ .sspx_offset = 0x600,
.u1_enable = true,
.u2_enable = true,
.lpm_enable = true,
@@ -3683,6 +3687,7 @@ static struct tegra_xudc_soc tegra234_xudc_soc_data = {
.clock_names = tegra186_xudc_clock_names,
.num_clks = ARRAY_SIZE(tegra186_xudc_clock_names),
.num_phys = 4,
+ .sspx_offset = 0x600,
.u1_enable = true,
.u2_enable = true,
.lpm_enable = true,
@@ -3696,6 +3701,7 @@ static struct tegra_xudc_soc tegra238_xudc_soc_data = {
.clock_names = tegra186_xudc_clock_names,
.num_clks = ARRAY_SIZE(tegra186_xudc_clock_names),
.num_phys = 3,
+ .sspx_offset = 0x600,
.u1_enable = true,
.u2_enable = true,
.lpm_enable = true,
--
2.43.0
next prev parent reply other threads:[~2026-09-21 12:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-21 12:19 [PATCH 0/9] usb: Add support for Tegra238 and device support for Tegra264 Jon Hunter
2026-09-21 12:19 ` [PATCH 1/9] dt-bindings: usb: Add Tegra238 XUSB host controller support Jon Hunter
2026-09-25 13:27 ` Krzysztof Kozlowski
2026-09-28 13:57 ` Jon Hunter
2026-10-02 15:21 ` Jon Hunter
2026-09-21 12:19 ` [PATCH 2/9] dt-bindings: usb: tegra-xudc: Add Tegra238 XUDC support Jon Hunter
2026-09-25 13:28 ` Krzysztof Kozlowski
2026-10-02 15:23 ` Jon Hunter
2026-09-21 12:19 ` [PATCH 3/9] dt-bindings: usb: tegra-xudc: Add Tegra264 " Jon Hunter
2026-09-25 13:28 ` Krzysztof Kozlowski
2026-09-21 12:19 ` [PATCH 4/9] usb: xhci: tegra: Add support for Tegra238 Jon Hunter
2026-09-21 12:19 ` [PATCH 5/9] usb: gadget: tegra-xudc: Fix CNT65 configuration Jon Hunter
2026-09-21 12:19 ` [PATCH 6/9] usb: gadget: tegra-xudc: Add support for Tegra238 Jon Hunter
2026-09-21 12:19 ` Jon Hunter [this message]
2026-09-21 12:19 ` [PATCH 8/9] usb: gadget: tegra-xudc: Add default settings to SoC data Jon Hunter
2026-09-21 12:19 ` [PATCH 9/9] usb: gadget: tegra-xudc: Add support for Tegra264 Jon Hunter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260921-tegra-usb-v1-7-74a925a35d82@nvidia.com \
--to=jonathanh@nvidia.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jckuo@nvidia.com \
--cc=krzk+dt@kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=nkristam@nvidia.com \
--cc=robh@kernel.org \
--cc=thierry.reding@gmail.com \
--cc=thierry.reding@kernel.org \
--cc=treding@nvidia.com \
--cc=waynec@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox