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:
"Two small fixes, both in drivers: ipr and ufs"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: ipr: Fix softlockup when rescanning devices in petitboot
scsi: ufs: Fix possible unclocked access to auto hibern8 timer register
+17
-8
+2
-1
drivers/scsi/ipr.c
+2
-1
drivers/scsi/ipr.c
···
9950
9950
ioa_cfg->max_devs_supported = ipr_max_devs;
9951
9951
9952
9952
if (ioa_cfg->sis64) {
9953
+
host->max_channel = IPR_MAX_SIS64_BUSES;
9953
9954
host->max_id = IPR_MAX_SIS64_TARGETS_PER_BUS;
9954
9955
host->max_lun = IPR_MAX_SIS64_LUNS_PER_TARGET;
9955
9956
if (ipr_max_devs > IPR_MAX_SIS64_DEVS)
···
9959
9958
+ ((sizeof(struct ipr_config_table_entry64)
9960
9959
* ioa_cfg->max_devs_supported)));
9961
9960
} else {
9961
+
host->max_channel = IPR_VSET_BUS;
9962
9962
host->max_id = IPR_MAX_NUM_TARGETS_PER_BUS;
9963
9963
host->max_lun = IPR_MAX_NUM_LUNS_PER_TARGET;
9964
9964
if (ipr_max_devs > IPR_MAX_PHYSICAL_DEVS)
···
9969
9967
* ioa_cfg->max_devs_supported)));
9970
9968
}
9971
9969
9972
-
host->max_channel = IPR_VSET_BUS;
9973
9970
host->unique_id = host->host_no;
9974
9971
host->max_cmd_len = IPR_MAX_CDB_LEN;
9975
9972
host->can_queue = ioa_cfg->max_cmds;
+1
drivers/scsi/ipr.h
+1
drivers/scsi/ipr.h
+14
-7
drivers/scsi/ufs/ufshcd.c
+14
-7
drivers/scsi/ufs/ufshcd.c
···
3884
3884
void ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit)
3885
3885
{
3886
3886
unsigned long flags;
3887
+
bool update = false;
3887
3888
3888
-
if (!(hba->capabilities & MASK_AUTO_HIBERN8_SUPPORT))
3889
+
if (!ufshcd_is_auto_hibern8_supported(hba))
3889
3890
return;
3890
3891
3891
3892
spin_lock_irqsave(hba->host->host_lock, flags);
3892
-
if (hba->ahit == ahit)
3893
-
goto out_unlock;
3894
-
hba->ahit = ahit;
3895
-
if (!pm_runtime_suspended(hba->dev))
3896
-
ufshcd_writel(hba, hba->ahit, REG_AUTO_HIBERNATE_IDLE_TIMER);
3897
-
out_unlock:
3893
+
if (hba->ahit != ahit) {
3894
+
hba->ahit = ahit;
3895
+
update = true;
3896
+
}
3898
3897
spin_unlock_irqrestore(hba->host->host_lock, flags);
3898
+
3899
+
if (update && !pm_runtime_suspended(hba->dev)) {
3900
+
pm_runtime_get_sync(hba->dev);
3901
+
ufshcd_hold(hba, false);
3902
+
ufshcd_auto_hibern8_enable(hba);
3903
+
ufshcd_release(hba);
3904
+
pm_runtime_put(hba->dev);
3905
+
}
3899
3906
}
3900
3907
EXPORT_SYMBOL_GPL(ufshcd_auto_hibern8_update);
3901
3908