UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

omap3: Runtime detection of Si features 

The OMAP35x family has multiple variants differing
in the HW features. This patch detects these features
at runtime and prints information during the boot.

Since most of the code seemed repetitive, macros
have been used for readability.

Signed-off-by: Sanjeev Premi <premi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Sanjeev Premi 2009-11-22 10:10:53 -08:00 committed by Tony Lindgren
parent 45f780a061
commit 8384ce0713
3 changed files with 108 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
arch/arm/mach-omap2/id.c
View File

@ -28,6 +28,7 @@
static struct omap_chip_id omap_chip;
static unsigned int omap_revision;
u32 omap3_features;
unsigned int omap_rev(void)
{
@ -155,7 +156,33 @@ void __init omap24xx_check_revision(void)
pr_info("\n");
}
void __init omap34xx_check_revision(void)
#define OMAP3_CHECK_FEATURE(status,feat) \
if (((status & OMAP3_ ##feat## _MASK) \
>> OMAP3_ ##feat## _SHIFT) != FEAT_ ##feat## _NONE) { \
omap3_features |= OMAP3_HAS_ ##feat; \
}
void __init omap3_check_features(void)
{
u32 status;
omap3_features = 0;
status = omap_ctrl_readl(OMAP3_CONTROL_OMAP_STATUS);
OMAP3_CHECK_FEATURE(status, L2CACHE);
OMAP3_CHECK_FEATURE(status, IVA);
OMAP3_CHECK_FEATURE(status, SGX);
OMAP3_CHECK_FEATURE(status, NEON);
OMAP3_CHECK_FEATURE(status, ISP);
/*
* TODO: Get additional info (where applicable)
* e.g. Size of L2 cache.
*/
}
void __init omap3_check_revision(void)
{
u32 cpuid, idcode;
u16 hawkeye;
@ -212,6 +239,22 @@ out:
pr_info("OMAP%04x %s\n", omap_rev() >> 16, rev_name);
}
#define OMAP3_SHOW_FEATURE(feat) \
if (omap3_has_ ##feat()) { \
pr_info (" - "#feat" : Y"); \
} else { \
pr_info (" - "#feat" : N"); \
}
void __init omap3_cpuinfo(void)
{
OMAP3_SHOW_FEATURE(l2cache);
OMAP3_SHOW_FEATURE(iva);
OMAP3_SHOW_FEATURE(sgx);
OMAP3_SHOW_FEATURE(neon);
OMAP3_SHOW_FEATURE(isp);
}
/*
* Try to detect the exact revision of the omap we're running on
*/
@ -223,8 +266,11 @@ void __init omap2_check_revision(void)
*/
if (cpu_is_omap24xx())
omap24xx_check_revision();
else if (cpu_is_omap34xx())
omap34xx_check_revision();
else if (cpu_is_omap34xx()) {
omap3_check_features();
omap3_check_revision();
omap3_cpuinfo();
}
else if (cpu_is_omap44xx()) {
printk(KERN_INFO "FIXME: CPU revision = OMAP4430\n");
return;

34
arch/arm/plat-omap/include/plat/control.h
View File

@ -254,6 +254,40 @@
#define OMAP343X_SCRATCHPAD (OMAP343X_CTRL_BASE + 0x910)
#define OMAP343X_SCRATCHPAD_ROM_OFFSET 0x19C
/*
* CONTROL OMAP STATUS register to identify OMAP3 features
*/
#define OMAP3_CONTROL_OMAP_STATUS 0x044c
#define OMAP3_SGX_SHIFT 13
#define OMAP3_SGX_MASK (3 << OMAP3_SGX_SHIFT)
#define FEAT_SGX_FULL 0
#define FEAT_SGX_HALF 1
#define FEAT_SGX_NONE 2
#define OMAP3_IVA_SHIFT 12
#define OMAP3_IVA_MASK (1 << OMAP3_SGX_SHIFT)
#define FEAT_IVA 0
#define FEAT_IVA_NONE 1
#define OMAP3_L2CACHE_SHIFT 10
#define OMAP3_L2CACHE_MASK (3 << OMAP3_L2CACHE_SHIFT)
#define FEAT_L2CACHE_NONE 0
#define FEAT_L2CACHE_64KB 1
#define FEAT_L2CACHE_128KB 2
#define FEAT_L2CACHE_256KB 3
#define OMAP3_ISP_SHIFT 5
#define OMAP3_ISP_MASK (1<< OMAP3_ISP_SHIFT)
#define FEAT_ISP 0
#define FEAT_ISP_NONE 1
#define OMAP3_NEON_SHIFT 4
#define OMAP3_NEON_MASK (1<< OMAP3_NEON_SHIFT)
#define FEAT_NEON 0
#define FEAT_NEON_NONE 1
#ifndef __ASSEMBLY__
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
defined(CONFIG_ARCH_OMAP4)

25
arch/arm/plat-omap/include/plat/cpu.h
View File

@ -30,6 +30,8 @@
#ifndef __ASM_ARCH_OMAP_CPU_H
#define __ASM_ARCH_OMAP_CPU_H
#include <linux/bitops.h>
/*
* Omap device type i.e. EMU/HS/TST/GP/BAD
*/
@ -423,4 +425,27 @@ IS_OMAP_TYPE(3430, 0x3430)
int omap_chip_is(struct omap_chip_id oci);
void omap2_check_revision(void);
/*
* Runtime detection of OMAP3 features
*/
extern u32 omap3_features;
#define OMAP3_HAS_L2CACHE BIT(0)
#define OMAP3_HAS_IVA BIT(1)
#define OMAP3_HAS_SGX BIT(2)
#define OMAP3_HAS_NEON BIT(3)
#define OMAP3_HAS_ISP BIT(4)
#define OMAP3_HAS_FEATURE(feat,flag) \
static inline unsigned int omap3_has_ ##feat(void) \
{ \
return (omap3_features & OMAP3_HAS_ ##flag); \
} \
OMAP3_HAS_FEATURE(l2cache, L2CACHE)
OMAP3_HAS_FEATURE(sgx, SGX)
OMAP3_HAS_FEATURE(iva, IVA)
OMAP3_HAS_FEATURE(neon, NEON)
OMAP3_HAS_FEATURE(isp, ISP)
#endif