Re: [edk2] [PATCH v2] ARM: Virt: Don't generate RTC ACPI device when using UEFI
On 01/13/16 15:54, Shannon Zhao wrote: > When booting the VM with UEFI, UEFI takes ownership of the RTC hardware. > While UEFI can use libfdt to disable the RTC device node in the DTB that > it passes to the OS, it cannot modify AML. Therefore, we won't generate > the RTC ACPI device at all when using UEFI. > > Signed-off-by: Shannon Zhao> --- > v2: just totally don't generate the RTC ACPI device when using UEFI > --- > hw/arm/virt-acpi-build.c | 19 --- > 1 file changed, 19 deletions(-) > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index 0caf5ce..ac568a3 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -94,23 +94,6 @@ static void acpi_dsdt_add_uart(Aml *scope, const > MemMapEntry *uart_memmap, > aml_append(scope, dev); > } > > -static void acpi_dsdt_add_rtc(Aml *scope, const MemMapEntry *rtc_memmap, > - uint32_t rtc_irq) > -{ > -Aml *dev = aml_device("RTC0"); > -aml_append(dev, aml_name_decl("_HID", aml_string("LNRO0013"))); > -aml_append(dev, aml_name_decl("_UID", aml_int(0))); > - > -Aml *crs = aml_resource_template(); > -aml_append(crs, aml_memory32_fixed(rtc_memmap->base, > - rtc_memmap->size, AML_READ_WRITE)); > -aml_append(crs, > - aml_interrupt(AML_CONSUMER, AML_LEVEL, AML_ACTIVE_HIGH, > - AML_EXCLUSIVE, _irq, 1)); > -aml_append(dev, aml_name_decl("_CRS", crs)); > -aml_append(scope, dev); > -} > - > static void acpi_dsdt_add_flash(Aml *scope, const MemMapEntry *flash_memmap) > { > Aml *dev, *crs; > @@ -575,8 +558,6 @@ build_dsdt(GArray *table_data, GArray *linker, > VirtGuestInfo *guest_info) > acpi_dsdt_add_cpus(scope, guest_info->smp_cpus); > acpi_dsdt_add_uart(scope, [VIRT_UART], > (irqmap[VIRT_UART] + ARM_SPI_BASE)); > -acpi_dsdt_add_rtc(scope, [VIRT_RTC], > - (irqmap[VIRT_RTC] + ARM_SPI_BASE)); > acpi_dsdt_add_flash(scope, [VIRT_FLASH]); > acpi_dsdt_add_virtio(scope, [VIRT_MMIO], > (irqmap[VIRT_MMIO] + ARM_SPI_BASE), > NUM_VIRTIO_TRANSPORTS); > Reviewed-by: Laszlo Ersek ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v2] ARM: Virt: Don't generate RTC ACPI device when using UEFI
On 13 January 2016 at 15:54, Shannon Zhaowrote: > When booting the VM with UEFI, UEFI takes ownership of the RTC hardware. > While UEFI can use libfdt to disable the RTC device node in the DTB that > it passes to the OS, it cannot modify AML. Therefore, we won't generate > the RTC ACPI device at all when using UEFI. > > Signed-off-by: Shannon Zhao > --- Acked-by: Ard Biesheuvel > v2: just totally don't generate the RTC ACPI device when using UEFI > --- > hw/arm/virt-acpi-build.c | 19 --- > 1 file changed, 19 deletions(-) > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index 0caf5ce..ac568a3 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -94,23 +94,6 @@ static void acpi_dsdt_add_uart(Aml *scope, const > MemMapEntry *uart_memmap, > aml_append(scope, dev); > } > > -static void acpi_dsdt_add_rtc(Aml *scope, const MemMapEntry *rtc_memmap, > - uint32_t rtc_irq) > -{ > -Aml *dev = aml_device("RTC0"); > -aml_append(dev, aml_name_decl("_HID", aml_string("LNRO0013"))); > -aml_append(dev, aml_name_decl("_UID", aml_int(0))); > - > -Aml *crs = aml_resource_template(); > -aml_append(crs, aml_memory32_fixed(rtc_memmap->base, > - rtc_memmap->size, AML_READ_WRITE)); > -aml_append(crs, > - aml_interrupt(AML_CONSUMER, AML_LEVEL, AML_ACTIVE_HIGH, > - AML_EXCLUSIVE, _irq, 1)); > -aml_append(dev, aml_name_decl("_CRS", crs)); > -aml_append(scope, dev); > -} > - > static void acpi_dsdt_add_flash(Aml *scope, const MemMapEntry *flash_memmap) > { > Aml *dev, *crs; > @@ -575,8 +558,6 @@ build_dsdt(GArray *table_data, GArray *linker, > VirtGuestInfo *guest_info) > acpi_dsdt_add_cpus(scope, guest_info->smp_cpus); > acpi_dsdt_add_uart(scope, [VIRT_UART], > (irqmap[VIRT_UART] + ARM_SPI_BASE)); > -acpi_dsdt_add_rtc(scope, [VIRT_RTC], > - (irqmap[VIRT_RTC] + ARM_SPI_BASE)); > acpi_dsdt_add_flash(scope, [VIRT_FLASH]); > acpi_dsdt_add_virtio(scope, [VIRT_MMIO], > (irqmap[VIRT_MMIO] + ARM_SPI_BASE), > NUM_VIRTIO_TRANSPORTS); > -- > 2.1.0 > ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel