Commit fd3a6837 authored by Damien Le Moal's avatar Damien Le Moal
Browse files

ata: libata-core: Fix ata_pci_shutdown_one() 



This reverts commit 5b6fba54.

Commit 5b6fba54 ("ata: libata-core: Detach a port devices on
shutdown") modified the function ata_pci_shutdown_one() to stop
(suspend) devices attached to the ports of a PCI AHCI adapter to ensure
that drives are spun down before shutting down a system. However, this
is done only for PCI adapters and not for other types of adapters. This
limitation was addressed with commit 24eca2dc ("scsi: sd: Introduce
manage_shutdown device flag"). With this, all ATA disks are spun down on
system shutdown, which make the changes introduced with 5b6fba54
useless.

Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarNiklas Cassel <niklas.cassel@wdc.com>
parent 13d88ac5

drivers/ata/libata-core.c

+1 −15
Original line number Diff line number Diff line
@@ -6180,24 +6180,10 @@ EXPORT_SYMBOL_GPL(ata_pci_remove_one); 
void ata_pci_shutdown_one(struct pci_dev *pdev)

{

	struct ata_host *host = pci_get_drvdata(pdev);

	struct ata_port *ap;

	unsigned long flags;

	int i;



	/* Tell EH to disable all devices */

	for (i = 0; i < host->n_ports; i++) {

		ap = host->ports[i];

		spin_lock_irqsave(ap->lock, flags);

		ap->pflags |= ATA_PFLAG_UNLOADING;

		ata_port_schedule_eh(ap);

		spin_unlock_irqrestore(ap->lock, flags);

	}



	for (i = 0; i < host->n_ports; i++) {

		ap = host->ports[i];



		/* Wait for EH to complete before freezing the port */

		ata_port_wait_eh(ap);

		struct ata_port *ap = host->ports[i];



		ap->pflags |= ATA_PFLAG_FROZEN;