Linaro-acpi

linaro-acpi@lists.linaro.org

820 discussions

leg-kernel tag leg-20140318.0 released

by Graeme Gregory

The leg-kernel release has been made and tagged as leg-20140318.0 This is based on mainline kernel v3.14-rc7 Repository : http://git.linaro.org/leg/acpi/leg-kernel.git Direct Link: https://git.linaro.org/leg/acpi/leg-kernel.git/commit/9ce67dfb053ccec04f580… Notes :- 1) starting from this release, a FDT is not used to describe the platform. The kernel uses ACPI tables only. This release contains prototype code to boot the CPUs from information held in the MADT. It is hard coded to PSCI control method for the FVP base model

10 years, 7 months

[PATCH] ACPI: Add error checks to ARM ACPI core code

by Ashwin Chaugule

Signed-off-by: Ashwin Chaugule <ashwin.chaugule(a)linaro.org> --- drivers/acpi/plat/arm-core.c | 57 +++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/drivers/acpi/plat/arm-core.c b/drivers/acpi/plat/arm-core.c index 9704229..52865c9 100644 --- a/drivers/acpi/plat/arm-core.c +++ b/drivers/acpi/plat/arm-core.c @@ -224,24 +224,37 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table) static void __init acpi_process_madt(void) { - int error; - - if (!acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt)) { - - /* - * Parse MADT GIC cpu interface entries - */ - error = acpi_parse_madt_gic_entries(); - if (!error) { - /* - * Parse MADT GIC distributor entries - */ - acpi_parse_madt_gic_distributor_entries(); - } + int err; + + err = acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt); + if (err) { + pr_err("Failed to parse MADT\n"); + goto out_err; + } + + /* + * Parse MADT GIC cpu interface entries + */ + err = acpi_parse_madt_gic_entries(); + if (err) { + pr_err("Failed to parse GIC entries from MADT\n"); + goto out_err; + } + + /* + * Parse MADT GIC distributor entries + */ + err = acpi_parse_madt_gic_distributor_entries(); + if (err) { + pr_err("Failed to find GIC Distributor entries from MADT\n"); + goto out_err; } pr_info("Using ACPI for processor (GIC) configuration information\n"); + return; +out_err: + pr_err("Err processing GIC information\n"); return; } @@ -273,20 +286,30 @@ void __init acpi_boot_table_init(void) int __init acpi_boot_init(void) { + int err = 0; /* * If acpi_disabled, bail out */ if (acpi_disabled) return -ENODEV; - acpi_table_parse(ACPI_SIG_FADT, acpi_parse_fadt); + err = acpi_table_parse(ACPI_SIG_FADT, acpi_parse_fadt); + if (err) { + pr_err("Failed to find FADT\n"); + goto out_err; + } /* * Process the Multiple APIC Description Table (MADT), if present */ - acpi_process_madt(); + err = acpi_process_madt(); + if (err) { + pr_err("Failed to process MADT\n"); + goto out_err; + } - return 0; +out_err: + return err; } static int __init parse_acpi(char *arg) -- 1.8.3.2

10 years, 7 months

[PATCH] Restructure code to get static PSCI function ID's

by Ashwin Chaugule

