Skip to contentSkip to conversation

OMAP4: Fix cpu detection

PATCH Superseded Santosh Shilimkar 7 participants 23 messages Dec 9, 2009 – Dec 11, 2009

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 OMAP4: Fix cpu detection

This patch fixes the OMAP4430 cpu detection. Since the omap ID register is not fused in OMAP4430 ES1.0 silicon, identification is done using ARM CPUID register.

---
 arch/arm/mach-omap2/id.c              |   27 ++++++++++++++++++++++++++-
 arch/arm/plat-omap/common.c           |    2 +-
 arch/arm/plat-omap/include/plat/cpu.h |    3 ++-
 3 files changed, 29 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/id.c +26 -1
index f48a4b2..52c6478 100644
@@ -246,6 +246,31 @@ void __init omap3_check_revision(void)
 	}
 }
 
+void __init omap4_check_revision(void)
+{
+	u32 idcode;
+	u16 hawkeye;
+	u8 rev;
+	char *rev_name = "ES1.0";
+
+	/*
+	 * The IC rev detection is done with hawkeye and rev.
+	 * Note that rev does not map directly to defined processor
+	 * revision numbers as ES1.0 uses value 0.
+	 */
+	idcode = read_tap_reg(OMAP_TAP_IDCODE);
+	hawkeye = (idcode >> 12) & 0xffff;
+	rev = (idcode >> 28) & 0xff;
+
+	if ((hawkeye == 0xb852) && (rev == 0x0)) {
+		omap_revision = OMAP4430_REV_ES1_0;
+		pr_info("OMAP%04x %s\n", omap_rev() >> 16, rev_name);
+		return;
+	}
+
+	printk(KERN_ERR "Unknown OMAP CPU id\n");
+}
+
 #define OMAP3_SHOW_FEATURE(feat)		\
 	if (omap3_has_ ##feat())		\
 		printk(#feat" ");
@@ -336,7 +361,7 @@ void __init omap2_check_revision(void)
 		omap3_check_features();
 		omap3_cpuinfo();
 	} else if (cpu_is_omap44xx()) {
-		printk(KERN_INFO "FIXME: CPU revision = OMAP4430\n");
+		omap4_check_revision();
 		return;
 	} else {
 		pr_err("OMAP revision unknown, please fix!\n");
arch/arm/plat-omap/common.c +1 -1
index cc050b3..3473a80 100644
@@ -280,7 +280,7 @@ void __init omap2_set_globals_343x(void)
 #if defined(CONFIG_ARCH_OMAP4)
 static struct omap_globals omap4_globals = {
 	.class	= OMAP443X_CLASS,
-	.tap	= OMAP2_L4_IO_ADDRESS(0x4830a000),
+	.tap	= OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE),
 	.ctrl	= OMAP2_L4_IO_ADDRESS(OMAP443X_CTRL_BASE),
 	.prm	= OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE),
 	.cm	= OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE),
arch/arm/plat-omap/include/plat/cpu.h +2 -1
index 2e17890..2a141ba 100644
@@ -443,7 +443,8 @@ IS_OMAP_TYPE(3517, 0x3517)
 #define OMAP3505_REV(v)		(OMAP35XX_CLASS | (0x3505 << 16) | (v << 12))
 #define OMAP3517_REV(v)		(OMAP35XX_CLASS | (0x3517 << 16) | (v << 12))
 
-#define OMAP443X_CLASS		0x44300034
+#define OMAP443X_CLASS		0x44300044
+#define OMAP4430_REV_ES1_0	0x44300044
 
 /*
  * omap_chip bits
Signature · 1 line
1.6.0.4
#1 lore raw

PATCH 2/6 OMAP4: Fix SRAM base and size

This patch fixes the public sram base address and available size on OMAP4430.

---
 arch/arm/plat-omap/sram.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
arch/arm/plat-omap/sram.c +9 -3
index 3e92366..3044009 100644
@@ -47,8 +47,10 @@
 #define OMAP3_SRAM_VA           0xfe400000
 #define OMAP3_SRAM_PUB_PA       0x40208000
 #define OMAP3_SRAM_PUB_VA       (OMAP3_SRAM_VA + 0x8000)
-#define OMAP4_SRAM_PA		0x40200000		/*0x402f0000*/
-#define OMAP4_SRAM_VA		0xfe400000		/*0xfe4f0000*/
+#define OMAP4_SRAM_PA		0x40300000
+#define OMAP4_SRAM_VA		0xfe400000
+#define OMAP4_SRAM_PUB_PA	(OMAP4_SRAM_PA + 0x4000)
+#define OMAP4_SRAM_PUB_VA	(OMAP4_SRAM_VA + 0x4000)
 
 #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
 #define SRAM_BOOTLOADER_SZ	0x00
@@ -139,6 +141,10 @@ void __init omap_detect_sram(void)
 				} else {
 					omap_sram_size = 0x8000; /* 32K */
 				}
