thunderbolt: Read retimer NVM authentication status prior tb_retimer_set_inbound_sbtx()
[ Upstream commit 1402ba08ab
]
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>
This commit is contained in:
Родитель
776b34615a
Коммит
25decbbb66
|
@ -208,6 +208,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;
|
||||
|
@ -480,20 +495,18 @@ int tb_retimer_scan(struct tb_port *port, bool add)
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
/*
|
||||
* Immediately after sending enumerate retimers read the
|
||||
* authentication status of each retimer.
|
||||
*/
|
||||
tb_retimer_nvm_authenticate_status(port, status);
|
||||
|
||||
/*
|
||||
* Enable sideband channel for each retimer. We can do this
|
||||
* regardless whether there is device connected or not.
|
||||
*/
|
||||
tb_retimer_set_inbound_sbtx(port);
|
||||
|
||||
/*
|
||||
* 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]);
|
||||
|
||||
for (i = 1; i <= TB_MAX_RETIMER_INDEX; i++) {
|
||||
/*
|
||||
* Last retimer is true only for the last on-board
|
||||
|
|
Загрузка…
Ссылка в новой задаче