thunderbolt: Read retimer NVM authentication status prior tb_retimer_set_inbound_sbtx()

[ Upstream commit 1402ba08abae5cfa583ff1a40b99c098a0532d41 ]

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: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/thunderbolt/retimer.c b/drivers/thunderbolt/retimer.c
index 9cc2819..edbd924 100644 (file)
--- a/drivers/thunderbolt/retimer.c
+++ b/drivers/thunderbolt/retimer.c
@@ -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;
@@ -455,18 +470,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++) {
                /*