|
@@ -54,7 +54,7 @@ static int __init parse_ioapics_under_ir(void);
|
|
|
|
|
|
static struct irq_2_iommu *irq_2_iommu(unsigned int irq)
|
|
static struct irq_2_iommu *irq_2_iommu(unsigned int irq)
|
|
{
|
|
{
|
|
- struct irq_cfg *cfg = irq_get_chip_data(irq);
|
|
|
|
|
|
+ struct irq_cfg *cfg = irq_cfg(irq);
|
|
return cfg ? &cfg->irq_2_iommu : NULL;
|
|
return cfg ? &cfg->irq_2_iommu : NULL;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -85,7 +85,7 @@ static int alloc_irte(struct intel_iommu *iommu, int irq, u16 count)
|
|
{
|
|
{
|
|
struct ir_table *table = iommu->ir_table;
|
|
struct ir_table *table = iommu->ir_table;
|
|
struct irq_2_iommu *irq_iommu = irq_2_iommu(irq);
|
|
struct irq_2_iommu *irq_iommu = irq_2_iommu(irq);
|
|
- struct irq_cfg *cfg = irq_get_chip_data(irq);
|
|
|
|
|
|
+ struct irq_cfg *cfg = irq_cfg(irq);
|
|
unsigned int mask = 0;
|
|
unsigned int mask = 0;
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
int index;
|
|
int index;
|
|
@@ -153,7 +153,7 @@ static int map_irq_to_irte_handle(int irq, u16 *sub_handle)
|
|
static int set_irte_irq(int irq, struct intel_iommu *iommu, u16 index, u16 subhandle)
|
|
static int set_irte_irq(int irq, struct intel_iommu *iommu, u16 index, u16 subhandle)
|
|
{
|
|
{
|
|
struct irq_2_iommu *irq_iommu = irq_2_iommu(irq);
|
|
struct irq_2_iommu *irq_iommu = irq_2_iommu(irq);
|
|
- struct irq_cfg *cfg = irq_get_chip_data(irq);
|
|
|
|
|
|
+ struct irq_cfg *cfg = irq_cfg(irq);
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
|
|
|
|
if (!irq_iommu)
|
|
if (!irq_iommu)
|
|
@@ -1050,7 +1050,7 @@ static int
|
|
intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,
|
|
intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,
|
|
bool force)
|
|
bool force)
|
|
{
|
|
{
|
|
- struct irq_cfg *cfg = data->chip_data;
|
|
|
|
|
|
+ struct irq_cfg *cfg = irqd_cfg(data);
|
|
unsigned int dest, irq = data->irq;
|
|
unsigned int dest, irq = data->irq;
|
|
struct irte irte;
|
|
struct irte irte;
|
|
int err;
|
|
int err;
|
|
@@ -1105,7 +1105,7 @@ static void intel_compose_msi_msg(struct pci_dev *pdev,
|
|
u16 sub_handle = 0;
|
|
u16 sub_handle = 0;
|
|
int ir_index;
|
|
int ir_index;
|
|
|
|
|
|
- cfg = irq_get_chip_data(irq);
|
|
|
|
|
|
+ cfg = irq_cfg(irq);
|
|
|
|
|
|
ir_index = map_irq_to_irte_handle(irq, &sub_handle);
|
|
ir_index = map_irq_to_irte_handle(irq, &sub_handle);
|
|
BUG_ON(ir_index == -1);
|
|
BUG_ON(ir_index == -1);
|