lkml.org 
[lkml]   [2021]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 8/8] MIPS: pci-legacy: use generic pci_enable_resources
    Date
    Follow the reasoning from commit 842de40d93e0 ("PCI: add generic
    pci_enable_resources()"):

    The only functional difference from the MIPS version is that the
    generic one uses "!r->parent" to check for resource collisions
    instead of "!r->start && r->end".

    That should have no effect on any pci-legacy driver.

    Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
    Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
    ---
    arch/mips/pci/pci-legacy.c | 40 ++------------------------------------
    1 file changed, 2 insertions(+), 38 deletions(-)

    diff --git a/arch/mips/pci/pci-legacy.c b/arch/mips/pci/pci-legacy.c
    index 78c22987bef0..c24226ea0a6e 100644
    --- a/arch/mips/pci/pci-legacy.c
    +++ b/arch/mips/pci/pci-legacy.c
    @@ -241,47 +241,11 @@ static int __init pcibios_init(void)

    subsys_initcall(pcibios_init);

    -static int pcibios_enable_resources(struct pci_dev *dev, int mask)
    -{
    - u16 cmd, old_cmd;
    - int idx;
    - struct resource *r;
    -
    - pci_read_config_word(dev, PCI_COMMAND, &cmd);
    - old_cmd = cmd;
    - for (idx=0; idx < PCI_NUM_RESOURCES; idx++) {
    - /* Only set up the requested stuff */
    - if (!(mask & (1<<idx)))
    - continue;
    -
    - r = &dev->resource[idx];
    - if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
    - continue;
    - if ((idx == PCI_ROM_RESOURCE) &&
    - (!(r->flags & IORESOURCE_ROM_ENABLE)))
    - continue;
    - if (!r->start && r->end) {
    - pci_err(dev,
    - "can't enable device: resource collisions\n");
    - return -EINVAL;
    - }
    - if (r->flags & IORESOURCE_IO)
    - cmd |= PCI_COMMAND_IO;
    - if (r->flags & IORESOURCE_MEM)
    - cmd |= PCI_COMMAND_MEMORY;
    - }
    - if (cmd != old_cmd) {
    - pci_info(dev, "enabling device (%04x -> %04x)\n", old_cmd, cmd);
    - pci_write_config_word(dev, PCI_COMMAND, cmd);
    - }
    - return 0;
    -}
    -
    int pcibios_enable_device(struct pci_dev *dev, int mask)
    {
    - int err;
    + int err = pci_enable_resources(dev, mask);

    - if ((err = pcibios_enable_resources(dev, mask)) < 0)
    + if (err < 0)
    return err;

    return pcibios_plat_dev_init(dev);
    --
    2.31.1
    \
     
     \ /
      Last update: 2021-04-13 08:23    [W:3.944 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site