aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/ahci.c80
1 files changed, 67 insertions, 13 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index fc5263c6b102..1799233dcf9f 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -39,7 +39,7 @@
39#include <asm/io.h> 39#include <asm/io.h>
40 40
41#define DRV_NAME "ahci" 41#define DRV_NAME "ahci"
42#define DRV_VERSION "1.00" 42#define DRV_VERSION "1.01"
43 43
44 44
45enum { 45enum {
@@ -134,6 +134,9 @@ enum {
134 PORT_CMD_ICC_ACTIVE = (0x1 << 28), /* Put i/f in active state */ 134 PORT_CMD_ICC_ACTIVE = (0x1 << 28), /* Put i/f in active state */
135 PORT_CMD_ICC_PARTIAL = (0x2 << 28), /* Put i/f in partial state */ 135 PORT_CMD_ICC_PARTIAL = (0x2 << 28), /* Put i/f in partial state */
136 PORT_CMD_ICC_SLUMBER = (0x6 << 28), /* Put i/f in slumber state */ 136 PORT_CMD_ICC_SLUMBER = (0x6 << 28), /* Put i/f in slumber state */
137
138 /* hpriv->flags bits */
139 AHCI_FLAG_MSI = (1 << 0),
137}; 140};
138 141
139struct ahci_cmd_hdr { 142struct ahci_cmd_hdr {
@@ -183,6 +186,7 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc);
183static u8 ahci_check_status(struct ata_port *ap); 186static u8 ahci_check_status(struct ata_port *ap);
184static u8 ahci_check_err(struct ata_port *ap); 187static u8 ahci_check_err(struct ata_port *ap);
185static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc); 188static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
189static void ahci_remove_one (struct pci_dev *pdev);
186 190
187static Scsi_Host_Template ahci_sht = { 191static Scsi_Host_Template ahci_sht = {
188 .module = THIS_MODULE, 192 .module = THIS_MODULE,
@@ -272,7 +276,7 @@ static struct pci_driver ahci_pci_driver = {
272 .name = DRV_NAME, 276 .name = DRV_NAME,
273 .id_table = ahci_pci_tbl, 277 .id_table = ahci_pci_tbl,
274 .probe = ahci_init_one, 278 .probe = ahci_init_one,
275 .remove = ata_pci_remove_one, 279 .remove = ahci_remove_one,
276}; 280};
277 281
278 282
@@ -795,8 +799,6 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent)
795 return rc; 799 return rc;
796 } 800 }
797 } 801 }
798
799 hpriv->flags |= HOST_CAP_64;
800 } else { 802 } else {
801 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 803 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
802 if (rc) { 804 if (rc) {
@@ -879,15 +881,19 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent)
879} 881}
880 882
881/* move to PCI layer, integrate w/ MSI stuff */ 883/* move to PCI layer, integrate w/ MSI stuff */
882static void pci_enable_intx(struct pci_dev *pdev) 884static void pci_intx(struct pci_dev *pdev, int enable)
883{ 885{
884 u16 pci_command; 886 u16 pci_command, new;
885 887
886 pci_read_config_word(pdev, PCI_COMMAND, &pci_command); 888 pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
887 if (pci_command & PCI_COMMAND_INTX_DISABLE) { 889
888 pci_command &= ~PCI_COMMAND_INTX_DISABLE; 890 if (enable)
891 new = pci_command & ~PCI_COMMAND_INTX_DISABLE;
892 else
893 new = pci_command | PCI_COMMAND_INTX_DISABLE;
894
895 if (new != pci_command)
889 pci_write_config_word(pdev, PCI_COMMAND, pci_command); 896 pci_write_config_word(pdev, PCI_COMMAND, pci_command);
890 }
891} 897}
892 898
893static void ahci_print_info(struct ata_probe_ent *probe_ent) 899static void ahci_print_info(struct ata_probe_ent *probe_ent)
@@ -969,7 +975,7 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
969 unsigned long base; 975 unsigned long base;
970 void *mmio_base; 976 void *mmio_base;
971 unsigned int board_idx = (unsigned int) ent->driver_data; 977 unsigned int board_idx = (unsigned int) ent->driver_data;
972 int pci_dev_busy = 0; 978 int have_msi, pci_dev_busy = 0;
973 int rc; 979 int rc;
974 980
975 VPRINTK("ENTER\n"); 981 VPRINTK("ENTER\n");
@@ -987,12 +993,17 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
987 goto err_out; 993 goto err_out;
988 } 994 }
989 995
990 pci_enable_intx(pdev); 996 if (pci_enable_msi(pdev) == 0)
997 have_msi = 1;
998 else {
999 pci_intx(pdev, 1);
1000 have_msi = 0;
1001 }
991 1002
992 probe_ent = kmalloc(sizeof(*probe_ent), GFP_KERNEL); 1003 probe_ent = kmalloc(sizeof(*probe_ent), GFP_KERNEL);
993 if (probe_ent == NULL) { 1004 if (probe_ent == NULL) {
994 rc = -ENOMEM; 1005 rc = -ENOMEM;
995 goto err_out_regions; 1006 goto err_out_msi;
996 } 1007 }
997 1008
998 memset(probe_ent, 0, sizeof(*probe_ent)); 1009 memset(probe_ent, 0, sizeof(*probe_ent));
@@ -1025,6 +1036,9 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
1025 probe_ent->mmio_base = mmio_base; 1036 probe_ent->mmio_base = mmio_base;
1026 probe_ent->private_data = hpriv; 1037 probe_ent->private_data = hpriv;
1027 1038
1039 if (have_msi)
1040 hpriv->flags |= AHCI_FLAG_MSI;
1041
1028 /* initialize adapter */ 1042 /* initialize adapter */
1029 rc = ahci_host_init(probe_ent); 1043 rc = ahci_host_init(probe_ent);
1030 if (rc) 1044 if (rc)
@@ -1044,7 +1058,11 @@ err_out_iounmap:
1044 iounmap(mmio_base); 1058 iounmap(mmio_base);
1045err_out_free_ent: 1059err_out_free_ent:
1046 kfree(probe_ent); 1060 kfree(probe_ent);
1047err_out_regions: 1061err_out_msi:
1062 if (have_msi)
1063 pci_disable_msi(pdev);
1064 else
1065 pci_intx(pdev, 0);
1048 pci_release_regions(pdev); 1066 pci_release_regions(pdev);
1049err_out: 1067err_out:
1050 if (!pci_dev_busy) 1068 if (!pci_dev_busy)
@@ -1052,6 +1070,42 @@ err_out:
1052 return rc; 1070 return rc;
1053} 1071}
1054 1072
1073static void ahci_remove_one (struct pci_dev *pdev)
1074{
1075 struct device *dev = pci_dev_to_dev(pdev);
1076 struct ata_host_set *host_set = dev_get_drvdata(dev);
1077 struct ahci_host_priv *hpriv = host_set->private_data;
1078 struct ata_port *ap;
1079 unsigned int i;
1080 int have_msi;
1081
1082 for (i = 0; i < host_set->n_ports; i++) {
1083 ap = host_set->ports[i];
1084
1085 scsi_remove_host(ap->host);
1086 }
1087
1088 have_msi = hpriv->flags & AHCI_FLAG_MSI;
1089 free_irq(host_set->irq, host_set);
1090
1091 for (i = 0; i < host_set->n_ports; i++) {
1092 ap = host_set->ports[i];
1093
1094 ata_scsi_release(ap->host);
1095 scsi_host_put(ap->host);
1096 }
1097
1098 host_set->ops->host_stop(host_set);
1099 kfree(host_set);
1100
1101 if (have_msi)
1102 pci_disable_msi(pdev);
1103 else
1104 pci_intx(pdev, 0);
1105 pci_release_regions(pdev);
1106 pci_disable_device(pdev);
1107 dev_set_drvdata(dev, NULL);
1108}
1055 1109
1056static int __init ahci_init(void) 1110static int __init ahci_init(void)
1057{ 1111{