timers hpet updates for 2.6.33
Linus,
Please pull the latest timers-for-linus-hpet git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git timers-for-linus-hpet
Thanks,
tglx
------------------>
Jan Beulich (1):
x86, hpet: Simplify the HPET code
Shaohua Li (1):
x86, hpet: Disable per-cpu hpet timer if ARAT is supported
Suresh Siddha (2):
intr-remap: generic support for remapping HPET MSIs
x86: arch specific support for remapping HPET MSIs
Thomas Gleixner (1):
x86: hpet: Make WARN_ON understandable
arch/x86/include/asm/hpet.h | 7 ++- arch/x86/kernel/acpi/boot.c | 1 + arch/x86/kernel/apic/io_apic.c | 49 ++++++++++++++++++---- arch/x86/kernel/hpet.c | 77 ++++++++++++++++++++++------------ drivers/pci/intr_remapping.c | 89 ++++++++++++++++++++++++++++++++++++++-- drivers/pci/intr_remapping.h | 7 +++ include/linux/dmar.h | 10 ++++ include/linux/hpet.h | 2 + 8 files changed, 199 insertions(+), 43 deletions(-)
arch/x86/include/asm/hpet.h +4 -3
@@ -65,11 +65,12 @@/* hpet memory map physical address */ extern unsigned long hpet_address;extern unsigned long force_hpet_address; +extern u8 hpet_blockid;extern int hpet_force_user;extern int is_hpet_enabled (void );extern int hpet_enable (void );extern void hpet_disable (void ); -extern unsigned long hpet_readl (unsigned long a); +extern unsigned int hpet_readl (unsigned int a);extern void force_hpet_resume (void );extern void hpet_msi_unmask (unsigned int irq);
@@ -78,9 +79,9 @@ extern void hpet_msi_write(unsigned int irq, struct msi_msg *msg);extern void hpet_msi_read (unsigned int irq,struct msi_msg *msg);#ifdef CONFIG_PCI_MSI -extern int arch_setup_hpet_msi (unsigned int irq); +extern int arch_setup_hpet_msi (unsigned int irq,unsigned int id);#else -static inline int arch_setup_hpet_msi (unsigned int irq) +static inline int arch_setup_hpet_msi (unsigned int irq,unsigned int id) {return -EINVAL ; }
arch/x86/kernel/acpi/boot.c +1 -0
@@ -624,6 +624,7 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table) } hpet_address = hpet_tbl->address.address; + hpet_blockid = hpet_tbl->sequence;/* * Some broken BIOSes advertise HPET at 0x0. We really do not
arch/x86/kernel/apic/io_apic.c +41 -8
95 lines not on this page · raw message
arch/x86/kernel/hpet.c +49 -28
232 lines not on this page · raw message
drivers/pci/intr_remapping.c +85 -4
137 lines not on this page · raw message
drivers/pci/intr_remapping.h +7 -0
@@ -7,4 +7,11 @@ struct ioapic_scope {unsigned int devfn;/* PCI devfn number */ }; +struct hpet_scope { +struct intel_iommu *iommu; +u8 id; +unsigned int bus; +unsigned int devfn; +}; +#define IR_X2APIC_MODE (mode) (mode ? (1 << 11) : 0)
include/linux/dmar.h +10 -0
@@ -126,7 +126,9 @@ extern int free_irte(int irq);extern int irq_remapped (int irq);extern struct intel_iommu *map_dev_to_ir (struct pci_dev *dev);extern struct intel_iommu *map_ioapic_to_ir (int apic); +extern struct intel_iommu *map_hpet_to_ir (u8 id);extern int set_ioapic_sid (struct irte *irte,int apic); +extern int set_hpet_sid (struct irte *irte,u8 id);extern int set_msi_sid (struct irte *irte,struct pci_dev *dev);#else static inline int alloc_irte (struct intel_iommu *iommu,int irq,u16 count)
@@ -158,10 +160,18 @@ static inline struct intel_iommu *map_ioapic_to_ir(int apic) {return NULL ; } +static inline struct intel_iommu *map_hpet_to_ir (unsigned int hpet_id) +{ +return NULL ; +}static inline int set_ioapic_sid (struct irte *irte,int apic) {return 0 ; } +static inline int set_hpet_sid (struct irte *irte,u8 id) +{ +return -1 ; +}static inline int set_msi_sid (struct irte *irte,struct pci_dev *dev) {return 0 ;
include/linux/hpet.h +2 -0
@@ -126,4 +126,6 @@ struct hpet_info {#define HPET_DPI _IO('h', 0x05)/* disable periodic */ #define HPET_IRQFREQ _IOW('h', 0x6, unsigned long)/* IRQFREQ usec */ +#define MAX_HPET_TBS 8/* maximum hpet timer blocks */ +#endif /* !__HPET__ */