Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1558498 > unrolled thread

[PATCH 4/8] x86/platform/UV: Add Support for UV4 Hubless NMIs

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH 4/8] x86/platform/UV: Add Support for UV4 Hubless NMIs Mike Travis <travis@sgi.com> - 2017-01-13 16:40 +0100
    Re: [PATCH 4/8] x86/platform/UV: Add Support for UV4 Hubless NMIs Ingo Molnar <mingo@kernel.org> - 2017-01-14 09:00 +0100
      Re: [PATCH] x86/platform/UV: Clean up the UV APIC code Joe Perches <joe@perches.com> - 2017-01-14 14:20 +0100

#1558498 — [PATCH 4/8] x86/platform/UV: Add Support for UV4 Hubless NMIs

Merge new UV Hubless NMI support into existing UV NMI handler.

Signed-off-by: Mike Travis <travis@sgi.com>
Acked-by: Dimitri Sivanich <sivanich@hpe.com>
Reviewed-by: Russ Anderson <rja@hpe.com>
---
 arch/x86/include/asm/uv/uv_hub.h   |    3 
 arch/x86/kernel/apic/x2apic_uv_x.c |    2 
 arch/x86/platform/uv/uv_nmi.c      |  185 ++++++++++++++++++++++++++++++++++---
 3 files changed, 177 insertions(+), 13 deletions(-)

--- linux.orig/arch/x86/include/asm/uv/uv_hub.h
+++ linux/arch/x86/include/asm/uv/uv_hub.h
@@ -772,6 +772,7 @@ static inline int uv_num_possible_blades
 
 /* Per Hub NMI support */
 extern void uv_nmi_setup(void);
+extern void uv_nmi_setup_hubless(void);
 
 /* BMC sets a bit this MMR non-zero before sending an NMI */
 #define UVH_NMI_MMR		UVH_SCRATCH5
@@ -799,6 +800,8 @@ struct uv_hub_nmi_s {
 	atomic_t	read_mmr_count;	/* count of MMR reads */
 	atomic_t	nmi_count;	/* count of true UV NMIs */
 	unsigned long	nmi_value;	/* last value read from NMI MMR */
+	bool		hub_present;	/* false means UV hubless system */
+	bool		pch_owner;	/* indicates this hub owns PCH */
 };
 
 struct uv_cpu_nmi_s {
--- linux.orig/arch/x86/kernel/apic/x2apic_uv_x.c
+++ linux/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -1529,6 +1529,8 @@ void __init uv_system_init(void)
 		uv_system_init_hub();
 
 	/* Initialize UV hubless system here */
+	else
+		uv_nmi_setup_hubless();
 }
 
 apic_driver(apic_x2apic_uv_x);
--- linux.orig/arch/x86/platform/uv/uv_nmi.c
+++ linux/arch/x86/platform/uv/uv_nmi.c
@@ -67,6 +67,19 @@ static struct uv_hub_nmi_s **uv_hub_nmi_
 DEFINE_PER_CPU(struct uv_cpu_nmi_s, uv_cpu_nmi);
 EXPORT_PER_CPU_SYMBOL_GPL(uv_cpu_nmi);
 
+/* UV hubless values */
+static int *pch_base;
+#define	NMI_CONTROL_PORT	0x70
+#define	NMI_DUMMY_PORT		0x71
+#define	GPI_NMI_STS_GPP_D_0	0x164
+#define	GPI_NMI_ENA_GPP_D_0	0x174
+#define	STS_GPP_D_0_MASK	0x1
+#define	PAD_CFG_DW0_GPP_D_0	0x4c0
+#define	GPIROUTNMI		(1ul << 17)
+#define	PCH_PCR_GPIO_1_BASE	0xfdae0000ul
+#define	PCH_PCR_GPIO_ADDRESS(offset)	\
+	(int *)((unsigned long long)pch_base | offset)
+
 static unsigned long nmi_mmr;
 static unsigned long nmi_mmr_clear;
 static unsigned long nmi_mmr_pending;
