On Thu, 2007-01-18 at 16:42 -0700, Bjorn Helgaas wrote:
> Resources described by the FADT aren't really a good fit for the
> ACPI motherboard driver.
>
> The motherboard driver cares about PNP0C01 and PNP0C02 devices and
> their resources.
>
> The FADT describes some resources used by the ACPI core. Often, they
> are also described by by the _CRS of a motherboard device, but I think
> it's better to reserve them specifically in the ACPI osl.c because
> (a) the motherboard driver is optional and ACPI uses the resources even
> if the driver is absent, and (b) I want to remove the ACPI motherboard
> driver because it's mostly redundant with the PNP system.c driver.
>
> Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
>
> Index: mm-work3/drivers/acpi/motherboard.c
> ===================================================================
> --- mm-work3.orig/drivers/acpi/motherboard.c 2007-01-14 14:52:30.000000000 -0700
> +++ mm-work3/drivers/acpi/motherboard.c 2007-01-18 10:21:13.000000000 -0700
> @@ -118,58 +118,9 @@
> },
> };
>
> -static void __init acpi_request_region (struct acpi_generic_address *addr,
> - unsigned int length, char *desc)
> -{
> - if (!addr->address || !length)
> - return;
> -
> - if (addr->address_space_id == ACPI_ADR_SPACE_SYSTEM_IO)
> - request_region(addr->address, length, desc);
> - else if (addr->address_space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
> - request_mem_region(addr->address, length, desc);
> -}
> -
> -static void __init acpi_reserve_resources(void)
> -{
> - acpi_request_region(&acpi_gbl_FADT->xpm1a_evt_blk,
> - acpi_gbl_FADT->pm1_evt_len, "ACPI PM1a_EVT_BLK");
> -
> - acpi_request_region(&acpi_gbl_FADT->xpm1b_evt_blk,
> - acpi_gbl_FADT->pm1_evt_len, "ACPI PM1b_EVT_BLK");
> -
> - acpi_request_region(&acpi_gbl_FADT->xpm1a_cnt_blk,
> - acpi_gbl_FADT->pm1_cnt_len, "ACPI PM1a_CNT_BLK");
> -
> - acpi_request_region(&acpi_gbl_FADT->xpm1b_cnt_blk,
> - acpi_gbl_FADT->pm1_cnt_len, "ACPI PM1b_CNT_BLK");
> -
> - if (acpi_gbl_FADT->pm_tm_len == 4)
> - acpi_request_region(&acpi_gbl_FADT->xpm_tmr_blk, 4, "ACPI PM_TMR");
> -
> - acpi_request_region(&acpi_gbl_FADT->xpm2_cnt_blk,
> - acpi_gbl_FADT->pm2_cnt_len, "ACPI PM2_CNT_BLK");
> -
> - /* Length of GPE blocks must be a non-negative multiple of 2 */
> -
> - if (!(acpi_gbl_FADT->gpe0_blk_len & 0x1))
> - acpi_request_region(&acpi_gbl_FADT->xgpe0_blk,
> - acpi_gbl_FADT->gpe0_blk_len, "ACPI GPE0_BLK");
> -
> - if (!(acpi_gbl_FADT->gpe1_blk_len & 0x1))
> - acpi_request_region(&acpi_gbl_FADT->xgpe1_blk,
> - acpi_gbl_FADT->gpe1_blk_len, "ACPI GPE1_BLK");
> -}
> -
> static int __init acpi_motherboard_init(void)
> {
> acpi_bus_register_driver(&acpi_motherboard_driver);
> - /*
> - * Guarantee motherboard IO reservation first
> - * This module must run after scan.c
> - */
> - if (!acpi_disabled)
> - acpi_reserve_resources();
> return 0;
> }
>
> Index: mm-work3/drivers/acpi/osl.c
> ===================================================================
> --- mm-work3.orig/drivers/acpi/osl.c 2007-01-14 14:52:30.000000000 -0700
> +++ mm-work3/drivers/acpi/osl.c 2007-01-18 14:39:47.000000000 -0700
> @@ -75,6 +75,54 @@
> static void *acpi_irq_context;
> static struct workqueue_struct *kacpid_wq;
>
> +static void __init acpi_request_region (struct acpi_generic_address *addr,
> + unsigned int length, char *desc)
> +{
> + struct resource *res;
> +
> + if (!addr->address || !length)
> + return;
> +
> + if (addr->address_space_id == ACPI_ADR_SPACE_SYSTEM_IO)
> + res = request_region(addr->address, length, desc);
> + else if (addr->address_space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
> + res = request_mem_region(addr->address, length, desc);
> +}
> +
> +static int __init acpi_reserve_resources(void)
> +{
> + acpi_request_region(&acpi_fadt.xpm1a_evt_blk, acpi_fadt.pm1_evt_len,
> + "ACPI PM1a_EVT_BLK");
> +
> + acpi_request_region(&acpi_fadt.xpm1b_evt_blk, acpi_fadt.pm1_evt_len,
> + "ACPI PM1b_EVT_BLK");
> +
> + acpi_request_region(&acpi_fadt.xpm1a_cnt_blk, acpi_fadt.pm1_cnt_len,
> + "ACPI PM1a_CNT_BLK");
> +
> + acpi_request_region(&acpi_fadt.xpm1b_cnt_blk, acpi_fadt.pm1_cnt_len,
> + "ACPI PM1b_CNT_BLK");
> +
> + if (acpi_fadt.pm_tm_len == 4)
> + acpi_request_region(&acpi_fadt.xpm_tmr_blk, 4, "ACPI PM_TMR");
> +
> + acpi_request_region(&acpi_fadt.xpm2_cnt_blk, acpi_fadt.pm2_cnt_len,
> + "ACPI PM2_CNT_BLK");
> +
> + /* Length of GPE blocks must be a non-negative multiple of 2 */
> +
> + if (!(acpi_fadt.gpe0_blk_len & 0x1))
> + acpi_request_region(&acpi_fadt.xgpe0_blk,
> + acpi_fadt.gpe0_blk_len, "ACPI GPE0_BLK");
> +
> + if (!(acpi_fadt.gpe1_blk_len & 0x1))
> + acpi_request_region(&acpi_fadt.xgpe1_blk,
> + acpi_fadt.gpe1_blk_len, "ACPI GPE1_BLK");
> +
> + return 0;
> +}
> +device_initcall(acpi_reserve_resources);
Will this be called before PCI assigned resources to PCI devices? We use
fs_initcall in motherboard to avoid PCI devices use motherboard's
resources before.
Thanks,
Shaohua
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
