Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad17356a authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: GICv3: remove the rtb logs of gic write and read" into msm-4.8

parents 33f345c1 62c17dca

arch/arm64/include/asm/arch_gicv3.h

+2 −2
Original line number Diff line number Diff line
@@ -188,8 +188,8 @@ static inline void gic_write_bpr1(u32 val) 
	asm volatile("msr_s " __stringify(ICC_BPR1_EL1) ", %0" : : "r" (val));

}



#define gic_read_typer(c)		readq_relaxed(c)

#define gic_write_irouter(v, c)		writeq_relaxed(v, c)

#define gic_read_typer(c)		readq_relaxed_no_log(c)

#define gic_write_irouter(v, c)		writeq_relaxed_no_log(v, c)



#endif /* __ASSEMBLY__ */

#endif /* __ASM_ARCH_GICV3_H */

drivers/irqchip/irq-gic-v3.c

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static void gic_do_wait_for_rwp(void __iomem *base) 
{

	u32 count = 1000000;	/* 1s! */



	while (readl_relaxed(base + GICD_CTLR) & GICD_CTLR_RWP) {

	while (readl_relaxed_no_log(base + GICD_CTLR) & GICD_CTLR_RWP) {

		count--;

		if (!count) {

			pr_err_ratelimited("RWP timeout, gone fishing\n");
@@ -179,7 +179,7 @@ static int gic_peek_irq(struct irq_data *d, u32 offset) 
	else

		base = gic_data.dist_base;



	return !!(readl_relaxed(base + offset + (gic_irq(d) / 32) * 4) & mask);

	return !!(readl_relaxed_no_log(base + offset + (gic_irq(d) / 32) * 4) & mask);

}



static void gic_poke_irq(struct irq_data *d, u32 offset)