>>> Keir Fraser <keir.fraser@xxxxxxxxxxxxx> 09.04.08 18:10 >>>
>Fourth release candidates are available from the public xen-3.1-testing.hg
>and xen-3.2-testing.hg.
>
>BSD/IA64/Sun people: Please at least build test 3.2.1-rc4. There are a
>couple of bugfix backports in tools/libxc which might break your builds.
>It's unlikely, but I'd like to be on the safe side.
For 3.2.1, short of including c/s 17249 and 17386, would it be possible
to at least include the simpler version below, to prevent failing to obtain
proper information needed for successfully powering off various
systems (making use of the optional nature of PM1b_{cnt,evt}_blk)?
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
--- a/xen/arch/x86/acpi/boot.c 2008-04-08 11:22:41.000000000 +0200
+++ b/xen/arch/x86/acpi/boot.c 2008-04-08 11:23:25.000000000 +0200
@@ -392,12 +392,14 @@ acpi_fadt_parse_sleep_info(struct fadt_d
/* Sanity check on FADT Rev. 2 */
if ((fadt->xpm1a_cnt_blk.address_space_id !=
ACPI_ADR_SPACE_SYSTEM_IO) ||
- (fadt->xpm1b_cnt_blk.address_space_id !=
- ACPI_ADR_SPACE_SYSTEM_IO) ||
+ (fadt->xpm1b_cnt_blk.address
+ && fadt->xpm1b_cnt_blk.address_space_id !=
+ ACPI_ADR_SPACE_SYSTEM_IO) ||
(fadt->xpm1a_evt_blk.address_space_id !=
ACPI_ADR_SPACE_SYSTEM_IO) ||
- (fadt->xpm1b_evt_blk.address_space_id !=
- ACPI_ADR_SPACE_SYSTEM_IO))
+ (fadt->xpm1b_evt_blk.address
+ && fadt->xpm1b_evt_blk.address_space_id !=
+ ACPI_ADR_SPACE_SYSTEM_IO))
goto bad;
acpi_sinfo.pm1a_cnt = (uint16_t)fadt->xpm1a_cnt_blk.address;
@@ -415,6 +417,11 @@ acpi_fadt_parse_sleep_info(struct fadt_d
if (!acpi_sinfo.pm1b_evt)
acpi_sinfo.pm1b_evt = (uint16_t)fadt->V1_pm1b_evt_blk;
+ printk(KERN_INFO PREFIX
+ "ACPI SLEEP INFO: pm1x_cnt[%x,%x], pm1x_evt[%x,%x]\n",
+ acpi_sinfo.pm1a_cnt, acpi_sinfo.pm1b_cnt,
+ acpi_sinfo.pm1a_evt, acpi_sinfo.pm1b_cnt);
+
/* Now FACS... */
if (fadt->revision >= FADT2_REVISION_ID)
facs_pa = fadt->xfirmware_ctrl;
@@ -456,10 +463,6 @@ acpi_fadt_parse_sleep_info(struct fadt_d
}
printk(KERN_INFO PREFIX
- "ACPI SLEEP INFO: pm1x_cnt[%x,%x], pm1x_evt[%x,%x]\n",
- acpi_sinfo.pm1a_cnt, acpi_sinfo.pm1b_cnt,
- acpi_sinfo.pm1a_evt, acpi_sinfo.pm1b_cnt);
- printk(KERN_INFO PREFIX
" wakeup_vec[%"PRIx64"], vec_size[%x]\n",
acpi_sinfo.wakeup_vector, acpi_sinfo.vector_width);
return;
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home