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

Commit 5fdef446 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "ARM: gic: save/restore distributor ISR register values""

parents 3defd5d6 04e45cf2

drivers/irqchip/irq-gic.c

+0 −12
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ struct gic_chip_data { 
	u32 __percpu *saved_ppi_enable;

	u32 __percpu *saved_ppi_conf;

#endif

	u32 saved_dist_isr[DIV_ROUND_UP(1020, 32)];

	struct irq_domain *domain;

	unsigned int gic_irqs;

#ifdef CONFIG_GIC_NON_BANKED
@@ -688,11 +687,6 @@ static void gic_dist_save(unsigned int gic_nr) 
	for (i = 0; i < DIV_ROUND_UP(gic_irqs, 32); i++)

		gic_data[gic_nr].saved_spi_enable[i] =

			readl_relaxed(dist_base + GIC_DIST_ENABLE_SET + i * 4);

	if (is_cpu_secure()) {

		for (i = 0; i < DIV_ROUND_UP(gic_irqs, 32); i++)

			gic_data[gic_nr].saved_dist_isr[i] =

				readl_relaxed(dist_base + GIC_DIST_IGROUP + i * 4);

	}

}



/*
@@ -735,12 +729,6 @@ static void gic_dist_restore(unsigned int gic_nr) 
		writel_relaxed(gic_data[gic_nr].saved_spi_enable[i],

			dist_base + GIC_DIST_ENABLE_SET + i * 4);



	if (is_cpu_secure()) {

		for (i = 0; i < DIV_ROUND_UP(gic_irqs, 32); i++)

			writel_relaxed(gic_data[gic_nr].saved_dist_isr[i],

					dist_base + GIC_DIST_IGROUP + i * 4);

	}



	writel_relaxed(saved_dist_ctrl, dist_base + GIC_DIST_CTRL);

}