?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Add patches accepted for 2.6.22-rc1 (not released yet)
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / releases / upstream / 2.6.22-rc1 / 0020-ACPI-thinkpad-acpi-add-subdriver-debug-statements.patch
blobb17fcf811605f7167d55c9f6542d7e4e204be9cd
1 From fe08bc4b4fd1371fad111675a564e4d2ebbf39ea Mon Sep 17 00:00:00 2001
2 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
3 Date: Sat, 21 Apr 2007 11:08:32 -0300
4 Subject: ACPI: thinkpad-acpi: add subdriver debug statements
5
6 Add debug messages to the subdriver initialization and exit code.
7
8 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
9 Signed-off-by: Len Brown <len.brown@intel.com>
10 ---
11 Documentation/thinkpad-acpi.txt | 4 ++
12 drivers/misc/thinkpad_acpi.c | 111 +++++++++++++++++++++++++++++++++++++++
13 drivers/misc/thinkpad_acpi.h | 4 ++
14 3 files changed, 119 insertions(+), 0 deletions(-)
15
16 diff --git a/Documentation/thinkpad-acpi.txt b/Documentation/thinkpad-acpi.txt
17 index 82fd822..20d5ec3 100644
18 --- a/Documentation/thinkpad-acpi.txt
19 +++ b/Documentation/thinkpad-acpi.txt
20 @@ -710,5 +710,9 @@ enable various classes of debugging output, for example:
21 will enable all debugging output classes. It takes a bitmask, so
22 to enable more than one output class, just add their values.
23
24 + Debug bitmask Description
25 + 0x0001 Initialization and probing
26 + 0x0002 Removal
27 +
28 There is also a kernel build option to enable more debugging
29 information, which may be necessary to debug driver problems.
30 diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
31 index eeab394..e8fc8da 100644
32 --- a/drivers/misc/thinkpad_acpi.c
33 +++ b/drivers/misc/thinkpad_acpi.c
34 @@ -313,6 +313,9 @@ static int __init setup_notify(struct ibm_struct *ibm)
35 if (!*ibm->handle)
36 return 0;
37
38 + dbg_printk(TPACPI_DBG_INIT,
39 + "setting up ACPI notify for %s\n", ibm->name);
40 +
41 ret = acpi_bus_get_device(*ibm->handle, &ibm->device);
42 if (ret < 0) {
43 printk(IBM_ERR "%s device not present\n", ibm->name);
44 @@ -349,6 +352,9 @@ static int __init register_tpacpi_subdriver(struct ibm_struct *ibm)
45 {
46 int ret;
47
48 + dbg_printk(TPACPI_DBG_INIT,
49 + "registering %s as an ACPI driver\n", ibm->name);
50 +
51 ibm->driver = kzalloc(sizeof(struct acpi_driver), GFP_KERNEL);
52 if (!ibm->driver) {
53 printk(IBM_ERR "kzalloc(ibm->driver) failed\n");
54 @@ -497,17 +503,25 @@ static int hotkey_orig_mask;
55
56 static int hotkey_init(void)
57 {
58 + vdbg_printk(TPACPI_DBG_INIT, "initializing hotkey subdriver\n");
59 +
60 IBM_HANDLE_INIT(hkey);
61
62 /* hotkey not supported on 570 */
63 hotkey_supported = hkey_handle != NULL;
64
65 + vdbg_printk(TPACPI_DBG_INIT, "hotkeys are %s\n",
66 + str_supported(hotkey_supported));
67 +
68 if (hotkey_supported) {
69 /* mask not supported on 570, 600e/x, 770e, 770x, A21e, A2xm/p,
70 A30, R30, R31, T20-22, X20-21, X22-24 */
71 hotkey_mask_supported =
72 acpi_evalf(hkey_handle, NULL, "DHKN", "qv");
73
74 + vdbg_printk(TPACPI_DBG_INIT, "hotkey masks are %s\n",
75 + str_supported(hotkey_mask_supported));
76 +
77 if (!hotkey_get(&hotkey_orig_status, &hotkey_orig_mask))
78 return -ENODEV;
79 }
80 @@ -518,6 +532,7 @@ static int hotkey_init(void)
81 static void hotkey_exit(void)
82 {
83 if (hotkey_supported) {
84 + dbg_printk(TPACPI_DBG_EXIT, "restoring original hotkey mask\n");
85 hotkey_set(hotkey_orig_status, hotkey_orig_mask);
86 }
87 }
88 @@ -633,6 +648,8 @@ static int bluetooth_supported;
89
90 static int bluetooth_init(void)
91 {
92 + vdbg_printk(TPACPI_DBG_INIT, "initializing bluetooth subdriver\n");
93 +
94 IBM_HANDLE_INIT(hkey);
95
96 /* bluetooth not supported on 570, 600e/x, 770e, 770x, A21e, A2xm/p,
97 @@ -640,6 +657,9 @@ static int bluetooth_init(void)
98 bluetooth_supported = hkey_handle &&
99 acpi_evalf(hkey_handle, NULL, "GBDC", "qv");
100
101 + vdbg_printk(TPACPI_DBG_INIT, "bluetooth is %s\n",
102 + str_supported(bluetooth_supported));
103 +
104 return (bluetooth_supported)? 0 : 1;
105 }
106
107 @@ -704,11 +724,16 @@ static int wan_supported;
108
109 static int wan_init(void)
110 {
111 + vdbg_printk(TPACPI_DBG_INIT, "initializing wan subdriver\n");
112 +
113 IBM_HANDLE_INIT(hkey);
114
115 wan_supported = hkey_handle &&
116 acpi_evalf(hkey_handle, NULL, "GWAN", "qv");
117
118 + vdbg_printk(TPACPI_DBG_INIT, "wan is %s\n",
119 + str_supported(wan_supported));
120 +
121 return (wan_supported)? 0 : 1;
122 }
123
124 @@ -784,6 +809,8 @@ static int video_init(void)
125 {
126 int ivga;
127
128 + vdbg_printk(TPACPI_DBG_INIT, "initializing video subdriver\n");
129 +
130 IBM_HANDLE_INIT(vid);
131 IBM_HANDLE_INIT(vid2);
132
133 @@ -804,11 +831,16 @@ static int video_init(void)
134 /* all others */
135 video_supported = TPACPI_VIDEO_NEW;
136
137 + vdbg_printk(TPACPI_DBG_INIT, "video is %s, mode %d\n",
138 + str_supported(video_supported != TPACPI_VIDEO_NONE),
139 + video_supported);
140 +
141 return (video_supported != TPACPI_VIDEO_NONE)? 0 : 1;
142 }
143
144 static void video_exit(void)
145 {
146 + dbg_printk(TPACPI_DBG_EXIT, "restoring original video autoswitch mode\n");
147 acpi_evalf(vid_handle, NULL, "_DOS", "vd", video_orig_autosw);
148 }
149
150 @@ -991,6 +1023,8 @@ IBM_HANDLE(ledb, ec, "LEDB"); /* G4x */
151
152 static int light_init(void)
153 {
154 + vdbg_printk(TPACPI_DBG_INIT, "initializing light subdriver\n");
155 +
156 IBM_HANDLE_INIT(ledb);
157 IBM_HANDLE_INIT(lght);
158 IBM_HANDLE_INIT(cmos);
159 @@ -1004,6 +1038,9 @@ static int light_init(void)
160 light_status_supported = acpi_evalf(ec_handle, NULL,
161 "KBLT", "qv");
162
163 + vdbg_printk(TPACPI_DBG_INIT, "light is %s\n",
164 + str_supported(light_supported));
165 +
166 return (light_supported)? 0 : 1;
167 }
168
169 @@ -1075,9 +1112,14 @@ IBM_HANDLE(pci, root, "\\_SB.PCI"); /* 570 */
170
171 static int dock_init(void)
172 {
173 + vdbg_printk(TPACPI_DBG_INIT, "initializing dock subdriver\n");
174 +
175 IBM_HANDLE_INIT(dock);
176 IBM_HANDLE_INIT(pci);
177
178 + vdbg_printk(TPACPI_DBG_INIT, "dock is %s\n",
179 + str_supported(dock_handle != NULL));
180 +
181 return (dock_handle)? 0 : 1;
182 }
183
184 @@ -1171,6 +1213,8 @@ IBM_HANDLE(bay2_ej, bay2, "_EJ3", /* 600e/x, 770e, A3x */
185
186 static int bay_init(void)
187 {
188 + vdbg_printk(TPACPI_DBG_INIT, "initializing bay subdriver\n");
189 +
190 IBM_HANDLE_INIT(bay);
191 if (bay_handle)
192 IBM_HANDLE_INIT(bay_ej);
193 @@ -1188,6 +1232,13 @@ static int bay_init(void)
194 bay_eject2_supported = bay2_handle && bay2_ej_handle &&
195 (strlencmp(bay2_ej_path, "_EJ0") == 0 || experimental);
196
197 + vdbg_printk(TPACPI_DBG_INIT,
198 + "bay 1: status %s, eject %s; bay 2: status %s, eject %s\n",
199 + str_supported(bay_status_supported),
200 + str_supported(bay_eject_supported),
201 + str_supported(bay_status2_supported),
202 + str_supported(bay_eject2_supported));
203 +
204 return (bay_status_supported || bay_eject_supported ||
205 bay_status2_supported || bay_eject2_supported)? 0 : 1;
206 }
207 @@ -1255,8 +1306,13 @@ static int bay_write(char *buf)
208
209 static int cmos_init(void)
210 {
211 + vdbg_printk(TPACPI_DBG_INIT,
212 + "initializing cmos commands subdriver\n");
213 +
214 IBM_HANDLE_INIT(cmos);
215
216 + vdbg_printk(TPACPI_DBG_INIT, "cmos commands are %s\n",
217 + str_supported(cmos_handle != NULL));
218 return (cmos_handle)? 0 : 1;
219 }
220
221 @@ -1320,6 +1376,8 @@ IBM_HANDLE(led, ec, "SLED", /* 570 */
222
223 static int led_init(void)
224 {
225 + vdbg_printk(TPACPI_DBG_INIT, "initializing LED subdriver\n");
226 +
227 IBM_HANDLE_INIT(led);
228
229 if (!led_handle)
230 @@ -1335,6 +1393,9 @@ static int led_init(void)
231 /* all others */
232 led_supported = TPACPI_LED_NEW;
233
234 + vdbg_printk(TPACPI_DBG_INIT, "LED commands are %s, mode %d\n",
235 + str_supported(led_supported), led_supported);
236 +
237 return (led_supported != TPACPI_LED_NONE)? 0 : 1;
238 }
239
240 @@ -1434,8 +1495,13 @@ IBM_HANDLE(beep, ec, "BEEP"); /* all except R30, R31 */
241
242 static int beep_init(void)
243 {
244 + vdbg_printk(TPACPI_DBG_INIT, "initializing beep subdriver\n");
245 +
246 IBM_HANDLE_INIT(beep);
247
248 + vdbg_printk(TPACPI_DBG_INIT, "beep is %s\n",
249 + str_supported(beep_handle != NULL));
250 +
251 return (beep_handle)? 0 : 1;
252 }
253
254 @@ -1486,6 +1552,8 @@ static int thermal_init(void)
255 int i;
256 int acpi_tmp7;
257
258 + vdbg_printk(TPACPI_DBG_INIT, "initializing thermal subdriver\n");
259 +
260 acpi_tmp7 = acpi_evalf(ec_handle, NULL, "TMP7", "qv");
261
262 if (ibm_thinkpad_ec_found && experimental) {
263 @@ -1542,6 +1610,10 @@ static int thermal_init(void)
264 thermal_read_mode = TPACPI_THERMAL_NONE;
265 }
266
267 + vdbg_printk(TPACPI_DBG_INIT, "thermal is %s, mode %d\n",
268 + str_supported(thermal_read_mode != TPACPI_THERMAL_NONE),
269 + thermal_read_mode);
270 +
271 return (thermal_read_mode != TPACPI_THERMAL_NONE)? 0 : 1;
272 }
273
274 @@ -1698,6 +1770,8 @@ static int brightness_init(void)
275 {
276 int b;
277
278 + vdbg_printk(TPACPI_DBG_INIT, "initializing brightness subdriver\n");
279 +
280 b = brightness_get(NULL);
281 if (b < 0)
282 return b;
283 @@ -1708,6 +1782,7 @@ static int brightness_init(void)
284 printk(IBM_ERR "Could not register backlight device\n");
285 return PTR_ERR(ibm_backlight_device);
286 }
287 + vdbg_printk(TPACPI_DBG_INIT, "brightness is supported\n");
288
289 ibm_backlight_device->props.max_brightness = 7;
290 ibm_backlight_device->props.brightness = b;
291 @@ -1719,6 +1794,8 @@ static int brightness_init(void)
292 static void brightness_exit(void)
293 {
294 if (ibm_backlight_device) {
295 + vdbg_printk(TPACPI_DBG_EXIT,
296 + "calling backlight_device_unregister()\n");
297 backlight_device_unregister(ibm_backlight_device);
298 ibm_backlight_device = NULL;
299 }
300 @@ -2017,6 +2094,8 @@ IBM_HANDLE(sfan, ec, "SFAN", /* 570 */
301
302 static int fan_init(void)
303 {
304 + vdbg_printk(TPACPI_DBG_INIT, "initializing fan subdriver\n");
305 +
306 fan_status_access_mode = TPACPI_FAN_NONE;
307 fan_control_access_mode = TPACPI_FAN_WR_NONE;
308 fan_control_commands = 0;
309 @@ -2095,6 +2174,11 @@ static int fan_init(void)
310 }
311 }
312
313 + vdbg_printk(TPACPI_DBG_INIT, "fan is %s, modes %d, %d\n",
314 + str_supported(fan_status_access_mode != TPACPI_FAN_NONE ||
315 + fan_control_access_mode != TPACPI_FAN_WR_NONE),
316 + fan_status_access_mode, fan_control_access_mode);
317 +
318 return (fan_status_access_mode != TPACPI_FAN_NONE ||
319 fan_control_access_mode != TPACPI_FAN_WR_NONE)?
320 0 : 1;
321 @@ -2138,6 +2222,7 @@ static int fan_get_status(u8 *status)
322
323 static void fan_exit(void)
324 {
325 + vdbg_printk(TPACPI_DBG_EXIT, "cancelling any pending watchdogs\n");
326 cancel_delayed_work(&fan_watchdog_task);
327 flush_scheduled_work();
328 }
329 @@ -2622,6 +2707,15 @@ static struct ibm_struct ibms[] = {
330 * Module and infrastructure proble, init and exit handling
331 */
332
333 +#ifdef CONFIG_THINKPAD_ACPI_DEBUG
334 +static const char * str_supported(int is_supported)
335 +{
336 + static const char * const text_unsupported = "not supported";
337 +
338 + return (is_supported)? text_unsupported + 4 : text_unsupported;
339 +}
340 +#endif /* CONFIG_THINKPAD_ACPI_DEBUG */
341 +
342 static int __init ibm_init(struct ibm_struct *ibm)
343 {
344 int ret;
345 @@ -2630,6 +2724,9 @@ static int __init ibm_init(struct ibm_struct *ibm)
346 if (ibm->experimental && !experimental)
347 return 0;
348
349 + dbg_printk(TPACPI_DBG_INIT,
350 + "probing for %s\n", ibm->name);
351 +
352 if (ibm->init) {
353 ret = ibm->init();
354 if (ret > 0)
355 @@ -2657,6 +2754,9 @@ static int __init ibm_init(struct ibm_struct *ibm)
356 goto err_out;
357 }
358
359 + dbg_printk(TPACPI_DBG_INIT,
360 + "%s installed\n", ibm->name);
361 +
362 if (ibm->read) {
363 entry = create_proc_entry(ibm->name,
364 S_IFREG | S_IRUGO | S_IWUSR,
365 @@ -2678,24 +2778,35 @@ static int __init ibm_init(struct ibm_struct *ibm)
366 return 0;
367
368 err_out:
369 + dbg_printk(TPACPI_DBG_INIT,
370 + "%s: at error exit path with result %d\n",
371 + ibm->name, ret);
372 +
373 ibm_exit(ibm);
374 return (ret < 0)? ret : 0;
375 }
376
377 static void ibm_exit(struct ibm_struct *ibm)
378 {
379 + dbg_printk(TPACPI_DBG_EXIT, "removing %s\n", ibm->name);
380 if (ibm->notify_installed) {
381 + dbg_printk(TPACPI_DBG_EXIT,
382 + "%s: acpi_remove_notify_handler\n", ibm->name);
383 acpi_remove_notify_handler(*ibm->handle, ibm->type,
384 dispatch_notify);
385 ibm->notify_installed = 0;
386 }
387
388 if (ibm->proc_created) {
389 + dbg_printk(TPACPI_DBG_EXIT,
390 + "%s: remove_proc_entry\n", ibm->name);
391 remove_proc_entry(ibm->name, proc_dir);
392 ibm->proc_created = 0;
393 }
394
395 if (ibm->driver_registered) {
396 + dbg_printk(TPACPI_DBG_EXIT,
397 + "%s: acpi_bus_unregister_driver\n", ibm->name);
398 acpi_bus_unregister_driver(ibm->driver);
399 kfree(ibm->driver);
400 ibm->driver = NULL;
401 diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
402 index 06d4c38..beb1447 100644
403 --- a/drivers/misc/thinkpad_acpi.h
404 +++ b/drivers/misc/thinkpad_acpi.h
405 @@ -76,12 +76,16 @@
406
407 /* Debugging */
408 #define TPACPI_DBG_ALL 0xffff
409 +#define TPACPI_DBG_ALL 0xffff
410 +#define TPACPI_DBG_INIT 0x0001
411 +#define TPACPI_DBG_EXIT 0x0002
412 #define dbg_printk(a_dbg_level, format, arg...) \
413 do { if (dbg_level & a_dbg_level) \
414 printk(IBM_DEBUG "%s: " format, __func__ , ## arg); } while (0)
415 #ifdef CONFIG_THINKPAD_ACPI_DEBUG
416 #define vdbg_printk(a_dbg_level, format, arg...) \
417 dbg_printk(a_dbg_level, format, ## arg)
418 +static const char *str_supported(int is_supported);
419 #else
420 #define vdbg_printk(a_dbg_level, format, arg...)
421 #endif
422 --
423 1.5.1
424
Linux 2.6 ibm-acpi/thinkpad-acpi driver git tree