mirror of https://gitee.com/openkylin/linux.git
[PATCH] ppc64: add MODALIAS= for vio bus
A non-broken udev would autoload also the drivers for devices on the pseries vio bus, like ibmveth, ibmvscsic and hvsc. This is similar to pci, usb and ieee1394: /lib/modules/`uname -r`/modules.alias alias vio:TvscsiSIBM,v-scsi* ibmvscsic alias vio:TnetworkSIBM,l-lan* ibmveth alias vio:Tserial-serverShvterm2* hvcs /events/debug.00004.pci.add.1394:MODALIAS='pci:v00001014d00000188sv00000000sd00000000bc06sc04i0f' /events/debug.00005.pci.add.1509:MODALIAS='pci:v00008086d00001229sv00001014sd000001FFbc02sc00i00' /events/debug.00026.vio.add.1519:MODALIAS='vio:TserialShvterm1' /events/debug.00027.vio.add.1446:MODALIAS='vio:TvscsiSIBM,v-scsi' /events/debug.00028.vio.add.1451:MODALIAS='vio:TnetworkSIBM,l-lan' modprobe -v vio:TnetworkSIBM,l-lan insmod /lib/modules/2.6.14-20051030_vio-ppc64/kernel/drivers/net/ibmveth.ko Signed-off-by: Olaf Hering <olh@suse.de> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
8827cc7068
commit
143dcec2f7
|
@ -21,6 +21,7 @@
|
||||||
#include <asm/iommu.h>
|
#include <asm/iommu.h>
|
||||||
#include <asm/dma.h>
|
#include <asm/dma.h>
|
||||||
#include <asm/vio.h>
|
#include <asm/vio.h>
|
||||||
|
#include <asm/prom.h>
|
||||||
|
|
||||||
static const struct vio_device_id *vio_match_device(
|
static const struct vio_device_id *vio_match_device(
|
||||||
const struct vio_device_id *, const struct vio_dev *);
|
const struct vio_device_id *, const struct vio_dev *);
|
||||||
|
@ -265,7 +266,33 @@ static int vio_bus_match(struct device *dev, struct device_driver *drv)
|
||||||
return (ids != NULL) && (vio_match_device(ids, vio_dev) != NULL);
|
return (ids != NULL) && (vio_match_device(ids, vio_dev) != NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int vio_hotplug(struct device *dev, char **envp, int num_envp,
|
||||||
|
char *buffer, int buffer_size)
|
||||||
|
{
|
||||||
|
const struct vio_dev *vio_dev = to_vio_dev(dev);
|
||||||
|
char *cp;
|
||||||
|
int length;
|
||||||
|
|
||||||
|
if (!num_envp)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
|
if (!vio_dev->dev.platform_data)
|
||||||
|
return -ENODEV;
|
||||||
|
cp = (char *)get_property(vio_dev->dev.platform_data, "compatible", &length);
|
||||||
|
if (!cp)
|
||||||
|
return -ENODEV;
|
||||||
|
|
||||||
|
envp[0] = buffer;
|
||||||
|
length = scnprintf(buffer, buffer_size, "MODALIAS=vio:T%sS%s",
|
||||||
|
vio_dev->type, cp);
|
||||||
|
if (buffer_size - length <= 0)
|
||||||
|
return -ENOMEM;
|
||||||
|
envp[1] = NULL;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
struct bus_type vio_bus_type = {
|
struct bus_type vio_bus_type = {
|
||||||
.name = "vio",
|
.name = "vio",
|
||||||
|
.hotplug = vio_hotplug,
|
||||||
.match = vio_bus_match,
|
.match = vio_bus_match,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue