Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bios: Replace model check with manufacturer check #97

Merged
merged 1 commit into from
Nov 14, 2023
Merged

Conversation

crawfxrd
Copy link
Member

Instead of checking the model string against every system released with coreboot, just check that the manufacturer is System76.

Test: Flash a firmware-open board with this checked out.

Instead of checking the model string against every system released with
coreboot, just check that the manufacturer is System76.

Signed-off-by: Tim Crawford <tcrawford@system76.com>
@crawfxrd crawfxrd requested review from jackpot51 and a team November 14, 2023 19:10
@leviport
Copy link
Member

leviport commented Nov 14, 2023

Where does that manufacturer string come from? Because our desktops set multiple manufacturer strings in DMI to System76:

Handle 0x0001, DMI type 1, 27 bytes
System Information
	Manufacturer: System76
	Product Name: Thelio
	Version: thelio-r3
	Serial Number: To be filled by O.E.M.
	UUID: d769ae41-c86a-9f1a-a153-047c164f85bd
	Wake-up Type: Power Switch
	SKU Number: To be filled by O.E.M.
	Family: To be filled by O.E.M.

Handle 0x0002, DMI type 2, 15 bytes
Base Board Information
	Manufacturer: System76
	Product Name: Thelio
	Version: thelio-r3
	Serial Number: 07D7311_MA1E033952
	Asset Tag: To be filled by O.E.M.
	Features:
		Board is a hosting board
		Board is replaceable
	Location In Chassis: To be filled by O.E.M.
	Chassis Handle: 0x0003
	Type: Motherboard
	Contained Object Handles: 0

Handle 0x0003, DMI type 3, 22 bytes
Chassis Information
	Manufacturer: System76
	Type: Desktop
	Lock: Not Present
	Version: thelio-r3
	Serial Number: To be filled by O.E.M.
	Asset Tag: To be filled by O.E.M.
	Boot-up State: Safe
	Power Supply State: Safe
	Thermal State: Safe
	Security Status: None
	OEM Information: 0x00000000
	Height: Unspecified
	Number Of Power Cords: 1
	Contained Elements: 0
	SKU Number: To be filled by O.E.M.

@leviport leviport closed this Nov 14, 2023
@leviport leviport reopened this Nov 14, 2023
@crawfxrd
Copy link
Member Author

crawfxrd commented Nov 14, 2023

Type 1 SMBIOS data, as set by coreboot.

Handle 0x0001, DMI type 1, 27 bytes
System Information
	Manufacturer: System76
	Product Name: Darter Pro
	Version: darp8
	Serial Number: 123456789
	UUID: Not Settable
	Wake-up Type: Power Switch
	SKU Number: Not Specified
	Family: Not Specified

The BIOS vendor check is still there. This change only affects coreboot models.

@leviport
Copy link
Member

So it'll probably match on all the Thelios then. I'll give it a test and see what happens.

@leviport
Copy link
Member

Thelio-r3 seems ok. The MSI/AMI update thing started normally and the firmware installed without issue. I would like to test an Asus, ASRock, and Gigabyte board as well, since they all update slightly differently.

Copy link
Member

@leviport leviport left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues on major-r4, mira-b4.1, spark-b1, or thelio-r2. If it does pick these systems up in the match, it doesn't look like there are any side effects.

@jackpot51 jackpot51 merged commit 97b7b49 into master Nov 14, 2023
4 checks passed
@jackpot51 jackpot51 deleted the check-mfg branch November 14, 2023 22:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants