Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"All fixes in the UFS driver.
The big contributor to the diffstats is the Intel controller S0ix/S3
fix which has to special case the suspend/resume patch for intel
controllers in ufshcd-pci.c"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: ufs: core: Fix invalid probe error return value
scsi: ufs: ufs-pci: Set UFSHCD_QUIRK_PERFORM_LINK_STARTUP_ONCE for Intel ADL
scsi: ufs: core: Add a quirk to suppress link_startup_again
scsi: ufs: ufs-pci: Fix S0ix/S3 for Intel controllers
scsi: ufs: core: Revert "Make HID attributes visible"
scsi: ufs: core: Reduce link startup failure logging
scsi: ufs: core: Fix a race condition related to the "hid" attribute group
scsi: ufs: ufs-qcom: Fix UFS OCP issue during UFS power down (PC=3)
+95
-17
+1
-1
drivers/ufs/core/ufs-sysfs.c
+1
-1
drivers/ufs/core/ufs-sysfs.c
···
1949
1949
return hba->dev_info.hid_sup ? attr->mode : 0;
1950
1950
}
1951
1951
1952
-
const struct attribute_group ufs_sysfs_hid_group = {
1952
+
static const struct attribute_group ufs_sysfs_hid_group = {
1953
1953
.name = "hid",
1954
1954
.attrs = ufs_sysfs_hid,
1955
1955
.is_visible = ufs_sysfs_hid_is_visible,
-1
drivers/ufs/core/ufs-sysfs.h
-1
drivers/ufs/core/ufs-sysfs.h
+6
-11
drivers/ufs/core/ufshcd.c
+6
-11
drivers/ufs/core/ufshcd.c
···
5066
5066
* If UFS device isn't active then we will have to issue link startup
5067
5067
* 2 times to make sure the device state move to active.
5068
5068
*/
5069
-
if (!ufshcd_is_ufs_dev_active(hba))
5069
+
if (!(hba->quirks & UFSHCD_QUIRK_PERFORM_LINK_STARTUP_ONCE) &&
5070
+
!ufshcd_is_ufs_dev_active(hba))
5070
5071
link_startup_again = true;
5071
5072
5072
5073
link_startup:
···
5132
5131
ufshcd_readl(hba, REG_UIC_ERROR_CODE_PHY_ADAPTER_LAYER);
5133
5132
ret = ufshcd_make_hba_operational(hba);
5134
5133
out:
5135
-
if (ret) {
5134
+
if (ret)
5136
5135
dev_err(hba->dev, "link startup failed %d\n", ret);
5137
-
ufshcd_print_host_state(hba);
5138
-
ufshcd_print_pwr_info(hba);
5139
-
ufshcd_print_evt_hist(hba);
5140
-
}
5141
5136
return ret;
5142
5137
}
5143
5138
···
8500
8503
DEVICE_DESC_PARAM_EXT_UFS_FEATURE_SUP) &
8501
8504
UFS_DEV_HID_SUPPORT;
8502
8505
8503
-
sysfs_update_group(&hba->dev->kobj, &ufs_sysfs_hid_group);
8504
-
8505
8506
model_index = desc_buf[DEVICE_DESC_PARAM_PRDCT_NAME];
8506
8507
8507
8508
err = ufshcd_read_string_desc(hba, model_index,
···
10656
10661
* @mmio_base: base register address
10657
10662
* @irq: Interrupt line of device
10658
10663
*
10659
-
* Return: 0 on success, non-zero value on failure.
10664
+
* Return: 0 on success; < 0 on failure.
10660
10665
*/
10661
10666
int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
10662
10667
{
···
10886
10891
if (err)
10887
10892
goto out_disable;
10888
10893
10889
-
async_schedule(ufshcd_async_scan, hba);
10890
10894
ufs_sysfs_add_nodes(hba->dev);
10895
+
async_schedule(ufshcd_async_scan, hba);
10891
10896
10892
10897
device_enable_async_suspend(dev);
10893
10898
ufshcd_pm_qos_init(hba);
···
10897
10902
hba->is_irq_enabled = false;
10898
10903
ufshcd_hba_exit(hba);
10899
10904
out_error:
10900
-
return err;
10905
+
return err > 0 ? -EIO : err;
10901
10906
}
10902
10907
EXPORT_SYMBOL_GPL(ufshcd_init);
10903
10908
+14
-1
drivers/ufs/host/ufs-qcom.c
+14
-1
drivers/ufs/host/ufs-qcom.c
···
740
740
741
741
742
742
/* reset the connected UFS device during power down */
743
-
if (ufs_qcom_is_link_off(hba) && host->device_reset)
743
+
if (ufs_qcom_is_link_off(hba) && host->device_reset) {
744
744
ufs_qcom_device_reset_ctrl(hba, true);
745
+
/*
746
+
* After sending the SSU command, asserting the rst_n
747
+
* line causes the device firmware to wake up and
748
+
* execute its reset routine.
749
+
*
750
+
* During this process, the device may draw current
751
+
* beyond the permissible limit for low-power mode (LPM).
752
+
* A 10ms delay, based on experimental observations,
753
+
* allows the UFS device to complete its hardware reset
754
+
* before transitioning the power rail to LPM.
755
+
*/
756
+
usleep_range(10000, 11000);
757
+
}
745
758
746
759
return ufs_qcom_ice_suspend(host);
747
760
}
+67
-3
drivers/ufs/host/ufshcd-pci.c
+67
-3
drivers/ufs/host/ufshcd-pci.c
···
15
15
#include <linux/pci.h>
16
16
#include <linux/pm_runtime.h>
17
17
#include <linux/pm_qos.h>
18
+
#include <linux/suspend.h>
18
19
#include <linux/debugfs.h>
19
20
#include <linux/uuid.h>
20
21
#include <linux/acpi.h>
···
32
31
u32 dsm_fns;
33
32
u32 active_ltr;
34
33
u32 idle_ltr;
34
+
int saved_spm_lvl;
35
35
struct dentry *debugfs_root;
36
36
struct gpio_desc *reset_gpio;
37
37
};
···
349
347
host = devm_kzalloc(hba->dev, sizeof(*host), GFP_KERNEL);
350
348
if (!host)
351
349
return -ENOMEM;
350
+
host->saved_spm_lvl = -1;
352
351
ufshcd_set_variant(hba, host);
353
352
intel_dsm_init(host, hba->dev);
354
353
if (INTEL_DSM_SUPPORTED(host, RESET)) {
···
428
425
static int ufs_intel_adl_init(struct ufs_hba *hba)
429
426
{
430
427
hba->nop_out_timeout = 200;
431
-
hba->quirks |= UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8;
428
+
hba->quirks |= UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8 |
429
+
UFSHCD_QUIRK_PERFORM_LINK_STARTUP_ONCE;
432
430
hba->caps |= UFSHCD_CAP_WB_EN;
433
431
return ufs_intel_common_init(hba);
434
432
}
···
542
538
543
539
return ufshcd_system_resume(dev);
544
540
}
541
+
542
+
static int ufs_intel_suspend_prepare(struct device *dev)
543
+
{
544
+
struct ufs_hba *hba = dev_get_drvdata(dev);
545
+
struct intel_host *host = ufshcd_get_variant(hba);
546
+
int err;
547
+
548
+
/*
549
+
* Only s2idle (S0ix) retains link state. Force power-off
550
+
* (UFS_PM_LVL_5) for any other case.
551
+
*/
552
+
if (pm_suspend_target_state != PM_SUSPEND_TO_IDLE && hba->spm_lvl < UFS_PM_LVL_5) {
553
+
host->saved_spm_lvl = hba->spm_lvl;
554
+
hba->spm_lvl = UFS_PM_LVL_5;
555
+
}
556
+
557
+
err = ufshcd_suspend_prepare(dev);
558
+
559
+
if (err < 0 && host->saved_spm_lvl != -1) {
560
+
hba->spm_lvl = host->saved_spm_lvl;
561
+
host->saved_spm_lvl = -1;
562
+
}
563
+
564
+
return err;
565
+
}
566
+
567
+
static void ufs_intel_resume_complete(struct device *dev)
568
+
{
569
+
struct ufs_hba *hba = dev_get_drvdata(dev);
570
+
struct intel_host *host = ufshcd_get_variant(hba);
571
+
572
+
ufshcd_resume_complete(dev);
573
+
574
+
if (host->saved_spm_lvl != -1) {
575
+
hba->spm_lvl = host->saved_spm_lvl;
576
+
host->saved_spm_lvl = -1;
577
+
}
578
+
}
579
+
580
+
static int ufshcd_pci_suspend_prepare(struct device *dev)
581
+
{
582
+
struct ufs_hba *hba = dev_get_drvdata(dev);
583
+
584
+
if (!strcmp(hba->vops->name, "intel-pci"))
585
+
return ufs_intel_suspend_prepare(dev);
586
+
587
+
return ufshcd_suspend_prepare(dev);
588
+
}
589
+
590
+
static void ufshcd_pci_resume_complete(struct device *dev)
591
+
{
592
+
struct ufs_hba *hba = dev_get_drvdata(dev);
593
+
594
+
if (!strcmp(hba->vops->name, "intel-pci")) {
595
+
ufs_intel_resume_complete(dev);
596
+
return;
597
+
}
598
+
599
+
ufshcd_resume_complete(dev);
600
+
}
545
601
#endif
546
602
547
603
/**
···
675
611
.thaw = ufshcd_system_resume,
676
612
.poweroff = ufshcd_system_suspend,
677
613
.restore = ufshcd_pci_restore,
678
-
.prepare = ufshcd_suspend_prepare,
679
-
.complete = ufshcd_resume_complete,
614
+
.prepare = ufshcd_pci_suspend_prepare,
615
+
.complete = ufshcd_pci_resume_complete,
680
616
#endif
681
617
};
682
618
+7
include/ufs/ufshcd.h
+7
include/ufs/ufshcd.h
···
688
688
* single doorbell mode.
689
689
*/
690
690
UFSHCD_QUIRK_BROKEN_LSDBS_CAP = 1 << 25,
691
+
692
+
/*
693
+
* This quirk indicates that DME_LINKSTARTUP should not be issued a 2nd
694
+
* time (refer link_startup_again) after the 1st time was successful,
695
+
* because it causes link startup to become unreliable.
696
+
*/
697
+
UFSHCD_QUIRK_PERFORM_LINK_STARTUP_ONCE = 1 << 26,
691
698
};
692
699
693
700
enum ufshcd_caps {