The PSCI Function ID's are well defined for ARM32 and ARM64. See PSCI spec v0.2. The initial version of the PSCI ACPI spec will only have provisions for discovering PSCI and the conduit. (i.e. SMC or HVC) Reformat code in preparation for patches that discover PSCI and the conduit via FACP flags. Signed-off-by: Ashwin Chaugule <ashwin.chaugule(a)linaro.org> --- arch/arm/include/asm/psci.h | 13 ++++++++++++ arch/arm64/include/asm/psci.h | 13 ++++++++++++ arch/arm64/kernel/psci.c | 47 +++++++++++++++++-------------------------- 3 files changed, 44 insertions(+), 29 deletions(-) diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index c4ae171..901de0f 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -34,6 +34,19 @@ struct psci_operations { extern struct psci_operations psci_ops; extern struct smp_operations psci_smp_ops; +/* PSCI Function ID's for ARM32 as per PSCI spec v0.2 */ + +#define PSCI_ID_VERSION 0x84000000 +#define PSCI_ID_CPU_SUSPEND 0x84000001 +#define PSCI_ID_CPU_OFF 0x84000002 +#define PSCI_ID_CPU_ON 0x84000003 +#define PSCI_ID_AFFINITY_INFO 0x84000004 +#define PSCI_ID_CPU_MIGRATE 0x84000005 +#define PSCI_ID_MIGRATE_INFO_TYPE 0x84000006 +#define PSCI_ID_MIGRATE_INFO_UP_CPU 0x84000007 +#define PSCI_ID_SYSTEM_OFF 0x84000008 +#define PSCI_ID_SYSTEM_RESET 0x84000009 + #ifdef CONFIG_ARM_PSCI void psci_init(void); bool psci_smp_available(void); diff --git a/arch/arm64/include/asm/psci.h b/arch/arm64/include/asm/psci.h index e5312ea..3bde75f 100644 --- a/arch/arm64/include/asm/psci.h +++ b/arch/arm64/include/asm/psci.h @@ -16,4 +16,17 @@ int psci_init(void); +/* PSCI Function ID's for ARM64 as per PSCI spec v0.2 */ + +#define PSCI_ID_VERSION 0x84000000 +#define PSCI_ID_CPU_SUSPEND 0xc4000001 +#define PSCI_ID_CPU_OFF 0x84000002 +#define PSCI_ID_CPU_ON 0xc4000003 +#define PSCI_ID_AFFINITY_INFO 0xc4000004 +#define PSCI_ID_CPU_MIGRATE 0xc4000005 +#define PSCI_ID_MIGRATE_INFO_TYPE 0x84000006 +#define PSCI_ID_MIGRATE_INFO_UP_CPU 0xc4000007 +#define PSCI_ID_SYSTEM_OFF 0x84000008 +#define PSCI_ID_SYSTEM_RESET 0x84000009 + #endif /* __ASM_PSCI_H */ diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index abaf7db..0cad34a 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -176,17 +176,12 @@ static const struct of_device_id psci_of_match[] __initconst = { {}, }; -static int __init psci_of_init(void) +static int __init psci_of_init(struct device_node *np) { - struct device_node *np; const char *method; u32 id; int err = 0; - np = of_find_matching_node(NULL, psci_of_match); - if (!np) - return -ENODEV; - pr_info("probing function IDs from device-tree\n"); if (of_property_read_string(np, "method", &method)) { @@ -230,34 +225,27 @@ out_put_node: return err; } -#if defined(CONFIG_ACPI) && defined(CONFIG_ARCH_VEXPRESS) +#if defined(CONFIG_ACPI) static int __init psci_acpi_init(void) { - /* - * FIXME: IDs should be probed from ACPI tables. Due to lack of PSCI - * support in ACPI 5.0, function IDs are hard coded. - * - * IDs are taken directly from fvp-base-gicv2-psci.dts as we currently - * support FVP Base model. Also, we do not have ID register unique - * for FVP model, thus we make code dependent on CONFIG_ARCH_VEXPRESS - * too. + /*TODO: Get conduit method from FACP flags, after + * discovering PSCI. Ret -ENODEV otherwise. */ -#define PSCI_FVP_ID_SUSPEND 0xc4000001 -#define PSCI_FVP_ID_OFF 0x84000002 -#define PSCI_FVP_ID_ON 0xc4000003 - - pr_info("Get hard coded PSCI function IDs\n"); + pr_info("Get PSCI method.\n"); invoke_psci_fn = __invoke_psci_fn_smc; - psci_function_id[PSCI_FN_CPU_SUSPEND] = PSCI_FVP_ID_SUSPEND; + pr_info("Initializing PSCI Function Id's.\n"); + psci_function_id[PSCI_FN_CPU_SUSPEND] = PSCI_ID_CPU_SUSPEND; psci_ops.cpu_suspend = psci_cpu_suspend; - psci_function_id[PSCI_FN_CPU_OFF] = PSCI_FVP_ID_OFF; + psci_function_id[PSCI_FN_CPU_OFF] = PSCI_ID_CPU_OFF; psci_ops.cpu_off = psci_cpu_off; - psci_function_id[PSCI_FN_CPU_ON] = PSCI_FVP_ID_ON; + psci_function_id[PSCI_FN_CPU_ON] = PSCI_ID_CPU_ON; psci_ops.cpu_on = psci_cpu_on; + psci_function_id[PSCI_FN_MIGRATE] = PSCI_ID_CPU_MIGRATE; + psci_ops.migrate = psci_migrate; return 0; } #else @@ -269,13 +257,14 @@ static int __init psci_acpi_init(void) int __init psci_init(void) { - int status; - - status = psci_of_init(); - if (!status) - return status; + struct device_node *np; - return psci_acpi_init(); + /* Check if there is a valid DT entry first. */ + np = of_find_matching_node(NULL, psci_of_match); + if (np) + return psci_of_init(np); + else + return psci_acpi_init(); } #ifdef CONFIG_SMP -- 1.8.3.2

