diff options
author | Liav A <liavalb@gmail.com> | 2021-09-07 12:08:38 +0300 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-09-07 13:47:37 +0200 |
commit | 25ea7461a0e5a6c2ed1a43b80b1db8b2ac3b3764 (patch) | |
tree | 135923d84d2dc4244148b9dcd3cb3c77f43378ad /Kernel/GlobalProcessExposed.cpp | |
parent | d1378339f6f4457457167fcf79cbca5f5549a336 (diff) | |
download | serenity-25ea7461a0e5a6c2ed1a43b80b1db8b2ac3b3764.zip |
Kernel/PCI: Simplify the entire subsystem
A couple of things were changed:
1. Semantic changes - PCI segments are now called PCI domains, to better
match what they are really. It's also the name that Linux gave, and it
seems that Wikipedia also uses this name.
We also remove PCI::ChangeableAddress, because it was used in the past
but now it's no longer being used.
2. There are no WindowedMMIOAccess or MMIOAccess classes anymore, as
they made a bunch of unnecessary complexity. Instead, Windowed access is
removed entirely (this was tested, but never was benchmarked), so we are
left with IO access and memory access options. The memory access option
is essentially mapping the PCI bus (from the chosen PCI domain), to
virtual memory as-is. This means that unless needed, at any time, there
is only one PCI bus being mapped, and this is changed if access to
another PCI bus in the same PCI domain is needed. For now, we don't
support mapping of different PCI buses from different PCI domains at the
same time, because basically it's still a non-issue for most machines
out there.
2. OOM-safety is increased, especially when constructing the Access
object. It means that we pre-allocating any needed resources, and we try
to find PCI domains (if requested to initialize memory access) after we
attempt to construct the Access object, so it's possible to fail at this
point "gracefully".
3. All PCI API functions are now separated into a different header file,
which means only "clients" of the PCI subsystem API will need to include
that header file.
4. Functional changes - we only allow now to enumerate the bus after
a hardware scan. This means that the old method "enumerate_hardware"
is removed, so, when initializing an Access object, the initializing
function must call rescan on it to force it to find devices. This makes
it possible to fail rescan, and also to defer it after construction from
both OOM-safety terms and hotplug capabilities.
Diffstat (limited to 'Kernel/GlobalProcessExposed.cpp')
-rw-r--r-- | Kernel/GlobalProcessExposed.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Kernel/GlobalProcessExposed.cpp b/Kernel/GlobalProcessExposed.cpp index 5c3459f47d..e1025c2764 100644 --- a/Kernel/GlobalProcessExposed.cpp +++ b/Kernel/GlobalProcessExposed.cpp @@ -9,7 +9,7 @@ #include <Kernel/Arch/x86/CPU.h> #include <Kernel/Arch/x86/InterruptDisabler.h> #include <Kernel/Arch/x86/ProcessorInfo.h> -#include <Kernel/Bus/PCI/Access.h> +#include <Kernel/Bus/PCI/API.h> #include <Kernel/CommandLine.h> #include <Kernel/ConsoleDevice.h> #include <Kernel/Devices/HID/HIDManagement.h> @@ -615,7 +615,7 @@ private: JsonArraySerializer array { builder }; PCI::enumerate([&array](PCI::Address address, PCI::ID id) { auto obj = array.add_object(); - obj.add("seg", address.seg()); + obj.add("domain", address.domain()); obj.add("bus", address.bus()); obj.add("device", address.device()); obj.add("function", address.function()); |