summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLifeng Zheng <zhenglifeng1@huawei.com>2024-11-13 18:33:09 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2024-11-13 12:45:23 +0100
commit2388b266c9fcc7c9169ba85c7f9ebe325b7622d7 (patch)
tree040febe0c3767099fcaf0367d9eae216430d6415
parent2d5404caa8c7bb5c4e0435f94b28834ae5456623 (diff)
downloadlinux-2388b266c9fcc7c9169ba85c7f9ebe325b7622d7.tar.gz
linux-2388b266c9fcc7c9169ba85c7f9ebe325b7622d7.tar.bz2
linux-2388b266c9fcc7c9169ba85c7f9ebe325b7622d7.zip
ACPI: CPPC: Fix _CPC register setting issue
Since commit 60949b7b8054 ("ACPI: CPPC: Fix MASK_VAL() usage"), _CPC registers cannot be changed from 1 to 0. It turns out that there is an extra OR after MASK_VAL_WRITE(), which has already ORed prev_val with the register mask. Remove the extra OR to fix the problem. Fixes: 60949b7b8054 ("ACPI: CPPC: Fix MASK_VAL() usage") Signed-off-by: Lifeng Zheng <zhenglifeng1@huawei.com> Link: https://patch.msgid.link/20241113103309.761031-1-zhenglifeng1@huawei.com [ rjw: Subject and changelog edits ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/cppc_acpi.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c
index 5c0cc7aae872..e78e3754d99e 100644
--- a/drivers/acpi/cppc_acpi.c
+++ b/drivers/acpi/cppc_acpi.c
@@ -1140,7 +1140,6 @@ static int cpc_write(int cpu, struct cpc_register_resource *reg_res, u64 val)
return -EFAULT;
}
val = MASK_VAL_WRITE(reg, prev_val, val);
- val |= prev_val;
}
switch (size) {