linux-kernel - [PATCH v3 4/6] clocksource: move some enums to arm_arch

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue,  2 Feb 2016 04:26:56 +0800
From:	fu.wei@...aro.org
To:	rjw@...ysocki.net, lenb@...nel.org, daniel.lezcano@...aro.org,
	tglx@...utronix.de, christoffer.dall@...aro.org,
	marc.zyngier@....com, gleb@...nel.org, pbonzini@...hat.com,
	hanjun.guo@...aro.org, wei@...hat.com,
	a.spyridakis@...tualopensystems.com
Cc:	linaro-acpi@...ts.linaro.org, linux-kernel@...r.kernel.org,
	linux-acpi@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
	kvmarm@...ts.cs.columbia.edu, kvm@...r.kernel.org,
	al.stone@...aro.org, graeme.gregory@...aro.org,
	davem@...emloft.net, jeffrey.t.kirsher@...el.com,
	richardcochran@...il.com, arnd@...db.de, wim@...ana.be,
	jcm@...hat.com, leo.duran@....com, mark.rutland@....com,
	catalin.marinas@....com, will.deacon@....com,
	Suravee.Suthikulpanit@....com, robherring2@...il.com,
	Fu Wei <fu.wei@...aro.org>
Subject: [PATCH v3 4/6] clocksource: move some enums to arm_arch_timer.h

From: Fu Wei <fu.wei@...aro.org>

The patch move enum ppi_nr from arm_arch_timer.c
to arm_arch_timer.h, and add enum spi_nr.

Signed-off-by: Fu Wei <fu.wei@...aro.org>
---
 drivers/clocksource/arm_arch_timer.c | 13 ++-----------
 include/clocksource/arm_arch_timer.h | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 3792fd6..90d17ef 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -52,15 +52,6 @@ struct arch_timer {
 #define to_arch_timer(e) container_of(e, struct arch_timer, evt)
 
 static u32 arch_timer_rate;
-
-enum ppi_nr {
-	PHYS_SECURE_PPI,
-	PHYS_NONSECURE_PPI,
-	VIRT_PPI,
-	HYP_PPI,
-	MAX_TIMER_PPI
-};
-
 static int arch_timer_ppi[MAX_TIMER_PPI];
 
 static struct clock_event_device __percpu *arch_timer_evt;
@@ -798,9 +789,9 @@ static void __init arch_timer_mem_init(struct device_node *np)
 	}
 
 	if (arch_timer_mem_use_virtual)
-		irq = irq_of_parse_and_map(best_frame, 1);
+		irq = irq_of_parse_and_map(best_frame, VIRT_SPI);
 	else
-		irq = irq_of_parse_and_map(best_frame, 0);
+		irq = irq_of_parse_and_map(best_frame, PHYS_SPI);
 	of_node_put(best_frame);
 	if (!irq) {
 		pr_err("arch_timer: Frame missing %s irq",
diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h
index 7a6d6dc..7bb5c1e 100644
--- a/include/clocksource/arm_arch_timer.h
+++ b/include/clocksource/arm_arch_timer.h
@@ -32,6 +32,20 @@ enum arch_timer_reg {
 	ARCH_TIMER_REG_TVAL,
 };
 
+enum ppi_nr {
+	PHYS_SECURE_PPI,
+	PHYS_NONSECURE_PPI,
+	VIRT_PPI,
+	HYP_PPI,
+	MAX_TIMER_PPI
+};
+
+enum spi_nr {
+	PHYS_SPI,
+	VIRT_SPI,
+	MAX_TIMER_SPI
+};
+
 #define ARCH_TIMER_PHYS_ACCESS		0
 #define ARCH_TIMER_VIRT_ACCESS		1
 #define ARCH_TIMER_MEM_PHYS_ACCESS	2
-- 
2.5.0