Tejun Heo wrote:
> Merge irq-pio.
>
<snip>
> diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
> index 5b7fea5..56105a1 100644
> --- a/drivers/scsi/sata_mv.c
> +++ b/drivers/scsi/sata_mv.c
> @@ -87,7 +87,7 @@ enum {
> 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_NO_ATAPI),
> + ATA_FLAG_PIO_POLLING),
> MV_6XXX_FLAGS = MV_FLAG_IRQ_COALESCE,
>
> CRQB_FLAG_READ = (1 << 0),
The ATA_FLAG_NO_ATAPI flag is lost by automatic merge.
> diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
> index 96d7b73..70a6954 100644
> --- a/drivers/scsi/sata_sx4.c
> +++ b/drivers/scsi/sata_sx4.c
> @@ -218,7 +218,7 @@ static const struct ata_port_info pdc_po
> .sht = &pdc_sata_sht,
> .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
> ATA_FLAG_SRST | ATA_FLAG_MMIO |
> - ATA_FLAG_NO_ATAPI,
> + ATA_FLAG_PIO_POLLING,
> .pio_mask = 0x1f, /* pio0-4 */
> .mwdma_mask = 0x07, /* mwdma0-2 */
> .udma_mask = 0x7f, /* udma0-6 ; FIXME */
The ATA_FLAG_NO_ATAPI flag is lost.
> }
> diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
> index 9646c39..0372be7 100644
> --- a/drivers/scsi/sata_vsc.c
> +++ b/drivers/scsi/sata_vsc.c
> @@ -221,14 +221,21 @@ static irqreturn_t vsc_sata_interrupt (i
>
> ap = host_set->ports[i];
>
> - if (ap && !(ap->flags &
> - (ATA_FLAG_DISABLED|ATA_FLAG_NOINTR))) {
> + if (is_vsc_sata_int_err(i, int_status)) {
> + u32 err_status;
> + printk(KERN_DEBUG "%s: ignoring interrupt(s)\n", __FUNCTION__);
> + err_status = ap ? vsc_sata_scr_read(ap, SCR_ERROR) : 0;
> + vsc_sata_scr_write(ap, SCR_ERROR, err_status);
> + handled++;
> + }
> +
> + if (ap && !(ap->flags & ATA_FLAG_DISABLED)) {
> struct ata_queued_cmd *qc;
>
The if(is_vsc_sata_int_err(i, int_status)) { } block is not irq-pio related.
Maybe it is from somewhere else?
Will submit a minor patch to put the ATA_FLAG_NO_ATAPI back.
--
albert
-
: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
