[PATCH] ata_piix: add a couple of flags

Add PIIX_FLAG_IGN_PRESENT and SCR flags.  Thi patch doesn't cause any
functional change.  To be used by later init/scr updates.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 5988d5fe1e18c1b9527f2009b3e8df698cf8b7bb..987a7ccac91755ea27b4483f57253dacffd3f6df 100644 (file)
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -101,6 +101,8 @@ enum {
        ICH5_PCS                = 0x92, /* port control and status */
        PIIX_SCC                = 0x0A, /* sub-class code register */
 
+       PIIX_FLAG_IGN_PRESENT   = (1 << 25), /* ignore PCS present bits */
+       PIIX_FLAG_SCR           = (1 << 26), /* SCR available */
        PIIX_FLAG_AHCI          = (1 << 27), /* AHCI possible */
        PIIX_FLAG_CHECKINTR     = (1 << 28), /* make sure PCI INTx enabled */
        PIIX_FLAG_COMBINED      = (1 << 29), /* combined mode possible */
@@ -314,7 +316,7 @@ static struct ata_port_info piix_port_info[] = {
        {
                .sht            = &piix_sht,
                .host_flags     = ATA_FLAG_SATA | PIIX_FLAG_COMBINED |
-                                 PIIX_FLAG_CHECKINTR,
+                                 PIIX_FLAG_CHECKINTR | PIIX_FLAG_IGN_PRESENT,
                .pio_mask       = 0x1f, /* pio0-4 */
                .mwdma_mask     = 0x07, /* mwdma0-2 */
                .udma_mask      = 0x7f, /* udma0-6 */
@@ -325,7 +327,8 @@ static struct ata_port_info piix_port_info[] = {
        {
                .sht            = &piix_sht,
                .host_flags     = ATA_FLAG_SATA | PIIX_FLAG_COMBINED_ICH6 |
-                                 PIIX_FLAG_CHECKINTR | ATA_FLAG_SLAVE_POSS,
+                                 PIIX_FLAG_CHECKINTR | ATA_FLAG_SLAVE_POSS |
+                                 PIIX_FLAG_SCR,
                .pio_mask       = 0x1f, /* pio0-4 */
                .mwdma_mask     = 0x07, /* mwdma0-2 */
                .udma_mask      = 0x7f, /* udma0-6 */
@@ -337,7 +340,7 @@ static struct ata_port_info piix_port_info[] = {
                .sht            = &piix_sht,
                .host_flags     = ATA_FLAG_SATA | PIIX_FLAG_COMBINED_ICH6 |
                                  PIIX_FLAG_CHECKINTR | ATA_FLAG_SLAVE_POSS |
-                                 PIIX_FLAG_AHCI,
+                                 PIIX_FLAG_SCR | PIIX_FLAG_AHCI,
                .pio_mask       = 0x1f, /* pio0-4 */
                .mwdma_mask     = 0x07, /* mwdma0-2 */
                .udma_mask      = 0x7f, /* udma0-6 */
@@ -349,7 +352,7 @@ static struct ata_port_info piix_port_info[] = {
                .sht            = &piix_sht,
                .host_flags     = ATA_FLAG_SATA | PIIX_FLAG_COMBINED_ICH6 |
                                  PIIX_FLAG_CHECKINTR | ATA_FLAG_SLAVE_POSS |
-                                 PIIX_FLAG_AHCI,
+                                 PIIX_FLAG_SCR | PIIX_FLAG_AHCI,
                .pio_mask       = 0x1f, /* pio0-4 */
                .mwdma_mask     = 0x07, /* mwdma0-2 */
                .udma_mask      = 0x7f, /* udma0-6 */