cpu: Add get_vendor callback

The CPU udevice already has a few callbacks to retreive information
about the currently running CPUs. This patch adds a new get_vendor()
call that returns the vendor of the main CPUs.

Signed-off-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Alexander Graf 2016-08-19 01:23:27 +02:00
parent 6f192ddcbd
commit 94eaa79cec
7 changed files with 59 additions and 0 deletions

View file

@ -189,6 +189,7 @@ static const struct cpu_ops cpu_x86_baytrail_ops = {
.get_desc = cpu_x86_get_desc, .get_desc = cpu_x86_get_desc,
.get_info = baytrail_get_info, .get_info = baytrail_get_info,
.get_count = baytrail_get_count, .get_count = baytrail_get_count,
.get_vendor = cpu_x86_get_vendor,
}; };
static const struct udevice_id cpu_x86_baytrail_ids[] = { static const struct udevice_id cpu_x86_baytrail_ids[] = {

View file

@ -743,6 +743,7 @@ static const struct cpu_ops cpu_x86_broadwell_ops = {
.get_desc = cpu_x86_get_desc, .get_desc = cpu_x86_get_desc,
.get_info = broadwell_get_info, .get_info = broadwell_get_info,
.get_count = broadwell_get_count, .get_count = broadwell_get_count,
.get_vendor = cpu_x86_get_vendor,
}; };
static const struct udevice_id cpu_x86_broadwell_ids[] = { static const struct udevice_id cpu_x86_broadwell_ids[] = {

View file

@ -27,6 +27,18 @@ int cpu_x86_bind(struct udevice *dev)
return 0; return 0;
} }
int cpu_x86_get_vendor(struct udevice *dev, char *buf, int size)
{
const char *vendor = cpu_vendor_name(gd->arch.x86_vendor);
if (size < (strlen(vendor) + 1))
return -ENOSPC;
strcpy(buf, vendor);
return 0;
}
int cpu_x86_get_desc(struct udevice *dev, char *buf, int size) int cpu_x86_get_desc(struct udevice *dev, char *buf, int size)
{ {
if (size < CPU_MAX_NAME_LEN) if (size < CPU_MAX_NAME_LEN)
@ -65,6 +77,7 @@ static int cpu_x86_get_count(struct udevice *dev)
static const struct cpu_ops cpu_x86_ops = { static const struct cpu_ops cpu_x86_ops = {
.get_desc = cpu_x86_get_desc, .get_desc = cpu_x86_get_desc,
.get_count = cpu_x86_get_count, .get_count = cpu_x86_get_count,
.get_vendor = cpu_x86_get_vendor,
}; };
static const struct udevice_id cpu_x86_ids[] = { static const struct udevice_id cpu_x86_ids[] = {

View file

@ -477,6 +477,7 @@ static const struct cpu_ops cpu_x86_model_206ax_ops = {
.get_desc = cpu_x86_get_desc, .get_desc = cpu_x86_get_desc,
.get_info = model_206ax_get_info, .get_info = model_206ax_get_info,
.get_count = model_206ax_get_count, .get_count = model_206ax_get_count,
.get_vendor = cpu_x86_get_vendor,
}; };
static const struct udevice_id cpu_x86_model_206ax_ids[] = { static const struct udevice_id cpu_x86_model_206ax_ids[] = {

View file

@ -31,4 +31,17 @@ int cpu_x86_bind(struct udevice *dev);
*/ */
int cpu_x86_get_desc(struct udevice *dev, char *buf, int size); int cpu_x86_get_desc(struct udevice *dev, char *buf, int size);
/**
* cpu_x86_get_vendor() - Get a vendor string for an x86 CPU
*
* This uses cpu_vendor_name() and is suitable to use as the get_vendor()
* method for the CPU uclass.
*
* @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_x86_get_vendor(struct udevice *dev, char *buf, int size);
#endif /* _ASM_CPU_X86_H */ #endif /* _ASM_CPU_X86_H */

View file

@ -44,6 +44,16 @@ int cpu_get_count(struct udevice *dev)
return ops->get_count(dev); return ops->get_count(dev);
} }
int cpu_get_vendor(struct udevice *dev, char *buf, int size)
{
struct cpu_ops *ops = cpu_get_ops(dev);
if (!ops->get_vendor)
return -ENOSYS;
return ops->get_vendor(dev, buf, size);
}
U_BOOT_DRIVER(cpu_bus) = { U_BOOT_DRIVER(cpu_bus) = {
.name = "cpu_bus", .name = "cpu_bus",
.id = UCLASS_SIMPLE_BUS, .id = UCLASS_SIMPLE_BUS,

View file

@ -73,6 +73,16 @@ struct cpu_ops {
* @return CPU count if OK, -ve on error * @return CPU count if OK, -ve on error
*/ */
int (*get_count)(struct udevice *dev); 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) #define cpu_get_ops(dev) ((struct cpu_ops *)(dev)->driver->ops)
@ -104,4 +114,14 @@ int cpu_get_info(struct udevice *dev, struct cpu_info *info);
*/ */
int cpu_get_count(struct udevice *dev); 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 #endif