Commit 25a98bd4 authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner
Browse files

genirq/MSI: Store 'struct device' instead of 'struct pci_dev' in struct msi_desc 



Store 'struct device *' instead of 'struct pci_dev *' in struct msi_desc,
so struct msi_desc can be reused by non PCI based MSI drivers.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Reviewed-by: default avatarYijing Wang <wangyijing@huawei.com>
Reviewed-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Stuart Yoder <stuart.yoder@freescale.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Alexander Gordeev <agordeev@redhat.com>
Link: http://lkml.kernel.org/r/1436428847-8886-11-git-send-email-jiang.liu@linux.intel.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4a7cc831

drivers/pci/msi.c

+6 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ static struct msi_desc *alloc_msi_entry(struct pci_dev *dev) 
		return NULL;



	INIT_LIST_HEAD(&desc->list);

	desc->dev = dev;

	desc->dev = &dev->dev;



	return desc;

}
@@ -1140,6 +1140,11 @@ int pci_enable_msix_range(struct pci_dev *dev, struct msix_entry *entries, 
}

EXPORT_SYMBOL(pci_enable_msix_range);



struct pci_dev *msi_desc_to_pci_dev(struct msi_desc *desc)

{

	return to_pci_dev(desc->dev);

}



void *msi_desc_to_pci_sysdata(struct msi_desc *desc)

{

	struct pci_dev *dev = msi_desc_to_pci_dev(desc);

include/linux/msi.h

+4 −7
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ extern int pci_msi_ignore_mask; 
/* Helper functions */

struct irq_data;

struct msi_desc;

struct pci_dev;

void __get_cached_msi_msg(struct msi_desc *entry, struct msi_msg *msg);

void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg);
@@ -37,14 +38,14 @@ struct msi_desc { 
		void __iomem *mask_base;

		u8 mask_pos;

	};

	struct pci_dev *dev;

	struct device *dev;



	/* Last set MSI message */

	struct msi_msg msg;

};



/* Helpers to hide struct msi_desc implementation details */

#define msi_desc_to_dev(desc)		(&(desc)->dev.dev)

#define msi_desc_to_dev(desc)		((desc)->dev)

#define dev_to_msi_list(dev)		(&(dev)->msi_list)

#define first_msi_entry(dev)		\

	list_first_entry(dev_to_msi_list((dev)), struct msi_desc, list)
@@ -56,11 +57,7 @@ struct msi_desc { 
#define for_each_pci_msi_entry(desc, pdev)	\

	for_each_msi_entry((desc), &(pdev)->dev)



static inline struct pci_dev *msi_desc_to_pci_dev(struct msi_desc *desc)

{

	return desc->dev;

}



struct pci_dev *msi_desc_to_pci_dev(struct msi_desc *desc);

void *msi_desc_to_pci_sysdata(struct msi_desc *desc);

#else /* CONFIG_PCI_MSI */

static inline void *msi_desc_to_pci_sysdata(struct msi_desc *desc)

CRA Git | Maintained and supported by SUSTech CRA and CCSE