diff options
author | Borislav Petkov <petkovbb@gmail.com> | 2008-10-10 16:39:35 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-10 16:39:35 -0400 |
commit | 20df429dd6671804999493baf2952f82582869fa (patch) | |
tree | e835d1ee54a09f75c5cf09e614da3d932eef6bb0 /drivers/ide | |
parent | b98b3409abb697321d1b53e3e96a14243fe9fc79 (diff) |
ide-generic: handle probing of legacy io-ports v5
Avoid probing the io-ports in case an IDE PCI controller is present and it
uses the legacy iobases. If we still want to enforce the probing, we do
ide_generic.probe_mask=0x3f
on the kernel command line. The iobase checking code is
adapted from drivers/ata/pata_legacy.c after converting hex
pci ids into their corresponding macros in <linux/pci_ids.h>.
Also, check only BAR0/2 resources since those are guaranteed
by the workaround in drivers/pci/probe.c:pci_setup_device().
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
[bart: trivial printk() fixups]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-generic.c | 55 |
1 files changed, 51 insertions, 4 deletions
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c index 8fe8b5b9cf7d..0a3cb0c33ae5 100644 --- a/drivers/ide/ide-generic.c +++ b/drivers/ide/ide-generic.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/ide.h> | 21 | #include <linux/ide.h> |
22 | #include <linux/pci_ids.h> | ||
22 | 23 | ||
23 | /* FIXME: convert m32r to use ide_platform host driver */ | 24 | /* FIXME: convert m32r to use ide_platform host driver */ |
24 | #ifdef CONFIG_M32R | 25 | #ifdef CONFIG_M32R |
@@ -27,7 +28,7 @@ | |||
27 | 28 | ||
28 | #define DRV_NAME "ide_generic" | 29 | #define DRV_NAME "ide_generic" |
29 | 30 | ||
30 | static int probe_mask = 0x03; | 31 | static int probe_mask; |
31 | module_param(probe_mask, int, 0); | 32 | module_param(probe_mask, int, 0); |
32 | MODULE_PARM_DESC(probe_mask, "probe mask for legacy ISA IDE ports"); | 33 | MODULE_PARM_DESC(probe_mask, "probe mask for legacy ISA IDE ports"); |
33 | 34 | ||
@@ -100,19 +101,65 @@ static const u16 legacy_bases[] = { 0x1f0, 0x170, 0x1e8, 0x168, 0x1e0, 0x160 }; | |||
100 | static const int legacy_irqs[] = { 14, 15, 11, 10, 8, 12 }; | 101 | static const int legacy_irqs[] = { 14, 15, 11, 10, 8, 12 }; |
101 | #endif | 102 | #endif |
102 | 103 | ||
104 | static void ide_generic_check_pci_legacy_iobases(int *primary, int *secondary) | ||
105 | { | ||
106 | struct pci_dev *p = NULL; | ||
107 | u16 val; | ||
108 | |||
109 | for_each_pci_dev(p) { | ||
110 | |||
111 | if (pci_resource_start(p, 0) == 0x1f0) | ||
112 | *primary = 1; | ||
113 | if (pci_resource_start(p, 2) == 0x170) | ||
114 | *secondary = 1; | ||
115 | |||
116 | /* Cyrix CS55{1,2}0 pre SFF MWDMA ATA on the bridge */ | ||
117 | if (p->vendor == PCI_VENDOR_ID_CYRIX && | ||
118 | (p->device == PCI_DEVICE_ID_CYRIX_5510 || | ||
119 | p->device == PCI_DEVICE_ID_CYRIX_5520)) | ||
120 | *primary = *secondary = 1; | ||
121 | |||
122 | /* Intel MPIIX - PIO ATA on non PCI side of bridge */ | ||
123 | if (p->vendor == PCI_VENDOR_ID_INTEL && | ||
124 | p->device == PCI_DEVICE_ID_INTEL_82371MX) { | ||
125 | |||
126 | pci_read_config_word(p, 0x6C, &val); | ||
127 | if (val & 0x8000) { | ||
128 | /* ATA port enabled */ | ||
129 | if (val & 0x4000) | ||
130 | *secondary = 1; | ||
131 | else | ||
132 | *primary = 1; | ||
133 | } | ||
134 | } | ||
135 | } | ||
136 | } | ||
137 | |||
103 | static int __init ide_generic_init(void) | 138 | static int __init ide_generic_init(void) |
104 | { | 139 | { |
105 | hw_regs_t hw[MAX_HWIFS], *hws[MAX_HWIFS]; | 140 | hw_regs_t hw[MAX_HWIFS], *hws[MAX_HWIFS]; |
106 | struct ide_host *host; | 141 | struct ide_host *host; |
107 | unsigned long io_addr; | 142 | unsigned long io_addr; |
108 | int i, rc; | 143 | int i, rc, primary = 0, secondary = 0; |
109 | 144 | ||
110 | #ifdef CONFIG_MIPS | 145 | #ifdef CONFIG_MIPS |
111 | if (!ide_probe_legacy()) | 146 | if (!ide_probe_legacy()) |
112 | return -ENODEV; | 147 | return -ENODEV; |
113 | #endif | 148 | #endif |
114 | printk(KERN_INFO DRV_NAME ": please use \"probe_mask=0x3f\" module " | 149 | ide_generic_check_pci_legacy_iobases(&primary, &secondary); |
115 | "parameter for probing all legacy ISA IDE ports\n"); | 150 | |
151 | if (!probe_mask) { | ||
152 | printk(KERN_INFO DRV_NAME ": please use \"probe_mask=0x3f\" " | ||
153 | "module parameter for probing all legacy ISA IDE ports\n"); | ||
154 | |||
155 | if (primary == 0) | ||
156 | probe_mask |= 0x1; | ||
157 | |||
158 | if (secondary == 0) | ||
159 | probe_mask |= 0x2; | ||
160 | } else | ||
161 | printk(KERN_INFO DRV_NAME ": enforcing probing of I/O ports " | ||
162 | "upon user request\n"); | ||
116 | 163 | ||
117 | memset(hws, 0, sizeof(hw_regs_t *) * MAX_HWIFS); | 164 | memset(hws, 0, sizeof(hw_regs_t *) * MAX_HWIFS); |
118 | 165 | ||