Hi Yijing,
On 2014/7/8 10:07, Yijing Wang wrote:
> Move MSI entry stuff to a new function
> msi_setup_entry(), simplify msi_capability_init()
> code like MSI-X do.
>
> Signed-off-by: Yijing Wang <wangyijing@xxxxxxxxxx>
> ---
> drivers/pci/msi.c | 51 +++++++++++++++++++++++++++++++++------------------
> 1 files changed, 33 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
> index 50a7e4e..c306883 100644
> --- a/drivers/pci/msi.c
> +++ b/drivers/pci/msi.c
> @@ -581,6 +581,38 @@ error_attrs:
> return ret;
> }
>
> +static struct msi_desc *msi_setup_entry(struct pci_dev *dev)
> +{
> + u16 control;
> + struct msi_desc *entry;
> +
> + /* MSI Entry Initialization */
> + entry = alloc_msi_entry(dev);
> + if (!entry)
> + return NULL;
> +
> + pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &control);
> +
> + entry->msi_attrib.is_msix = 0;
> + entry->msi_attrib.is_64 = !!(control & PCI_MSI_FLAGS_64BIT);
> + entry->msi_attrib.entry_nr = 0;
> + entry->msi_attrib.maskbit = !!(control & PCI_MSI_FLAGS_MASKBIT);
> + entry->msi_attrib.default_irq = dev->irq; /* Save IOAPIC IRQ */
> + entry->msi_attrib.pos = dev->msi_cap;
> + entry->msi_attrib.multi_cap = (control & PCI_MSI_FLAGS_QMASK) >> 1;
> +
> + if (control & PCI_MSI_FLAGS_64BIT)
> + entry->mask_pos = dev->msi_cap + PCI_MSI_MASK_64;
> + else
> + entry->mask_pos = dev->msi_cap + PCI_MSI_MASK_32;
> +
> + /* Save the initial mask status */
> + if (entry->msi_attrib.maskbit)
> + pci_read_config_dword(dev, entry->mask_pos, &entry->masked);
+ list_add_tail(&entry->list, &dev->msi_list);
Just an advice. :)
Thanks,
Abel.
> +
> + return entry;
> +}
> +
> /**
> * msi_capability_init - configure device's MSI capability structure
> * @dev: pointer to the pci_dev data structure of MSI device function
> @@ -596,32 +628,15 @@ static int msi_capability_init(struct pci_dev *dev, int nvec)
> {
> struct msi_desc *entry;
> int ret;
> - u16 control;
> unsigned mask;
>
> msi_set_enable(dev, 0); /* Disable MSI during set up */
>
> - pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &control);
> - /* MSI Entry Initialization */
> - entry = alloc_msi_entry(dev);
> + entry = msi_setup_entry(dev);
> if (!entry)
> return -ENOMEM;
>
> - entry->msi_attrib.is_msix = 0;
> - entry->msi_attrib.is_64 = !!(control & PCI_MSI_FLAGS_64BIT);
> - entry->msi_attrib.entry_nr = 0;
> - entry->msi_attrib.maskbit = !!(control & PCI_MSI_FLAGS_MASKBIT);
> - entry->msi_attrib.default_irq = dev->irq; /* Save IOAPIC IRQ */
> - entry->msi_attrib.pos = dev->msi_cap;
> - entry->msi_attrib.multi_cap = (control & PCI_MSI_FLAGS_QMASK) >> 1;
> -
> - if (control & PCI_MSI_FLAGS_64BIT)
> - entry->mask_pos = dev->msi_cap + PCI_MSI_MASK_64;
> - else
> - entry->mask_pos = dev->msi_cap + PCI_MSI_MASK_32;
> /* All MSIs are unmasked by default, Mask them all */
> - if (entry->msi_attrib.maskbit)
> - pci_read_config_dword(dev, entry->mask_pos, &entry->masked);
> mask = msi_mask(entry->msi_attrib.multi_cap);
> msi_mask_irq(entry, mask, mask);
>
--
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