@@ -144,6 +157,19 @@ module_param_named(wait_count, uv_nmi_wa
 static int uv_nmi_retry_count = 500;
 module_param_named(retry_count, uv_nmi_retry_count, int, 0644);
 
+static bool uv_pch_intr_enable = true;
+static bool uv_pch_intr_now_enabled;
+module_param_named(pch_intr_enable, uv_pch_intr_enable, bool, 0644);
+
+static int uv_nmi_debug;
+module_param_named(debug, uv_nmi_debug, int, 0644);
+
+#define nmi_debug(fmt, ...)				\
+	do {						\
+		if (uv_nmi_debug)			\
+			pr_info(fmt, ##__VA_ARGS__);	\
+	} while (0)
+
 /*
  * Valid NMI Actions:
  *  "dump"	- dump process stack for each cpu
@@ -192,6 +218,78 @@ static inline void uv_local_mmr_clear_nm
 }
 
 /*
+ * UV hubless NMI handler functions
+ */
+static inline void uv_reassert_nmi(void)
+{
+	/* (from arch/x86/include/asm/mach_traps.h) */
+	outb(0x8f, NMI_CONTROL_PORT);
+	inb(NMI_DUMMY_PORT);		/* dummy read */
+	outb(0x0f, NMI_CONTROL_PORT);
+	inb(NMI_DUMMY_PORT);		/* dummy read */
+}
+
+static void uv_init_hubless_pch_io(int offset, int mask, int data)
+{
+	int *addr = PCH_PCR_GPIO_ADDRESS(offset);
+	int readd = readl(addr);
+
+	if (mask) {			/* OR in new data */
+		int writed = (readd & ~mask) | data;
+
+		nmi_debug("UV:PCH: %p = %x & %x | %x (%x)\n",
+			addr, readd, ~mask, data, writed);
+		writel(writed, addr);
+
+	} else if (readd & data) {	/* clear status bit */
+		nmi_debug("UV:PCH: %p = %x\n", addr, data);
+		writel(data, addr);
+	}
+
+	(void)readl(addr);		/* flush write data */
+}
+
+static void uv_nmi_setup_hubless_intr(void)
+{
+	uv_pch_intr_now_enabled = uv_pch_intr_enable;
+
+	uv_init_hubless_pch_io(
+		PAD_CFG_DW0_GPP_D_0, GPIROUTNMI,
+		uv_pch_intr_now_enabled ? GPIROUTNMI : 0);
+
+	nmi_debug("UV:NMI: GPP_D_0 interrupt %s\n",
+		uv_pch_intr_now_enabled ? "enabled" : "disabled");
+}
+
+static int uv_nmi_test_hubless(struct uv_hub_nmi_s *hub_nmi)
+{
+	int *pstat = PCH_PCR_GPIO_ADDRESS(GPI_NMI_STS_GPP_D_0);
+	int status = *pstat;
+
+	hub_nmi->nmi_value = status;
+	atomic_inc(&hub_nmi->read_mmr_count);
+
+	if (!(status & STS_GPP_D_0_MASK))	/* NOT UV external NMI */
+		return 0;
+
+	*pstat = STS_GPP_D_0_MASK;	/* IS UV NMI, clear GPP_D_0 status */
+	(void)*pstat;			/* flush write */
+
+	return 1;
+}
+
+static int uv_test_nmi(struct uv_hub_nmi_s *hub_nmi)
+{
+	if (hub_nmi->hub_present)
+		return uv_nmi_test_mmr(hub_nmi);
+
+	if (hub_nmi->pch_owner)		/* Only PCH owner can check status */
+		return uv_nmi_test_hubless(hub_nmi);
+
+	return -1;
+}
+
+/*
  * If first cpu in on this hub, set hub_nmi "in_nmi" and "owner" values and
  * return true.  If first cpu in on the system, set global "in_nmi" flag.
  */
@@ -214,6 +312,7 @@ static int uv_check_nmi(struct uv_hub_nm
 {
 	int cpu = smp_processor_id();
 	int nmi = 0;
+	int nmi_detected = 0;
 
 	local64_inc(&uv_nmi_count);
 	this_cpu_inc(uv_cpu_nmi.queries);
@@ -224,20 +323,26 @@ static int uv_check_nmi(struct uv_hub_nm
 			break;
 
 		if (raw_spin_trylock(&hub_nmi->nmi_lock)) {
+			nmi_detected = uv_test_nmi(hub_nmi);
 
-			/* check hub MMR NMI flag */
-			if (uv_nmi_test_mmr(hub_nmi)) {
+			/* check flag for UV external NMI */
+			if (nmi_detected > 0) {
 				uv_set_in_nmi(cpu, hub_nmi);
 				nmi = 1;
 				break;
 			}
 
-			/* MMR NMI flag is clear */
+			/* A non-PCH node in a hubless system waits for NMI */
+			else if (nmi_detected < 0)
+				goto slave_wait;
+
+			/* MMR/PCH NMI flag is clear */
 			raw_spin_unlock(&hub_nmi->nmi_lock);
 
 		} else {
+
 			/* wait a moment for the hub nmi locker to set flag */
-			cpu_relax();
+slave_wait:		cpu_relax();
 			udelay(uv_nmi_slave_delay);
 
 			/* re-check hub in_nmi flag */
@@ -246,13 +351,20 @@ static int uv_check_nmi(struct uv_hub_nm
 				break;
 		}
 
-		/* check if this BMC missed setting the MMR NMI flag */
+		/*
+		 * check if this BMC missed setting the MMR NMI flag (or)
+		 * UV hubless system where only PCH owner can check flag
+		 */
 		if (!nmi) {
 			nmi = atomic_read(&uv_in_nmi);
 			if (nmi)
 				uv_set_in_nmi(cpu, hub_nmi);
 		}
 
+		/* if we're holding the hub lock, release it now */
+		if (nmi_detected < 0)
+			raw_spin_unlock(&hub_nmi->nmi_lock);
+
 	} while (0);
 
 	if (!nmi)
@@ -269,7 +381,10 @@ static inline void uv_clear_nmi(int cpu)
 	if (cpu == atomic_read(&hub_nmi->cpu_owner)) {
 		atomic_set(&hub_nmi->cpu_owner, -1);
 		atomic_set(&hub_nmi->in_nmi, 0);
-		uv_local_mmr_clear_nmi();
+		if (hub_nmi->hub_present)
+			uv_local_mmr_clear_nmi();
+		else
+			uv_reassert_nmi();
 		raw_spin_unlock(&hub_nmi->nmi_lock);
 	}
 }
@@ -302,6 +417,7 @@ static int uv_nmi_wait_cpus(int first)
 {
 	int i, j, k, n = num_online_cpus();
 	int last_k = 0, waiting = 0;
+	int cpu = smp_processor_id();
 
 	if (first) {
 		cpumask_copy(uv_nmi_cpu_mask, cpu_online_mask);
@@ -310,6 +426,12 @@ static int uv_nmi_wait_cpus(int first)
 		k = n - cpumask_weight(uv_nmi_cpu_mask);
 	}
 
+	/* PCH NMI causes only one cpu to respond */
+	if (first && uv_pch_intr_now_enabled) {
+		cpumask_clear_cpu(cpu, uv_nmi_cpu_mask);
+		return n - k - 1;
+	}
+
 	udelay(uv_nmi_initial_delay);
 	for (i = 0; i < uv_nmi_retry_count; i++) {
 		int loop_delay = uv_nmi_loop_delay;
@@ -358,7 +480,7 @@ static void uv_nmi_wait(int master)
 			break;
 
 		/* if not all made it in, send IPI NMI to them */
-		pr_alert("UV: Sending NMI IPI to %d non-responding CPUs: %*pbl\n",
+		pr_alert("UV: Sending NMI IPI to %d CPUs: %*pbl\n",
 			 cpumask_weight(uv_nmi_cpu_mask),
 			 cpumask_pr_args(uv_nmi_cpu_mask));
 
@@ -634,6 +756,13 @@ int uv_handle_nmi(unsigned int reason, s
 	else if (uv_nmi_action_is("kdb") || uv_nmi_action_is("kgdb"))
 		uv_call_kgdb_kdb(cpu, regs, master);
 
+	/* Unknown NMI action */
+	else {
+		if (master)
+			pr_alert("UV: unknown NMI action: %s\n", uv_nmi_action);
+		uv_nmi_sync_exit(master);
+	}
+
 	/* Clear per_cpu "in nmi" flag */
 	this_cpu_write(uv_cpu_nmi.state, UV_NMI_STATE_OUT);
 
@@ -648,6 +777,7 @@ int uv_handle_nmi(unsigned int reason, s
 		atomic_set(&uv_nmi_cpu, -1);
 		atomic_set(&uv_in_nmi, 0);
 		atomic_set(&uv_nmi_kexec_failed, 0);
+		atomic_set(&uv_nmi_slave_continue, SLAVE_CLEAR);
 	}
 
 	uv_nmi_touch_watchdogs();
@@ -697,28 +827,57 @@ void uv_nmi_init(void)
 	apic_write(APIC_LVT1, value);
 }
 
-void uv_nmi_setup(void)
+/* Setup hub nmi info */
+void __init uv_nmi_setup_common(bool hubbed)
 {
 	int size = sizeof(void *) * (1 << NODES_SHIFT);
-	int cpu, nid;
+	int cpu;
 
-	/* Setup hub nmi info */
-	uv_nmi_setup_mmrs();
 	uv_hub_nmi_list = kzalloc(size, GFP_KERNEL);
-	pr_info("UV: NMI hub list @ 0x%p (%d)\n", uv_hub_nmi_list, size);
+	nmi_debug("UV: NMI hub list @ 0x%p (%d)\n", uv_hub_nmi_list, size);
 	BUG_ON(!uv_hub_nmi_list);
 	size = sizeof(struct uv_hub_nmi_s);
 	for_each_present_cpu(cpu) {
-		nid = cpu_to_node(cpu);
+		int nid = cpu_to_node(cpu);
 		if (uv_hub_nmi_list[nid] == NULL) {
 			uv_hub_nmi_list[nid] = kzalloc_node(size,
 							    GFP_KERNEL, nid);
 			BUG_ON(!uv_hub_nmi_list[nid]);
 			raw_spin_lock_init(&(uv_hub_nmi_list[nid]->nmi_lock));
 			atomic_set(&uv_hub_nmi_list[nid]->cpu_owner, -1);
+			uv_hub_nmi_list[nid]->hub_present = hubbed;
+			uv_hub_nmi_list[nid]->pch_owner = (nid == 0);
 		}
 		uv_hub_nmi_per(cpu) = uv_hub_nmi_list[nid];
 	}
 	BUG_ON(!alloc_cpumask_var(&uv_nmi_cpu_mask, GFP_KERNEL));
+}
+
+/* setup for UV Hub systems */
+void __init uv_nmi_setup(void)
+{
+	uv_nmi_setup_mmrs();
+	uv_nmi_setup_common(true);
+	uv_register_nmi_notifier();
+	pr_info("UV: Hub NMI enabled\n");
+}
+
+/* setup for UV Hubless systems */
+void __init uv_nmi_setup_hubless(void)
+{
+	uv_nmi_setup_common(false);
+
+	pch_base = xlate_dev_mem_ptr(PCH_PCR_GPIO_1_BASE);
+	nmi_debug("UV: PCH base:%p from 0x%lx, GPP_D_0\n",
+		pch_base, PCH_PCR_GPIO_1_BASE);
+
+	uv_init_hubless_pch_io(GPI_NMI_ENA_GPP_D_0,
+				STS_GPP_D_0_MASK, STS_GPP_D_0_MASK);
+
+	uv_nmi_setup_hubless_intr();
+
+	uv_reassert_nmi();		/* insure NMI enabled in proc inf reg */
+
 	uv_register_nmi_notifier();
+	pr_info("UV: Hubless NMI enabled\n");
 }

-- 

[toc] | [next] | [standalone]

#1558865

* Mike Travis <travis@sgi.com> wrote:

> --- linux.orig/arch/x86/kernel/apic/x2apic_uv_x.c
> +++ linux/arch/x86/kernel/apic/x2apic_uv_x.c
> @@ -1529,6 +1529,8 @@ void __init uv_system_init(void)
>  		uv_system_init_hub();
>  
>  	/* Initialize UV hubless system here */
> +	else
> +		uv_nmi_setup_hubless();

That's not the proper coding style ...

> +++ linux/arch/x86/platform/uv/uv_nmi.c
> @@ -67,6 +67,19 @@ static struct uv_hub_nmi_s **uv_hub_nmi_
>  DEFINE_PER_CPU(struct uv_cpu_nmi_s, uv_cpu_nmi);
>  EXPORT_PER_CPU_SYMBOL_GPL(uv_cpu_nmi);
>  
> +/* UV hubless values */
> +static int *pch_base;
> +#define	NMI_CONTROL_PORT	0x70

Ditto...

> +#define	NMI_DUMMY_PORT		0x71
> +#define	GPI_NMI_STS_GPP_D_0	0x164
> +#define	GPI_NMI_ENA_GPP_D_0	0x174
> +#define	STS_GPP_D_0_MASK	0x1
> +#define	PAD_CFG_DW0_GPP_D_0	0x4c0
> +#define	GPIROUTNMI		(1ul << 17)
> +#define	PCH_PCR_GPIO_1_BASE	0xfdae0000ul
> +#define	PCH_PCR_GPIO_ADDRESS(offset)	\
> +	(int *)((unsigned long long)pch_base | offset)

> +static void uv_init_hubless_pch_io(int offset, int mask, int data)
> +{
> +	int *addr = PCH_PCR_GPIO_ADDRESS(offset);
> +	int readd = readl(addr);
> +
> +	if (mask) {			/* OR in new data */
> +		int writed = (readd & ~mask) | data;
> +
> +		nmi_debug("UV:PCH: %p = %x & %x | %x (%x)\n",
> +			addr, readd, ~mask, data, writed);

No unnecessary linebreaks please.

> +
>  			/* wait a moment for the hub nmi locker to set flag */
> -			cpu_relax();

Please capitalize 'NMI' consistently in all the patches.

> +	/* PCH NMI causes only one cpu to respond */

Same for 'CPU'.

>  	else if (uv_nmi_action_is("kdb") || uv_nmi_action_is("kgdb"))
>  		uv_call_kgdb_kdb(cpu, regs, master);
>  
> +	/* Unknown NMI action */
> +	else {

Sigh ...

> +/* setup for UV Hubless systems */
> +void __init uv_nmi_setup_hubless(void)
> +{
> +	uv_nmi_setup_common(false);
> +
> +	pch_base = xlate_dev_mem_ptr(PCH_PCR_GPIO_1_BASE);
> +	nmi_debug("UV: PCH base:%p from 0x%lx, GPP_D_0\n",
> +		pch_base, PCH_PCR_GPIO_1_BASE);
> +
> +	uv_init_hubless_pch_io(GPI_NMI_ENA_GPP_D_0,
> +				STS_GPP_D_0_MASK, STS_GPP_D_0_MASK);
> +
> +	uv_nmi_setup_hubless_intr();
> +
> +	uv_reassert_nmi();		/* insure NMI enabled in proc inf reg */

And typos ...

Much cleaner patches please! I haven't checked the others in the series but please 
review them for similar mishaps.

Thanks,

	Ingo

[toc] | [prev] | [next] | [standalone]

#1558998 — Re: [PATCH] x86/platform/UV: Clean up the UV APIC code

On Sat, 2017-01-14 at 09:26 +0100, Ingo Molnar wrote:
> * Ingo Molnar <mingo@kernel.org> wrote:
[]
> In particular the random line breaks, apparently to pacify checkpatch, were
> horribly widespread. I just made the lines longer - that's still more readable
> than the multi-line horror that was there before.
[]
> arch/x86/kernel/apic/x2apic_uv_x.c |  500 ++++++++++++++++++-------------------
[]
> -	pr_info("UV: OEM IDs %s/%s, System/HUB Types %d/%d, uv_apic %d\n",
> -		oem_id, oem_table_id, uv_system_type,
> -		uv_min_hub_revision_id, uv_apic);
> +	pr_info("UV: OEM IDs %s/%s, System/HUB Types %d/%d, uv_apic %d\n", oem_id, oem_table_id, uv_system_type, uv_min_hub_revision_id, uv_apic);

140+ chars on a single line.

Is this really better or easier to read?

Long lines make it harder to humans to verify
format and arguments used in printf type calls.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web