leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86_ioapic_Consolidate_IOAPIC_allocation

Browse Source 
Move the IOAPIC specific fields into their own struct and reuse the common
devid. Get rid of the #ifdeffery as it does not matter at all whether the
alloc info is a couple of bytes longer or not.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Wei Liu <wei.liu@kernel.org>
Acked-by: Joerg Roedel <jroedel@suse.de>
Link: https://lore.kernel.org/r/20200826112332.054367732@linutronix.de
This commit is contained in:
Thomas Gleixner 2020-08-26 13:16:42 +02:00
parent 2bf1e7bced
commit 33a65ba470
6 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
arch/x86/include/asm/hw_irq.h
View File

@ -44,6 +44,15 @@ enum irq_alloc_type {
X86_IRQ_ALLOC_TYPE_HPET_GET_PARENT, X86_IRQ_ALLOC_TYPE_HPET_GET_PARENT,
}; };
struct ioapic_alloc_info {
int pin;
int node;
u32 trigger : 1;
u32 polarity : 1;
u32 valid : 1;
struct IO_APIC_route_entry *entry;
};
/** /**
* irq_alloc_info - X86 specific interrupt allocation info * irq_alloc_info - X86 specific interrupt allocation info
* @type: X86 specific allocation type * @type: X86 specific allocation type
@ -53,6 +62,8 @@ enum irq_alloc_type {
* @mask: CPU mask for vector allocation * @mask: CPU mask for vector allocation
* @desc: Pointer to msi descriptor * @desc: Pointer to msi descriptor
* @data: Allocation specific data * @data: Allocation specific data
*
* @ioapic: IOAPIC specific allocation data
*/ */
struct irq_alloc_info { struct irq_alloc_info {
enum irq_alloc_type type; enum irq_alloc_type type;
@ -64,6 +75,7 @@ struct irq_alloc_info {
void *data; void *data;
union { union {
struct ioapic_alloc_info ioapic;
int unused; int unused;
#ifdef CONFIG_PCI_MSI #ifdef CONFIG_PCI_MSI
struct { struct {
@ -71,17 +83,6 @@ struct irq_alloc_info {
irq_hw_number_t msi_hwirq; irq_hw_number_t msi_hwirq;
}; };
#endif #endif
#ifdef CONFIG_X86_IO_APIC
struct {
int ioapic_id;
int ioapic_pin;
int ioapic_node;
u32 ioapic_trigger : 1;
u32 ioapic_polarity : 1;
u32 ioapic_valid : 1;
struct IO_APIC_route_entry *ioapic_entry;
};
#endif
#ifdef CONFIG_DMAR_TABLE #ifdef CONFIG_DMAR_TABLE
struct { struct {
int dmar_id; int dmar_id;

70
arch/x86/kernel/apic/io_apic.c
View File

@ -860,10 +860,10 @@ void ioapic_set_alloc_attr(struct irq_alloc_info *info, int node,
{ {
init_irq_alloc_info(info, NULL); init_irq_alloc_info(info, NULL);
info->type = X86_IRQ_ALLOC_TYPE_IOAPIC; info->type = X86_IRQ_ALLOC_TYPE_IOAPIC;
info->ioapic_node = node; info->ioapic.node = node;
info->ioapic_trigger = trigger; info->ioapic.trigger = trigger;
info->ioapic_polarity = polarity; info->ioapic.polarity = polarity;
info->ioapic_valid = 1; info->ioapic.valid = 1;
} }
#ifndef CONFIG_ACPI #ifndef CONFIG_ACPI
@ -878,32 +878,32 @@ static void ioapic_copy_alloc_attr(struct irq_alloc_info *dst,
copy_irq_alloc_info(dst, src); copy_irq_alloc_info(dst, src);
dst->type = X86_IRQ_ALLOC_TYPE_IOAPIC; dst->type = X86_IRQ_ALLOC_TYPE_IOAPIC;
dst->ioapic_id = mpc_ioapic_id(ioapic_idx); dst->devid = mpc_ioapic_id(ioapic_idx);
dst->ioapic_pin = pin; dst->ioapic.pin = pin;
dst->ioapic_valid = 1; dst->ioapic.valid = 1;
if (src && src->ioapic_valid) { if (src && src->ioapic.valid) {
dst->ioapic_node = src->ioapic_node; dst->ioapic.node = src->ioapic.node;
dst->ioapic_trigger = src->ioapic_trigger; dst->ioapic.trigger = src->ioapic.trigger;
dst->ioapic_polarity = src->ioapic_polarity; dst->ioapic.polarity = src->ioapic.polarity;
} else { } else {
dst->ioapic_node = NUMA_NO_NODE; dst->ioapic.node = NUMA_NO_NODE;
if (acpi_get_override_irq(gsi, &trigger, &polarity) >= 0) { if (acpi_get_override_irq(gsi, &trigger, &polarity) >= 0) {
dst->ioapic_trigger = trigger; dst->ioapic.trigger = trigger;
dst->ioapic_polarity = polarity; dst->ioapic.polarity = polarity;
} else { } else {
/* /*
* PCI interrupts are always active low level * PCI interrupts are always active low level
* triggered. * triggered.
*/ */
dst->ioapic_trigger = IOAPIC_LEVEL; dst->ioapic.trigger = IOAPIC_LEVEL;
dst->ioapic_polarity = IOAPIC_POL_LOW; dst->ioapic.polarity = IOAPIC_POL_LOW;
} }
} }
} }
static int ioapic_alloc_attr_node(struct irq_alloc_info *info) static int ioapic_alloc_attr_node(struct irq_alloc_info *info)
{ {
return (info && info->ioapic_valid) ? info->ioapic_node : NUMA_NO_NODE; return (info && info->ioapic.valid) ? info->ioapic.node : NUMA_NO_NODE;
} }
static void mp_register_handler(unsigned int irq, unsigned long trigger) static void mp_register_handler(unsigned int irq, unsigned long trigger)
@ -933,14 +933,14 @@ static bool mp_check_pin_attr(int irq, struct irq_alloc_info *info)
* pin with real trigger and polarity attributes. * pin with real trigger and polarity attributes.
*/ */
if (irq < nr_legacy_irqs() && data->count == 1) { if (irq < nr_legacy_irqs() && data->count == 1) {
if (info->ioapic_trigger != data->trigger) if (info->ioapic.trigger != data->trigger)
mp_register_handler(irq, info->ioapic_trigger); mp_register_handler(irq, info->ioapic.trigger);
data->entry.trigger = data->trigger = info->ioapic_trigger; data->entry.trigger = data->trigger = info->ioapic.trigger;
data->entry.polarity = data->polarity = info->ioapic_polarity; data->entry.polarity = data->polarity = info->ioapic.polarity;
} }
return data->trigger == info->ioapic_trigger && return data->trigger == info->ioapic.trigger &&
data->polarity == info->ioapic_polarity; data->polarity == info->ioapic.polarity;
} }
static int alloc_irq_from_domain(struct irq_domain *domain, int ioapic, u32 gsi, static int alloc_irq_from_domain(struct irq_domain *domain, int ioapic, u32 gsi,
@ -1002,7 +1002,7 @@ static int alloc_isa_irq_from_domain(struct irq_domain *domain,
if (!mp_check_pin_attr(irq, info)) if (!mp_check_pin_attr(irq, info))
return -EBUSY; return -EBUSY;
if (__add_pin_to_irq_node(irq_data->chip_data, node, ioapic, if (__add_pin_to_irq_node(irq_data->chip_data, node, ioapic,
info->ioapic_pin)) info->ioapic.pin))
return -ENOMEM; return -ENOMEM;
} else { } else {
info->flags |= X86_IRQ_ALLOC_LEGACY; info->flags |= X86_IRQ_ALLOC_LEGACY;
@ -2092,8 +2092,8 @@ static int mp_alloc_timer_irq(int ioapic, int pin)
struct irq_alloc_info info; struct irq_alloc_info info;
ioapic_set_alloc_attr(&info, NUMA_NO_NODE, 0, 0); ioapic_set_alloc_attr(&info, NUMA_NO_NODE, 0, 0);
info.ioapic_id = mpc_ioapic_id(ioapic); info.devid = mpc_ioapic_id(ioapic);
info.ioapic_pin = pin; info.ioapic.pin = pin;
mutex_lock(&ioapic_mutex); mutex_lock(&ioapic_mutex);
irq = alloc_isa_irq_from_domain(domain, 0, ioapic, pin, &info); irq = alloc_isa_irq_from_domain(domain, 0, ioapic, pin, &info);
mutex_unlock(&ioapic_mutex); mutex_unlock(&ioapic_mutex);
@ -2297,7 +2297,7 @@ static int mp_irqdomain_create(int ioapic)
init_irq_alloc_info(&info, NULL); init_irq_alloc_info(&info, NULL);
info.type = X86_IRQ_ALLOC_TYPE_IOAPIC_GET_PARENT; info.type = X86_IRQ_ALLOC_TYPE_IOAPIC_GET_PARENT;
info.ioapic_id = mpc_ioapic_id(ioapic); info.devid = mpc_ioapic_id(ioapic);
parent = irq_remapping_get_irq_domain(&info); parent = irq_remapping_get_irq_domain(&info);
if (!parent) if (!parent)
parent = x86_vector_domain; parent = x86_vector_domain;
@ -2932,9 +2932,9 @@ int mp_ioapic_registered(u32 gsi_base)
static void mp_irqdomain_get_attr(u32 gsi, struct mp_chip_data *data, static void mp_irqdomain_get_attr(u32 gsi, struct mp_chip_data *data,
struct irq_alloc_info *info) struct irq_alloc_info *info)
{ {
if (info && info->ioapic_valid) { if (info && info->ioapic.valid) {
data->trigger = info->ioapic_trigger; data->trigger = info->ioapic.trigger;
data->polarity = info->ioapic_polarity; data->polarity = info->ioapic.polarity;
} else if (acpi_get_override_irq(gsi, &data->trigger, } else if (acpi_get_override_irq(gsi, &data->trigger,
&data->polarity) < 0) { &data->polarity) < 0) {
/* PCI interrupts are always active low level triggered. */ /* PCI interrupts are always active low level triggered. */
@ -2980,7 +2980,7 @@ int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq,
return -EINVAL; return -EINVAL;
ioapic = mp_irqdomain_ioapic_idx(domain); ioapic = mp_irqdomain_ioapic_idx(domain);
pin = info->ioapic_pin; pin = info->ioapic.pin;
if (irq_find_mapping(domain, (irq_hw_number_t)pin) > 0) if (irq_find_mapping(domain, (irq_hw_number_t)pin) > 0)
return -EEXIST; return -EEXIST;
@ -2988,7 +2988,7 @@ int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq,
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
info->ioapic_entry = &data->entry; info->ioapic.entry = &data->entry;
ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, info); ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, info);
if (ret < 0) { if (ret < 0) {
kfree(data); kfree(data);
@ -2996,7 +2996,7 @@ int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq,
} }
INIT_LIST_HEAD(&data->irq_2_pin); INIT_LIST_HEAD(&data->irq_2_pin);
irq_data->hwirq = info->ioapic_pin; irq_data->hwirq = info->ioapic.pin;
irq_data->chip = (domain->parent == x86_vector_domain) ? irq_data->chip = (domain->parent == x86_vector_domain) ?
&ioapic_chip : &ioapic_ir_chip; &ioapic_chip : &ioapic_ir_chip;
irq_data->chip_data = data; irq_data->chip_data = data;
@ -3006,8 +3006,8 @@ int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq,
add_pin_to_irq_node(data, ioapic_alloc_attr_node(info), ioapic, pin); add_pin_to_irq_node(data, ioapic_alloc_attr_node(info), ioapic, pin);
local_irq_save(flags); local_irq_save(flags);
if (info->ioapic_entry) if (info->ioapic.entry)
mp_setup_entry(cfg, data, info->ioapic_entry); mp_setup_entry(cfg, data, info->ioapic.entry);
mp_register_handler(virq, data->trigger); mp_register_handler(virq, data->trigger);
if (virq < nr_legacy_irqs()) if (virq < nr_legacy_irqs())
legacy_pic->mask(virq); legacy_pic->mask(virq);

4
arch/x86/kernel/devicetree.c
View File

@ -229,8 +229,8 @@ static int dt_irqdomain_alloc(struct irq_domain *domain, unsigned int virq,
it = &of_ioapic_type[type_index]; it = &of_ioapic_type[type_index];
ioapic_set_alloc_attr(&tmp, NUMA_NO_NODE, it->trigger, it->polarity); ioapic_set_alloc_attr(&tmp, NUMA_NO_NODE, it->trigger, it->polarity);
tmp.ioapic_id = mpc_ioapic_id(mp_irqdomain_ioapic_idx(domain)); tmp.devid = mpc_ioapic_id(mp_irqdomain_ioapic_idx(domain));
tmp.ioapic_pin = fwspec->param[0]; tmp.ioapic.pin = fwspec->param[0];
return mp_irqdomain_alloc(domain, virq, nr_irqs, &tmp); return mp_irqdomain_alloc(domain, virq, nr_irqs, &tmp);
} }

14
drivers/iommu/amd/iommu.c
View File

@ -3522,7 +3522,7 @@ static int get_devid(struct irq_alloc_info *info)
switch (info->type) { switch (info->type) {
case X86_IRQ_ALLOC_TYPE_IOAPIC: case X86_IRQ_ALLOC_TYPE_IOAPIC:
case X86_IRQ_ALLOC_TYPE_IOAPIC_GET_PARENT: case X86_IRQ_ALLOC_TYPE_IOAPIC_GET_PARENT:
return get_ioapic_devid(info->ioapic_id); return get_ioapic_devid(info->devid);
case X86_IRQ_ALLOC_TYPE_HPET: case X86_IRQ_ALLOC_TYPE_HPET:
case X86_IRQ_ALLOC_TYPE_HPET_GET_PARENT: case X86_IRQ_ALLOC_TYPE_HPET_GET_PARENT:
return get_hpet_devid(info->devid); return get_hpet_devid(info->devid);
@ -3600,15 +3600,15 @@ static void irq_remapping_prepare_irte(struct amd_ir_data *data,
switch (info->type) { switch (info->type) {
case X86_IRQ_ALLOC_TYPE_IOAPIC: case X86_IRQ_ALLOC_TYPE_IOAPIC:
/* Setup IOAPIC entry */ /* Setup IOAPIC entry */
entry = info->ioapic_entry; entry = info->ioapic.entry;
info->ioapic_entry = NULL; info->ioapic.entry = NULL;
memset(entry, 0, sizeof(*entry)); memset(entry, 0, sizeof(*entry));
entry->vector = index; entry->vector = index;
entry->mask = 0; entry->mask = 0;
entry->trigger = info->ioapic_trigger; entry->trigger = info->ioapic.trigger;
entry->polarity = info->ioapic_polarity; entry->polarity = info->ioapic.polarity;
/* Mask level triggered irqs. */ /* Mask level triggered irqs. */
if (info->ioapic_trigger) if (info->ioapic.trigger)
entry->mask = 1; entry->mask = 1;
break; break;
@ -3694,7 +3694,7 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,
iommu->irte_ops->set_allocated(table, i); iommu->irte_ops->set_allocated(table, i);
} }
WARN_ON(table->min_index != 32); WARN_ON(table->min_index != 32);
index = info->ioapic_pin; index = info->ioapic.pin;
} else { } else {
index = -ENOMEM; index = -ENOMEM;
} }

2
drivers/iommu/hyperv-iommu.c
View File

@ -101,7 +101,7 @@ static int hyperv_irq_remapping_alloc(struct irq_domain *domain,
* in the chip_data and hyperv_irq_remapping_activate()/hyperv_ir_set_ * in the chip_data and hyperv_irq_remapping_activate()/hyperv_ir_set_
* affinity() set vector and dest_apicid directly into IO-APIC entry. * affinity() set vector and dest_apicid directly into IO-APIC entry.
*/ */
irq_data->chip_data = info->ioapic_entry; irq_data->chip_data = info->ioapic.entry;
/* /*
* Hypver-V IO APIC irq affinity should be in the scope of * Hypver-V IO APIC irq affinity should be in the scope of

18
drivers/iommu/intel/irq_remapping.c
View File

@ -1119,7 +1119,7 @@ static struct irq_domain *intel_get_irq_domain(struct irq_alloc_info *info)
switch (info->type) { switch (info->type) {
case X86_IRQ_ALLOC_TYPE_IOAPIC_GET_PARENT: case X86_IRQ_ALLOC_TYPE_IOAPIC_GET_PARENT:
return map_ioapic_to_ir(info->ioapic_id); return map_ioapic_to_ir(info->devid);
case X86_IRQ_ALLOC_TYPE_HPET_GET_PARENT: case X86_IRQ_ALLOC_TYPE_HPET_GET_PARENT:
return map_hpet_to_ir(info->devid); return map_hpet_to_ir(info->devid);
case X86_IRQ_ALLOC_TYPE_PCI_MSI: case X86_IRQ_ALLOC_TYPE_PCI_MSI:
@ -1260,16 +1260,16 @@ static void intel_irq_remapping_prepare_irte(struct intel_ir_data *data,
switch (info->type) { switch (info->type) {
case X86_IRQ_ALLOC_TYPE_IOAPIC: case X86_IRQ_ALLOC_TYPE_IOAPIC:
/* Set source-id of interrupt request */ /* Set source-id of interrupt request */
set_ioapic_sid(irte, info->ioapic_id); set_ioapic_sid(irte, info->devid);
apic_printk(APIC_VERBOSE, KERN_DEBUG "IOAPIC[%d]: Set IRTE entry (P:%d FPD:%d Dst_Mode:%d Redir_hint:%d Trig_Mode:%d Dlvry_Mode:%X Avail:%X Vector:%02X Dest:%08X SID:%04X SQ:%X SVT:%X)\n", apic_printk(APIC_VERBOSE, KERN_DEBUG "IOAPIC[%d]: Set IRTE entry (P:%d FPD:%d Dst_Mode:%d Redir_hint:%d Trig_Mode:%d Dlvry_Mode:%X Avail:%X Vector:%02X Dest:%08X SID:%04X SQ:%X SVT:%X)\n",
info->ioapic_id, irte->present, irte->fpd, info->devid, irte->present, irte->fpd,
irte->dst_mode, irte->redir_hint, irte->dst_mode, irte->redir_hint,
irte->trigger_mode, irte->dlvry_mode, irte->trigger_mode, irte->dlvry_mode,
irte->avail, irte->vector, irte->dest_id, irte->avail, irte->vector, irte->dest_id,
irte->sid, irte->sq, irte->svt); irte->sid, irte->sq, irte->svt);
entry = (struct IR_IO_APIC_route_entry *)info->ioapic_entry; entry = (struct IR_IO_APIC_route_entry *)info->ioapic.entry;
info->ioapic_entry = NULL; info->ioapic.entry = NULL;
memset(entry, 0, sizeof(*entry)); memset(entry, 0, sizeof(*entry));
entry->index2 = (index >> 15) & 0x1; entry->index2 = (index >> 15) & 0x1;
entry->zero = 0; entry->zero = 0;
@ -1279,11 +1279,11 @@ static void intel_irq_remapping_prepare_irte(struct intel_ir_data *data,
* IO-APIC RTE will be configured with virtual vector. * IO-APIC RTE will be configured with virtual vector.
* irq handler will do the explicit EOI to the io-apic. * irq handler will do the explicit EOI to the io-apic.
*/ */
entry->vector = info->ioapic_pin; entry->vector = info->ioapic.pin;
entry->mask = 0; /* enable IRQ */ entry->mask = 0; /* enable IRQ */
entry->trigger = info->ioapic_trigger; entry->trigger = info->ioapic.trigger;
entry->polarity = info->ioapic_polarity; entry->polarity = info->ioapic.polarity;
if (info->ioapic_trigger) if (info->ioapic.trigger)
entry->mask = 1; /* Mask level triggered irqs. */ entry->mask = 1; /* Mask level triggered irqs. */
break; break;