Use correct SATA driver for (some) MacPros

[Christian Kellner]

There is a simple line missing in ahci.c so the ahci driver can claim to be responsible for the esb2 chip:
(I am on edgy and the kernel I patched and tested it is 2.6.17-10)

------- snip ----

--- ahci-old.c 2006-10-06 23:17:19.000000000 +0200
+++ ahci.c 2006-10-06 23:17:35.000000000 +0200
@@ -293,6 +293,8 @@
          board_ahci }, /* ICH7R */
        { PCI_VENDOR_ID_AL, 0x5288, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
          board_ahci }, /* ULi M5288 */
+ { PCI_VENDOR_ID_INTEL, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* ESB2 */
        { PCI_VENDOR_ID_INTEL, 0x2681, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
          board_ahci }, /* ESB2 */
        { PCI_VENDOR_ID_INTEL, 0x2682, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

Note: the original reporter indicated the bug was in package 'kernel-image'; however, that package was not published in Ubuntu.

[Ben Collins (ben-collins)]

Is this a regression from dapper? If so, please test the latest edgy kernel and see if that ata_piix works better for you.

The PCI ID you have is already claimed by ata_piix, so I am reluctant to duplicate it. It can only be in one place or the other.

[Christian Kellner (gicmo)]

No, the error actually is that ata_piix is used while ahci *should* be used for it. If I use the ata_piix driver for it, it only detects 4 of the 6 available ports and the speed is WAY slower. My own patched kernel is running nice and smoothly here. I guess the ata_piix claiming to be responsible for it is just wrong but it also looks like they are compatible enough that one can handle the other without too many problems. Maybe that issue should be brought up at the lkml. Some intel guy reading the ml might know better.

[Ben Collins (ben-collins)]

I'm a little concerned about this breaking setups that work with ata_piix, but at least with this, folks can blacklist whichever one doesn't work.

[Tollef Fog Heen (tfheen)]

linux-source-2.6.17 (2.6.17-10.33) edgy; urgency=low

  * Fix build failure

  [2.6.17-10.32]

  * ia64: Fix merge error for CVE-2006-3741. Caused a FTBFS.
  * Re-add ipw2200 quiesce patch.
  * Revert "usb/unusual: Add Domain Tech as GO_SLOW".
  * general: Quieten some more messages.
  * prism2: Commented out devices from MODULE_DEV_TABLE that are supported by
    hostap.
    - Malone #62685
  * pcbios: Cherry pick fix for PCBIOS PCI probing:
    Upstream GIT-SHA: 954c0b7cd5b9aaa11fb67a0c011fcb5e5897385a
    - Malone #60231
  * sdhci: Cherry pick fix for some devices, avoid reset in certain cases.
    Upstream GIT-SHA: 8a4da1430f7f2a16df3be9c7b5d55ba4e75b708c
    - Malone #63553
  * ahci: Add Intel 2680 device.
    - Malone #64433
  * hdaps: Re-implement lost dapper patch for y-only axis swapping. Add X41 as
    y-only.
    - Malone #58742
  * Enable all V4L1 modules.
    - Malone #58742

 -- Ben Collins <email address hidden> Wed, 11 Oct 2006 17:05:07 -0400

[Ben Collins (ben-collins)]

Please retest against 2.6.20-2 when it is available in the feisty archive.

[Christian Kellner (gicmo)]

Works fine here now! Thanks!