diff options
-rw-r--r-- | .bumpversion.cfg | 3 | ||||
-rwxr-xr-x | bin/boot_mode_test_snappy.py | 14 | ||||
-rwxr-xr-x | bin/efi-pxeboot.py | 5 | ||||
-rwxr-xr-x | bin/screenoff.sh | 3 | ||||
-rwxr-xr-x | bin/sof_ri_info.py | 217 | ||||
-rw-r--r-- | data/gpio-loopback.UPN-EHL01.in | 4 | ||||
-rw-r--r-- | data/gpio-loopback.UPX-TGL01.in | 4 | ||||
-rwxr-xr-x | manage.py | 2 | ||||
-rw-r--r-- | units/ethernet/jobs.pxu | 3 | ||||
-rw-r--r-- | units/gpio/vendor-aaeon.pxu | 2 | ||||
-rw-r--r-- | units/hibernate/jobs.pxu | 6 | ||||
-rw-r--r-- | units/stress/jobs.pxu | 8 | ||||
-rw-r--r-- | units/stress/s3s4.pxu | 4 | ||||
-rw-r--r-- | units/suspend/suspend-graphics.pxu | 4 | ||||
-rw-r--r-- | units/suspend/suspend.pxu | 8 | ||||
-rw-r--r-- | units/touchscreen/jobs.pxu | 8 |
16 files changed, 261 insertions, 34 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 3d4c6ab..45925c0 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.60.0.dev0 +current_version = 0.62.0.dev0 files = manage.py parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+))?((?P<release>\.?[a-z]+)(?P<N>\d+))? serialize = @@ -12,4 +12,3 @@ values = .dev rc RELEASE - diff --git a/bin/boot_mode_test_snappy.py b/bin/boot_mode_test_snappy.py index 23b30e4..0e0957a 100755 --- a/bin/boot_mode_test_snappy.py +++ b/bin/boot_mode_test_snappy.py @@ -19,7 +19,10 @@ from checkbox_support.snap_utils.system import get_lk_bootimg_path def fitdumpimage(filename): cmd = 'dumpimage -l {}'.format(filename) - out = sp.check_output(cmd, shell=True).decode(sys.stdout.encoding) + try: + out = sp.check_output(cmd, shell=True).decode(sys.stdout.encoding) + except Exception: + raise SystemExit(1) buf = io.StringIO(out) # first line should identify FIT file @@ -71,8 +74,10 @@ def main(): 'ERROR: failed to find gadget.yaml at {}'.format(gadget_yaml)) with open(gadget_yaml) as f: - data = yaml.load(f) + data = yaml.load(f, Loader=yaml.SafeLoader) for k in data['volumes'].keys(): + if 'bootloader' not in data['volumes'][k]: + continue bootloader = data['volumes'][k]['bootloader'] if not bootloader: raise SystemExit('ERROR: could not find name of bootloader') @@ -162,7 +167,10 @@ def main(): if bootloader == 'grub': cmd = 'mokutil --sb-state' print('+', cmd, flush=True) - out = sp.check_output(cmd, shell=True).decode(sys.stdout.encoding) + try: + out = sp.check_output(cmd, shell=True).decode(sys.stdout.encoding) + except Exception: + raise SystemExit(1) print(out, flush=True) if out != 'SecureBoot enabled\n': raise SystemExit('ERROR: mokutil reports Secure Boot not in use') diff --git a/bin/efi-pxeboot.py b/bin/efi-pxeboot.py index 52eace9..cfeee5d 100755 --- a/bin/efi-pxeboot.py +++ b/bin/efi-pxeboot.py @@ -141,6 +141,11 @@ def main(): "indicate a firmware") print("problem.") retval = 3 + if boot_current == "": + print("FAIL: The EFI BootCurrent variable is missing. This may " + "indicate a firmware") + print("problem.") + retval = 4 if (retval == 0): retval = is_pxe_booted(boot_entries, boot_order, boot_current) return(retval) diff --git a/bin/screenoff.sh b/bin/screenoff.sh index 8a565c7..0769e58 100755 --- a/bin/screenoff.sh +++ b/bin/screenoff.sh @@ -9,7 +9,8 @@ do sysfs="${line:9}" break fi - if [ "$name" = "AT Translated Set 2 keyboard" ]; then + if [ "$name" = "AT Translated Set 2 keyboard" ] || + [ "${name:0:26}" = "Logitech Wireless Keyboard" ]; then keyboard=1 else keyboard=0 diff --git a/bin/sof_ri_info.py b/bin/sof_ri_info.py index 638fa75..8739a12 100755 --- a/bin/sof_ri_info.py +++ b/bin/sof_ri_info.py @@ -121,6 +121,39 @@ ICL_INTEL_PROD_KEY = bytes([0x63, 0xdf, 0x54, 0xe3, 0xc1, 0xe5, 0xd9, 0xd2, 0x5, 0x76, 0x1b, 0x44, 0x55, 0x75, 0xd9, 0x32, 0x35, 0xf1, 0xec, 0x4d, 0x93, 0x73, 0xe6, 0xc4]) +JSL_INTEL_PROD_KEY = bytes([0x6f, 0xe4, 0xd5, 0xc9, 0x52, 0xf4, 0x01, 0xc1, + 0x89, 0xc7, 0x2b, 0x16, 0x9b, 0xe6, 0x5d, 0x8e, + 0x91, 0x28, 0x63, 0x16, 0x4f, 0x7b, 0x18, 0x6e, + 0xa7, 0x89, 0x0c, 0xea, 0x24, 0x62, 0xc7, 0x94, + 0x75, 0x43, 0xfd, 0x6d, 0xa8, 0x67, 0x47, 0x36, + 0x50, 0xaf, 0x37, 0x46, 0x15, 0x82, 0x45, 0x4a, + 0xa3, 0x2e, 0xae, 0xa4, 0x1f, 0x92, 0x67, 0x4b, + 0x5e, 0x67, 0x7e, 0x02, 0xfc, 0x18, 0x6f, 0x68, + 0x0d, 0xe3, 0xc1, 0x00, 0xdf, 0xea, 0xed, 0x9f, + 0xdc, 0x61, 0xa0, 0xfd, 0x36, 0x61, 0x84, 0xa7, + 0x8c, 0x2a, 0x4b, 0x2c, 0x2d, 0xed, 0x8d, 0x0b, + 0x35, 0xe9, 0x79, 0x59, 0x3f, 0x22, 0xdc, 0x3c, + 0xd4, 0x43, 0x32, 0x22, 0xf0, 0xda, 0x0d, 0xa1, + 0x3a, 0xec, 0x47, 0x87, 0x5e, 0xa0, 0xd2, 0xaa, + 0xf8, 0x1c, 0x61, 0x08, 0x05, 0x64, 0xb4, 0xa8, + 0x75, 0xc8, 0x20, 0x34, 0xbf, 0x04, 0x10, 0x75, + 0x8c, 0xb7, 0x6d, 0x49, 0xde, 0x3d, 0x3c, 0x66, + 0x08, 0xfe, 0x67, 0xc8, 0x77, 0x04, 0x7c, 0xa5, + 0xf0, 0x9e, 0xe7, 0x5e, 0x70, 0xbf, 0xde, 0xf1, + 0xcb, 0x1c, 0xc0, 0x84, 0x4a, 0x89, 0x76, 0x37, + 0x4f, 0xad, 0x3b, 0x8f, 0x04, 0x91, 0xd0, 0x1b, + 0x0b, 0xa8, 0x20, 0x6e, 0x1e, 0x97, 0x1e, 0xff, + 0x1f, 0xef, 0xde, 0x7a, 0xd7, 0x93, 0x3c, 0xa9, + 0x46, 0xe5, 0x74, 0x66, 0x9c, 0x85, 0xfa, 0xaa, + 0x4a, 0xe4, 0x39, 0xc5, 0x33, 0xbb, 0x8e, 0xca, + 0x1f, 0xd9, 0x4c, 0xbc, 0xcd, 0x7c, 0xa1, 0x30, + 0xdb, 0x15, 0xed, 0xa1, 0x24, 0x9d, 0xcb, 0xf0, + 0xbe, 0xeb, 0x92, 0x60, 0xb0, 0xab, 0x60, 0xa0, + 0xcc, 0xd8, 0x04, 0xf9, 0xf1, 0xa0, 0x04, 0x98, + 0x6a, 0x20, 0xd8, 0x86, 0xff, 0xd4, 0x9d, 0x09, + 0xa1, 0x22, 0xce, 0x0a, 0x3e, 0x21, 0x27, 0xcd, + 0xf8, 0x7c, 0xb0, 0x09, 0x09, 0xc2, 0xa3, 0xcc]) + TGL_INTEL_PROD_KEY = bytes([0xd3, 0x72, 0x92, 0x99, 0x4e, 0xb9, 0xcd, 0x67, 0x41, 0x86, 0x16, 0x77, 0x35, 0xa1, 0x34, 0x85, 0x43, 0x96, 0xd9, 0x53, 0x76, 0x4d, 0xd0, 0x63, @@ -170,6 +203,104 @@ TGL_INTEL_PROD_KEY = bytes([0xd3, 0x72, 0x92, 0x99, 0x4e, 0xb9, 0xcd, 0x67, 0xe7, 0x51, 0x42, 0x59, 0x56, 0xa, 0x1c, 0xf, 0x5d, 0x62, 0x4a, 0x80, 0x96, 0x31, 0xf8, 0xb5]) +EHL_INTEL_PROD_KEY = bytes([0xb5, 0xb0, 0xe2, 0x25, 0x3d, 0xc7, 0x54, 0x10, + 0xde, 0x3c, 0xc9, 0x24, 0x97, 0x74, 0xbc, 0x02, + 0x7d, 0x0b, 0xd6, 0x61, 0x2e, 0x35, 0x65, 0xed, + 0x78, 0xf6, 0x85, 0x73, 0x1f, 0x8c, 0xda, 0x8f, + 0x50, 0x79, 0xc7, 0x0c, 0x9e, 0xb4, 0x09, 0x3b, + 0xfc, 0x2e, 0x4e, 0xf3, 0x46, 0xfe, 0x3f, 0x20, + 0x9d, 0x8d, 0xf6, 0x3e, 0xc3, 0x46, 0x92, 0xf9, + 0xce, 0xbb, 0x7d, 0x0b, 0xb3, 0x45, 0x35, 0x76, + 0xbe, 0x19, 0x87, 0x21, 0x6c, 0x79, 0xfa, 0xf4, + 0xc8, 0x8e, 0x07, 0x26, 0x03, 0x0d, 0xe9, 0xe3, + 0x1e, 0x61, 0x7c, 0xd1, 0x45, 0x10, 0x61, 0x1c, + 0x79, 0x3f, 0x10, 0xa9, 0x42, 0x60, 0x2c, 0x7a, + 0x7a, 0x89, 0x1b, 0x54, 0xda, 0x0e, 0x54, 0x08, + 0x30, 0x0f, 0x6e, 0x37, 0xea, 0xb7, 0x58, 0xa0, + 0xaf, 0x4a, 0x94, 0x2c, 0x43, 0x50, 0x74, 0xed, + 0x16, 0xdc, 0x11, 0xa1, 0xd3, 0x6e, 0x54, 0xa6, + 0x56, 0xf9, 0x40, 0x8c, 0x3f, 0xa3, 0x74, 0xae, + 0x4f, 0x48, 0xc8, 0x79, 0x30, 0x5a, 0x99, 0x79, + 0x26, 0xe1, 0x52, 0x9b, 0xfe, 0x9e, 0xaf, 0x96, + 0xcc, 0xe6, 0x9a, 0x53, 0x2e, 0xe4, 0x40, 0xcc, + 0xad, 0x19, 0x8e, 0x23, 0x53, 0x63, 0xc8, 0xfd, + 0x96, 0xeb, 0x27, 0x9b, 0x3e, 0x49, 0x0d, 0x90, + 0xb0, 0x67, 0xb4, 0x05, 0x4a, 0x55, 0x5b, 0xb0, + 0xa5, 0x68, 0xb8, 0x60, 0xa4, 0x81, 0x6a, 0x3e, + 0x8c, 0xbc, 0x29, 0xcd, 0x85, 0x45, 0x3c, 0xf4, + 0x86, 0xf8, 0x9b, 0x69, 0xb5, 0xc5, 0xb9, 0xaa, + 0xc8, 0xed, 0x7d, 0x70, 0x45, 0xb6, 0xf6, 0x5b, + 0x48, 0x62, 0xf6, 0x68, 0xe8, 0xdd, 0x79, 0xda, + 0xb0, 0xe9, 0x3c, 0x8f, 0x01, 0x92, 0x80, 0x73, + 0x89, 0x7d, 0x9a, 0xaf, 0x31, 0x85, 0x75, 0x7c, + 0x89, 0xf3, 0x6c, 0x77, 0x95, 0x5b, 0xa9, 0xc5, + 0xe1, 0x33, 0xe0, 0x44, 0x81, 0x7e, 0x72, 0xa5, + 0xbb, 0x3d, 0x40, 0xb7, 0xc9, 0x77, 0xd8, 0xc3, + 0xe3, 0xef, 0x42, 0xae, 0x57, 0x91, 0x63, 0x0c, + 0x26, 0xac, 0x5e, 0x10, 0x51, 0x28, 0xe6, 0x61, + 0xad, 0x4d, 0xc4, 0x93, 0xb2, 0xe0, 0xb4, 0x31, + 0x60, 0x5a, 0x97, 0x0e, 0x80, 0x86, 0x91, 0xc9, + 0xcd, 0xfc, 0x97, 0xc3, 0x78, 0xbd, 0xca, 0xce, + 0xd3, 0x96, 0xee, 0x75, 0x81, 0xe0, 0x8b, 0x45, + 0x8e, 0x20, 0x4b, 0x98, 0x31, 0x0f, 0xf9, 0x66, + 0xb3, 0x04, 0xb7, 0x0d, 0xde, 0x68, 0x1e, 0x2a, + 0xe4, 0xec, 0x45, 0x2a, 0x0a, 0x24, 0x81, 0x82, + 0xcb, 0x86, 0xa0, 0x61, 0x7f, 0xe7, 0x96, 0x84, + 0x4b, 0x30, 0xc4, 0x7d, 0x5c, 0x1b, 0x2c, 0x1e, + 0x66, 0x68, 0x71, 0x1d, 0x39, 0x6c, 0x23, 0x07, + 0x6d, 0xf3, 0x3e, 0x64, 0xc3, 0x03, 0x97, 0x84, + 0x14, 0xd1, 0xf6, 0x50, 0xf4, 0x32, 0x5d, 0xae, + 0xad, 0x23, 0x46, 0x0c, 0x9f, 0xfc, 0x3e, 0xb9]) + +ADL_INTEL_PROD_KEY = bytes([0xd3, 0x42, 0x11, 0x78, 0xf4, 0x4a, 0xa5, 0x85, + 0x4b, 0x78, 0x7a, 0x9b, 0xbd, 0x71, 0xc1, 0x84, + 0x0f, 0x54, 0xe4, 0x07, 0x47, 0x65, 0x9e, 0xdc, + 0x79, 0x85, 0x14, 0x52, 0x3c, 0xa1, 0xe1, 0x06, + 0x4c, 0x25, 0x31, 0x56, 0xb2, 0xba, 0x7c, 0xfd, + 0x3d, 0x2d, 0x87, 0x28, 0xf4, 0xb3, 0x19, 0xe9, + 0x38, 0xd9, 0x78, 0x3c, 0x45, 0x7d, 0xfa, 0x9c, + 0x58, 0x3a, 0xaf, 0xda, 0x4b, 0xe1, 0x94, 0xcc, + 0xb0, 0xdb, 0x41, 0x5d, 0x5f, 0xd5, 0xf9, 0xeb, + 0x53, 0xcc, 0xd7, 0x14, 0xab, 0xdb, 0x13, 0x20, + 0x26, 0x59, 0xc0, 0x7e, 0xaa, 0x14, 0x7f, 0x80, + 0x0f, 0x73, 0x9a, 0xb2, 0xc4, 0x8c, 0x8b, 0x0d, + 0x56, 0xd0, 0x7a, 0xd1, 0x52, 0xca, 0xaa, 0x96, + 0x28, 0x8e, 0x98, 0xad, 0x6e, 0xf6, 0x36, 0x1a, + 0x6e, 0xdd, 0xba, 0x4f, 0xd5, 0xb1, 0x06, 0xe6, + 0xc8, 0x5a, 0x06, 0x93, 0x06, 0x51, 0xd1, 0x44, + 0xe1, 0x87, 0x54, 0x49, 0x2f, 0xfd, 0xa5, 0x2b, + 0x86, 0xbe, 0xea, 0x59, 0xa9, 0x09, 0xf5, 0x1f, + 0x01, 0xa4, 0x7a, 0x0b, 0xd9, 0xd0, 0x73, 0x13, + 0x1a, 0x4a, 0xb3, 0xd5, 0x4d, 0x37, 0x06, 0x6b, + 0x84, 0x48, 0xce, 0xbb, 0x0b, 0x81, 0x71, 0xa1, + 0x97, 0x3f, 0x95, 0x64, 0x6b, 0xfd, 0xb0, 0x37, + 0x4e, 0xfd, 0xa5, 0x0b, 0x08, 0xb3, 0xd0, 0xbc, + 0xbe, 0x27, 0x64, 0x72, 0x89, 0xc7, 0xc8, 0x58, + 0x7e, 0x83, 0x8a, 0x0f, 0xf5, 0x56, 0xa7, 0x53, + 0x06, 0x24, 0xa1, 0x9e, 0x2c, 0xd2, 0x35, 0x86, + 0xdf, 0x6d, 0x68, 0xdd, 0x7a, 0x95, 0xbf, 0xf5, + 0x7a, 0xa4, 0x52, 0xf9, 0xc2, 0x03, 0xa8, 0xa1, + 0x63, 0x38, 0x1e, 0xc9, 0x2b, 0x1d, 0xcb, 0x55, + 0x04, 0x4b, 0xed, 0x53, 0x06, 0xb4, 0x96, 0xc8, + 0x84, 0x73, 0x66, 0x66, 0xbe, 0xb9, 0xca, 0xfc, + 0x8b, 0x81, 0xe2, 0xbd, 0x0b, 0x8e, 0xa3, 0x93, + 0x98, 0x82, 0x1d, 0x8e, 0x99, 0xf7, 0x29, 0x48, + 0x3d, 0xeb, 0x70, 0xda, 0x02, 0x6e, 0x2e, 0xc7, + 0x6c, 0x60, 0x7c, 0x3d, 0xff, 0x78, 0xdc, 0x95, + 0x4b, 0xec, 0x89, 0x7a, 0x97, 0x61, 0x32, 0x7e, + 0x00, 0x59, 0x1d, 0x1d, 0xbe, 0x3a, 0x55, 0xb8, + 0x2e, 0xa1, 0xb4, 0xf8, 0x6c, 0xad, 0x92, 0xbc, + 0x47, 0x27, 0xe8, 0x0e, 0xad, 0x80, 0xca, 0xca, + 0xb2, 0x92, 0x71, 0xaa, 0x19, 0x2b, 0x3a, 0x4e, + 0xbb, 0x01, 0x76, 0x9b, 0x6d, 0x42, 0xd3, 0xc4, + 0x2f, 0x29, 0x8f, 0x3f, 0xd2, 0xd1, 0xd9, 0xcb, + 0x48, 0xb3, 0x99, 0xce, 0x78, 0xfa, 0x29, 0x69, + 0xdc, 0x55, 0xde, 0xcf, 0xc0, 0xc9, 0x2f, 0xbe, + 0x67, 0x22, 0xb4, 0x02, 0x38, 0x18, 0xbd, 0xa6, + 0x98, 0xcf, 0xc9, 0x42, 0x8e, 0xdd, 0xbd, 0xa0, + 0xcc, 0x17, 0xb2, 0x12, 0xd3, 0x32, 0x0f, 0x1e, + 0x0c, 0x8e, 0x94, 0x8b, 0x7c, 0xbe, 0x79, 0xeb]) + COMMUNITY_KEY = bytes([0x85, 0x00, 0xe1, 0x68, 0xaa, 0xeb, 0xd2, 0x07, 0x1b, 0x7c, 0x5e, 0xed, 0xd6, 0xe7, 0xe5, 0xf9, 0xc1, 0x0e, 0x47, 0xd4, 0x4c, 0xab, 0x8c, 0xf0, @@ -203,11 +334,64 @@ COMMUNITY_KEY = bytes([0x85, 0x00, 0xe1, 0x68, 0xaa, 0xeb, 0xd2, 0x07, 0x3f, 0x82, 0x8f, 0xe5, 0x28, 0x4d, 0xdb, 0xb5, 0x5a, 0x96, 0x28, 0x27, 0x19, 0xaf, 0x43, 0xb9]) +COMMUNITY_KEY2 = bytes([0x6b, 0x75, 0xed, 0x58, 0x20, 0x08, 0x85, 0x95, + 0xa0, 0x49, 0x8b, 0x9e, 0xbd, 0x5f, 0x34, 0x82, + 0x0a, 0x9d, 0x1e, 0x9a, 0xb6, 0x76, 0x43, 0x19, + 0xb7, 0x76, 0x45, 0x5b, 0x59, 0xab, 0xbb, 0xf3, + 0x9e, 0x72, 0xf2, 0x41, 0x24, 0x92, 0x97, 0xef, + 0x39, 0xc0, 0xed, 0xc4, 0x7a, 0x4e, 0xdb, 0xec, + 0xeb, 0xc7, 0x4c, 0xf6, 0x45, 0xbe, 0xb2, 0xe0, + 0x13, 0x6a, 0xdc, 0x06, 0x7a, 0x1c, 0xbd, 0x8d, + 0xd8, 0xd2, 0xd7, 0x82, 0x6d, 0xbe, 0x03, 0x76, + 0x3b, 0x6b, 0xb8, 0x2f, 0xcc, 0xbe, 0x30, 0x56, + 0x61, 0x87, 0x09, 0xdf, 0x44, 0x51, 0xf8, 0x82, + 0xc5, 0x78, 0x05, 0x45, 0x8c, 0xe3, 0x78, 0x0e, + 0xd3, 0x7a, 0xd4, 0xf4, 0xbe, 0x96, 0xde, 0xb8, + 0x3b, 0x78, 0x90, 0x8b, 0xd3, 0xdd, 0x0b, 0xdd, + 0xbe, 0x56, 0xf3, 0x9a, 0x34, 0xc9, 0x38, 0x47, + 0x8d, 0xc4, 0xbd, 0x5e, 0x68, 0xf8, 0x62, 0xc4, + 0x28, 0xdd, 0x00, 0x48, 0x93, 0xb5, 0xad, 0x74, + 0x52, 0xe5, 0xf3, 0xd2, 0x97, 0xde, 0xbc, 0x0a, + 0x85, 0x95, 0xe9, 0xfa, 0xd2, 0xac, 0xdc, 0xdc, + 0x59, 0x74, 0xfa, 0x57, 0xf2, 0xd3, 0x61, 0xc6, + 0x2b, 0x26, 0xde, 0x57, 0x50, 0xe2, 0x58, 0x6b, + 0x79, 0x65, 0x0b, 0x49, 0x2c, 0x59, 0x28, 0x25, + 0x64, 0x31, 0x93, 0x65, 0x9a, 0x0a, 0x88, 0x98, + 0x9a, 0x77, 0x00, 0x47, 0x8f, 0xa0, 0xc7, 0x6b, + 0x58, 0x90, 0xa9, 0xb5, 0x15, 0xff, 0x65, 0x7c, + 0x84, 0x02, 0xd4, 0xdd, 0x09, 0xf1, 0x25, 0xad, + 0xf9, 0x30, 0xaa, 0x34, 0x5b, 0x77, 0xef, 0xb2, + 0x75, 0x3d, 0x54, 0x9d, 0xcc, 0x0d, 0x11, 0xda, + 0x91, 0x01, 0x2e, 0x51, 0xdc, 0x0c, 0x8a, 0x92, + 0x71, 0x44, 0x9a, 0xd5, 0x69, 0x5d, 0x7a, 0xad, + 0xaf, 0xdf, 0x25, 0xea, 0x95, 0x21, 0xbb, 0x99, + 0x53, 0x89, 0xbc, 0x54, 0xca, 0xf3, 0x54, 0xf5, + 0xbb, 0x38, 0x27, 0x64, 0xce, 0xf2, 0x17, 0x25, + 0x75, 0x33, 0x1a, 0x2d, 0x19, 0x00, 0xff, 0x9b, + 0xd9, 0x4d, 0x0c, 0xb1, 0xa5, 0x55, 0x55, 0xa9, + 0x29, 0x8e, 0xfb, 0x82, 0x43, 0xeb, 0xfa, 0xc8, + 0x33, 0x76, 0xf3, 0x7d, 0xee, 0x95, 0xe1, 0x39, + 0xba, 0xa5, 0x4a, 0xd5, 0xb1, 0x8a, 0xa6, 0xff, + 0x8f, 0x4b, 0x45, 0x8c, 0xe9, 0x7b, 0x87, 0xae, + 0x8d, 0x32, 0x6e, 0x16, 0xe7, 0x9e, 0x85, 0x22, + 0x71, 0x3d, 0x17, 0xba, 0x54, 0xed, 0x73, 0x87, + 0xe5, 0x9d, 0xbf, 0xc0, 0xcd, 0x76, 0xfa, 0x83, + 0xd4, 0xc5, 0x30, 0xd1, 0xc7, 0x25, 0x49, 0x25, + 0x75, 0x4d, 0x0a, 0x4a, 0x2d, 0x13, 0x1c, 0x12, + 0x2e, 0x5d, 0x2a, 0xe2, 0xa9, 0xae, 0xbf, 0x8f, + 0xdf, 0x24, 0x76, 0xf5, 0x81, 0x1e, 0x09, 0x5d, + 0x63, 0x04, 0xaf, 0x24, 0x45, 0x87, 0xf4, 0x96, + 0x55, 0xd1, 0x7d, 0xc6, 0x0d, 0x79, 0x12, 0xa9]) + KNOWN_KEYS = {APL_INTEL_PROD_KEY: 'APL Intel prod key', CNL_INTEL_PROD_KEY: 'CNL Intel prod key', ICL_INTEL_PROD_KEY: 'ICL Intel prod key', + JSL_INTEL_PROD_KEY: 'JSL Intel prod key', TGL_INTEL_PROD_KEY: 'TGL Intel prod key', - COMMUNITY_KEY: 'Community key'} + EHL_INTEL_PROD_KEY: 'EHL Intel prod key', + ADL_INTEL_PROD_KEY: 'ADL Intel prod key', + COMMUNITY_KEY: 'Community key', + COMMUNITY_KEY2: 'Community 3k key'} def parse_params(): @@ -1327,21 +1511,44 @@ ICL_MEMORY_SPACE = DspMemory('Intel Icelake', 'l2 lpsram', 0xbe800000, 1*64*1024) ]) -TGL_MEMORY_SPACE = DspMemory('Intel Tigerlake', +TGL_LP_MEMORY_SPACE = DspMemory('Intel Tigerlake-LP', + [ + DspMemorySegment( + 'imr', 0xb0000000, 16*1024*1024), + DspMemorySegment( + 'l2 hpsram', 0xbe000000, 46*64*1024), + DspMemorySegment( + 'l2 lpsram', 0xbe800000, 1*64*1024) + ]) + +JSL_MEMORY_SPACE = DspMemory('Intel Jasperlake', [ DspMemorySegment( - 'imr', 0xb0000000, 16*1024*1024), + 'imr', 0xb0000000, 8*1024*1024), DspMemorySegment( - 'l2 hpsram', 0xbe000000, 46*64*1024), + 'l2 hpsram', 0xbe000000, 16*64*1024), DspMemorySegment( 'l2 lpsram', 0xbe800000, 1*64*1024) ]) +TGL_H_MEMORY_SPACE = DspMemory('Intel Tigerlake-H', + [ + DspMemorySegment( + 'imr', 0xb0000000, 16*1024*1024), + DspMemorySegment( + 'l2 hpsram', 0xbe000000, 30*64*1024), + DspMemorySegment( + 'l2 lpsram', 0xbe800000, 1*64*1024) + ]) + DSP_MEM_SPACE_EXT = { 'apl': APL_MEMORY_SPACE, 'cnl': CNL_MEMORY_SPACE, 'icl': ICL_MEMORY_SPACE, - 'tgl': TGL_MEMORY_SPACE + 'tgl': TGL_LP_MEMORY_SPACE, + 'jsl': JSL_MEMORY_SPACE, + 'tgl-h': TGL_H_MEMORY_SPACE, + 'ehl': TGL_LP_MEMORY_SPACE, } diff --git a/data/gpio-loopback.UPN-EHL01.in b/data/gpio-loopback.UPN-EHL01.in new file mode 100644 index 0000000..259cbc1 --- /dev/null +++ b/data/gpio-loopback.UPN-EHL01.in @@ -0,0 +1,4 @@ +# GPIO IDs as presented by sysfs. See: +# https://github.com/up-board/up-community/wiki/Pinout_UPXi11 +# (in this case, this means connecting GPIO pins 13 and 15 together) +22,27 diff --git a/data/gpio-loopback.UPX-TGL01.in b/data/gpio-loopback.UPX-TGL01.in index e705ad8..259cbc1 100644 --- a/data/gpio-loopback.UPX-TGL01.in +++ b/data/gpio-loopback.UPX-TGL01.in @@ -1,2 +1,4 @@ -# GPIO IDs as presented by sysfs that have paired together: +# GPIO IDs as presented by sysfs. See: +# https://github.com/up-board/up-community/wiki/Pinout_UPXi11 +# (in this case, this means connecting GPIO pins 13 and 15 together) 22,27 @@ -5,7 +5,7 @@ from plainbox.provider_manager import N_ setup( name='plainbox-provider-checkbox', namespace='com.canonical.certification', - version="0.60.0.dev0", + version="0.62.0.dev0", description=N_("Checkbox provider"), gettext_domain='plainbox-provider-checkbox', strict=False, deprecated=False, diff --git a/units/ethernet/jobs.pxu b/units/ethernet/jobs.pxu index 89565bf..244cca6 100644 --- a/units/ethernet/jobs.pxu +++ b/units/ethernet/jobs.pxu @@ -301,7 +301,8 @@ plugin: user-interact command: eth_hotplugging.py {{ interface }} && gateway_ping_test.py -v --interface {{ interface }} category_id: com.canonical.plainbox::ethernet -estimated_duration: 1.0 +estimated_duration: 60.0 +user: root flags: preserve-locale unit: template diff --git a/units/gpio/vendor-aaeon.pxu b/units/gpio/vendor-aaeon.pxu index 7f8d6bc..cdf5f2d 100644 --- a/units/gpio/vendor-aaeon.pxu +++ b/units/gpio/vendor-aaeon.pxu @@ -1,7 +1,7 @@ unit: template template-resource: dmi -template-filter: dmi.category == 'SYSTEM' and dmi.vendor == 'AAEON' and dmi.product in ('UPX-TGL01') +template-filter: dmi.category == 'SYSTEM' and dmi.vendor == 'AAEON' and dmi.product in ('UPX-TGL01', 'UPN-EHL01') template-unit: job id: gpio/sysfs_loopback_pairs_{vendor}_{product} _summary: Test GPIO lines exposed on headers can be controlled via sysfs diff --git a/units/hibernate/jobs.pxu b/units/hibernate/jobs.pxu index 589b2d4..b47160b 100644 --- a/units/hibernate/jobs.pxu +++ b/units/hibernate/jobs.pxu @@ -9,7 +9,7 @@ user: root command: if type -P fwts >/dev/null; then echo "Calling fwts" - checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/hibernate-single -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 + checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/hibernate-single.log -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 else echo "Calling sleep_test.py" sleep_test.py -s disk -w 120 @@ -34,7 +34,7 @@ requires: rtc.state == 'supported' environ: PLAINBOX_SESSION_SHARE user: root -command: checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/hibernate-single -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 +command: checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/hibernate-single.log -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 estimated_duration: 300.00 _description: This is the automated version of suspend/hibernate_advanced. @@ -54,7 +54,7 @@ estimated_duration: 300.00 command: if type -P fwts >/dev/null; then echo "Calling fwts" - checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/{index}_hibernate-single -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 + checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/{index}_hibernate-single.log -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 else echo "Calling sleep_test.py" sleep_test.py -s disk -w 120 diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu index fbe30ca..51668f3 100644 --- a/units/stress/jobs.pxu +++ b/units/stress/jobs.pxu @@ -49,7 +49,7 @@ user: root command: if type -P fwts >/dev/null; then echo "Calling fwts" - checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/hibernate_30_cycles -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=30 + checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/hibernate_30_cycles.log -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=30 else echo "Calling sleep_test.py" set -o pipefail; sleep_test.py -s disk -i 30 -w 120 | tee "$PLAINBOX_SESSION_SHARE"/hibernate_30_cycles.log @@ -112,7 +112,7 @@ user: root command: if type -P fwts >/dev/null; then echo "Calling fwts" - set -o pipefail; checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/suspend_30_cycles -f none -s s3 --s3-device-check --s3-device-check-delay=60 --s3-sleep-delay=60 --s3-multiple=30 | tee "$PLAINBOX_SESSION_SHARE"/suspend_30_cycles_times.log + set -o pipefail; checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/suspend_30_cycles.log -f none -s s3 --s3-device-check --s3-device-check-delay=60 --s3-sleep-delay=60 --s3-multiple=30 | tee "$PLAINBOX_SESSION_SHARE"/suspend_30_cycles_times.log else echo "Calling sleep_test.py" set -o pipefail; sleep_test.py -p -s mem -i 30 | tee "$PLAINBOX_SESSION_SHARE"/suspend_30_cycles.log @@ -212,7 +212,7 @@ user: root command: if type -P fwts >/dev/null; then echo "Calling fwts" - checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/hibernate_250_cycles -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=250 + checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/hibernate_250_cycles.log -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=250 else echo "Calling sleep_test.py" set -o pipefail; sleep_test.py -s disk -i 250 -w 120 | tee "$PLAINBOX_SESSION_SHARE"/hibernate_250_cycles.log @@ -239,7 +239,7 @@ user: root command: if type -P fwts >/dev/null; then echo "Calling fwts" - set -o pipefail; checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/suspend_250_cycles -s s3 --s3-device-check --s3-device-check-delay=45 --s3-sleep-delay=30 --s3-multiple=250 | tee "$PLAINBOX_SESSION_SHARE"/suspend_250_cycles_times.log + set -o pipefail; checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/suspend_250_cycles.log -s s3 --s3-device-check --s3-device-check-delay=45 --s3-sleep-delay=30 --s3-multiple=250 | tee "$PLAINBOX_SESSION_SHARE"/suspend_250_cycles_times.log else echo "Calling sleep_test.py" set -o pipefail; sleep_test.py -p -s mem -i 250 | tee "$PLAINBOX_SESSION_SHARE"/suspend_250_cycles.log diff --git a/units/stress/s3s4.pxu b/units/stress/s3s4.pxu index b8fc25b..77b9af6 100644 --- a/units/stress/s3s4.pxu +++ b/units/stress/s3s4.pxu @@ -58,7 +58,7 @@ user: root command: {%- if fwts == "supported" %} export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/lib/fwts" - set -o pipefail; checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/suspend_{{ s3_iterations }}_cycles -f none -s s3 --s3-device-check --s3-device-check-delay="${STRESS_S3_WAIT_DELAY:-45}" --s3-sleep-delay="${STRESS_S3_SLEEP_DELAY:-30}" --s3-multiple={{ s3_iterations }} -j "$SNAP"/share/fwts | tee "$PLAINBOX_SESSION_SHARE"/suspend_{{ s3_iterations }}_cycles_times.log + set -o pipefail; checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/suspend_{{ s3_iterations }}_cycles.log -f none -s s3 --s3-device-check --s3-device-check-delay="${STRESS_S3_WAIT_DELAY:-45}" --s3-sleep-delay="${STRESS_S3_SLEEP_DELAY:-30}" --s3-multiple={{ s3_iterations }} -j "$SNAP"/share/fwts | tee "$PLAINBOX_SESSION_SHARE"/suspend_{{ s3_iterations }}_cycles_times.log {%- else %} for i in {1..{{ s3_iterations }}}; do @@ -118,7 +118,7 @@ environ: PLAINBOX_SESSION_SHARE STRESS_S4_SLEEP_DELAY STRESS_S4_WAIT_DELAY LD_LI user: root command: export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/lib/fwts" - checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/hibernate_{{ s4_iterations }}_cycles -f none -s s4 --s4-device-check --s4-device-check-delay="${STRESS_S4_WAIT_DELAY:-45}" --s4-sleep-delay="${STRESS_S4_SLEEP_DELAY:-120}" --s4-multiple={{ s4_iterations }} -j "$SNAP"/share/fwts + checkbox-support-fwts_test -l "$PLAINBOX_SESSION_SHARE"/hibernate_{{ s4_iterations }}_cycles.log -f none -s s4 --s4-device-check --s4-device-check-delay="${STRESS_S4_WAIT_DELAY:-45}" --s4-sleep-delay="${STRESS_S4_SLEEP_DELAY:-120}" --s4-multiple={{ s4_iterations }} -j "$SNAP"/share/fwts _description: PURPOSE: This is an automated stress test that will force the system to hibernate/resume for {{ s4_iterations }} cycles diff --git a/units/suspend/suspend-graphics.pxu b/units/suspend/suspend-graphics.pxu index 22c3d9a..22012ec 100644 --- a/units/suspend/suspend-graphics.pxu +++ b/units/suspend/suspend-graphics.pxu @@ -28,7 +28,7 @@ command: if [[ -v SNAP ]]; then export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/lib/fwts" fi - set -o pipefail; checkbox-support-fwts_test -f none -l "$PLAINBOX_SESSION_SHARE"/{index}_suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee "$PLAINBOX_SESSION_SHARE"/{index}_suspend_single_times.log + set -o pipefail; checkbox-support-fwts_test -f none -l "$PLAINBOX_SESSION_SHARE"/{index}_suspend_single.log -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee "$PLAINBOX_SESSION_SHARE"/{index}_suspend_single_times.log estimated_duration: 1m30s _summary: Test auto suspend/resume after switching to {vendor} {product} @@ -262,7 +262,7 @@ user: root command: if type -P fwts >/dev/null; then echo "Calling fwts" - set -o pipefail; checkbox-support-fwts_test -f none -l "$PLAINBOX_SESSION_SHARE"/{index}_suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee "$PLAINBOX_SESSION_SHARE"/{index}_suspend_single_times.log + set -o pipefail; checkbox-support-fwts_test -f none -l "$PLAINBOX_SESSION_SHARE"/{index}_suspend_single.log -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee "$PLAINBOX_SESSION_SHARE"/{index}_suspend_single_times.log else echo "Calling sleep_test.py" set -o pipefail; sleep_test.py -p | tee "$PLAINBOX_SESSION_SHARE"/{index}_suspend_single_times.log diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu index d16bee6..56960be 100644 --- a/units/suspend/suspend.pxu +++ b/units/suspend/suspend.pxu @@ -198,7 +198,7 @@ command: fi if fwts --show-tests-categories | grep -q 's3 '; then echo "Calling fwts" - set -o pipefail; checkbox-support-fwts_test -f none -l "$PLAINBOX_SESSION_SHARE"/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee "$PLAINBOX_SESSION_SHARE"/suspend_single_times.log + set -o pipefail; checkbox-support-fwts_test -f none -l "$PLAINBOX_SESSION_SHARE"/suspend_single.log -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee "$PLAINBOX_SESSION_SHARE"/suspend_single_times.log else echo "Calling rtcwake" if [ -z "$RTC_DEVICE_FILE" ]; then @@ -243,7 +243,7 @@ command: if [[ -v SNAP ]]; then export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/lib/fwts" fi - set -o pipefail; checkbox-support-fwts_test -f none -l "$PLAINBOX_SESSION_SHARE"/{index}_suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee "$PLAINBOX_SESSION_SHARE"/{index}_suspend_single_times.log + set -o pipefail; checkbox-support-fwts_test -f none -l "$PLAINBOX_SESSION_SHARE"/{index}_suspend_single.log -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee "$PLAINBOX_SESSION_SHARE"/{index}_suspend_single_times.log else echo "Calling sleep_test.py" set -o pipefail; sleep_test.py -p | tee "$PLAINBOX_SESSION_SHARE"/{index}_suspend_single_times.log @@ -281,7 +281,7 @@ command: # fwts s3 is not available on all architectures (i.e ARM) if fwts --show-tests-categories | grep -q 's3 '; then echo "Calling fwts" - set -o pipefail; checkbox-support-fwts_test -f none -l "$PLAINBOX_SESSION_SHARE"/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee "$PLAINBOX_SESSION_SHARE"/suspend_single_times.log + set -o pipefail; checkbox-support-fwts_test -f none -l "$PLAINBOX_SESSION_SHARE"/suspend_single.log -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee "$PLAINBOX_SESSION_SHARE"/suspend_single_times.log else echo "Calling rtcwake" if [ -z "$RTC_DEVICE_FILE" ]; then @@ -302,7 +302,7 @@ command: if [[ -v SNAP ]]; then export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/lib/fwts" fi - set -o pipefail; checkbox-support-fwts_test -f none -l "$PLAINBOX_SESSION_SHARE"/{index}_hybrid_sleep_single -s s3 --s3-hybrid --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 --pm-method=pm-utils | tee "$PLAINBOX_SESSION_SHARE"/{index}_hybrid_sleep_single_times.log + set -o pipefail; checkbox-support-fwts_test -f none -l "$PLAINBOX_SESSION_SHARE"/{index}_hybrid_sleep_single.log -s s3 --s3-hybrid --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 --pm-method=pm-utils | tee "$PLAINBOX_SESSION_SHARE"/{index}_hybrid_sleep_single_times.log estimated_duration: 90.0 _summary: This test will check hybrid sleep and resume _description: diff --git a/units/touchscreen/jobs.pxu b/units/touchscreen/jobs.pxu index 8618e2c..ba4017b 100644 --- a/units/touchscreen/jobs.pxu +++ b/units/touchscreen/jobs.pxu @@ -141,7 +141,7 @@ _description: Validate that 3-touch tap is operating as expected STEPS: 1. Commence the test - {%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %} + {%- if 'Unity' in __system_env__.get("XDG_CURRENT_DESKTOP", "") %} 2. Tap the screen within the test area with 3 fingers simultaneously. 3. Once 3 fingers are on the screen you should see the indicator they are recognized. VERIFICATION: @@ -153,7 +153,7 @@ _description: Was the tap detected? {% endif %} command: - {%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %} + {%- if 'Unity' in __system_env__.get("XDG_CURRENT_DESKTOP", "") %} manage_compiz_plugin.py unityshell disable qmlscene -qt5 3 "$PLAINBOX_PROVIDER_DATA"/touch_tap_test.qml 2>&1 | grep -o PASS EXIT=$? @@ -178,7 +178,7 @@ _description: Validate that 4-touch tap is operating as expected STEPS: 1. Commence the test - {%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %} + {%- if 'Unity' in __system_env__.get("XDG_CURRENT_DESKTOP", "") %} 2. Tap the screen within the test area with 4 fingers simultaneously. 3. Once 4 fingers are on the screen you should see the indicator they are recognized. VERIFICATION: @@ -188,7 +188,7 @@ _description: 3. If the tap is not detected the test will time out after 20 seconds. {% endif %} command: - {%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %} + {%- if 'Unity' in __system_env__.get("XDG_CURRENT_DESKTOP", "") %} manage_compiz_plugin.py unityshell disable qmlscene -qt5 4 "$PLAINBOX_PROVIDER_DATA"/touch_tap_test.qml 2>&1 | grep -o PASS EXIT=$? |