+			} else if (cpu_is_omap44xx()) {
+				omap_sram_base = OMAP4_SRAM_PUB_VA;
+				omap_sram_start = OMAP4_SRAM_PUB_PA;
+				omap_sram_size = 0xa000; /* 40K */
 			} else {
 				omap_sram_base = OMAP2_SRAM_PUB_VA;
 				omap_sram_start = OMAP2_SRAM_PUB_PA;
@@ -152,7 +158,7 @@ void __init omap_detect_sram(void)
 			} else if (cpu_is_omap44xx()) {
 				omap_sram_base = OMAP4_SRAM_VA;
 				omap_sram_start = OMAP4_SRAM_PA;
-				omap_sram_size = 0x8000; /* 32K */
+				omap_sram_size = 0xe000; /* 56K */
 			} else {
 				omap_sram_base = OMAP2_SRAM_VA;
 				omap_sram_start = OMAP2_SRAM_PA;
Signature · 1 line
1.6.0.4
#2 lore raw

PATCH 3/6 OMAP4: Re-arrange the low level debug code

On OMAP4430 the UART3 base address is different than that on OMAP3. Because of this existing code needs additional #ifdef'ry to accommodate that code. Hence this patch separates it. Also UART3 base address is fixed for OMAP4430 in this patch.

---
 arch/arm/mach-omap2/include/mach/debug-macro.S |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/include/mach/debug-macro.S +12 -1
index e9f255d..b2b4b29 100644
@@ -25,7 +25,7 @@
 		add	\rx, \rx, #0x00004000	@ UART 3
 #endif
 
-#elif defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
+#elif CONFIG_ARCH_OMAP3
 		moveq	\rx, #0x48000000	@ physical base address
 		movne	\rx, #0xfa000000	@ virtual base
 		orr	\rx, \rx, #0x0006a000
@@ -36,6 +36,17 @@
 		add	\rx, \rx, #0x00fb0000	@ UART 3
 		add	\rx, \rx, #0x00006000
 #endif
+#elif CONFIG_ARCH_OMAP4
+		moveq	\rx, #0x48000000	@ physical base address
+		movne	\rx, #0xfa000000	@ virtua base
+		orr	\rx, \rx, #0x0006a000	@ UART 1
+#ifdef CONFIG_OMAP_LL_DEBUG_UART2
+		add	\rx, \rx, #0x00002000	@ UART 2
+#endif
+#ifdef CONFIG_OMAP_LL_DEBUG_UART3
+		and 	\rx, \rx, #0xff000000
+		add	\rx, \rx, #0x00020000	@ UART 3
+#endif
 #endif
 		.endm
 
Signature · 1 line
1.6.0.4
#3 lore raw

PATCH 4/6 OMAP4: AuxCoreBoot registers only accessible in secure mode.

The AuxCoreBoot0 and AuxCoreBoot1 can be only accessed in secure mode. Replace the current code with secure monitor API's to access/modify these registers.

---
 arch/arm/mach-omap2/omap-headsmp.S    |   35 +++++++++++++++++++++++++-------
 arch/arm/mach-omap2/omap-smp.c        |   24 +++++++---------------
 arch/arm/plat-omap/include/plat/smp.h |    2 +
 3 files changed, 37 insertions(+), 24 deletions(-)
arch/arm/mach-omap2/omap-headsmp.S +27 -8
index 4afadba..aa3f65c 100644
@@ -27,20 +27,39 @@
  * OMAP4 specific entry point for secondary CPU to jump from ROM
  * code.  This routine also provides a holding flag into which
  * secondary core is held until we're ready for it to initialise.
- * The primary core will update the this flag using a hardware
- * register AuxCoreBoot1.
+ * The primary core will update this flag using a hardware
+ * register AuxCoreBoot0.
  */
 ENTRY(omap_secondary_startup)
-	mrc	p15, 0, r0, c0, c0, 5
-	and	r0, r0, #0x0f
-hold:	ldr	r1, =OMAP4_AUX_CORE_BOOT1_PA	@ read from AuxCoreBoot1
-	ldr	r2, [r1]
-	cmp	r2, r0
+hold:	ldr	r12,=0x103
+	dsb
+	smc				@ read from AuxCoreBoot0
+	mov	r0, r0, lsr #9
+	mrc	p15, 0, r4, c0, c0, 5
+	and	r4, r4, #0x0f
+	cmp	r0, r4
 	bne	hold
 
 	/*
-	 * we've been released from the cpu_release,secondary_stack
+	 * we've been released from the wait loop,secondary_stack
 	 * should now contain the SVC stack for this core
 	 */
 	b	secondary_startup
+END(omap_secondary_startup)
 
+
+ENTRY(omap_modify_auxcoreboot0)
+	stmfd   sp!, {r1-r12, lr}
+	ldr	r12, =0x104
+	dsb
+	smc
+	ldmfd   sp!, {r1-r12, pc}
+END(omap_modify_auxcoreboot0)
+
+ENTRY(omap_auxcoreboot_addr)
+	stmfd   sp!, {r2-r12, lr}
+	ldr	r12, =0x105
+	dsb
+	smc
+	ldmfd   sp!, {r2-r12, pc}
+END(omap_auxcoreboot_addr)
arch/arm/mach-omap2/omap-smp.c +8 -16
index 4890bcf..59e8478 100644
@@ -21,15 +21,12 @@
 #include <linux/smp.h>
 #include <linux/io.h>
 
+#include <asm/cacheflush.h>
 #include <asm/localtimer.h>
 #include <asm/smp_scu.h>
 #include <mach/hardware.h>
 #include <plat/common.h>
 
-/* Registers used for communicating startup information */
-static void __iomem *omap4_auxcoreboot_reg0;
-static void __iomem *omap4_auxcoreboot_reg1;
-
 /* SCU base address */
 static void __iomem *scu_base;
 
@@ -74,12 +71,13 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
 	spin_lock(&boot_lock);
 
 	/*
-	 * Update the AuxCoreBoot1 with boot state for secondary core.
+	 * Update the AuxCoreBoot0 with boot state for secondary core.
 	 * omap_secondary_startup() routine will hold the secondary core till
 	 * the AuxCoreBoot1 register is updated with cpu state
 	 * A barrier is added to ensure that write buffer is drained
 	 */
-	__raw_writel(cpu, omap4_auxcoreboot_reg1);
+	omap_modify_auxcoreboot0(0x200, 0x0);
+	flush_cache_all();
 	smp_wmb();
 
 	timeout = jiffies + (1 * HZ);
@@ -99,17 +97,18 @@ static void __init wakeup_secondary(void)
 {
 	/*
 	 * Write the address of secondary startup routine into the
-	 * AuxCoreBoot0 where ROM code will jump and start executing
+	 * AuxCoreBoot1 where ROM code will jump and start executing
 	 * on secondary core once out of WFE
 	 * A barrier is added to ensure that write buffer is drained
 	 */
-	__raw_writel(virt_to_phys(omap_secondary_startup),	   \
-					omap4_auxcoreboot_reg0);
+	omap_auxcoreboot_addr(virt_to_phys(omap_secondary_startup));
 	smp_wmb();
 
 	/*
 	 * Send a 'sev' to wake the secondary core from WFE.
+	 * Drain the outstanding writes to memory
 	 */
+	dsb();
 	set_event();
 	mb();
 }
@@ -136,7 +135,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 {
 	unsigned int ncores = get_core_count();
 	unsigned int cpu = smp_processor_id();
-	void __iomem *omap4_wkupgen_base;
 	int i;
 
 	/* sanity check */
@@ -168,12 +166,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 	for (i = 0; i < max_cpus; i++)
 		set_cpu_present(i, true);
 
-	/* Never released */
-	omap4_wkupgen_base = ioremap(OMAP44XX_WKUPGEN_BASE, SZ_4K);
-	BUG_ON(!omap4_wkupgen_base);
-	omap4_auxcoreboot_reg0 = omap4_wkupgen_base + 0x800;
-	omap4_auxcoreboot_reg1 = omap4_wkupgen_base + 0x804;
-
 	if (max_cpus > 1) {
 		/*
 		 * Enable the local timer or broadcast device for the
arch/arm/plat-omap/include/plat/smp.h +2 -0
index dcaa8fd..8983d54 100644
@@ -28,6 +28,8 @@
 
 /* Needed for secondary core boot */
 extern void omap_secondary_startup(void);
+extern u32 omap_modify_auxcoreboot0(u32 set_mask, u32 clear_mask);
+extern void omap_auxcoreboot_addr(u32 cpu_addr);
 
 /*
  * We use Soft IRQ1 as the IPI
Signature · 1 line
1.6.0.4
#4 lore raw

PATCH 5/6 OMAP4: Remove the secondary wait loop.

The secondary cores wakes up in time so the wait loop is not necessary anymore.

---
 arch/arm/mach-omap2/omap-smp.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
arch/arm/mach-omap2/omap-smp.c +0 -7
index 59e8478..38153e5 100644
@@ -17,7 +17,6 @@
  */
 #include <linux/init.h>
 #include <linux/device.h>
-#include <linux/jiffies.h>
 #include <linux/smp.h>
 #include <linux/io.h>
 
@@ -62,8 +61,6 @@ void __cpuinit platform_secondary_init(unsigned int cpu)
 
 int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
-	unsigned long timeout;
-
 	/*
 	 * Set synchronisation state between this boot processor
 	 * and the secondary one
@@ -80,10 +77,6 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
 	flush_cache_all();
 	smp_wmb();
 
-	timeout = jiffies + (1 * HZ);
-	while (time_before(jiffies, timeout))
-		;
-
 	/*
 	 * Now the secondary core is starting up let it run its
 	 * calibrations, then wait for it to finish
Signature · 1 line
1.6.0.4
#5 lore raw

PATCH 6/6 OMAP4: Sync up omap4430 defconfig

Enable minimum features to boot omap4430 on es1.0 samples

---
 arch/arm/configs/omap_4430sdp_defconfig |  146 ++++++++++++++++++-------------
 1 files changed, 84 insertions(+), 62 deletions(-)
arch/arm/configs/omap_4430sdp_defconfig +84 -62
index a464ca3..49df3ad 100644
@@ -1,26 +1,29 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.30-rc7
-# Tue Jun  9 12:36:23 2009
+# Linux kernel version: 2.6.32
+# Sun Dec  6 23:37:45 2009
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_TIME=y
 CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_MMU=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_LOCKBREAK=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPUFREQ=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
 
 #
 # General setup
@@ -39,11 +42,12 @@ CONFIG_BSD_PROCESS_ACCT=y
 #
 # RCU Subsystem
 #
-CONFIG_CLASSIC_RCU=y
-# CONFIG_TREE_RCU is not set
-# CONFIG_PREEMPT_RCU is not set
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_GROUP_SCHED=y
@@ -52,8 +56,7 @@ CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_USER_SCHED=y
 # CONFIG_CGROUP_SCHED is not set
 # CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED=y is not set
-# CONFIG_SYSFS_DEPRECATED_V2=y is not set
+CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -70,7 +73,6 @@ CONFIG_UID16=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
-# CONFIG_STRIP_ASM_SYMS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
@@ -83,6 +85,10 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+
+#
+# Kernel Performance Events And Counters
+#
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
 CONFIG_COMPAT_BRK=y
@@ -90,13 +96,16 @@ CONFIG_COMPAT_BRK=y
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 # CONFIG_PROFILING is not set
-# CONFIG_MARKERS is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_HAVE_CLK=y
+
+#
+# GCOV-based kernel profiling
+#
 # CONFIG_SLOW_WORK is not set
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
@@ -110,7 +119,7 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
-# CONFIG_LBD is not set
+CONFIG_LBDAF=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
@@ -131,6 +140,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # System Type
 #
+CONFIG_MMU=y
 # CONFIG_ARCH_AAEC2000 is not set
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_REALVIEW is not set
@@ -142,8 +152,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_STMP3XXX is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_NOMADIK is not set
 # CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
@@ -166,10 +178,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5PC1XX is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_U300 is not set
 # CONFIG_ARCH_DAVINCI is not set
 CONFIG_ARCH_OMAP=y
+# CONFIG_ARCH_BCMRING is not set
 
 #
 # TI OMAP Implementations
@@ -190,9 +205,12 @@ CONFIG_ARCH_OMAP4=y
 CONFIG_OMAP_32K_TIMER=y
 CONFIG_OMAP_32K_TIMER_HZ=128
 CONFIG_OMAP_DM_TIMER=y
-CONFIG_OMAP_LL_DEBUG_UART1=y
+# CONFIG_OMAP_LL_DEBUG_UART1 is not set
 # CONFIG_OMAP_LL_DEBUG_UART2 is not set
-# CONFIG_OMAP_LL_DEBUG_UART3 is not set
+CONFIG_OMAP_LL_DEBUG_UART3=y
+# CONFIG_OMAP_LL_DEBUG_NONE is not set
+# CONFIG_OMAP_PM_NONE is not set
+CONFIG_OMAP_PM_NOOP=y
 
 #
 # OMAP Board Type
@@ -207,7 +225,7 @@ CONFIG_CPU_32v6K=y
 CONFIG_CPU_V7=y
 CONFIG_CPU_32v7=y
 CONFIG_CPU_ABRT_EV7=y
-CONFIG_CPU_PABRT_IFAR=y
+CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_CACHE_V7=y
 CONFIG_CPU_CACHE_VIPT=y
 CONFIG_CPU_COPY_V6=y
@@ -222,9 +240,10 @@ CONFIG_CPU_CP15_MMU=y
 # CONFIG_ARM_THUMB is not set
 # CONFIG_ARM_THUMBEE is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set
-CONFIG_CPU_DCACHE_DISABLE=y
+# CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_HAS_TLS_REG=y
+CONFIG_ARM_L1_CACHE_SHIFT=5
 # CONFIG_ARM_ERRATA_430973 is not set
 # CONFIG_ARM_ERRATA_458693 is not set
 # CONFIG_ARM_ERRATA_460075 is not set
@@ -245,18 +264,20 @@ CONFIG_ARM_GIC=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_SMP=y
 CONFIG_HAVE_ARM_SCU=y
-CONFIG_HAVE_ARM_TWD=y
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_2G is not set
 # CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_NR_CPUS=2
 # CONFIG_HOTPLUG_CPU is not set
-CONFIG_LOCAL_TIMERS=y
-# CONFIG_PREEMPT is not set
+# CONFIG_LOCAL_TIMERS is not set
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
 CONFIG_HZ=128
+# CONFIG_THUMB2_KERNEL is not set
 CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
+CONFIG_OABI_COMPAT=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_HIGHMEM is not set
@@ -271,10 +292,13 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_VIRT_TO_BUS=y
-# CONFIG_UNEVICTABLE_LRU is not set
 CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_LEDS is not set
 CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_UACCESS_WITH_MEMCPY is not set
 
 #
 # Boot options
@@ -298,9 +322,11 @@ CONFIG_CMDLINE="root=/dev/ram0 rw mem=128M console=ttyS0,115200n8 initrd=0x81600
 #
 # At least one emulation must be selected
 #
+# CONFIG_FPE_NWFPE is not set
+# CONFIG_FPE_FASTFPE is not set
 CONFIG_VFP=y
 CONFIG_VFPv3=y
-# CONFIG_NEON is not set
+CONFIG_NEON=y
 
 #
 # Userspace binary formats
@@ -325,6 +351,7 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
@@ -342,6 +369,7 @@ CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
 # CONFIG_BLK_DEV_XIP is not set
 # CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_MG_DISK is not set
 # CONFIG_MISC_DEVICES is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
@@ -355,6 +383,7 @@ CONFIG_HAVE_IDE=y
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_ATA is not set
 # CONFIG_MD is not set
+# CONFIG_PHONE is not set
 
 #
 # Input device support
@@ -427,6 +456,11 @@ CONFIG_HW_RANDOM=y
 # CONFIG_TCG_TPM is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_DEBUG_GPIO is not set
@@ -447,11 +481,14 @@ CONFIG_GPIOLIB=y
 #
 # SPI GPIO expanders:
 #
+
+#
+# AC97 GPIO expanders:
+#
 # CONFIG_W1 is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
-# CONFIG_THERMAL_HWMON is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 
@@ -472,21 +509,8 @@ CONFIG_SSB_POSSIBLE=y
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_MFD_TC6393XB is not set
-
-#
-# Multimedia devices
-#
-
-#
-# Multimedia core support
-#
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_VIDEO_MEDIA is not set
-
-#
-# Multimedia drivers
-#
-CONFIG_DAB=y
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
 
 #
 # Graphics support
@@ -511,14 +535,17 @@ CONFIG_DUMMY_CONSOLE=y
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_MMC is not set
 # CONFIG_MEMSTICK is not set
-# CONFIG_ACCESSIBILITY is not set
 # CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
 CONFIG_RTC_LIB=y
 # CONFIG_RTC_CLASS is not set
 # CONFIG_DMADEVICES is not set
 # CONFIG_AUXDISPLAY is not set
-# CONFIG_REGULATOR is not set
 # CONFIG_UIO is not set
+
+#
+# TI VLYNQ
+#
 # CONFIG_STAGING is not set
 
 #
@@ -535,9 +562,12 @@ CONFIG_JBD=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
-CONFIG_FILE_LOCKING=y
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -601,7 +631,6 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ROMFS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-# CONFIG_NILFS2_FS is not set
 
 #
 # Partition Types
@@ -673,23 +702,24 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
-CONFIG_DETECT_SOFTLOCKUP=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+# CONFIG_DETECT_SOFTLOCKUP is not set
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHED_DEBUG is not set
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
@@ -708,31 +738,22 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_PAGE_POISONING is not set
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_TRACING_SUPPORT=y
-
-#
-# Tracers
-#
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
-# CONFIG_EVENT_TRACER is not set
-# CONFIG_BOOT_TRACER is not set
-# CONFIG_TRACE_BRANCH_PROFILING is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_KMEMTRACE is not set
-# CONFIG_WORKQUEUE_TRACER is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_FTRACE is not set
+# CONFIG_BRANCH_PROFILE_NONE is not set
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
@@ -754,7 +775,6 @@ CONFIG_CRYPTO=y
 #
 # Crypto core or helper
 #
-# CONFIG_CRYPTO_FIPS is not set
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD2=y
@@ -796,11 +816,13 @@ CONFIG_CRYPTO_PCBC=m
 #
 # CONFIG_CRYPTO_HMAC is not set
 # CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
 
 #
 # Digest
 #
 CONFIG_CRYPTO_CRC32C=y
+# CONFIG_CRYPTO_GHASH is not set
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
Signature · 1 line
1.6.0.4
#6 lore raw

PATCH 6/6 OMAP4: Sync up omap4430 defconfig

Santosh

Quoted 1 line

-----Original Message-----

From: [email protected] [mailto:linux-omap-owner at vger.kernel.org] On Behalf Of

Quoted 25 lines

Shilimkar, Santosh
Sent: Wednesday, December 09, 2009 12:29 PM
To: tony at atomide.com
Cc: linux-arm-kernel at lists.infradead.org; linux-omap at vger.kernel.org; linux at arm.linux.org.uk; Shilimkar, Santosh
Subject: [PATCH 6/6] OMAP4: Sync up omap4430 defconfig

Enable minimum features to boot omap4430 on es1.0 samples

---
arch/arm/configs/omap_4430sdp_defconfig | 146 ++++++++++++++++++-------------

1 files changed, 84 insertions(+), 62 deletions(-)
arch/arm/configs/omap_4430sdp_defconfig +2 -2
index a464ca3..49df3ad 100644
@@ -1,26 +1,29 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.30-rc7
-# Tue Jun  9 12:36:23 2009
+# Linux kernel version: 2.6.32
+# Sun Dec  6 23:37:45 2009

<snip>

arch/arm/configs/omap_4430sdp_defconfig CONFIG_FAIR_GROUP_SCHED=y · line 59

Quoted 3 lines
arch/arm/configs/omap_4430sdp_defconfig +1 -2
-# CONFIG_SYSFS_DEPRECATED=y is not set
-# CONFIG_SYSFS_DEPRECATED_V2=y is not set
+CONFIG_SYSFS_DEPRECATED_V2=y

This is a deprecated feature and don't introduce it back again. There haven been patches in recent past to get rid of this.

Quoted 1 line

# CONFIG_RELAY is not set

#7 lore raw

PATCH 6/6 OMAP4: Sync up omap4430 defconfig

Quoted 28 lines
Quoted 27 lines

-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-owner at vger.kernel.org] On Behalf Of Shilimkar, Santosh
Sent: Wednesday, December 09, 2009 12:29 PM
To: tony at atomide.com
Cc: linux-arm-kernel at lists.infradead.org; linux-omap at vger.kernel.org; linux at arm.linux.org.uk; Shilimkar, Santosh
Subject: [PATCH 6/6] OMAP4: Sync up omap4430 defconfig

Enable minimum features to boot omap4430 on es1.0 samples

---
arch/arm/configs/omap_4430sdp_defconfig | 146 ++++++++++++++++++-------------

1 files changed, 84 insertions(+), 62 deletions(-)
arch/arm/configs/omap_4430sdp_defconfig +2 -2
index a464ca3..49df3ad 100644
@@ -1,26 +1,29 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.30-rc7
-# Tue Jun  9 12:36:23 2009
+# Linux kernel version: 2.6.32
+# Sun Dec  6 23:37:45 2009

<snip>

Quoted 6 lines

arch/arm/configs/omap_4430sdp_defconfig CONFIG_FAIR_GROUP_SCHED=y · line 59

Quoted 3 lines
arch/arm/configs/omap_4430sdp_defconfig +1 -2
-# CONFIG_SYSFS_DEPRECATED=y is not set
-# CONFIG_SYSFS_DEPRECATED_V2=y is not set
+CONFIG_SYSFS_DEPRECATED_V2=y

This is a deprecated feature and don't introduce it back again. There haven been patches in recent past to get rid of this.

Thanks Vikram. The thing is some of the busy box people are using get confused and stuck without this.

Do you have pointers to those patches ?

Regards,
Santosh

#8 lore raw

PATCH 6/6 OMAP4: Sync up omap4430 defconfig

Quoted 37 lines

-----Original Message-----
From: Shilimkar, Santosh
Sent: Wednesday, December 09, 2009 12:49 PM
To: Pandita, Vikram; tony at atomide.com
Cc: linux-arm-kernel at lists.infradead.org; linux-omap at vger.kernel.org; linux at arm.linux.org.uk
Subject: RE: [PATCH 6/6] OMAP4: Sync up omap4430 defconfig

Quoted 28 lines
Quoted 27 lines

-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-owner at vger.kernel.org] On Behalf Of Shilimkar, Santosh
Sent: Wednesday, December 09, 2009 12:29 PM
To: tony at atomide.com
Cc: linux-arm-kernel at lists.infradead.org; linux-omap at vger.kernel.org; linux at arm.linux.org.uk; Shilimkar, Santosh
Subject: [PATCH 6/6] OMAP4: Sync up omap4430 defconfig

Enable minimum features to boot omap4430 on es1.0 samples

---
arch/arm/configs/omap_4430sdp_defconfig | 146 ++++++++++++++++++-------------

1 files changed, 84 insertions(+), 62 deletions(-)
arch/arm/configs/omap_4430sdp_defconfig +2 -2
index a464ca3..49df3ad 100644
@@ -1,26 +1,29 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.30-rc7
-# Tue Jun  9 12:36:23 2009
+# Linux kernel version: 2.6.32
+# Sun Dec  6 23:37:45 2009

<snip>

Quoted 8 lines
Quoted 6 lines

arch/arm/configs/omap_4430sdp_defconfig CONFIG_FAIR_GROUP_SCHED=y · line 59

Quoted 3 lines
arch/arm/configs/omap_4430sdp_defconfig +1 -2
-# CONFIG_SYSFS_DEPRECATED=y is not set
-# CONFIG_SYSFS_DEPRECATED_V2=y is not set
+CONFIG_SYSFS_DEPRECATED_V2=y

This is a deprecated feature and don't introduce it back again. There haven been patches in recent past to get rid of this.

Thanks Vikram. The thing is some of the busy box people are using get confused and stuck without this.

The reason is they have not upgraded to latest busybox yet.

Quoted 2 lines

Do you have pointers to those patches ?

Here's the reference in k.org
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6502401d8169f76c6a72849cb55e8302226ca930

Quoted 3 lines

Regards,
Santosh

#9 lore raw

PATCH 6/6 OMAP4: Sync up omap4430 defconfig

Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 7 lines

# Automatically generated make config: don't edit

arch/arm/configs/omap_4430sdp_defconfig +2 -2
-# Linux kernel version: 2.6.30-rc7
-# Tue Jun  9 12:36:23 2009
+# Linux kernel version: 2.6.32
+# Sun Dec  6 23:37:45 2009

<snip>

arch/arm/configs/omap_4430sdp_defconfig CONFIG_FAIR_GROUP_SCHED=y · line 59

Quoted 3 lines
arch/arm/configs/omap_4430sdp_defconfig +1 -2
-# CONFIG_SYSFS_DEPRECATED=y is not set
-# CONFIG_SYSFS_DEPRECATED_V2=y is not set
+CONFIG_SYSFS_DEPRECATED_V2=y

This is a deprecated feature and don't introduce it back again. There haven been patches in recent past to get rid of this.

Quoted 4 lines
Quoted 2 lines

Thanks Vikram. The thing is some of the busy box people are using get confused and stuck without this.

The reason is they have not upgraded to latest busybox yet.

I guessed so. Time to upgrade the file system.

Quoted 6 lines
Quoted 2 lines

Do you have pointers to those patches ?

Here's the reference in k.org
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-
2.6.git;a=commit;h=6502401d8169f76c6a72849cb55e8302226ca930

OK. Then we can get rid of this on OMAP4 too.

Regards,
Santosh

#10 lore raw

PATCH 6/6 OMAP4: Sync up omap4430 defconfig

In reply to Shilimkar, Santosh
Quoted 34 lines · Santosh
Quoted 28 lines
Quoted 27 lines

-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-owner at vger.kernel.org] On Behalf Of Shilimkar, Santosh
Sent: Wednesday, December 09, 2009 12:29 PM
To: tony at atomide.com
Cc: linux-arm-kernel at lists.infradead.org; linux-omap at vger.kernel.org; linux at arm.linux.org.uk; Shilimkar, Santosh
Subject: [PATCH 6/6] OMAP4: Sync up omap4430 defconfig

Enable minimum features to boot omap4430 on es1.0 samples

---
arch/arm/configs/omap_4430sdp_defconfig | 146 ++++++++++++++++++-------------

1 files changed, 84 insertions(+), 62 deletions(-)
arch/arm/configs/omap_4430sdp_defconfig +2 -2
index a464ca3..49df3ad 100644
@@ -1,26 +1,29 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.30-rc7
-# Tue Jun  9 12:36:23 2009
+# Linux kernel version: 2.6.32
+# Sun Dec  6 23:37:45 2009

<snip>

Quoted 6 lines

arch/arm/configs/omap_4430sdp_defconfig CONFIG_FAIR_GROUP_SCHED=y · line 59

Quoted 3 lines
arch/arm/configs/omap_4430sdp_defconfig +1 -2
-# CONFIG_SYSFS_DEPRECATED=y is not set
-# CONFIG_SYSFS_DEPRECATED_V2=y is not set
+CONFIG_SYSFS_DEPRECATED_V2=y

This is a deprecated feature and don't introduce it back again. There haven been patches in recent past to get rid of this.

Quoted 5 lines

Thanks Vikram. The thing is some of the busy box people are using get confused and stuck without this.

Do you have pointers to those patches ?

Poky, and other open-embedded based distros expect this to be disabled to work correctly

The solution is to upgrade busybox, not enable a deprecated CONFIG option.

Patches to update the different OMAP defconfig were posted to l-o a few months ago.

Here's one.such patch.
<http://patchwork.kernel.org/patch/40949/>

- Anand

maintainer
#11 lore raw

[APPLIED] > >[PATCH 6/6] OMAP4: Sync up omap4430 defconfig

In reply to Santosh Shilimkar

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: for-next

Initial commit ID (Likely to change): 238d4e7ddab5233c5624570f5cf3b1849d85d55b

PatchWorks
http://patchwork.kernel.org/patch/66030/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=238d4e7ddab5233c5624570f5cf3b1849d85d55b

maintainer
#12 lore raw

PATCH 5/6 OMAP4: Remove the secondary wait loop.

In reply to Santosh Shilimkar

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: for-next

Initial commit ID (Likely to change): 5ed72a874cb80fb3859b48c9d815baefe27a68c5

PatchWorks
http://patchwork.kernel.org/patch/66026/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=5ed72a874cb80fb3859b48c9d815baefe27a68c5

maintainer
#13 lore raw

PATCH 4/6 OMAP4: AuxCoreBoot registers only accessible in secure

In reply to Santosh Shilimkar

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: for-next

Initial commit ID (Likely to change): c8d5e860a36d0002f2931540280898f0844e661e

PatchWorks
http://patchwork.kernel.org/patch/66029/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=c8d5e860a36d0002f2931540280898f0844e661e

#14 lore raw

Re: [PATCH 3/6] OMAP4: Re-arrange the low level debug code

In reply to Santosh Shilimkar

Hello.

Quoted 7 lines · Santosh Shilimkar

On OMAP4430 the UART3 base address is different than that on OMAP3. Because of this existing code needs additional #ifdef'ry to accommodate that code. Hence this patch separates it. Also UART3 base address is fixed for OMAP4430 in this patch.

[...]

arch/arm/mach-omap2/include/mach/debug-macro.S line 29

Quoted 11 lines
arch/arm/mach-omap2/include/mach/debug-macro.S +1 -1
index e9f255d..b2b4b29 100644
@@ -25,7 +25,7 @@
 		add	\rx, \rx, #0x00004000	@ UART 3
 #endif
 
-#elif defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
+#elif CONFIG_ARCH_OMAP3
 

Why you've dropped defined()? This doesn't seem right as it should
cause error when CONFIG_ARCH_OMAP3=n...

arch/arm/mach-omap2/include/mach/debug-macro.S line 40

Quoted 9 lines
arch/arm/mach-omap2/include/mach/debug-macro.S +0 -0
 		moveq	\rx, #0x48000000	@ physical base address
 		movne	\rx, #0xfa000000	@ virtual base
arch/arm/mach-omap2/include/mach/debug-macro.S +1 -0
 		orr	\rx, \rx, #0x0006a000
@@ -36,6 +36,17 @@
 		add	\rx, \rx, #0x00fb0000	@ UART 3
 		add	\rx, \rx, #0x00006000
 #endif
+#elif CONFIG_ARCH_OMAP4
 

Same comment here...

WBR, Sergei

#15 lore raw

PATCH 3/6 OMAP4: Re-arrange the low level debug code

Quoted 31 lines

-----Original Message-----
From: Sergei Shtylyov [mailto:sshtylyov at ru.mvista.com]
Sent: Thursday, December 10, 2009 4:06 PM
To: Shilimkar, Santosh
Cc: tony at atomide.com; linux-omap at vger.kernel.org; linux at arm.linux.org.uk; linux-arm- kernel at lists.infradead.org
Subject: Re: [PATCH 3/6] OMAP4: Re-arrange the low level debug code

Hello.

Quoted 7 lines · Santosh Shilimkar

On OMAP4430 the UART3 base address is different than that on OMAP3. Because of this existing code needs additional #ifdef'ry to accommodate that code. Hence this patch separates it. Also UART3 base address is fixed for OMAP4430 in this patch.

[...]

arch/arm/mach-

Quoted 1 line
arch/arm/mach- renamed from arch/arm/mach-omap2/include/mach/debug-macro.S +0 -0

omap2/include/mach/debug-macro.S

Quoted 7 lines

index e9f255d..b2b4b29 100644

arch/arm/mach-omap2/include/mach/debug-macro.S +0 -0
@@ -25,7 +25,7 @@
 		add	\rx, \rx, #0x00004000	@ UART 3
 #endif
 
Quoted 6 lines

arch/arm/mach-omap2/include/mach/debug-macro.S

Quoted 3 lines
arch/arm/mach-omap2/include/mach/debug-macro.S +1 -1
-#elif defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
+#elif CONFIG_ARCH_OMAP3
 

Why you've dropped defined()? This doesn't seem right as it should
cause error when CONFIG_ARCH_OMAP3=n...

Before omap4 support was added, it was as above. Now when I decided to go back and spilt it I changed it. How the ARCH flag will be n ? It will be either 0 or 1

#16 lore raw

Re: [PATCH 3/6] OMAP4: Re-arrange the low level debug code

Hello.

Quoted 42 lines · Santosh
Quoted 34 lines

-----Original Message-----
From: Sergei Shtylyov [mailto:[email protected]]
Sent: Thursday, December 10, 2009 4:06 PM
To: Shilimkar, Santosh
Cc: [email protected]; [email protected]; [email protected]; linux-arm- [email protected]
Subject: Re: [PATCH 3/6] OMAP4: Re-arrange the low level debug code

Hello.

Quoted 8 lines · Santosh Shilimkar

On OMAP4430 the UART3 base address is different than that on OMAP3. Because of this existing code needs additional #ifdef'ry to accommodate that code. Hence this patch separates it. Also UART3 base address is fixed for OMAP4430 in this patch.

[...]

arch/arm/mach-

Quoted 2 lines
arch/arm/mach- renamed from arch/arm/mach-omap2/include/mach/debug-macro.S +0 -0

omap2/include/mach/debug-macro.S

Quoted 7 lines

index e9f255d..b2b4b29 100644

arch/arm/mach-omap2/include/mach/debug-macro.S +0 -0
@@ -25,7 +25,7 @@
 		add	\rx, \rx, #0x00004000	@ UART 3
 #endif
 
Quoted 7 lines

arch/arm/mach-omap2/include/mach/debug-macro.S

Quoted 4 lines
arch/arm/mach-omap2/include/mach/debug-macro.S +1 -1
-#elif defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
+#elif CONFIG_ARCH_OMAP3
 
 

Why you've dropped defined()? This doesn't seem right as it should
cause error when CONFIG_ARCH_OMAP3=n...

Quoted 4 lines

Before omap4 support was added, it was as above. Now when I decided to go back and spilt it I changed it. How the ARCH flag will be n ? It will be either 0 or 1

This is .config variable -- it's either 1 or *not defined*.

WBR, Sergei

maintainer
#17 lore raw

PATCH 2/6 OMAP4: Fix SRAM base and size

In reply to Santosh Shilimkar

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: for-next

Initial commit ID (Likely to change): c1b279cf762347d50c3d4c8f19ef497679a7dbde

PatchWorks
http://patchwork.kernel.org/patch/66025/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=c1b279cf762347d50c3d4c8f19ef497679a7dbde

#18 lore raw

PATCH 1/6 OMAP4: Fix cpu detection

In reply to Santosh Shilimkar
Quoted 3 lines · Santosh Shilimkar

This patch fixes the OMAP4430 cpu detection. Since the omap ID register is not fused in OMAP4430 ES1.0 silicon, identification is done using ARM CPUID register.

Am I reading the commit message wrong? the code seems to check on TAPID instead of checking the arm CPUID...

Quoted 29 lines

---
 arch/arm/mach-omap2/id.c              |   27 ++++++++++++++++++++++++++- arch/arm/plat-omap/common.c           |    2 +- arch/arm/plat-omap/include/plat/cpu.h |    3 ++-

 3 files changed, 29 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/id.c +13 -0
index f48a4b2..52c6478 100644
@@ -246,6 +246,31 @@ void __init omap3_check_revision(void)
        }
  }
 
+void __init omap4_check_revision(void)
+{
+       u32 idcode;
+       u16 hawkeye;
+       u8 rev;
+       char *rev_name = "ES1.0";
+
+       /*
+        * The IC rev detection is done with hawkeye and rev.
+        * Note that rev does not map directly to defined processor
+        * revision numbers as ES1.0 uses value 0.
+        */
+       idcode = read_tap_reg(OMAP_TAP_IDCODE);

arch/arm/mach-omap2/id.c void __init omap3_check_revision(void) · line 271

Quoted 10 lines
arch/arm/mach-omap2/id.c +10 -0
+       hawkeye = (idcode >> 12) & 0xffff;
+       rev = (idcode >> 28) & 0xff;
+
+       if ((hawkeye == 0xb852) && (rev == 0x0)) {
+               omap_revision = OMAP4430_REV_ES1_0;
+               pr_info("OMAP%04x %s\n", omap_rev() >> 16, rev_name);
+               return;
+       }
+
+       printk(KERN_ERR "Unknown OMAP CPU id\n");

a) Do you want to state unknown OMAP4 CPU id?
b) why not use pr_err?

Quoted 19 lines
arch/arm/mach-omap2/id.c +3 -1
+}
+
  #define OMAP3_SHOW_FEATURE(feat)               \
        if (omap3_has_ ##feat())                \
                printk(#feat" ");
@@ -336,7 +361,7 @@ void __init omap2_check_revision(void)
                omap3_check_features();
                omap3_cpuinfo();
        } else if (cpu_is_omap44xx()) {
-               printk(KERN_INFO "FIXME: CPU revision = OMAP4430\n");
+               omap4_check_revision();
                return;
        } else {
                pr_err("OMAP revision unknown, please fix!\n");
arch/arm/plat-omap/common.c +0 -0
index cc050b3..3473a80 100644

arch/arm/plat-omap/common.c void __init omap2_set_globals_343x(void) · line 283

Quoted 5 lines
arch/arm/plat-omap/common.c +1 -1
@@ -280,7 +280,7 @@ void __init omap2_set_globals_343x(void)
  #if defined(CONFIG_ARCH_OMAP4)
  static struct omap_globals omap4_globals = {
        .class  = OMAP443X_CLASS,
-       .tap    = OMAP2_L4_IO_ADDRESS(0x4830a000),
+       .tap    = OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE),

What does this have to do with the subject of the patch? I agree it is a good thing to have, but probably belongs elsewhere.

Quoted 8 lines
arch/arm/plat-omap/common.c +0 -0
        .ctrl   = OMAP2_L4_IO_ADDRESS(OMAP443X_CTRL_BASE),
        .prm    = OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE),
        .cm     = OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE),
