Skip to contentSkip to conversation

Linux Secondary Slave IDE timings

PATCH In review Daniel Quinlan 3 participants 3 messages Feb 26, 2002

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Linux Secondary Slave IDE timings

This fix is from Dave Bogdanoff <[email protected]>.

Linux incorrectly sets up IDE timings for secondary slave drives on PC systems that use Intel PIIX Southbridges.

This will correctly shift IDE slave PCI timings for register 44h so that:

- secondary slave (drive1) uses bits 4-7
- primary slave (drive1) uses bits 0-3

(The addition of the parentheses is needed so the shift will take place after the bitwise-or. Without the parentheses, the shift will incorrectly always take place before the bitwise-or.)

drivers/ide/piix.c renamed from drivers/ide/piix.c.orig +2 -2
@@ -258,8 +258,8 @@
 			master_data = master_data | 0x0070;
 		pci_read_config_byte(HWIF(drive)->pci_dev, slave_port, &slave_data);
 		slave_data = slave_data & (HWIF(drive)->index ? 0x0f : 0xf0);
-		slave_data = slave_data | ((timings[pio][0] << 2) | (timings[pio][1]
-					   << (HWIF(drive)->index ? 4 : 0)));
+		slave_data = slave_data | (((timings[pio][0] << 2) | timings[pio][1])
+					   << (HWIF(drive)->index ? 4 : 0));
 	} else {
 		master_data = master_data & 0xccf8;
 		if (pio > 1)
#1 lore raw

It is a valid and correct fix.
There must have been a bug or something in an odd compiler, but the reason for the <> | order problem escapes me now.
The verification came from a commumication I had with the author of the Intel programmer docs.

I hope my comments do not kill the patch.

Regards,

Andre Hedrick
Linux Disk Certification Project Linux ATA Development

Quoted 34 lines · Daniel Quinlan

This fix is from Dave Bogdanoff <[email protected]>.

Linux incorrectly sets up IDE timings for secondary slave drives on PC systems that use Intel PIIX Southbridges.

This will correctly shift IDE slave PCI timings for register 44h so that:

- secondary slave (drive1) uses bits 4-7
- primary slave (drive1) uses bits 0-3

(The addition of the parentheses is needed so the shift will take place after the bitwise-or. Without the parentheses, the shift will incorrectly always take place before the bitwise-or.)

drivers/ide/piix.c renamed from drivers/ide/piix.c.orig +2 -3
@@ -258,8 +258,8 @@
 			master_data = master_data | 0x0070;
 		pci_read_config_byte(HWIF(drive)->pci_dev, slave_port, &slave_data);
 		slave_data = slave_data & (HWIF(drive)->index ? 0x0f : 0xf0);
-		slave_data = slave_data | ((timings[pio][0] << 2) | (timings[pio][1]
-					   << (HWIF(drive)->index ? 4 : 0)));
+		slave_data = slave_data | (((timings[pio][0] << 2) | timings[pio][1])
+					   << (HWIF(drive)->index ? 4 : 0));
 	} else {
 		master_data = master_data & 0xccf8;
 		if (pio > 1)
-

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#2 lore raw
Quoted 7 lines · Andre Hedrick

It is a valid and correct fix.
There must have been a bug or something in an odd compiler, but the reason for the <> | order problem escapes me now.
The verification came from a commumication I had with the author of the Intel programmer docs.

I hope my comments do not kill the patch.

Certainly NOT. Thank's for confirmation.