From: Alex Chiang <achiang@hp.com>
To: venkatesh.pallipadi@intel.com, lenb@kernel.org
Cc: Tony Luck <tony.luck@intel.com>,
linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-acpi@vger.kernel.org, Ingo Molnar <mingo@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH 04/11] ACPI: processor: factor out common _PDC settings
Date: Sun, 20 Dec 2009 12:19:24 -0700 [thread overview]
Message-ID: <20091220191924.4274.27963.stgit@bob.kio> (raw)
In-Reply-To: <20091220190434.4274.67855.stgit@bob.kio>
Both x86 and ia64 initialize _PDC with mostly common bit settings.
Factor out the common settings and leave the arch-specific ones alone.
Cc: Tony Luck <tony.luck@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
---
arch/ia64/kernel/acpi-processor.c | 10 +---------
arch/x86/kernel/acpi/processor.c | 10 +---------
drivers/acpi/processor_pdc.c | 11 +++++++++++
3 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/arch/ia64/kernel/acpi-processor.c b/arch/ia64/kernel/acpi-processor.c
index ab72d46..ebe23f5 100644
--- a/arch/ia64/kernel/acpi-processor.c
+++ b/arch/ia64/kernel/acpi-processor.c
@@ -18,15 +18,7 @@ static void init_intel_pdc(struct acpi_processor *pr)
{
u32 *buf = (u32 *)pr->pdc->pointer->buffer.pointer;
- buf[0] = ACPI_PDC_REVISION_ID;
- buf[1] = 1;
- buf[2] = ACPI_PDC_EST_CAPABILITY_SMP;
- /*
- * The default of PDC_SMP_T_SWCOORD bit is set for IA64 cpu so
- * that OSPM is capable of native ACPI throttling software
- * coordination using BIOS supplied _TSD info.
- */
- buf[2] |= ACPI_PDC_SMP_T_SWCOORD;
+ buf[2] |= ACPI_PDC_EST_CAPABILITY_SMP;
return;
}
diff --git a/arch/x86/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c
index 967860b..d722ca8 100644
--- a/arch/x86/kernel/acpi/processor.c
+++ b/arch/x86/kernel/acpi/processor.c
@@ -16,16 +16,8 @@ static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c)
{
u32 *buf = (u32 *)pr->pdc->pointer->buffer.pointer;
- buf[0] = ACPI_PDC_REVISION_ID;
- buf[1] = 1;
- buf[2] = ACPI_PDC_C_CAPABILITY_SMP;
+ buf[2] |= ACPI_PDC_C_CAPABILITY_SMP;
- /*
- * The default of PDC_SMP_T_SWCOORD bit is set for intel x86 cpu so
- * that OSPM is capable of native ACPI throttling software
- * coordination using BIOS supplied _TSD info.
- */
- buf[2] |= ACPI_PDC_SMP_T_SWCOORD;
if (cpu_has(c, X86_FEATURE_EST))
buf[2] |= ACPI_PDC_EST_CAPABILITY_SWSMP;
diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
index 87946b6..ccda7c9 100644
--- a/drivers/acpi/processor_pdc.c
+++ b/drivers/acpi/processor_pdc.c
@@ -33,6 +33,15 @@ static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = {
{},
};
+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;
+}
+
static void acpi_processor_init_pdc(struct acpi_processor *pr)
{
struct acpi_object_list *obj_list;
@@ -63,6 +72,8 @@ static void acpi_processor_init_pdc(struct acpi_processor *pr)
return;
}
+ acpi_set_pdc_bits(buf);
+
obj->type = ACPI_TYPE_BUFFER;
obj->buffer.length = 12;
obj->buffer.pointer = (u8 *) buf;
next prev parent reply other threads:[~2009-12-20 19:21 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-20 19:19 [PATCH 00/11] ACPI: early _PDC eval and unify x86/ia64 Alex Chiang
2009-12-20 19:19 ` [PATCH 01/11] ACPI: processor: call _PDC early Alex Chiang
2009-12-28 18:39 ` [PATCH] Fix section mismatch error for acpi_early_processor_set_pdc() Luck, Tony
2010-01-06 22:52 ` Alex Chiang
2010-01-16 7:01 ` Len Brown
2009-12-20 19:19 ` [PATCH 02/11] ACPI: processor: introduce arch_has_acpi_pdc Alex Chiang
2009-12-20 19:19 ` [PATCH 03/11] ACPI: processor: unify arch_acpi_processor_init_pdc Alex Chiang
2009-12-20 19:19 ` Alex Chiang [this message]
2009-12-20 19:19 ` [PATCH 05/11] ACPI: processor: finish unifying arch_acpi_processor_init_pdc() Alex Chiang
2009-12-20 19:19 ` [PATCH 06/11] ACPI: processor: unify arch_acpi_processor_cleanup_pdc Alex Chiang
2009-12-20 19:19 ` [PATCH 07/11] ACPI: processor: introduce acpi_processor_alloc_pdc() Alex Chiang
2009-12-20 19:19 ` [PATCH 08/11] ACPI: processor: change acpi_processor_eval_pdc interface Alex Chiang
2009-12-20 19:23 ` [PATCH 1/3] ACPI: processor: open code acpi_processor_cleanup_pdc Alex Chiang
2009-12-20 19:23 ` [PATCH 2/3] ACPI: processor: change acpi_processor_set_pdc() interface Alex Chiang
2009-12-20 19:23 ` [PATCH 3/3] ACPI: processor: remove _PDC object list from struct acpi_processor Alex Chiang
2009-12-20 19:25 ` [PATCH 00/11] ACPI: early _PDC eval and unify x86/ia64 Alex Chiang
2009-12-21 8:15 ` Dominik Brodowski
2009-12-21 21:17 ` Alex Chiang
2009-12-22 8:43 ` Len Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091220191924.4274.27963.stgit@bob.kio \
--to=achiang@hp.com \
--cc=hpa@zytor.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=venkatesh.pallipadi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).