x86: Cleanup Numachip support
Subsystems (2)
PATCH 1/4 x86: Cleanup Numachip support
Drop unused code and includes in Numachip header files and APIC driver.
Additionally, use the 'numachip1' prefix on Numachip1-specific functions; this prepares for adding Numachip2 support in later patches.
--- arch/x86/include/asm/numachip/numachip_csr.h | 118 +-------------------------- arch/x86/kernel/apic/apic_numachip.c | 103 ++++++++++------------- 2 files changed, 43 insertions(+), 178 deletions(-)
arch/x86/include/asm/numachip/numachip_csr.h +2 -116
@@ -14,12 +14,7 @@#ifndef _ASM_X86_NUMACHIP_NUMACHIP_CSR_H#define _ASM_X86_NUMACHIP_NUMACHIP_CSR_H -#include <linux/numa.h> -#include <linux/percpu.h> #include <linux/io.h> -#include <linux/swab.h> -#include <asm/types.h> -#include <asm/processor.h> #define CSR_NODE_SHIFT 16#define CSR_NODE_BITS (p) (((unsigned long)(p)) << CSR_NODE_SHIFT)
@@ -27,11 +22,8 @@/* 32K CSR space, b15 indicates geo/non-geo */ #define CSR_OFFSET_MASK 0x7fffUL - -/* Global CSR space covers all 4K possible nodes with 64K CSR space per node */ -#define NUMACHIP_GCSR_BASE 0x3fff00000000ULL -#define NUMACHIP_GCSR_LIM 0x3fff0fffffffULL -#define NUMACHIP_GCSR_SIZE (NUMACHIP_GCSR_LIM - NUMACHIP_GCSR_BASE + 1) +#define CSR_G0_NODE_IDS (0x008 + (0 << 12)) +#define CSR_G3_EXT_IRQ_GEN (0x030 + (3 << 12))/* * Local CSR space starts in global CSR space with "nodeid" = 0xfff0, however
@@ -42,28 +34,12 @@#define NUMACHIP_LCSR_LIM 0x3fffffffffffULL#define NUMACHIP_LCSR_SIZE (NUMACHIP_LCSR_LIM - NUMACHIP_LCSR_BASE + 1) -static inline void *gcsr_address (int node,unsigned long offset) -{ -return __va (NUMACHIP_GCSR_BASE | (1UL <<15 ) | -CSR_NODE_BITS (node &CSR_NODE_MASK ) | (offset &CSR_OFFSET_MASK )); -} -static inline void *lcsr_address (unsigned long offset) {return __va (NUMACHIP_LCSR_BASE | (1UL <<15 ) |CSR_NODE_BITS (0xfff0 ) | (offset &CSR_OFFSET_MASK )); } -static inline unsigned int read_gcsr (int node,unsigned long offset) -{ -return swab32 (readl (gcsr_address (node, offset))); -} - -static inline void write_gcsr (int node,unsigned long offset,unsigned int val) -{ -writel (swab32 (val),gcsr_address (node, offset)); -} -static inline unsigned int read_lcsr (unsigned long offset) {return swab32 (readl (lcsr_address (offset)));
@@ -74,94 +50,4 @@ static inline void write_lcsr(unsigned long offset, unsigned int val) writel(swab32(val), lcsr_address(offset)); } -/* ========================================================================= */ -/* CSR_G0_STATE_CLEAR */ -/* ========================================================================= */ - -#define CSR_G0_STATE_CLEAR (0x000 + (0 << 12)) -union numachip_csr_g0_state_clear { -unsigned int v; -struct numachip_csr_g0_state_clear_s { -unsigned int _state:2 ; -unsigned int _rsvd_2_6:5 ; -unsigned int _lost:1 ; -unsigned int _rsvd_8_31:24 ; - } s; -}; - -/* ========================================================================= */ -/* CSR_G0_NODE_IDS */ -/* ========================================================================= */ - -#define CSR_G0_NODE_IDS (0x008 + (0 << 12)) -union numachip_csr_g0_node_ids { -unsigned int v; -struct numachip_csr_g0_node_ids_s { -unsigned int _initialid:16 ; -unsigned int _nodeid:12 ; -unsigned int _rsvd_28_31:4 ; - } s; -}; - -/* ========================================================================= */ -/* CSR_G3_EXT_IRQ_GEN */ -/* ========================================================================= */ - -#define CSR_G3_EXT_IRQ_GEN (0x030 + (3 << 12)) -union numachip_csr_g3_ext_irq_gen { -unsigned int v; -struct numachip_csr_g3_ext_irq_gen_s { -unsigned int _vector:8 ; -unsigned int _msgtype:3 ; -unsigned int _index:5 ; -unsigned int _destination_apic_id:16 ; - } s; -}; - -/* ========================================================================= */ -/* CSR_G3_EXT_IRQ_STATUS */ -/* ========================================================================= */ - -#define CSR_G3_EXT_IRQ_STATUS (0x034 + (3 << 12)) -union numachip_csr_g3_ext_irq_status { -unsigned int v; -struct numachip_csr_g3_ext_irq_status_s { -unsigned int _result:32 ; - } s; -}; - -/* ========================================================================= */ -/* CSR_G3_EXT_IRQ_DEST */ -/* ========================================================================= */ - -#define CSR_G3_EXT_IRQ_DEST (0x038 + (3 << 12)) -union numachip_csr_g3_ext_irq_dest { -unsigned int v; -struct numachip_csr_g3_ext_irq_dest_s { -unsigned int _irq:8 ; -unsigned int _rsvd_8_31:24 ; - } s; -}; - -/* ========================================================================= */ -/* CSR_G3_NC_ATT_MAP_SELECT */ -/* ========================================================================= */ - -#define CSR_G3_NC_ATT_MAP_SELECT (0x7fc + (3 << 12)) -union numachip_csr_g3_nc_att_map_select { -unsigned int v; -struct numachip_csr_g3_nc_att_map_select_s { -unsigned int _upper_address_bits:4 ; -unsigned int _select_ram:4 ; -unsigned int _rsvd_8_31:24 ; - } s; -}; - -/* ========================================================================= */ -/* CSR_G3_NC_ATT_MAP_SELECT_0-255 */ -/* ========================================================================= */ - -#define CSR_G3_NC_ATT_MAP_SELECT_0 (0x800 + (3 << 12)) -#endif /* _ASM_X86_NUMACHIP_NUMACHIP_CSR_H */ -
arch/x86/kernel/apic/apic_numachip.c +42 -62
189 lines not on this page · raw message
Signature · 1 line
2.5.0
PATCH 2/4 x86: Add Numachip2 APIC support
Introduce support for Numachip2 remote interrupts via detecting the right ACPI SRAT signature.
Access is performed via a fixed mapping in the x86 physical address space.
--- arch/x86/include/asm/numachip/numachip.h | 1 + arch/x86/include/asm/numachip/numachip_csr.h | 34 ++++++++++ arch/x86/kernel/apic/apic_numachip.c | 93 ++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+)
arch/x86/include/asm/numachip/numachip.h +1 -0
@@ -14,6 +14,7 @@#ifndef _ASM_X86_NUMACHIP_NUMACHIP_H#define _ASM_X86_NUMACHIP_NUMACHIP_H +extern u8 numachip_system;extern int __init pci_numachip_init (void );#endif /* _ASM_X86_NUMACHIP_NUMACHIP_H */
arch/x86/include/asm/numachip/numachip_csr.h +35 -0
@@ -14,6 +14,7 @@#ifndef _ASM_X86_NUMACHIP_NUMACHIP_CSR_H#define _ASM_X86_NUMACHIP_NUMACHIP_CSR_H +#include <linux/smp.h> #include <linux/io.h> #define CSR_NODE_SHIFT 16
@@ -50,4 +51,38 @@ static inline void write_lcsr(unsigned long offset, unsigned int val) writel(swab32(val), lcsr_address(offset)); } +/* +* On NumaChip2, local CSR space is 16MB and starts at fixed offset below 4G +*/ + +#define NUMACHIP2_LCSR_BASE 0xf0000000UL +#define NUMACHIP2_LCSR_SIZE 0x1000000UL +#define NUMACHIP2_APIC_ICR 0x100000 + +static inline void __iomem *numachip2_lcsr_address (unsigned long offset) +{ +return (void __iomem *)__va (NUMACHIP2_LCSR_BASE | + (offset & (NUMACHIP2_LCSR_SIZE -1 ))); +} + +static inline u32 numachip2_read32_lcsr (unsigned long offset) +{ +return readl (numachip2_lcsr_address (offset)); +} + +static inline u64 numachip2_read64_lcsr (unsigned long offset) +{ +return readq (numachip2_lcsr_address (offset)); +} + +static inline void numachip2_write32_lcsr (unsigned long offset,u32 val) +{ +writel (val,numachip2_lcsr_address (offset)); +} + +static inline void numachip2_write64_lcsr (unsigned long offset,u64 val) +{ +writeq (val,numachip2_lcsr_address (offset)); +} +#endif /* _ASM_X86_NUMACHIP_NUMACHIP_CSR_H */
arch/x86/kernel/apic/apic_numachip.c +93 -0
132 lines not on this page · raw message
Signature · 1 line
2.5.0
tip-bot for Daniel J Blueman
merge bot[tip:x86/apic] x86/numachip: Add Numachip2 APIC support
x86/numachip: Add Numachip2 APIC support
Commit-ID: d9d4dee6cedfa17e5eedcba242dca3091bf73bc3 Gitweb: http://git.kernel.org/tip/d9d4dee6cedfa17e5eedcba242dca3091bf73bc3 Author: Daniel J Blueman <[email protected]> AuthorDate: Mon, 21 Sep 2015 01:02:00 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 22 Sep 2015 22:25:33 +0200
x86/numachip: Add Numachip2 APIC support
Introduce support for Numachip2 remote interrupts via detecting the right ACPI SRAT signature.
Access is performed via a fixed mapping in the x86 physical address space.
--- arch/x86/include/asm/numachip/numachip.h | 1 + arch/x86/include/asm/numachip/numachip_csr.h | 35 +++++++++++ arch/x86/kernel/apic/apic_numachip.c | 93 ++++++++++++++++++++++++++++ 3 files changed, 129 insertions(+)
arch/x86/include/asm/numachip/numachip.h +1 -0
@@ -14,6 +14,7 @@#ifndef _ASM_X86_NUMACHIP_NUMACHIP_H#define _ASM_X86_NUMACHIP_NUMACHIP_H +extern u8 numachip_system;extern int __init pci_numachip_init (void );#endif /* _ASM_X86_NUMACHIP_NUMACHIP_H */
arch/x86/include/asm/numachip/numachip_csr.h +35 -0
@@ -14,6 +14,7 @@#ifndef _ASM_X86_NUMACHIP_NUMACHIP_CSR_H#define _ASM_X86_NUMACHIP_NUMACHIP_CSR_H +#include <linux/smp.h> #include <linux/io.h> #define CSR_NODE_SHIFT 16
@@ -50,4 +51,38 @@ static inline void write_lcsr(unsigned long offset, unsigned int val) writel(swab32(val), lcsr_address(offset)); } +/* +* On NumaChip2, local CSR space is 16MB and starts at fixed offset below 4G +*/ + +#define NUMACHIP2_LCSR_BASE 0xf0000000UL +#define NUMACHIP2_LCSR_SIZE 0x1000000UL +#define NUMACHIP2_APIC_ICR 0x100000 + +static inline void __iomem *numachip2_lcsr_address (unsigned long offset) +{ +return (void __iomem *)__va (NUMACHIP2_LCSR_BASE | + (offset & (NUMACHIP2_LCSR_SIZE -1 ))); +} + +static inline u32 numachip2_read32_lcsr (unsigned long offset) +{ +return readl (numachip2_lcsr_address (offset)); +} + +static inline u64 numachip2_read64_lcsr (unsigned long offset) +{ +return readq (numachip2_lcsr_address (offset)); +} + +static inline void numachip2_write32_lcsr (unsigned long offset,u32 val) +{ +writel (val,numachip2_lcsr_address (offset)); +} + +static inline void numachip2_write64_lcsr (unsigned long offset,u64 val) +{ +writeq (val,numachip2_lcsr_address (offset)); +} +#endif /* _ASM_X86_NUMACHIP_NUMACHIP_CSR_H */
arch/x86/kernel/apic/apic_numachip.c +93 -0
132 lines not on this page · raw message
PATCH 3/4 x86: Add Numachip IPI optimisations
In reply to Daniel J BluemanWhen sending IPIs, first check if the non-local part of the source and destination APIC IDs match; if so, send via the local APIC for efficiency.
Secondly, since the AMD BIOS-kernel developer guide states IPI delivery will occur invarient of prior deliver status, avoid polling the delivery status bit for efficiency.
--- arch/x86/include/asm/numachip/numachip_csr.h | 1 + arch/x86/kernel/apic/apic_numachip.c | 36 ++++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 5 deletions(-)
arch/x86/include/asm/numachip/numachip_csr.h +1 -0
@@ -34,6 +34,7 @@#define NUMACHIP_LCSR_BASE 0x3ffffe000000ULL#define NUMACHIP_LCSR_LIM 0x3fffffffffffULL#define NUMACHIP_LCSR_SIZE (NUMACHIP_LCSR_LIM - NUMACHIP_LCSR_BASE + 1) +#define NUMACHIP_LAPIC_BITS 8static inline void *lcsr_address (unsigned long offset) {
arch/x86/kernel/apic/apic_numachip.c +32 -5
@@ -95,9 +95,25 @@ static int numachip_wakeup_secondary(int phys_apicid, unsigned long start_rip)static void numachip_send_IPI_one (int cpu,int vector) { -int apicid =per_cpu (x86_cpu_to_apicid, cpu); +int local_apicid, apicid =per_cpu (x86_cpu_to_apicid, cpu);unsigned int dmode; +preempt_disable (); + local_apicid =__this_cpu_read (x86_cpu_to_apicid); + +/* Send via local APIC where non-local part matches */ +if (!((apicid ^ local_apicid) >>NUMACHIP_LAPIC_BITS )) { +unsigned long flags; + +local_irq_save (flags); +__default_send_IPI_dest_field (apicid, vector, +APIC_DEST_PHYSICAL ); +local_irq_restore (flags); +preempt_enable (); +return ; + } +preempt_enable (); + dmode = (vector ==NMI_VECTOR ) ?APIC_DM_NMI :APIC_DM_FIXED ;numachip_apic_icr_write (apicid, dmode | vector); }
@@ -217,6 +232,17 @@ static int numachip2_acpi_madt_oem_check(char *oem_id, char *oem_table_id)return 1 ; } +/* APIC IPIs are queued */ +static void numachip_apic_wait_icr_idle (void ) +{ +} + +/* APIC NMI IPIs are queued */ +static u32 numachip_safe_apic_wait_icr_idle (void ) +{ +return 0 ; +} +static const struct apic apic_numachip1__refconst = { .name ="NumaConnect system" , .probe = numachip1_probe,
@@ -262,8 +288,8 @@ static const struct apic apic_numachip1 __refconst = { .eoi_write = native_apic_mem_write, .icr_read = native_apic_icr_read, .icr_write = native_apic_icr_write, - .wait_icr_idle = native_apic_wait_icr_idle, - .safe_wait_icr_idle = native_safe_apic_wait_icr_idle, + .wait_icr_idle = numachip_apic_wait_icr_idle, + .safe_wait_icr_idle = numachip_safe_apic_wait_icr_idle, };apic_driver (apic_numachip1);
@@ -313,8 +339,8 @@ static const struct apic apic_numachip2 __refconst = { .eoi_write = native_apic_mem_write, .icr_read = native_apic_icr_read, .icr_write = native_apic_icr_write, - .wait_icr_idle = native_apic_wait_icr_idle, - .safe_wait_icr_idle = native_safe_apic_wait_icr_idle, + .wait_icr_idle = numachip_apic_wait_icr_idle, + .safe_wait_icr_idle = numachip_safe_apic_wait_icr_idle, };apic_driver (apic_numachip2);
Signature · 1 line
2.5.0
tip-bot for Daniel J Blueman
merge bot[tip:x86/apic] x86/numachip: Add Numachip IPI optimisations
x86/numachip: Add Numachip IPI optimisations
Commit-ID: ad03a9c25d258641556c7198e26fd882c741987a Gitweb: http://git.kernel.org/tip/ad03a9c25d258641556c7198e26fd882c741987a Author: Daniel J Blueman <[email protected]> AuthorDate: Mon, 21 Sep 2015 01:02:01 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 22 Sep 2015 22:25:33 +0200
x86/numachip: Add Numachip IPI optimisations
When sending IPIs, first check if the non-local part of the source and destination APIC IDs match; if so, send via the local APIC for efficiency.
Secondly, since the AMD BIOS-kernel developer guide states IPI delivery will occur invarient of prior deliver status, avoid polling the delivery status bit for efficiency.
--- arch/x86/include/asm/numachip/numachip_csr.h | 1 + arch/x86/kernel/apic/apic_numachip.c | 37 ++++++++++++++++++++++++---- 2 files changed, 33 insertions(+), 5 deletions(-)
arch/x86/include/asm/numachip/numachip_csr.h +1 -0
@@ -34,6 +34,7 @@#define NUMACHIP_LCSR_BASE 0x3ffffe000000ULL#define NUMACHIP_LCSR_LIM 0x3fffffffffffULL#define NUMACHIP_LCSR_SIZE (NUMACHIP_LCSR_LIM - NUMACHIP_LCSR_BASE + 1) +#define NUMACHIP_LAPIC_BITS 8static inline void *lcsr_address (unsigned long offset) {
arch/x86/kernel/apic/apic_numachip.c +32 -5
@@ -96,9 +96,25 @@ static int numachip_wakeup_secondary(int phys_apicid, unsigned long start_rip)static void numachip_send_IPI_one (int cpu,int vector) { -int apicid =per_cpu (x86_cpu_to_apicid, cpu); +int local_apicid, apicid =per_cpu (x86_cpu_to_apicid, cpu);unsigned int dmode; +preempt_disable (); + local_apicid =__this_cpu_read (x86_cpu_to_apicid); + +/* Send via local APIC where non-local part matches */ +if (!((apicid ^ local_apicid) >>NUMACHIP_LAPIC_BITS )) { +unsigned long flags; + +local_irq_save (flags); +__default_send_IPI_dest_field (apicid, vector, +APIC_DEST_PHYSICAL ); +local_irq_restore (flags); +preempt_enable (); +return ; + } +preempt_enable (); + dmode = (vector ==NMI_VECTOR ) ?APIC_DM_NMI :APIC_DM_FIXED ;numachip_apic_icr_write (apicid, dmode | vector); }
@@ -218,6 +234,17 @@ static int numachip2_acpi_madt_oem_check(char *oem_id, char *oem_table_id)return 1 ; } +/* APIC IPIs are queued */ +static void numachip_apic_wait_icr_idle (void ) +{ +} + +/* APIC NMI IPIs are queued */ +static u32 numachip_safe_apic_wait_icr_idle (void ) +{ +return 0 ; +} +static const struct apic apic_numachip1__refconst = { .name ="NumaConnect system" , .probe = numachip1_probe,
@@ -263,8 +290,8 @@ static const struct apic apic_numachip1 __refconst = { .eoi_write = native_apic_mem_write, .icr_read = native_apic_icr_read, .icr_write = native_apic_icr_write, - .wait_icr_idle = native_apic_wait_icr_idle, - .safe_wait_icr_idle = native_safe_apic_wait_icr_idle, + .wait_icr_idle = numachip_apic_wait_icr_idle, + .safe_wait_icr_idle = numachip_safe_apic_wait_icr_idle, };apic_driver (apic_numachip1);
@@ -314,8 +341,8 @@ static const struct apic apic_numachip2 __refconst = { .eoi_write = native_apic_mem_write, .icr_read = native_apic_icr_read, .icr_write = native_apic_icr_write, - .wait_icr_idle = native_apic_wait_icr_idle, - .safe_wait_icr_idle = native_safe_apic_wait_icr_idle, + .wait_icr_idle = numachip_apic_wait_icr_idle, + .safe_wait_icr_idle = numachip_safe_apic_wait_icr_idle, };apic_driver (apic_numachip2);
PATCH 4/4 x86: Introduce Numachip2 timer mechanisms
In reply to Daniel J BluemanAdd 1GHz 64-bit Numachip2 clocksource timer support for accurate system-wide timekeeping, as core TSCs are unsynchronised.
Additionally, add a per-core clockevent mechanism that interrupts via the platform IPI vector after a programmed period.
--- arch/x86/include/asm/numachip/numachip_csr.h | 9 +++++++++ drivers/clocksource/Makefile | 1 + 2 files changed, 10 insertions(+)
arch/x86/include/asm/numachip/numachip_csr.h +9 -0
@@ -59,6 +59,10 @@ static inline void write_lcsr(unsigned long offset, unsigned int val)#define NUMACHIP2_LCSR_BASE 0xf0000000UL#define NUMACHIP2_LCSR_SIZE 0x1000000UL#define NUMACHIP2_APIC_ICR 0x100000 +#define NUMACHIP2_TIMER_DEADLINE 0x200000 +#define NUMACHIP2_TIMER_INT 0x200008 +#define NUMACHIP2_TIMER_NOW 0x200018 +#define NUMACHIP2_TIMER_RESET 0x200020static inline void __iomem *numachip2_lcsr_address (unsigned long offset) {
@@ -86,4 +90,9 @@ static inline void numachip2_write64_lcsr(unsigned long offset, u64 val) writeq(val, numachip2_lcsr_address(offset)); } +static inline unsigned int numachip2_timer (void ) +{ +return (smp_processor_id () %48 ) <<6 ; +} +#endif /* _ASM_X86_NUMACHIP_NUMACHIP_CSR_H */
drivers/clocksource/Makefile +1 -0
@@ -62,3 +62,4 @@ obj-$(CONFIG_H8300) += h8300_timer8.o obj-$(CONFIG_H8300_TMR16) += h8300_timer16.o obj-$(CONFIG_H8300_TPU) += h8300_tpu.o obj-$(CONFIG_CLKSRC_ST_LPC) += clksrc_st_lpc.o +obj-$(CONFIG_X86_NUMACHIP) += numachip.o
drivers/clocksource/numachip.c new file +95 -0
95 lines not on this page · raw message
Signature · 1 line
2.5.0
PATCH v2 1/1 x86: Introduce Numachip2 timer mechanisms
Add 1GHz 64-bit Numachip2 clocksource timer support for accurate system-wide timekeeping, as core TSCs are unsynchronised.
Additionally, add a per-core clockevent mechanism that interrupts via the platform IPI vector after a programmed period.
v2: Fix whitespace and wrapping issue
--- arch/x86/include/asm/numachip/numachip_csr.h | 9 +++ drivers/clocksource/Makefile | 1 + drivers/clocksource/numachip.c | 95 ++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 drivers/clocksource/numachip.c
arch/x86/include/asm/numachip/numachip_csr.h +9 -0
@@ -59,6 +59,10 @@ static inline void write_lcsr(unsigned long offset, unsigned int val)#define NUMACHIP2_LCSR_BASE 0xf0000000UL#define NUMACHIP2_LCSR_SIZE 0x1000000UL#define NUMACHIP2_APIC_ICR 0x100000 +#define NUMACHIP2_TIMER_DEADLINE 0x200000 +#define NUMACHIP2_TIMER_INT 0x200008 +#define NUMACHIP2_TIMER_NOW 0x200018 +#define NUMACHIP2_TIMER_RESET 0x200020static inline void __iomem *numachip2_lcsr_address (unsigned long offset) {
@@ -86,4 +90,9 @@ static inline void numachip2_write64_lcsr(unsigned long offset, u64 val) writeq(val, numachip2_lcsr_address(offset)); } +static inline unsigned int numachip2_timer (void ) +{ +return (smp_processor_id () %48 ) <<6 ; +} +#endif /* _ASM_X86_NUMACHIP_NUMACHIP_CSR_H */
drivers/clocksource/Makefile +1 -0
@@ -62,3 +62,4 @@ obj-$(CONFIG_H8300) += h8300_timer8.o obj-$(CONFIG_H8300_TMR16) += h8300_timer16.o obj-$(CONFIG_H8300_TPU) += h8300_tpu.o obj-$(CONFIG_CLKSRC_ST_LPC) += clksrc_st_lpc.o +obj-$(CONFIG_X86_NUMACHIP) += numachip.o
drivers/clocksource/numachip.c new file +95 -0
95 lines not on this page · raw message
Signature · 1 line
2.5.0
tip-bot for Daniel J Blueman
merge bot[tip:x86/apic] x86/numachip: Introduce Numachip2 timer mechanisms
x86/numachip: Introduce Numachip2 timer mechanisms
Commit-ID: ce2e572cfe7b2fc3f0e9da4aa7bc61a2c2c51fc7 Gitweb: http://git.kernel.org/tip/ce2e572cfe7b2fc3f0e9da4aa7bc61a2c2c51fc7 Author: Daniel J Blueman <[email protected]> AuthorDate: Mon, 21 Sep 2015 18:02:25 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 22 Sep 2015 22:25:33 +0200
x86/numachip: Introduce Numachip2 timer mechanisms
Add 1GHz 64-bit Numachip2 clocksource timer support for accurate system-wide timekeeping, as core TSCs are unsynchronised.
Additionally, add a per-core clockevent mechanism that interrupts via the platform IPI vector after a programmed period.
[ tglx: Taking it through x86 due to dependencies ]
--- arch/x86/include/asm/numachip/numachip_csr.h | 9 +++ drivers/clocksource/Makefile | 1 + drivers/clocksource/numachip.c | 95 ++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+)
arch/x86/include/asm/numachip/numachip_csr.h +9 -0
@@ -59,6 +59,10 @@ static inline void write_lcsr(unsigned long offset, unsigned int val)#define NUMACHIP2_LCSR_BASE 0xf0000000UL#define NUMACHIP2_LCSR_SIZE 0x1000000UL#define NUMACHIP2_APIC_ICR 0x100000 +#define NUMACHIP2_TIMER_DEADLINE 0x200000 +#define NUMACHIP2_TIMER_INT 0x200008 +#define NUMACHIP2_TIMER_NOW 0x200018 +#define NUMACHIP2_TIMER_RESET 0x200020static inline void __iomem *numachip2_lcsr_address (unsigned long offset) {
@@ -86,4 +90,9 @@ static inline void numachip2_write64_lcsr(unsigned long offset, u64 val) writeq(val, numachip2_lcsr_address(offset)); } +static inline unsigned int numachip2_timer (void ) +{ +return (smp_processor_id () %48 ) <<6 ; +} +#endif /* _ASM_X86_NUMACHIP_NUMACHIP_CSR_H */
drivers/clocksource/Makefile +1 -0
@@ -62,3 +62,4 @@ obj-$(CONFIG_H8300) += h8300_timer8.o obj-$(CONFIG_H8300_TMR16) += h8300_timer16.o obj-$(CONFIG_H8300_TPU) += h8300_tpu.o obj-$(CONFIG_CLKSRC_ST_LPC) += clksrc_st_lpc.o +obj-$(CONFIG_X86_NUMACHIP) += numachip.o
drivers/clocksource/numachip.c new file +95 -0
95 lines not on this page · raw message
tip-bot for Daniel J Blueman
merge bot[tip:x86/apic] x86/numachip: Cleanup Numachip support
In reply to Daniel J Bluemanx86/numachip: Cleanup Numachip support
Commit-ID: db1003a719d75cebe5843a7906c02c29bec9922c Gitweb: http://git.kernel.org/tip/db1003a719d75cebe5843a7906c02c29bec9922c Author: Daniel J Blueman <[email protected]> AuthorDate: Mon, 21 Sep 2015 01:01:59 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 22 Sep 2015 22:25:32 +0200
x86/numachip: Cleanup Numachip support
Drop unused code and includes in Numachip header files and APIC driver.
Additionally, use the 'numachip1' prefix on Numachip1-specific functions; this prepares for adding Numachip2 support in later patches.
--- arch/x86/include/asm/numachip/numachip_csr.h | 118 +-------------------------- arch/x86/kernel/apic/apic_numachip.c | 104 ++++++++++------------- 2 files changed, 44 insertions(+), 178 deletions(-)
arch/x86/include/asm/numachip/numachip_csr.h +2 -116
@@ -14,12 +14,7 @@#ifndef _ASM_X86_NUMACHIP_NUMACHIP_CSR_H#define _ASM_X86_NUMACHIP_NUMACHIP_CSR_H -#include <linux/numa.h> -#include <linux/percpu.h> #include <linux/io.h> -#include <linux/swab.h> -#include <asm/types.h> -#include <asm/processor.h> #define CSR_NODE_SHIFT 16#define CSR_NODE_BITS (p) (((unsigned long)(p)) << CSR_NODE_SHIFT)
@@ -27,11 +22,8 @@/* 32K CSR space, b15 indicates geo/non-geo */ #define CSR_OFFSET_MASK 0x7fffUL - -/* Global CSR space covers all 4K possible nodes with 64K CSR space per node */ -#define NUMACHIP_GCSR_BASE 0x3fff00000000ULL -#define NUMACHIP_GCSR_LIM 0x3fff0fffffffULL -#define NUMACHIP_GCSR_SIZE (NUMACHIP_GCSR_LIM - NUMACHIP_GCSR_BASE + 1) +#define CSR_G0_NODE_IDS (0x008 + (0 << 12)) +#define CSR_G3_EXT_IRQ_GEN (0x030 + (3 << 12))/* * Local CSR space starts in global CSR space with "nodeid" = 0xfff0, however
@@ -42,28 +34,12 @@#define NUMACHIP_LCSR_LIM 0x3fffffffffffULL#define NUMACHIP_LCSR_SIZE (NUMACHIP_LCSR_LIM - NUMACHIP_LCSR_BASE + 1) -static inline void *gcsr_address (int node,unsigned long offset) -{ -return __va (NUMACHIP_GCSR_BASE | (1UL <<15 ) | -CSR_NODE_BITS (node &CSR_NODE_MASK ) | (offset &CSR_OFFSET_MASK )); -} -static inline void *lcsr_address (unsigned long offset) {return __va (NUMACHIP_LCSR_BASE | (1UL <<15 ) |CSR_NODE_BITS (0xfff0 ) | (offset &CSR_OFFSET_MASK )); } -static inline unsigned int read_gcsr (int node,unsigned long offset) -{ -return swab32 (readl (gcsr_address (node, offset))); -} - -static inline void write_gcsr (int node,unsigned long offset,unsigned int val) -{ -writel (swab32 (val),gcsr_address (node, offset)); -} -static inline unsigned int read_lcsr (unsigned long offset) {return swab32 (readl (lcsr_address (offset)));
@@ -74,94 +50,4 @@ static inline void write_lcsr(unsigned long offset, unsigned int val) writel(swab32(val), lcsr_address(offset)); } -/* ========================================================================= */ -/* CSR_G0_STATE_CLEAR */ -/* ========================================================================= */ - -#define CSR_G0_STATE_CLEAR (0x000 + (0 << 12)) -union numachip_csr_g0_state_clear { -unsigned int v; -struct numachip_csr_g0_state_clear_s { -unsigned int _state:2 ; -unsigned int _rsvd_2_6:5 ; -unsigned int _lost:1 ; -unsigned int _rsvd_8_31:24 ; - } s; -}; - -/* ========================================================================= */ -/* CSR_G0_NODE_IDS */ -/* ========================================================================= */ - -#define CSR_G0_NODE_IDS (0x008 + (0 << 12)) -union numachip_csr_g0_node_ids { -unsigned int v; -struct numachip_csr_g0_node_ids_s { -unsigned int _initialid:16 ; -unsigned int _nodeid:12 ; -unsigned int _rsvd_28_31:4 ; - } s; -}; - -/* ========================================================================= */ -/* CSR_G3_EXT_IRQ_GEN */ -/* ========================================================================= */ - -#define CSR_G3_EXT_IRQ_GEN (0x030 + (3 << 12)) -union numachip_csr_g3_ext_irq_gen { -unsigned int v; -struct numachip_csr_g3_ext_irq_gen_s { -unsigned int _vector:8 ; -unsigned int _msgtype:3 ; -unsigned int _index:5 ; -unsigned int _destination_apic_id:16 ; - } s; -}; - -/* ========================================================================= */ -/* CSR_G3_EXT_IRQ_STATUS */ -/* ========================================================================= */ - -#define CSR_G3_EXT_IRQ_STATUS (0x034 + (3 << 12)) -union numachip_csr_g3_ext_irq_status { -unsigned int v; -struct numachip_csr_g3_ext_irq_status_s { -unsigned int _result:32 ; - } s; -}; - -/* ========================================================================= */ -/* CSR_G3_EXT_IRQ_DEST */ -/* ========================================================================= */ - -#define CSR_G3_EXT_IRQ_DEST (0x038 + (3 << 12)) -union numachip_csr_g3_ext_irq_dest { -unsigned int v; -struct numachip_csr_g3_ext_irq_dest_s { -unsigned int _irq:8 ; -unsigned int _rsvd_8_31:24 ; - } s; -}; - -/* ========================================================================= */ -/* CSR_G3_NC_ATT_MAP_SELECT */ -/* ========================================================================= */ - -#define CSR_G3_NC_ATT_MAP_SELECT (0x7fc + (3 << 12)) -union numachip_csr_g3_nc_att_map_select { -unsigned int v; -struct numachip_csr_g3_nc_att_map_select_s { -unsigned int _upper_address_bits:4 ; -unsigned int _select_ram:4 ; -unsigned int _rsvd_8_31:24 ; - } s; -}; - -/* ========================================================================= */ -/* CSR_G3_NC_ATT_MAP_SELECT_0-255 */ -/* ========================================================================= */ - -#define CSR_G3_NC_ATT_MAP_SELECT_0 (0x800 + (3 << 12)) -#endif /* _ASM_X86_NUMACHIP_NUMACHIP_CSR_H */ -
arch/x86/kernel/apic/apic_numachip.c +42 -62
189 lines not on this page · raw message