mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
iommu: rename intr_remapping references to irq_remapping
Make the code consistent with the naming conventions of irq subsystem. Signed-off-by: Suresh Siddha <[email protected]> Cc: Joerg Roedel <[email protected]> Cc: Yinghai Lu <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Alex Williamson <[email protected]> Signed-off-by: Joerg Roedel <[email protected]>
This commit is contained in:
Suresh Siddha
Joerg Roedel
parent
263b5e8629
commit
95a02e976c
9 changed files with 148 additions and 145 deletions
|
|
@ -556,7 +556,7 @@ int __init detect_intel_iommu(void)
|
|||
|
||||
dmar = (struct acpi_table_dmar *) dmar_tbl;
|
||||
|
||||
if (ret && intr_remapping_enabled && cpu_has_x2apic &&
|
||||
if (ret && irq_remapping_enabled && cpu_has_x2apic &&
|
||||
dmar->flags & 0x1)
|
||||
printk(KERN_INFO
|
||||
"Queued invalidation will be enabled to support x2apic and Intr-remapping.\n");
|
||||
|
|
@ -1042,7 +1042,7 @@ static const char *dma_remap_fault_reasons[] =
|
|||
"non-zero reserved fields in PTE",
|
||||
};
|
||||
|
||||
static const char *intr_remap_fault_reasons[] =
|
||||
static const char *irq_remap_fault_reasons[] =
|
||||
{
|
||||
"Detected reserved fields in the decoded interrupt-remapped request",
|
||||
"Interrupt index exceeded the interrupt-remapping table size",
|
||||
|
|
@ -1058,9 +1058,9 @@ static const char *intr_remap_fault_reasons[] =
|
|||
const char *dmar_get_fault_reason(u8 fault_reason, int *fault_type)
|
||||
{
|
||||
if (fault_reason >= 0x20 && (fault_reason <= 0x20 +
|
||||
ARRAY_SIZE(intr_remap_fault_reasons))) {
|
||||
ARRAY_SIZE(irq_remap_fault_reasons))) {
|
||||
*fault_type = INTR_REMAP;
|
||||
return intr_remap_fault_reasons[fault_reason - 0x20];
|
||||
return irq_remap_fault_reasons[fault_reason - 0x20];
|
||||
} else if (fault_reason < ARRAY_SIZE(dma_remap_fault_reasons)) {
|
||||
*fault_type = DMA_REMAP;
|
||||
return dma_remap_fault_reasons[fault_reason];
|
||||
|
|
|
|||
|
|
@ -4083,7 +4083,7 @@ static int intel_iommu_domain_has_cap(struct iommu_domain *domain,
|
|||
if (cap == IOMMU_CAP_CACHE_COHERENCY)
|
||||
return dmar_domain->iommu_snooping;
|
||||
if (cap == IOMMU_CAP_INTR_REMAP)
|
||||
return intr_remapping_enabled;
|
||||
return irq_remapping_enabled;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -394,7 +394,7 @@ static int set_msi_sid(struct irte *irte, struct pci_dev *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void iommu_set_intr_remapping(struct intel_iommu *iommu, int mode)
|
||||
static void iommu_set_irq_remapping(struct intel_iommu *iommu, int mode)
|
||||
{
|
||||
u64 addr;
|
||||
u32 sts;
|
||||
|
|
@ -434,7 +434,7 @@ static void iommu_set_intr_remapping(struct intel_iommu *iommu, int mode)
|
|||
}
|
||||
|
||||
|
||||
static int intel_setup_intr_remapping(struct intel_iommu *iommu, int mode)
|
||||
static int intel_setup_irq_remapping(struct intel_iommu *iommu, int mode)
|
||||
{
|
||||
struct ir_table *ir_table;
|
||||
struct page *pages;
|
||||
|
|
@ -457,14 +457,14 @@ static int intel_setup_intr_remapping(struct intel_iommu *iommu, int mode)
|
|||
|
||||
ir_table->base = page_address(pages);
|
||||
|
||||
iommu_set_intr_remapping(iommu, mode);
|
||||
iommu_set_irq_remapping(iommu, mode);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Disable Interrupt Remapping.
|
||||
*/
|
||||
static void iommu_disable_intr_remapping(struct intel_iommu *iommu)
|
||||
static void iommu_disable_irq_remapping(struct intel_iommu *iommu)
|
||||
{
|
||||
unsigned long flags;
|
||||
u32 sts;
|
||||
|
|
@ -503,11 +503,11 @@ static int __init dmar_x2apic_optout(void)
|
|||
return dmar->flags & DMAR_X2APIC_OPT_OUT;
|
||||
}
|
||||
|
||||
static int __init intel_intr_remapping_supported(void)
|
||||
static int __init intel_irq_remapping_supported(void)
|
||||
{
|
||||
struct dmar_drhd_unit *drhd;
|
||||
|
||||
if (disable_intremap)
|
||||
if (disable_irq_remap)
|
||||
return 0;
|
||||
|
||||
if (!dmar_ir_support())
|
||||
|
|
@ -523,7 +523,7 @@ static int __init intel_intr_remapping_supported(void)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static int __init intel_enable_intr_remapping(void)
|
||||
static int __init intel_enable_irq_remapping(void)
|
||||
{
|
||||
struct dmar_drhd_unit *drhd;
|
||||
int setup = 0;
|
||||
|
|
@ -561,7 +561,7 @@ static int __init intel_enable_intr_remapping(void)
|
|||
* Disable intr remapping and queued invalidation, if already
|
||||
* enabled prior to OS handover.
|
||||
*/
|
||||
iommu_disable_intr_remapping(iommu);
|
||||
iommu_disable_irq_remapping(iommu);
|
||||
|
||||
dmar_disable_qi(iommu);
|
||||
}
|
||||
|
|
@ -607,7 +607,7 @@ static int __init intel_enable_intr_remapping(void)
|
|||
if (!ecap_ir_support(iommu->ecap))
|
||||
continue;
|
||||
|
||||
if (intel_setup_intr_remapping(iommu, eim))
|
||||
if (intel_setup_irq_remapping(iommu, eim))
|
||||
goto error;
|
||||
|
||||
setup = 1;
|
||||
|
|
@ -616,7 +616,7 @@ static int __init intel_enable_intr_remapping(void)
|
|||
if (!setup)
|
||||
goto error;
|
||||
|
||||
intr_remapping_enabled = 1;
|
||||
irq_remapping_enabled = 1;
|
||||
pr_info("Enabled IRQ remapping in %s mode\n", eim ? "x2apic" : "xapic");
|
||||
|
||||
return eim ? IRQ_REMAP_X2APIC_MODE : IRQ_REMAP_XAPIC_MODE;
|
||||
|
|
@ -759,14 +759,14 @@ int __init parse_ioapics_under_ir(void)
|
|||
|
||||
int __init ir_dev_scope_init(void)
|
||||
{
|
||||
if (!intr_remapping_enabled)
|
||||
if (!irq_remapping_enabled)
|
||||
return 0;
|
||||
|
||||
return dmar_dev_scope_init();
|
||||
}
|
||||
rootfs_initcall(ir_dev_scope_init);
|
||||
|
||||
static void disable_intr_remapping(void)
|
||||
static void disable_irq_remapping(void)
|
||||
{
|
||||
struct dmar_drhd_unit *drhd;
|
||||
struct intel_iommu *iommu = NULL;
|
||||
|
|
@ -778,11 +778,11 @@ static void disable_intr_remapping(void)
|
|||
if (!ecap_ir_support(iommu->ecap))
|
||||
continue;
|
||||
|
||||
iommu_disable_intr_remapping(iommu);
|
||||
iommu_disable_irq_remapping(iommu);
|
||||
}
|
||||
}
|
||||
|
||||
static int reenable_intr_remapping(int eim)
|
||||
static int reenable_irq_remapping(int eim)
|
||||
{
|
||||
struct dmar_drhd_unit *drhd;
|
||||
int setup = 0;
|
||||
|
|
@ -800,7 +800,7 @@ static int reenable_intr_remapping(int eim)
|
|||
continue;
|
||||
|
||||
/* Set up interrupt remapping for iommu.*/
|
||||
iommu_set_intr_remapping(iommu, eim);
|
||||
iommu_set_irq_remapping(iommu, eim);
|
||||
setup = 1;
|
||||
}
|
||||
|
||||
|
|
@ -1049,11 +1049,11 @@ static int intel_setup_hpet_msi(unsigned int irq, unsigned int id)
|
|||
}
|
||||
|
||||
struct irq_remap_ops intel_irq_remap_ops = {
|
||||
.supported = intel_intr_remapping_supported,
|
||||
.hardware_init = dmar_table_init,
|
||||
.hardware_enable = intel_enable_intr_remapping,
|
||||
.hardware_disable = disable_intr_remapping,
|
||||
.hardware_reenable = reenable_intr_remapping,
|
||||
.supported = intel_irq_remapping_supported,
|
||||
.prepare = dmar_table_init,
|
||||
.enable = intel_enable_irq_remapping,
|
||||
.disable = disable_irq_remapping,
|
||||
.reenable = reenable_irq_remapping,
|
||||
.enable_faulting = enable_drhd_fault_handling,
|
||||
.setup_ioapic_entry = intel_setup_ioapic_entry,
|
||||
.set_affinity = intel_ioapic_set_affinity,
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
|
||||
#include "intr_remapping.h"
|
||||
|
||||
int intr_remapping_enabled;
|
||||
int irq_remapping_enabled;
|
||||
|
||||
int disable_intremap;
|
||||
int disable_irq_remap;
|
||||
int disable_sourceid_checking;
|
||||
int no_x2apic_optout;
|
||||
|
||||
|
|
@ -14,21 +14,21 @@ static struct irq_remap_ops *remap_ops;
|
|||
|
||||
static __init int setup_nointremap(char *str)
|
||||
{
|
||||
disable_intremap = 1;
|
||||
disable_irq_remap = 1;
|
||||
return 0;
|
||||
}
|
||||
early_param("nointremap", setup_nointremap);
|
||||
|
||||
static __init int setup_intremap(char *str)
|
||||
static __init int setup_irqremap(char *str)
|
||||
{
|
||||
if (!str)
|
||||
return -EINVAL;
|
||||
|
||||
while (*str) {
|
||||
if (!strncmp(str, "on", 2))
|
||||
disable_intremap = 0;
|
||||
disable_irq_remap = 0;
|
||||
else if (!strncmp(str, "off", 3))
|
||||
disable_intremap = 1;
|
||||
disable_irq_remap = 1;
|
||||
else if (!strncmp(str, "nosid", 5))
|
||||
disable_sourceid_checking = 1;
|
||||
else if (!strncmp(str, "no_x2apic_optout", 16))
|
||||
|
|
@ -41,16 +41,16 @@ static __init int setup_intremap(char *str)
|
|||
|
||||
return 0;
|
||||
}
|
||||
early_param("intremap", setup_intremap);
|
||||
early_param("intremap", setup_irqremap);
|
||||
|
||||
void __init setup_intr_remapping(void)
|
||||
void __init setup_irq_remapping_ops(void)
|
||||
{
|
||||
remap_ops = &intel_irq_remap_ops;
|
||||
}
|
||||
|
||||
int intr_remapping_supported(void)
|
||||
int irq_remapping_supported(void)
|
||||
{
|
||||
if (disable_intremap)
|
||||
if (disable_irq_remap)
|
||||
return 0;
|
||||
|
||||
if (!remap_ops || !remap_ops->supported)
|
||||
|
|
@ -59,39 +59,39 @@ int intr_remapping_supported(void)
|
|||
return remap_ops->supported();
|
||||
}
|
||||
|
||||
int __init intr_hardware_init(void)
|
||||
int __init irq_remapping_prepare(void)
|
||||
{
|
||||
if (!remap_ops || !remap_ops->hardware_init)
|
||||
if (!remap_ops || !remap_ops->prepare)
|
||||
return -ENODEV;
|
||||
|
||||
return remap_ops->hardware_init();
|
||||
return remap_ops->prepare();
|
||||
}
|
||||
|
||||
int __init intr_hardware_enable(void)
|
||||
int __init irq_remapping_enable(void)
|
||||
{
|
||||
if (!remap_ops || !remap_ops->hardware_enable)
|
||||
if (!remap_ops || !remap_ops->enable)
|
||||
return -ENODEV;
|
||||
|
||||
return remap_ops->hardware_enable();
|
||||
return remap_ops->enable();
|
||||
}
|
||||
|
||||
void intr_hardware_disable(void)
|
||||
void irq_remapping_disable(void)
|
||||
{
|
||||
if (!remap_ops || !remap_ops->hardware_disable)
|
||||
if (!remap_ops || !remap_ops->disable)
|
||||
return;
|
||||
|
||||
remap_ops->hardware_disable();
|
||||
remap_ops->disable();
|
||||
}
|
||||
|
||||
int intr_hardware_reenable(int mode)
|
||||
int irq_remapping_reenable(int mode)
|
||||
{
|
||||
if (!remap_ops || !remap_ops->hardware_reenable)
|
||||
if (!remap_ops || !remap_ops->reenable)
|
||||
return 0;
|
||||
|
||||
return remap_ops->hardware_reenable(mode);
|
||||
return remap_ops->reenable(mode);
|
||||
}
|
||||
|
||||
int __init intr_enable_fault_handling(void)
|
||||
int __init irq_remap_enable_fault_handling(void)
|
||||
{
|
||||
if (!remap_ops || !remap_ops->enable_faulting)
|
||||
return -ENODEV;
|
||||
|
|
@ -99,10 +99,10 @@ int __init intr_enable_fault_handling(void)
|
|||
return remap_ops->enable_faulting();
|
||||
}
|
||||
|
||||
int intr_setup_ioapic_entry(int irq,
|
||||
struct IO_APIC_route_entry *entry,
|
||||
unsigned int destination, int vector,
|
||||
struct io_apic_irq_attr *attr)
|
||||
int setup_ioapic_remapped_entry(int irq,
|
||||
struct IO_APIC_route_entry *entry,
|
||||
unsigned int destination, int vector,
|
||||
struct io_apic_irq_attr *attr)
|
||||
{
|
||||
if (!remap_ops || !remap_ops->setup_ioapic_entry)
|
||||
return -ENODEV;
|
||||
|
|
@ -111,8 +111,8 @@ int intr_setup_ioapic_entry(int irq,
|
|||
vector, attr);
|
||||
}
|
||||
|
||||
int intr_set_affinity(struct irq_data *data, const struct cpumask *mask,
|
||||
bool force)
|
||||
int set_remapped_irq_affinity(struct irq_data *data, const struct cpumask *mask,
|
||||
bool force)
|
||||
{
|
||||
if (!remap_ops || !remap_ops->set_affinity)
|
||||
return 0;
|
||||
|
|
@ -120,7 +120,7 @@ int intr_set_affinity(struct irq_data *data, const struct cpumask *mask,
|
|||
return remap_ops->set_affinity(data, mask, force);
|
||||
}
|
||||
|
||||
void intr_free_irq(int irq)
|
||||
void free_remapped_irq(int irq)
|
||||
{
|
||||
if (!remap_ops || !remap_ops->free_irq)
|
||||
return;
|
||||
|
|
@ -128,9 +128,9 @@ void intr_free_irq(int irq)
|
|||
remap_ops->free_irq(irq);
|
||||
}
|
||||
|
||||
void intr_compose_msi_msg(struct pci_dev *pdev,
|
||||
unsigned int irq, unsigned int dest,
|
||||
struct msi_msg *msg, u8 hpet_id)
|
||||
void compose_remapped_msi_msg(struct pci_dev *pdev,
|
||||
unsigned int irq, unsigned int dest,
|
||||
struct msi_msg *msg, u8 hpet_id)
|
||||
{
|
||||
if (!remap_ops || !remap_ops->compose_msi_msg)
|
||||
return;
|
||||
|
|
@ -138,7 +138,7 @@ void intr_compose_msi_msg(struct pci_dev *pdev,
|
|||
remap_ops->compose_msi_msg(pdev, irq, dest, msg, hpet_id);
|
||||
}
|
||||
|
||||
int intr_msi_alloc_irq(struct pci_dev *pdev, int irq, int nvec)
|
||||
int msi_alloc_remapped_irq(struct pci_dev *pdev, int irq, int nvec)
|
||||
{
|
||||
if (!remap_ops || !remap_ops->msi_alloc_irq)
|
||||
return -ENODEV;
|
||||
|
|
@ -146,8 +146,8 @@ int intr_msi_alloc_irq(struct pci_dev *pdev, int irq, int nvec)
|
|||
return remap_ops->msi_alloc_irq(pdev, irq, nvec);
|
||||
}
|
||||
|
||||
int intr_msi_setup_irq(struct pci_dev *pdev, unsigned int irq,
|
||||
int index, int sub_handle)
|
||||
int msi_setup_remapped_irq(struct pci_dev *pdev, unsigned int irq,
|
||||
int index, int sub_handle)
|
||||
{
|
||||
if (!remap_ops || !remap_ops->msi_setup_irq)
|
||||
return -ENODEV;
|
||||
|
|
@ -155,7 +155,7 @@ int intr_msi_setup_irq(struct pci_dev *pdev, unsigned int irq,
|
|||
return remap_ops->msi_setup_irq(pdev, irq, index, sub_handle);
|
||||
}
|
||||
|
||||
int intr_setup_hpet_msi(unsigned int irq, unsigned int id)
|
||||
int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
|
||||
{
|
||||
if (!remap_ops || !remap_ops->setup_hpet_msi)
|
||||
return -ENODEV;
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ struct cpumask;
|
|||
struct pci_dev;
|
||||
struct msi_msg;
|
||||
|
||||
extern int disable_intremap;
|
||||
extern int disable_irq_remap;
|
||||
extern int disable_sourceid_checking;
|
||||
extern int no_x2apic_optout;
|
||||
|
||||
|
|
@ -40,16 +40,16 @@ struct irq_remap_ops {
|
|||
int (*supported)(void);
|
||||
|
||||
/* Initializes hardware and makes it ready for remapping interrupts */
|
||||
int (*hardware_init)(void);
|
||||
int (*prepare)(void);
|
||||
|
||||
/* Enables the remapping hardware */
|
||||
int (*hardware_enable)(void);
|
||||
int (*enable)(void);
|
||||
|
||||
/* Disables the remapping hardware */
|
||||
void (*hardware_disable)(void);
|
||||
void (*disable)(void);
|
||||
|
||||
/* Reenables the remapping hardware */
|
||||
int (*hardware_reenable)(int);
|
||||
int (*reenable)(int);
|
||||
|
||||
/* Enable fault handling */
|
||||
int (*enable_faulting)(void);
|
||||
|
|
|
|||
Loading…
Reference in a new issue