[Feisty][SPARC64] Extra commits in Dave Millers tree

Phillip lougher phillip at lougher.demon.co.uk
Wed May 16 16:23:49 UTC 2007


Fabbione & Ben:

There's a couple of extra commits in Dave Miller's Feisty git tree,
which I cannot find any requests from you to integrate.

Do we want to pull these into our kernel too?

Phillip


>From c0c422dc6268a43eef85f15c50f766e4c512dc49 Mon Sep 17 00:00:00 2001
From: David S. Miller <davem at davemloft.net>
Date: Sun, 13 May 2007 22:03:05 -0700
Subject: [PATCH] [SERIAL] SUNHV: Add an ID string.

The 'compatible' property can be SUNW,sun4v-console as
well as 'qcn'.

Signed-off-by: David S. Miller <davem at davemloft.net>
---
 drivers/serial/sunhv.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index 40d4856..c3a6bd2 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/serial/sunhv.c
@@ -493,6 +493,10 @@ static struct of_device_id hv_match[] = {
 		.name = "console",
 		.compatible = "qcn",
 	},
+	{
+		.name = "console",
+		.compatible = "SUNW,sun4v-console",
+	},
 	{},
 };
 MODULE_DEVICE_TABLE(of, hv_match);
-- 
1.4.4.2

>From e77498fb2c40c3b8b7b4b31a45ff82bbb85afbf9 Mon Sep 17 00:00:00 2001
From: David S. Miller <davem at davemloft.net>
Date: Sun, 13 May 2007 22:03:32 -0700
Subject: [PATCH] [SPARC64]: Be more resiliant with PCI I/O space regs.

If we miss on the ranges, just toss the translation up to the parent
instead of failing.

Signed-off-by: David S. Miller <davem at davemloft.net>
---
 arch/sparc64/kernel/of_device.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
index 1f45985..c42fe5a 100644
--- a/arch/sparc64/kernel/of_device.c
+++ b/arch/sparc64/kernel/of_device.c
@@ -508,6 +508,13 @@ static int __init build_one_resource(struct device_node *parent,
 			return 0;
 	}
 
+	/* When we miss an I/O space match on PCI, just pass it up
+	 * to the next PCI bridge and/or controller.
+	 */
+	if (!strcmp(bus->name, "pci") &&
+	    (addr[0] & 0x03000000) == 0x01000000)
+		return 0;
+
 	return 1;
 }
 
-- 
1.4.4.2

>From 6573fc3fd3b79ad9b277e6d0d9020369a2058a94 Mon Sep 17 00:00:00 2001
From: David S. Miller <davem at davemloft.net>
Date: Mon, 14 May 2007 02:02:42 -0700
Subject: [PATCH] [SPARC64]: Add missing cpus_empty() check in hypervisor xcall handling.

Signed-off-by: David S. Miller <davem at davemloft.net>
---
 arch/sparc64/kernel/smp.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index fc99f7b..8ad7bdb 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -566,6 +566,9 @@ static void hypervisor_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t
 	unsigned long flags, status;
 	int cnt, retries, this_cpu, prev_sent, i;
 
+	if (cpus_empty(mask))
+		return;
+
 	/* We have to do this whole thing with interrupts fully disabled.
 	 * Otherwise if we send an xcall from interrupt context it will
 	 * corrupt both our mondo block and cpu list state.
-- 
1.4.4.2





More information about the kernel-team mailing list