Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Ingo Molnar:
"Mostly irqchip driver fixes, plus a symbol export"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
kernel/irq: Export irq_set_parent()
irqchip/gic: Add missing \n to CPU IF adjustment message
irqchip/jcore: Don't show Kconfig menu item for driver
irqchip/eznps: Drop pointless static qualifier in nps400_of_init()
irqchip/gic-v3-its: Fix entry size mask for GITS_BASER
irqchip/gic-v3-its: Fix 64bit GIC{R,ITS}_TYPER accesses
+11
-10
+2
-2
drivers/irqchip/Kconfig
+2
-2
drivers/irqchip/Kconfig
···
158
158
select IRQ_DOMAIN
159
159
160
160
config JCORE_AIC
161
-
bool "J-Core integrated AIC"
162
-
depends on OF && (SUPERH || COMPILE_TEST)
161
+
bool "J-Core integrated AIC" if COMPILE_TEST
162
+
depends on OF
163
163
select IRQ_DOMAIN
164
164
help
165
165
Support for the J-Core integrated AIC.
+1
-1
drivers/irqchip/irq-eznps.c
+1
-1
drivers/irqchip/irq-eznps.c
···
135
135
static int __init nps400_of_init(struct device_node *node,
136
136
struct device_node *parent)
137
137
{
138
-
static struct irq_domain *nps400_root_domain;
138
+
struct irq_domain *nps400_root_domain;
139
139
140
140
if (parent) {
141
141
pr_err("DeviceTree incore ic not a root irq controller\n");
+5
-5
drivers/irqchip/irq-gic-v3-its.c
+5
-5
drivers/irqchip/irq-gic-v3-its.c
···
1023
1023
1024
1024
static int its_alloc_tables(struct its_node *its)
1025
1025
{
1026
-
u64 typer = readq_relaxed(its->base + GITS_TYPER);
1026
+
u64 typer = gic_read_typer(its->base + GITS_TYPER);
1027
1027
u32 ids = GITS_TYPER_DEVBITS(typer);
1028
1028
u64 shr = GITS_BASER_InnerShareable;
1029
1029
u64 cache = GITS_BASER_WaWb;
···
1198
1198
* We now have to bind each collection to its target
1199
1199
* redistributor.
1200
1200
*/
1201
-
if (readq_relaxed(its->base + GITS_TYPER) & GITS_TYPER_PTA) {
1201
+
if (gic_read_typer(its->base + GITS_TYPER) & GITS_TYPER_PTA) {
1202
1202
/*
1203
1203
* This ITS wants the physical address of the
1204
1204
* redistributor.
···
1208
1208
/*
1209
1209
* This ITS wants a linear CPU number.
1210
1210
*/
1211
-
target = readq_relaxed(gic_data_rdist_rd_base() + GICR_TYPER);
1211
+
target = gic_read_typer(gic_data_rdist_rd_base() + GICR_TYPER);
1212
1212
target = GICR_TYPER_CPU_NUMBER(target) << 16;
1213
1213
}
1214
1214
···
1691
1691
INIT_LIST_HEAD(&its->its_device_list);
1692
1692
its->base = its_base;
1693
1693
its->phys_base = res->start;
1694
-
its->ite_size = ((readl_relaxed(its_base + GITS_TYPER) >> 4) & 0xf) + 1;
1694
+
its->ite_size = ((gic_read_typer(its_base + GITS_TYPER) >> 4) & 0xf) + 1;
1695
1695
its->numa_node = numa_node;
1696
1696
1697
1697
its->cmd_base = kzalloc(ITS_CMD_QUEUE_SZ, GFP_KERNEL);
···
1763
1763
1764
1764
static bool gic_rdists_supports_plpis(void)
1765
1765
{
1766
-
return !!(readl_relaxed(gic_data_rdist_rd_base() + GICR_TYPER) & GICR_TYPER_PLPIS);
1766
+
return !!(gic_read_typer(gic_data_rdist_rd_base() + GICR_TYPER) & GICR_TYPER_PLPIS);
1767
1767
}
1768
1768
1769
1769
int its_cpu_init(void)
+1
-1
drivers/irqchip/irq-gic.c
+1
-1
drivers/irqchip/irq-gic.c
+1
-1
include/linux/irqchip/arm-gic-v3.h
+1
-1
include/linux/irqchip/arm-gic-v3.h
···
290
290
#define GITS_BASER_TYPE_SHIFT (56)
291
291
#define GITS_BASER_TYPE(r) (((r) >> GITS_BASER_TYPE_SHIFT) & 7)
292
292
#define GITS_BASER_ENTRY_SIZE_SHIFT (48)
293
-
#define GITS_BASER_ENTRY_SIZE(r) ((((r) >> GITS_BASER_ENTRY_SIZE_SHIFT) & 0xff) + 1)
293
+
#define GITS_BASER_ENTRY_SIZE(r) ((((r) >> GITS_BASER_ENTRY_SIZE_SHIFT) & 0x1f) + 1)
294
294
#define GITS_BASER_SHAREABILITY_SHIFT (10)
295
295
#define GITS_BASER_InnerShareable \
296
296
GIC_BASER_SHAREABILITY(GITS_BASER, InnerShareable)