arch/arm/plat-omap/include/plat/cpu.h +0 -0
index 2e17890..2a141ba 100644

arch/arm/plat-omap/include/plat/cpu.h IS_OMAP_TYPE(3517, 0x3517) · line 447

Quoted 6 lines
arch/arm/plat-omap/include/plat/cpu.h +2 -1
@@ -443,7 +443,8 @@ IS_OMAP_TYPE(3517, 0x3517)
  #define OMAP3505_REV(v)                (OMAP35XX_CLASS | (0x3505 << 16) | (v << 12))
  #define OMAP3517_REV(v)                (OMAP35XX_CLASS | (0x3517 << 16) | (v << 12))
 
-#define OMAP443X_CLASS         0x44300034
+#define OMAP443X_CLASS         0x44300044
+#define OMAP4430_REV_ES1_0     0x44300044

Errr.. why? I suspect this might be to get the class and subclass right..

Dont we need an cpu_is_omap_4430() to use it correctly? (unless I missed a pending patch series as I am checking l-o kernel codebase).. do we need the following?
IS_OMAP_CLASS(44xx, 0x44)
IS_OMAP_SUBCLASS(443x, 0x443)

then you will have is_omap_443x() and you can now:
#define cpu_is_omap4430 is_omap443x()

just my 2cents..

