usb: typec: tcpm: fix multiple times discover svids error

[ Upstream commit dac3b192107b978198e89ec0f77375738352e0c8 ]

PD3.0 Spec 6.4.4.3.2 say that only Responder supports 12 or more SVIDs,
the Discover SVIDs Command Shall be executed multiple times until a
Discover SVIDs VDO is returned ending either with a SVID value of
0x0000 in the last part of the last VDO or with a VDO containing two
SVIDs with values of 0x0000.

In the current implementation, if the last VDO does not find that the
Discover SVIDs Command would be executed multiple times even if the
Responder SVIDs are less than 12, and we found some odd dockers just
meet this case. So fix it.

Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Link: https://lore.kernel.org/r/20230316081149.24519-1-frank.wang@rock-chips.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c
index e4308f97d97391aace49635182bf813d456e9456..0fdae44c9b8cfc3c6b6b38febb5ad7d952b7248f 100644 (file)
--- a/drivers/usb/typec/tcpm.c
+++ b/drivers/usb/typec/tcpm.c
@@ -1006,7 +1006,21 @@ static bool svdm_consume_svids(struct tcpm_port *port, const __le32 *payload,
                pmdata->svids[pmdata->nsvids++] = svid;
                tcpm_log(port, "SVID %d: 0x%x", pmdata->nsvids, svid);
        }
-       return true;
+
+       /*
+        * PD3.0 Spec 6.4.4.3.2: The SVIDs are returned 2 per VDO (see Table
+        * 6-43), and can be returned maximum 6 VDOs per response (see Figure
+        * 6-19). If the Respondersupports 12 or more SVID then the Discover
+        * SVIDs Command Shall be executed multiple times until a Discover
+        * SVIDs VDO is returned ending either with a SVID value of 0x0000 in
+        * the last part of the last VDO or with a VDO containing two SVIDs
+        * with values of 0x0000.
+        *
+        * However, some odd dockers support SVIDs less than 12 but without
+        * 0x0000 in the last VDO, so we need to break the Discover SVIDs
+        * request and return false here.
+        */
+       return cnt == 7;
 abort:
        tcpm_log(port, "SVID_DISCOVERY_MAX(%d) too low!", SVID_DISCOVERY_MAX);
        return false;