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

Commit 8b132f4e authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master'

parents d22a8ccf 65ab592d

drivers/scsi/libata-scsi.c

+5 −2
Original line number Original line 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)))

	if (unlikely(!ata_dev_present(dev)))

		return NULL;

		return NULL;





	if (!atapi_enabled) {

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

		if (unlikely(dev->class == ATA_DEV_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 NULL;

		}

		}

	}





	return dev;

	return dev;

}

}

drivers/scsi/sata_mv.c

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

	MV_FLAG_DUAL_HC		= (1 << 30),  /* two SATA Host Controllers */

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

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

	MV_COMMON_FLAGS		= (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

	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,

	MV_6XXX_FLAGS		= MV_FLAG_IRQ_COALESCE,





	CRQB_FLAG_READ		= (1 << 0),

	CRQB_FLAG_READ		= (1 << 0),

drivers/scsi/sata_promise.c

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

	PDC_HAS_PATA		= (1 << 1), /* PDC20375 has PATA */





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

	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 */

	/* board_2037x */

	{

	{

		.sht		= &pdc_ata_sht,

		.sht		= &pdc_ata_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

		.host_flags	= PDC_COMMON_FLAGS | ATA_FLAG_SATA,

				  ATA_FLAG_SRST | ATA_FLAG_MMIO,

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

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

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

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

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

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

	/* board_20319 */

	{

	{

		.sht		= &pdc_ata_sht,

		.sht		= &pdc_ata_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

		.host_flags	= PDC_COMMON_FLAGS | ATA_FLAG_SATA,

				  ATA_FLAG_SRST | ATA_FLAG_MMIO,

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

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

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

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

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

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

	/* board_20619 */

	{

	{

		.sht		= &pdc_ata_sht,

		.sht		= &pdc_ata_sht,

		.host_flags	= ATA_FLAG_NO_LEGACY | ATA_FLAG_SRST |

		.host_flags	= PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS,

				  ATA_FLAG_MMIO | ATA_FLAG_SLAVE_POSS,

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

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

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

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

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

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

drivers/scsi/sata_sx4.c

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

	{

		.sht		= &pdc_sata_sht,

		.sht		= &pdc_sata_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

		.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 */

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

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

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

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

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

include/asm-ia64/sal.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -320,7 +320,8 @@ typedef struct sal_log_timestamp { 
typedef struct sal_log_record_header {

typedef struct sal_log_record_header {

	u64 id;				/* Unique monotonically increasing ID */

	u64 id;				/* Unique monotonically increasing ID */

	sal_log_revision_t revision;	/* Major and Minor revision of header */

	sal_log_revision_t revision;	/* Major and Minor revision of header */

	u16 severity;			/* Error Severity */

	u8 severity;			/* Error Severity */

	u8 validation_bits;		/* 0: platform_guid, 1: !timestamp */

	u32 len;			/* Length of this error log in bytes */

	u32 len;			/* Length of this error log in bytes */

	sal_log_timestamp_t timestamp;	/* Timestamp */

	sal_log_timestamp_t timestamp;	/* Timestamp */

	efi_guid_t platform_guid;	/* Unique OEM Platform ID */

	efi_guid_t platform_guid;	/* Unique OEM Platform ID */