arch/arm/plat-omap/include/plat/cpu.h IS_OMAP_TYPE(3517, 0x3517) · line 450

Quoted 3 lines
arch/arm/plat-omap/include/plat/cpu.h +0 -0
  /*
  * omap_chip bits

Regards,
Nishanth Menon
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#19 lore raw

PATCH 1/6 OMAP4: Fix cpu detection

Thanks Nishant !!

Quoted 9 lines
Quoted 7 lines

+ ? ? ? if ((hawkeye == 0xb852) && (rev == 0x0)) {
+ ? ? ? ? ? ? ? omap_revision = OMAP4430_REV_ES1_0;
+ ? ? ? ? ? ? ? pr_info("OMAP%04x %s\n", omap_rev() >> 16, rev_name);
+ ? ? ? ? ? ? ? return;
+ ? ? ? }
+
+ ? ? ? printk(KERN_ERR "Unknown OMAP CPU id\n");

a) Do you want to state unknown OMAP4 CPU id?
b) why not use pr_err?

OK

Quoted 9 lines

Review void __init omap2_set_globals_343x(void) · line 283

Quoted 6 lines
(quoted diff) +1 -1
@@ -280,7 +280,7 @@ void __init omap2_set_globals_343x(void)
 ?#if defined(CONFIG_ARCH_OMAP4)
 ?static struct omap_globals omap4_globals = {
 ? ? ? ?.class ?= OMAP443X_CLASS,
- ? ? ? .tap ? ?= OMAP2_L4_IO_ADDRESS(0x4830a000),
+ ? ? ? .tap ? ?= OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE),

What does this have to do with the subject of the patch? I agree it is a good thing to have, but probably belongs elsewhere.

This is everything to do with subject. ID_CODE reg is in SCM and you Need a right base to read that reg, Isn't it ?

Quoted 17 lines
Quoted 9 lines
(quoted diff) +0 -0
 ? ? ? ?.ctrl ? = OMAP2_L4_IO_ADDRESS(OMAP443X_CTRL_BASE),
 ? ? ? ?.prm ? ?= OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE),
 ? ? ? ?.cm ? ? = OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE),
arch/arm/plat-omap/include/plat/cpu.h +0 -0
index 2e17890..2a141ba 100644

arch/arm/plat-omap/include/plat/cpu.h IS_OMAP_TYPE(3517, 0x3517) · line 447

Quoted 6 lines
arch/arm/plat-omap/include/plat/cpu.h +2 -1
@@ -443,7 +443,8 @@ IS_OMAP_TYPE(3517, 0x3517)
 ?#define OMAP3505_REV(v) ? ? ? ? ? ? ? ?(OMAP35XX_CLASS | (0x3505 << 16) | (v << 12))
 ?#define OMAP3517_REV(v) ? ? ? ? ? ? ? ?(OMAP35XX_CLASS | (0x3517 << 16) | (v << 12))
 
-#define OMAP443X_CLASS ? ? ? ? 0x44300034
+#define OMAP443X_CLASS ? ? ? ? 0x44300044
+#define OMAP4430_REV_ES1_0 ? ? 0x44300044

Errr.. why? I suspect this might be to get the class and subclass right..

Quoted 8 lines

Dont we need an cpu_is_omap_4430() to use it correctly? (unless I missed a pending patch series as I am checking l-o kernel codebase).. do we need the following?
IS_OMAP_CLASS(44xx, 0x44)
IS_OMAP_SUBCLASS(443x, 0x443)

then you will have is_omap_443x() and you can now:
#define cpu_is_omap4430 is_omap443x()

This has to be done and I planning to do this in next series. This series just enables the basic boot on ES1.0.

Regards,
Santosh

#20 lore raw

PATCH 1/6 OMAP4: Fix cpu detection

Quoted 22 lines · Santosh

Thanks Nishant !!

Quoted 9 lines
Quoted 7 lines

+       if ((hawkeye == 0xb852) && (rev == 0x0)) {
+               omap_revision = OMAP4430_REV_ES1_0;
+               pr_info("OMAP%04x %s\n", omap_rev() >> 16, rev_name);
+               return;
+       }
+
+       printk(KERN_ERR "Unknown OMAP CPU id\n");

a) Do you want to state unknown OMAP4 CPU id?
b) why not use pr_err?

OK

Quoted 9 lines

arch/arm/plat-omap/common.c void __init omap2_set_globals_343x(void) · line 283

Quoted 6 lines
arch/arm/plat-omap/common.c +1 -1
@@ -280,7 +280,7 @@ void __init omap2_set_globals_343x(void)
  #if defined(CONFIG_ARCH_OMAP4)
  static struct omap_globals omap4_globals = {
        .class  = OMAP443X_CLASS,
-       .tap    = OMAP2_L4_IO_ADDRESS(0x4830a000),
+       .tap    = OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE),

What does this have to do with the subject of the patch? I agree it is a good thing to have, but probably belongs elsewhere.

Quoted 2 lines

This is everything to do with subject. ID_CODE reg is in SCM and you Need a right base to read that reg, Isn't it ?

Gotcha.. thanks, could be an info useful in your rev2 commit message.

Quoted 23 lines
Quoted 23 lines
Quoted 9 lines
arch/arm/plat-omap/common.c +0 -0
        .ctrl   = OMAP2_L4_IO_ADDRESS(OMAP443X_CTRL_BASE),
        .prm    = OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE),
        .cm     = OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE),
arch/arm/plat-omap/include/plat/cpu.h +0 -0
index 2e17890..2a141ba 100644

arch/arm/plat-omap/include/plat/cpu.h IS_OMAP_TYPE(3517, 0x3517) · line 447

Quoted 6 lines
arch/arm/plat-omap/include/plat/cpu.h +2 -1
@@ -443,7 +443,8 @@ IS_OMAP_TYPE(3517, 0x3517)
  #define OMAP3505_REV(v)                (OMAP35XX_CLASS | (0x3505 << 16) | (v << 12))
  #define OMAP3517_REV(v)                (OMAP35XX_CLASS | (0x3517 << 16) | (v << 12))
 
-#define OMAP443X_CLASS         0x44300034
+#define OMAP443X_CLASS         0x44300044
+#define OMAP4430_REV_ES1_0     0x44300044

Errr.. why? I suspect this might be to get the class and subclass right..

Dont we need an cpu_is_omap_4430() to use it correctly? (unless I missed a pending patch series as I am checking l-o kernel codebase).. do we need the following?
IS_OMAP_CLASS(44xx, 0x44)
IS_OMAP_SUBCLASS(443x, 0x443)

Quoted 4 lines
Quoted 2 lines

then you will have is_omap_443x() and you can now:
#define cpu_is_omap4430 is_omap443x()

This has to be done and I planning to do this in next series. This series just enables the basic boot on ES1.0.

not sure, but might be good to do this in this patch as the CLASS and ES1 value change dont make much sense without it.. it should not change your basic boot behavior.

Quoted 5 lines

Regards,
Santosh

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#21 lore raw

PATCH 1/6 OMAP4: Fix cpu detection

In reply to Santosh Shilimkar

Hi Santosh,

From: [email protected] [mailto:linux-omap-

Quoted 5 lines

owner at vger.kernel.org] On Behalf Of Shilimkar, Santosh

This patch fixes the OMAP4430 cpu detection. Since the omap ID register is not fused in OMAP4430 ES1.0 silicon, identification is done using ARM CPUID register.

I think that this description is not reflecting your current patch that does use the DEVICE_ID register.

Regards,
Benoit

Quoted 85 lines

---

arch/arm/mach-omap2/id.c              |   27 ++++++++++++++++++++++++++-
arch/arm/plat-omap/common.c           |    2 +-
arch/arm/plat-omap/include/plat/cpu.h |    3 ++-
3 files changed, 29 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/id.c +26 -1
index f48a4b2..52c6478 100644
@@ -246,6 +246,31 @@ void __init omap3_check_revision(void)
      }
 }
 
+void __init omap4_check_revision(void)
+{
+      u32 idcode;
+      u16 hawkeye;
+      u8 rev;
+      char *rev_name = "ES1.0";
+
+      /*
+       * The IC rev detection is done with hawkeye and rev.
+       * Note that rev does not map directly to defined processor
+       * revision numbers as ES1.0 uses value 0.
+       */
+      idcode = read_tap_reg(OMAP_TAP_IDCODE);
+      hawkeye = (idcode >> 12) & 0xffff;
+      rev = (idcode >> 28) & 0xff;
+
+      if ((hawkeye == 0xb852) && (rev == 0x0)) {
+              omap_revision = OMAP4430_REV_ES1_0;
+              pr_info("OMAP%04x %s\n", omap_rev() >> 16, rev_name);
+              return;
+      }
+
+      printk(KERN_ERR "Unknown OMAP CPU id\n");
+}
+
 #define OMAP3_SHOW_FEATURE(feat)              \
      if (omap3_has_ ##feat())                \
              printk(#feat" ");
@@ -336,7 +361,7 @@ void __init omap2_check_revision(void)
              omap3_check_features();
              omap3_cpuinfo();
      } else if (cpu_is_omap44xx()) {
-              printk(KERN_INFO "FIXME: CPU revision = OMAP4430\n");
+              omap4_check_revision();
              return;
      } else {
              pr_err("OMAP revision unknown, please fix!\n");
arch/arm/plat-omap/common.c +1 -1
index cc050b3..3473a80 100644
@@ -280,7 +280,7 @@ void __init omap2_set_globals_343x(void)
 #if defined(CONFIG_ARCH_OMAP4)
 static struct omap_globals omap4_globals = {
      .class  = OMAP443X_CLASS,
-      .tap    = OMAP2_L4_IO_ADDRESS(0x4830a000),
+      .tap    = OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE),
      .ctrl   = OMAP2_L4_IO_ADDRESS(OMAP443X_CTRL_BASE),
      .prm    = OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE),
      .cm     = OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE),
