Skip to content

Commit 11db741

Browse files
author
Marc Zyngier
committed
irqchip/apple-aic: Move PMU-specific registers to their own include file
As we are about to have a PMU driver, move the PMU bits from the AIC driver into a common include file. Reviewed-by: Hector Martin <marcan@marcan.st> Signed-off-by: Marc Zyngier <maz@kernel.org>
1 parent 0f522ef commit 11db741

2 files changed

Lines changed: 20 additions & 10 deletions

File tree

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
3+
#ifndef __ASM_APPLE_M1_PMU_h
4+
#define __ASM_APPLE_M1_PMU_h
5+
6+
#include <linux/bits.h>
7+
#include <asm/sysreg.h>
8+
9+
/* Core PMC control register */
10+
#define SYS_IMP_APL_PMCR0_EL1 sys_reg(3, 1, 15, 0, 0)
11+
#define PMCR0_IMODE GENMASK(10, 8)
12+
#define PMCR0_IMODE_OFF 0
13+
#define PMCR0_IMODE_PMI 1
14+
#define PMCR0_IMODE_AIC 2
15+
#define PMCR0_IMODE_HALT 3
16+
#define PMCR0_IMODE_FIQ 4
17+
#define PMCR0_IACT BIT(11)
18+
19+
#endif /* __ASM_APPLE_M1_PMU_h */

drivers/irqchip/irq-apple-aic.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
#include <linux/limits.h>
5656
#include <linux/of_address.h>
5757
#include <linux/slab.h>
58+
#include <asm/apple_m1_pmu.h>
5859
#include <asm/exception.h>
5960
#include <asm/sysreg.h>
6061
#include <asm/virt.h>
@@ -109,16 +110,6 @@
109110
* Note: sysreg-based IPIs are not supported yet.
110111
*/
111112

112-
/* Core PMC control register */
113-
#define SYS_IMP_APL_PMCR0_EL1 sys_reg(3, 1, 15, 0, 0)
114-
#define PMCR0_IMODE GENMASK(10, 8)
115-
#define PMCR0_IMODE_OFF 0
116-
#define PMCR0_IMODE_PMI 1
117-
#define PMCR0_IMODE_AIC 2
118-
#define PMCR0_IMODE_HALT 3
119-
#define PMCR0_IMODE_FIQ 4
120-
#define PMCR0_IACT BIT(11)
121-
122113
/* IPI request registers */
123114
#define SYS_IMP_APL_IPI_RR_LOCAL_EL1 sys_reg(3, 5, 15, 0, 0)
124115
#define SYS_IMP_APL_IPI_RR_GLOBAL_EL1 sys_reg(3, 5, 15, 0, 1)

0 commit comments

Comments
 (0)