10 years, 7 months

leg-kernel tag leg-20140313.0 released

by Graeme Gregory

The leg-kernel release has been made and tagged as leg-20140313.0 This is based on mainline kernel v3.14-rc6 Repository : http://git.linaro.org/leg/acpi/leg-kernel.git Direct Link: https://git.linaro.org/leg/acpi/leg-kernel.git/commit/d8bfabcad828ad3dbf3b6… Notes :- 1) starting from this release, a FDT is not used to describe the platform. The kernel uses ACPI tables only. This release contains prototype code to boot the CPUs from information held in the MADT. It is hard coded to PSCI control method for the FVP base model

10 years, 7 months

leg-kernel tag leg-20140306.0 released

by Graeme Gregory

The leg-kernel release has been made and tagged as leg-20140306.0 This is based on mainline kernel v3.14-rc5 Repository : http://git.linaro.org/leg/acpi/leg-kernel.git Direct Link: https://git.linaro.org/leg/acpi/leg-kernel.git/commit/8506af0325655fef22731… Notes :- 1) starting from this release, a FDT is not used to describe the platform. The kernel uses ACPI tables only. This release contains prototype code to boot the CPUs from information held in the MADT. It is hard coded to PSCI control method for the FVP base model

10 years, 7 months

ACPI and leg-kernel repos moving

by Graeme Gregory

Hi, The ACPI and leg-kernel repos will be moving from their current location which to under the leg/ location instead. So they will become leg/acpi/acpi.git - The kernel development tree of the ACPI team leg/acpi/acpi-asl.git - The ASL tree leg/acpi/leg-kernel.git - the leg-kernel releases tree. This is due to the arm/ location being meant for arm landing team. ACPI Team if you could check wiki pages for references to old address and update as needed that would be great. Fathi if you could change the leg-kernel CI loop to the new address? We will owe you a beer! Thanks Graeme

10 years, 7 months

[PATCH] ACPI / trivial: Remove the duplicate macro for PREFIX

by Hanjun Guo

