platform_drv: add default DMA mappings interface

genodelabs/genode#5002
This commit is contained in:
Johannes Schlatow 2023-11-21 18:06:58 +01:00
parent 4163367b53
commit bc09ff7498
2 changed files with 33 additions and 1 deletions

View File

@ -98,7 +98,7 @@ void Driver::Common::acquire_io_mmu_devices()
}); });
/* iterate devices and determine address translation mode */ /* iterate IOMMU devices and determine address translation mode */
bool mpu_present { false }; bool mpu_present { false };
bool device_present { false }; bool device_present { false };
_io_mmu_devices.for_each([&] (Io_mmu const & io_mmu) { _io_mmu_devices.for_each([&] (Io_mmu const & io_mmu) {
@ -111,12 +111,35 @@ void Driver::Common::acquire_io_mmu_devices()
if (device_present && !mpu_present) if (device_present && !mpu_present)
_root.enable_dma_remapping(); _root.enable_dma_remapping();
/* iterate devices and add default mappings */
_devices.for_each([&] (Device & device) {
device.for_each_io_mmu([&] (Device::Io_mmu const & io_mmu) {
_io_mmu_devices.for_each([&] (Io_mmu & io_mmu_dev) {
if (io_mmu_dev.name() == io_mmu.name) {
bool has_reserved_mem = false;
device.for_each_reserved_memory([&] (unsigned,
Io_mmu::Range range) {
io_mmu_dev.add_default_range(range, range.start);
has_reserved_mem = true;
});
/* enable default mappings for corresponding pci devices */
device.for_pci_config([&] (Device::Pci_config const & cfg) {
io_mmu_dev.enable_default_mappings(
{cfg.bus_num, cfg.dev_num, cfg.func_num});
});
}
});
}, [&] () { /* empty list fn */ });
});
bool kernel_iommu_present { false }; bool kernel_iommu_present { false };
_io_mmu_devices.for_each([&] (Io_mmu & io_mmu_dev) { _io_mmu_devices.for_each([&] (Io_mmu & io_mmu_dev) {
io_mmu_dev.default_mappings_complete();
if (io_mmu_dev.name() == "kernel_iommu") if (io_mmu_dev.name() == "kernel_iommu")
kernel_iommu_present = true; kernel_iommu_present = true;
}); });
/* if kernel implements iommu, instantiate Kernel_iommu */ /* if kernel implements iommu, instantiate Kernel_iommu */
if (_iommu() && !kernel_iommu_present) if (_iommu() && !kernel_iommu_present)
new (_heap) Kernel_iommu(_env, _io_mmu_devices, "kernel_iommu"); new (_heap) Kernel_iommu(_env, _io_mmu_devices, "kernel_iommu");

View File

@ -134,6 +134,15 @@ class Driver::Io_mmu : private Io_mmu_devices::Element
public: public:
/* interface for adding default mappings (used for reserved memory) */
virtual void add_default_range(Range const &, addr_t) { }
/* interface for activating default mappings for certain device */
virtual void enable_default_mappings(Pci::Bdf) { }
/* interface for completing default mappings (enabled IOMMU) */
virtual void default_mappings_complete() { }
Device::Name const & name() const { return _name; } Device::Name const & name() const { return _name; }
bool domain_owner(Domain const & domain) const { bool domain_owner(Domain const & domain) const {