diff mbox

[Xen-devel,for-4.8,1/2] xen/arm: Convert DEBUG_DT to Kconfig

Message ID 1464085241-12929-2-git-send-email-julien.grall@arm.com
State Superseded
Headers show

Commit Message

Julien Grall May 24, 2016, 10:20 a.m. UTC
Convert device-tree debugging to 'Kconfig' as
CONFIG_DEBUG_TREE_DEBUG.

The option is not enabled by default because the output is very
verbose.

Signed-off-by: Julien Grall <julien.grall@arm.com>

---
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: George Dunlap <George.Dunlap@eu.citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Tim Deegan <tim@xen.org>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Doug Goldstein <cardoe@cardoe.com>
---
 xen/Kconfig.debug           | 7 +++++++
 xen/arch/arm/domain_build.c | 4 +---
 xen/common/device_tree.c    | 4 +---
 3 files changed, 9 insertions(+), 6 deletions(-)

Comments

Julien Grall May 24, 2016, 2:44 p.m. UTC | #1
Hi Konrad,

On 24/05/16 14:38, Konrad Rzeszutek Wilk wrote:
> On Tue, May 24, 2016 at 11:20:40AM +0100, Julien Grall wrote:
>> Convert device-tree debugging to 'Kconfig' as
>> CONFIG_DEBUG_TREE_DEBUG.
>>
>> The option is not enabled by default because the output is very
>> verbose.
>>
>> Signed-off-by: Julien Grall <julien.grall@arm.com>
>>
>> ---
>> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
>> Cc: George Dunlap <George.Dunlap@eu.citrix.com>
>> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
>> Cc: Jan Beulich <jbeulich@suse.com>
>> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>> Cc: Stefano Stabellini <sstabellini@kernel.org>
>> Cc: Tim Deegan <tim@xen.org>
>> Cc: Wei Liu <wei.liu2@citrix.com>
>> Cc: Doug Goldstein <cardoe@cardoe.com>
>> ---
>>   xen/Kconfig.debug           | 7 +++++++
>>   xen/arch/arm/domain_build.c | 4 +---
>>   xen/common/device_tree.c    | 4 +---
>>   3 files changed, 9 insertions(+), 6 deletions(-)
>>
>> diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug
>> index 303bf36..59be34d 100644
>> --- a/xen/Kconfig.debug
>> +++ b/xen/Kconfig.debug
>> @@ -55,6 +55,13 @@ config VERBOSE_DEBUG
>>   	  Guest output from HYPERVISOR_console_io and hypervisor parsing
>>   	  ELF images (dom0) is logged in the Xen ring buffer.
>>
>> +config DEVICE_TREE_DEBUG
>> +	bool "Device tree debug messages"
>> +	depends on HAS_DEVICE_TREE
>> +	---help---
>> +	  Device tree parsing and DOM0 device tree building messages is
>> +	  logged in the Xen ring buffer
>
> s/is logged/are logged/
>
> Also missing stop at the end.
>
> Perhaps also add:
>
> "If unsure, say N here."

I will do all the 3 changes in the next version.

>
> Or could this be part of the VERBOSE one (which spews out data about
> ELF parsing and allows guests to do  the console_io_write hypercalls?).

The debug messages from the device tree is really verbose (it will 
obscure useful boot messages). So it should only be enabled when Xen 
does not parse correctly the device tree.

Regards,
diff mbox

Patch

diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug
index 303bf36..59be34d 100644
--- a/xen/Kconfig.debug
+++ b/xen/Kconfig.debug
@@ -55,6 +55,13 @@  config VERBOSE_DEBUG
 	  Guest output from HYPERVISOR_console_io and hypervisor parsing
 	  ELF images (dom0) is logged in the Xen ring buffer.
 
+config DEVICE_TREE_DEBUG
+	bool "Device tree debug messages"
+	depends on HAS_DEVICE_TREE
+	---help---
+	  Device tree parsing and DOM0 device tree building messages is
+	  logged in the Xen ring buffer
+
 endif # DEBUG || EXPERT
 
 endmenu
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 00dc07a..fb035ff 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -42,9 +42,7 @@  static void __init parse_dom0_mem(const char *s)
 }
 custom_param("dom0_mem", parse_dom0_mem);
 
-//#define DEBUG_DT
-
-#ifdef DEBUG_DT
+#ifdef CONFIG_DEVICE_TREE_DEBUG
 # define DPRINT(fmt, args...) printk(XENLOG_DEBUG fmt, ##args)
 #else
 # define DPRINT(fmt, args...) do {} while ( 0 )
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index 06a2837..0df2e4b 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -54,9 +54,7 @@  struct dt_alias_prop {
 
 static LIST_HEAD(aliases_lookup);
 
-// #define DEBUG_DT
-
-#ifdef DEBUG_DT
+#ifdef CONFIG_DEVICE_TREE_DEBUG
 # define dt_dprintk(fmt, args...) printk(XENLOG_DEBUG fmt, ##args)
 static void dt_dump_addr(const char *s, const __be32 *addr, int na)
 {