History

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley: "This series consists of the usual driver updates (ufs, pm80xx, lpfc, mpi3mr, mpt3sas, hisi_sas, libsas) and minor updates and bug fixes. The most impactful change is likely the switch from GFP_DMA to GFP_KERNEL in a bunch of drivers, but even that shouldn't affect too many people" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (121 commits) scsi: mpi3mr: Bump driver version to 8.0.0.61.0 scsi: mpi3mr: Fixes around reply request queues scsi: mpi3mr: Enhanced Task Management Support Reply handling scsi: mpi3mr: Use TM response codes from MPI3 headers scsi: mpi3mr: Add io_uring interface support in I/O-polled mode scsi: mpi3mr: Print cable mngnt and temp threshold events scsi: mpi3mr: Support Prepare for Reset event scsi: mpi3mr: Add Event acknowledgment logic scsi: mpi3mr: Gracefully handle online FW update operation scsi: mpi3mr: Detect async reset that occurred in firmware scsi: mpi3mr: Add IOC reinit function scsi: mpi3mr: Handle offline FW activation in graceful manner scsi: mpi3mr: Code refactor of IOC init - part2 scsi: mpi3mr: Code refactor of IOC init - part1 scsi: mpi3mr: Fault IOC when internal command gets timeout scsi: mpi3mr: Display IOC firmware package version scsi: mpi3mr: Handle unaligned PLL in unmap cmnds scsi: mpi3mr: Increase internal cmnds timeout to 60s scsi: mpi3mr: Do access status validation before adding devices scsi: mpi3mr: Add support for PCIe Managed Switch SES device ...

Linus Torvalds committed 4 years ago

Commit e1a7aa22 parents fb3b067 c77b1f892 files · +3714 −1628Browse files

Showing the changes to include (3 of 92 files). Show all

Unified · Split

3 files
  1. include/linux/blk-pm.h +1 −1
  2. include/scsi/libsas.h +2 −0
  3. include/scsi/scsi_host.h +0 −6
include/linux/blk-pm.h+1−1
@@ -14,7 +14,7 @@ extern void blk_pm_runtime_init(struct request_queue *q, struct device *dev); · 13 unmodified lines
1414 extern int blk_pre_runtime_suspend(struct request_queue *q);
1515 extern void blk_post_runtime_suspend(struct request_queue *q, int err);
1616 extern void blk_pre_runtime_resume(struct request_queue *q);
17−extern void blk_post_runtime_resume(struct request_queue *q, int err);
17+extern void blk_post_runtime_resume(struct request_queue *q);
1818 extern void blk_set_runtime_active(struct request_queue *q);
1919 #else
2020 static inline void blk_pm_runtime_init(struct request_queue *q,
include/scsi/libsas.h+2−0
@@ -356,6 +356,7 @@ enum sas_ha_state { · 355 unmodified lines
356356 SAS_HA_DRAINING,
357357 SAS_HA_ATA_EH_ACTIVE,
358358 SAS_HA_FROZEN,
359+ SAS_HA_RESUMING,
359360 };
360361
361362 struct sas_ha_struct {
@@ -660,6 +661,7 @@ extern int sas_register_ha(struct sas_ha_struct *); · 298 unmodified lines
660661 extern int sas_unregister_ha(struct sas_ha_struct *);
661662 extern void sas_prep_resume_ha(struct sas_ha_struct *sas_ha);
662663 extern void sas_resume_ha(struct sas_ha_struct *sas_ha);
664+extern void sas_resume_ha_no_sync(struct sas_ha_struct *sas_ha);
663665 extern void sas_suspend_ha(struct sas_ha_struct *sas_ha);
664666
665667 int sas_set_phy_speed(struct sas_phy *phy, struct sas_phy_linkrates *rates);
include/scsi/scsi_host.h+0−6
@@ -691,12 +691,6 @@ struct Scsi_Host { · 690 unmodified lines
691691
692692 /* ldm bits */
693693 struct device shost_gendev, shost_dev;
694− /*
695− * The array size 3 provides space for one attribute group defined by
696− * the SCSI core, one attribute group defined by the SCSI LLD and one
697− * terminating NULL pointer.
698− */
699− const struct attribute_group *shost_dev_attr_groups[3];
700694
701695 /*
702696 * Points to the transport data (if any) which is allocated

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t