lkml.org 
[lkml]   [2008]   [Dec]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] PCI/MSI: bugfix/utilize for msi_capability_init()
    This patch fix a following bug and does a cleanup.

    bug:
    commit 5993760f7fc75b77e4701f1e56dc84c0d6cf18d5
    had a wrong change (since is_64 is boolean[0|1]):

    - pci_write_config_dword(dev,
    - msi_mask_bits_reg(pos, is_64bit_address(control)),
    - maskbits);
    + pci_write_config_dword(dev, entry->msi_attrib.is_64, maskbits);

    utilize:
    Unify separated if (entry->msi_attrib.maskbit) statements.

    Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
    ---
    drivers/pci/msi.c | 16 +++++++---------
    1 files changed, 7 insertions(+), 9 deletions(-)

    diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
    index 74801f7..5aee7ee 100644
    --- a/drivers/pci/msi.c
    +++ b/drivers/pci/msi.c
    @@ -378,21 +378,19 @@ static int msi_capability_init(struct pci_dev *dev)
    entry->msi_attrib.masked = 1;
    entry->msi_attrib.default_irq = dev->irq; /* Save IOAPIC IRQ */
    entry->msi_attrib.pos = pos;
    - if (entry->msi_attrib.maskbit) {
    - entry->mask_base = (void __iomem *)(long)msi_mask_bits_reg(pos,
    - entry->msi_attrib.is_64);
    - }
    entry->dev = dev;
    if (entry->msi_attrib.maskbit) {
    - unsigned int maskbits, temp;
    + unsigned int base, maskbits, temp;
    +
    + base = msi_mask_bits_reg(pos, entry->msi_attrib.is_64);
    + entry->mask_base = (void __iomem *)(long)base;
    +
    /* All MSIs are unmasked by default, Mask them all */
    - pci_read_config_dword(dev,
    - msi_mask_bits_reg(pos, entry->msi_attrib.is_64),
    - &maskbits);
    + pci_read_config_dword(dev, base, &maskbits);
    temp = (1 << multi_msi_capable(control));
    temp = ((temp - 1) & ~temp);
    maskbits |= temp;
    - pci_write_config_dword(dev, entry->msi_attrib.is_64, maskbits);
    + pci_write_config_dword(dev, base, maskbits);
    entry->msi_attrib.maskbits_mask = temp;
    }
    list_add_tail(&entry->list, &dev->msi_list);
    --
    1.6.1.rc4


    \
     
     \ /
      Last update: 2008-12-24 09:29    [W:0.024 / U:215.032 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site