diff options
| -rwxr-xr-x | bin/cpuid.py | 5 | ||||
| -rwxr-xr-x | bin/wwan_tests.py | 4 | ||||
| -rw-r--r-- | units/wwan/resource.pxu | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/bin/cpuid.py b/bin/cpuid.py index fcb6e0c6..d0cdea91 100755 --- a/bin/cpuid.py +++ b/bin/cpuid.py @@ -78,12 +78,13 @@ is_64bit = ctypes.sizeof(ctypes.c_voidp) == 8 CPUIDS = { "Amber Lake": ['0x806e9'], "AMD EPYC": ['0x800f12'], - "AMD Opteron 6100": ['0x100f91'], + "AMD Lisbon": ['0x100f81'], + "AMD Magny-Cours": ['0x100f91'], "AMD ROME": ['0x830f10'], "Broadwell": ['0x4067', '0x306d4', '0x5066', '0x406f'], "Canon Lake": ['0x6066'], "Cascade Lake": ['0x50655', '0x50656', '0x50657'], - "Coffee Lake": ['0x806ea', '0x906e'], + "Coffee Lake": ['0x806ea', '0x906ea', '0x906eb', '0x906ec', '0x906ed'], "Haswell": ['0x306c', '0x4065', '0x4066', '0x306f'], "Ice Lake": ['0x706e'], "Ivy Bridge": ['0x306a', '0x306e'], diff --git a/bin/wwan_tests.py b/bin/wwan_tests.py index c19c547e..df44cf61 100755 --- a/bin/wwan_tests.py +++ b/bin/wwan_tests.py @@ -261,7 +261,7 @@ def _ping_test(if_name): class ThreeGppConnection(): - def invoked(self, ctx): + def invoked(self): parser = argparse.ArgumentParser() parser.add_argument('wwan_control_if', type=str, help='The control interface for the device') @@ -274,7 +274,7 @@ class ThreeGppConnection(): args = parser.parse_args(sys.argv[2:]) ret_code = 1 try: - _create_3gpp_connection(ctx.args.wwan_control_if, args.apn) + _create_3gpp_connection(args.wwan_control_if, args.apn) _wwan_radio_on() time.sleep(args.wwan_setup_time) ret_code = _ping_test(args.wwan_net_if) diff --git a/units/wwan/resource.pxu b/units/wwan/resource.pxu index 0197f15e..74895834 100644 --- a/units/wwan/resource.pxu +++ b/units/wwan/resource.pxu @@ -11,7 +11,7 @@ category_id: wwan plugin: resource _summary: Gather device info about WWAN modems _description: Gather device info about WWAN modems -command: wwan_tests.py --use-cli resources +command: wwan_tests.py resources user: root estimated_duration: 3s flags: preserve-locale |