forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PCI/MSI: Rename __read_msi_msg() to __pci_read_msi_msg()

Browse source 
Rename __read_msi_msg() to __pci_read_msi_msg() and kill unused
read_msi_msg(). It's a preparation to separate generic MSI code from
PCI core.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Yingjoe Chen <yingjoe.chen@mediatek.com>
Cc: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Jiang Liu 2014-11-09 23:10:33 +08:00 • committed by Thomas Gleixner
commit 891d4a48f7
4 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/powerpc/platforms/pseries/msi.c
View file

@ -476,7 +476,7 @@ again:
irq_set_msi_desc(virq, entry); irq_set_msi_desc(virq, entry);
/* Read config space back so we can restore after reset */ /* Read config space back so we can restore after reset */
__read_msi_msg(entry, &msg); __pci_read_msi_msg(entry, &msg);
entry->msg = msg; entry->msg = msg;
} }

2
arch/x86/pci/xen.c
View file

@ -229,7 +229,7 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
return 1; return 1;
list_for_each_entry(msidesc, &dev->msi_list, list) { list_for_each_entry(msidesc, &dev->msi_list, list) {
__read_msi_msg(msidesc, &msg); __pci_read_msi_msg(msidesc, &msg);
pirq = MSI_ADDR_EXT_DEST_ID(msg.address_hi) | pirq = MSI_ADDR_EXT_DEST_ID(msg.address_hi) |
((msg.address_lo >> MSI_ADDR_DEST_ID_SHIFT) & 0xff); ((msg.address_lo >> MSI_ADDR_DEST_ID_SHIFT) & 0xff);
if (msg.data != XEN_PIRQ_MSI_DATA || if (msg.data != XEN_PIRQ_MSI_DATA ||

9
drivers/pci/msi.c
View file

@ -252,7 +252,7 @@ void default_restore_msi_irqs(struct pci_dev *dev)
default_restore_msi_irq(dev, entry->irq); default_restore_msi_irq(dev, entry->irq);
} }
void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg) void __pci_read_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
{ {
BUG_ON(entry->dev->current_state != PCI_D0); BUG_ON(entry->dev->current_state != PCI_D0);
@ -282,13 +282,6 @@ void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
} }
} }
void read_msi_msg(unsigned int irq, struct msi_msg *msg)
{
struct msi_desc *entry = irq_get_msi_desc(irq);
__read_msi_msg(entry, msg);
}
void __get_cached_msi_msg(struct msi_desc *entry, struct msi_msg *msg) void __get_cached_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
{ {
/* Assert that the cache is valid, assuming that /* Assert that the cache is valid, assuming that

5
include/linux/msi.h
View file

@ -16,12 +16,11 @@ struct irq_data;
struct msi_desc; struct msi_desc;
void mask_msi_irq(struct irq_data *data); void mask_msi_irq(struct irq_data *data);
void unmask_msi_irq(struct irq_data *data); void unmask_msi_irq(struct irq_data *data);
void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
void __get_cached_msi_msg(struct msi_desc *entry, struct msi_msg *msg); void __get_cached_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg); void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
void read_msi_msg(unsigned int irq, struct msi_msg *msg);
void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg); void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg);
void write_msi_msg(unsigned int irq, struct msi_msg *msg); void write_msi_msg(unsigned int irq, struct msi_msg *msg);
u32 __msix_mask_irq(struct msi_desc *desc, u32 flag); u32 __msix_mask_irq(struct msi_desc *desc, u32 flag);
u32 __msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag); u32 __msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag);
@ -51,6 +50,8 @@ struct msi_desc {
struct msi_msg msg; struct msi_msg msg;
}; };
void __pci_read_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
/* /*
* The arch hooks to setup up msi irqs. Those functions are * The arch hooks to setup up msi irqs. Those functions are
* implemented as weak symbols so that they /can/ be overriden by * implemented as weak symbols so that they /can/ be overriden by