| Message ID | 1403618235-19353-5-git-send-email-t.figa@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Tomasz, On Tue, Jun 24, 2014 at 2:57 PM, Tomasz Figa <t.figa@samsung.com> wrote: > Due to recently merged patches and previous merge conflicts, the Samsung > PM Debug functionality no longer can be enabled. This patch fixes > incorrect dependency of SAMSUNG_PM_DEBUG on an integer symbol and adds > missing header inclusion. Testing against 3.16-rc2, this doesn't quite work for me. SAMSUNG_PM_DEBUG still doesn't appear in menuconfig. HAVE_SAMSUNG_PM_DEBUG is 'n'. Looks like the select from DEBUG_S3C_UART is not working, but I'm not sure why. Daniel
On 25.06.2014 12:09, Daniel Drake wrote: > Hi Tomasz, > > On Tue, Jun 24, 2014 at 2:57 PM, Tomasz Figa <t.figa@samsung.com> wrote: >> Due to recently merged patches and previous merge conflicts, the Samsung >> PM Debug functionality no longer can be enabled. This patch fixes >> incorrect dependency of SAMSUNG_PM_DEBUG on an integer symbol and adds >> missing header inclusion. > > Testing against 3.16-rc2, this doesn't quite work for me. > SAMSUNG_PM_DEBUG still doesn't appear in menuconfig. > > HAVE_SAMSUNG_PM_DEBUG is 'n'. Looks like the select from > DEBUG_S3C_UART is not working, but I'm not sure why. I hastily changed this to something simpler in last minute before sending without proper testing. Let me send something that works. Best regards, Tomasz
Tomasz Figa wrote: > > Due to recently merged patches and previous merge conflicts, the Samsung > PM Debug functionality no longer can be enabled. This patch fixes > incorrect dependency of SAMSUNG_PM_DEBUG on an integer symbol and adds > missing header inclusion. > Yes, you're right and it should be fixed...but I have comments... > Signed-off-by: Tomasz Figa <t.figa@samsung.com> > --- > arch/arm/plat-samsung/Kconfig | 8 +++++++- > arch/arm/plat-samsung/pm-debug.c | 1 + > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig > index 301b892..483c959 100644 > --- a/arch/arm/plat-samsung/Kconfig > +++ b/arch/arm/plat-samsung/Kconfig > @@ -412,9 +412,14 @@ config S5P_DEV_MFC > > comment "Power management" > > +config HAVE_SAMSUNG_PM_DEBUG > + bool > + help > + Allow compilation of Samsung PM debugging code. > + > config SAMSUNG_PM_DEBUG > bool "S3C2410 PM Suspend debug" > - depends on PM && DEBUG_KERNEL && DEBUG_S3C_UART > + depends on PM && DEBUG_KERNEL && HAVE_SAMSUNG_PM_DEBUG > help > Say Y here if you want verbose debugging from the PM Suspend and > Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt> > @@ -484,6 +489,7 @@ config S5P_SLEEP > > config DEBUG_S3C_UART > depends on PLAT_SAMSUNG > + select HAVE_SAMSUNG_PM_DEBUG Hmm... The DEBUG_S3C_UART will be '0' when we select DEBUG_S3C_UART0, then the HAVE_SAMSUNG_PM_DEBUG will not be selected so SAMSUNG_PM_DEBUG is also... > int > default "0" if DEBUG_S3C_UART0 > default "1" if DEBUG_S3C_UART1 > diff --git a/arch/arm/plat-samsung/pm-debug.c b/arch/arm/plat-samsung/pm-debug.c > index 8f19f66..3960960 100644 > --- a/arch/arm/plat-samsung/pm-debug.c > +++ b/arch/arm/plat-samsung/pm-debug.c > @@ -14,6 +14,7 @@ > */ > > #include <linux/serial_core.h> > +#include <linux/serial_s3c.h> Yeah, this is required then we don't need inclusion <linux/serial_core.h> here. > #include <linux/io.h> > > #include <asm/mach/map.h> > -- > 1.9.3
On 08.07.2014 15:48, Kukjin Kim wrote: > Tomasz Figa wrote: >> >> Due to recently merged patches and previous merge conflicts, the Samsung >> PM Debug functionality no longer can be enabled. This patch fixes >> incorrect dependency of SAMSUNG_PM_DEBUG on an integer symbol and adds >> missing header inclusion. >> > Yes, you're right and it should be fixed...but I have comments... > >> Signed-off-by: Tomasz Figa <t.figa@samsung.com> >> --- >> arch/arm/plat-samsung/Kconfig | 8 +++++++- >> arch/arm/plat-samsung/pm-debug.c | 1 + >> 2 files changed, 8 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig >> index 301b892..483c959 100644 >> --- a/arch/arm/plat-samsung/Kconfig >> +++ b/arch/arm/plat-samsung/Kconfig >> @@ -412,9 +412,14 @@ config S5P_DEV_MFC >> >> comment "Power management" >> >> +config HAVE_SAMSUNG_PM_DEBUG >> + bool >> + help >> + Allow compilation of Samsung PM debugging code. >> + >> config SAMSUNG_PM_DEBUG >> bool "S3C2410 PM Suspend debug" >> - depends on PM && DEBUG_KERNEL && DEBUG_S3C_UART >> + depends on PM && DEBUG_KERNEL && HAVE_SAMSUNG_PM_DEBUG >> help >> Say Y here if you want verbose debugging from the PM Suspend and >> Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt> >> @@ -484,6 +489,7 @@ config S5P_SLEEP >> >> config DEBUG_S3C_UART >> depends on PLAT_SAMSUNG >> + select HAVE_SAMSUNG_PM_DEBUG > > Hmm... > > The DEBUG_S3C_UART will be '0' when we select DEBUG_S3C_UART0, then the > HAVE_SAMSUNG_PM_DEBUG will not be selected so SAMSUNG_PM_DEBUG is also... Yes, that's right. I posted v2 after a while in another reply to this thread. Best regards, Tomasz
On 07/08/14 22:54, Tomasz Figa wrote: > On 08.07.2014 15:48, Kukjin Kim wrote: >> Tomasz Figa wrote: >>> >>> Due to recently merged patches and previous merge conflicts, the Samsung >>> PM Debug functionality no longer can be enabled. This patch fixes >>> incorrect dependency of SAMSUNG_PM_DEBUG on an integer symbol and adds >>> missing header inclusion. >>> >> Yes, you're right and it should be fixed...but I have comments... >> >>> Signed-off-by: Tomasz Figa<t.figa@samsung.com> >>> --- >>> arch/arm/plat-samsung/Kconfig | 8 +++++++- >>> arch/arm/plat-samsung/pm-debug.c | 1 + >>> 2 files changed, 8 insertions(+), 1 deletion(-) >>> >>> diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig >>> index 301b892..483c959 100644 >>> --- a/arch/arm/plat-samsung/Kconfig >>> +++ b/arch/arm/plat-samsung/Kconfig >>> @@ -412,9 +412,14 @@ config S5P_DEV_MFC >>> >>> comment "Power management" >>> >>> +config HAVE_SAMSUNG_PM_DEBUG >>> + bool >>> + help >>> + Allow compilation of Samsung PM debugging code. >>> + >>> config SAMSUNG_PM_DEBUG >>> bool "S3C2410 PM Suspend debug" >>> - depends on PM&& DEBUG_KERNEL&& DEBUG_S3C_UART >>> + depends on PM&& DEBUG_KERNEL&& HAVE_SAMSUNG_PM_DEBUG >>> help >>> Say Y here if you want verbose debugging from the PM Suspend and >>> Resume code. See<file:Documentation/arm/Samsung-S3C24XX/Suspend.txt> >>> @@ -484,6 +489,7 @@ config S5P_SLEEP >>> >>> config DEBUG_S3C_UART >>> depends on PLAT_SAMSUNG >>> + select HAVE_SAMSUNG_PM_DEBUG >> >> Hmm... >> >> The DEBUG_S3C_UART will be '0' when we select DEBUG_S3C_UART0, then the >> HAVE_SAMSUNG_PM_DEBUG will not be selected so SAMSUNG_PM_DEBUG is also... > > Yes, that's right. I posted v2 after a while in another reply to this > thread. > Any updates? Or I missed your updated? - Kukjin
On 15.07.2014 20:02, Kukjin Kim wrote: > On 07/08/14 22:54, Tomasz Figa wrote: >> On 08.07.2014 15:48, Kukjin Kim wrote: >>> Tomasz Figa wrote: >>>> >>>> Due to recently merged patches and previous merge conflicts, the >>>> Samsung >>>> PM Debug functionality no longer can be enabled. This patch fixes >>>> incorrect dependency of SAMSUNG_PM_DEBUG on an integer symbol and adds >>>> missing header inclusion. >>>> >>> Yes, you're right and it should be fixed...but I have comments... >>> >>>> Signed-off-by: Tomasz Figa<t.figa@samsung.com> >>>> --- >>>> arch/arm/plat-samsung/Kconfig | 8 +++++++- >>>> arch/arm/plat-samsung/pm-debug.c | 1 + >>>> 2 files changed, 8 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/arch/arm/plat-samsung/Kconfig >>>> b/arch/arm/plat-samsung/Kconfig >>>> index 301b892..483c959 100644 >>>> --- a/arch/arm/plat-samsung/Kconfig >>>> +++ b/arch/arm/plat-samsung/Kconfig >>>> @@ -412,9 +412,14 @@ config S5P_DEV_MFC >>>> >>>> comment "Power management" >>>> >>>> +config HAVE_SAMSUNG_PM_DEBUG >>>> + bool >>>> + help >>>> + Allow compilation of Samsung PM debugging code. >>>> + >>>> config SAMSUNG_PM_DEBUG >>>> bool "S3C2410 PM Suspend debug" >>>> - depends on PM&& DEBUG_KERNEL&& DEBUG_S3C_UART >>>> + depends on PM&& DEBUG_KERNEL&& HAVE_SAMSUNG_PM_DEBUG >>>> help >>>> Say Y here if you want verbose debugging from the PM Suspend >>>> and >>>> Resume code. >>>> See<file:Documentation/arm/Samsung-S3C24XX/Suspend.txt> >>>> @@ -484,6 +489,7 @@ config S5P_SLEEP >>>> >>>> config DEBUG_S3C_UART >>>> depends on PLAT_SAMSUNG >>>> + select HAVE_SAMSUNG_PM_DEBUG >>> >>> Hmm... >>> >>> The DEBUG_S3C_UART will be '0' when we select DEBUG_S3C_UART0, then the >>> HAVE_SAMSUNG_PM_DEBUG will not be selected so SAMSUNG_PM_DEBUG is >>> also... >> >> Yes, that's right. I posted v2 after a while in another reply to this >> thread. >> > Any updates? Or I missed your updated? I'm afraid you missed. V2 has been there since a long time posted as a reply to original patch. You can find it here: https://lkml.org/lkml/2014/6/25/301 Best regards, Tomasz
On 16.07.2014 01:59, Tomasz Figa wrote: > On 15.07.2014 20:02, Kukjin Kim wrote: >> On 07/08/14 22:54, Tomasz Figa wrote: >>> On 08.07.2014 15:48, Kukjin Kim wrote: >>>> Tomasz Figa wrote: >>>>> >>>>> Due to recently merged patches and previous merge conflicts, the >>>>> Samsung >>>>> PM Debug functionality no longer can be enabled. This patch fixes >>>>> incorrect dependency of SAMSUNG_PM_DEBUG on an integer symbol and adds >>>>> missing header inclusion. >>>>> >>>> Yes, you're right and it should be fixed...but I have comments... >>>> >>>>> Signed-off-by: Tomasz Figa<t.figa@samsung.com> >>>>> --- >>>>> arch/arm/plat-samsung/Kconfig | 8 +++++++- >>>>> arch/arm/plat-samsung/pm-debug.c | 1 + >>>>> 2 files changed, 8 insertions(+), 1 deletion(-) >>>>> >>>>> diff --git a/arch/arm/plat-samsung/Kconfig >>>>> b/arch/arm/plat-samsung/Kconfig >>>>> index 301b892..483c959 100644 >>>>> --- a/arch/arm/plat-samsung/Kconfig >>>>> +++ b/arch/arm/plat-samsung/Kconfig >>>>> @@ -412,9 +412,14 @@ config S5P_DEV_MFC >>>>> >>>>> comment "Power management" >>>>> >>>>> +config HAVE_SAMSUNG_PM_DEBUG >>>>> + bool >>>>> + help >>>>> + Allow compilation of Samsung PM debugging code. >>>>> + >>>>> config SAMSUNG_PM_DEBUG >>>>> bool "S3C2410 PM Suspend debug" >>>>> - depends on PM&& DEBUG_KERNEL&& DEBUG_S3C_UART >>>>> + depends on PM&& DEBUG_KERNEL&& HAVE_SAMSUNG_PM_DEBUG >>>>> help >>>>> Say Y here if you want verbose debugging from the PM Suspend >>>>> and >>>>> Resume code. >>>>> See<file:Documentation/arm/Samsung-S3C24XX/Suspend.txt> >>>>> @@ -484,6 +489,7 @@ config S5P_SLEEP >>>>> >>>>> config DEBUG_S3C_UART >>>>> depends on PLAT_SAMSUNG >>>>> + select HAVE_SAMSUNG_PM_DEBUG >>>> >>>> Hmm... >>>> >>>> The DEBUG_S3C_UART will be '0' when we select DEBUG_S3C_UART0, then the >>>> HAVE_SAMSUNG_PM_DEBUG will not be selected so SAMSUNG_PM_DEBUG is >>>> also... >>> >>> Yes, that's right. I posted v2 after a while in another reply to this >>> thread. >>> >> Any updates? Or I missed your updated? > > I'm afraid you missed. V2 has been there since a long time posted as a > reply to original patch. You can find it here: > > https://lkml.org/lkml/2014/6/25/301 Ping. Best regards, Tomasz
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 301b892..483c959 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -412,9 +412,14 @@ config S5P_DEV_MFC comment "Power management" +config HAVE_SAMSUNG_PM_DEBUG + bool + help + Allow compilation of Samsung PM debugging code. + config SAMSUNG_PM_DEBUG bool "S3C2410 PM Suspend debug" - depends on PM && DEBUG_KERNEL && DEBUG_S3C_UART + depends on PM && DEBUG_KERNEL && HAVE_SAMSUNG_PM_DEBUG help Say Y here if you want verbose debugging from the PM Suspend and Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt> @@ -484,6 +489,7 @@ config S5P_SLEEP config DEBUG_S3C_UART depends on PLAT_SAMSUNG + select HAVE_SAMSUNG_PM_DEBUG int default "0" if DEBUG_S3C_UART0 default "1" if DEBUG_S3C_UART1 diff --git a/arch/arm/plat-samsung/pm-debug.c b/arch/arm/plat-samsung/pm-debug.c index 8f19f66..3960960 100644 --- a/arch/arm/plat-samsung/pm-debug.c +++ b/arch/arm/plat-samsung/pm-debug.c @@ -14,6 +14,7 @@ */ #include <linux/serial_core.h> +#include <linux/serial_s3c.h> #include <linux/io.h> #include <asm/mach/map.h>
Due to recently merged patches and previous merge conflicts, the Samsung PM Debug functionality no longer can be enabled. This patch fixes incorrect dependency of SAMSUNG_PM_DEBUG on an integer symbol and adds missing header inclusion. Signed-off-by: Tomasz Figa <t.figa@samsung.com> --- arch/arm/plat-samsung/Kconfig | 8 +++++++- arch/arm/plat-samsung/pm-debug.c | 1 + 2 files changed, 8 insertions(+), 1 deletion(-)