From c29caf2a857db3ef7dbceda5f088fd668e8904c9 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Thu, 28 Jan 2021 11:47:29 +0000 Subject: [PATCH] vmm: acpi: Fix incorrect mutex timeout value The mutex timeout should be 0xffff rather than 0xfff to disable the timeout feature. dsdt.dsl 745: Acquire (\_SB.PRES.CPLK, 0x0FFF) Warning 3130 - ^ Result is not used, possible operator timeout will be missed dsdt.dsl 767: Acquire (\_SB.PRES.CPLK, 0x0FFF) Warning 3130 - ^ Result is not used, possible operator timeout will be missed dsdt.dsl 775: Acquire (\_SB.PRES.CPLK, 0x0FFF) Warning 3130 - ^ Result is not used, possible operator timeout will be missed Fixes: #2216 Signed-off-by: Rob Bradford --- vmm/src/cpu.rs | 6 +++--- vmm/src/memory_manager.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vmm/src/cpu.rs b/vmm/src/cpu.rs index 5a4e053d4..43bea036e 100644 --- a/vmm/src/cpu.rs +++ b/vmm/src/cpu.rs @@ -1178,7 +1178,7 @@ impl Aml for CPUMethods { true, vec![ // Take lock defined above - &aml::Acquire::new("\\_SB_.PRES.CPLK".into(), 0xfff), + &aml::Acquire::new("\\_SB_.PRES.CPLK".into(), 0xffff), // Write CPU number (in first argument) to I/O port via field &aml::Store::new(&aml::Path::new("\\_SB_.PRES.CSEL"), &aml::Arg(0)), &aml::Store::new(&aml::Local(0), &aml::ZERO), @@ -1216,7 +1216,7 @@ impl Aml for CPUMethods { 1, true, vec![ - &aml::Acquire::new("\\_SB_.PRES.CPLK".into(), 0xfff), + &aml::Acquire::new("\\_SB_.PRES.CPLK".into(), 0xffff), // Write CPU number (in first argument) to I/O port via field &aml::Store::new(&aml::Path::new("\\_SB_.PRES.CSEL"), &aml::Arg(0)), // Set CEJ0 bit @@ -1234,7 +1234,7 @@ impl Aml for CPUMethods { true, vec![ // Take lock defined above - &aml::Acquire::new("\\_SB_.PRES.CPLK".into(), 0xfff), + &aml::Acquire::new("\\_SB_.PRES.CPLK".into(), 0xffff), &aml::Store::new(&aml::Local(0), &aml::ZERO), &aml::While::new( &aml::LessThan::new(&aml::Local(0), &self.max_vcpus), diff --git a/vmm/src/memory_manager.rs b/vmm/src/memory_manager.rs index 7270c46b6..6a6a6a500 100644 --- a/vmm/src/memory_manager.rs +++ b/vmm/src/memory_manager.rs @@ -1638,7 +1638,7 @@ impl Aml for MemoryMethods { true, vec![ // Take lock defined above - &aml::Acquire::new("MLCK".into(), 0xfff), + &aml::Acquire::new("MLCK".into(), 0xffff), &aml::Store::new(&aml::Local(0), &aml::ZERO), &aml::While::new( &aml::LessThan::new(&aml::Local(0), &self.slots), @@ -1695,7 +1695,7 @@ impl Aml for MemoryMethods { true, vec![ // Take lock defined above - &aml::Acquire::new("MLCK".into(), 0xfff), + &aml::Acquire::new("MLCK".into(), 0xffff), // Write slot number (in first argument) to I/O port via field &aml::Store::new(&aml::Path::new("\\_SB_.MHPC.MSEL"), &aml::Arg(0)), &aml::Store::new(&aml::Local(0), &aml::ZERO), @@ -1721,7 +1721,7 @@ impl Aml for MemoryMethods { true, vec![ // Take lock defined above - &aml::Acquire::new("MLCK".into(), 0xfff), + &aml::Acquire::new("MLCK".into(), 0xffff), // Write slot number (in first argument) to I/O port via field &aml::Store::new(&aml::Path::new("\\_SB_.MHPC.MSEL"), &aml::Arg(0)), &aml::Name::new(