Skip to content

Commit d0645f4

Browse files
committed
soc: apple: pmp: Handle optional "dram-capaticy"
Not present on all machines and macOS ignores it. Signed-off-by: Janne Grunau <j@jannau.net>
1 parent 93ffbb5 commit d0645f4

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

drivers/soc/apple/pmp.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -413,17 +413,17 @@ impl platform::Driver for PmpDriver {
413413
let dvid = node
414414
.property_read(c"apple,dram-vendor-id")
415415
.required_by(&dev)?;
416-
let dcap = node
417-
.property_read(c"apple,dram-capacity")
418-
.required_by(&dev)?;
419-
let bdid = node
420-
.property_read(c"apple,board-id")
421-
.required_by(&dev)?;
422-
data.patch_bootargs(&[
423-
(from_fourcc(b"BDID"), bdid),
424-
(from_fourcc(b"DCAP"), dcap),
425-
(from_fourcc(b"DVID"), dvid),
426-
])?;
416+
let bdid = node.property_read(c"apple,board-id").required_by(&dev)?;
417+
match node.property_read(c"apple,dram-capacity").optional() {
418+
Some(dcap) => data.patch_bootargs(&[
419+
(from_fourcc(b"BDID"), bdid),
420+
(from_fourcc(b"DCAP"), dcap),
421+
(from_fourcc(b"DVID"), dvid),
422+
])?,
423+
None => {
424+
data.patch_bootargs(&[(from_fourcc(b"BDID"), bdid), (from_fourcc(b"DVID"), dvid)])?
425+
}
426+
};
427427
let rtkit = rtkit::RtKit::<PmpData>::new(&dev, None, 0, data.clone())?;
428428
*data.rtkit.lock() = Some(rtkit);
429429
data.start_cpu()?;

0 commit comments

Comments
 (0)