ARM: OMAP2: Dynamic allocator for GPMC memory space

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / machdep.h

diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index fa03864d06eb0d69c528ffa4f25e110d102ca44c..0f9254c18914d6c6afad891d62dc87781cbe3f85 100644 (file)
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -27,6 +27,9 @@ struct device_node;
 struct iommu_table;
 struct rtc_time;
 struct file;
+#ifdef CONFIG_KEXEC
+struct kimage;
+#endif
 
 #ifdef CONFIG_SMP
 struct smp_ops_t {
@@ -44,6 +47,7 @@ struct smp_ops_t {
 #endif
 
 struct machdep_calls {
+       char            *name;
 #ifdef CONFIG_PPC64
        void            (*hpte_invalidate)(unsigned long slot,
                                           unsigned long va,
@@ -82,10 +86,9 @@ struct machdep_calls {
        void            (*iommu_dev_setup)(struct pci_dev *dev);
        void            (*iommu_bus_setup)(struct pci_bus *bus);
        void            (*irq_bus_setup)(struct pci_bus *bus);
-       int             (*set_dabr)(unsigned long dabr);
-#endif
+#endif /* CONFIG_PPC64 */
 
-       int             (*probe)(int platform);
+       int             (*probe)(void);
        void            (*setup_arch)(void);
        void            (*init_early)(void);
        /* Optional, may be NULL. */
@@ -94,7 +97,9 @@ struct machdep_calls {
 
        void            (*init_IRQ)(void);
        int             (*get_irq)(struct pt_regs *);
-       void            (*cpu_irq_down)(int secondary);
+#ifdef CONFIG_KEXEC
+       void            (*kexec_cpu_down)(int crash_shutdown, int secondary);
+#endif
 
        /* PCI stuff */
        /* Called after scanning the bus, before allocating resources */
@@ -130,7 +135,7 @@ struct machdep_calls {
        void            (*nvram_sync)(void);
 
        /* Exception handlers */
-       void            (*system_reset_exception)(struct pt_regs *regs);
+       int             (*system_reset_exception)(struct pt_regs *regs);
        int             (*machine_check_exception)(struct pt_regs *regs);
 
        /* Motherboard/chipset features. This is a kind of general purpose
@@ -154,22 +159,24 @@ struct machdep_calls {
        /* Idle loop for this platform, leave empty for default idle loop */
        void            (*idle_loop)(void);
 
+       /*
+        * Function for waiting for work with reduced power in idle loop;
+        * called with interrupts disabled.
+        */
+       void            (*power_save)(void);
+
        /* Function to enable performance monitor counters for this
           platform, called once per cpu. */
        void            (*enable_pmcs)(void);
 
+       /* Set DABR for this platform, leave empty for default implemenation */
+       int             (*set_dabr)(unsigned long dabr);
+
 #ifdef CONFIG_PPC32    /* XXX for now */
        /* A general init function, called by ppc_init in init/main.c.
           May be NULL. */
        void            (*init)(void);
 
-       void            (*idle)(void);
-       void            (*power_save)(void);
-
-       void            (*heartbeat)(void);
-       unsigned long   heartbeat_reset;
-       unsigned long   heartbeat_count;
-
        void            (*setup_io_mappings)(void);
 
        void            (*early_serial_map)(void);
@@ -201,21 +208,19 @@ struct machdep_calls {
        /* Called at then very end of pcibios_init() */
        void (*pcibios_after_init)(void);
 
-       /* this is for modules, since _machine can be a define -- Cort */
-       int ppc_machine;
+#endif /* CONFIG_PPC32 */
 
-#ifdef CONFIG_KEXEC
        /* Called to shutdown machine specific hardware not already controlled
         * by other drivers.
-        * XXX Should we move this one out of kexec scope?
         */
        void (*machine_shutdown)(void);
 
+#ifdef CONFIG_KEXEC
        /* Called to do the minimal shutdown needed to run a kexec'd kernel
         * to run successfully.
         * XXX Should we move this one out of kexec scope?
         */
-       void (*machine_crash_shutdown)(void);
+       void (*machine_crash_shutdown)(struct pt_regs *regs);
 
        /* Called to do what every setup is needed on image and the
         * reboot code buffer. Returns 0 on success.
@@ -233,13 +238,35 @@ struct machdep_calls {
         */
        void (*machine_kexec)(struct kimage *image);
 #endif /* CONFIG_KEXEC */
-#endif /* CONFIG_PPC32 */
 };
 
-extern void default_idle(void);
-extern void native_idle(void);
+extern void power4_idle(void);
+extern void ppc6xx_idle(void);
 
+/*
+ * ppc_md contains a copy of the machine description structure for the
+ * current platform. machine_id contains the initial address where the
+ * description was found during boot.
+ */
 extern struct machdep_calls ppc_md;
+extern struct machdep_calls *machine_id;
+
+#define __machine_desc __attribute__ ((__section__ (".machine.desc")))
+
+#define define_machine(name)                                   \
+       extern struct machdep_calls mach_##name;                \
+       EXPORT_SYMBOL(mach_##name);                             \
+       struct machdep_calls mach_##name __machine_desc =
+
+#define machine_is(name) \
+       ({ \
+               extern struct machdep_calls mach_##name \
+                       __attribute__((weak));           \
+               machine_id == &mach_##name; \
+       })
+
+extern void probe_machine(void);
+
 extern char cmd_line[COMMAND_LINE_SIZE];
 
 #ifdef CONFIG_PPC_PMAC