diff options
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/Makefile | 2 | ||||
-rw-r--r-- | drivers/acpi/motherboard.c | 180 | ||||
-rw-r--r-- | drivers/acpi/osl.c | 48 |
3 files changed, 49 insertions, 181 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 399b0e8c41c4..856c32bccacb 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile | |||
@@ -37,7 +37,7 @@ endif | |||
37 | 37 | ||
38 | obj-y += sleep/ | 38 | obj-y += sleep/ |
39 | obj-y += bus.o glue.o | 39 | obj-y += bus.o glue.o |
40 | obj-y += scan.o motherboard.o | 40 | obj-y += scan.o |
41 | obj-$(CONFIG_ACPI_AC) += ac.o | 41 | obj-$(CONFIG_ACPI_AC) += ac.o |
42 | obj-$(CONFIG_ACPI_BATTERY) += battery.o | 42 | obj-$(CONFIG_ACPI_BATTERY) += battery.o |
43 | obj-$(CONFIG_ACPI_BUTTON) += button.o | 43 | obj-$(CONFIG_ACPI_BUTTON) += button.o |
diff --git a/drivers/acpi/motherboard.c b/drivers/acpi/motherboard.c deleted file mode 100644 index 8f13b4f3e906..000000000000 --- a/drivers/acpi/motherboard.c +++ /dev/null | |||
@@ -1,180 +0,0 @@ | |||
1 | /* | ||
2 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
3 | * This program is free software; you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation; either version 2 of the License, or (at | ||
6 | * your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, but | ||
9 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
11 | * General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License along | ||
14 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
15 | * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. | ||
16 | * | ||
17 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
18 | */ | ||
19 | |||
20 | /* Purpose: Prevent PCMCIA cards from using motherboard resources. */ | ||
21 | |||
22 | #include <linux/kernel.h> | ||
23 | #include <linux/init.h> | ||
24 | #include <linux/types.h> | ||
25 | #include <linux/pci.h> | ||
26 | #include <linux/ioport.h> | ||
27 | #include <asm/io.h> | ||
28 | |||
29 | #include <acpi/acpi_bus.h> | ||
30 | #include <acpi/acpi_drivers.h> | ||
31 | |||
32 | #define _COMPONENT ACPI_SYSTEM_COMPONENT | ||
33 | ACPI_MODULE_NAME("acpi_motherboard") | ||
34 | |||
35 | /* Dell use PNP0C01 instead of PNP0C02 */ | ||
36 | #define ACPI_MB_HID "PNP0C01,PNP0C02" | ||
37 | /** | ||
38 | * Doesn't care about legacy IO ports, only IO ports beyond 0x1000 are reserved | ||
39 | * Doesn't care about the failure of 'request_region', since other may reserve | ||
40 | * the io ports as well | ||
41 | */ | ||
42 | #define IS_RESERVED_ADDR(base, len) \ | ||
43 | (((len) > 0) && ((base) > 0) && ((base) + (len) < IO_SPACE_LIMIT) \ | ||
44 | && ((base) + (len) > PCIBIOS_MIN_IO)) | ||
45 | /* | ||
46 | * Clearing the flag (IORESOURCE_BUSY) allows drivers to use | ||
47 | * the io ports if they really know they can use it, while | ||
48 | * still preventing hotplug PCI devices from using it. | ||
49 | */ | ||
50 | |||
51 | /* | ||
52 | * When CONFIG_PNP is enabled, pnp/system.c binds to PNP0C01 | ||
53 | * and PNP0C02, redundant with acpi_reserve_io_ranges(). | ||
54 | * But acpi_reserve_io_ranges() is necessary for !CONFIG_PNP. | ||
55 | */ | ||
56 | static acpi_status acpi_reserve_io_ranges(struct acpi_resource *res, void *data) | ||
57 | { | ||
58 | struct resource *requested_res = NULL; | ||
59 | |||
60 | |||
61 | if (res->type == ACPI_RESOURCE_TYPE_IO) { | ||
62 | struct acpi_resource_io *io_res = &res->data.io; | ||
63 | |||
64 | if (io_res->minimum != io_res->maximum) | ||
65 | return AE_OK; | ||
66 | if (IS_RESERVED_ADDR | ||
67 | (io_res->minimum, io_res->address_length)) { | ||
68 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | ||
69 | "Motherboard resources 0x%08x - 0x%08x\n", | ||
70 | io_res->minimum, | ||
71 | io_res->minimum + | ||
72 | io_res->address_length)); | ||
73 | requested_res = | ||
74 | request_region(io_res->minimum, | ||
75 | io_res->address_length, "motherboard"); | ||
76 | } | ||
77 | } else if (res->type == ACPI_RESOURCE_TYPE_FIXED_IO) { | ||
78 | struct acpi_resource_fixed_io *fixed_io_res = | ||
79 | &res->data.fixed_io; | ||
80 | |||
81 | if (IS_RESERVED_ADDR | ||
82 | (fixed_io_res->address, fixed_io_res->address_length)) { | ||
83 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | ||
84 | "Motherboard resources 0x%08x - 0x%08x\n", | ||
85 | fixed_io_res->address, | ||
86 | fixed_io_res->address + | ||
87 | fixed_io_res->address_length)); | ||
88 | requested_res = | ||
89 | request_region(fixed_io_res->address, | ||
90 | fixed_io_res->address_length, | ||
91 | "motherboard"); | ||
92 | } | ||
93 | } else { | ||
94 | /* Memory mapped IO? */ | ||
95 | } | ||
96 | |||
97 | if (requested_res) | ||
98 | requested_res->flags &= ~IORESOURCE_BUSY; | ||
99 | return AE_OK; | ||
100 | } | ||
101 | |||
102 | static int acpi_motherboard_add(struct acpi_device *device) | ||
103 | { | ||
104 | if (!device) | ||
105 | return -EINVAL; | ||
106 | acpi_walk_resources(device->handle, METHOD_NAME__CRS, | ||
107 | acpi_reserve_io_ranges, NULL); | ||
108 | |||
109 | return 0; | ||
110 | } | ||
111 | |||
112 | static struct acpi_driver acpi_motherboard_driver = { | ||
113 | .name = "motherboard", | ||
114 | .class = "", | ||
115 | .ids = ACPI_MB_HID, | ||
116 | .ops = { | ||
117 | .add = acpi_motherboard_add, | ||
118 | }, | ||
119 | }; | ||
120 | |||
121 | static void __init acpi_request_region (struct acpi_generic_address *addr, | ||
122 | unsigned int length, char *desc) | ||
123 | { | ||
124 | if (!addr->address || !length) | ||
125 | return; | ||
126 | |||
127 | if (addr->space_id == ACPI_ADR_SPACE_SYSTEM_IO) | ||
128 | request_region(addr->address, length, desc); | ||
129 | else if (addr->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) | ||
130 | request_mem_region(addr->address, length, desc); | ||
131 | } | ||
132 | |||
133 | static void __init acpi_reserve_resources(void) | ||
134 | { | ||
135 | acpi_request_region(&acpi_gbl_FADT.xpm1a_event_block, | ||
136 | acpi_gbl_FADT.pm1_event_length, "ACPI PM1a_EVT_BLK"); | ||
137 | |||
138 | acpi_request_region(&acpi_gbl_FADT.xpm1b_event_block, | ||
139 | acpi_gbl_FADT.pm1_event_length, "ACPI PM1b_EVT_BLK"); | ||
140 | |||
141 | acpi_request_region(&acpi_gbl_FADT.xpm1a_control_block, | ||
142 | acpi_gbl_FADT.pm1_control_length, "ACPI PM1a_CNT_BLK"); | ||
143 | |||
144 | acpi_request_region(&acpi_gbl_FADT.xpm1b_control_block, | ||
145 | acpi_gbl_FADT.pm1_control_length, "ACPI PM1b_CNT_BLK"); | ||
146 | |||
147 | if (acpi_gbl_FADT.pm_timer_length == 4) | ||
148 | acpi_request_region(&acpi_gbl_FADT.xpm_timer_block, 4, "ACPI PM_TMR"); | ||
149 | |||
150 | acpi_request_region(&acpi_gbl_FADT.xpm2_control_block, | ||
151 | acpi_gbl_FADT.pm2_control_length, "ACPI PM2_CNT_BLK"); | ||
152 | |||
153 | /* Length of GPE blocks must be a non-negative multiple of 2 */ | ||
154 | |||
155 | if (!(acpi_gbl_FADT.gpe0_block_length & 0x1)) | ||
156 | acpi_request_region(&acpi_gbl_FADT.xgpe0_block, | ||
157 | acpi_gbl_FADT.gpe0_block_length, "ACPI GPE0_BLK"); | ||
158 | |||
159 | if (!(acpi_gbl_FADT.gpe1_block_length & 0x1)) | ||
160 | acpi_request_region(&acpi_gbl_FADT.xgpe1_block, | ||
161 | acpi_gbl_FADT.gpe1_block_length, "ACPI GPE1_BLK"); | ||
162 | } | ||
163 | |||
164 | static int __init acpi_motherboard_init(void) | ||
165 | { | ||
166 | acpi_bus_register_driver(&acpi_motherboard_driver); | ||
167 | /* | ||
168 | * Guarantee motherboard IO reservation first | ||
169 | * This module must run after scan.c | ||
170 | */ | ||
171 | if (!acpi_disabled) | ||
172 | acpi_reserve_resources(); | ||
173 | return 0; | ||
174 | } | ||
175 | |||
176 | /** | ||
177 | * Reserve motherboard resources after PCI claim BARs, | ||
178 | * but before PCI assign resources for uninitialized PCI devices | ||
179 | */ | ||
180 | fs_initcall(acpi_motherboard_init); | ||
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index a28f5b8972b4..0f6f3bcbc8eb 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
@@ -76,6 +76,54 @@ static acpi_osd_handler acpi_irq_handler; | |||
76 | static void *acpi_irq_context; | 76 | static void *acpi_irq_context; |
77 | static struct workqueue_struct *kacpid_wq; | 77 | static struct workqueue_struct *kacpid_wq; |
78 | 78 | ||
79 | static void __init acpi_request_region (struct acpi_generic_address *addr, | ||
80 | unsigned int length, char *desc) | ||
81 | { | ||
82 | struct resource *res; | ||
83 | |||
84 | if (!addr->address || !length) | ||
85 | return; | ||
86 | |||
87 | if (addr->space_id == ACPI_ADR_SPACE_SYSTEM_IO) | ||
88 | res = request_region(addr->address, length, desc); | ||
89 | else if (addr->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) | ||
90 | res = request_mem_region(addr->address, length, desc); | ||
91 | } | ||
92 | |||
93 | static int __init acpi_reserve_resources(void) | ||
94 | { | ||
95 | acpi_request_region(&acpi_gbl_FADT.xpm1a_event_block, acpi_gbl_FADT.pm1_event_length, | ||
96 | "ACPI PM1a_EVT_BLK"); | ||
97 | |||
98 | acpi_request_region(&acpi_gbl_FADT.xpm1b_event_block, acpi_gbl_FADT.pm1_event_length, | ||
99 | "ACPI PM1b_EVT_BLK"); | ||
100 | |||
101 | acpi_request_region(&acpi_gbl_FADT.xpm1a_control_block, acpi_gbl_FADT.pm1_control_length, | ||
102 | "ACPI PM1a_CNT_BLK"); | ||
103 | |||
104 | acpi_request_region(&acpi_gbl_FADT.xpm1b_control_block, acpi_gbl_FADT.pm1_control_length, | ||
105 | "ACPI PM1b_CNT_BLK"); | ||
106 | |||
107 | if (acpi_gbl_FADT.pm_timer_length == 4) | ||
108 | acpi_request_region(&acpi_gbl_FADT.xpm_timer_block, 4, "ACPI PM_TMR"); | ||
109 | |||
110 | acpi_request_region(&acpi_gbl_FADT.xpm2_control_block, acpi_gbl_FADT.pm2_control_length, | ||
111 | "ACPI PM2_CNT_BLK"); | ||
112 | |||
113 | /* Length of GPE blocks must be a non-negative multiple of 2 */ | ||
114 | |||
115 | if (!(acpi_gbl_FADT.gpe0_block_length & 0x1)) | ||
116 | acpi_request_region(&acpi_gbl_FADT.xgpe0_block, | ||
117 | acpi_gbl_FADT.gpe0_block_length, "ACPI GPE0_BLK"); | ||
118 | |||
119 | if (!(acpi_gbl_FADT.gpe1_block_length & 0x1)) | ||
120 | acpi_request_region(&acpi_gbl_FADT.xgpe1_block, | ||
121 | acpi_gbl_FADT.gpe1_block_length, "ACPI GPE1_BLK"); | ||
122 | |||
123 | return 0; | ||
124 | } | ||
125 | device_initcall(acpi_reserve_resources); | ||
126 | |||
79 | acpi_status acpi_os_initialize(void) | 127 | acpi_status acpi_os_initialize(void) |
80 | { | 128 | { |
81 | return AE_OK; | 129 | return AE_OK; |