.. | .. |
---|
13 | 13 | #include <linux/dmi.h> |
---|
14 | 14 | #include <linux/io.h> |
---|
15 | 15 | |
---|
16 | | -int io_delay_type __read_mostly = CONFIG_DEFAULT_IO_DELAY_TYPE; |
---|
| 16 | +#define IO_DELAY_TYPE_0X80 0 |
---|
| 17 | +#define IO_DELAY_TYPE_0XED 1 |
---|
| 18 | +#define IO_DELAY_TYPE_UDELAY 2 |
---|
| 19 | +#define IO_DELAY_TYPE_NONE 3 |
---|
| 20 | + |
---|
| 21 | +#if defined(CONFIG_IO_DELAY_0X80) |
---|
| 22 | +#define DEFAULT_IO_DELAY_TYPE IO_DELAY_TYPE_0X80 |
---|
| 23 | +#elif defined(CONFIG_IO_DELAY_0XED) |
---|
| 24 | +#define DEFAULT_IO_DELAY_TYPE IO_DELAY_TYPE_0XED |
---|
| 25 | +#elif defined(CONFIG_IO_DELAY_UDELAY) |
---|
| 26 | +#define DEFAULT_IO_DELAY_TYPE IO_DELAY_TYPE_UDELAY |
---|
| 27 | +#elif defined(CONFIG_IO_DELAY_NONE) |
---|
| 28 | +#define DEFAULT_IO_DELAY_TYPE IO_DELAY_TYPE_NONE |
---|
| 29 | +#endif |
---|
| 30 | + |
---|
| 31 | +int io_delay_type __read_mostly = DEFAULT_IO_DELAY_TYPE; |
---|
17 | 32 | |
---|
18 | 33 | static int __initdata io_delay_override; |
---|
19 | 34 | |
---|
.. | .. |
---|
24 | 39 | { |
---|
25 | 40 | switch (io_delay_type) { |
---|
26 | 41 | default: |
---|
27 | | - case CONFIG_IO_DELAY_TYPE_0X80: |
---|
| 42 | + case IO_DELAY_TYPE_0X80: |
---|
28 | 43 | asm volatile ("outb %al, $0x80"); |
---|
29 | 44 | break; |
---|
30 | | - case CONFIG_IO_DELAY_TYPE_0XED: |
---|
| 45 | + case IO_DELAY_TYPE_0XED: |
---|
31 | 46 | asm volatile ("outb %al, $0xed"); |
---|
32 | 47 | break; |
---|
33 | | - case CONFIG_IO_DELAY_TYPE_UDELAY: |
---|
| 48 | + case IO_DELAY_TYPE_UDELAY: |
---|
34 | 49 | /* |
---|
35 | 50 | * 2 usecs is an upper-bound for the outb delay but |
---|
36 | 51 | * note that udelay doesn't have the bus-level |
---|
.. | .. |
---|
39 | 54 | * are shorter until calibrated): |
---|
40 | 55 | */ |
---|
41 | 56 | udelay(2); |
---|
42 | | - case CONFIG_IO_DELAY_TYPE_NONE: |
---|
| 57 | + break; |
---|
| 58 | + case IO_DELAY_TYPE_NONE: |
---|
43 | 59 | break; |
---|
44 | 60 | } |
---|
45 | 61 | } |
---|
.. | .. |
---|
47 | 63 | |
---|
48 | 64 | static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id) |
---|
49 | 65 | { |
---|
50 | | - if (io_delay_type == CONFIG_IO_DELAY_TYPE_0X80) { |
---|
| 66 | + if (io_delay_type == IO_DELAY_TYPE_0X80) { |
---|
51 | 67 | pr_notice("%s: using 0xed I/O delay port\n", id->ident); |
---|
52 | | - io_delay_type = CONFIG_IO_DELAY_TYPE_0XED; |
---|
| 68 | + io_delay_type = IO_DELAY_TYPE_0XED; |
---|
53 | 69 | } |
---|
54 | 70 | |
---|
55 | 71 | return 0; |
---|
.. | .. |
---|
115 | 131 | return -EINVAL; |
---|
116 | 132 | |
---|
117 | 133 | if (!strcmp(s, "0x80")) |
---|
118 | | - io_delay_type = CONFIG_IO_DELAY_TYPE_0X80; |
---|
| 134 | + io_delay_type = IO_DELAY_TYPE_0X80; |
---|
119 | 135 | else if (!strcmp(s, "0xed")) |
---|
120 | | - io_delay_type = CONFIG_IO_DELAY_TYPE_0XED; |
---|
| 136 | + io_delay_type = IO_DELAY_TYPE_0XED; |
---|
121 | 137 | else if (!strcmp(s, "udelay")) |
---|
122 | | - io_delay_type = CONFIG_IO_DELAY_TYPE_UDELAY; |
---|
| 138 | + io_delay_type = IO_DELAY_TYPE_UDELAY; |
---|
123 | 139 | else if (!strcmp(s, "none")) |
---|
124 | | - io_delay_type = CONFIG_IO_DELAY_TYPE_NONE; |
---|
| 140 | + io_delay_type = IO_DELAY_TYPE_NONE; |
---|
125 | 141 | else |
---|
126 | 142 | return -EINVAL; |
---|
127 | 143 | |
---|