tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'acpi-5.17-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull extra ACPI updates from Rafael Wysocki:
"These fix and clean up the ACPI CPPC driver on top of the recent
changes in it merged previously and add some new device IDs to the
ACPI DPTF driver.

Specifics:

- Fix a recently introduced endianness-related issue in the ACPI CPPC
library and clean it up on top of that (Rafael Wysocki)

- Add new device IDs for the Raptor Lake SoC to the ACPI DPTF driver
(Srinivas Pandruvada)"

* tag 'acpi-5.17-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: DPTF: Support Raptor Lake
ACPI: CPPC: Drop redundant local variable from cpc_read()
ACPI: CPPC: Fix up I/O port access in cpc_read()

Linus Torvalds 71f1b916 0809edba

+16 -5
+6 -5
drivers/acpi/cppc_acpi.c
··· 915 915 916 916 static int cpc_read(int cpu, struct cpc_register_resource *reg_res, u64 *val) 917 917 { 918 - int ret_val = 0; 919 918 void __iomem *vaddr = NULL; 920 919 int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpu); 921 920 struct cpc_reg *reg = &reg_res->cpc_entry.reg; 922 921 923 922 if (reg_res->type == ACPI_TYPE_INTEGER) { 924 923 *val = reg_res->cpc_entry.int_value; 925 - return ret_val; 924 + return 0; 926 925 } 927 926 928 927 *val = 0; 929 928 930 929 if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_IO) { 931 930 u32 width = 8 << (reg->access_width - 1); 931 + u32 val_u32; 932 932 acpi_status status; 933 933 934 934 status = acpi_os_read_port((acpi_io_address)reg->address, 935 - (u32 *)val, width); 935 + &val_u32, width); 936 936 if (ACPI_FAILURE(status)) { 937 937 pr_debug("Error: Failed to read SystemIO port %llx\n", 938 938 reg->address); 939 939 return -EFAULT; 940 940 } 941 941 942 + *val = val_u32; 942 943 return 0; 943 944 } else if (reg->space_id == ACPI_ADR_SPACE_PLATFORM_COMM && pcc_ss_id >= 0) 944 945 vaddr = GET_PCC_VADDR(reg->address, pcc_ss_id); ··· 967 966 default: 968 967 pr_debug("Error: Cannot read %u bit width from PCC for ss: %d\n", 969 968 reg->bit_width, pcc_ss_id); 970 - ret_val = -EFAULT; 969 + return -EFAULT; 971 970 } 972 971 973 - return ret_val; 972 + return 0; 974 973 } 975 974 976 975 static int cpc_write(int cpu, struct cpc_register_resource *reg_res, u64 val)
+1
drivers/acpi/dptf/dptf_pch_fivr.c
··· 151 151 static const struct acpi_device_id pch_fivr_device_ids[] = { 152 152 {"INTC1045", 0}, 153 153 {"INTC1049", 0}, 154 + {"INTC10A3", 0}, 154 155 {"", 0}, 155 156 }; 156 157 MODULE_DEVICE_TABLE(acpi, pch_fivr_device_ids);
+2
drivers/acpi/dptf/dptf_power.c
··· 231 231 {"INTC1050", 0}, 232 232 {"INTC1060", 0}, 233 233 {"INTC1061", 0}, 234 + {"INTC10A4", 0}, 235 + {"INTC10A5", 0}, 234 236 {"", 0}, 235 237 }; 236 238 MODULE_DEVICE_TABLE(acpi, int3407_device_ids);
+6
drivers/acpi/dptf/int340x_thermal.c
··· 37 37 {"INTC1050"}, 38 38 {"INTC1060"}, 39 39 {"INTC1061"}, 40 + {"INTC10A0"}, 41 + {"INTC10A1"}, 42 + {"INTC10A2"}, 43 + {"INTC10A3"}, 44 + {"INTC10A4"}, 45 + {"INTC10A5"}, 40 46 {""}, 41 47 }; 42 48
+1
drivers/acpi/fan.h
··· 10 10 {"INT3404", }, /* Fan */ \ 11 11 {"INTC1044", }, /* Fan for Tiger Lake generation */ \ 12 12 {"INTC1048", }, /* Fan for Alder Lake generation */ \ 13 + {"INTC10A2", }, /* Fan for Raptor Lake generation */ \ 13 14 {"PNP0C0B", } /* Generic ACPI fan */