Daniel Samson
8754d4e46a
The source layout now mirrors the runtime filesystem hierarchy
(docs/danos-file-system-hierarchy-FSH.md): what lives under system/ in the
source is what a running danos represents under /system. Each service and
driver is a sub-project directory that is its own Zig module — cross-project
references go by module name, never by a path into another project's files.
Moves (all git mv, history preserved):
- src/ -> system/ (danos internals; the self-representation)
root.zig -> danos.zig (the kernel<->user contract module)
kernel/arch/ -> kernel/architecture/ (arch -> architecture)
device/ -> devices/ (what /system/devices reflects)
boot/ -> /boot (the loaders, top level)
- sbin/ -> split by role:
init, vfs -> system/services/<name>/<name>.zig
hpetd, busd -> system/drivers/<name>/<name>.zig
vfs-test -> system/services/vfs/vfs-test.zig (inside the vfs project)
- lib/ -> library/runtime/ (room for other libraries beside runtime)
The VFS wire protocol becomes its own module, system/services/vfs/protocol.zig
("vfs-protocol"): the vfs sub-project exposes its interface, and the runtime's
file layer imports it by name. First instance of the "protocol module" pattern
(docs/driver-model.md); usb/block will expose theirs the same way.
Also: fix a naming-standard violation in the protocol — Op -> Operation (and
req -> request, _pad -> _padding). Docs updated: /system/services added to the
FHS doc, a repository-layout section added to the docs index, and stale source
paths swept across comments and docs.
Runtime boot paths are unchanged (the bootloader still loads /sbin/init);
aligning the runtime filesystem to the FHS is a separate follow-up. Suite 35/35
plus host tests green.
96 lines
3.8 KiB
Zig
96 lines
3.8 KiB
Zig
//! The firmware-agnostic discovery facade.
|
|
//!
|
|
//! The kernel calls `platform.discover()` and gets back a generic `DeviceTree`
|
|
//! without ever naming ACPI or device-tree — the same way it imports `architecture`
|
|
//! without naming x86_64. Which backend runs is decided *at runtime* from what
|
|
//! the bootloader handed us (an ACPI RSDP today, a device-tree blob later),
|
|
//! because a single image — a future ARM kernel especially — may boot under
|
|
//! either firmware. That's a deliberate divergence from `architecture`, which is a
|
|
//! compile-time choice.
|
|
|
|
const std = @import("std");
|
|
const danos = @import("danos");
|
|
const device_model = @import("device-model.zig");
|
|
const acpi = @import("acpi.zig");
|
|
const power = @import("power.zig");
|
|
const devicetree = @import("device-tree.zig");
|
|
|
|
pub const DeviceTree = device_model.DeviceTree;
|
|
pub const Device = device_model.Device;
|
|
pub const DeviceClass = device_model.DeviceClass;
|
|
pub const Resource = device_model.Resource;
|
|
pub const ResourceKind = device_model.ResourceKind;
|
|
pub const Hal = device_model.Hal;
|
|
pub const PowerInformation = acpi.PowerInformation;
|
|
pub const AmlStats = acpi.AmlStats;
|
|
pub const PlatformInformation = acpi.PlatformInformation;
|
|
pub const RegisterAccess = acpi.RegisterAccess;
|
|
pub const IsoEntry = acpi.IsoEntry;
|
|
pub const Cpu = acpi.Cpu;
|
|
|
|
/// The register map + sleep types discovery extracted, for logging/diagnostics.
|
|
pub fn powerInformation() PowerInformation {
|
|
return acpi.power_information;
|
|
}
|
|
|
|
/// The scalar firmware facts the architecture layer needs to avoid legacy assumptions
|
|
/// (8259 presence, LAPIC base, PM timer, SPCR UART, IRQ overrides).
|
|
pub fn platformInformation() PlatformInformation {
|
|
return acpi.platform_information;
|
|
}
|
|
|
|
/// AML parse integrity/diagnostics (namespace node count, bytes consumed).
|
|
pub fn amlStats() AmlStats {
|
|
return acpi.aml_stats;
|
|
}
|
|
|
|
/// The usable logical processors discovered during enumeration — one entry per
|
|
/// core danos may schedule on, each carrying the Local APIC ID an SMP wake targets.
|
|
/// `len` is the hardware's degree of parallelism: how many tasks *could* run at the
|
|
/// same instant once the application processors are started. Today only the
|
|
/// bootstrap processor is actually running, so starting the rest is the pending SMP
|
|
/// step (see docs/smp.md). Borrowed from static storage populated by `discover`.
|
|
pub fn cpus() []const Cpu {
|
|
return acpi.cpu_information.cpus[0..acpi.cpu_information.count];
|
|
}
|
|
|
|
/// Non-zero only if enumeration found more processors than the static pool holds
|
|
/// (the surplus were dropped from `cpus()`); surfaced so the cap is never silent.
|
|
pub fn cpusDropped() usize {
|
|
return acpi.cpu_information.dropped;
|
|
}
|
|
|
|
/// Enumerate hardware into a fresh device tree. `hal` supplies the hardware
|
|
/// primitives the backend needs (MMIO mapping for PCIe configuration space, port I/O for
|
|
/// ACPI registers); pass the architecture implementation. Errors leave nothing to clean up
|
|
/// beyond the tree's own allocations.
|
|
pub fn discover(
|
|
boot_information: *const danos.BootInformation,
|
|
allocator: std.mem.Allocator,
|
|
hal: Hal,
|
|
) !DeviceTree {
|
|
var device_tree = try DeviceTree.init(allocator);
|
|
|
|
if (boot_information.acpi_rsdp != 0) {
|
|
try acpi.discover(boot_information.acpi_rsdp, &device_tree, hal);
|
|
} else {
|
|
// No ACPI RSDP. A device-tree boot would parse its blob here; today that
|
|
// path is a stub, so this reports the machine described itself no way we
|
|
// understand yet.
|
|
try devicetree.discover(&device_tree);
|
|
}
|
|
|
|
return device_tree;
|
|
}
|
|
|
|
/// Restart the machine. Never returns on success; returns only if no reset method
|
|
/// worked (extremely unlikely). Backend-agnostic entry the kernel calls.
|
|
pub fn reboot(hal: Hal) void {
|
|
power.reboot(hal);
|
|
}
|
|
|
|
/// Power the machine off (ACPI S5). Never returns on success.
|
|
pub fn shutdown(hal: Hal) void {
|
|
power.shutdown(hal);
|
|
}
|