Module Name: src
Committed By: skrll
Date: Mon Jan 21 08:04:26 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: cpu.c
src/sys/arch/arm/fdt: pmu_fdt.c
src/sys/arch/mips/mips: cpu_subr.c
Log Message:
Use ci_{package,core,smt}_id instead of ci_data.cpu_{package,core,smt}_id
NFC
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/aarch64/aarch64/cpu.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/fdt/pmu_fdt.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/mips/mips/cpu_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/cpu.c
diff -u src/sys/arch/aarch64/aarch64/cpu.c:1.15 src/sys/arch/aarch64/aarch64/cpu.c:1.16
--- src/sys/arch/aarch64/aarch64/cpu.c:1.15 Fri Dec 21 08:01:01 2018
+++ src/sys/arch/aarch64/aarch64/cpu.c Mon Jan 21 08:04:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.15 2018/12/21 08:01:01 ryo Exp $ */
+/* $NetBSD: cpu.c,v 1.16 2019/01/21 08:04:26 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.15 2018/12/21 08:01:01 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.16 2019/01/21 08:04:26 skrll Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -144,12 +144,12 @@ cpu_attach(device_t dv, cpuid_t id)
mpidr = ci->ci_id.ac_mpidr;
if (mpidr & MPIDR_MT) {
- ci->ci_data.cpu_smt_id = __SHIFTOUT(mpidr, MPIDR_AFF0);
- ci->ci_data.cpu_core_id = __SHIFTOUT(mpidr, MPIDR_AFF1);
- ci->ci_data.cpu_package_id = __SHIFTOUT(mpidr, MPIDR_AFF2);
+ ci->ci_smt_id = __SHIFTOUT(mpidr, MPIDR_AFF0);
+ ci->ci_core_id = __SHIFTOUT(mpidr, MPIDR_AFF1);
+ ci->ci_package_id = __SHIFTOUT(mpidr, MPIDR_AFF2);
} else {
- ci->ci_data.cpu_core_id = __SHIFTOUT(mpidr, MPIDR_AFF0);
- ci->ci_data.cpu_package_id = __SHIFTOUT(mpidr, MPIDR_AFF1);
+ ci->ci_core_id = __SHIFTOUT(mpidr, MPIDR_AFF0);
+ ci->ci_package_id = __SHIFTOUT(mpidr, MPIDR_AFF1);
}
ci->ci_dev = dv;
Index: src/sys/arch/arm/fdt/pmu_fdt.c
diff -u src/sys/arch/arm/fdt/pmu_fdt.c:1.4 src/sys/arch/arm/fdt/pmu_fdt.c:1.5
--- src/sys/arch/arm/fdt/pmu_fdt.c:1.4 Sun Aug 12 18:39:59 2018
+++ src/sys/arch/arm/fdt/pmu_fdt.c Mon Jan 21 08:04:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmu_fdt.c,v 1.4 2018/08/12 18:39:59 jmcneill Exp $ */
+/* $NetBSD: pmu_fdt.c,v 1.5 2019/01/21 08:04:26 skrll Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmu_fdt.c,v 1.4 2018/08/12 18:39:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmu_fdt.c,v 1.5 2019/01/21 08:04:26 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -184,8 +184,8 @@ pmu_fdt_intr_distribute(const int phandl
return ENXIO;
for (CPU_INFO_FOREACH(cii, ci)) {
const uint32_t ci_mpidr =
- __SHIFTIN(ci->ci_data.cpu_core_id, MPIDR_AFF0) |
- __SHIFTIN(ci->ci_data.cpu_package_id, MPIDR_AFF1);
+ __SHIFTIN(ci->ci_core_id, MPIDR_AFF0) |
+ __SHIFTIN(ci->ci_package_id, MPIDR_AFF1);
if (ci_mpidr == mpidr) {
kcpuset_set(set, cpu_index(ci));
break;
Index: src/sys/arch/mips/mips/cpu_subr.c
diff -u src/sys/arch/mips/mips/cpu_subr.c:1.33 src/sys/arch/mips/mips/cpu_subr.c:1.34
--- src/sys/arch/mips/mips/cpu_subr.c:1.33 Sun Aug 20 11:06:35 2017
+++ src/sys/arch/mips/mips/cpu_subr.c Mon Jan 21 08:04:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_subr.c,v 1.33 2017/08/20 11:06:35 maxv Exp $ */
+/* $NetBSD: cpu_subr.c,v 1.34 2019/01/21 08:04:26 skrll Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.33 2017/08/20 11:06:35 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.34 2019/01/21 08:04:26 skrll Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@@ -182,9 +182,9 @@ cpu_info_alloc(struct pmap_tlb_info *ti,
KASSERT(cpu_id != 0);
ci->ci_cpuid = cpu_id;
ci->ci_pmap_kern_segtab = &pmap_kern_segtab,
- ci->ci_data.cpu_package_id = cpu_package_id;
- ci->ci_data.cpu_core_id = cpu_core_id;
- ci->ci_data.cpu_smt_id = cpu_smt_id;
+ ci->ci_package_id = cpu_package_id;
+ ci->ci_core_id = cpu_core_id;
+ ci->ci_smt_id = cpu_smt_id;
ci->ci_cpu_freq = cpu_info_store.ci_cpu_freq;
ci->ci_cctr_freq = cpu_info_store.ci_cctr_freq;
ci->ci_cycles_per_hz = cpu_info_store.ci_cycles_per_hz;
