From cd61d006685e06f8fb64839dad167b5cdffecc0b Mon Sep 17 00:00:00 2001 From: Chao Song Date: Mon, 8 Mar 2021 13:04:30 +0800 Subject: [PATCH 1/2] kernel-log-check: revise ignore_str for usb hub A dot(.) can only match to a single character, so the fix 22530629 for sof-test#431 doesn't work. Fixes: #431 Signed-off-by: Chao Song --- tools/sof-kernel-log-check.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/sof-kernel-log-check.sh b/tools/sof-kernel-log-check.sh index e6a509fe..9131e9f5 100755 --- a/tools/sof-kernel-log-check.sh +++ b/tools/sof-kernel-log-check.sh @@ -164,8 +164,7 @@ ignore_str="$ignore_str"'|tpm tpm0: tpm_try_transmit: send\(\): error -5' ignore_str="$ignore_str"'|platform regulatory\.0: Direct firmware load for regulatory\.db failed with error -2' ignore_str="$ignore_str"'|cfg80211: failed to load regulatory\.db' ignore_str="$ignore_str"'|EXT4-fs \(nvme0n1p6\): re-mounted\. Opts: errors=remount-ro' -ignore_str="$ignore_str"'|usb 2-3: Enable of device-initiated U1 failed\.' -ignore_str="$ignore_str"'|usb 2-3: Enable of device-initiated U2 failed\.' +ignore_str="$ignore_str"'|usb .+: Enable of device-initiated .+ failed\.' ignore_str="$ignore_str"'|thermal thermal_zone.*: failed to read out thermal zone \(-61\)' # Dell CML-U laptop with SoundWire, issues reported by sof-test @@ -189,8 +188,8 @@ ignore_str="$ignore_str"'|\[drm:drm_dp_send_link_address \[drm_kms_helper\]\] \* # CHT devices with USB hub, issues reported by sof-test # BugLink: https://github.com/thesofproject/sof-test/issues/431 -ignore_str="$ignore_str"'|hub 2-.: .' -ignore_str="$ignore_str"'|usb 2-.: .' +ignore_str="$ignore_str"'|hub [23]-.+: hub_ext_port_status failed' +ignore_str="$ignore_str"'|usb [23]-.+: Failed to suspend device, error' # TGL devices with USB 3.1 devices, issues reported by sof-test # BugLink: https://github.com/thesofproject/sof-test/issues/482 From 61a1f39dab0cb6013d285a8b91103935ac8f0dd7 Mon Sep 17 00:00:00 2001 From: Chao Song Date: Mon, 8 Mar 2021 13:08:29 +0800 Subject: [PATCH 2/2] kernel-log-check: revise ignore_str for new USB error This patch revises ignore_str for a new USB error: - usb 2-4.1: Disable of device-initiated U1 failed. - usb 2-4.1: Disable of device-initiated U2 failed. Signed-off-by: Chao Song --- tools/sof-kernel-log-check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/sof-kernel-log-check.sh b/tools/sof-kernel-log-check.sh index 9131e9f5..bcfb0be4 100755 --- a/tools/sof-kernel-log-check.sh +++ b/tools/sof-kernel-log-check.sh @@ -164,7 +164,7 @@ ignore_str="$ignore_str"'|tpm tpm0: tpm_try_transmit: send\(\): error -5' ignore_str="$ignore_str"'|platform regulatory\.0: Direct firmware load for regulatory\.db failed with error -2' ignore_str="$ignore_str"'|cfg80211: failed to load regulatory\.db' ignore_str="$ignore_str"'|EXT4-fs \(nvme0n1p6\): re-mounted\. Opts: errors=remount-ro' -ignore_str="$ignore_str"'|usb .+: Enable of device-initiated .+ failed\.' +ignore_str="$ignore_str"'|usb .+: (Enable|Disable) of device-initiated .+ failed\.' ignore_str="$ignore_str"'|thermal thermal_zone.*: failed to read out thermal zone \(-61\)' # Dell CML-U laptop with SoundWire, issues reported by sof-test