Commit 1402ba08 authored by Mika Westerberg's avatar Mika Westerberg
Browse files

thunderbolt: Read retimer NVM authentication status prior tb_retimer_set_inbound_sbtx() 



According to the USB4 retimer guide the correct order is immediately
after sending ENUMERATE_RETIMERS so update the code to follow this.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 53ba2e16

drivers/thunderbolt/retimer.c

+21 −8
Original line number Diff line number Diff line
@@ -187,6 +187,21 @@ static ssize_t nvm_authenticate_show(struct device *dev, 
	return ret;

}



static void tb_retimer_nvm_authenticate_status(struct tb_port *port, u32 *status)

{

	int i;



	tb_port_dbg(port, "reading NVM authentication status of retimers\n");



	/*

	 * Before doing anything else, read the authentication status.

	 * If the retimer has it set, store it for the new retimer

	 * device instance.

	 */

	for (i = 1; i <= TB_MAX_RETIMER_INDEX; i++)

		usb4_port_retimer_nvm_authenticate_status(port, i, &status[i]);

}



static void tb_retimer_set_inbound_sbtx(struct tb_port *port)

{

	int i;
@@ -449,18 +464,16 @@ int tb_retimer_scan(struct tb_port *port, bool add) 
		return ret;



	/*

	 * Enable sideband channel for each retimer. We can do this

	 * regardless whether there is device connected or not.

	 * Immediately after sending enumerate retimers read the

	 * authentication status of each retimer.

	 */

	tb_retimer_set_inbound_sbtx(port);

	tb_retimer_nvm_authenticate_status(port, status);



	/*

	 * Before doing anything else, read the authentication status.

	 * If the retimer has it set, store it for the new retimer

	 * device instance.

	 * Enable sideband channel for each retimer. We can do this

	 * regardless whether there is device connected or not.

	 */

	for (i = 1; i <= TB_MAX_RETIMER_INDEX; i++)

		usb4_port_retimer_nvm_authenticate_status(port, i, &status[i]);

	tb_retimer_set_inbound_sbtx(port);



	for (i = 1; i <= TB_MAX_RETIMER_INDEX; i++) {

		/*