we already have a macro for PREFIX of "ACPI: " in drivers/acpi/internal.h, so remove the duplicate ones in ACPI drivers when internal.h is included. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- drivers/acpi/acpi_cmos_rtc.c | 2 -- drivers/acpi/container.c | 2 -- drivers/acpi/dock.c | 2 -- drivers/acpi/osl.c | 2 +- drivers/acpi/pci_link.c | 2 -- drivers/acpi/pci_root.c | 2 -- drivers/acpi/power.c | 2 -- drivers/acpi/processor_core.c | 1 - drivers/acpi/processor_driver.c | 2 -- drivers/acpi/sysfs.c | 2 -- drivers/acpi/video.c | 2 -- drivers/acpi/video_detect.c | 2 -- 12 files changed, 1 insertion(+), 22 deletions(-) diff --git a/drivers/acpi/acpi_cmos_rtc.c b/drivers/acpi/acpi_cmos_rtc.c index 84190ed..961b45d 100644 --- a/drivers/acpi/acpi_cmos_rtc.c +++ b/drivers/acpi/acpi_cmos_rtc.c @@ -18,8 +18,6 @@ #include "internal.h" -#define PREFIX "ACPI: " - ACPI_MODULE_NAME("cmos rtc"); static const struct acpi_device_id acpi_cmos_rtc_ids[] = { diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index a55cccb..63119d0 100644 --- a/drivers/acpi/container.c +++ b/drivers/acpi/container.c @@ -31,8 +31,6 @@ #include "internal.h" -#define PREFIX "ACPI: " - #define _COMPONENT ACPI_CONTAINER_COMPONENT ACPI_MODULE_NAME("container"); diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index a7bd300..f0fc626 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -37,8 +37,6 @@ #include "internal.h" -#define PREFIX "ACPI: " - #define ACPI_DOCK_DRIVER_DESCRIPTION "ACPI Dock Station Driver" ACPI_MODULE_NAME("dock"); diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index d40d6dc..f7fd72a 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -52,7 +52,7 @@ #define _COMPONENT ACPI_OS_SERVICES ACPI_MODULE_NAME("osl"); -#define PREFIX "ACPI: " + struct acpi_os_dpc { acpi_osd_exec_callback function; void *context; diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 9418c7a..cfd7581 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -43,8 +43,6 @@ #include "internal.h" -#define PREFIX "ACPI: " - #define _COMPONENT ACPI_PCI_COMPONENT ACPI_MODULE_NAME("pci_link"); #define ACPI_PCI_LINK_CLASS "pci_irq_routing" diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index c288ff3..d388f13 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -39,8 +39,6 @@ #include "internal.h" -#define PREFIX "ACPI: " - #define _COMPONENT ACPI_PCI_COMPONENT ACPI_MODULE_NAME("pci_root"); #define ACPI_PCI_ROOT_CLASS "pci_bridge" diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index ad7da68..e0bcfb6 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@ -46,8 +46,6 @@ #include "sleep.h" #include "internal.h" -#define PREFIX "ACPI: " - #define _COMPONENT ACPI_POWER_COMPONENT ACPI_MODULE_NAME("power"); #define ACPI_POWER_CLASS "power_resource" diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index a4eea9a..57e0769 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -15,7 +15,6 @@ #include "internal.h" -#define PREFIX "ACPI: " #define _COMPONENT ACPI_PROCESSOR_COMPONENT ACPI_MODULE_NAME("processor_core"); diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index c1c3562..7f70f31 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c @@ -41,8 +41,6 @@ #include "internal.h" -#define PREFIX "ACPI: " - #define ACPI_PROCESSOR_NOTIFY_PERFORMANCE 0x80 #define ACPI_PROCESSOR_NOTIFY_POWER 0x81 #define ACPI_PROCESSOR_NOTIFY_THROTTLING 0x82 diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c index 91a32ce..38cb978 100644 --- a/drivers/acpi/sysfs.c +++ b/drivers/acpi/sysfs.c @@ -12,8 +12,6 @@ #define _COMPONENT ACPI_SYSTEM_COMPONENT ACPI_MODULE_NAME("sysfs"); -#define PREFIX "ACPI: " - #ifdef CONFIG_ACPI_DEBUG /* * ACPI debug sysfs I/F, including: diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index b6ba88e..48c7e8a 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -45,8 +45,6 @@ #include "internal.h" -#define PREFIX "ACPI: " - #define ACPI_VIDEO_BUS_NAME "Video Bus" #define ACPI_VIDEO_DEVICE_NAME "Video Device" #define ACPI_VIDEO_NOTIFY_SWITCH 0x80 diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c index 19080c8..33e3db5 100644 --- a/drivers/acpi/video_detect.c +++ b/drivers/acpi/video_detect.c @@ -40,8 +40,6 @@ #include "internal.h" -#define PREFIX "ACPI: " - ACPI_MODULE_NAME("video"); #define _COMPONENT ACPI_VIDEO_COMPONENT -- 1.7.9.5

10 years, 7 months

[PATCH 1/2] Include correct definition for gic init with no ACPI

by Ashwin Chaugule

Include the correct definitions for gic_acpi_init() when building with CONFIG_ACPI=n. Signed-off-by: Ashwin Chaugule <ashwin.chaugule(a)linaro.org> --- arch/arm64/kernel/irq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/irq.c b/arch/arm64/kernel/irq.c index a99bfc7..9ea35113 100644 --- a/arch/arm64/kernel/irq.c +++ b/arch/arm64/kernel/irq.c @@ -25,11 +25,12 @@ #include <linux/irq.h> #include <linux/smp.h> #include <linux/init.h> -#include <linux/acpi.h> #include <linux/irqchip.h> #include <linux/seq_file.h> #include <linux/ratelimit.h> +#include <asm/acpi.h> + unsigned long irq_err_count; int arch_show_interrupts(struct seq_file *p, int prec) -- 1.8.3.2

