lkml.org 
[lkml]   [2020]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/irq] x86/irq: Make most MSI ops XEN private
    The following commit has been merged into the x86/irq branch of tip:

    Commit-ID: 874a2013a07dd8ec48413db5d06d27d02f7765b5
    Gitweb: https://git.kernel.org/tip/874a2013a07dd8ec48413db5d06d27d02f7765b5
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Wed, 26 Aug 2020 13:17:04 +02:00
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitterDate: Wed, 16 Sep 2020 16:52:38 +02:00

    x86/irq: Make most MSI ops XEN private

    Nothing except XEN uses the setup/teardown ops. Hide them there.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Link: https://lore.kernel.org/r/20200826112334.198633344@linutronix.de

    ---
    arch/x86/include/asm/x86_init.h | 2 --
    arch/x86/pci/xen.c | 21 ++++++++++++++-------
    2 files changed, 14 insertions(+), 9 deletions(-)

    diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
    index d8b597c..397196f 100644
    --- a/arch/x86/include/asm/x86_init.h
    +++ b/arch/x86/include/asm/x86_init.h
    @@ -276,8 +276,6 @@ struct x86_platform_ops {
    struct pci_dev;

    struct x86_msi_ops {
    - int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);
    - void (*teardown_msi_irqs)(struct pci_dev *dev);
    void (*restore_msi_irqs)(struct pci_dev *dev);
    };

    diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
    index cb90095..c552cd2 100644
    --- a/arch/x86/pci/xen.c
    +++ b/arch/x86/pci/xen.c
    @@ -157,6 +157,13 @@ static int acpi_register_gsi_xen(struct device *dev, u32 gsi,
    struct xen_pci_frontend_ops *xen_pci_frontend;
    EXPORT_SYMBOL_GPL(xen_pci_frontend);

    +struct xen_msi_ops {
    + int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);
    + void (*teardown_msi_irqs)(struct pci_dev *dev);
    +};
    +
    +static struct xen_msi_ops xen_msi_ops __ro_after_init;
    +
    static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
    {
    int irq, ret, i;
    @@ -415,7 +422,7 @@ static int xen_msi_domain_alloc_irqs(struct irq_domain *domain,
    else
    type = PCI_CAP_ID_MSI;

    - return x86_msi.setup_msi_irqs(to_pci_dev(dev), nvec, type);
    + return xen_msi_ops.setup_msi_irqs(to_pci_dev(dev), nvec, type);
    }

    static void xen_msi_domain_free_irqs(struct irq_domain *domain,
    @@ -424,7 +431,7 @@ static void xen_msi_domain_free_irqs(struct irq_domain *domain,
    if (WARN_ON_ONCE(!dev_is_pci(dev)))
    return;

    - x86_msi.teardown_msi_irqs(to_pci_dev(dev));
    + xen_msi_ops.teardown_msi_irqs(to_pci_dev(dev));
    }

    static struct msi_domain_ops xen_pci_msi_domain_ops = {
    @@ -463,16 +470,16 @@ static __init void xen_setup_pci_msi(void)
    {
    if (xen_pv_domain()) {
    if (xen_initial_domain()) {
    - x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs;
    + xen_msi_ops.setup_msi_irqs = xen_initdom_setup_msi_irqs;
    x86_msi.restore_msi_irqs = xen_initdom_restore_msi_irqs;
    } else {
    - x86_msi.setup_msi_irqs = xen_setup_msi_irqs;
    + xen_msi_ops.setup_msi_irqs = xen_setup_msi_irqs;
    }
    - x86_msi.teardown_msi_irqs = xen_pv_teardown_msi_irqs;
    + xen_msi_ops.teardown_msi_irqs = xen_pv_teardown_msi_irqs;
    pci_msi_ignore_mask = 1;
    } else if (xen_hvm_domain()) {
    - x86_msi.setup_msi_irqs = xen_hvm_setup_msi_irqs;
    - x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs;
    + xen_msi_ops.setup_msi_irqs = xen_hvm_setup_msi_irqs;
    + xen_msi_ops.teardown_msi_irqs = xen_teardown_msi_irqs;
    } else {
    WARN_ON_ONCE(1);
    return;
    \
     
     \ /
      Last update: 2020-09-16 20:46    [W:4.311 / U:6.996 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site