Commit 4589f1fe authored by Joachim Fenkes's avatar Joachim Fenkes Committed by Paul Mackerras
Browse files

powerpc/ibmebus: Restore "name" sysfs attribute on ibmebus devices 



Recent of_platform changes made of_bus_type_init() overwrite the bus
type's .dev_attrs list, meaning that the "name" attribute that ibmebus
devices previously had is no longer present.  This is a user-visible
regression which breaks the userspace eHCA support, since the eHCA
userspace driver relies on the name attribute to check for valid
adapters.

This fixes it by providing the "name" attribute in the generic OF
device code instead.  Tested on POWER.

Signed-off-by: default avatarJoachim Fenkes <fenkes@de.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 7230ced4

arch/powerpc/kernel/ibmebus.c

+0 −12
Original line number Diff line number Diff line
@@ -233,17 +233,6 @@ void ibmebus_free_irq(u32 ist, void *dev_id) 
}

EXPORT_SYMBOL(ibmebus_free_irq);



static ssize_t name_show(struct device *dev,

			 struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "%s\n", to_of_device(dev)->node->name);

}



static struct device_attribute ibmebus_dev_attrs[] = {

	__ATTR_RO(name),

	__ATTR_NULL

};



static char *ibmebus_chomp(const char *in, size_t count)

{

	char *out = kmalloc(count + 1, GFP_KERNEL);
@@ -327,7 +316,6 @@ static struct bus_attribute ibmebus_bus_attrs[] = { 


struct bus_type ibmebus_bus_type = {

	.uevent    = of_device_uevent,

	.dev_attrs = ibmebus_dev_attrs,

	.bus_attrs = ibmebus_bus_attrs

};

EXPORT_SYMBOL(ibmebus_bus_type);

drivers/of/device.c

+10 −0
Original line number Diff line number Diff line
@@ -57,6 +57,15 @@ static ssize_t devspec_show(struct device *dev, 
	return sprintf(buf, "%s\n", ofdev->node->full_name);

}



static ssize_t name_show(struct device *dev,

				struct device_attribute *attr, char *buf)

{

	struct of_device *ofdev;



	ofdev = to_of_device(dev);

	return sprintf(buf, "%s\n", ofdev->node->name);

}



static ssize_t modalias_show(struct device *dev,

				struct device_attribute *attr, char *buf)

{
@@ -71,6 +80,7 @@ static ssize_t modalias_show(struct device *dev, 


struct device_attribute of_platform_device_attrs[] = {

	__ATTR_RO(devspec),

	__ATTR_RO(name),

	__ATTR_RO(modalias),

	__ATTR_NULL

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE