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 1f25529fe05dac186dbbe466f92098b5d9b90b5b..361fece3d8188171c28ff8d587993703ecb32e3c 100644 (file)
--- a/drivers/thunderbolt/retimer.c
+++ b/drivers/thunderbolt/retimer.c
@@ -93,9 +93,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;
        dev_dbg(&rt->dev, "NVM version %x.%x\n", nvm->major, nvm->minor);