x86: Move pci init function to x86_init

[safe/jmp/linux-2.6] / arch / x86 / include / asm / x86_init.h

diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index b7d258f..f145d84 100644 (file)
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -2,6 +2,7 @@
 #define _ASM_X86_PLATFORM_H
 
 #include <asm/pgtable_types.h>
+#include <asm/bootparam.h>
 
 struct mpc_bus;
 struct mpc_cpu;
@@ -25,7 +26,7 @@ struct x86_init_mpparse {
        void (*smp_read_mpc_oem)(struct mpc_table *mpc);
        void (*mpc_oem_pci_bus)(struct mpc_bus *m);
        void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
-       void (*find_smp_config)(unsigned int reserve);
+       void (*find_smp_config)(void);
        void (*get_smp_config)(unsigned int early);
 };
 
@@ -34,14 +35,12 @@ struct x86_init_mpparse {
  * @probe_roms:                        probe BIOS roms
  * @reserve_resources:         reserve the standard resources for the
  *                             platform
- * @reserve_ebda_region:       reserve the extended bios data area
  * @memory_setup:              platform specific memory setup
  *
  */
 struct x86_init_resources {
        void (*probe_roms)(void);
        void (*reserve_resources)(void);
-       void (*reserve_ebda_region)(void);
        char *(*memory_setup)(void);
 };
 
@@ -82,9 +81,29 @@ struct x86_init_paging {
  * struct x86_init_timers - platform specific timer setup
  * @setup_perpcu_clockev:      set up the per cpu clock event device for the
  *                             boot cpu
+ * @tsc_pre_init:              platform function called before TSC init
+ * @timer_init:                        initialize the platform timer (default PIT/HPET)
  */
 struct x86_init_timers {
        void (*setup_percpu_clockev)(void);
+       void (*tsc_pre_init)(void);
+       void (*timer_init)(void);
+};
+
+/**
+ * struct x86_init_iommu - platform specific iommu setup
+ * @iommu_init:                        platform specific iommu setup
+ */
+struct x86_init_iommu {
+       int (*iommu_init)(void);
+};
+
+ /*
+  * struct x86_init_pci - platform specific pci init functions
+ * @init:                      platform specific pci init
+ */
+struct x86_init_pci {
+       int (*init)(void);
 };
 
 /**
@@ -98,6 +117,8 @@ struct x86_init_ops {
        struct x86_init_oem             oem;
        struct x86_init_paging          paging;
        struct x86_init_timers          timers;
+       struct x86_init_iommu           iommu;
+       struct x86_init_pci             pci;
 };
 
 /**
@@ -108,8 +129,24 @@ struct x86_cpuinit_ops {
        void (*setup_percpu_clockev)(void);
 };
 
+/**
+ * struct x86_platform_ops - platform specific runtime functions
+ * @calibrate_tsc:             calibrate TSC
+ * @get_wallclock:             get time from HW clock like RTC etc.
+ * @set_wallclock:             set time back to HW clock
+ * @is_untracked_pat_range     exclude from PAT logic
+ */
+struct x86_platform_ops {
+       unsigned long (*calibrate_tsc)(void);
+       unsigned long (*get_wallclock)(void);
+       int (*set_wallclock)(unsigned long nowtime);
+       void (*iommu_shutdown)(void);
+       bool (*is_untracked_pat_range)(u64 start, u64 end);
+};
+
 extern struct x86_init_ops x86_init;
 extern struct x86_cpuinit_ops x86_cpuinit;
+extern struct x86_platform_ops x86_platform;
 
 extern void x86_init_noop(void);
 extern void x86_init_uint_noop(unsigned int unused);