usb: xhci: avoid noisy 'Starting the controller' message.

We should avoid overwhelming users with non-essential messages.

The message 'Starting the controller' is not written for EHCI.
We should not write it for XHCI either.

Adjust the Python test accordingly.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@kernel.org>

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index d59804580f1c0bbeec8d88c4f8c14dfb6b6ab242..c3986dac3e8514d7eb62f24b396c39ec2babb832 100644 (file)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -158,7 +158,7 @@ static int xhci_start(struct xhci_hcor *hcor)
        u32 temp;
        int ret;
 
-       puts("Starting the controller\n");
+       debug("Starting the controller\n");
        temp = xhci_readl(&hcor->or_usbcmd);
        temp |= (CMD_RUN);
        xhci_writel(&hcor->or_usbcmd, temp);

diff --git a/test/py/tests/test_usb.py b/test/py/tests/test_usb.py
index 1dcd0834f55f675ba567373e8f5b4769becdf5e1..9226d1c174d3ac222e28d7e948ab2a4be891abb8 100644 (file)
--- a/test/py/tests/test_usb.py
+++ b/test/py/tests/test_usb.py
@@ -58,7 +58,7 @@ def test_usb_start(ubman):
     assert 'USB init failed' not in output
     assert 'starting USB...' in output
 
-    if 'Starting the controller' in output:
+    if ubman.config.buildconfig.get('config_usb_xhci_hcd'):
         assert 'USB XHCI' in output
 
     output = ubman.run_command('echo $?')
@@ -104,7 +104,7 @@ def test_usb_reset(ubman):
     assert 'USB init failed' not in output
     assert 'resetting USB...' in output
 
-    if 'Starting the controller' in output:
+    if ubman.config.buildconfig.get('config_usb_xhci_hcd'):
         assert 'USB XHCI' in output
 
     output = ubman.run_command('echo $?')