2 files changed, 87 insertions, 35 deletions

diff --git a/include/asm-x86/microcode.h b/include/asm-x86/microcode.h
new file mode 100644
index 000000000000..18b2aeec2adf
--- /dev/null
+++ b/include/asm-x86/microcode.h
@@ -0,0 +1,87 @@
+extern int microcode_init(void *opaque, struct module *module);
+extern void microcode_exit(void);
+
+struct microcode_ops {
+        long (*get_next_ucode)(void **mc, long offset);
+        long (*microcode_get_next_ucode)(void **mc, long offset);
+        int (*get_matching_microcode)(void *mc, int cpu);
+        int (*apply_microcode_check_cpu)(int cpu);
+        int (*microcode_sanity_check)(void *mc);
+        int (*cpu_request_microcode)(int cpu);
+        void (*collect_cpu_info)(int cpu_num);
+        void (*apply_microcode)(int cpu);
+        void (*microcode_fini_cpu)(int cpu);
+        void (*clear_patch)(void *data);
+};
+
+struct microcode_header_intel {
+        unsigned int            hdrver;
+        unsigned int            rev;
+        unsigned int            date;
+        unsigned int            sig;
+        unsigned int            cksum;
+        unsigned int            ldrver;
+        unsigned int            pf;
+        unsigned int            datasize;
+        unsigned int            totalsize;
+        unsigned int            reserved[3];
+};
+
+struct microcode_intel {
+        struct microcode_header_intel hdr;
+        unsigned int            bits[0];
+};
+
+/* microcode format is extended from prescott processors */
+struct extended_signature {
+        unsigned int            sig;
+        unsigned int            pf;
+        unsigned int            cksum;
+};
+
+struct extended_sigtable {
+        unsigned int            count;
+        unsigned int            cksum;
+        unsigned int            reserved[3];
+        struct extended_signature sigs[0];
+};
+
+struct equiv_cpu_entry {
+        unsigned int installed_cpu;
+        unsigned int fixed_errata_mask;
+        unsigned int fixed_errata_compare;
+        unsigned int equiv_cpu;
+};
+
+struct microcode_header_amd {
+        unsigned int  data_code;
+        unsigned int  patch_id;
+        unsigned char mc_patch_data_id[2];
+        unsigned char mc_patch_data_len;
+        unsigned char init_flag;
+        unsigned int  mc_patch_data_checksum;
+        unsigned int  nb_dev_id;
+        unsigned int  sb_dev_id;
+        unsigned char processor_rev_id[2];
+        unsigned char nb_rev_id;
+        unsigned char sb_rev_id;
+        unsigned char bios_api_rev;
+        unsigned char reserved1[3];
+        unsigned int  match_reg[8];
+};
+
+struct microcode_amd {
+        struct microcode_header_amd hdr;
+        unsigned int mpb[0];
+};
+
+struct ucode_cpu_info {
+        int valid;
+        unsigned int sig;
+        unsigned int pf;
+        unsigned int rev;
+        union {
+                struct microcode_intel *mc_intel;
+                struct microcode_amd *mc_amd;
+        } mc;
+};
diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
index 5f58da401b43..58a76f69ee31 100644
--- a/include/asm-x86/processor.h
+++ b/include/asm-x86/processor.h
@@ -561,41 +561,6 @@ static inline void clear_in_cr4(unsigned long mask)
         write_cr4(cr4);
 }
 
-struct microcode_header {
-        unsigned int            hdrver;
-        unsigned int            rev;
-        unsigned int            date;
-        unsigned int            sig;
-        unsigned int            cksum;
-        unsigned int            ldrver;
-        unsigned int            pf;
-        unsigned int            datasize;
-        unsigned int            totalsize;
-        unsigned int            reserved[3];
-};
-
-struct microcode {
-        struct microcode_header hdr;
-        unsigned int            bits[0];
-};
-
-typedef struct microcode        microcode_t;
-typedef struct microcode_header microcode_header_t;
-
-/* microcode format is extended from prescott processors */
-struct extended_signature {
-        unsigned int            sig;
-        unsigned int            pf;
-        unsigned int            cksum;
-};
-
-struct extended_sigtable {
-        unsigned int            count;
-        unsigned int            cksum;
-        unsigned int            reserved[3];
-        struct extended_signature sigs[0];
-};
-
 typedef struct {
         unsigned long           seg;
 } mm_segment_t;