diff options
| -rw-r--r-- | drivers/ata/ahci.c | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 4d9373e509cc..062e6a1a248f 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
| @@ -105,31 +105,27 @@ static struct ata_port_operations ahci_p5wdh_ops = { | |||
| 105 | 105 | ||
| 106 | static const struct ata_port_info ahci_port_info[] = { | 106 | static const struct ata_port_info ahci_port_info[] = { |
| 107 | /* by features */ | 107 | /* by features */ |
| 108 | [board_ahci] = | 108 | [board_ahci] = { |
| 109 | { | ||
| 110 | .flags = AHCI_FLAG_COMMON, | 109 | .flags = AHCI_FLAG_COMMON, |
| 111 | .pio_mask = ATA_PIO4, | 110 | .pio_mask = ATA_PIO4, |
| 112 | .udma_mask = ATA_UDMA6, | 111 | .udma_mask = ATA_UDMA6, |
| 113 | .port_ops = &ahci_ops, | 112 | .port_ops = &ahci_ops, |
| 114 | }, | 113 | }, |
| 115 | [board_ahci_ign_iferr] = | 114 | [board_ahci_ign_iferr] = { |
| 116 | { | ||
| 117 | AHCI_HFLAGS (AHCI_HFLAG_IGN_IRQ_IF_ERR), | 115 | AHCI_HFLAGS (AHCI_HFLAG_IGN_IRQ_IF_ERR), |
| 118 | .flags = AHCI_FLAG_COMMON, | 116 | .flags = AHCI_FLAG_COMMON, |
| 119 | .pio_mask = ATA_PIO4, | 117 | .pio_mask = ATA_PIO4, |
| 120 | .udma_mask = ATA_UDMA6, | 118 | .udma_mask = ATA_UDMA6, |
| 121 | .port_ops = &ahci_ops, | 119 | .port_ops = &ahci_ops, |
| 122 | }, | 120 | }, |
| 123 | [board_ahci_nosntf] = | 121 | [board_ahci_nosntf] = { |
| 124 | { | ||
| 125 | AHCI_HFLAGS (AHCI_HFLAG_NO_SNTF), | 122 | AHCI_HFLAGS (AHCI_HFLAG_NO_SNTF), |
| 126 | .flags = AHCI_FLAG_COMMON, | 123 | .flags = AHCI_FLAG_COMMON, |
| 127 | .pio_mask = ATA_PIO4, | 124 | .pio_mask = ATA_PIO4, |
| 128 | .udma_mask = ATA_UDMA6, | 125 | .udma_mask = ATA_UDMA6, |
| 129 | .port_ops = &ahci_ops, | 126 | .port_ops = &ahci_ops, |
| 130 | }, | 127 | }, |
| 131 | [board_ahci_yes_fbs] = | 128 | [board_ahci_yes_fbs] = { |
| 132 | { | ||
| 133 | AHCI_HFLAGS (AHCI_HFLAG_YES_FBS), | 129 | AHCI_HFLAGS (AHCI_HFLAG_YES_FBS), |
| 134 | .flags = AHCI_FLAG_COMMON, | 130 | .flags = AHCI_FLAG_COMMON, |
| 135 | .pio_mask = ATA_PIO4, | 131 | .pio_mask = ATA_PIO4, |
| @@ -137,8 +133,7 @@ static const struct ata_port_info ahci_port_info[] = { | |||
| 137 | .port_ops = &ahci_ops, | 133 | .port_ops = &ahci_ops, |
| 138 | }, | 134 | }, |
| 139 | /* by chipsets */ | 135 | /* by chipsets */ |
| 140 | [board_ahci_mcp65] = | 136 | [board_ahci_mcp65] = { |
| 141 | { | ||
| 142 | AHCI_HFLAGS (AHCI_HFLAG_NO_FPDMA_AA | AHCI_HFLAG_NO_PMP | | 137 | AHCI_HFLAGS (AHCI_HFLAG_NO_FPDMA_AA | AHCI_HFLAG_NO_PMP | |
| 143 | AHCI_HFLAG_YES_NCQ), | 138 | AHCI_HFLAG_YES_NCQ), |
| 144 | .flags = AHCI_FLAG_COMMON | ATA_FLAG_NO_DIPM, | 139 | .flags = AHCI_FLAG_COMMON | ATA_FLAG_NO_DIPM, |
| @@ -146,24 +141,21 @@ static const struct ata_port_info ahci_port_info[] = { | |||
| 146 | .udma_mask = ATA_UDMA6, | 141 | .udma_mask = ATA_UDMA6, |
| 147 | .port_ops = &ahci_ops, | 142 | .port_ops = &ahci_ops, |
| 148 | }, | 143 | }, |
| 149 | [board_ahci_mcp77] = | 144 | [board_ahci_mcp77] = { |
| 150 | { | ||
| 151 | AHCI_HFLAGS (AHCI_HFLAG_NO_FPDMA_AA | AHCI_HFLAG_NO_PMP), | 145 | AHCI_HFLAGS (AHCI_HFLAG_NO_FPDMA_AA | AHCI_HFLAG_NO_PMP), |
| 152 | .flags = AHCI_FLAG_COMMON, | 146 | .flags = AHCI_FLAG_COMMON, |
| 153 | .pio_mask = ATA_PIO4, | 147 | .pio_mask = ATA_PIO4, |
| 154 | .udma_mask = ATA_UDMA6, | 148 | .udma_mask = ATA_UDMA6, |
| 155 | .port_ops = &ahci_ops, | 149 | .port_ops = &ahci_ops, |
| 156 | }, | 150 | }, |
| 157 | [board_ahci_mcp89] = | 151 | [board_ahci_mcp89] = { |
| 158 | { | ||
| 159 | AHCI_HFLAGS (AHCI_HFLAG_NO_FPDMA_AA), | 152 | AHCI_HFLAGS (AHCI_HFLAG_NO_FPDMA_AA), |
| 160 | .flags = AHCI_FLAG_COMMON, | 153 | .flags = AHCI_FLAG_COMMON, |
| 161 | .pio_mask = ATA_PIO4, | 154 | .pio_mask = ATA_PIO4, |
| 162 | .udma_mask = ATA_UDMA6, | 155 | .udma_mask = ATA_UDMA6, |
| 163 | .port_ops = &ahci_ops, | 156 | .port_ops = &ahci_ops, |
| 164 | }, | 157 | }, |
| 165 | [board_ahci_mv] = | 158 | [board_ahci_mv] = { |
| 166 | { | ||
| 167 | AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_MSI | | 159 | AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_MSI | |
| 168 | AHCI_HFLAG_MV_PATA | AHCI_HFLAG_NO_PMP), | 160 | AHCI_HFLAG_MV_PATA | AHCI_HFLAG_NO_PMP), |
| 169 | .flags = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA, | 161 | .flags = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA, |
| @@ -171,8 +163,7 @@ static const struct ata_port_info ahci_port_info[] = { | |||
| 171 | .udma_mask = ATA_UDMA6, | 163 | .udma_mask = ATA_UDMA6, |
| 172 | .port_ops = &ahci_ops, | 164 | .port_ops = &ahci_ops, |
| 173 | }, | 165 | }, |
| 174 | [board_ahci_sb600] = | 166 | [board_ahci_sb600] = { |
| 175 | { | ||
| 176 | AHCI_HFLAGS (AHCI_HFLAG_IGN_SERR_INTERNAL | | 167 | AHCI_HFLAGS (AHCI_HFLAG_IGN_SERR_INTERNAL | |
| 177 | AHCI_HFLAG_NO_MSI | AHCI_HFLAG_SECT255 | | 168 | AHCI_HFLAG_NO_MSI | AHCI_HFLAG_SECT255 | |
| 178 | AHCI_HFLAG_32BIT_ONLY), | 169 | AHCI_HFLAG_32BIT_ONLY), |
| @@ -181,16 +172,14 @@ static const struct ata_port_info ahci_port_info[] = { | |||
| 181 | .udma_mask = ATA_UDMA6, | 172 | .udma_mask = ATA_UDMA6, |
| 182 | .port_ops = &ahci_pmp_retry_srst_ops, | 173 | .port_ops = &ahci_pmp_retry_srst_ops, |
| 183 | }, | 174 | }, |
| 184 | [board_ahci_sb700] = /* for SB700 and SB800 */ | 175 | [board_ahci_sb700] = { /* for SB700 and SB800 */ |
| 185 | { | ||
| 186 | AHCI_HFLAGS (AHCI_HFLAG_IGN_SERR_INTERNAL), | 176 | AHCI_HFLAGS (AHCI_HFLAG_IGN_SERR_INTERNAL), |
| 187 | .flags = AHCI_FLAG_COMMON, | 177 | .flags = AHCI_FLAG_COMMON, |
| 188 | .pio_mask = ATA_PIO4, | 178 | .pio_mask = ATA_PIO4, |
| 189 | .udma_mask = ATA_UDMA6, | 179 | .udma_mask = ATA_UDMA6, |
| 190 | .port_ops = &ahci_pmp_retry_srst_ops, | 180 | .port_ops = &ahci_pmp_retry_srst_ops, |
| 191 | }, | 181 | }, |
| 192 | [board_ahci_vt8251] = | 182 | [board_ahci_vt8251] = { |
| 193 | { | ||
| 194 | AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_PMP), | 183 | AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_PMP), |
| 195 | .flags = AHCI_FLAG_COMMON, | 184 | .flags = AHCI_FLAG_COMMON, |
| 196 | .pio_mask = ATA_PIO4, | 185 | .pio_mask = ATA_PIO4, |
