On Thu, Apr 4, 2013 at 5:39 AM, Gavin Shan <shangw@xxxxxxxxxxxxxxxxxx> wrote:
> The patch intends to use the cached MSI capability offset in
> pci_dev instead of polling that from config space when enabling
> MSI interrupts.
>
> Signed-off-by: Gavin Shan <shangw@xxxxxxxxxxxxxxxxxx>
> ---
> drivers/pci/msi.c | 19 +++++++++----------
> 1 files changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
> index 5f51e10..182474d 100644
> --- a/drivers/pci/msi.c
> +++ b/drivers/pci/msi.c
> @@ -552,14 +552,14 @@ out_unroll:
> static int msi_capability_init(struct pci_dev *dev, int nvec)
> {
> struct msi_desc *entry;
> - int pos, ret;
> + int ret;
> u16 control;
> unsigned mask;
>
> - pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
> - msi_set_enable(dev, 0); /* Disable MSI during set up */
> + /* Disable MSI during set up */
> + msi_set_enable(dev, 0);
>
> - pci_read_config_word(dev, msi_control_reg(pos), &control);
> + pci_read_config_word(dev, msi_control_reg(dev->msi_cap), &control);
While you're at at, can you get rid of msi_control_reg() and friends?
They are needlessly different from the common style in this file,
e.g., "pos + PCI_MSI_FLAGS".
> /* MSI Entry Initialization */
> entry = alloc_msi_entry(dev);
> if (!entry)
> @@ -570,9 +570,9 @@ static int msi_capability_init(struct pci_dev *dev, int nvec)
> entry->msi_attrib.entry_nr = 0;
> entry->msi_attrib.maskbit = is_mask_bit_support(control);
> entry->msi_attrib.default_irq = dev->irq; /* Save IOAPIC IRQ */
> - entry->msi_attrib.pos = pos;
> + entry->msi_attrib.pos = dev->msi_cap;
>
> - entry->mask_pos = msi_mask_reg(pos, entry->msi_attrib.is_64);
> + entry->mask_pos = msi_mask_reg(dev->msi_cap, entry->msi_attrib.is_64);
> /* All MSIs are unmasked by default, Mask them all */
> if (entry->msi_attrib.maskbit)
> pci_read_config_dword(dev, entry->mask_pos, &entry->masked);
> @@ -818,13 +818,12 @@ static int pci_msi_check_device(struct pci_dev *dev, int nvec, int type)
> */
> int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec)
> {
> - int status, pos, maxvec;
> + int status, maxvec;
> u16 msgctl;
>
> - pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
> - if (!pos)
> + if (!dev->msi_cap)
> return -EINVAL;
> - pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &msgctl);
> + pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &msgctl);
> maxvec = 1 << ((msgctl & PCI_MSI_FLAGS_QMASK) >> 1);
> if (nvec > maxvec)
> return maxvec;
> --
> 1.7.5.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
