* [PATCH 1/6] omap3: id: fix 3630 rev detection
2010-08-13 8:01 [PATCH 0/6] omap fixes for upcoming 2.6.36-rc1 Tony Lindgren
@ 2010-08-13 8:01 ` Tony Lindgren
2010-08-13 8:01 ` [PATCH 2/6] OMAP3: Fix a cpu type check problem Tony Lindgren
` (4 subsequent siblings)
5 siblings, 0 replies; 17+ messages in thread
From: Tony Lindgren @ 2010-08-13 8:01 UTC (permalink / raw)
To: linux-arm-kernel
From: Nishanth Menon <nm@ti.com>
Wrong placement of break causes all revisions of 3630 to be
detected as 3630 es1.2, we need to break main loop if we have
an identified chip, default falls through as in the rest of the
switches in this function.
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Sanjeev Premi <premi@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Manjunath K <manjugk@ti.com>
Cc: Anand Gadiyar <gadiyar@ti.com>
Cc: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/id.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index e8256a2..9a879f9 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -284,8 +284,8 @@ static void __init omap3_check_revision(void)
default:
omap_revision = OMAP3630_REV_ES1_2;
omap_chip.oc |= CHIP_IS_OMAP3630ES1_2;
- break;
}
+ break;
default:
/* Unknown default to latest silicon rev as default*/
omap_revision = OMAP3630_REV_ES1_2;
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 2/6] OMAP3: Fix a cpu type check problem
2010-08-13 8:01 [PATCH 0/6] omap fixes for upcoming 2.6.36-rc1 Tony Lindgren
2010-08-13 8:01 ` [PATCH 1/6] omap3: id: fix 3630 rev detection Tony Lindgren
@ 2010-08-13 8:01 ` Tony Lindgren
2010-08-13 8:02 ` [PATCH 3/6] OMAP3: PM: ensure IO wakeups are properly disabled Tony Lindgren
` (3 subsequent siblings)
5 siblings, 0 replies; 17+ messages in thread
From: Tony Lindgren @ 2010-08-13 8:01 UTC (permalink / raw)
To: linux-arm-kernel
From: stanley.miao <stanley.miao@windriver.com>
cpu_is_omap3517() and cpu_is_omap3505() are the subgroups of cpu_is_omap34xx(),
so we should check cpu_is_omap3517() and cpu_is_omap3505() first, then check
cpu_is_omap34xx().
Otherwise, All AM35XX (Sitara) clocks do not get registered and device drivers
(ti_hecc, etc...) that depend on those clocks are failing to get the clock and
end up with non working device.
Signed-off-by: Stanley.Miao <stanley.miao@windriver.com>
Tested-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/clock3xxx_data.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index 138646d..dfdce2d 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3417,7 +3417,13 @@ int __init omap3xxx_clk_init(void)
struct omap_clk *c;
u32 cpu_clkflg = CK_3XXX;
- if (cpu_is_omap34xx()) {
+ if (cpu_is_omap3517()) {
+ cpu_mask = RATE_IN_3XXX | RATE_IN_3430ES2PLUS;
+ cpu_clkflg |= CK_3517;
+ } else if (cpu_is_omap3505()) {
+ cpu_mask = RATE_IN_3XXX | RATE_IN_3430ES2PLUS;
+ cpu_clkflg |= CK_3505;
+ } else if (cpu_is_omap34xx()) {
cpu_mask = RATE_IN_3XXX;
cpu_clkflg |= CK_343X;
@@ -3432,12 +3438,6 @@ int __init omap3xxx_clk_init(void)
cpu_mask |= RATE_IN_3430ES2PLUS;
cpu_clkflg |= CK_3430ES2;
}
- } else if (cpu_is_omap3517()) {
- cpu_mask = RATE_IN_3XXX | RATE_IN_3430ES2PLUS;
- cpu_clkflg |= CK_3517;
- } else if (cpu_is_omap3505()) {
- cpu_mask = RATE_IN_3XXX | RATE_IN_3430ES2PLUS;
- cpu_clkflg |= CK_3505;
}
if (omap3_has_192mhz_clk())
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 3/6] OMAP3: PM: ensure IO wakeups are properly disabled
2010-08-13 8:01 [PATCH 0/6] omap fixes for upcoming 2.6.36-rc1 Tony Lindgren
2010-08-13 8:01 ` [PATCH 1/6] omap3: id: fix 3630 rev detection Tony Lindgren
2010-08-13 8:01 ` [PATCH 2/6] OMAP3: Fix a cpu type check problem Tony Lindgren
@ 2010-08-13 8:02 ` Tony Lindgren
2010-08-13 9:53 ` Sergei Shtylyov
2010-08-13 8:02 ` [PATCH 4/6] omap: Fix sev instruction usage for multi-omap Tony Lindgren
` (2 subsequent siblings)
5 siblings, 1 reply; 17+ messages in thread
From: Tony Lindgren @ 2010-08-13 8:02 UTC (permalink / raw)
To: linux-arm-kernel
From: Kevin Hilman <khilman@ti.com>
Commit 5a5f561 (convert OMAP3 PRCM macros to the _SHIFT/_MASK suffixes)
mistakenly removed the check for PER when disabling the IO chain.
During idle, if the PER powerdomain transitions and CORE does not (as
is the case with the lower C-states when using CPUidle) the IO pad
wakeups are not being disabled in the idle path after they are
enabled.
This patch ensures that the check for disabling IO wakeups also checks
for PER transitions, matching the check done to enable IO wakeups.
Found when debugging PM/CPUidle related problems reported by Ameya
Palande <ameya.palande@nokia.com>. Problems were triggered
particularily on boards with UART2 consoles (n900, Overo) since UART2
is in the PER powerdomain.
Tested on l-o master (omap3_defonfig + CONFIG_CPU_IDLE=y) as well
as with current PM branch. Boards tested: n900, Overo, omap3evm.
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Ameya Palande <ameya.palande@nokia.com>
Tested-by: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/pm34xx.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index fb4994a..7b03426 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -480,7 +480,9 @@ void omap_sram_idle(void)
}
/* Disable IO-PAD and IO-CHAIN wakeup */
- if (omap3_has_io_wakeup() && core_next_state < PWRDM_POWER_ON) {
+ if (omap3_has_io_wakeup() &&
+ (per_next_state < PWRDM_POWER_ON ||
+ core_next_state < PWRDM_POWER_ON)) {
prm_clear_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD, PM_WKEN);
omap3_disable_io_chain();
}
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 3/6] OMAP3: PM: ensure IO wakeups are properly disabled
2010-08-13 8:02 ` [PATCH 3/6] OMAP3: PM: ensure IO wakeups are properly disabled Tony Lindgren
@ 2010-08-13 9:53 ` Sergei Shtylyov
2010-08-13 10:29 ` Tony Lindgren
0 siblings, 1 reply; 17+ messages in thread
From: Sergei Shtylyov @ 2010-08-13 9:53 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
Tony Lindgren wrote:
> From: Kevin Hilman <khilman@ti.com>
> Commit 5a5f561 (convert OMAP3 PRCM macros to the _SHIFT/_MASK suffixes)
> mistakenly removed the check for PER when disabling the IO chain.
>
> During idle, if the PER powerdomain transitions and CORE does not (as
Does not what?
> is the case with the lower C-states when using CPUidle) the IO pad
> wakeups are not being disabled in the idle path after they are
> enabled.
WBR, Sergei
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 3/6] OMAP3: PM: ensure IO wakeups are properly disabled
2010-08-13 9:53 ` Sergei Shtylyov
@ 2010-08-13 10:29 ` Tony Lindgren
2010-08-13 10:50 ` Sergei Shtylyov
0 siblings, 1 reply; 17+ messages in thread
From: Tony Lindgren @ 2010-08-13 10:29 UTC (permalink / raw)
To: linux-arm-kernel
* Sergei Shtylyov <sshtylyov@mvista.com> [100813 12:48]:
> Hello.
>
> Tony Lindgren wrote:
>
> >From: Kevin Hilman <khilman@ti.com>
>
> >Commit 5a5f561 (convert OMAP3 PRCM macros to the _SHIFT/_MASK suffixes)
> >mistakenly removed the check for PER when disabling the IO chain.
> >
> >During idle, if the PER powerdomain transitions and CORE does not (as
>
> Does not what?
How about ".. and CORE does not transition"?
Kevin, care to clarify that?
Tony
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 3/6] OMAP3: PM: ensure IO wakeups are properly disabled
2010-08-13 10:29 ` Tony Lindgren
@ 2010-08-13 10:50 ` Sergei Shtylyov
2010-08-19 18:14 ` Kevin Hilman
0 siblings, 1 reply; 17+ messages in thread
From: Sergei Shtylyov @ 2010-08-13 10:50 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
Tony Lindgren wrote:
>>> From: Kevin Hilman <khilman@ti.com>
>>> Commit 5a5f561 (convert OMAP3 PRCM macros to the _SHIFT/_MASK suffixes)
>>> mistakenly removed the check for PER when disabling the IO chain.
>>> During idle, if the PER powerdomain transitions and CORE does not (as
>> Does not what?
> How about ".. and CORE does not transition"?
Transition to what then? Sentense till won't parse right...
> Kevin, care to clarify that?
Yeah, looks like a considerable partt of that sentense got omitted...
> Tony
WBR, Sergei
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 3/6] OMAP3: PM: ensure IO wakeups are properly disabled
2010-08-13 10:50 ` Sergei Shtylyov
@ 2010-08-19 18:14 ` Kevin Hilman
2010-08-19 18:34 ` Sergei Shtylyov
0 siblings, 1 reply; 17+ messages in thread
From: Kevin Hilman @ 2010-08-19 18:14 UTC (permalink / raw)
To: linux-arm-kernel
Sergei Shtylyov <sshtylyov@mvista.com> writes:
> Hello.
>
> Tony Lindgren wrote:
>
>>>> From: Kevin Hilman <khilman@ti.com>
>>>> Commit 5a5f561 (convert OMAP3 PRCM macros to the _SHIFT/_MASK suffixes)
>>>> mistakenly removed the check for PER when disabling the IO chain.
>
>>>> During idle, if the PER powerdomain transitions and CORE does not (as
>
>>> Does not what?
>
>> How about ".. and CORE does not transition"?
>
> Transition to what then? Sentense till won't parse right...
>
>> Kevin, care to clarify that?
>
> Yeah, looks like a considerable partt of that sentense got omitted...
>
No. Nothing was omitted.
It's like saying "Tony drinks Fernet and Kevin does not." Adding an
additional "drinks Fernet" at the end is redundant.
Kevin
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 3/6] OMAP3: PM: ensure IO wakeups are properly disabled
2010-08-19 18:14 ` Kevin Hilman
@ 2010-08-19 18:34 ` Sergei Shtylyov
2010-08-20 6:56 ` Tony Lindgren
0 siblings, 1 reply; 17+ messages in thread
From: Sergei Shtylyov @ 2010-08-19 18:34 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
Kevin Hilman wrote:
>>>>> From: Kevin Hilman <khilman@ti.com>
>>>>> Commit 5a5f561 (convert OMAP3 PRCM macros to the _SHIFT/_MASK suffixes)
>>>>> mistakenly removed the check for PER when disabling the IO chain.
>>>>> During idle, if the PER powerdomain transitions and CORE does not (as
>>>> Does not what?
>>> How about ".. and CORE does not transition"?
>> Transition to what then? Sentense till won't parse right...
>>> Kevin, care to clarify that?
>> Yeah, looks like a considerable partt of that sentense got omitted...
> No. Nothing was omitted.
> It's like saying "Tony drinks Fernet and Kevin does not." Adding an
> additional "drinks Fernet" at the end is redundant.
Sorry, the sentence still doesn't parse for me. You don't say "Fernet"
there BTW, so it's not clear where the PER powerdomain transitions to. What
goes after the closing parenthesis doesn't clear things up either, it just
describes what happens if...
> Kevin
WBR, Sergei
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 3/6] OMAP3: PM: ensure IO wakeups are properly disabled
2010-08-19 18:34 ` Sergei Shtylyov
@ 2010-08-20 6:56 ` Tony Lindgren
2010-08-20 16:43 ` Kevin Hilman
0 siblings, 1 reply; 17+ messages in thread
From: Tony Lindgren @ 2010-08-20 6:56 UTC (permalink / raw)
To: linux-arm-kernel
* Sergei Shtylyov <sshtylyov@mvista.com> [100819 21:27]:
> Hello.
>
> Kevin Hilman wrote:
>
> >>>>>From: Kevin Hilman <khilman@ti.com>
> >>>>>Commit 5a5f561 (convert OMAP3 PRCM macros to the _SHIFT/_MASK suffixes)
> >>>>>mistakenly removed the check for PER when disabling the IO chain.
> >>>>>During idle, if the PER powerdomain transitions and CORE does not (as
>
> >>>> Does not what?
>
> >>>How about ".. and CORE does not transition"?
>
> >> Transition to what then? Sentense till won't parse right...
>
> >>>Kevin, care to clarify that?
> >> Yeah, looks like a considerable partt of that sentense got omitted...
>
> >No. Nothing was omitted.
>
> >It's like saying "Tony drinks Fernet and Kevin does not." Adding an
> >additional "drinks Fernet" at the end is redundant.
>
> Sorry, the sentence still doesn't parse for me. You don't say
> "Fernet" there BTW, so it's not clear where the PER powerdomain
> transitions to. What goes after the closing parenthesis doesn't
> clear things up either, it just describes what happens if...
I'll update it with the following to preserve the Fernet style,
and to describe the transition:
During idle, if the PER powerdomain transitions into a lower state
and CORE does not, the IO pad wakeups are not being disabled in
the idle path after they are enabled. This can happen with the
lower C-states when using CPUidle for example.
Updated patch attached.
Please reply ASAP if this is not OK, I'd like to get a pull
request for these fixes sent to Linus over the weekend.
Regards,
Tony
-------------- next part --------------
A non-text attachment was scrubbed...
Name: omap3-pm-ensure-io-wakeups-are-properly-disabled.patch
Type: text/x-diff
Size: 1872 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100820/16fe0adb/attachment.bin>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 4/6] omap: Fix sev instruction usage for multi-omap
2010-08-13 8:01 [PATCH 0/6] omap fixes for upcoming 2.6.36-rc1 Tony Lindgren
` (2 preceding siblings ...)
2010-08-13 8:02 ` [PATCH 3/6] OMAP3: PM: ensure IO wakeups are properly disabled Tony Lindgren
@ 2010-08-13 8:02 ` Tony Lindgren
2010-08-13 9:04 ` Shilimkar, Santosh
2010-08-13 8:02 ` [PATCH 5/6] omap: Use CONFIG_SMP for test_for_ipi and test_for_ltirq Tony Lindgren
2010-08-13 8:02 ` [PATCH 6/6] omap: Fix omap_4430sdp_defconfig for make oldconfig Tony Lindgren
5 siblings, 1 reply; 17+ messages in thread
From: Tony Lindgren @ 2010-08-13 8:02 UTC (permalink / raw)
To: linux-arm-kernel
Otherwise we get the following error with omap3_defconfig and CONFIG_SMP:
Error: selected processor does not support `sev'
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/Makefile | 1 +
arch/arm/mach-omap2/omap-smp.c | 3 +--
arch/arm/plat-omap/include/plat/smp.h | 7 -------
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 63b2d88..88d3a1e 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_LOCAL_TIMERS) += timer-mpu.o
obj-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.o
obj-$(CONFIG_ARCH_OMAP4) += omap44xx-smc.o omap4-common.o
+AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a
AFLAGS_omap44xx-smc.o :=-Wa,-march=armv7-a
# Functions loaded to SRAM
diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
index af3c20c..9e9f70e 100644
--- a/arch/arm/mach-omap2/omap-smp.c
+++ b/arch/arm/mach-omap2/omap-smp.c
@@ -102,8 +102,7 @@ static void __init wakeup_secondary(void)
* Send a 'sev' to wake the secondary core from WFE.
* Drain the outstanding writes to memory
*/
- dsb();
- set_event();
+ dsb_sev();
mb();
}
diff --git a/arch/arm/plat-omap/include/plat/smp.h b/arch/arm/plat-omap/include/plat/smp.h
index 6a3ff65..5177a9c 100644
--- a/arch/arm/plat-omap/include/plat/smp.h
+++ b/arch/arm/plat-omap/include/plat/smp.h
@@ -19,13 +19,6 @@
#include <asm/hardware/gic.h>
-/*
- * set_event() is used to wake up secondary core from wfe using sev. ROM
- * code puts the second core into wfe(standby).
- *
- */
-#define set_event() __asm__ __volatile__ ("sev" : : : "memory")
-
/* Needed for secondary core boot */
extern void omap_secondary_startup(void);
extern u32 omap_modify_auxcoreboot0(u32 set_mask, u32 clear_mask);
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 4/6] omap: Fix sev instruction usage for multi-omap
2010-08-13 8:02 ` [PATCH 4/6] omap: Fix sev instruction usage for multi-omap Tony Lindgren
@ 2010-08-13 9:04 ` Shilimkar, Santosh
0 siblings, 0 replies; 17+ messages in thread
From: Shilimkar, Santosh @ 2010-08-13 9:04 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-
> owner at vger.kernel.org] On Behalf Of Tony Lindgren
> Sent: Friday, August 13, 2010 1:32 PM
> To: linux-arm-kernel at lists.infradead.org
> Cc: linux-omap at vger.kernel.org
> Subject: [PATCH 4/6] omap: Fix sev instruction usage for multi-omap
>
> Otherwise we get the following error with omap3_defconfig and CONFIG_SMP:
>
> Error: selected processor does not support `sev'
>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
Looks good to me.
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> ---
> arch/arm/mach-omap2/Makefile | 1 +
> arch/arm/mach-omap2/omap-smp.c | 3 +--
> arch/arm/plat-omap/include/plat/smp.h | 7 -------
> 3 files changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
> index 63b2d88..88d3a1e 100644
> --- a/arch/arm/mach-omap2/Makefile
> +++ b/arch/arm/mach-omap2/Makefile
> @@ -25,6 +25,7 @@ obj-$(CONFIG_LOCAL_TIMERS) += timer-mpu.o
> obj-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.o
> obj-$(CONFIG_ARCH_OMAP4) += omap44xx-smc.o omap4-common.o
>
> +AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a
> AFLAGS_omap44xx-smc.o :=-Wa,-march=armv7-a
>
> # Functions loaded to SRAM
> diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-
> smp.c
> index af3c20c..9e9f70e 100644
> --- a/arch/arm/mach-omap2/omap-smp.c
> +++ b/arch/arm/mach-omap2/omap-smp.c
> @@ -102,8 +102,7 @@ static void __init wakeup_secondary(void)
> * Send a 'sev' to wake the secondary core from WFE.
> * Drain the outstanding writes to memory
> */
> - dsb();
> - set_event();
> + dsb_sev();
> mb();
> }
>
> diff --git a/arch/arm/plat-omap/include/plat/smp.h b/arch/arm/plat-
> omap/include/plat/smp.h
> index 6a3ff65..5177a9c 100644
> --- a/arch/arm/plat-omap/include/plat/smp.h
> +++ b/arch/arm/plat-omap/include/plat/smp.h
> @@ -19,13 +19,6 @@
>
> #include <asm/hardware/gic.h>
>
> -/*
> - * set_event() is used to wake up secondary core from wfe using sev. ROM
> - * code puts the second core into wfe(standby).
> - *
> - */
> -#define set_event() __asm__ __volatile__ ("sev" : : : "memory")
> -
> /* Needed for secondary core boot */
> extern void omap_secondary_startup(void);
> extern u32 omap_modify_auxcoreboot0(u32 set_mask, u32 clear_mask);
>
> --
> 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
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 5/6] omap: Use CONFIG_SMP for test_for_ipi and test_for_ltirq
2010-08-13 8:01 [PATCH 0/6] omap fixes for upcoming 2.6.36-rc1 Tony Lindgren
` (3 preceding siblings ...)
2010-08-13 8:02 ` [PATCH 4/6] omap: Fix sev instruction usage for multi-omap Tony Lindgren
@ 2010-08-13 8:02 ` Tony Lindgren
2010-08-13 9:04 ` Shilimkar, Santosh
2010-08-13 8:02 ` [PATCH 6/6] omap: Fix omap_4430sdp_defconfig for make oldconfig Tony Lindgren
5 siblings, 1 reply; 17+ messages in thread
From: Tony Lindgren @ 2010-08-13 8:02 UTC (permalink / raw)
To: linux-arm-kernel
Otherwise we get the following error when enabling CONFIG_SMP
for omap3_defconfig:
arch/arm/kernel/entry-armv.S: Assembler messages:
arch/arm/kernel/entry-armv.S:48: Error: bad instruction `test_for_ipi r0,r6,r5,lr'
arch/arm/kernel/entry-armv.S:48: Error: bad instruction `test_for_ltirq r0,r6,r5,lr'
arch/arm/kernel/entry-armv.S:48: Error: bad instruction `test_for_ipi r0,r6,r5,lr'
arch/arm/kernel/entry-armv.S:48: Error: bad instruction `test_for_ltirq r0,r6,r5,lr'
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/include/mach/entry-macro.S | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/include/mach/entry-macro.S b/arch/arm/mach-omap2/include/mach/entry-macro.S
index 50fd749..06e64e1 100644
--- a/arch/arm/mach-omap2/include/mach/entry-macro.S
+++ b/arch/arm/mach-omap2/include/mach/entry-macro.S
@@ -177,7 +177,10 @@ omap_irq_base: .word 0
cmpne \irqnr, \tmp
cmpcs \irqnr, \irqnr
.endm
+#endif
+#endif /* MULTI_OMAP2 */
+#ifdef CONFIG_SMP
/* We assume that irqstat (the raw value of the IRQ acknowledge
* register) is preserved from the macro above.
* If there is an IPI, we immediately signal end of interrupt
@@ -205,8 +208,7 @@ omap_irq_base: .word 0
streq \irqstat, [\base, #GIC_CPU_EOI]
cmp \tmp, #0
.endm
-#endif
-#endif /* MULTI_OMAP2 */
+#endif /* CONFIG_SMP */
.macro irq_prio_table
.endm
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 5/6] omap: Use CONFIG_SMP for test_for_ipi and test_for_ltirq
2010-08-13 8:02 ` [PATCH 5/6] omap: Use CONFIG_SMP for test_for_ipi and test_for_ltirq Tony Lindgren
@ 2010-08-13 9:04 ` Shilimkar, Santosh
0 siblings, 0 replies; 17+ messages in thread
From: Shilimkar, Santosh @ 2010-08-13 9:04 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-
> owner at vger.kernel.org] On Behalf Of Tony Lindgren
> Sent: Friday, August 13, 2010 1:32 PM
> To: linux-arm-kernel at lists.infradead.org
> Cc: linux-omap at vger.kernel.org
> Subject: [PATCH 5/6] omap: Use CONFIG_SMP for test_for_ipi and
> test_for_ltirq
>
> Otherwise we get the following error when enabling CONFIG_SMP
> for omap3_defconfig:
>
> arch/arm/kernel/entry-armv.S: Assembler messages:
> arch/arm/kernel/entry-armv.S:48: Error: bad instruction `test_for_ipi
> r0,r6,r5,lr'
> arch/arm/kernel/entry-armv.S:48: Error: bad instruction `test_for_ltirq
> r0,r6,r5,lr'
> arch/arm/kernel/entry-armv.S:48: Error: bad instruction `test_for_ipi
> r0,r6,r5,lr'
> arch/arm/kernel/entry-armv.S:48: Error: bad instruction `test_for_ltirq
> r0,r6,r5,lr'
>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
This is same with omap_4430sdp_defconfig.
With this patch build is working patch now.
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> arch/arm/mach-omap2/include/mach/entry-macro.S | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/include/mach/entry-macro.S
> b/arch/arm/mach-omap2/include/mach/entry-macro.S
> index 50fd749..06e64e1 100644
> --- a/arch/arm/mach-omap2/include/mach/entry-macro.S
> +++ b/arch/arm/mach-omap2/include/mach/entry-macro.S
> @@ -177,7 +177,10 @@ omap_irq_base: .word 0
> cmpne \irqnr, \tmp
> cmpcs \irqnr, \irqnr
> .endm
> +#endif
> +#endif /* MULTI_OMAP2 */
>
> +#ifdef CONFIG_SMP
> /* We assume that irqstat (the raw value of the IRQ
> acknowledge
> * register) is preserved from the macro above.
> * If there is an IPI, we immediately signal end of interrupt
> @@ -205,8 +208,7 @@ omap_irq_base: .word 0
> streq \irqstat, [\base, #GIC_CPU_EOI]
> cmp \tmp, #0
> .endm
> -#endif
> -#endif /* MULTI_OMAP2 */
> +#endif /* CONFIG_SMP */
>
> .macro irq_prio_table
> .endm
>
> --
> 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
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 6/6] omap: Fix omap_4430sdp_defconfig for make oldconfig
2010-08-13 8:01 [PATCH 0/6] omap fixes for upcoming 2.6.36-rc1 Tony Lindgren
` (4 preceding siblings ...)
2010-08-13 8:02 ` [PATCH 5/6] omap: Use CONFIG_SMP for test_for_ipi and test_for_ltirq Tony Lindgren
@ 2010-08-13 8:02 ` Tony Lindgren
2010-08-13 9:04 ` Shilimkar, Santosh
5 siblings, 1 reply; 17+ messages in thread
From: Tony Lindgren @ 2010-08-13 8:02 UTC (permalink / raw)
To: linux-arm-kernel
Commit ffb63e3402849e1b70119ee0c9a81dc9da4dfa97 changed
Kconfig to select support for omap2, 3 and 4 by default.
However, CONFIG_SMP won't currently work properly on
uniprocessor ARMs, or if support for earlier ARM cores
is selected in.
Fix this by updating omap_4430sdp_defconfig to not
select omap2 or 3 at this point.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/configs/omap_4430sdp_defconfig | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/arch/arm/configs/omap_4430sdp_defconfig b/arch/arm/configs/omap_4430sdp_defconfig
index 63e0c2d..14c1e18 100644
--- a/arch/arm/configs/omap_4430sdp_defconfig
+++ b/arch/arm/configs/omap_4430sdp_defconfig
@@ -13,6 +13,9 @@ CONFIG_MODULE_SRCVERSION_ALL=y
# CONFIG_BLK_DEV_BSG is not set
CONFIG_ARCH_OMAP=y
CONFIG_ARCH_OMAP4=y
+# CONFIG_ARCH_OMAP2PLUS_TYPICAL is not set
+# CONFIG_ARCH_OMAP2 is not set
+# CONFIG_ARCH_OMAP3 is not set
# CONFIG_OMAP_MUX is not set
CONFIG_OMAP_32K_TIMER=y
CONFIG_OMAP_DM_TIMER=y
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 6/6] omap: Fix omap_4430sdp_defconfig for make oldconfig
2010-08-13 8:02 ` [PATCH 6/6] omap: Fix omap_4430sdp_defconfig for make oldconfig Tony Lindgren
@ 2010-08-13 9:04 ` Shilimkar, Santosh
0 siblings, 0 replies; 17+ messages in thread
From: Shilimkar, Santosh @ 2010-08-13 9:04 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-
> owner at vger.kernel.org] On Behalf Of Tony Lindgren
> Sent: Friday, August 13, 2010 1:32 PM
> To: linux-arm-kernel at lists.infradead.org
> Cc: linux-omap at vger.kernel.org
> Subject: [PATCH 6/6] omap: Fix omap_4430sdp_defconfig for make oldconfig
>
> Commit ffb63e3402849e1b70119ee0c9a81dc9da4dfa97 changed
> Kconfig to select support for omap2, 3 and 4 by default.
>
> However, CONFIG_SMP won't currently work properly on
> uniprocessor ARMs, or if support for earlier ARM cores
> is selected in.
>
> Fix this by updating omap_4430sdp_defconfig to not
> select omap2 or 3 at this point.
>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
With this patch and previous one in the series, OMAP4
SDP build and boot are working fine. Thanks
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> ---
> arch/arm/configs/omap_4430sdp_defconfig | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/configs/omap_4430sdp_defconfig
> b/arch/arm/configs/omap_4430sdp_defconfig
> index 63e0c2d..14c1e18 100644
> --- a/arch/arm/configs/omap_4430sdp_defconfig
> +++ b/arch/arm/configs/omap_4430sdp_defconfig
> @@ -13,6 +13,9 @@ CONFIG_MODULE_SRCVERSION_ALL=y
> # CONFIG_BLK_DEV_BSG is not set
> CONFIG_ARCH_OMAP=y
> CONFIG_ARCH_OMAP4=y
> +# CONFIG_ARCH_OMAP2PLUS_TYPICAL is not set
> +# CONFIG_ARCH_OMAP2 is not set
> +# CONFIG_ARCH_OMAP3 is not set
> # CONFIG_OMAP_MUX is not set
> CONFIG_OMAP_32K_TIMER=y
> CONFIG_OMAP_DM_TIMER=y
>
> --
> 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
^ permalink raw reply [flat|nested] 17+ messages in thread