lkml.org 
[lkml]   [2007]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2.6.23] ibmebus: Prevent bus_id collisions
    Date
    Previously, ibmebus derived a device's bus_id from its location code. The
    location code is not guaranteed to be unique, so we might get bus_id
    collisions if two devices share the same location code. The OFDT full_name,
    however, is unique, so we use that instead.

    Signed-off-by: Joachim Fenkes <fenkes@de.ibm.com>
    ---

    The patch has been tested and works fine. If you think it's too much change
    for 2.6.23-rc5, please schedule for 2.6.24 instead.

    arch/powerpc/kernel/ibmebus.c | 30 +++++++++---------------------
    1 files changed, 9 insertions(+), 21 deletions(-)

    diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
    index 9a8c9af..d6a38cd 100644
    --- a/arch/powerpc/kernel/ibmebus.c
    +++ b/arch/powerpc/kernel/ibmebus.c
    @@ -188,33 +188,21 @@ static struct ibmebus_dev* __devinit ibmebus_register_device_node(
    struct device_node *dn)
    {
    struct ibmebus_dev *dev;
    - const char *loc_code;
    - int length;
    -
    - loc_code = of_get_property(dn, "ibm,loc-code", NULL);
    - if (!loc_code) {
    - printk(KERN_WARNING "%s: node %s missing 'ibm,loc-code'\n",
    - __FUNCTION__, dn->name ? dn->name : "<unknown>");
    - return ERR_PTR(-EINVAL);
    - }
    -
    - if (strlen(loc_code) == 0) {
    - printk(KERN_WARNING "%s: 'ibm,loc-code' is invalid\n",
    - __FUNCTION__);
    - return ERR_PTR(-EINVAL);
    - }
    + int i, len, bus_len;

    dev = kzalloc(sizeof(struct ibmebus_dev), GFP_KERNEL);
    - if (!dev) {
    + if (!dev)
    return ERR_PTR(-ENOMEM);
    - }

    dev->ofdev.node = of_node_get(dn);

    - length = strlen(loc_code);
    - memcpy(dev->ofdev.dev.bus_id, loc_code
    - + (length - min(length, BUS_ID_SIZE - 1)),
    - min(length, BUS_ID_SIZE - 1));
    + len = strlen(dn->full_name + 1);
    + bus_len = min(len, BUS_ID_SIZE - 1);
    + memcpy(dev->ofdev.dev.bus_id, dn->full_name + 1
    + + (len - bus_len), bus_len);
    + for (i = 0; i < bus_len; i++)
    + if (dev->ofdev.dev.bus_id[i] == '/')
    + dev->ofdev.dev.bus_id[i] = '_';

    /* Register with generic device framework. */
    if (ibmebus_register_device_common(dev, dn->name) != 0) {
    --
    1.5.2



    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-08-29 18:29    [W:0.026 / U:1.460 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site