Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50630195 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata] mark certain hardware (or drivers) with a no-atapi flag 

Some hardware does not support the PACKET command at all.
Other hardware supports ATAPI, but the driver does something nasty such
as calling BUG() when an ATAPI command is issued.

For these such cases, we mark them with a new flag, ATA_FLAG_NO_ATAPI.

Initial version contributed by Ben Collins.
parent be0d9b6c

drivers/scsi/libata-scsi.c

+5 −2
Original line number Diff line number Diff line
@@ -2173,10 +2173,13 @@ ata_scsi_find_dev(struct ata_port *ap, const struct scsi_device *scsidev) 
	if (unlikely(!ata_dev_present(dev)))

		return NULL;



	if (!atapi_enabled) {

		if (unlikely(dev->class == ATA_DEV_ATAPI))

	if (!atapi_enabled || (ap->flags & ATA_FLAG_NO_ATAPI)) {

		if (unlikely(dev->class == ATA_DEV_ATAPI)) {

			printk(KERN_WARNING "ata%u(%u): WARNING: ATAPI is %s, device ignored.\n",

			       ap->id, dev->devno, atapi_enabled ? "not supported with this driver" : "disabled");

			return NULL;

		}

	}



	return dev;

}

drivers/scsi/sata_mv.c

+2 −1
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ enum { 
	MV_FLAG_DUAL_HC		= (1 << 30),  /* two SATA Host Controllers */

	MV_FLAG_IRQ_COALESCE	= (1 << 29),  /* IRQ coalescing capability */

	MV_COMMON_FLAGS		= (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO),

				   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO |

				   ATA_FLAG_NO_ATAPI),

	MV_6XXX_FLAGS		= MV_FLAG_IRQ_COALESCE,



	CRQB_FLAG_READ		= (1 << 0),

drivers/scsi/sata_promise.c

+6 −6
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ enum { 
	PDC_HAS_PATA		= (1 << 1), /* PDC20375 has PATA */



	PDC_RESET		= (1 << 11), /* HDMA reset */



	PDC_COMMON_FLAGS	= ATA_FLAG_NO_LEGACY | ATA_FLAG_SRST |

				  ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI,

};
@@ -162,8 +165,7 @@ static struct ata_port_info pdc_port_info[] = { 
	/* board_2037x */

	{

		.sht		= &pdc_ata_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_SRST | ATA_FLAG_MMIO,

		.host_flags	= PDC_COMMON_FLAGS | ATA_FLAG_SATA,

		.pio_mask	= 0x1f, /* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
@@ -173,8 +175,7 @@ static struct ata_port_info pdc_port_info[] = { 
	/* board_20319 */

	{

		.sht		= &pdc_ata_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_SRST | ATA_FLAG_MMIO,

		.host_flags	= PDC_COMMON_FLAGS | ATA_FLAG_SATA,

		.pio_mask	= 0x1f, /* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
@@ -184,8 +185,7 @@ static struct ata_port_info pdc_port_info[] = { 
	/* board_20619 */

	{

		.sht		= &pdc_ata_sht,

		.host_flags	= ATA_FLAG_NO_LEGACY | ATA_FLAG_SRST |

				  ATA_FLAG_MMIO | ATA_FLAG_SLAVE_POSS,

		.host_flags	= PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS,

		.pio_mask	= 0x1f, /* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

drivers/scsi/sata_sx4.c

+2 −1
Original line number Diff line number Diff line
@@ -220,7 +220,8 @@ static struct ata_port_info pdc_port_info[] = { 
	{

		.sht		= &pdc_sata_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_SRST | ATA_FLAG_MMIO,

				  ATA_FLAG_SRST | ATA_FLAG_MMIO |

				  ATA_FLAG_NO_ATAPI,

		.pio_mask	= 0x1f, /* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

include/linux/libata.h

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ enum { 
	ATA_FLAG_NOINTR		= (1 << 9), /* FIXME: Remove this once

					     * proper HSM is in place. */

	ATA_FLAG_DEBUGMSG	= (1 << 10),

	ATA_FLAG_NO_ATAPI	= (1 << 11), /* No ATAPI support */



	ATA_QCFLAG_ACTIVE	= (1 << 1), /* cmd not yet ack'd to scsi lyer */

	ATA_QCFLAG_SG		= (1 << 3), /* have s/g table? */