ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-20 17:52:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pci: return correct I/O port base from BAR

Browse Source 
The base address of I/O ports has a different encoding than
those of I/O memory. This needs to be encountered in the PCI
config helper utilities.

Fix genodelabs/genode#4576
This commit is contained in:
Stefan Kalkowski 2022-07-25 13:47:56 +02:00 committed by Christian Helmuth
parent 49c6e01049
commit 5bf3e72d37
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
repos/os/include/pci/config.h
View File

@ -129,8 +129,12 @@ struct Pci::Config : Genode::Mmio
Genode::uint64_t addr()
{
return (bit64() ? ((Genode::uint64_t)read<Upper_bits>()<<32) : 0UL)
| Bar_32bit::Memory_base::masked(read<Bar_32bit>());
if (memory())
return (bit64()
? ((Genode::uint64_t)read<Upper_bits>()<<32) : 0UL)
| Bar_32bit::Memory_base::masked(read<Bar_32bit>());
else
return Bar_32bit::Io_base::masked(read<Bar_32bit>());
}
};