* [PATCH v2 0/2] thermal: exynos: Fix NULL pointer error and bug of PD_DET_EN of Exynos7 @ 2015-02-24 4:56 Chanwoo Choi 2015-02-24 4:56 ` [PATCH 1/2] thermal: exynos: Fix wrong control of power down detection mode for Exynos7 Chanwoo Choi 2015-02-24 4:56 ` [PATCH 2/2] thermal: exynos: Clean-up code to use oneline entry for exynos compatible table Chanwoo Choi 0 siblings, 2 replies; 8+ messages in thread From: Chanwoo Choi @ 2015-02-24 4:56 UTC (permalink / raw) To: linux-arm-kernel This patch-set fix the bug of PD_DET_EN bit field of Exynos7 TMU. And the clean-up the exynos compatible table by making oneline entry. Changes from v1: - Rebased it on Linux 4.0-rc1 - Add acked message by Lukasz Majewski - Drop first patch [1] because NULL poiner error don't happen. [1] http://www.spinics.net/lists/linux-samsung-soc/msg42424.html Chanwoo Choi (2): thermal: exynos: Fix wrong control of power down detection mode for Exynos7 thermal: exynos: Clean-up code to use oneline entry for exynos compatible table drivers/thermal/samsung/exynos_tmu.c | 41 +++++++++++------------------------- 1 file changed, 12 insertions(+), 29 deletions(-) -- 1.8.5.5 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] thermal: exynos: Fix wrong control of power down detection mode for Exynos7 2015-02-24 4:56 [PATCH v2 0/2] thermal: exynos: Fix NULL pointer error and bug of PD_DET_EN of Exynos7 Chanwoo Choi @ 2015-02-24 4:56 ` Chanwoo Choi 2015-02-24 18:53 ` Eduardo Valentin 2015-02-25 9:03 ` Lukasz Majewski 2015-02-24 4:56 ` [PATCH 2/2] thermal: exynos: Clean-up code to use oneline entry for exynos compatible table Chanwoo Choi 1 sibling, 2 replies; 8+ messages in thread From: Chanwoo Choi @ 2015-02-24 4:56 UTC (permalink / raw) To: linux-arm-kernel This patch fixes the wrong control of PD_DET_EN (power down detection mode) for Exynos7 because exynos7_tmu_control() always enables the power down detection mode regardless 'on' parameter. Cc: Zhang Rui <rui.zhang@intel.com> Cc: Eduardo Valentin <edubezval@gmail.com> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> --- drivers/thermal/samsung/exynos_tmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index 933cd80..a60f527 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -682,6 +682,7 @@ static void exynos7_tmu_control(struct platform_device *pdev, bool on) if (on) { con |= (1 << EXYNOS_TMU_CORE_EN_SHIFT); + con |= (1 << EXYNOS7_PD_DET_EN_SHIFT); interrupt_en = (of_thermal_is_trip_valid(tz, 7) << EXYNOS7_TMU_INTEN_RISE7_SHIFT) | @@ -704,9 +705,9 @@ static void exynos7_tmu_control(struct platform_device *pdev, bool on) interrupt_en << EXYNOS_TMU_INTEN_FALL0_SHIFT; } else { con &= ~(1 << EXYNOS_TMU_CORE_EN_SHIFT); + con &= ~(1 << EXYNOS7_PD_DET_EN_SHIFT); interrupt_en = 0; /* Disable all interrupts */ } - con |= 1 << EXYNOS7_PD_DET_EN_SHIFT; writel(interrupt_en, data->base + EXYNOS7_TMU_REG_INTEN); writel(con, data->base + EXYNOS_TMU_REG_CONTROL); -- 1.8.5.5 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 1/2] thermal: exynos: Fix wrong control of power down detection mode for Exynos7 2015-02-24 4:56 ` [PATCH 1/2] thermal: exynos: Fix wrong control of power down detection mode for Exynos7 Chanwoo Choi @ 2015-02-24 18:53 ` Eduardo Valentin 2015-02-25 9:03 ` Lukasz Majewski 1 sibling, 0 replies; 8+ messages in thread From: Eduardo Valentin @ 2015-02-24 18:53 UTC (permalink / raw) To: linux-arm-kernel On Tue, Feb 24, 2015 at 01:56:54PM +0900, Chanwoo Choi wrote: > This patch fixes the wrong control of PD_DET_EN (power down detection mode) > for Exynos7 because exynos7_tmu_control() always enables the power down detection > mode regardless 'on' parameter. > > Cc: Zhang Rui <rui.zhang@intel.com> > Cc: Eduardo Valentin <edubezval@gmail.com> > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Lukasz, Any objections to this code? BR, Eduardo Valentin > --- > drivers/thermal/samsung/exynos_tmu.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c > index 933cd80..a60f527 100644 > --- a/drivers/thermal/samsung/exynos_tmu.c > +++ b/drivers/thermal/samsung/exynos_tmu.c > @@ -682,6 +682,7 @@ static void exynos7_tmu_control(struct platform_device *pdev, bool on) > > if (on) { > con |= (1 << EXYNOS_TMU_CORE_EN_SHIFT); > + con |= (1 << EXYNOS7_PD_DET_EN_SHIFT); > interrupt_en = > (of_thermal_is_trip_valid(tz, 7) > << EXYNOS7_TMU_INTEN_RISE7_SHIFT) | > @@ -704,9 +705,9 @@ static void exynos7_tmu_control(struct platform_device *pdev, bool on) > interrupt_en << EXYNOS_TMU_INTEN_FALL0_SHIFT; > } else { > con &= ~(1 << EXYNOS_TMU_CORE_EN_SHIFT); > + con &= ~(1 << EXYNOS7_PD_DET_EN_SHIFT); > interrupt_en = 0; /* Disable all interrupts */ > } > - con |= 1 << EXYNOS7_PD_DET_EN_SHIFT; > > writel(interrupt_en, data->base + EXYNOS7_TMU_REG_INTEN); > writel(con, data->base + EXYNOS_TMU_REG_CONTROL); > -- > 1.8.5.5 > -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 473 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150224/bb0c2606/attachment.sig> ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] thermal: exynos: Fix wrong control of power down detection mode for Exynos7 2015-02-24 4:56 ` [PATCH 1/2] thermal: exynos: Fix wrong control of power down detection mode for Exynos7 Chanwoo Choi 2015-02-24 18:53 ` Eduardo Valentin @ 2015-02-25 9:03 ` Lukasz Majewski 2015-02-25 12:09 ` Abhilash Kesavan 1 sibling, 1 reply; 8+ messages in thread From: Lukasz Majewski @ 2015-02-25 9:03 UTC (permalink / raw) To: linux-arm-kernel Hi Abhilash, > This patch fixes the wrong control of PD_DET_EN (power down detection > mode) for Exynos7 because exynos7_tmu_control() always enables the > power down detection mode regardless 'on' parameter. > > Cc: Zhang Rui <rui.zhang@intel.com> > Cc: Eduardo Valentin <edubezval@gmail.com> > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> > --- > drivers/thermal/samsung/exynos_tmu.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/thermal/samsung/exynos_tmu.c > b/drivers/thermal/samsung/exynos_tmu.c index 933cd80..a60f527 100644 > --- a/drivers/thermal/samsung/exynos_tmu.c > +++ b/drivers/thermal/samsung/exynos_tmu.c > @@ -682,6 +682,7 @@ static void exynos7_tmu_control(struct > platform_device *pdev, bool on) > if (on) { > con |= (1 << EXYNOS_TMU_CORE_EN_SHIFT); > + con |= (1 << EXYNOS7_PD_DET_EN_SHIFT); > interrupt_en = > (of_thermal_is_trip_valid(tz, 7) > << EXYNOS7_TMU_INTEN_RISE7_SHIFT) | > @@ -704,9 +705,9 @@ static void exynos7_tmu_control(struct > platform_device *pdev, bool on) interrupt_en << > EXYNOS_TMU_INTEN_FALL0_SHIFT; } else { > con &= ~(1 << EXYNOS_TMU_CORE_EN_SHIFT); > + con &= ~(1 << EXYNOS7_PD_DET_EN_SHIFT); > interrupt_en = 0; /* Disable all interrupts */ > } > - con |= 1 << EXYNOS7_PD_DET_EN_SHIFT; > > writel(interrupt_en, data->base + EXYNOS7_TMU_REG_INTEN); > writel(con, data->base + EXYNOS_TMU_REG_CONTROL); Could you test this patch if it isn't introducing any regression on your HW? -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] thermal: exynos: Fix wrong control of power down detection mode for Exynos7 2015-02-25 9:03 ` Lukasz Majewski @ 2015-02-25 12:09 ` Abhilash Kesavan 2015-02-25 12:25 ` Lukasz Majewski 0 siblings, 1 reply; 8+ messages in thread From: Abhilash Kesavan @ 2015-02-25 12:09 UTC (permalink / raw) To: linux-arm-kernel Hi Lukasz, On Wed, Feb 25, 2015 at 2:33 PM, Lukasz Majewski <l.majewski@samsung.com> wrote: > Hi Abhilash, > >> This patch fixes the wrong control of PD_DET_EN (power down detection >> mode) for Exynos7 because exynos7_tmu_control() always enables the >> power down detection mode regardless 'on' parameter. >> >> Cc: Zhang Rui <rui.zhang@intel.com> >> Cc: Eduardo Valentin <edubezval@gmail.com> >> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> >> --- >> drivers/thermal/samsung/exynos_tmu.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/thermal/samsung/exynos_tmu.c >> b/drivers/thermal/samsung/exynos_tmu.c index 933cd80..a60f527 100644 >> --- a/drivers/thermal/samsung/exynos_tmu.c >> +++ b/drivers/thermal/samsung/exynos_tmu.c >> @@ -682,6 +682,7 @@ static void exynos7_tmu_control(struct >> platform_device *pdev, bool on) >> if (on) { >> con |= (1 << EXYNOS_TMU_CORE_EN_SHIFT); >> + con |= (1 << EXYNOS7_PD_DET_EN_SHIFT); >> interrupt_en = >> (of_thermal_is_trip_valid(tz, 7) >> << EXYNOS7_TMU_INTEN_RISE7_SHIFT) | >> @@ -704,9 +705,9 @@ static void exynos7_tmu_control(struct >> platform_device *pdev, bool on) interrupt_en << >> EXYNOS_TMU_INTEN_FALL0_SHIFT; } else { >> con &= ~(1 << EXYNOS_TMU_CORE_EN_SHIFT); >> + con &= ~(1 << EXYNOS7_PD_DET_EN_SHIFT); >> interrupt_en = 0; /* Disable all interrupts */ >> } >> - con |= 1 << EXYNOS7_PD_DET_EN_SHIFT; >> >> writel(interrupt_en, data->base + EXYNOS7_TMU_REG_INTEN); >> writel(con, data->base + EXYNOS_TMU_REG_CONTROL); > > Could you test this patch if it isn't introducing any regression on your > HW? The patch does not cause any regression on exynos7 and seems logically correct. Tested-by: Abhilash Kesavan <a.kesavan@samsung.com> Regards, Abhilash > > -- > Best regards, > > Lukasz Majewski > > Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] thermal: exynos: Fix wrong control of power down detection mode for Exynos7 2015-02-25 12:09 ` Abhilash Kesavan @ 2015-02-25 12:25 ` Lukasz Majewski 2015-02-25 19:01 ` Eduardo Valentin 0 siblings, 1 reply; 8+ messages in thread From: Lukasz Majewski @ 2015-02-25 12:25 UTC (permalink / raw) To: linux-arm-kernel Hi Eduardo, > Hi Lukasz, > > On Wed, Feb 25, 2015 at 2:33 PM, Lukasz Majewski > <l.majewski@samsung.com> wrote: > > Hi Abhilash, > > > >> This patch fixes the wrong control of PD_DET_EN (power down > >> detection mode) for Exynos7 because exynos7_tmu_control() always > >> enables the power down detection mode regardless 'on' parameter. > >> > >> Cc: Zhang Rui <rui.zhang@intel.com> > >> Cc: Eduardo Valentin <edubezval@gmail.com> > >> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> > >> --- > >> drivers/thermal/samsung/exynos_tmu.c | 3 ++- > >> 1 file changed, 2 insertions(+), 1 deletion(-) > >> > >> diff --git a/drivers/thermal/samsung/exynos_tmu.c > >> b/drivers/thermal/samsung/exynos_tmu.c index 933cd80..a60f527 > >> 100644 --- a/drivers/thermal/samsung/exynos_tmu.c > >> +++ b/drivers/thermal/samsung/exynos_tmu.c > >> @@ -682,6 +682,7 @@ static void exynos7_tmu_control(struct > >> platform_device *pdev, bool on) > >> if (on) { > >> con |= (1 << EXYNOS_TMU_CORE_EN_SHIFT); > >> + con |= (1 << EXYNOS7_PD_DET_EN_SHIFT); > >> interrupt_en = > >> (of_thermal_is_trip_valid(tz, 7) > >> << EXYNOS7_TMU_INTEN_RISE7_SHIFT) | > >> @@ -704,9 +705,9 @@ static void exynos7_tmu_control(struct > >> platform_device *pdev, bool on) interrupt_en << > >> EXYNOS_TMU_INTEN_FALL0_SHIFT; } else { > >> con &= ~(1 << EXYNOS_TMU_CORE_EN_SHIFT); > >> + con &= ~(1 << EXYNOS7_PD_DET_EN_SHIFT); > >> interrupt_en = 0; /* Disable all interrupts */ > >> } > >> - con |= 1 << EXYNOS7_PD_DET_EN_SHIFT; > >> > >> writel(interrupt_en, data->base + EXYNOS7_TMU_REG_INTEN); > >> writel(con, data->base + EXYNOS_TMU_REG_CONTROL); > > > > Could you test this patch if it isn't introducing any regression on > > your HW? > > The patch does not cause any regression on exynos7 and seems > logically correct. > > Tested-by: Abhilash Kesavan <a.kesavan@samsung.com> > Eduardo, it is up to you if you prefer to take this fix directly or via the new thermal-samsung tree ? >From when shall I regard myself as a maintainer? :-) > > Regards, > Abhilash > > > > -- > > Best regards, > > > > Lukasz Majewski > > > > Samsung R&D Institute Poland (SRPOL) | Linux Platform Group -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] thermal: exynos: Fix wrong control of power down detection mode for Exynos7 2015-02-25 12:25 ` Lukasz Majewski @ 2015-02-25 19:01 ` Eduardo Valentin 0 siblings, 0 replies; 8+ messages in thread From: Eduardo Valentin @ 2015-02-25 19:01 UTC (permalink / raw) To: linux-arm-kernel On Wed, Feb 25, 2015 at 01:25:08PM +0100, Lukasz Majewski wrote: > Hi Eduardo, > > > Hi Lukasz, > > > > On Wed, Feb 25, 2015 at 2:33 PM, Lukasz Majewski > > <l.majewski@samsung.com> wrote: > > > Hi Abhilash, > > > > > >> This patch fixes the wrong control of PD_DET_EN (power down > > >> detection mode) for Exynos7 because exynos7_tmu_control() always > > >> enables the power down detection mode regardless 'on' parameter. > > >> > > >> Cc: Zhang Rui <rui.zhang@intel.com> > > >> Cc: Eduardo Valentin <edubezval@gmail.com> > > >> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> > > >> --- > > >> drivers/thermal/samsung/exynos_tmu.c | 3 ++- > > >> 1 file changed, 2 insertions(+), 1 deletion(-) > > >> > > >> diff --git a/drivers/thermal/samsung/exynos_tmu.c > > >> b/drivers/thermal/samsung/exynos_tmu.c index 933cd80..a60f527 > > >> 100644 --- a/drivers/thermal/samsung/exynos_tmu.c > > >> +++ b/drivers/thermal/samsung/exynos_tmu.c > > >> @@ -682,6 +682,7 @@ static void exynos7_tmu_control(struct > > >> platform_device *pdev, bool on) > > >> if (on) { > > >> con |= (1 << EXYNOS_TMU_CORE_EN_SHIFT); > > >> + con |= (1 << EXYNOS7_PD_DET_EN_SHIFT); > > >> interrupt_en = > > >> (of_thermal_is_trip_valid(tz, 7) > > >> << EXYNOS7_TMU_INTEN_RISE7_SHIFT) | > > >> @@ -704,9 +705,9 @@ static void exynos7_tmu_control(struct > > >> platform_device *pdev, bool on) interrupt_en << > > >> EXYNOS_TMU_INTEN_FALL0_SHIFT; } else { > > >> con &= ~(1 << EXYNOS_TMU_CORE_EN_SHIFT); > > >> + con &= ~(1 << EXYNOS7_PD_DET_EN_SHIFT); > > >> interrupt_en = 0; /* Disable all interrupts */ > > >> } > > >> - con |= 1 << EXYNOS7_PD_DET_EN_SHIFT; > > >> > > >> writel(interrupt_en, data->base + EXYNOS7_TMU_REG_INTEN); > > >> writel(con, data->base + EXYNOS_TMU_REG_CONTROL); > > > > > > Could you test this patch if it isn't introducing any regression on > > > your HW? > > > > The patch does not cause any regression on exynos7 and seems > > logically correct. > > > > Tested-by: Abhilash Kesavan <a.kesavan@samsung.com> > > > > Eduardo, it is up to you if you prefer to take this fix directly or via > the new thermal-samsung tree ? > > From when shall I regard myself as a maintainer? :-) > Yeah. Go ahead and collect it. > > > > > Regards, > > Abhilash > > > > > > -- > > > Best regards, > > > > > > Lukasz Majewski > > > > > > Samsung R&D Institute Poland (SRPOL) | Linux Platform Group > > > -- > Best regards, > > Lukasz Majewski > > Samsung R&D Institute Poland (SRPOL) | Linux Platform Group -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 473 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150225/ecc22b37/attachment.sig> ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] thermal: exynos: Clean-up code to use oneline entry for exynos compatible table 2015-02-24 4:56 [PATCH v2 0/2] thermal: exynos: Fix NULL pointer error and bug of PD_DET_EN of Exynos7 Chanwoo Choi 2015-02-24 4:56 ` [PATCH 1/2] thermal: exynos: Fix wrong control of power down detection mode for Exynos7 Chanwoo Choi @ 2015-02-24 4:56 ` Chanwoo Choi 1 sibling, 0 replies; 8+ messages in thread From: Chanwoo Choi @ 2015-02-24 4:56 UTC (permalink / raw) To: linux-arm-kernel This patch cleanup the code to use oneline for entry of exynos compatible table. Cc: Zhang Rui <rui.zhang@intel.com> Cc: Eduardo Valentin <edubezval@gmail.com> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Acked-by: Lukasz Majewski <l.majewski@samsung.com> --- drivers/thermal/samsung/exynos_tmu.c | 38 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index a60f527..1d30b09 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -919,34 +919,16 @@ static irqreturn_t exynos_tmu_irq(int irq, void *id) } static const struct of_device_id exynos_tmu_match[] = { - { - .compatible = "samsung,exynos3250-tmu", - }, - { - .compatible = "samsung,exynos4210-tmu", - }, - { - .compatible = "samsung,exynos4412-tmu", - }, - { - .compatible = "samsung,exynos5250-tmu", - }, - { - .compatible = "samsung,exynos5260-tmu", - }, - { - .compatible = "samsung,exynos5420-tmu", - }, - { - .compatible = "samsung,exynos5420-tmu-ext-triminfo", - }, - { - .compatible = "samsung,exynos5440-tmu", - }, - { - .compatible = "samsung,exynos7-tmu", - }, - {}, + { .compatible = "samsung,exynos3250-tmu", }, + { .compatible = "samsung,exynos4210-tmu", }, + { .compatible = "samsung,exynos4412-tmu", }, + { .compatible = "samsung,exynos5250-tmu", }, + { .compatible = "samsung,exynos5260-tmu", }, + { .compatible = "samsung,exynos5420-tmu", }, + { .compatible = "samsung,exynos5420-tmu-ext-triminfo", }, + { .compatible = "samsung,exynos5440-tmu", }, + { .compatible = "samsung,exynos7-tmu", }, + { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, exynos_tmu_match); -- 1.8.5.5 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-02-25 19:01 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-02-24 4:56 [PATCH v2 0/2] thermal: exynos: Fix NULL pointer error and bug of PD_DET_EN of Exynos7 Chanwoo Choi 2015-02-24 4:56 ` [PATCH 1/2] thermal: exynos: Fix wrong control of power down detection mode for Exynos7 Chanwoo Choi 2015-02-24 18:53 ` Eduardo Valentin 2015-02-25 9:03 ` Lukasz Majewski 2015-02-25 12:09 ` Abhilash Kesavan 2015-02-25 12:25 ` Lukasz Majewski 2015-02-25 19:01 ` Eduardo Valentin 2015-02-24 4:56 ` [PATCH 2/2] thermal: exynos: Clean-up code to use oneline entry for exynos compatible table Chanwoo Choi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox