Commit71054d8841("x86, hpet: Introduce x86_msi_ops.setup_hpet_msi") introduced x86_msi_ops.setup_hpet_msi to setup hpet MSI irq when irq remapping enabled. This caused a regression of hpet MSI irq remapping. Original code flow before commit71054d8841: hpet_setup_msi_irq() arch_setup_hpet_msi() setup_hpet_msi_remapped() remap_ops->setup_hpet_msi() alloc_irte() msi_compose_msg() hpet_msi_write() ... Current code flow after commit71054d8841: hpet_setup_msi_irq() x86_msi.setup_hpet_msi() setup_hpet_msi_remapped() intel_setup_hpet_msi() alloc_irte() Currently, we only call alloc_irte() for hpet MSI, but do not composed and wrote its msg... Signed-off-by: Yijing Wang <wangyijing@huawei.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
		
			
				
	
	
		
			97 lines
		
	
	
	
		
			2.7 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			97 lines
		
	
	
	
		
			2.7 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (C) 2012 Advanced Micro Devices, Inc.
 | 
						|
 * Author: Joerg Roedel <joerg.roedel@amd.com>
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or modify it
 | 
						|
 * under the terms of the GNU General Public License version 2 as published
 | 
						|
 * by the Free Software Foundation.
 | 
						|
 *
 | 
						|
 * This program is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
 * GNU General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU General Public License
 | 
						|
 * along with this program; if not, write to the Free Software
 | 
						|
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 | 
						|
 *
 | 
						|
 * This header file contains stuff that is shared between different interrupt
 | 
						|
 * remapping drivers but with no need to be visible outside of the IOMMU layer.
 | 
						|
 */
 | 
						|
 | 
						|
#ifndef __IRQ_REMAPPING_H
 | 
						|
#define __IRQ_REMAPPING_H
 | 
						|
 | 
						|
#ifdef CONFIG_IRQ_REMAP
 | 
						|
 | 
						|
struct IO_APIC_route_entry;
 | 
						|
struct io_apic_irq_attr;
 | 
						|
struct irq_data;
 | 
						|
struct cpumask;
 | 
						|
struct pci_dev;
 | 
						|
struct msi_msg;
 | 
						|
 | 
						|
extern int disable_irq_remap;
 | 
						|
extern int irq_remap_broken;
 | 
						|
extern int disable_sourceid_checking;
 | 
						|
extern int no_x2apic_optout;
 | 
						|
extern int irq_remapping_enabled;
 | 
						|
 | 
						|
struct irq_remap_ops {
 | 
						|
	/* Check whether Interrupt Remapping is supported */
 | 
						|
	int (*supported)(void);
 | 
						|
 | 
						|
	/* Initializes hardware and makes it ready for remapping interrupts */
 | 
						|
	int  (*prepare)(void);
 | 
						|
 | 
						|
	/* Enables the remapping hardware */
 | 
						|
	int  (*enable)(void);
 | 
						|
 | 
						|
	/* Disables the remapping hardware */
 | 
						|
	void (*disable)(void);
 | 
						|
 | 
						|
	/* Reenables the remapping hardware */
 | 
						|
	int  (*reenable)(int);
 | 
						|
 | 
						|
	/* Enable fault handling */
 | 
						|
	int  (*enable_faulting)(void);
 | 
						|
 | 
						|
	/* IO-APIC setup routine */
 | 
						|
	int (*setup_ioapic_entry)(int irq, struct IO_APIC_route_entry *,
 | 
						|
				  unsigned int, int,
 | 
						|
				  struct io_apic_irq_attr *);
 | 
						|
 | 
						|
	/* Set the CPU affinity of a remapped interrupt */
 | 
						|
	int (*set_affinity)(struct irq_data *data, const struct cpumask *mask,
 | 
						|
			    bool force);
 | 
						|
 | 
						|
	/* Free an IRQ */
 | 
						|
	int (*free_irq)(int);
 | 
						|
 | 
						|
	/* Create MSI msg to use for interrupt remapping */
 | 
						|
	void (*compose_msi_msg)(struct pci_dev *,
 | 
						|
				unsigned int, unsigned int,
 | 
						|
				struct msi_msg *, u8);
 | 
						|
 | 
						|
	/* Allocate remapping resources for MSI */
 | 
						|
	int (*msi_alloc_irq)(struct pci_dev *, int, int);
 | 
						|
 | 
						|
	/* Setup the remapped MSI irq */
 | 
						|
	int (*msi_setup_irq)(struct pci_dev *, unsigned int, int, int);
 | 
						|
 | 
						|
	/* Setup interrupt remapping for an HPET MSI */
 | 
						|
	int (*alloc_hpet_msi)(unsigned int, unsigned int);
 | 
						|
};
 | 
						|
 | 
						|
extern struct irq_remap_ops intel_irq_remap_ops;
 | 
						|
extern struct irq_remap_ops amd_iommu_irq_ops;
 | 
						|
 | 
						|
#else  /* CONFIG_IRQ_REMAP */
 | 
						|
 | 
						|
#define irq_remapping_enabled 0
 | 
						|
#define disable_irq_remap     1
 | 
						|
#define irq_remap_broken      0
 | 
						|
 | 
						|
#endif /* CONFIG_IRQ_REMAP */
 | 
						|
 | 
						|
#endif /* __IRQ_REMAPPING_H */
 |