Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
Message-ID: <41b0e30c-0dc8-4bfd-b1fc-b01d1421e60d@amd.com>
Date:   Tue, 12 Dec 2023 13:26:40 -0600
User-Agent: Mozilla Thunderbird
Subject: Re: [Patch v2 1/2] thunderbolt: Introduce tb_switch_reset_ports(),
 tb_port_reset() and usb4_port_reset()
Content-Language: en-US
To:     Sanath S <Sanath.S@amd.com>, andreas.noever@gmail.com,
        michael.jamet@intel.com, mika.westerberg@linux.intel.com,
        YehezkelShB@gmail.com, linux-usb@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <20231212191635.2022520-1-Sanath.S@amd.com>
 <20231212191635.2022520-2-Sanath.S@amd.com>
From:   Mario Limonciello <mario.limonciello@amd.com>
In-Reply-To: <20231212191635.2022520-2-Sanath.S@amd.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?KzZBTGRiYWhMN0o4S1pMaTFkcm1BZ01WYVVMcDg2TEw1V1l2SytqNjN0VjVo?=
 =?utf-8?B?K1V0N1RqK1VydHZRdDRHZDFMeFN5V0JBRFdldXVJWVBTL3h6cW5UWUpGOFBa?=
 =?utf-8?B?ZU11WDNLbDFxZWxScVNoK1l0dHNQTjUxQW14WFQ0ZEZMWVpXZmxMZWEwMGVo?=
 =?utf-8?B?OXp0N3IvVEtiS2l2aEt6MnRvcloySjhoU094MEFxM0hMUHlqYmE1bzBxaGQ5?=
 =?utf-8?B?Tk5JOWxlRkx6R0dGUXRPRVFZOW1aQjNwL3R1R1ZpcC9QSjdqWGlTTGdSc014?=
 =?utf-8?B?eERuUHZSaE9ZQ0RtVlhhdWphUXNiYjl3Y3JDSHhXZWNOdG5xOU9yZFA5K3Rl?=
 =?utf-8?B?TVdVNlE4T2w4bG1xUXRGZXFaVmtyVmxpcXM5M242REN6Tk5xZXZ3K1lFUU4r?=
 =?utf-8?B?ZXhRZlNWWFVpdlN0UnprYjVaZ00yeDRSOHlyV1IvOEZkN1ZMSWI2RVpkOHZ4?=
 =?utf-8?B?M291YVlxbnNybk1wM3NVYzUwNE03RHMvRXNMdFFSTlF6ZGVBZXpMYkw5R0tK?=
 =?utf-8?B?bXBLejJHbmhjU216U0ZvcjA4UUEreEhLT3pLK0NncUwrUmhudVhCazdnKzZ6?=
 =?utf-8?B?RGdEVHZ1NHFtaXQxV1IzcHBLeFV0MXFicll6ZGljUStxRDZOYWlSVjVGR1RT?=
 =?utf-8?B?UkpsMHlZcFVzVWo0QVM2RWI2bHhaa052a3hOZGhqTmRpSlFJZkpITGNINGZ6?=
 =?utf-8?B?UTlMQ2tOelh5K05nY1A3M0YxZkJLeWN1eVpTa3FkdE90M29KOVRtemt3UTd5?=
 =?utf-8?B?eGduQUxkeVV2RmZBelZyZmQ4cUFCYTgwNlNXL1hrQXhVaC9sYnFYTmQ5aFVO?=
 =?utf-8?B?SDNMZnp6cUhPN0Z1UnkwSGlZbzVyUXBEK3hKQ1loRGMxUnZSUjNGOG0xdFJ0?=
 =?utf-8?B?VUpLQmtyN1F3bmJZaTVRWlUxanFrYWhab2lzK053MDNVb0RZdFpicExEQlBX?=
 =?utf-8?B?QXNqT0paVGJwS1hYVXY3RWFJY216M3M3cWtMd3VtMTFaOEN5WlJEczZwU21m?=
 =?utf-8?B?V1hmVFp5ZWdhYi9Tays1VVV5VkZwekcwNGJZU2hVZlpzTUM4OERrTlIyTDdy?=
 =?utf-8?B?dHpQdkZ3blRFVUJ4UnVWTCswUHpNS3hDY25nZk5NUlZpczZ4VzdUbjd6NDZS?=
 =?utf-8?B?MkFBU0ZPWDB3TTNRVDNGVXUzaDNTaE9oaEc1cUk2bW5kZlFwVmk2NnUxTDNw?=
 =?utf-8?B?R3FGUllNNTZGTytBZmI3YVJsd25DdmtET2xKSGMwVXpOcytJRVlMQlhUN0Zo?=
 =?utf-8?B?cU0vUnIyNnlzdCtkWE9lbUIyRThWREUrVzIvVTk3b2V6SXlVa3NlQW5tMGds?=
 =?utf-8?B?YXpINE1zaVA4Z2c1YW9aWDBRVExuSHZxSHEzTUdPenErWFBPczg5RVdQTU44?=
 =?utf-8?B?YWtsckh0Q2oxbjhWTzQ2d2dJeVhlTlp3MEZWUVE5NUlVWnhVbkNLdjlnUWdU?=
 =?utf-8?B?TzZqNkdVUGRPMENNN1JqejlvSXJvUWZac09wMmdtWjZabUdpcmxNeG9CSVJu?=
 =?utf-8?B?VjJRQ0NkY2M3bWJ1dm5qZkVZeWdxOEdVZjNCajk0Tk1IQ1FxbENnSDJ5dFB4?=
 =?utf-8?B?MHNTMDJzZXU4Tk9EZGQ0WGNVbGVGaUJFdWtFR043QzNEWjhRVC9HQTF2dlh5?=
 =?utf-8?B?NmN4L2F6V0FFZHo4bE10RGordVdqenhhUlN1TjdtMUY0dWw2VUswZ1AxdFRX?=
 =?utf-8?B?azNWZ3hMS2FWY3dTV0xqcHdqYisrMUlMbWF2ckV2NG55WXF2MkR1WWVIZGoy?=
 =?utf-8?B?dEpqcUdSQ05PNXFWTkhPVmxPTGNmQzdUdzdjYkRhOUN4UitYek5IZGtLMGZQ?=
 =?utf-8?B?TllwQXY3aEp4RU9VcDg2NEJVVk8rK250QnhMbUdGMkJmRHFhLzdwQ1VQM2dE?=
 =?utf-8?B?WER5VWF2YlRZTVJLanpBQ3RDMC9reWlxK1J0OCtDMFpvcUJadlZzdVg0UDJ2?=
 =?utf-8?B?TEt4czRWVjhkb3YxNklBaWVMV2dsaXZwT0kxNXhBbTRUcmcwTDFzdDhaR3lS?=
 =?utf-8?B?NERQWVN0Kzg0aERRVXZCRUhNb3NXbEpCVUdTeUM2ZDJNZzRWL1lqWHlmN2FV?=
 =?utf-8?B?WW01MVMzYjRtUDUxdXhyZmJLODMvZ0lQUEc2eWRrVTl2VC96Ni9na2V2SkRj?=
 =?utf-8?Q?gQCTdD73K2lXi1HfRM99n41bC?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 26cf291d-397f-43b6-5ba7-08dbfb4844bc
