Re: [PATCH] memory: omap-gpmc: Don't try to save the GPMC context
* Javier Martinez Canillas [150805 05:47]: > Hello Tomeu, > > On Wed, Aug 5, 2015 at 2:24 PM, Tomeu Vizoso > wrote: > > ...if there isn't one already. > > > > I think is better to instead splitting the subject line like this, to > change it for something that fits like "memory: omap-gpmc: Don't try > to save uninitialized GPMC context" or "memory: omap-gpmc: Fix > gpmc_base NULL pointer dereference" I'll apply this into omap-for-v4.2/fixes-v2 with the description updated by adding word "unitialized". Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] memory: omap-gpmc: Don't try to save the GPMC context
On 05/08/15 15:24, Tomeu Vizoso wrote:
> ...if there isn't one already.
>
> If for some reason the GPMC device hasn't been probed yet, gpmc_base is
> going to be NULL. Because there's no context yet to be saved, just turn
> these functions into no-ops until that device gets probed.
>
> Unable to handle kernel NULL pointer dereference at virtual address 0010
> pgd = c0204000
> [0010] *pgd=
> Internal error: Oops: 5 [#1] SMP ARM
> Modules linked in:
> CPU: 0 PID: 0 Comm: swapper/0 Not tainted
> 4.2.0-rc5-next-20150804-05947-g23f38fe8eda9 #1
> Hardware name: Generic OMAP3-GP (Flattened Device Tree)
> task: c0e623e8 ti: c0e5c000 task.ti: c0e5c000
> PC is at omap3_gpmc_save_context+0x8/0xc4
> LR is at omap_sram_idle+0x154/0x23c
> pc : []lr : []psr: 6193
> sp : c0e5df40 ip : c0f92a80 fp : c0999eb0
> r10: c0e57364 r9 : c0e66f14 r8 : 0003
> r7 : r6 : 0003 r5 : r4 : c0f5f174
> r3 : c0fa4fe8 r2 : r1 : r0 : fa200280
> Flags: nZCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment kernel
> Control: 10c5387d Table: 80204019 DAC: 0015
> Process swapper/0 (pid: 0, stack limit = 0xc0e5c220)
> Stack: (0xc0e5df40 to 0xc0e5e000)
> df40: c0e66ef8 c0f5f1a4 0003 c02333a4 c3813822
> df60: c0e5a5c8 cfb8a5d0 c07f0c44 0e4f1d7e
> df80: c3813822 cfb8a5d0 c0e5e4e4 cfb8a5d0 c0e66f14 c0e5a5c8 c0e5e54c
> dfa0: c0e5e544 c0e57364 c0999eb0 c0277758 00fa c0f5d000 c0d61c18
> dfc0: c0d61674 c0df7a48 c0f5d5d4
> dfe0: c0e5e4c0 c0df7a44 c0e634f8 80204059 8020807c
> [] (omap3_gpmc_save_context) from []
> (omap_sram_idle+0x154/0x23c)
> [] (omap_sram_idle) from []
> (omap3_enter_idle_bm+0xec/0x1a8)
> [] (omap3_enter_idle_bm) from []
> (cpuidle_enter_state+0xbc/0x284)
> [] (cpuidle_enter_state) from []
> (cpu_startup_entry+0x174/0x24c)
> [] (cpu_startup_entry) from [] (start_kernel+0x358/0x3c0)
> [] (start_kernel) from [<8020807c>] (0x8020807c)
> Code: c0ccace8 c0ccacc0 e59f30b4 e5932000 (e5921010)
>
> Signed-off-by: Tomeu Vizoso
> Suggested-by: Javier Martinez Canillas
Acked-by: Roger Quadros
cheers,
-roger
> ---
> drivers/memory/omap-gpmc.c | 6 ++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
> index 3a27a84ad3ec..9426276dbe14 100644
> --- a/drivers/memory/omap-gpmc.c
> +++ b/drivers/memory/omap-gpmc.c
> @@ -2245,6 +2245,9 @@ void omap3_gpmc_save_context(void)
> {
> int i;
>
> + if (!gpmc_base)
> + return;
> +
> gpmc_context.sysconfig = gpmc_read_reg(GPMC_SYSCONFIG);
> gpmc_context.irqenable = gpmc_read_reg(GPMC_IRQENABLE);
> gpmc_context.timeout_ctrl = gpmc_read_reg(GPMC_TIMEOUT_CONTROL);
> @@ -2277,6 +2280,9 @@ void omap3_gpmc_restore_context(void)
> {
> int i;
>
> + if (!gpmc_base)
> + return;
> +
> gpmc_write_reg(GPMC_SYSCONFIG, gpmc_context.sysconfig);
> gpmc_write_reg(GPMC_IRQENABLE, gpmc_context.irqenable);
> gpmc_write_reg(GPMC_TIMEOUT_CONTROL, gpmc_context.timeout_ctrl);
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] memory: omap-gpmc: Don't try to save the GPMC context
Hello Tomeu,
On Wed, Aug 5, 2015 at 2:24 PM, Tomeu Vizoso wrote:
> ...if there isn't one already.
>
I think is better to instead splitting the subject line like this, to
change it for something that fits like "memory: omap-gpmc: Don't try
to save uninitialized GPMC context" or "memory: omap-gpmc: Fix
gpmc_base NULL pointer dereference"
> If for some reason the GPMC device hasn't been probed yet, gpmc_base is
> going to be NULL. Because there's no context yet to be saved, just turn
> these functions into no-ops until that device gets probed.
>
> Unable to handle kernel NULL pointer dereference at virtual address 0010
> pgd = c0204000
> [0010] *pgd=
> Internal error: Oops: 5 [#1] SMP ARM
> Modules linked in:
Also, I don't know if the kernel backtrace makes the commit message
more readable. Maybe instead you can add an explanation of who is
calling this function? That this function is called from OMAP2+
CPUidle code that tries to save the state of several IP blocks but
omap3_gpmc_{save,restore}_context() assumes that it will be called
after the probe() function has initialized gpmc_base and that might
not be true?
The patch looks good to me though so after these changes feel free to
also add my:
Reviewed-by: Javier Martinez Canillas
Best regards,
Javier
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] memory: omap-gpmc: Don't try to save the GPMC context
...if there isn't one already.
If for some reason the GPMC device hasn't been probed yet, gpmc_base is
going to be NULL. Because there's no context yet to be saved, just turn
these functions into no-ops until that device gets probed.
Unable to handle kernel NULL pointer dereference at virtual address 0010
pgd = c0204000
[0010] *pgd=
Internal error: Oops: 5 [#1] SMP ARM
Modules linked in:
CPU: 0 PID: 0 Comm: swapper/0 Not tainted
4.2.0-rc5-next-20150804-05947-g23f38fe8eda9 #1
Hardware name: Generic OMAP3-GP (Flattened Device Tree)
task: c0e623e8 ti: c0e5c000 task.ti: c0e5c000
PC is at omap3_gpmc_save_context+0x8/0xc4
LR is at omap_sram_idle+0x154/0x23c
pc : []lr : []psr: 6193
sp : c0e5df40 ip : c0f92a80 fp : c0999eb0
r10: c0e57364 r9 : c0e66f14 r8 : 0003
r7 : r6 : 0003 r5 : r4 : c0f5f174
r3 : c0fa4fe8 r2 : r1 : r0 : fa200280
Flags: nZCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment kernel
Control: 10c5387d Table: 80204019 DAC: 0015
Process swapper/0 (pid: 0, stack limit = 0xc0e5c220)
Stack: (0xc0e5df40 to 0xc0e5e000)
df40: c0e66ef8 c0f5f1a4 0003 c02333a4 c3813822
df60: c0e5a5c8 cfb8a5d0 c07f0c44 0e4f1d7e
df80: c3813822 cfb8a5d0 c0e5e4e4 cfb8a5d0 c0e66f14 c0e5a5c8 c0e5e54c
dfa0: c0e5e544 c0e57364 c0999eb0 c0277758 00fa c0f5d000 c0d61c18
dfc0: c0d61674 c0df7a48 c0f5d5d4
dfe0: c0e5e4c0 c0df7a44 c0e634f8 80204059 8020807c
[] (omap3_gpmc_save_context) from []
(omap_sram_idle+0x154/0x23c)
[] (omap_sram_idle) from [] (omap3_enter_idle_bm+0xec/0x1a8)
[] (omap3_enter_idle_bm) from []
(cpuidle_enter_state+0xbc/0x284)
[] (cpuidle_enter_state) from []
(cpu_startup_entry+0x174/0x24c)
[] (cpu_startup_entry) from [] (start_kernel+0x358/0x3c0)
[] (start_kernel) from [<8020807c>] (0x8020807c)
Code: c0ccace8 c0ccacc0 e59f30b4 e5932000 (e5921010)
Signed-off-by: Tomeu Vizoso
Suggested-by: Javier Martinez Canillas
---
drivers/memory/omap-gpmc.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index 3a27a84ad3ec..9426276dbe14 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -2245,6 +2245,9 @@ void omap3_gpmc_save_context(void)
{
int i;
+ if (!gpmc_base)
+ return;
+
gpmc_context.sysconfig = gpmc_read_reg(GPMC_SYSCONFIG);
gpmc_context.irqenable = gpmc_read_reg(GPMC_IRQENABLE);
gpmc_context.timeout_ctrl = gpmc_read_reg(GPMC_TIMEOUT_CONTROL);
@@ -2277,6 +2280,9 @@ void omap3_gpmc_restore_context(void)
{
int i;
+ if (!gpmc_base)
+ return;
+
gpmc_write_reg(GPMC_SYSCONFIG, gpmc_context.sysconfig);
gpmc_write_reg(GPMC_IRQENABLE, gpmc_context.irqenable);
gpmc_write_reg(GPMC_TIMEOUT_CONTROL, gpmc_context.timeout_ctrl);
--
2.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