arch/arm/plat- renamed from arch/arm/plat-omap/include/plat/cpu.h +0 -0

omap/include/plat/cpu.h
index 2e17890..2a141ba 100644

arch/arm/plat-omap/include/plat/cpu.h +2 -1
@@ -443,7 +443,8 @@ IS_OMAP_TYPE(3517, 0x3517)
 #define OMAP3505_REV(v)               (OMAP35XX_CLASS | (0x3505 << 16) | (v
 << 12))
 #define OMAP3517_REV(v)               (OMAP35XX_CLASS | (0x3517 << 16) | (v
 << 12))
 
-#define OMAP443X_CLASS                0x44300034
+#define OMAP443X_CLASS                0x44300044
+#define OMAP4430_REV_ES1_0    0x44300044
 

/*
* omap_chip bits
--
1.6.0.4

Quoted 4 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Texas Instruments France SA, 821 Avenue Jack Kilby, 06270 Villeneuve Loubet. 036 420 040 R.C.S Antibes. Capital de EUR 753.920

#22 lore raw

PATCH 1/6 OMAP4: Fix cpu detection

Quoted 13 lines

-----Original Message-----
From: Cousson, Benoit
Sent: Thursday, December 10, 2009 1:04 AM
To: Shilimkar, Santosh; tony at atomide.com
Cc: linux-arm-kernel at lists.infradead.org; linux-omap at vger.kernel.org; linux at arm.linux.org.uk
Subject: RE: [PATCH 1/6] OMAP4: Fix cpu detection

Hi Santosh,

Quoted 3 lines

From: linux-omap-owner at vger.kernel.org [mailto:linux-omap- owner at vger.kernel.org] On Behalf Of Shilimkar, Santosh

Quoted 6 lines
Quoted 3 lines

This patch fixes the OMAP4430 cpu detection. Since the omap ID register is not fused in OMAP4430 ES1.0 silicon, identification is done using ARM CPUID register.

I think that this description is not reflecting your current patch that does use the DEVICE_ID register.

Yes. The second version uses ID_CODE but the commit message still refers to the 1st one. Will fix Commit message.