Skip to content

Use model-specific scripts if found #136

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.

Sign up for GitHub

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

Draft
crawfxrd wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Use model-specific scripts if found #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 42 additions & 3 deletions src/app/bios.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ use std::uefi::reset::ResetType;
use std::vars::{get_boot_item, get_boot_order, set_boot_item, set_boot_order};

use super::{
Component, FIRMWARECAP, FIRMWAREDIR, FIRMWARENSH, FIRMWAREROM, H2OFFT, IFLASHV, UEFIFLASH,
UefiMapper, cmos, pci_mcfg, shell,
Component, FIRMWARECAP, FIRMWAREDIR, FIRMWARENSH, FIRMWAREROM, H2OFFT, IFLASHV,
MODEL_FIRMWARE_NSH, UEFIFLASH, UefiMapper, cmos, pci_mcfg, shell,
};

fn copy_region(
Expand Down Expand Up @@ -245,7 +245,46 @@ impl Component for BiosComponent {
}

fn flash(&self) -> Result<()> {
if let Some((mut spi, _hsfsts_ctl)) = self.spi() {
if find(MODEL_FIRMWARE_NSH).is_ok() {
find(FIRMWARENSH)?;

let mut boot_options: Vec<(u16, Vec<u8>)> = vec![];

let order = get_boot_order();
if order.is_ok() {
println!("Preserving boot order");
for num in order.clone().unwrap() {
if let Ok(item) = get_boot_item(num) {
boot_options.push((num, item));
} else {
println!("Failed to read Boot{:>04X}", num);
}
}
} else {
println!("Failed to preserve boot order");
}

let cmd = format!("{} {} bios flash", FIRMWARENSH, FIRMWAREDIR);
let status = shell(&cmd)?;

if let Ok(order) = order {
if set_boot_order(&order).is_ok() {
for (num, data) in boot_options {
if set_boot_item(num, &data).is_err() {
println!("Failed to write Boot{:>04X}", num);
}
}
println!("Restored boot order");
} else {
println!("Failed to restore boot order");
}
}

if status != 0 {
println!("{} Flash Error: {}", self.name(), status);
return Err(Status::DEVICE_ERROR);
}
} else if let Some((mut spi, _hsfsts_ctl)) = self.spi() {
// Read new data
let mut new;
{
Expand Down
92 changes: 54 additions & 38 deletions src/app/ec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ use std::{
};

use super::{
Component, EC2ROM, ECROM, ECTAG, FIRMWAREDIR, FIRMWARENSH, pci_read, shell, sideband::Sideband,
Component, EC2ROM, ECROM, ECTAG, FIRMWAREDIR, FIRMWARENSH, MODEL_EC_NSH, pci_read, shell,
sideband::Sideband,
};

pub struct UefiTimeout {
Expand Down Expand Up @@ -767,49 +768,64 @@ impl Component for EcComponent {
println!("file version: {:?}", str::from_utf8(firmware.version));
}

let result = match &self.ec {
EcKind::Pang(_pmc, _system_version) => {
find(FIRMWARENSH)?;
let command = if self.master { "ec" } else { "ec2" };
let status = shell(&format!(
"{} {} {} flash",
FIRMWARENSH, FIRMWAREDIR, command
))?;
if status == 0 {
Ok(())
} else {
println!("{} Flash Error: {}", self.name(), status);
Err(Status::DEVICE_ERROR)
}
let result = if find(MODEL_EC_NSH).is_ok() {
find(FIRMWARENSH)?;
let command = if self.master { "ec" } else { "ec2" };
let status = shell(&format!(
"{} {} {} flash",
FIRMWARENSH, FIRMWAREDIR, command
))?;
if status == 0 {
Ok(())
} else {
println!("{} Flash Error: {}", self.name(), status);
Err(Status::DEVICE_ERROR)
}
EcKind::System76(_ec, _pmc) => {
// System76 EC requires reset to load new firmware
requires_reset = true;

// Flash main ROM
match unsafe { flash(&firmware_data, SpiTarget::Main) } {
Ok(()) => Ok(()),
Err(err) => {
println!("{} Flash Error: {:X?}", self.name(), err);
} else {
match &self.ec {
EcKind::Pang(_pmc, _system_version) => {
find(FIRMWARENSH)?;
let command = if self.master { "ec" } else { "ec2" };
let status = shell(&format!(
"{} {} {} flash",
FIRMWARENSH, FIRMWAREDIR, command
))?;
if status == 0 {
Ok(())
} else {
println!("{} Flash Error: {}", self.name(), status);
Err(Status::DEVICE_ERROR)
}
}
}
EcKind::Legacy(_ec) => {
requires_reset = true;

// Use open source flashing code
match unsafe { flash_legacy(&firmware_data) } {
Ok(()) => Ok(()),
Err(err) => {
println!("{} Flash Error: {:X?}", self.name(), err);
Err(Status::DEVICE_ERROR)
EcKind::System76(_ec, _pmc) => {
// System76 EC requires reset to load new firmware
requires_reset = true;

// Flash main ROM
match unsafe { flash(&firmware_data, SpiTarget::Main) } {
Ok(()) => Ok(()),
Err(err) => {
println!("{} Flash Error: {:X?}", self.name(), err);
Err(Status::DEVICE_ERROR)
}
}
}
}
EcKind::Unknown => {
println!("{} Failed to flash EcKind::Unknown", self.name());
Err(Status::DEVICE_ERROR)
EcKind::Legacy(_ec) => {
requires_reset = true;

// Use open source flashing code
match unsafe { flash_legacy(&firmware_data) } {
Ok(()) => Ok(()),
Err(err) => {
println!("{} Flash Error: {:X?}", self.name(), err);
Err(Status::DEVICE_ERROR)
}
}
}
EcKind::Unknown => {
println!("{} Failed to flash EcKind::Unknown", self.name());
Err(Status::DEVICE_ERROR)
}
}
};

Expand Down
4 changes: 4 additions & 0 deletions src/app/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ static SPLASHBMP: &str = concat!("\\", env!("BASEDIR"), "\\res\\splash.bmp");
static UEFIFLASH: &str = concat!("\\", env!("BASEDIR"), "\\firmware\\uefiflash.efi");
static UEFIFLASHTAG: &str = concat!("\\", env!("BASEDIR"), "\\firmware\\uefiflash.tag");

// Model-specific flash scripts
static MODEL_FIRMWARE_NSH: &str = concat!("\\", env!("BASEDIR"), "\\firmware\\firmware.nsh");
static MODEL_EC_NSH: &str = concat!("\\", env!("BASEDIR"), "\\firmware\\ec.nsh");

fn shell(cmd: &str) -> Result<usize> {
exec_path(
SHELLEFI,
Expand Down