Commit 3700dc91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ata-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux 

Pull ata fixes from Niklas Cassel:

 - Fix a hibernate regression where the disk was needlessly spun down
   and then immediately spun up both when entering and when resuming
   from hibernation (me)

 - Update the MAINTAINERS file to remove remnants from Jens
   maintainership of libata (Damien)

* tag 'ata-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux:
  ata: libata: Update MAINTAINERS file
  ata: libata: avoid superfluous disk spin down + spin up during hibernation
parents befcc893 0df4b9d9

MAINTAINERS

+0 −6
Original line number Diff line number Diff line
@@ -12944,7 +12944,6 @@ LIBATA PATA ARASAN COMPACT FLASH CONTROLLER 
M:	Viresh Kumar <vireshk@kernel.org>

L:	linux-ide@vger.kernel.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git

F:	drivers/ata/pata_arasan_cf.c

F:	include/linux/pata_arasan_cf_data.h








@@ -12958,17 +12957,14 @@ LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS







M:	Linus Walleij <linus.walleij@linaro.org>









L:	linux-ide@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git









F:	drivers/ata/pata_ftide010.c









F:	drivers/ata/sata_gemini.c









F:	drivers/ata/sata_gemini.h

















LIBATA SATA AHCI PLATFORM devices support









M:	Hans de Goede <hdegoede@redhat.com>









M:	Jens Axboe <axboe@kernel.dk>









L:	linux-ide@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git









F:	drivers/ata/ahci_platform.c









F:	drivers/ata/libahci_platform.c









F:	include/linux/ahci_platform.h








@@ -12977,7 +12973,6 @@ LIBATA SATA AHCI SYNOPSYS DWC CONTROLLER DRIVER







M:	Serge Semin <fancer.lancer@gmail.com>









L:	linux-ide@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git









F:	Documentation/devicetree/bindings/ata/baikal,bt1-ahci.yaml









F:	Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml









F:	drivers/ata/ahci_dwc.c








@@ -12986,7 +12981,6 @@ LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER







M:	Mikael Pettersson <mikpelinux@gmail.com>









L:	linux-ide@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git









F:	drivers/ata/sata_promise.*

















LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
































drivers/ata/libata-eh.c



+14
−4






























Original line number
Diff line number
Diff line







@@ -4099,11 +4099,21 @@ static void ata_eh_handle_port_suspend(struct ata_port *ap)

















	WARN_ON(ap->pflags & ATA_PFLAG_SUSPENDED);



















	/*









	 * We will reach this point for all of the PM events:









	 * PM_EVENT_SUSPEND (if runtime pm, PM_EVENT_AUTO will also be set)









	 * PM_EVENT_FREEZE, and PM_EVENT_HIBERNATE.









	 *









	 * We do not want to perform disk spin down for PM_EVENT_FREEZE.









	 * (Spin down will be performed by the subsequent PM_EVENT_HIBERNATE.)









	 */









	if (!(ap->pm_mesg.event & PM_EVENT_FREEZE)) {









		/* Set all devices attached to the port in standby mode */









		ata_for_each_link(link, ap, HOST_FIRST) {









			ata_for_each_dev(dev, link, ENABLED)









				ata_dev_power_set_standby(dev);









		}









	}



















	/*









	 * If we have a ZPODD attached, check its zero