@@ -110,7 +110,8 @@ enum {
PIIX_FLAG_SIDPR = (1 << 29), /* SATA idx/data pair regs */
PIIX_PATA_FLAGS = ATA_FLAG_SLAVE_POSS,
- PIIX_SATA_FLAGS = ATA_FLAG_SATA | PIIX_FLAG_CHECKINTR,
+ PIIX_SATA_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_SATA_HOTPLUG |
+ PIIX_FLAG_CHECKINTR,
PIIX_80C_PRI = (1 << 5) | (1 << 4),
PIIX_80C_SEC = (1 << 7) | (1 << 6),
@@ -274,7 +274,8 @@ static const struct ata_port_info pdc_port_info[] = {
{
.flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
ATA_FLAG_SRST | ATA_FLAG_MMIO |
- ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING,
+ ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING |
+ ATA_FLAG_NO_SATA_HOTPLUG,
.pio_mask = ATA_PIO4,
.mwdma_mask = ATA_MWDMA2,
.udma_mask = ATA_UDMA6,
SATA is generally hotpluggable, though some controllers don't expose enough information to make it possible. Flag those controllers appropriately. Signed-off-by: Matthew Garrett <mjg@redhat.com> --- drivers/ata/ata_piix.c | 3 ++- drivers/ata/sata_sx4.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)