thunderbolt: Do not add non-active NVM if NVM upgrade is disabled for retimer

[ Upstream commit ad79c278e478ca8c1a3bf8e7a0afba8f862a48a1 ]

This is only used to write a new NVM in order to upgrade the retimer
firmware. It does not make sense to expose it if upgrade is disabled.
This also makes it consistent with the router NVM upgrade.

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 5bd5c22a5085d40c0a6aec99f03cc8a7941110bf..d2038337ea03bd8930668b63a6cf4006b4ac13be 100644 (file)
--- a/drivers/thunderbolt/retimer.c
+++ b/drivers/thunderbolt/retimer.c
@@ -89,9 +89,11 @@ static int tb_retimer_nvm_add(struct tb_retimer *rt)
        if (ret)
                goto err_nvm;
 
-       ret = tb_nvm_add_non_active(nvm, nvm_write);
-       if (ret)
-               goto err_nvm;
+       if (!rt->no_nvm_upgrade) {
+               ret = tb_nvm_add_non_active(nvm, nvm_write);
+               if (ret)
+                       goto err_nvm;
+       }
 
        rt->nvm = nvm;
        return 0;