From: Albert Lee <albertcc@tw.ibm.com>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: Tejun Heo <htejun@gmail.com>,
linux-ide@vger.kernel.org, Doug Maxey <dwm@maxeymade.com>
Subject: [PATCH 1/1] libata: minor fix for irq-pio merge
Date: Tue, 23 May 2006 18:12:30 +0800 [thread overview]
Message-ID: <4472E00E.30000@tw.ibm.com> (raw)
In-Reply-To: <4472DE75.6010507@tw.ibm.com>
Minor fix to put the ATA_FLAG_NO_ATAPI flag back.
Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
---
The ATA_FLAG_NO_ATAPI flag seems lost by auto merge.
In addtional to the lost ATA_FLAG_NO_ATAPI flag, there is a
extra if() block in sata_vsc.c which is not related to libata.
Maybe it is from somewhere else?
Patch against the libata-dev upstream branch
(b74ba22f030eb7ab88f7d8954ad18ecc0ac5ce3c).
diff -Nrup upstream0/drivers/scsi/sata_mv.c minor_fix/drivers/scsi/sata_mv.c
--- upstream0/drivers/scsi/sata_mv.c 2006-05-23 17:46:51.000000000 +0800
+++ minor_fix/drivers/scsi/sata_mv.c 2006-05-23 17:51:32.000000000 +0800
@@ -93,7 +93,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_PIO_POLLING),
+ ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING),
MV_6XXX_FLAGS = MV_FLAG_IRQ_COALESCE,
CRQB_FLAG_READ = (1 << 0),
diff -Nrup upstream0/drivers/scsi/sata_sx4.c minor_fix/drivers/scsi/sata_sx4.c
--- upstream0/drivers/scsi/sata_sx4.c 2006-05-23 17:46:51.000000000 +0800
+++ minor_fix/drivers/scsi/sata_sx4.c 2006-05-23 17:52:10.000000000 +0800
@@ -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_PIO_POLLING,
+ ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING,
.pio_mask = 0x1f, /* pio0-4 */
.mwdma_mask = 0x07, /* mwdma0-2 */
.udma_mask = 0x7f, /* udma0-6 ; FIXME */
next prev parent reply other threads:[~2006-05-23 10:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-11 13:33 [PATCHSET 04/11] merge irq-pio Tejun Heo
2006-05-11 13:33 ` [PATCH] libata: fix irq-pio merge Tejun Heo
2006-05-11 13:33 ` [PATCH] libata: merge irq-pio Tejun Heo
2006-05-23 10:05 ` Albert Lee
2006-05-23 10:12 ` Albert Lee [this message]
2006-05-23 20:09 ` Jeff Garzik
2006-05-26 8:14 ` Albert Lee
2006-05-27 0:53 ` Tejun Heo
2006-05-13 22:11 ` [PATCHSET 04/11] " Jeff Garzik
2006-05-16 10:00 ` Albert Lee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4472E00E.30000@tw.ibm.com \
--to=albertcc@tw.ibm.com \
--cc=albertl@mail.com \
--cc=dwm@maxeymade.com \
--cc=htejun@gmail.com \
--cc=jgarzik@pobox.com \
--cc=linux-ide@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.