Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm/broadcom use arm_cpu_mpidr() and fix arm64 builds.
details: https://anonhg.NetBSD.org/src/rev/14229fa75fe7
branches: trunk
changeset: 848187:14229fa75fe7
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Jan 20 06:55:35 2020 +0000
description:
use arm_cpu_mpidr() and fix arm64 builds.
diffstat:
sys/arch/arm/broadcom/bcm2835_intr.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diffs (63 lines):
diff -r a795d8cc743d -r 14229fa75fe7 sys/arch/arm/broadcom/bcm2835_intr.c
--- a/sys/arch/arm/broadcom/bcm2835_intr.c Mon Jan 20 06:50:34 2020 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_intr.c Mon Jan 20 06:55:35 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_intr.c,v 1.30 2020/01/19 16:53:20 skrll Exp $ */
+/* $NetBSD: bcm2835_intr.c,v 1.31 2020/01/20 06:55:35 mrg Exp $ */
/*-
* Copyright (c) 2012, 2015, 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.30 2020/01/19 16:53:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.31 2020/01/20 06:55:35 mrg Exp $");
#define _INTR_PRIVATE
@@ -337,7 +337,7 @@
{
struct cpu_info * const ci = curcpu();
const int oldipl = ci->ci_cpl;
- const cpuid_t cpuid = __SHIFTOUT(ci->ci_mpidr, MPIDR_AFF0);
+ const cpuid_t cpuid = __SHIFTOUT(arm_cpu_mpidr(ci), MPIDR_AFF0);
const uint32_t oldipl_mask = __BIT(oldipl);
int ipl_mask = 0;
@@ -700,7 +700,7 @@
bcm2836mp_pic_find_pending_irqs(struct pic_softc *pic)
{
struct cpu_info * const ci = curcpu();
- const cpuid_t cpuid = __SHIFTOUT(ci->ci_mpidr, MPIDR_AFF0);
+ const cpuid_t cpuid = __SHIFTOUT(arm_cpu_mpidr(ci), MPIDR_AFF0);
uint32_t lpending;
int ipl = 0;
@@ -741,7 +741,7 @@
#if defined(MULTIPROCESSOR)
static void bcm2836mp_cpu_init(struct pic_softc *pic, struct cpu_info *ci)
{
- const cpuid_t cpuid = __SHIFTOUT(ci->ci_mpidr, MPIDR_AFF0);
+ const cpuid_t cpuid = __SHIFTOUT(arm_cpu_mpidr(ci), MPIDR_AFF0);
KASSERT(cpuid < BCM2836_NCPUS);
@@ -768,7 +768,7 @@
bcm2836mp_ipi_handler(void *priv)
{
const struct cpu_info *ci = curcpu();
- const cpuid_t cpuid = __SHIFTOUT(ci->ci_mpidr, MPIDR_AFF0);
+ const cpuid_t cpuid = __SHIFTOUT(arm_cpu_mpidr(ci), MPIDR_AFF0);
uint32_t ipimask, bit;
KASSERT(cpuid < BCM2836_NCPUS);
@@ -817,7 +817,7 @@
static void
bcm2836mp_intr_init(void *priv, struct cpu_info *ci)
{
- const cpuid_t cpuid = __SHIFTOUT(ci->ci_mpidr, MPIDR_AFF0);
+ const cpuid_t cpuid = __SHIFTOUT(arm_cpu_mpidr(ci), MPIDR_AFF0);
struct pic_softc * const pic = &bcm2836mp_pic[cpuid];
KASSERT(cpuid < BCM2836_NCPUS);
Home |
Main Index |
Thread Index |
Old Index