Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f79e3185dd0f8650022518d7624c876d8929061b

Authored by Len Brown
2 parents e8b495fe09 8b8eb7d8cf
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Pull misc into release branch 

Conflicts:

	Documentation/feature-removal-schedule.txt

Showing 8 changed files Side-by-side Diff

Documentation/feature-removal-schedule.txt
Diff comments   View file @ f79e318
... ... @@ -180,24 +180,11 @@
180 180  
181 181 ---------------------------
182 182  
183   -What: /sys/firmware/acpi/namespace
184   -When: 2.6.21
185   -Why: The ACPI namespace is effectively the symbol list for
186   - the BIOS. The device names are completely arbitrary
187   - and have no place being exposed to user-space.
188   -
189   - For those interested in the BIOS ACPI namespace,
190   - the BIOS can be extracted and disassembled with acpidump
191   - and iasl as documented in the pmtools package here:
192   - http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils
193   -Who: Len Brown <len.brown@intel.com>
194   -
195   ----------------------------
196   -
197 183 What: ACPI procfs interface
198   -When: July 2007
199   -Why: After ACPI sysfs conversion, ACPI attributes will be duplicated
200   - in sysfs and the ACPI procfs interface should be removed.
  184 +When: July 2008
  185 +Why: ACPI sysfs conversion should be finished by January 2008.
  186 + ACPI procfs interface will be removed in July 2008 so that
  187 + there is enough time for the user space to catch up.
