Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d5eb435 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
  ide: Serialize CMD643 and CMD646 to fix a hardware bug with SSD
parents 49b2de8e 9bd7496f

drivers/ide/cmd64x.c

+4 −2
Original line number Diff line number Diff line
@@ -379,7 +379,8 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { 
		.enablebits	= {{0x00,0x00,0x00}, {0x51,0x08,0x08}},

		.port_ops	= &cmd64x_port_ops,

		.host_flags	= IDE_HFLAG_CLEAR_SIMPLEX |

				  IDE_HFLAG_ABUSE_PREFETCH,

				  IDE_HFLAG_ABUSE_PREFETCH |

				  IDE_HFLAG_SERIALIZE,

		.pio_mask	= ATA_PIO5,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= 0x00, /* no udma */
@@ -389,7 +390,8 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { 
		.init_chipset	= init_chipset_cmd64x,

		.enablebits	= {{0x51,0x04,0x04}, {0x51,0x08,0x08}},

		.port_ops	= &cmd648_port_ops,

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH,

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH |

				  IDE_HFLAG_SERIALIZE,

		.pio_mask	= ATA_PIO5,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA2,