Re: set pio timing in pata_atiixp.c

[Jeff Garzik <jeff@xxxxxxxxxx>]

Edward Shao wrote:
> Hi all,
> I read linux-2.6.25 stable
>
> In function drivers/ata/pata_atiixp.c:atiixp_set_pio_timing()
> 	I see
>  	pci_read_config_word(pdev, ATIIXP_IDE_PIO_TIMING, &pio_timing_data);
> 	pio_mode_data &= ~(0xFF << timing_shift);
> 	pio_mode_data |= (pio_timings[pio] << timing_shift);
> 	pci_write_config_word(pdev, ATIIXP_IDE_PIO_TIMING, pio_timing_data);
>
> 	but I think it should be
>
>  	pci_read_config_word(pdev, ATIIXP_IDE_PIO_TIMING, &pio_timing_data);
> 	pio_timing_data &= ~(0xFF << timing_shift);
> 	pio_timing_data |= (pio_timings[pio] << timing_shift);
> 	pci_write_config_word(pdev, ATIIXP_IDE_PIO_TIMING, pio_timing_data);

Yes, it certainly appears you noticed a bug...

Presumably the attached patch fixes?

	Jeff



diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index 408bdc1..780144f 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -93,8 +93,8 @@ static void atiixp_set_pio_timing(struct ata_port *ap, struct ata_device *adev,
 	pci_write_config_word(pdev, ATIIXP_IDE_PIO_MODE, pio_mode_data);
 
 	pci_read_config_word(pdev, ATIIXP_IDE_PIO_TIMING, &pio_timing_data);
-	pio_mode_data &= ~(0xFF << timing_shift);
-	pio_mode_data |= (pio_timings[pio] << timing_shift);
+	pio_timing_data &= ~(0xFF << timing_shift);
+	pio_timing_data |= (pio_timings[pio] << timing_shift);
 	pci_write_config_word(pdev, ATIIXP_IDE_PIO_TIMING, pio_timing_data);
 }