malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
Pull irq fixes from Thomas Gleixner:
 "Four small fixes for irqchip drivers:

   - Add missing low level irq handler initialization on mxs, so
     interrupts can acutally be delivered

   - Add a missing barrier to the GIC driver

   - Two fixes for the GIC-V3-ITS driver, addressing a double EOI write
     and a cache flush beyond the actual region"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/gic-v3: Add missing barrier to 32bit version of gic_read_iar()
  irqchip/mxs: Add missing set_handle_irq()
  irqchip/gicv3-its: Avoid cache flush beyond ITS_BASERn memory size
  irqchip/gic-v3-its: Fix double ICC_EOIR write for LPI in EOImode==1
This commit is contained in:
Linus Torvalds 2016-02-28 07:45:58 -08:00
commit f055ae04ae
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/include/asm/arch_gicv3.h
View File

@ -117,6 +117,7 @@ static inline u32 gic_read_iar(void)
u32 irqstat; u32 irqstat;
asm volatile("mrc " __stringify(ICC_IAR1) : "=r" (irqstat)); asm volatile("mrc " __stringify(ICC_IAR1) : "=r" (irqstat));
dsb(sy);
return irqstat; return irqstat;
} }

18
drivers/irqchip/irq-gic-v3-its.c
View File

@ -78,6 +78,9 @@ struct its_node {
#define ITS_ITT_ALIGN SZ_256 #define ITS_ITT_ALIGN SZ_256
/* Convert page order to size in bytes */
#define PAGE_ORDER_TO_SIZE(o) (PAGE_SIZE << (o))
struct event_lpi_map { struct event_lpi_map {
unsigned long *lpi_map; unsigned long *lpi_map;
u16 *col_map; u16 *col_map;
@ -600,11 +603,6 @@ static void its_unmask_irq(struct irq_data *d)
lpi_set_config(d, true); lpi_set_config(d, true);
} }
static void its_eoi_irq(struct irq_data *d)
{
gic_write_eoir(d->hwirq);
}
static int its_set_affinity(struct irq_data *d, const struct cpumask *mask_val, static int its_set_affinity(struct irq_data *d, const struct cpumask *mask_val,
bool force) bool force)
{ {
@ -641,7 +639,7 @@ static struct irq_chip its_irq_chip = {
.name = "ITS", .name = "ITS",
.irq_mask = its_mask_irq, .irq_mask = its_mask_irq,
.irq_unmask = its_unmask_irq, .irq_unmask = its_unmask_irq,
.irq_eoi = its_eoi_irq, .irq_eoi = irq_chip_eoi_parent,
.irq_set_affinity = its_set_affinity, .irq_set_affinity = its_set_affinity,
.irq_compose_msi_msg = its_irq_compose_msi_msg, .irq_compose_msi_msg = its_irq_compose_msi_msg,
}; };
@ -846,7 +844,6 @@ static int its_alloc_tables(const char *node_name, struct its_node *its)
u64 type = GITS_BASER_TYPE(val); u64 type = GITS_BASER_TYPE(val);
u64 entry_size = GITS_BASER_ENTRY_SIZE(val); u64 entry_size = GITS_BASER_ENTRY_SIZE(val);
int order = get_order(psz); int order = get_order(psz);
int alloc_size;
int alloc_pages; int alloc_pages;
u64 tmp; u64 tmp;
void *base; void *base;
@ -878,9 +875,8 @@ static int its_alloc_tables(const char *node_name, struct its_node *its)
} }
} }
alloc_size = (1 << order) * PAGE_SIZE;
retry_alloc_baser: retry_alloc_baser:
alloc_pages = (alloc_size / psz); alloc_pages = (PAGE_ORDER_TO_SIZE(order) / psz);
if (alloc_pages > GITS_BASER_PAGES_MAX) { if (alloc_pages > GITS_BASER_PAGES_MAX) {
alloc_pages = GITS_BASER_PAGES_MAX; alloc_pages = GITS_BASER_PAGES_MAX;
order = get_order(GITS_BASER_PAGES_MAX * psz); order = get_order(GITS_BASER_PAGES_MAX * psz);
@ -933,7 +929,7 @@ retry_baser:
shr = tmp & GITS_BASER_SHAREABILITY_MASK; shr = tmp & GITS_BASER_SHAREABILITY_MASK;
if (!shr) { if (!shr) {
cache = GITS_BASER_nC; cache = GITS_BASER_nC;
__flush_dcache_area(base, alloc_size); __flush_dcache_area(base, PAGE_ORDER_TO_SIZE(order));
} }
goto retry_baser; goto retry_baser;
} }
@ -966,7 +962,7 @@ retry_baser:
} }
pr_info("ITS: allocated %d %s @%lx (psz %dK, shr %d)\n", pr_info("ITS: allocated %d %s @%lx (psz %dK, shr %d)\n",
(int)(alloc_size / entry_size), (int)(PAGE_ORDER_TO_SIZE(order) / entry_size),
its_base_type_string[type], its_base_type_string[type],
(unsigned long)virt_to_phys(base), (unsigned long)virt_to_phys(base),
psz / SZ_1K, (int)shr >> GITS_BASER_SHAREABILITY_SHIFT); psz / SZ_1K, (int)shr >> GITS_BASER_SHAREABILITY_SHIFT);