Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / include / cpu.h

diff --git a/include/cpu.h b/include/cpu.h
index bfb0db2e2c6dd96c5c52fa65edeb3a1bb9cfeb49..954257715a4197dab2d999324af020cf7c2c7d4a 100644 (file)
--- a/include/cpu.h
+++ b/include/cpu.h
@@ -15,15 +15,22 @@
  * device.
  *
  * @cpu_id:    Platform-specific way of identifying the CPU.
+ * @ucode_version: Microcode version, if CPU_FEAT_UCODE is set
  */
 struct cpu_platdata {
        int cpu_id;
+       int ucode_version;
+       ulong device_id;
+       u16 family;             /* DMTF CPU Family */
+       u32 id[2];              /* DMTF CPU Processor IDs */
 };
 
 /* CPU features - mostly just a placeholder for now */
 enum {
        CPU_FEAT_L1_CACHE       = 0,    /* Supports level 1 cache */
        CPU_FEAT_MMU            = 1,    /* Supports virtual memory */
+       CPU_FEAT_UCODE          = 2,    /* Requires/uses microcode */
+       CPU_FEAT_DEVICE_ID      = 3,    /* Provides a device ID */
 
        CPU_FEAT_COUNT,
 };
@@ -66,6 +73,16 @@ struct cpu_ops {
         * @return CPU count if OK, -ve on error
         */
        int (*get_count)(struct udevice *dev);
+
+       /**
+        * get_vendor() - Get vendor name of a CPU
+        *
+        * @dev:        Device to check (UCLASS_CPU)
+        * @buf:        Buffer to place string
+        * @size:       Size of string space
+        * @return 0 if OK, -ENOSPC if buffer is too small, other -ve on error
+        */
+       int (*get_vendor)(struct udevice *dev, char *buf, int size);
 };
 
 #define cpu_get_ops(dev)        ((struct cpu_ops *)(dev)->driver->ops)
@@ -97,4 +114,14 @@ int cpu_get_info(struct udevice *dev, struct cpu_info *info);
  */
 int cpu_get_count(struct udevice *dev);
 
+/**
+ * cpu_get_vendor() - Get vendor name of a CPU
+ *
+ * @dev:       Device to check (UCLASS_CPU)
+ * @buf:       Buffer to place string
+ * @size:      Size of string space
+ * @return 0 if OK, -ENOSPC if buffer is too small, other -ve on error
+ */
+int cpu_get_vendor(struct udevice *dev, char *buf, int size);
+
 #endif