Re: Endless ACPI errors on Linus tree (5b664cb235)

From: Takashi Iwai
Date: Fri Jul 18 2008 - 12:39:07 EST


At Fri, 18 Jul 2008 17:16:53 +0100,
Jan Beulich wrote:
>
> >OK, found out the bad commit via bisect.
> >Reverting below fixes the boot problem.
> >
> >
> >commit 01a5bba576b9364b33f61f0cd9fa70c2cf5535e2
> >Author: Jan Beulich <jbeulich@xxxxxxxxxx>
> >Date: Wed Jul 16 23:27:08 2008 +0200
> >
> > Fix FADT parsing
>
> After someone else observed some problem with this patch earlier, I had
> already sent out attached patch as a replacement one. Any chance you
> could also try this with your box?

It resulted in the same error, unfortunately.


thanks,

Takashi

>
> Thanks, Jan
>
> [2 linux-2.6.26-acpi-fadt-parse.patch <text/plain (quoted-printable)>]
> The (1.0 inherited) separate length fields in the FADT are byte
> granular. Further, PM1a/b may have distinct lengths and live in
> distinct address spaces. acpi_tb_convert_fadt() should account for
> all of these conditions.
>
> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
>
> ---
> drivers/acpi/tables/tbfadt.c | 39 ++++++++++++++++++++++++++++++++-------
> 1 file changed, 32 insertions(+), 7 deletions(-)
>
> --- linux-2.6.26/drivers/acpi/tables/tbfadt.c 2008-07-13 23:51:29.000000000 +0200
> +++ 2.6.26-acpi-fadt-parse/drivers/acpi/tables/tbfadt.c 2008-07-18 10:43:55.000000000 +0200
> @@ -50,7 +50,7 @@ ACPI_MODULE_NAME("tbfadt")
> /* Local prototypes */
> static void inline
> acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
> - u8 bit_width, u64 address);
> + u8 byte_width, u64 address);
>
> static void acpi_tb_convert_fadt(void);
>
> @@ -111,7 +111,7 @@ static struct acpi_fadt_info fadt_info_t
> * FUNCTION: acpi_tb_init_generic_address
> *
> * PARAMETERS: generic_address - GAS struct to be initialized
> - * bit_width - Width of this register
> + * byte_width - Width of this register
> * Address - Address of the register
> *
> * RETURN: None
> @@ -124,7 +124,7 @@ static struct acpi_fadt_info fadt_info_t
>
> static void inline
> acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
> - u8 bit_width, u64 address)
> + u8 byte_width, u64 address)
> {
>
> /*
> @@ -136,7 +136,7 @@ acpi_tb_init_generic_address(struct acpi
> /* All other fields are byte-wide */
>
> generic_address->space_id = ACPI_ADR_SPACE_SYSTEM_IO;
> - generic_address->bit_width = bit_width;
> + generic_address->bit_width = byte_width << 3;
> generic_address->bit_offset = 0;
> generic_address->access_width = 0;
> }
> @@ -343,9 +343,21 @@ static void acpi_tb_convert_fadt(void)
> *
> * The PM event blocks are split into two register blocks, first is the
> * PM Status Register block, followed immediately by the PM Enable Register
> - * block. Each is of length (pm1_event_length/2)
> + * block. Each is of length (xpm1x_event_block.bit_width/2)
> */
> - pm1_register_length = (u8) ACPI_DIV_2(acpi_gbl_FADT.pm1_event_length);
> + if (!ACPI_MOD_16(acpi_gbl_FADT.xpm1a_event_block.bit_width))
> + pm1_register_length = (u8) ACPI_DIV_16(acpi_gbl_FADT
> + .xpm1a_event_block
> + .bit_width);
> + else {
> + printk(KERN_WARNING "FADT: "
> + "X_PM1a_EVT_BLK.bit_width=%u is invalid,"
> + " falling back to PM1_EVT_LEN=%u\n",
> + acpi_gbl_FADT.xpm1a_event_block.bit_width,
> + acpi_gbl_FADT.pm1_event_length);
> + pm1_register_length = (u8) ACPI_DIV_2(acpi_gbl_FADT
> + .pm1_event_length);
> + }
>
> /* The PM1A register block is required */
>
> @@ -360,13 +372,26 @@ static void acpi_tb_convert_fadt(void)
> /* The PM1B register block is optional, ignore if not present */
>
> if (acpi_gbl_FADT.xpm1b_event_block.address) {
> + if (!ACPI_MOD_16(acpi_gbl_FADT.xpm1b_event_block.bit_width))
> + pm1_register_length = (u8) ACPI_DIV_16(acpi_gbl_FADT
> + .xpm1b_event_block
> + .bit_width);
> + else {
> + printk(KERN_WARNING "FADT: "
> + "X_PM1b_EVT_BLK.bit_width=%u is invalid,"
> + " falling back to PM1_EVT_LEN=%u\n",
> + acpi_gbl_FADT.xpm1b_event_block.bit_width,
> + acpi_gbl_FADT.pm1_event_length);
> + pm1_register_length = (u8) ACPI_DIV_2(acpi_gbl_FADT
> + .pm1_event_length);
> + }
> acpi_tb_init_generic_address(&acpi_gbl_xpm1b_enable,
> pm1_register_length,
> (acpi_gbl_FADT.xpm1b_event_block.
> address + pm1_register_length));
> /* Don't forget to copy space_id of the GAS */
> acpi_gbl_xpm1b_enable.space_id =
> - acpi_gbl_FADT.xpm1a_event_block.space_id;
> + acpi_gbl_FADT.xpm1b_event_block.space_id;
>
> }
> }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/