10 years, 8 months

Connect: ACPI Power Management Session

by Graeme Gregory

Hi, Here are the minutes I took, its always difficult to capture everything so I apologise if I missed something or misrepresented. ACPI Power Management --------------------- Not sure if it is ACPI core or driver that calls _PS? methods, Graeme thinks it is ACPI core. Must check. PSCI transitions do not go through AML Where people say "UEFI" when talking about hardware initialisation this actually means that by the time we enter kernel it will have been done. This does not actually mean UEFI needs to do this. Fine grained means devices, so if two children shut off its upto firmware to work out and shut down the parent. ASWG ASAP items, new GIC tables, flags for PSCI, GTDT memory mapped timers. Is there a way to repeat runtime PM ability to not shutdown due to latency cost. Will need to be investigated. If using an embedded power controller, what is the path for events. There is a general lack of latency type control in ACPI. Also missing dependencies between devices and also devices states and C states. At least one CPU is always in control of D-State transitions. Improved CPU state change latency is in discussion in ASWG. Discussion on extending the spec to allow for P-States on devices, this would give devfreq support for ACPI machines. Dong Wei - Please participate in ASWG to improve the spec.

10 years, 8 months

[RESEND][PATCH v5 2/5] ACPI / processor_core: Rework _PDC related stuff to make it more arch-independent

by Hanjun Guo

