[PATCH 4/4] x86: Add sysfs entries for UV v2

[PATCH 4/4] x86: Add sysfs entries for UV v2

[Russ Anderson]

[PATCH 4/4] Add sysfs entries for UV

Create /sys/firmware/sgi_uv sysfs entries for partition_id and coherence_id.
The interface is documented in Documentation/ABI/testing/sysfs-firmware-sgi_uv.


Signed-off-by: Russ Anderson <rja@sgi.com>

---
 arch/x86/kernel/Makefile   |    2 -
 arch/x86/kernel/uv_sysfs.c |   72 +++++++++++++++++++++++++++++++++++++++++++++
 include/asm-x86/uv/bios.h  |    1 
 3 files changed, 74 insertions(+), 1 deletion(-)

Index: linux/arch/x86/kernel/Makefile
===================================================================
--- linux.orig/arch/x86/kernel/Makefile	2008-09-26 13:54:10.000000000 -0500
+++ linux/arch/x86/kernel/Makefile	2008-09-26 14:14:14.000000000 -0500
@@ -107,7 +107,7 @@ obj-$(CONFIG_OLPC)		+= olpc.o
 # 64 bit specific files
 ifeq ($(CONFIG_X86_64),y)
         obj-y				+= genapic_64.o genapic_flat_64.o genx2apic_uv_x.o tlb_uv.o
-	obj-y				+= bios_uv.o
+	obj-y				+= bios_uv.o uv_sysfs.o
         obj-y				+= genx2apic_cluster.o
         obj-y				+= genx2apic_phys.o
         obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer_64.o
Index: linux/arch/x86/kernel/uv_sysfs.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ linux/arch/x86/kernel/uv_sysfs.c	2008-09-26 14:14:14.000000000 -0500
@@ -0,0 +1,72 @@
+/*
+ * This file supports the /sys/firmware/sgi_uv interfaces for SGI UV.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ *  Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.
+ *  Copyright (c) Russ Anderson
+ */
+
+#include <linux/sysdev.h>
+#include <asm/uv/bios.h>
+
+struct kobject *sgi_uv_kobj;
+
+static ssize_t partition_id_show(struct kobject *kobj,
+			struct kobj_attribute *attr, char *buf)
+{
+	return snprintf(buf, PAGE_SIZE, "%ld\n", sn_partition_id);
+}
+
+static ssize_t coherence_id_show(struct kobject *kobj,
+			struct kobj_attribute *attr, char *buf)
+{
+	return snprintf(buf, PAGE_SIZE, "%ld\n", partition_coherence_id());
+}
+
+static struct kobj_attribute partition_id_attr =
+	__ATTR(partition_id, S_IRUGO, partition_id_show, NULL);
+
+static struct kobj_attribute coherence_id_attr =
+	__ATTR(coherence_id, S_IRUGO, coherence_id_show, NULL);
+
+
+static int __init sgi_uv_sysfs_init(void)
+{
+	unsigned long ret;
+
+	if (!sgi_uv_kobj)
+		sgi_uv_kobj = kobject_create_and_add("sgi_uv", firmware_kobj);
+	if (!sgi_uv_kobj) {
+		printk(KERN_WARNING "kobject_create_and_add sgi_uv failed \n");
+		return -EINVAL;
+	}
+
+	ret = sysfs_create_file(sgi_uv_kobj, &partition_id_attr.attr);
+	if (ret) {
+		printk(KERN_WARNING "sysfs_create_file partition_id failed \n");
+		return ret;
+	}
+
+	ret = sysfs_create_file(sgi_uv_kobj, &coherence_id_attr.attr);
+	if (ret) {
+		printk(KERN_WARNING "sysfs_create_file coherence_id failed \n");
+		return ret;
+	}
+
+	return 0;
+}
+
+device_initcall(sgi_uv_sysfs_init);
Index: linux/include/asm-x86/uv/bios.h
===================================================================
--- linux.orig/include/asm-x86/uv/bios.h	2008-09-26 14:13:45.000000000 -0500
+++ linux/include/asm-x86/uv/bios.h	2008-09-26 14:14:14.000000000 -0500
@@ -89,5 +89,6 @@ extern long uv_coherency_id;
 extern long uv_region_size;
 #define partition_coherence_id()	(uv_coherency_id)
 
+extern struct kobject *sgi_uv_kobj;	/* /sys/firmware/sgi_uv */
 
 #endif /* ASM_X86__UV__BIOS_H */
-- 
Russ Anderson, OS RAS/Partitioning Project Lead  
SGI - Silicon Graphics Inc          rja@sgi.com

Re: [PATCH 4/4] x86: Add sysfs entries for UV v2

[Greg KH]

On Fri, Sep 26, 2008 at 03:03:43PM -0500, Russ Anderson wrote:
> [PATCH 4/4] Add sysfs entries for UV
> 
> Create /sys/firmware/sgi_uv sysfs entries for partition_id and coherence_id.
> The interface is documented in Documentation/ABI/testing/sysfs-firmware-sgi_uv.

It is?  I don't see that file in the patch:

>  arch/x86/kernel/Makefile   |    2 -
>  arch/x86/kernel/uv_sysfs.c |   72 +++++++++++++++++++++++++++++++++++++++++++++
>  include/asm-x86/uv/bios.h  |    1 
>  3 files changed, 74 insertions(+), 1 deletion(-)

Did you forget something?

thanks,

greg k-h

Re: [PATCH 4/4] x86: Add sysfs entries for UV v2

[Russ Anderson]

On Sun, Sep 28, 2008 at 01:47:01PM -0700, Greg KH wrote:
> On Fri, Sep 26, 2008 at 03:03:43PM -0500, Russ Anderson wrote:
> > [PATCH 4/4] Add sysfs entries for UV
> > 
> > Create /sys/firmware/sgi_uv sysfs entries for partition_id and coherence_id.
> > The interface is documented in Documentation/ABI/testing/sysfs-firmware-sgi_uv.
> 
> It is?  I don't see that file in the patch:

It is already in Linus' tree.

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8b3a8944a9c0f2a3afc1678798b44f0442924a37

> >  arch/x86/kernel/Makefile   |    2 -
> >  arch/x86/kernel/uv_sysfs.c |   72 +++++++++++++++++++++++++++++++++++++++++++++
> >  include/asm-x86/uv/bios.h  |    1 
> >  3 files changed, 74 insertions(+), 1 deletion(-)
> 
> Did you forget something?
> 
> thanks,
> 
> greg k-h

Thanks,
-- 
Russ Anderson, OS RAS/Partitioning Project Lead  
SGI - Silicon Graphics Inc          rja@sgi.com

Re: [PATCH 4/4] x86: Add sysfs entries for UV v2

[Greg KH]

On Sun, Sep 28, 2008 at 04:28:34PM -0500, Russ Anderson wrote:
> On Sun, Sep 28, 2008 at 01:47:01PM -0700, Greg KH wrote:
> > On Fri, Sep 26, 2008 at 03:03:43PM -0500, Russ Anderson wrote:
> > > [PATCH 4/4] Add sysfs entries for UV
> > > 
> > > Create /sys/firmware/sgi_uv sysfs entries for partition_id and coherence_id.
> > > The interface is documented in Documentation/ABI/testing/sysfs-firmware-sgi_uv.
> > 
> > It is?  I don't see that file in the patch:
> 
> It is already in Linus' tree.
> 
> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8b3a8944a9c0f2a3afc1678798b44f0442924a37

Heh you got the documentation in before the code, that seems to be an
interesting trend these days :)

thanks,

greg k-h