kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

aarch64: Rename RAM_64BIT_START in layout

Browse Source 
`RAM_64BIT_START` was set to 1 GiB, not a real 64-bit address. Now
rename it `RAM_START` to avoid confusion.

Signed-off-by: Michael Zhao <michael.zhao@arm.com>
This commit is contained in:
Michael Zhao
2022-03-30 08:36:23 +08:00
committed by Xin Wang
parent c035e5a836
commit ef9f37cd5f
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/src/aarch64/fdt.rs
+2 -2
View File
@@ -255,10 +255,10 @@ fn create_memory_node(
} }
} }
} else { } else {
let mem_size = guest_mem.last_addr().raw_value() - super::layout::RAM_64BIT_START + 1; let mem_size = guest_mem.last_addr().raw_value() - super::layout::RAM_START + 1;
// See https://github.com/torvalds/linux/blob/master/Documentation/devicetree/booting-without-of.txt#L960 // See https://github.com/torvalds/linux/blob/master/Documentation/devicetree/booting-without-of.txt#L960
// for an explanation of this. // for an explanation of this.
let mem_reg_prop = [super::layout::RAM_64BIT_START as u64, mem_size as u64]; let mem_reg_prop = [super::layout::RAM_START as u64, mem_size as u64];
let memory_node = fdt.begin_node("memory")?; let memory_node = fdt.begin_node("memory")?;
fdt.property_string("device_type", "memory")?; fdt.property_string("device_type", "memory")?;
arch/src/aarch64/layout.rs
+4 -4
View File
@@ -85,8 +85,8 @@ pub const PCI_MMCONFIG_SIZE: u64 = 256 << 20;
// One bus with potentially 256 devices (32 slots x 8 functions). // One bus with potentially 256 devices (32 slots x 8 functions).
pub const PCI_MMIO_CONFIG_SIZE_PER_SEGMENT: u64 = 4096 * 256; pub const PCI_MMIO_CONFIG_SIZE_PER_SEGMENT: u64 = 4096 * 256;
/// Start of RAM on 64 bit ARM. /// Start of RAM.
pub const RAM_64BIT_START: u64 = 0x4000_0000; pub const RAM_START: u64 = 0x4000_0000;
/// Kernel command line maximum size. /// Kernel command line maximum size.
/// As per `arch/arm64/include/uapi/asm/setup.h`. /// As per `arch/arm64/include/uapi/asm/setup.h`.
@@ -94,11 +94,11 @@ pub const CMDLINE_MAX_SIZE: usize = 2048;
/// FDT is at the beginning of RAM. /// FDT is at the beginning of RAM.
/// Maximum size of the device tree blob as specified in https://www.kernel.org/doc/Documentation/arm64/booting.txt. /// Maximum size of the device tree blob as specified in https://www.kernel.org/doc/Documentation/arm64/booting.txt.
pub const FDT_START: u64 = RAM_64BIT_START; pub const FDT_START: u64 = RAM_START;
pub const FDT_MAX_SIZE: usize = 0x20_0000; pub const FDT_MAX_SIZE: usize = 0x20_0000;
/// Put ACPI table above dtb /// Put ACPI table above dtb
pub const ACPI_START: u64 = RAM_64BIT_START + FDT_MAX_SIZE as u64; pub const ACPI_START: u64 = RAM_START + FDT_MAX_SIZE as u64;
pub const ACPI_MAX_SIZE: usize = 0x20_0000; pub const ACPI_MAX_SIZE: usize = 0x20_0000;
pub const RSDP_POINTER: GuestAddress = GuestAddress(ACPI_START); pub const RSDP_POINTER: GuestAddress = GuestAddress(ACPI_START);
arch/src/aarch64/mod.rs
+2 -2
View File
@@ -108,7 +108,7 @@ pub fn arch_memory_regions(size: GuestUsize) -> Vec<(GuestAddress, usize, Region
), ),
// 1 GiB ~ : Ram // 1 GiB ~ : Ram
( (
GuestAddress(layout::RAM_64BIT_START), GuestAddress(layout::RAM_START),
(size - ram_deduction) as usize, (size - ram_deduction) as usize,
RegionType::Ram, RegionType::Ram,
), ),
@@ -212,7 +212,7 @@ mod tests {
fn test_arch_memory_regions_dram() { fn test_arch_memory_regions_dram() {
let regions = arch_memory_regions((1usize << 32) as u64); //4GB let regions = arch_memory_regions((1usize << 32) as u64); //4GB
assert_eq!(5, regions.len()); assert_eq!(5, regions.len());
assert_eq!(GuestAddress(layout::RAM_64BIT_START), regions[4].0); assert_eq!(GuestAddress(layout::RAM_START), regions[4].0);
assert_eq!(((1 << 32) - layout::UEFI_SIZE) as usize, regions[4].1); assert_eq!(((1 << 32) - layout::UEFI_SIZE) as usize, regions[4].1);
assert_eq!(RegionType::Ram, regions[4].2); assert_eq!(RegionType::Ram, regions[4].2);
} }
vmm/src/vm.rs
+1 -1
View File
@@ -2993,7 +2993,7 @@ mod tests {
#[test] #[test]
fn test_create_fdt_with_devices() { fn test_create_fdt_with_devices() {
let regions = vec![( let regions = vec![(
GuestAddress(layout::RAM_64BIT_START), GuestAddress(layout::RAM_START),
(layout::FDT_MAX_SIZE + 0x1000) as usize, (layout::FDT_MAX_SIZE + 0x1000) as usize,
)]; )];
let mem = GuestMemoryMmap::from_ranges(&regions).expect("Cannot initialize memory"); let mem = GuestMemoryMmap::from_ranges(&regions).expect("Cannot initialize memory");