ata_piix: fix ghost device probing by honoring PCS present bits
PATCH 1/1 ata_piix: fix ghost device probing by honoring PCS present bits
Move out PCS handling from piix_sata_prereset() into piix_sata_present_mask() and use it from newly implemented piix_sata_softreset(). Class codes for devices which are indicated to be absent by PCS are cleared to ATA_DEV_NONE. This fixes ghost device problem reported on ICH6 and 7.
This patch moves PCS handling from prereset to softreset, which makes two behavior changes.
* perform softreset even when PCS indicates no device
* PCS handling is repeated before retrying softresets due to reset failures.
Both behavior changes are intended and more consistent with how other drivers behave.
---
This patch fixes ghost device problem on my machine and also somehow allows me to warm plug the second slot successfully (e.g. if PM is occupied and PS not, I couldn't warm plug PS, but with this patch, it works).
This patch is against upstream + set-PIO-0-patch + all hotplug patches, and is also available from for-jeff git tree, tagged with fj-ata_piix-fix-ghost.
drivers/scsi/ata_piix.c | 51 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 39 insertions(+), 12 deletions(-)
cafaa04becd7fa90c562d4af10513c0acdc7fe7c
drivers/scsi/ata_piix.c +39 -12
@@ -491,21 +491,20 @@ static void piix_pata_error_handler(stru }/** -* piix_sata_prereset - prereset for SATA host controller +* piix_sata_present_mask - determine present mask for SATA host controller * @ap: Target port * * Reads and configures SATA PCI device's PCI config register * Port Configuration and Status (PCS) to determine port and -* device availability. Return -ENODEV to skip reset if no -* device is present. +* device availability. * * LOCKING: -* None (inherited from caller). +* Kernel thread context (may sleep). * * RETURNS: -* 0 if device is present, -ENODEV otherwise. +* determined present_mask */ -static int piix_sata_prereset (struct ata_port *ap) +static unsigned int piix_sata_present_mask (struct ata_port *ap) {struct pci_dev *pdev =to_pci_dev (ap->host_set->dev);const unsigned int *map = ap->host_set->private_data;
@@ -547,18 +546,46 @@ static int piix_sata_prereset(struct ataDPRINTK ("ata%u: LEAVE, pcs=0x%x present_mask=0x%x\n" , ap->id, pcs, present_mask); -if (!present_mask) { -ata_port_printk (ap,KERN_INFO ,"SATA port has no device.\n" ); - ap->eh_context.i.action &= ~ATA_EH_RESET_MASK ; -return 0 ; +return present_mask; +} + +/** +* piix_sata_softreset - reset SATA host port via ATA SRST +* @ap: port to reset +* @classes: resulting classes of attached devices +* +* Reset SATA host port via ATA SRST. On controllers with +* reliable PCS present bits, the bits are used to determine +* device presence. +* +* LOCKING: +* Kernel thread context (may sleep) +* +* RETURNS: +* 0 on success, -errno otherwise. +*/ +static int piix_sata_softreset (struct ata_port *ap,unsigned int *classes) +{ +unsigned int present_mask; +int i, rc; + + present_mask =piix_sata_present_mask (ap); + + rc =ata_std_softreset (ap, classes); +if (rc) +return rc; + +for (i =0 ; i <ATA_MAX_DEVICES ; i++) { +if (!(present_mask & (1 << i))) + classes[i] =ATA_DEV_NONE ; } -return ata_std_prereset (ap); +return 0 ; }static void piix_sata_error_handler (struct ata_port *ap) { -ata_bmdma_drive_eh (ap, piix_sata_prereset, ata_std_softreset,NULL , +ata_bmdma_drive_eh (ap, ata_std_prereset, piix_sata_softreset,NULL , ata_std_postreset); }
Signature · 1 line
1.3.2