diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-08-07 11:50:00 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-08-07 11:50:00 -0400 |
| commit | 06d7a64f782c53c592ab373f0d54924c08dce9b3 (patch) | |
| tree | 177199f8ad8b73f9cc9d55954f92f8de721e6df1 /usr/src/common | |
| parent | 863589c2e208100c03809c39bacdd3361f404956 (diff) | |
| parent | 1d1fc316c9e8072a7e63a5b1218bab66b9a66b66 (diff) | |
| download | illumos-joyent-06d7a64f782c53c592ab373f0d54924c08dce9b3.tar.gz | |
[illumos-gate merge]
commit 1d1fc316c9e8072a7e63a5b1218bab66b9a66b66
14820 Want SMBIOS 3.6 Support
14872 smbios_info_processor forgot ext clock speed
commit f02dfbac954fb75e2030de187f92788ab9ece137
14877 remove support for the old process model from sgs
commit 051bd850f53c8034271a9fd12ce95ca63d008a12
14889 efi.h: EFI_MEMORY_DESCRIPTOR has fields swapped
Conflicts:
usr/src/cmd/smbios/smbios.c
Diffstat (limited to 'usr/src/common')
| -rw-r--r-- | usr/src/common/smbios/smb_info.c | 7 | ||||
| -rw-r--r-- | usr/src/common/smbios/smb_open.c | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/usr/src/common/smbios/smb_info.c b/usr/src/common/smbios/smb_info.c index 09d7d5374a..9ced5687b2 100644 --- a/usr/src/common/smbios/smb_info.c +++ b/usr/src/common/smbios/smb_info.c @@ -22,7 +22,7 @@ /* * Copyright 2015 OmniTI Computer Consulting, Inc. All rights reserved. * Copyright 2019 Joyent, Inc. - * Copyright 2021 Oxide Computer Company + * Copyright 2022 Oxide Computer Company * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -696,6 +696,7 @@ smbios_info_processor(smbios_hdl_t *shp, id_t id, smbios_processor_t *pp) pp->smbp_type = p.smbpr_type; pp->smbp_family = p.smbpr_family; pp->smbp_voltage = p.smbpr_voltage; + pp->smbp_clkspeed = p.smbpr_clkspeed; pp->smbp_maxspeed = p.smbpr_maxspeed; pp->smbp_curspeed = p.smbpr_curspeed; pp->smbp_status = p.smbpr_status; @@ -729,6 +730,10 @@ smbios_info_processor(smbios_hdl_t *shp, id_t id, smbios_processor_t *pp) } } + if (smb_libgteq(shp, SMB_VERSION_36)) { + pp->smbp_threadsenabled = p.smpbr_threaden; + } + return (0); } diff --git a/usr/src/common/smbios/smb_open.c b/usr/src/common/smbios/smb_open.c index 454fb61b8b..0ecd0fac0e 100644 --- a/usr/src/common/smbios/smb_open.c +++ b/usr/src/common/smbios/smb_open.c @@ -22,7 +22,7 @@ /* * Copyright 2015 OmniTI Computer Consulting, Inc. All rights reserved. * Copyright 2018 Joyent, Inc. - * Copyright 2021 Oxide Computer Company + * Copyright 2022 Oxide Computer Company * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -234,6 +234,7 @@ smbios_bufopen(const smbios_entry_t *ep, const void *buf, size_t len, case SMB_VERSION_33: case SMB_VERSION_34: case SMB_VERSION_35: + case SMB_VERSION_36: break; default: return (smb_open_error(shp, errp, ESMB_VERSION)); |