ahci can drive the Promise PDC42819, but obviously it can only use SATA disks connected to this controller. The controller can actually support SAS disks as well, but at the moment only with Promise's own binary t3sas driver. To allow users to use both the ahci and the t3sas drivers in the same system (with t3sas controlling the PDC42819) we add a parameter, promise_enable that can be used to disable ahci on the Promise chip (by setting it to 0). This way even if the ahci driver is loaded first the t3sas driver can grab the Promise chip and the user's SAS disks will be operational. By default the parameter is 1 so ahci drives the controller. While we're at it, add a message letting users know that with ahci driving their Promise chip they won't be able to use their SAS disks. Signed-off-by: Mark Nelson <mdnelson8@xxxxxxxxx> --- drivers/ata/ahci.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) Index: linux-2.6/drivers/ata/ahci.c =================================================================== --- linux-2.6.orig/drivers/ata/ahci.c +++ linux-2.6/drivers/ata/ahci.c @@ -700,6 +700,9 @@ static int marvell_enable = 1; module_param(marvell_enable, int, 0644); MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 = enabled)"); +static int promise_enable = 1; +module_param(promise_enable, int, 0644); +MODULE_PARM_DESC(promise_enable, "Promise PDC42819 via AHCI (1 = enabled)"); static inline int ahci_nr_ports(u32 cap) { @@ -2988,6 +2991,26 @@ static int ahci_init_one(struct pci_dev if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable) return -ENODEV; + /* Promise's PDC42819 is a SAS/SATA controller that has an AHCI mode. + * At the moment, Promise's t3sas driver is required for SAS + * functionality. Disable ahci on this device if the user asked for + * it. + */ + if (pdev->vendor == PCI_VENDOR_ID_PROMISE) { + if (promise_enable) { + dev_printk(KERN_INFO, &pdev->dev, "Promise PDC42819 " + "support enabled\n"); + dev_printk(KERN_INFO, &pdev->dev, "Only SATA devices " + "will function with" + " this driver\n"); + + } else { + dev_printk(KERN_INFO, &pdev->dev, "Promise PDC42819 " + "support disabled\n"); + return -ENODEV; + } + } + /* acquire resources */ rc = pcim_enable_device(pdev); if (rc) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html