mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-10 20:19:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

devices: pci: allocate BARs with correct alignment

Browse source 
Each PCI BAR must be aligned to at least its own size to allow the BAR
sizing mechanism to work.  Change all BAR allocations to use
allocate_with_align(), specifying the size as the alignment.

In particular, this fixes the alignment of the XHCI BAR, whose size is
larger than a page (the default MMIO allocator alignment).

BUG=None
TEST=Boot vm_kernel in crosvm

Change-Id: Icba03771a896b9b4feae608efdb7685fe24f8b98
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1660202
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
This commit is contained in:
Daniel Verkamp 2019-06-14 15:22:40 -07:00 committed by Commit Bot
parent c9b0ea544d
commit 4dd6ddbc39
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
devices/src/pci/ac97.rs
View file

@ -150,10 +150,11 @@ impl PciDevice for Ac97Dev {
let mut ranges = Vec::new();
let mixer_regs_addr = resources
.mmio_allocator()
.allocate(
.allocate_with_align(
MIXER_REGS_SIZE,
Alloc::PciBar { bus, dev, bar: 0 },
"ac97-mixer_regs".to_string(),
MIXER_REGS_SIZE,
)
.map_err(|e| pci_device::Error::IoAllocationFailed(MIXER_REGS_SIZE, e))?;
let mixer_config = PciBarConfiguration::default()
@ -167,10 +168,11 @@ impl PciDevice for Ac97Dev {
let master_regs_addr = resources
.mmio_allocator()
.allocate(
.allocate_with_align(
MASTER_REGS_SIZE,
Alloc::PciBar { bus, dev, bar: 1 },
"ac97-master_regs".to_string(),
MASTER_REGS_SIZE,
)
.map_err(|e| pci_device::Error::IoAllocationFailed(MASTER_REGS_SIZE, e))?;
let master_config = PciBarConfiguration::default()

3
devices/src/usb/xhci/xhci_controller.rs
View file

@ -216,10 +216,11 @@ impl PciDevice for XhciController {
// xHCI spec 5.2.1.
let bar0_addr = resources
.mmio_allocator()
.allocate(
.allocate_with_align(
XHCI_BAR0_SIZE,
Alloc::PciBar { bus, dev, bar: 0 },
"xhci_bar0".to_string(),
XHCI_BAR0_SIZE,
)
.map_err(|e| PciDeviceError::IoAllocationFailed(XHCI_BAR0_SIZE, e))?;
let bar0_config = PciBarConfiguration::default()

6
devices/src/virtio/virtio_pci_device.rs
View file

@ -340,13 +340,14 @@ impl PciDevice for VirtioPciDevice {
let mut ranges = Vec::new();
let settings_config_addr = resources
.mmio_allocator()
.allocate(
.allocate_with_align(
CAPABILITY_BAR_SIZE,
Alloc::PciBar { bus, dev, bar: 0 },
format!(
"virtio-{}-cap_bar",
type_to_str(self.device.device_type()).unwrap_or("?")
),
CAPABILITY_BAR_SIZE,
)
.map_err(|e| PciDeviceError::IoAllocationFailed(CAPABILITY_BAR_SIZE, e))?;
let config = PciBarConfiguration::default()
@ -377,7 +378,7 @@ impl PciDevice for VirtioPciDevice {
for config in self.device.get_device_bars() {
let device_addr = resources
.device_allocator()
.allocate(
.allocate_with_align(
config.get_size(),
Alloc::PciBar {
bus,
@ -388,6 +389,7 @@ impl PciDevice for VirtioPciDevice {
"virtio-{}-custom_bar",
type_to_str(self.device.device_type()).unwrap_or("?")
),
config.get_size(),
)
.map_err(|e| PciDeviceError::IoAllocationFailed(config.get_size(), e))?;
let config = config.set_address(device_addr);