Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
63 changes: 63 additions & 0 deletions drivers/gpu/drm/asahi/g15/hw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,69 @@ pub(crate) mod t6030 {
0xe7, 0x9b, 0xb9, 0xb0, 0x22, 0x09, 0xdb, 0x53,
],
},
// J514S firmware measured on the 14.7 boot chain; desktop rendering
// was verified with the bring-up prefix override (issue #247).
FirmwareBuild {
name: "J514S cd05 firmware (14.7 boot chain)",
machine: Some(kernel::c_str!("apple,j514s")),
text_size: 0x5c000,
data_size: 0x114000,
marker: 0x58e88,
text_sha256: [
0xcd, 0x05, 0xaf, 0x6a, 0x82, 0x8b, 0x52, 0xe4,
0xc2, 0xfe, 0xd2, 0x00, 0x86, 0xd3, 0xd1, 0x8a,
0x7d, 0xb4, 0x2e, 0x03, 0xa8, 0xfd, 0x6f, 0x83,
0x54, 0xf9, 0xf0, 0x6e, 0x0a, 0x61, 0x36, 0x3e,
],
},
// Some J516S units on the same 14.7 boot chain load a different B0
// TEXT image with identical sizes and marker. Pin its complete
// measured digest for the J516S only.
FirmwareBuild {
name: "J516S cd05 firmware (14.7 boot chain)",
machine: Some(kernel::c_str!("apple,j516s")),
text_size: 0x5c000,
data_size: 0x114000,
marker: 0x58e88,
text_sha256: [
0xcd, 0x05, 0xaf, 0x6a, 0x82, 0x8b, 0x52, 0xe4,
0xc2, 0xfe, 0xd2, 0x00, 0x86, 0xd3, 0xd1, 0x8a,
0x7d, 0xb4, 0x2e, 0x03, 0xa8, 0xfd, 0x6f, 0x83,
0x54, 0xf9, 0xf0, 0x6e, 0x0a, 0x61, 0x36, 0x3e,
],
},
// J514S (14-inch) firmware measured on the 14.7 boot chain with
// system firmware 26.6.2; the GPU reached READY with the bring-up
// prefix override (issue #247).
FirmwareBuild {
name: "J514S 4118 firmware (14.7 boot chain)",
machine: Some(kernel::c_str!("apple,j514s")),
text_size: 0x5c000,
data_size: 0x114000,
marker: 0x58e88,
text_sha256: [
0x41, 0x18, 0x33, 0xa7, 0xde, 0xd7, 0x73, 0xfe,
0xea, 0xc4, 0xa1, 0x81, 0x55, 0x2e, 0x3f, 0xf5,
0x58, 0x2e, 0xaf, 0x44, 0x35, 0xf2, 0xdd, 0x8f,
0x62, 0x0c, 0x1e, 0xd0, 0xb3, 0x1d, 0xf1, 0xb0,
],
},
// J516S (16-inch) firmware measured on the 14.7 boot chain with
// system firmware 26.6.2; the GPU reached READY with the bring-up
// prefix override (issue #247).
FirmwareBuild {
name: "J516S 4118 firmware (14.7 boot chain)",
machine: Some(kernel::c_str!("apple,j516s")),
text_size: 0x5c000,
data_size: 0x114000,
marker: 0x58e88,
text_sha256: [
0x41, 0x18, 0x33, 0xa7, 0xde, 0xd7, 0x73, 0xfe,
0xea, 0xc4, 0xa1, 0x81, 0x55, 0x2e, 0x3f, 0xf5,
0x58, 0x2e, 0xaf, 0x44, 0x35, 0xf2, 0xdd, 0x8f,
0x62, 0x0c, 0x1e, 0xd0, 0xb3, 0x1d, 0xf1, 0xb0,
],
},
],
machine: kernel::c_str!("apple,t6030"),
platform: super::Platform::AdtWithPmp,
Expand Down
5 changes: 4 additions & 1 deletion drivers/gpu/drm/asahi/g15/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,11 @@ impl platform::Driver for Driver<'_> {
// after probe_g15 started firmware would return an unbound device.
try_pin_init!(Driver {
_driver: {
// Not EPROBE_DEFER: a deferred device stays listed in devices_deferred until the
// deferred-probe work runs, even after activate()'s probe fails for good. Activation
// reprobes every unbound device; a device added later sees MODULE_READY set.
if !MODULE_READY.load(Ordering::Acquire) {
return Err(EPROBE_DEFER);
return Err(ENODEV);
}
let cfg = *info.ok_or(ENODEV)?;
dev_info!(pdev.as_ref(), "G15: probing ({})\n", cfg.name);
Expand Down
64 changes: 62 additions & 2 deletions tools/asahi/g15-maintained-handoff-tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,71 @@ def item(s, marker):
OWNER_CALLS.set(0); let bytes = fixture(kind);
assert!(parse(&dev, &Adt { data: &bytes }).is_err()); assert_eq!(OWNER_CALLS.get(), 0);
}
assert_eq!(BUILDS.len(), 3, "maintained B0 firmware row must not require an absent profile symbol");
assert_eq!(BUILDS.len(), 7, "maintained B0 firmware row must not require an absent profile symbol");
for (row, machine) in [(1, &b"apple,j516s"[..]), (2, &b"apple,j514s"[..])] {
assert_eq!(BUILDS[row].machine.unwrap().to_bytes(), machine);
assert_eq!((BUILDS[row].text_size, BUILDS[row].data_size, BUILDS[row].marker), (0x5c000, 0x114000, 0x58e88));
assert_eq!(BUILDS[row].text_sha256, [0xda,0x26,0xec,0xca,0xb1,0xf8,0x59,0x8d,0xa8,0x0c,0x85,0x5e,0xca,0x91,0x65,0x20,0x40,0x6d,0x1d,0x06,0x70,0xf1,0xd4,0x70,0xe7,0x9b,0xb9,0xb0,0x22,0x09,0xdb,0x53]);
}
assert_eq!(BUILDS[4].machine.unwrap().to_bytes(), b"apple,j516s");
assert_eq!((BUILDS[4].text_size, BUILDS[4].data_size, BUILDS[4].marker), (0x5c000, 0x114000, 0x58e88));
assert_eq!(BUILDS[4].text_sha256, [0xcd,0x05,0xaf,0x6a,0x82,0x8b,0x52,0xe4,0xc2,0xfe,0xd2,0x00,0x86,0xd3,0xd1,0x8a,0x7d,0xb4,0x2e,0x03,0xa8,0xfd,0x6f,0x83,0x54,0xf9,0xf0,0x6e,0x0a,0x61,0x36,0x3e]);
// Issue #247: this J514S build must pin without the bring-up override.
use identity::lookup::{Measured, Verdict, verdict};
let measured = Measured {
text_size: 0x5c000, data_size: 0x114000, marker: 0x58e88,
sha256: [0xcd,0x05,0xaf,0x6a,0x82,0x8b,0x52,0xe4,
0xc2,0xfe,0xd2,0x00,0x86,0xd3,0xd1,0x8a,
0x7d,0xb4,0x2e,0x03,0xa8,0xfd,0x6f,0x83,
0x54,0xf9,0xf0,0x6e,0x0a,0x61,0x36,0x3e],
};
let identify = |m: &Measured, machine: &[u8]| verdict(m, BUILDS.iter().map(|b| (
Measured { text_size: b.text_size, data_size: b.data_size,
marker: b.marker, sha256: b.text_sha256 },
b.machine.map_or(true, |board| board.to_bytes() == machine),
)), 0);
assert!(matches!(identify(&measured, b"apple,j514s"), Verdict::Pinned(3)),
"J514S cd05 firmware must pin without a prefix override");
assert_eq!(identify(&measured, b"apple,j516s"), Verdict::Pinned(4));
let mut changed = measured;
changed.sha256[31] ^= 1;
assert_eq!(identify(&changed, b"apple,j514s"), Verdict::Refused);
changed = measured; changed.text_size += 0x1000;
assert_eq!(identify(&changed, b"apple,j514s"), Verdict::Refused);
changed = measured; changed.data_size += 0x1000;
assert_eq!(identify(&changed, b"apple,j514s"), Verdict::Refused);
changed = measured; changed.marker += 8;
assert_eq!(identify(&changed, b"apple,j514s"), Verdict::Refused);
// Issue #247: the 4118 build pins on the J514S and the J516S, each to
// its own row, without the bring-up override.
let digest = [0x41,0x18,0x33,0xa7,0xde,0xd7,0x73,0xfe,
0xea,0xc4,0xa1,0x81,0x55,0x2e,0x3f,0xf5,
0x58,0x2e,0xaf,0x44,0x35,0xf2,0xdd,0x8f,
0x62,0x0c,0x1e,0xd0,0xb3,0x1d,0xf1,0xb0];
for (row, machine) in [(5, &b"apple,j514s"[..]), (6, &b"apple,j516s"[..])] {
assert_eq!(BUILDS[row].machine.unwrap().to_bytes(), machine);
assert_eq!((BUILDS[row].text_size, BUILDS[row].data_size, BUILDS[row].marker), (0x5c000, 0x114000, 0x58e88));
assert_eq!(BUILDS[row].text_sha256, digest);
}
let measured = Measured { text_size: 0x5c000, data_size: 0x114000, marker: 0x58e88, sha256: digest };
assert_eq!(identify(&measured, b"apple,j514s"), Verdict::Pinned(5),
"J514S 4118 firmware must pin without a prefix override");
assert_eq!(identify(&measured, b"apple,j516s"), Verdict::Pinned(6),
"J516S 4118 firmware must pin without a prefix override");
for other in [&b"apple,j514c"[..], b"apple,j516c", b"apple,j514m", b"apple,j516m", b"apple,t6030"] {
assert_eq!(identify(&measured, other), Verdict::Refused);
}
for machine in [&b"apple,j514s"[..], b"apple,j516s"] {
let mut changed = measured;
changed.sha256[31] ^= 1;
assert_eq!(identify(&changed, machine), Verdict::Refused);
changed = measured; changed.text_size += 0x1000;
assert_eq!(identify(&changed, machine), Verdict::Refused);
changed = measured; changed.data_size += 0x1000;
assert_eq!(identify(&changed, machine), Verdict::Refused);
changed = measured; changed.marker += 8;
assert_eq!(identify(&changed, machine), Verdict::Refused);
}
for error in [0, -517, -12] {
INIT_ERROR.set(error); let shared = Arc::new(Shared); let result = Rtkit::new(&dev, &shared);
assert_eq!(result.is_ok(), error == 0);
Expand All @@ -167,7 +226,8 @@ def main():
while depth: depth+=(hw[end]=='[')-(hw[end]==']'); end+=1
firmware='static BUILDS: &[FirmwareBuild] = &'+hw[start:end]+';\n'+item(hw,'pub(crate) struct FirmwareBuild')
constructor=item(boot,' fn new(dev: &device::Device, shared: &Arc<Shared>)')
source=PREFIX+'\nmod hw {\n'+constants+'\n}\nmod record {\n'+record_constants+'\n}\n'+helpers+'\n'+firmware+'\nimpl Rtkit {\n'+constructor+'\n}\n'+CASES
identity='mod identity {\n'+''.join(f'#[path = "{G15 / "identity" / (name + ".rs")}"] pub(crate) mod {name};\n' for name in ['matching', 'lookup'])+'}\n'
source=PREFIX+'\nmod hw {\n'+constants+'\n}\nmod record {\n'+record_constants+'\n}\n'+helpers+'\n'+firmware+'\nimpl Rtkit {\n'+constructor+'\n}\n'+identity+CASES
variants={'actual':source}
if a.mutations:
variants['skip-owner-check']=source.replace('if !glue::reserved_uat(i as u32, r.start, r.end - r.start) {','if false {')
Expand Down
25 changes: 21 additions & 4 deletions tools/asahi/g15-probe-init-tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ def item(text, marker):
static EXEC_SHARE_READY: Cell<bool> = const { Cell::new(false) };
static ATTACH_ERROR: Cell<bool> = const { Cell::new(false) };
static PROBE_ERROR: Cell<i32> = const { Cell::new(0) };
static PRE_ACTIVATION: Cell<u32> = const { Cell::new(0) };
}
struct Core<'a>(PhantomData<&'a ()>);
struct Device { data: Cell<*mut core::ffi::c_void> }
Expand Down Expand Up @@ -184,7 +185,16 @@ def item(text, marker):
};
// Model driver_attach and a late driver_add_groups failure. A deferred
// worker can also retry G15 while the other registration is in progress.
let _ = callback::<Driver<'static>>(&PDEV, Some(&&CFG));
let ready = MODULE_READY.load(Ordering::Acquire);
let started = PROBES.get();
let result = callback::<Driver<'static>>(&PDEV, Some(&&CFG));
// A probe that started firmware here is the readiness-gate failure, checked below.
if !ready && PROBES.get() == started {
// A deferral would keep the GPU in devices_deferred after a later
// terminal failure; before activation the probe must decline outright.
assert_eq!(result, Err(ENODEV), "pre-activation probe deferred instead of ENODEV");
PRE_ACTIVATION.set(PRE_ACTIVATION.get() + 1);
}
if FAIL_REGISTRATION.get() == stage { return Err(-5); }
COMPLETED_REGISTRATION.set(stage);
stage
Expand Down Expand Up @@ -252,7 +262,7 @@ def item(text, marker):
PDEV.base.data.set(core::ptr::null_mut());
MODULE_READY.store(false, Ordering::Release);
COMPLETED_REGISTRATION.set(0); FAIL_REGISTRATION.set(failure);
ACTIVATED.set(false); ATTACH_ERROR.set(failure == 0);
ACTIVATED.set(false); ATTACH_ERROR.set(failure == 0); PRE_ACTIVATION.set(0);
let init = <DriverModule as InPlaceModule>::init(&MODULE);
assert_eq!(PROBES.get(), 0, "module initializer eagerly started firmware");
let result = KBox::pin_init(init, GFP_KERNEL);
Expand All @@ -269,6 +279,12 @@ def item(text, marker):
assert!(!PDEV.base.data.get().is_null());
unsafe { drop(Box::from_raw(PDEV.base.data.get().cast::<Driver<'_>>())); }
}
// Every probe before activation declined: one per completed or failing registration.
// The registrations run G15 (1), the generic driver (2), then G16 (3) where it is built.
let expected = if cfg!(CONFIG_DRM_ASAHI_G16) {
match failure { 1 => 1, 2 => 2, _ => 3 }
} else if failure == 1 { 1 } else { 2 };
assert_eq!(PRE_ACTIVATION.get(), expected, "pre-activation probes");
println!("module-registration-{failure}: PASS");
}
}
Expand Down Expand Up @@ -415,9 +431,10 @@ def main():
needle = " None\n"
assert probe.count(needle) == 1
variants["retained-error-unbinds"] = (probe.replace(needle, " return Err(error);\n"), module_code)
gate = " if !MODULE_READY.load(Ordering::Acquire) {\n return Err(EPROBE_DEFER);\n }\n"
gate = " if !MODULE_READY.load(Ordering::Acquire) {\n return Err(ENODEV);\n }\n"
assert probe.count(gate) == 1
variants["no-registration-readiness-gate"] = (probe.replace(gate, ""), module_code)
variants["pre-activation-defers"] = (probe.replace(gate, gate.replace("ENODEV", "EPROBE_DEFER")), module_code)
late = " #[cfg(CONFIG_DRM_ASAHI_G15)]\n _g15_ready: g15::activate(),\n"
assert module_code.count(late) == 1
early = module_code.replace(late, "").replace(" _driver <-", late + " _driver <-", 1)
Expand Down Expand Up @@ -446,7 +463,7 @@ def main():
else:
receipt["mutants"][label] = result
if r.returncode == 0: raise SystemExit("SURVIVED: " + name)
intended = {"eager-probe-before-allocation": "allocation-before-start: firmware probe before drvdata allocation", "retained-error-unbinds": "retained-start-failure-binds: callback result", "no-registration-readiness-gate": "late registration failure started firmware", "activation-before-last-registration": "activation before all registrations completed", "activation-before-g16-registration": "activation before all registrations completed"}[name]
intended = {"pre-activation-defers": "pre-activation probe deferred instead of ENODEV", "eager-probe-before-allocation": "allocation-before-start: firmware probe before drvdata allocation", "retained-error-unbinds": "retained-start-failure-binds: callback result", "no-registration-readiness-gate": "late registration failure started firmware", "activation-before-last-registration": "activation before all registrations completed", "activation-before-g16-registration": "activation before all registrations completed"}[name]
result["intended_failure"] = intended in r.stderr
if not result["intended_failure"]: raise SystemExit("INVALID unrelated failure: " + name + "\n" + r.stderr)
(out / "result.json").write_text(json.dumps(receipt, indent=2) + "\n")
Expand Down
13 changes: 8 additions & 5 deletions tools/asahi/g15-zero-words-tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@
renumbering margins became tuning constants (the tables are unchanged). Its T6030
configuration module is
independently pinned to the original bytes,
except for the J514S B0 FirmwareBuild row added to its firmware table: the
module is the original pinned bytes (0079ae08) plus that one 15-line row, and
the whole hw.rs pin was refreshed with it. prepare_board() is pinned too;
except for the J514S B0 FirmwareBuild row, the J514S cd05 and J516S cd05
FirmwareBuild rows and the J514S 4118 and J516S 4118 FirmwareBuild rows added
to its firmware table: the module is the original pinned bytes (0079ae08) plus
those five rows, and the whole hw.rs pin was refreshed with each (with the 4118
rows removed, both pins are their earlier values fb2118b6 and 2667963a; with
the cd05 rows also removed, e9b80be9 and cab592b5). prepare_board() is pinned too;
it was refreshed for the same Board change (its T6030 arm is unchanged).
"""

Expand All @@ -37,11 +40,11 @@
GOLDEN_FILES = {
"board/data.rs": "7c5ff1077ca3296cbfc9e7144294162b6dea78a3774c38eeed4b0f59a14d7a5c",
"board/template.rs": "286872f5474a67534f214e83e659253299f85143f3dc59035fa80894022e2549",
"hw.rs": "c54a4f8342fb466f82f4b9cfed6a137ee1ca1f4d80ede4e1b7f397d39223558e",
"hw.rs": "f45a0f11f952fea4e36809267ffd240ee1e381e8f3400de5e8527cd316b9f225",
"power/idle.rs": "4928ecf7699b3ca85ff5143eb6e996efd40d47321e29a238a02c8873bc9f102c",
}
GOLDEN_FUNCTIONS = {
("hw.rs", "pub(crate) mod t6030 {"): "cab592b5d776be9ede93b96b1b0526c1d838ef2948a5e4a86caa4ec71f71c2ca",
("hw.rs", "pub(crate) mod t6030 {"): "4016ec0d46831482382a92791b625e10fb2f6e4e28115a9498fdde0776f82e52",
("initdata.rs", "fn templates("): "c3115c9926d3d7d93317cb8510e93b04f30b0c256811d7137568e822dd93b8ee",
("initdata.rs", "pub(crate) fn prepare_board("): "ebef64ab87ef7b1f994eb7fa2a2424d05bc4fc9e88cbfbf18e51570bdfc4222d",
("board.rs", "pub(crate) fn from_adt("): "cecd0b28db5bd94d3b75c1bbb5f35204e8bf0699f74e5b3d08228c59025f6ac2",
Expand Down
Loading