|
@@ -392,7 +392,7 @@ static void __init gic_dist_init(void)
|
|
*/
|
|
*/
|
|
affinity = gic_mpidr_to_affinity(cpu_logical_map(smp_processor_id()));
|
|
affinity = gic_mpidr_to_affinity(cpu_logical_map(smp_processor_id()));
|
|
for (i = 32; i < gic_data.irq_nr; i++)
|
|
for (i = 32; i < gic_data.irq_nr; i++)
|
|
- writeq_relaxed(affinity, base + GICD_IROUTER + i * 8);
|
|
|
|
|
|
+ gic_write_irouter(affinity, base + GICD_IROUTER + i * 8);
|
|
}
|
|
}
|
|
|
|
|
|
static int gic_populate_rdist(void)
|
|
static int gic_populate_rdist(void)
|
|
@@ -423,7 +423,7 @@ static int gic_populate_rdist(void)
|
|
}
|
|
}
|
|
|
|
|
|
do {
|
|
do {
|
|
- typer = readq_relaxed(ptr + GICR_TYPER);
|
|
|
|
|
|
+ typer = gic_read_typer(ptr + GICR_TYPER);
|
|
if ((typer >> 32) == aff) {
|
|
if ((typer >> 32) == aff) {
|
|
u64 offset = ptr - gic_data.redist_regions[i].redist_base;
|
|
u64 offset = ptr - gic_data.redist_regions[i].redist_base;
|
|
gic_data_rdist_rd_base() = ptr;
|
|
gic_data_rdist_rd_base() = ptr;
|
|
@@ -623,7 +623,7 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val,
|
|
reg = gic_dist_base(d) + GICD_IROUTER + (gic_irq(d) * 8);
|
|
reg = gic_dist_base(d) + GICD_IROUTER + (gic_irq(d) * 8);
|
|
val = gic_mpidr_to_affinity(cpu_logical_map(cpu));
|
|
val = gic_mpidr_to_affinity(cpu_logical_map(cpu));
|
|
|
|
|
|
- writeq_relaxed(val, reg);
|
|
|
|
|
|
+ gic_write_irouter(val, reg);
|
|
|
|
|
|
/*
|
|
/*
|
|
* If the interrupt was enabled, enabled it again. Otherwise,
|
|
* If the interrupt was enabled, enabled it again. Otherwise,
|