* [PATCH 3/3] s390/MSI: Use __msi_mask_irq() instead of default_msi_mask_irq()
[not found] <1414377878-23497-1-git-send-email-wangyijing@huawei.com>
@ 2014-10-27 2:44 ` Yijing Wang
2014-11-11 21:23 ` [PATCH 0/3] xen MSI code clean up Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Yijing Wang @ 2014-10-27 2:44 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: wangyijing, linux-pci, Sebastian Ott, linux-s390
Now only s390/MSI use default_msi_mask_irq() and
default_msix_mask_irq(), replace them with the common
msi mask irq functions __msi_mask_irq() and __msix_mask_irq().
Remove default_msi_mask_irq() and default_msix_mask_irq().
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
CC: Sebastian Ott <sebott@linux.vnet.ibm.com>
CC: linux-s390@vger.kernel.org
---
arch/s390/pci/pci.c | 4 ++--
include/linux/msi.h | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index 2fa7b14..552b990 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -448,9 +448,9 @@ void arch_teardown_msi_irqs(struct pci_dev *pdev)
/* Release MSI interrupts */
list_for_each_entry(msi, &pdev->msi_list, list) {
if (msi->msi_attrib.is_msix)
- default_msix_mask_irq(msi, 1);
+ __msix_mask_irq(msi, 1);
else
- default_msi_mask_irq(msi, 1, 1);
+ __msi_mask_irq(msi, 1, 1);
irq_set_msi_desc(msi->irq, NULL);
irq_free_desc(msi->irq);
msi->msg.address_lo = 0;
diff --git a/include/linux/msi.h b/include/linux/msi.h
index f6630a5..efad127 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -64,8 +64,6 @@ void arch_restore_msi_irqs(struct pci_dev *dev);
void default_teardown_msi_irqs(struct pci_dev *dev);
void default_restore_msi_irqs(struct pci_dev *dev);
-#define default_msi_mask_irq __msi_mask_irq
-#define default_msix_mask_irq __msix_mask_irq
struct msi_chip {
struct module *owner;
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 0/3] xen MSI code clean up
[not found] <1414377878-23497-1-git-send-email-wangyijing@huawei.com>
2014-10-27 2:44 ` [PATCH 3/3] s390/MSI: Use __msi_mask_irq() instead of default_msi_mask_irq() Yijing Wang
@ 2014-11-11 21:23 ` Bjorn Helgaas
2014-11-12 9:24 ` Sebastian Ott
1 sibling, 1 reply; 3+ messages in thread
From: Bjorn Helgaas @ 2014-11-11 21:23 UTC (permalink / raw)
To: Yijing Wang
Cc: linux-pci, Sebastian Ott, linux-s390, David Vrabel,
Konrad Rzeszutek Wilk, xen-devel
[+cc Sebastian, linux-s390, David, Konrad, xen-devel]
On Mon, Oct 27, 2014 at 10:44:35AM +0800, Yijing Wang wrote:
>
> Yijing Wang (3):
> x86/xen: Introduce a global flag to fix the MSI mask bug
> x86/xen: Revert "PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()"
> s390/MSI: Use __msi_mask_irq() instead of default_msi_mask_irq()
I applied these with David's reviewed-by and ack to pci/msi for v3.19.
I'd like to see an ack from Sebastian for the s390 part, but I guess that
one is pretty trivial.
> arch/s390/pci/pci.c | 4 ++--
> arch/x86/include/asm/x86_init.h | 3 ---
> arch/x86/kernel/x86_init.c | 10 ----------
> arch/x86/pci/xen.c | 15 +++------------
> drivers/pci/msi.c | 29 ++++++++++++-----------------
> include/linux/msi.h | 5 +++--
> 6 files changed, 20 insertions(+), 46 deletions(-)
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread