diff mbox

Revert "acpi: mark PMTIMER as unlocked"

Message ID 1460702609-25971-1-git-send-email-kraxel@redhat.com
State New
Headers show

Commit Message

Gerd Hoffmann April 15, 2016, 6:43 a.m. UTC
This reverts commit 7070e085d490c396f9237c8f10bf8b6e69cd0066.

Commit message claims locking is not needed, but that appears
to not be true, seabios ehci driver runs into timekeeping problems
with this, see
	https://bugzilla.redhat.com/show_bug.cgi?id=1322713

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/acpi/core.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Paolo Bonzini April 15, 2016, 10:10 a.m. UTC | #1
On 15/04/2016 08:43, Gerd Hoffmann wrote:
> This reverts commit 7070e085d490c396f9237c8f10bf8b6e69cd0066.
> 
> Commit message claims locking is not needed, but that appears
> to not be true, seabios ehci driver runs into timekeeping problems
> with this, see
> 	https://bugzilla.redhat.com/show_bug.cgi?id=1322713

I need to look into it further, because for example the same problem
would happen if you moved the PMTIMER to the hypervisor (Xen does this).
 But for now this is the right fix, I agree.

Paolo
Gerd Hoffmann May 2, 2016, 12:32 p.m. UTC | #2
On Fr, 2016-04-15 at 12:10 +0200, Paolo Bonzini wrote:
> 
> On 15/04/2016 08:43, Gerd Hoffmann wrote:
> > This reverts commit 7070e085d490c396f9237c8f10bf8b6e69cd0066.
> > 
> > Commit message claims locking is not needed, but that appears
> > to not be true, seabios ehci driver runs into timekeeping problems
> > with this, see
> > 	https://bugzilla.redhat.com/show_bug.cgi?id=1322713
> 
> I need to look into it further, because for example the same problem
> would happen if you moved the PMTIMER to the hypervisor (Xen does this).
>  But for now this is the right fix, I agree.

Peter, can you pick up this one for 2.6?

thanks,
  Gerd
Peter Maydell May 2, 2016, 4:19 p.m. UTC | #3
On 2 May 2016 at 13:32, Gerd Hoffmann <kraxel@redhat.com> wrote:
> On Fr, 2016-04-15 at 12:10 +0200, Paolo Bonzini wrote:
>>
>> On 15/04/2016 08:43, Gerd Hoffmann wrote:
>> > This reverts commit 7070e085d490c396f9237c8f10bf8b6e69cd0066.
>> >
>> > Commit message claims locking is not needed, but that appears
>> > to not be true, seabios ehci driver runs into timekeeping problems
>> > with this, see
>> >     https://bugzilla.redhat.com/show_bug.cgi?id=1322713
>>
>> I need to look into it further, because for example the same problem
>> would happen if you moved the PMTIMER to the hypervisor (Xen does this).
>>  But for now this is the right fix, I agree.
>
> Peter, can you pick up this one for 2.6?

Applied to master, thanks.

-- PMM
diff mbox

Patch

diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index 7925a1a..6a2f452 100644
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -536,7 +536,6 @@  void acpi_pm_tmr_init(ACPIREGS *ar, acpi_update_sci_fn update_sci,
     ar->tmr.timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, acpi_pm_tmr_timer, ar);
     memory_region_init_io(&ar->tmr.io, memory_region_owner(parent),
                           &acpi_pm_tmr_ops, ar, "acpi-tmr", 4);
-    memory_region_clear_global_locking(&ar->tmr.io);
     memory_region_add_subregion(parent, 8, &ar->tmr.io);
 }