201 188 Who: Zhang Rui <rui.zhang@intel.com>
202 189  
203 190 ---------------------------
arch/i386/kernel/acpi/boot.c
Diff comments   View file @ f79e318
... ... @@ -986,14 +986,6 @@
986 986 },
987 987 {
988 988 .callback = force_acpi_ht,
989   - .ident = "DELL GX240",
990   - .matches = {
991   - DMI_MATCH(DMI_BOARD_VENDOR, "Dell Computer Corporation"),
992   - DMI_MATCH(DMI_BOARD_NAME, "OptiPlex GX240"),
993   - },
994   - },
995   - {
996   - .callback = force_acpi_ht,
997 989 .ident = "HP VISUALIZE NT Workstation",
998 990 .matches = {
999 991 DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
drivers/acpi/Kconfig
Diff comments   View file @ f79e318
... ... @@ -2,16 +2,12 @@
2 2 # ACPI Configuration
3 3 #
4 4  
5   -menu "ACPI (Advanced Configuration and Power Interface) Support"
  5 +menuconfig ACPI
  6 + bool "ACPI Support (Advanced Configuration and Power Interface) Support"
6 7 depends on !X86_NUMAQ
7 8 depends on !X86_VISWS
8 9 depends on !IA64_HP_SIM
9 10 depends on IA64 || X86
10   - depends on PM
11   -
12   -config ACPI
13   - bool "ACPI Support"
14   - depends on IA64 || X86
15 11 depends on PCI
16 12 depends on PM
17 13 select PNP
... ... @@ -49,7 +45,6 @@
49 45 config ACPI_SLEEP
50 46 bool "Sleep States"
51 47 depends on X86 && (!SMP || SUSPEND_SMP)
52   - depends on PM
53 48 default y
54 49 ---help---
55 50 This option adds support for ACPI suspend states.
... ... @@ -82,7 +77,6 @@
82 77  
83 78 config ACPI_PROCFS
84 79 bool "Procfs interface (deprecated)"
85   - depends on ACPI
86 80 default y
87 81 ---help---
88 82 The Procfs interface for ACPI is made optional for backward compatibility.
... ... @@ -338,7 +332,6 @@
338 332  
339 333 config ACPI_HOTPLUG_MEMORY
340 334 tristate "Memory Hotplug"
341   - depends on ACPI
342 335 depends on MEMORY_HOTPLUG
343 336 default n
344 337 help
... ... @@ -367,6 +360,4 @@
367 360 to today's ACPI "Control Method" battery.
368 361  
369 362 endif # ACPI
370   -
371   -endmenu
... ... @@ -16,7 +16,7 @@
16 16 #if ACPI_GLUE_DEBUG
17 17 #define DBG(x...) printk(PREFIX x)
18 18 #else
19   -#define DBG(x...)
  19 +#define DBG(x...) do { } while(0)
20 20 #endif
21 21 static LIST_HEAD(bus_type_list);
22 22 static DECLARE_RWSEM(bus_type_sem);
drivers/acpi/pci_link.c
Diff comments   View file @ f79e318
... ... @@ -733,7 +733,7 @@
733 733 /* query and set link->irq.active */
734 734 acpi_pci_link_get_current(link);
735 735  
736   - printk(PREFIX "%s [%s] (IRQs", acpi_device_name(device),
  736 + printk(KERN_INFO PREFIX "%s [%s] (IRQs", acpi_device_name(device),
737 737 acpi_device_bid(device));
738 738 for (i = 0; i < link->irq.possible_count; i++) {
739 739 if (link->irq.active == link->irq.possible[i]) {
drivers/acpi/processor_idle.c
Diff comments   View file @ f79e318
... ... @@ -490,7 +490,17 @@
490 490  
491 491 case ACPI_STATE_C3:
492 492  
493   - if (pr->flags.bm_check) {
  493 + /*
  494 + * disable bus master
  495 + * bm_check implies we need ARB_DIS
  496 + * !bm_check implies we need cache flush
  497 + * bm_control implies whether we can do ARB_DIS
  498 + *
  499 + * That leaves a case where bm_check is set and bm_control is
  500 + * not set. In that case we cannot do much, we enter C3
  501 + * without doing anything.
  502 + */
  503 + if (pr->flags.bm_check && pr->flags.bm_control) {
494 504 if (atomic_inc_return(&c3_cpu_count) ==
495 505 num_online_cpus()) {
496 506 /*
... ... @@ -499,7 +509,7 @@
499 509 */
500 510 acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);
501 511 }
502   - } else {
  512 + } else if (!pr->flags.bm_check) {
503 513 /* SMP with no shared cache... Invalidate cache */
504 514 ACPI_FLUSH_CPU_CACHE();
505 515 }
... ... @@ -511,7 +521,7 @@
511 521 acpi_cstate_enter(cx);
512 522 /* Get end time (ticks) */
513 523 t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
514   - if (pr->flags.bm_check) {
  524 + if (pr->flags.bm_check && pr->flags.bm_control) {
515 525 /* Enable bus master arbitration */
516 526 atomic_dec(&c3_cpu_count);
517 527 acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
518 528  
... ... @@ -961,9 +971,9 @@
961 971 if (pr->flags.bm_check) {
962 972 /* bus mastering control is necessary */
963 973 if (!pr->flags.bm_control) {
  974 + /* In this case we enter C3 without bus mastering */
964 975 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
965   - "C3 support requires bus mastering control\n"));
966   - return;
  976 + "C3 support without bus mastering control\n"));
967 977 }
968 978 } else {
969 979 /*
drivers/acpi/sleep/main.c
Diff comments   View file @ f79e318
... ... @@ -210,11 +210,6 @@
210 210  
211 211 /* reset firmware waking vector */
212 212 acpi_set_firmware_waking_vector((acpi_physical_address) 0);
213   -
214   - if (init_8259A_after_S1) {
215   - printk("Broken toshiba laptop -> kicking interrupts\n");
216   - init_8259A(0);
217   - }
218 213 }
219 214  
220 215 static int acpi_hibernation_pre_restore(void)
include/acpi/acmacros.h
Diff comments   View file @ f79e318
... ... @@ -622,26 +622,26 @@
622 622 #define ACPI_DEBUG_EXEC(a)
623 623 #define ACPI_NORMAL_EXEC(a) a;
624 624  
625   -#define ACPI_DEBUG_DEFINE(a)
626   -#define ACPI_DEBUG_ONLY_MEMBERS(a)
627   -#define ACPI_FUNCTION_NAME(a)
628   -#define ACPI_FUNCTION_TRACE(a)
629   -#define ACPI_FUNCTION_TRACE_PTR(a,b)
630   -#define ACPI_FUNCTION_TRACE_U32(a,b)
631   -#define ACPI_FUNCTION_TRACE_STR(a,b)
632   -#define ACPI_FUNCTION_EXIT
633   -#define ACPI_FUNCTION_STATUS_EXIT(s)
634   -#define ACPI_FUNCTION_VALUE_EXIT(s)
635   -#define ACPI_FUNCTION_ENTRY()
636   -#define ACPI_DUMP_STACK_ENTRY(a)
637   -#define ACPI_DUMP_OPERANDS(a,b,c,d,e)
638   -#define ACPI_DUMP_ENTRY(a,b)
639   -#define ACPI_DUMP_TABLES(a,b)
640   -#define ACPI_DUMP_PATHNAME(a,b,c,d)
641   -#define ACPI_DUMP_RESOURCE_LIST(a)
642   -#define ACPI_DUMP_BUFFER(a,b)
643   -#define ACPI_DEBUG_PRINT(pl)
644   -#define ACPI_DEBUG_PRINT_RAW(pl)
  625 +#define ACPI_DEBUG_DEFINE(a) do { } while(0)
  626 +#define ACPI_DEBUG_ONLY_MEMBERS(a) do { } while(0)
  627 +#define ACPI_FUNCTION_NAME(a) do { } while(0)
  628 +#define ACPI_FUNCTION_TRACE(a) do { } while(0)
  629 +#define ACPI_FUNCTION_TRACE_PTR(a,b) do { } while(0)
  630 +#define ACPI_FUNCTION_TRACE_U32(a,b) do { } while(0)
  631 +#define ACPI_FUNCTION_TRACE_STR(a,b) do { } while(0)
  632 +#define ACPI_FUNCTION_EXIT do { } while(0)
  633 +#define ACPI_FUNCTION_STATUS_EXIT(s) do { } while(0)
  634 +#define ACPI_FUNCTION_VALUE_EXIT(s) do { } while(0)
  635 +#define ACPI_FUNCTION_ENTRY() do { } while(0)
  636 +#define ACPI_DUMP_STACK_ENTRY(a) do { } while(0)
  637 +#define ACPI_DUMP_OPERANDS(a,b,c,d,e) do { } while(0)
  638 +#define ACPI_DUMP_ENTRY(a,b) do { } while(0)
  639 +#define ACPI_DUMP_TABLES(a,b) do { } while(0)
  640 +#define ACPI_DUMP_PATHNAME(a,b,c,d) do { } while(0)
  641 +#define ACPI_DUMP_RESOURCE_LIST(a) do { } while(0)
  642 +#define ACPI_DUMP_BUFFER(a,b) do { } while(0)
  643 +#define ACPI_DEBUG_PRINT(pl) do { } while(0)
  644 +#define ACPI_DEBUG_PRINT_RAW(pl) do { } while(0)
645 645  
646 646 #define return_VOID return
647 647 #define return_ACPI_STATUS(s) return(s)