]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
scsi: ufs: core: Skip link param validation when lanes_per_direction is unset
authorDaejun Park <daejun7.park@samsung.com>
Wed, 20 May 2026 07:00:09 +0000 (16:00 +0900)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 2 Jun 2026 01:44:21 +0000 (21:44 -0400)
ufshcd_validate_link_params(), added by commit e72323f3b09f ("scsi: ufs:
core: Configure only active lanes during link"), is called
unconditionally from ufshcd_link_startup() and fails link startup with
-ENOLINK when the connected lane count read from the device differs from
hba->lanes_per_direction.

lanes_per_direction is only set by ufshcd-pltfrm (default 2, or the
"lanes-per-direction" devicetree property); ufshcd-pci controllers
(e.g. Intel) leave it 0. As the device always reports >= 1 connected
lanes, the check can never match and link startup always fails.
Reproduced with QEMU's UFS device.

Skip the check when lanes_per_direction is unset: with no expected value
to validate against, restore the behaviour from before that commit.

Fixes: e72323f3b09f ("scsi: ufs: core: Configure only active lanes during link")
Signed-off-by: Daejun Park <daejun7.park@samsung.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Link: https://patch.msgid.link/20260520070009epcms2p6542f3abb7660839e9d8140b3f2f145c3@epcms2p6
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/ufs/core/ufshcd.c

index c1a0a79e386d8f1c1543ebcac2f8af3a5c28c55d..1061e20786fa41f2345081522719841f5828a53a 100644 (file)
@@ -5200,6 +5200,16 @@ static int ufshcd_validate_link_params(struct ufs_hba *hba)
 {
        int ret, val;
 
+       /*
+        * lanes_per_direction is only populated by the platform glue (it
+        * defaults to 2 or is read from the "lanes-per-direction" devicetree
+        * property). Controllers probed via ufshcd-pci leave it unset (0), in
+        * which case there is no expected lane count to validate the connected
+        * lanes against. Skip the check instead of failing link startup.
+        */
+       if (!hba->lanes_per_direction)
+               return 0;
+
        ret = ufshcd_dme_get(hba, UIC_ARG_MIB(PA_CONNECTEDTXDATALANES),
                             &val);
        if (ret)