From: "Jan Beulich" Subject: [PATCH] linux: make Xen cpufreq handling also work without _PSD objects Date: Mon, 08 Sep 2008 13:58:39 +0100 Message-ID: <48C53D9F.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org _PSD objects are optional according to the ACPI spec. Also eliminate a pointless static variable. As usual, written and tested on 2.6.27-rc5 and made apply to the 2.6.18 tree without further testing. Signed-off-by: Jan Beulich Index: head-2008-09-01/arch/i386/kernel/acpi/processor_extcntl_xen.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head-2008-09-01.orig/arch/i386/kernel/acpi/processor_extcntl_xen.c = 2008-08-07 12:44:36.000000000 +0200 +++ head-2008-09-01/arch/i386/kernel/acpi/processor_extcntl_xen.c = 2008-09-08 11:38:34.000000000 +0200 @@ -32,8 +32,6 @@ #include #include =20 -static int xen_processor_pmbits; - static int xen_cx_notifier(struct acpi_processor *pr, int action) { int ret, count =3D 0, i; @@ -215,13 +213,13 @@ static struct processor_extcntl_ops xen_ =20 void arch_acpi_processor_init_extcntl(const struct processor_extcntl_ops = **ops) { - xen_processor_pmbits =3D (xen_start_info->flags & SIF_PM_MASK) >> = 8; + unsigned int pmbits =3D (xen_start_info->flags & SIF_PM_MASK) >> = 8; =20 - if (xen_processor_pmbits & XEN_PROCESSOR_PM_CX) + if (pmbits & XEN_PROCESSOR_PM_CX) xen_extcntl_ops.pm_ops[PM_TYPE_IDLE] =3D xen_cx_notifier; - if (xen_processor_pmbits & XEN_PROCESSOR_PM_PX) + if (pmbits & XEN_PROCESSOR_PM_PX) xen_extcntl_ops.pm_ops[PM_TYPE_PERF] =3D xen_px_notifier; - if (xen_processor_pmbits & XEN_PROCESSOR_PM_TX) + if (pmbits & XEN_PROCESSOR_PM_TX) xen_extcntl_ops.pm_ops[PM_TYPE_THR] =3D xen_tx_notifier; =20 *ops =3D &xen_extcntl_ops; Index: head-2008-09-01/drivers/acpi/processor_extcntl.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head-2008-09-01.orig/drivers/acpi/processor_extcntl.c 2008-09-01 = 13:03:39.000000000 +0200 +++ head-2008-09-01/drivers/acpi/processor_extcntl.c 2008-09-08 = 11:39:11.000000000 +0200 @@ -195,13 +195,22 @@ static int processor_extcntl_get_perform * processor objects to external logic. In this case, it's = preferred * to use ACPI ID instead. */ - pr->performance->domain_info.num_processors =3D 0; + pdomain =3D &pr->performance->domain_info; + pdomain->num_processors =3D 0; ret =3D acpi_processor_get_psd(pr); - if (ret < 0) - goto err_out; + if (ret < 0) { + /* + * _PSD is optional - assume no coordination if absent (or + * broken), matching native kernels' behavior. + */ + pdomain->num_entries =3D ACPI_PSD_REV0_ENTRIES; + pdomain->revision =3D ACPI_PSD_REV0_REVISION; + pdomain->domain =3D pr->acpi_id; + pdomain->coord_type =3D DOMAIN_COORD_TYPE_SW_ALL; + pdomain->num_processors =3D 1; + } =20 /* Some sanity check */ - pdomain =3D &pr->performance->domain_info; if ((pdomain->revision !=3D ACPI_PSD_REV0_REVISION) || (pdomain->num_entries !=3D ACPI_PSD_REV0_ENTRIES) || ((pdomain->coord_type !=3D DOMAIN_COORD_TYPE_SW_ALL) &&