s390/pci: make better use of zpci_dbg() levels

While the zpci_dbg() macro offers a level parameter this is currently
largely unused. The only instance with higher importance than 3 is the
UID checking change debug message which is not actually more important
as the UID uniqueness guarantee is already exposed in sysfs so this
should rather be 3 as well.

On the other hand the "add ..." message which shows what devices are
visible at the lowest level is essential during problem determination.
By setting its level to 1, lowering the debug level can act as a filter
to only show the available functions.

On the error side the default level is set to 6 while all existing
messages are printed at level 0. This is inconsistent and means there is
no room for having messages be invisible on the default level so instead
set the default level to 3 like for errors matching the default for
debug messages.

Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index e563cb65c0c4c8d3cf76c36a4952291e2eab5234..bc980fd313d5137a44f083b1253cd14bc189edc6 100644 (file)
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -799,7 +799,7 @@ struct zpci_dev *zpci_create_device(u32 fid, u32 fh, enum zpci_state state)
        struct zpci_dev *zdev;
        int rc;
 
-       zpci_dbg(3, "add fid:%x, fh:%x, c:%d\n", fid, fh, state);
+       zpci_dbg(1, "add fid:%x, fh:%x, c:%d\n", fid, fh, state);
        zdev = kzalloc(sizeof(*zdev), GFP_KERNEL);
        if (!zdev)
                return ERR_PTR(-ENOMEM);

diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c
index 1057d7af4a551b7498a0a37f3856faa1ac52cd99..375e0a5120bc1645cafa589b6bb7d178f76223a2 100644 (file)
--- a/arch/s390/pci/pci_clp.c
+++ b/arch/s390/pci/pci_clp.c
@@ -30,7 +30,7 @@ bool zpci_unique_uid;
 void update_uid_checking(bool new)
 {
        if (zpci_unique_uid != new)
-               zpci_dbg(1, "uid checking:%d\n", new);
+               zpci_dbg(3, "uid checking:%d\n", new);
 
        zpci_unique_uid = new;
 }

diff --git a/arch/s390/pci/pci_debug.c b/arch/s390/pci/pci_debug.c
index 3408c0df3ebf11fa54c289cab70703ed272fb99d..ca6bd98eec136e9a920a250729108730ec652ef5 100644 (file)
--- a/arch/s390/pci/pci_debug.c
+++ b/arch/s390/pci/pci_debug.c
@@ -196,7 +196,7 @@ int __init zpci_debug_init(void)
        if (!pci_debug_err_id)
                return -EINVAL;
        debug_register_view(pci_debug_err_id, &debug_hex_ascii_view);
-       debug_set_level(pci_debug_err_id, 6);
+       debug_set_level(pci_debug_err_id, 3);
 
        debugfs_root = debugfs_create_dir("pci", NULL);
        return 0;