X-MS-Exchange-CrossTenant-AuthSource: MN0PR12MB6101.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2023 19:26:41.3772
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 51dUodpXWDWl2kE+6uCkDr4HsmqzcFdT0btL8mx4rOilhs9qGvmqLcltjSQmoDHrEMOjEr+U5UERsvKhk+hM4g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB7975
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 12 Dec 2023 11:26:55 -0800 (PST)

On 12/12/2023 13:16, Sanath S wrote:
> Introduce the tb_switch_reset_ports() function that resets the
> downstream ports of a given switch. This helps us reset the USB4
> links created by boot firmware during the init sequence.
> 
> Introduce the tb_port_reset() helper function that resets the
> given port.
> 
> Introduce the usb4_port_reset() function that performs the DPR
> of a given port. This function follows the CM guide specification 7.3
> 
> Suggested-by: Mario Limonciello <mario.limonciello@amd.com>
> Signed-off-by: Sanath S <Sanath.S@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
>   drivers/thunderbolt/switch.c  | 35 +++++++++++++++++++++++++++++++
>   drivers/thunderbolt/tb.h      |  2 ++
>   drivers/thunderbolt/tb_regs.h |  1 +
>   drivers/thunderbolt/usb4.c    | 39 +++++++++++++++++++++++++++++++++++
>   4 files changed, 77 insertions(+)
> 
> diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
> index 44e9b09de47a..ef7ed92fd48e 100644
> --- a/drivers/thunderbolt/switch.c
> +++ b/drivers/thunderbolt/switch.c
> @@ -626,6 +626,19 @@ int tb_port_unlock(struct tb_port *port)
>   	return 0;
>   }
>   
> +/**
> + * tb_port_reset() - Reset downstream port
> + * @port: Port to reset
> + *
> + * Helps to reconfigure the USB4 link by resetting the downstream port.
> + *
> + * Return: Returns 0 on success or an error code on failure.
> + */
> +static int tb_port_reset(struct tb_port *port)
> +{
> +	return usb4_port_reset(port);
> +}
> +
>   static int __tb_port_enable(struct tb_port *port, bool enable)
>   {
>   	int ret;
> @@ -1547,6 +1560,28 @@ static void tb_dump_switch(const struct tb *tb, const struct tb_switch *sw)
>   	       regs->__unknown1, regs->__unknown4);
>   }
>   
> +/**
> + * tb_switch_reset_ports() - Reset downstream ports of switch.
> + * @sw: Switch whose ports need to be reset.
> + *
> + * This is applicable only for USB4 routers.
> + * tb_switch_is_usb4() needs to be called before calling this
> + * function.
> + *
> + * Return: Returns 0 on success or an error code on failure.
> + */
> +int tb_switch_reset_ports(struct tb_switch *sw)
> +{
> +	struct tb_port *port;
> +	int ret = -EOPNOTSUPP;
> +
> +	tb_switch_for_each_port(sw, port) {
> +		if (tb_port_is_null(port) && port->cap_usb4)
> +			return tb_port_reset(port);
> +	}
> +	return ret;
> +}
> +
>   /**
>    * tb_switch_reset() - reconfigure route, enable and send TB_CFG_PKG_RESET
>    * @sw: Switch to reset
> diff --git a/drivers/thunderbolt/tb.h b/drivers/thunderbolt/tb.h
> index e299e53473ae..f2687ec4ac53 100644
> --- a/drivers/thunderbolt/tb.h
> +++ b/drivers/thunderbolt/tb.h
> @@ -797,6 +797,7 @@ void tb_switch_remove(struct tb_switch *sw);
>   void tb_switch_suspend(struct tb_switch *sw, bool runtime);
>   int tb_switch_resume(struct tb_switch *sw);
>   int tb_switch_reset(struct tb_switch *sw);
> +int tb_switch_reset_ports(struct tb_switch *sw);
>   int tb_switch_wait_for_bit(struct tb_switch *sw, u32 offset, u32 bit,
>   			   u32 value, int timeout_msec);
>   void tb_sw_set_unplugged(struct tb_switch *sw);
> @@ -1281,6 +1282,7 @@ struct tb_port *usb4_switch_map_usb3_down(struct tb_switch *sw,
>   int usb4_switch_add_ports(struct tb_switch *sw);
>   void usb4_switch_remove_ports(struct tb_switch *sw);
>   
> +int usb4_port_reset(struct tb_port *port);
>   int usb4_port_unlock(struct tb_port *port);
>   int usb4_port_hotplug_enable(struct tb_port *port);
>   int usb4_port_configure(struct tb_port *port);
> diff --git a/drivers/thunderbolt/tb_regs.h b/drivers/thunderbolt/tb_regs.h
> index 87e4795275fe..d49530bc0d53 100644
> --- a/drivers/thunderbolt/tb_regs.h
> +++ b/drivers/thunderbolt/tb_regs.h
> @@ -389,6 +389,7 @@ struct tb_regs_port_header {
>   #define PORT_CS_18_CSA				BIT(22)
>   #define PORT_CS_18_TIP				BIT(24)
>   #define PORT_CS_19				0x13
> +#define PORT_CS_19_DPR				BIT(0)
>   #define PORT_CS_19_PC				BIT(3)
>   #define PORT_CS_19_PID				BIT(4)
>   #define PORT_CS_19_WOC				BIT(16)
> diff --git a/drivers/thunderbolt/usb4.c b/drivers/thunderbolt/usb4.c
> index 4277733d0021..c8a4bf33ed1c 100644
> --- a/drivers/thunderbolt/usb4.c
> +++ b/drivers/thunderbolt/usb4.c
> @@ -1073,6 +1073,45 @@ void usb4_switch_remove_ports(struct tb_switch *sw)
>   	}
>   }
>   
> +/**
> + * usb4_port_reset() - Reset USB4 downsteam port
> + * @port: USB4 port to reset.
> + *
> + * Helps to reconfigure USB4 link by resetting downstream port.
> + *
> + * Return: Returns 0 on success or an error code on failure.
> + */
> +int usb4_port_reset(struct tb_port *port)
> +{
> +	u32 val = 0;
> +	int ret;
> +
> +	ret = tb_port_read(port, &val, TB_CFG_PORT,
> +			port->cap_usb4 + PORT_CS_19, 1);
> +	if (ret)
> +		return ret;
> +
> +	val = val | PORT_CS_19_DPR;
> +	ret = tb_port_write(port, &val, TB_CFG_PORT,
> +			port->cap_usb4 + PORT_CS_19, 1);
> +	if (ret)
> +		return ret;
> +
> +	/* Wait for 10ms after requesting downstream port reset */
> +	usleep_range(10000, 15000);
> +
> +	ret = tb_port_read(port, &val, TB_CFG_PORT,
> +			port->cap_usb4 + PORT_CS_19, 1);
> +	if (ret)
> +		return ret;
> +
> +	val &= ~PORT_CS_19_DPR;
> +	ret = tb_port_write(port, &val, TB_CFG_PORT,
> +			port->cap_usb4 + PORT_CS_19, 1);
> +
> +	return ret;
> +}
> +
>   /**
>    * usb4_port_unlock() - Unlock USB4 downstream port
>    * @port: USB4 port to unlock