lkml.org 
[lkml]   [2004]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: [PATCH] PCI Update for 2.6.3-rc1
    Date
    From
    ChangeSet 1.1500.11.17, 2004/02/04 10:03:35-08:00, colpatch@us.ibm.com

    [PATCH] PCI: fix "pcibus_class" Device Class, release function

    John Rose wrote:
    > The function release_pcibus_dev() in probe.c defines the release procedure for
    > device class pcibus_class. I want to suggest that this function be scrapped :)
    >
    > This release function is called in the code path of class_device_unregister().
    > The pcibus_class devices aren't currently unregistered anywhere, from what I
    > can tell, so this release function is currently unused. The runtime removal of
    > PCI buses from logical partitions on PPC64 requires the unregistration of these
    > class devices. The natural place to do this IMHO is in pci_remove_bus_device()
    > in remove.c.

    You're right that the class device isn't currently unregistered, and
    that was an oversight in the patch I originally sent. Attatched is a
    patch that remedies that situation. pci_remove_bus_device() *is* the
    natural place to unregister the class_dev, and that's just what the
    patch does.


    > The problem is that this calls pci_destroy_dev(), which calls put() on the same
    > "bridge" device that the release function does. This should only be done once
    > in the course of removing a pci_bus, and I doubt that we want to change
    > pci_destroy_dev(). The kfree() of the pci_bus struct is also done in both
    > pci_remove_bus_device() and release_pcibus_dev().

    Yep. The patch pulls the kfree() out of pci_remove_bus_device() and
    calls class_device_unregister() in it's place. This will put() the
    bridge device and free the pci_bus as needed. put() does need to be
    called twice because the bridge device is get()'d twice: once when the
    device is registered and once when it's bus device grabs a reference to it.


    drivers/pci/remove.c | 2 +-
    1 files changed, 1 insertion(+), 1 deletion(-)


    diff -Nru a/drivers/pci/remove.c b/drivers/pci/remove.c
    --- a/drivers/pci/remove.c Mon Feb 9 14:58:38 2004
    +++ b/drivers/pci/remove.c Mon Feb 9 14:58:38 2004
    @@ -83,7 +83,7 @@
    list_del(&b->node);
    spin_unlock(&pci_bus_lock);

    - kfree(b);
    + class_device_unregister(&b->class_dev);
    dev->subordinate = NULL;
    }

    -
    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: 2005-03-22 14:00    [W:0.027 / U:3.300 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site