_PDC related stuff in processor_core.c is little bit X86/IA64 dependent, macros of ACPI_PDC_* are _PDC bit definitions for Intel processors, if we use these macros in processor_core.c, we can not compile it when ACPI is enabled on ARM/ARM64. This patch reworks the code to make it more arch-independent, moving Intel related _PDC bits into architecture directory, no functional change. Cc: Tony Luck <tony.luck(a)intel.com> Cc: Fenghua Yu <fenghua.yu(a)intel.com> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: "H. Peter Anvin" <hpa(a)zytor.com> Cc: x86(a)kernel.org Cc: linux-ia64(a)vger.kernel.org Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> Signed-off-by: Graeme Gregory <graeme.gregory(a)linaro.org> --- Hi Tony, Fenghua, Thomas, Peter, this patch was reviewed in ACPI mailling list, and updated for serveral versions, Rafael needs your opinion on this patch, could you please review and ack it? Thanks Hanjun --- arch/ia64/include/asm/acpi.h | 5 +---- arch/ia64/kernel/acpi.c | 14 ++++++++++++++ arch/x86/include/asm/acpi.h | 19 +------------------ arch/x86/kernel/acpi/cstate.c | 29 +++++++++++++++++++++++++++++ drivers/acpi/processor_core.c | 19 +------------------ 5 files changed, 46 insertions(+), 40 deletions(-) diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h index d651102..d2b8b9d 100644 --- a/arch/ia64/include/asm/acpi.h +++ b/arch/ia64/include/asm/acpi.h @@ -152,10 +152,7 @@ extern int __initdata nid_to_pxm_map[MAX_NUMNODES]; #endif static inline bool arch_has_acpi_pdc(void) { return true; } -static inline void arch_acpi_set_pdc_bits(u32 *buf) -{ - buf[2] |= ACPI_PDC_EST_CAPABILITY_SMP; -} +extern void arch_acpi_set_pdc_bits(u32 *buf); #define acpi_unlazy_tlb(x) diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 07d209c..af9d9e4 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c @@ -1014,3 +1014,17 @@ EXPORT_SYMBOL(acpi_unregister_ioapic); * TBD when when IA64 starts to support suspend... */ int acpi_suspend_lowlevel(void) { return 0; } + +void arch_acpi_set_pdc_bits(u32 *buf) +{ + /* Enable coordination with firmware's _TSD info */ + buf[2] |= ACPI_PDC_SMP_T_SWCOORD | ACPI_PDC_EST_CAPABILITY_SMP; + if (boot_option_idle_override == IDLE_NOMWAIT) { + /* + * If mwait is disabled for CPU C-states, the C2C3_FFH access + * mode will be disabled in the parameter of _PDC object. + * Of course C1_FFH access mode will also be disabled. + */ + buf[2] &= ~(ACPI_PDC_C_C2C3_FFH | ACPI_PDC_C_C1_FFH); + } +} diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index c8c1e70..e9f71bc 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -147,24 +147,7 @@ static inline bool arch_has_acpi_pdc(void) c->x86_vendor == X86_VENDOR_CENTAUR); } -static inline void arch_acpi_set_pdc_bits(u32 *buf) -{ - struct cpuinfo_x86 *c = &cpu_data(0); - - buf[2] |= ACPI_PDC_C_CAPABILITY_SMP; - - if (cpu_has(c, X86_FEATURE_EST)) - buf[2] |= ACPI_PDC_EST_CAPABILITY_SWSMP; - - if (cpu_has(c, X86_FEATURE_ACPI)) - buf[2] |= ACPI_PDC_T_FFH; - - /* - * If mwait/monitor is unsupported, C2/C3_FFH will be disabled - */ - if (!cpu_has(c, X86_FEATURE_MWAIT)) - buf[2] &= ~(ACPI_PDC_C_C2C3_FFH); -} +extern void arch_acpi_set_pdc_bits(u32 *buf); #else /* !CONFIG_ACPI */ diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c index e69182f..a36638f 100644 --- a/arch/x86/kernel/acpi/cstate.c +++ b/arch/x86/kernel/acpi/cstate.c @@ -16,6 +16,35 @@ #include <asm/mwait.h> #include <asm/special_insns.h> +void arch_acpi_set_pdc_bits(u32 *buf) +{ + struct cpuinfo_x86 *c = &cpu_data(0); + + /* Enable coordination with firmware's _TSD info */ + buf[2] |= ACPI_PDC_SMP_T_SWCOORD | ACPI_PDC_C_CAPABILITY_SMP; + + if (cpu_has(c, X86_FEATURE_EST)) + buf[2] |= ACPI_PDC_EST_CAPABILITY_SWSMP; + + if (cpu_has(c, X86_FEATURE_ACPI)) + buf[2] |= ACPI_PDC_T_FFH; + + /* + * If mwait/monitor is unsupported, C2/C3_FFH will be disabled + */ + if (!cpu_has(c, X86_FEATURE_MWAIT)) + buf[2] &= ~(ACPI_PDC_C_C2C3_FFH); + + if (boot_option_idle_override == IDLE_NOMWAIT) { + /* + * If mwait is disabled for CPU C-states, the C2C3_FFH access + * mode will be disabled in the parameter of _PDC object. + * Of course C1_FFH access mode will also be disabled. + */ + buf[2] &= ~(ACPI_PDC_C_C2C3_FFH | ACPI_PDC_C_C1_FFH); + } +} + /* * Initialize bm_flags based on the CPU cache properties * On SMP it depends on cache configuration diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 4d91b32..4dcf776 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -255,9 +255,6 @@ static void acpi_set_pdc_bits(u32 *buf) buf[0] = ACPI_PDC_REVISION_ID; buf[1] = 1; - /* Enable coordination with firmware's _TSD info */ - buf[2] = ACPI_PDC_SMP_T_SWCOORD; - /* Twiddle arch-specific bits needed for _PDC */ arch_acpi_set_pdc_bits(buf); } @@ -282,7 +279,7 @@ static struct acpi_object_list *acpi_processor_alloc_pdc(void) return NULL; } - buf = kmalloc(12, GFP_KERNEL); + buf = kzalloc(12, GFP_KERNEL); if (!buf) { printk(KERN_ERR "Memory allocation error\n"); kfree(obj); @@ -310,20 +307,6 @@ acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in) { acpi_status status = AE_OK; - if (boot_option_idle_override == IDLE_NOMWAIT) { - /* - * If mwait is disabled for CPU C-states, the C2C3_FFH access - * mode will be disabled in the parameter of _PDC object. - * Of course C1_FFH access mode will also be disabled. - */ - union acpi_object *obj; - u32 *buffer = NULL; - - obj = pdc_in->pointer; - buffer = (u32 *)(obj->buffer.pointer); - buffer[2] &= ~(ACPI_PDC_C_C2C3_FFH | ACPI_PDC_C_C1_FFH); - - } status = acpi_evaluate_object(handle, "_PDC", pdc_in, NULL); if (ACPI_FAILURE(status)) -- 1.7.9.5

10 years, 8 months

← Newer
1
...
49
50
51
52
53
54
55
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Linaro-acpi