MIPS: GCMP: Avoid accessing registers when they are not present (05cf2079) · Commits · e / devices / android_kernel_fairphone_FP4

arch/mips/mti-malta/malta-int.c

+13 −3

Original line number	Diff line number	Diff line
		@@ -411,6 +411,11 @@ static struct gic_intr_map gic_intr_map[GIC_NUM_INTRS] = {
		*/
		int __init gcmp_probe(unsigned long addr, unsigned long size)
		{
		if (mips_revision_sconid != MIPS_REVISION_SCON_ROCIT) {
		gcmp_present = 0;
		return gcmp_present;
		}

		if (gcmp_present >= 0)
		return gcmp_present;

		@@ -479,9 +484,14 @@ void __init arch_init_irq(void)
		GCMPGCB(GICBA) = GIC_BASE_ADDR \| GCMP_GCB_GICBA_EN_MSK;
		gic_present = 1;
		} else {
		_msc01_biu_base = (unsigned long) ioremap_nocache(MSC01_BIU_REG_BASE, MSC01_BIU_ADDRSPACE_SZ);
		if (mips_revision_sconid == MIPS_REVISION_SCON_ROCIT) {
		_msc01_biu_base = (unsigned long)
		ioremap_nocache(MSC01_BIU_REG_BASE,
		MSC01_BIU_ADDRSPACE_SZ);
		gic_present = (REG(_msc01_biu_base, MSC01_SC_CFG) &
		MSC01_SC_CFG_GICPRES_MSK) >> MSC01_SC_CFG_GICPRES_SHF;
		MSC01_SC_CFG_GICPRES_MSK) >>
		MSC01_SC_CFG_GICPRES_SHF;
		}
		}
		if (gic_present)
		pr_debug("GIC present\n");