ACPICA: Remove PCI bits from ACPICA when CONFIG_PCI is unset
Allow ACPI to be built without PCI support in place. Signed-off-by: Sinan Kaya <okaya@kernel.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Родитель
8668977687
Коммит
bd23fac3ea
|
@ -77,13 +77,13 @@ acpi-y += \
|
||||||
hwacpi.o \
|
hwacpi.o \
|
||||||
hwesleep.o \
|
hwesleep.o \
|
||||||
hwgpe.o \
|
hwgpe.o \
|
||||||
hwpci.o \
|
|
||||||
hwregs.o \
|
hwregs.o \
|
||||||
hwsleep.o \
|
hwsleep.o \
|
||||||
hwvalid.o \
|
hwvalid.o \
|
||||||
hwxface.o \
|
hwxface.o \
|
||||||
hwxfsleep.o
|
hwxfsleep.o
|
||||||
|
|
||||||
|
acpi-$(CONFIG_PCI) += hwpci.o
|
||||||
acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
|
acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
|
||||||
|
|
||||||
acpi-y += \
|
acpi-y += \
|
||||||
|
|
|
@ -106,11 +106,20 @@ acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
|
||||||
struct acpi_gpe_block_info *gpe_block,
|
struct acpi_gpe_block_info *gpe_block,
|
||||||
void *context);
|
void *context);
|
||||||
|
|
||||||
|
#ifdef ACPI_PCI_CONFIGURED
|
||||||
/*
|
/*
|
||||||
* hwpci - PCI configuration support
|
* hwpci - PCI configuration support
|
||||||
*/
|
*/
|
||||||
acpi_status
|
acpi_status
|
||||||
acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id,
|
acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id,
|
||||||
acpi_handle root_pci_device, acpi_handle pci_region);
|
acpi_handle root_pci_device, acpi_handle pci_region);
|
||||||
|
#else
|
||||||
|
static inline acpi_status
|
||||||
|
acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id, acpi_handle root_pci_device,
|
||||||
|
acpi_handle pci_region)
|
||||||
|
{
|
||||||
|
return AE_SUPPORT;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* __ACHWARE_H__ */
|
#endif /* __ACHWARE_H__ */
|
||||||
|
|
|
@ -364,25 +364,25 @@ acpi_ev_install_space_handler(struct acpi_namespace_node *node,
|
||||||
handler = acpi_ex_system_io_space_handler;
|
handler = acpi_ex_system_io_space_handler;
|
||||||
setup = acpi_ev_io_space_region_setup;
|
setup = acpi_ev_io_space_region_setup;
|
||||||
break;
|
break;
|
||||||
|
#ifdef ACPI_PCI_CONFIGURED
|
||||||
case ACPI_ADR_SPACE_PCI_CONFIG:
|
case ACPI_ADR_SPACE_PCI_CONFIG:
|
||||||
|
|
||||||
handler = acpi_ex_pci_config_space_handler;
|
handler = acpi_ex_pci_config_space_handler;
|
||||||
setup = acpi_ev_pci_config_region_setup;
|
setup = acpi_ev_pci_config_region_setup;
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
case ACPI_ADR_SPACE_CMOS:
|
case ACPI_ADR_SPACE_CMOS:
|
||||||
|
|
||||||
handler = acpi_ex_cmos_space_handler;
|
handler = acpi_ex_cmos_space_handler;
|
||||||
setup = acpi_ev_cmos_region_setup;
|
setup = acpi_ev_cmos_region_setup;
|
||||||
break;
|
break;
|
||||||
|
#ifdef ACPI_PCI_CONFIGURED
|
||||||
case ACPI_ADR_SPACE_PCI_BAR_TARGET:
|
case ACPI_ADR_SPACE_PCI_BAR_TARGET:
|
||||||
|
|
||||||
handler = acpi_ex_pci_bar_space_handler;
|
handler = acpi_ex_pci_bar_space_handler;
|
||||||
setup = acpi_ev_pci_bar_region_setup;
|
setup = acpi_ev_pci_bar_region_setup;
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
case ACPI_ADR_SPACE_DATA_TABLE:
|
case ACPI_ADR_SPACE_DATA_TABLE:
|
||||||
|
|
||||||
handler = acpi_ex_data_table_space_handler;
|
handler = acpi_ex_data_table_space_handler;
|
||||||
|
|
|
@ -311,6 +311,7 @@ acpi_ex_system_io_space_handler(u32 function,
|
||||||
return_ACPI_STATUS(status);
|
return_ACPI_STATUS(status);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef ACPI_PCI_CONFIGURED
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
*
|
*
|
||||||
* FUNCTION: acpi_ex_pci_config_space_handler
|
* FUNCTION: acpi_ex_pci_config_space_handler
|
||||||
|
@ -387,6 +388,7 @@ acpi_ex_pci_config_space_handler(u32 function,
|
||||||
|
|
||||||
return_ACPI_STATUS(status);
|
return_ACPI_STATUS(status);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
*
|
*
|
||||||
|
@ -420,6 +422,7 @@ acpi_ex_cmos_space_handler(u32 function,
|
||||||
return_ACPI_STATUS(status);
|
return_ACPI_STATUS(status);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef ACPI_PCI_CONFIGURED
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
*
|
*
|
||||||
* FUNCTION: acpi_ex_pci_bar_space_handler
|
* FUNCTION: acpi_ex_pci_bar_space_handler
|
||||||
|
@ -451,6 +454,7 @@ acpi_ex_pci_bar_space_handler(u32 function,
|
||||||
|
|
||||||
return_ACPI_STATUS(status);
|
return_ACPI_STATUS(status);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
*
|
*
|
||||||
|
|
|
@ -769,6 +769,7 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u64 value, u32 width)
|
||||||
return AE_OK;
|
return AE_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_PCI
|
||||||
acpi_status
|
acpi_status
|
||||||
acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
|
acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
|
||||||
u64 *value, u32 width)
|
u64 *value, u32 width)
|
||||||
|
@ -827,6 +828,7 @@ acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
|
||||||
|
|
||||||
return (result ? AE_ERROR : AE_OK);
|
return (result ? AE_ERROR : AE_OK);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static void acpi_os_execute_deferred(struct work_struct *work)
|
static void acpi_os_execute_deferred(struct work_struct *work)
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,6 +33,10 @@
|
||||||
|
|
||||||
/* Kernel specific ACPICA configuration */
|
/* Kernel specific ACPICA configuration */
|
||||||
|
|
||||||
|
#ifdef CONFIG_PCI
|
||||||
|
#define ACPI_PCI_CONFIGURED
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_ACPI_REDUCED_HARDWARE_ONLY
|
#ifdef CONFIG_ACPI_REDUCED_HARDWARE_ONLY
|
||||||
#define ACPI_REDUCED_HARDWARE 1
|
#define ACPI_REDUCED_HARDWARE 1
|
||||||
#endif
|
#endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче