Commit 8f061abb authored by Justin Ernst's avatar Justin Ernst Committed by Borislav Petkov
Browse files

x86/platform/uv: Remove existing /sys/firmware/sgi_uv/ interface 



Remove existing interface at /sys/firmware/sgi_uv/, created by
arch/x86/platform/uv/uv_sysfs.c

This interface includes:
/sys/firmware/sgi_uv/coherence_id
/sys/firmware/sgi_uv/partition_id

Both coherence_id and partition_id will be re-introduced via a
new uv_sysfs driver.

Signed-off-by: default avatarJustin Ernst <justin.ernst@hpe.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarSteve Wahl <steve.wahl@hpe.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lkml.kernel.org/r/20201125175444.279074-2-justin.ernst@hpe.com
parent 418baf2c

arch/x86/platform/uv/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_X86_UV)		+= bios_uv.o uv_irq.o uv_sysfs.o uv_time.o uv_nmi.o
 
obj-$(CONFIG_X86_UV)		+= bios_uv.o uv_irq.o uv_time.o uv_nmi.o

arch/x86/platform/uv/uv_sysfs.c

deleted100644 → 0
+0 −63
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * This file supports the /sys/firmware/sgi_uv interfaces for SGI UV.

 *

 *  Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.

 *  Copyright (c) Russ Anderson

 */



#include <linux/device.h>

#include <asm/uv/bios.h>

#include <asm/uv/uv.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", sn_coherency_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 (!is_uv_system())

		return -ENODEV;



	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);