Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'acpi-4.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki:
"This fixes an out of bounds warning from KASAN in the ACPI CPPC
driver"
* tag 'acpi-4.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / CPPC: Fix KASAN global out of bounds warning
+15
-8
+15
-8
drivers/acpi/cppc_acpi.c
+15
-8
drivers/acpi/cppc_acpi.c
···
949
949
}
950
950
951
951
*val = 0;
952
-
if (reg->space_id == ACPI_ADR_SPACE_PLATFORM_COMM)
952
+
if (reg->space_id == ACPI_ADR_SPACE_PLATFORM_COMM && pcc_ss_id >= 0)
953
953
vaddr = GET_PCC_VADDR(reg->address, pcc_ss_id);
954
954
else if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
955
955
vaddr = reg_res->sys_mem_vaddr;
···
988
988
int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpu);
989
989
struct cpc_reg *reg = ®_res->cpc_entry.reg;
990
990
991
-
if (reg->space_id == ACPI_ADR_SPACE_PLATFORM_COMM)
991
+
if (reg->space_id == ACPI_ADR_SPACE_PLATFORM_COMM && pcc_ss_id >= 0)
992
992
vaddr = GET_PCC_VADDR(reg->address, pcc_ss_id);
993
993
else if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
994
994
vaddr = reg_res->sys_mem_vaddr;
···
1035
1035
*lowest_non_linear_reg, *nominal_reg;
1036
1036
u64 high, low, nom, min_nonlinear;
1037
1037
int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpunum);
1038
-
struct cppc_pcc_data *pcc_ss_data = pcc_data[pcc_ss_id];
1038
+
struct cppc_pcc_data *pcc_ss_data;
1039
1039
int ret = 0, regs_in_pcc = 0;
1040
1040
1041
-
if (!cpc_desc) {
1041
+
if (!cpc_desc || pcc_ss_id < 0) {
1042
1042
pr_debug("No CPC descriptor for CPU:%d\n", cpunum);
1043
1043
return -ENODEV;
1044
1044
}
1045
1045
1046
+
pcc_ss_data = pcc_data[pcc_ss_id];
1046
1047
highest_reg = &cpc_desc->cpc_regs[HIGHEST_PERF];
1047
1048
lowest_reg = &cpc_desc->cpc_regs[LOWEST_PERF];
1048
1049
lowest_non_linear_reg = &cpc_desc->cpc_regs[LOW_NON_LINEAR_PERF];
···
1096
1095
struct cpc_register_resource *delivered_reg, *reference_reg,
1097
1096
*ref_perf_reg, *ctr_wrap_reg;
1098
1097
int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpunum);
1099
-
struct cppc_pcc_data *pcc_ss_data = pcc_data[pcc_ss_id];
1098
+
struct cppc_pcc_data *pcc_ss_data;
1100
1099
u64 delivered, reference, ref_perf, ctr_wrap_time;
1101
1100
int ret = 0, regs_in_pcc = 0;
1102
1101
1103
-
if (!cpc_desc) {
1102
+
if (!cpc_desc || pcc_ss_id < 0) {
1104
1103
pr_debug("No CPC descriptor for CPU:%d\n", cpunum);
1105
1104
return -ENODEV;
1106
1105
}
1107
1106
1107
+
pcc_ss_data = pcc_data[pcc_ss_id];
1108
1108
delivered_reg = &cpc_desc->cpc_regs[DELIVERED_CTR];
1109
1109
reference_reg = &cpc_desc->cpc_regs[REFERENCE_CTR];
1110
1110
ref_perf_reg = &cpc_desc->cpc_regs[REFERENCE_PERF];
···
1174
1172
struct cppc_pcc_data *pcc_ss_data = pcc_data[pcc_ss_id];
1175
1173
int ret = 0;
1176
1174
1177
-
if (!cpc_desc) {
1175
+
if (!cpc_desc || pcc_ss_id < 0) {
1178
1176
pr_debug("No CPC descriptor for CPU:%d\n", cpu);
1179
1177
return -ENODEV;
1180
1178
}
1181
1179
1180
+
pcc_ss_data = pcc_data[pcc_ss_id];
1182
1181
desired_reg = &cpc_desc->cpc_regs[DESIRED_PERF];
1183
1182
1184
1183
/*
···
1304
1301
struct cpc_desc *cpc_desc;
1305
1302
struct cpc_register_resource *desired_reg;
1306
1303
int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpu_num);
1307
-
struct cppc_pcc_data *pcc_ss_data = pcc_data[pcc_ss_id];
1304
+
struct cppc_pcc_data *pcc_ss_data;
1308
1305
1309
1306
cpc_desc = per_cpu(cpc_desc_ptr, cpu_num);
1310
1307
if (!cpc_desc)
···
1314
1311
if (!CPC_IN_PCC(desired_reg))
1315
1312
return CPUFREQ_ETERNAL;
1316
1313
1314
+
if (pcc_ss_id < 0)
1315
+
return CPUFREQ_ETERNAL;
1316
+
1317
+
pcc_ss_data = pcc_data[pcc_ss_id];
1317
1318
if (pcc_ss_data->pcc_mpar)
1318
1319
latency_ns = 60 * (1000 * 1000 * 1000 / pcc_ss_data->pcc_mpar);
1319
1320