From ee7fcdb3cf9d350f7a1f317013d37b51b4f22554 Mon Sep 17 00:00:00 2001 From: Michael Zhao Date: Sun, 14 Mar 2021 15:09:50 +0800 Subject: [PATCH] aarch64: Correct wrong settings for serial device Corrected: - The device name in FDT - MMIO mapping size Signed-off-by: Michael Zhao --- arch/src/aarch64/fdt.rs | 2 +- vmm/src/device_manager.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/src/aarch64/fdt.rs b/arch/src/aarch64/fdt.rs index 9bd8a1477..fecfc22d8 100644 --- a/arch/src/aarch64/fdt.rs +++ b/arch/src/aarch64/fdt.rs @@ -490,7 +490,7 @@ fn create_serial_node( let serial_reg_prop = generate_prop64(&[dev_info.addr(), dev_info.length()]); let irq = generate_prop32(&[GIC_FDT_IRQ_TYPE_SPI, dev_info.irq(), IRQ_TYPE_EDGE_RISING]); - append_begin_node(fdt, &format!("uart@{:x}", dev_info.addr()))?; + append_begin_node(fdt, &format!("U6_16550A@{:x}", dev_info.addr()))?; append_property_string(fdt, "compatible", "ns16550a")?; append_property(fdt, "reg", &serial_reg_prop)?; append_property_u32(fdt, "clocks", CLOCK_PHANDLE)?; diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs index d56ef95ae..fa50cbbda 100644 --- a/vmm/src/device_manager.rs +++ b/vmm/src/device_manager.rs @@ -1628,14 +1628,14 @@ impl DeviceManager { self.address_manager .mmio_bus - .insert(serial.clone(), addr.0, MMIO_LEN) + .insert(serial.clone(), addr.0, 0x8) .map_err(DeviceManagerError::BusError)?; self.id_to_dev_info.insert( (DeviceType::Serial, DeviceType::Serial.to_string()), MMIODeviceInfo { addr: addr.0, - len: MMIO_LEN, + len: 0x8, irq: serial_irq, }, );