aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristen Carlson Accardi <kristen.c.accardi@intel.com>2007-08-15 04:11:25 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-12 14:55:33 -0400
commit2f2949680ad89d606db838340b17c30216c0bb0f (patch)
tree25d7918c7b846d151776bbdf6a111a1d241d6b05
parent9f45cbd3f0fc597530aaf85cad7fe52cd63f1fd8 (diff)
[libata] ahci: send event when AN received
When we get an SDB FIS with the 'N' bit set, we should send an event to user space to indicate that there has been a media change. This will be done via the scsi device. Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/ata/ahci.c24
-rw-r--r--drivers/ata/libata-scsi.c18
-rw-r--r--include/linux/libata.h1
3 files changed, 43 insertions, 0 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 483733783cf8..d52b73ab795a 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1368,6 +1368,30 @@ static void ahci_port_intr(struct ata_port *ap)
1368 return; 1368 return;
1369 } 1369 }
1370 1370
1371 if (status & PORT_IRQ_SDB_FIS) {
1372 /*
1373 * if this is an ATAPI device with AN turned on,
1374 * then we should interrogate the device to
1375 * determine the cause of the interrupt
1376 *
1377 * for AN - this we should check the SDB FIS
1378 * and find the I and N bits set
1379 */
1380 const __le32 *f = pp->rx_fis + RX_FIS_SDB;
1381 u32 f0 = le32_to_cpu(f[0]);
1382
1383 /* check the 'N' bit in word 0 of the FIS */
1384 if (f0 & (1 << 15)) {
1385 int port_addr = ((f0 & 0x00000f00) >> 8);
1386 struct ata_device *adev;
1387 if (port_addr < ATA_MAX_DEVICES) {
1388 adev = &ap->link.device[port_addr];
1389 if (adev->flags & ATA_DFLAG_AN)
1390 ata_scsi_media_change_notify(adev);
1391 }
1392 }
1393 }
1394
1371 if (ap->link.sactive) 1395 if (ap->link.sactive)
1372 qc_active = readl(port_mmio + PORT_SCR_ACT); 1396 qc_active = readl(port_mmio + PORT_SCR_ACT);
1373 else 1397 else
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 7d66c986a54c..f0f586b56c20 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3160,6 +3160,24 @@ static void ata_scsi_handle_link_detach(struct ata_link *link)
3160} 3160}
3161 3161
3162/** 3162/**
3163 * ata_scsi_media_change_notify - send media change event
3164 * @atadev: Pointer to the disk device with media change event
3165 *
3166 * Tell the block layer to send a media change notification
3167 * event.
3168 *
3169 * LOCKING:
3170 * interrupt context, may not sleep.
3171 */
3172void ata_scsi_media_change_notify(struct ata_device *atadev)
3173{
3174#ifdef OTHER_AN_PATCHES_HAVE_BEEN_APPLIED
3175 scsi_device_event_notify(atadev->sdev, SDEV_MEDIA_CHANGE);
3176#endif
3177}
3178EXPORT_SYMBOL_GPL(ata_scsi_media_change_notify);
3179
3180/**
3163 * ata_scsi_hotplug - SCSI part of hotplug 3181 * ata_scsi_hotplug - SCSI part of hotplug
3164 * @work: Pointer to ATA port to perform SCSI hotplug on 3182 * @work: Pointer to ATA port to perform SCSI hotplug on
3165 * 3183 *
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 6dd5b437210d..d98e8b50e20c 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -755,6 +755,7 @@ extern void ata_host_init(struct ata_host *, struct device *,
755extern int ata_scsi_detect(struct scsi_host_template *sht); 755extern int ata_scsi_detect(struct scsi_host_template *sht);
756extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); 756extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
757extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); 757extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
758extern void ata_scsi_media_change_notify(struct ata_device *atadev);
758extern void ata_sas_port_destroy(struct ata_port *); 759extern void ata_sas_port_destroy(struct ata_port *);
759extern struct ata_port *ata_sas_port_alloc(struct ata_host *, 760extern struct ata_port *ata_sas_port_alloc(struct ata_host *,
760 struct ata_port_info *, struct Scsi_Host *); 761 struct ata_port_info *, struct Scsi_Host *);