Re: [patch V2 19/36] PCI/MSI: Store properties in device::msi::data

Bjorn Helgaas
2021-12-07T21:05:11Z

On Mon, Dec 06, 2021 at 11:39:26PM +0100, Thomas Gleixner wrote:
> Store the properties which are interesting for various places so the MSI
> descriptor fiddling can be removed.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Acked-by: Bjorn Helgaas <bhelgaas@google.com>

> ---
> V2: Use the setter function
> ---
> drivers/pci/msi/msi.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> --- a/drivers/pci/msi/msi.c
> +++ b/drivers/pci/msi/msi.c
> @@ -244,6 +244,8 @@ static void free_msi_irqs(struct pci_dev
> iounmap(dev->msix_base);
> dev->msix_base = NULL;
> }
> +
> + msi_device_set_properties(&dev->dev, 0);
> }
>
> static void pci_intx_for_msi(struct pci_dev *dev, int enable)
> @@ -341,6 +343,7 @@ msi_setup_entry(struct pci_dev *dev, int
> {
> struct irq_affinity_desc *masks = NULL;
> struct msi_desc *entry;
> + unsigned long prop;
> u16 control;
>
> if (affd)
> @@ -372,6 +375,10 @@ msi_setup_entry(struct pci_dev *dev, int
> if (entry->pci.msi_attrib.can_mask)
> pci_read_config_dword(dev, entry->pci.mask_pos, &entry->pci.msi_mask);
>
> + prop = MSI_PROP_PCI_MSI;
> + if (entry->pci.msi_attrib.is_64)
> + prop |= MSI_PROP_64BIT;
> + msi_device_set_properties(&dev->dev, prop);
> out:
> kfree(masks);
> return entry;
> @@ -514,6 +521,7 @@ static int msix_setup_entries(struct pci
> if (masks)
> curmsk++;
> }
> + msi_device_set_properties(&dev->dev, MSI_PROP_PCI_MSIX | MSI_PROP_64BIT);
> ret = 0;
> out:
> kfree(masks);
>