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

Commit 6246cd06 authored by Afzal Mohammed's avatar Afzal Mohammed Committed by Tony Lindgren
Browse files

ARM: OMAP2+: wakeupgen: AM43x adaptation 



AM43x has 224 interrupts and 7 banks, make it as maximum values. Keep
default values as earlier, if am43x is detected, update interrupts and
banks accordingly.

Also AM43x has only one cpu, ensure that clearing bitmask at wakeupgen
is done only for the single existing cpu, existing code assumes that
there are two cpu's.

If bitmask is cleared in wakeupgen for the nonexistent second cpu,
an imprecise abort happens as soon as Kernel switches to user space.
It was rootcaused by Sekhar Nori <nsekhar@ti.com>.

Signed-off-by: default avatarAfzal Mohammed <afzal@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 8ff875e7

arch/arm/mach-omap2/omap-wakeupgen.c

+13 −5
Original line number Original line Diff line number Diff line
@@ -33,8 +33,12 @@ 
#include "omap4-sar-layout.h"

#include "omap4-sar-layout.h"

#include "common.h"

#include "common.h"





#define MAX_NR_REG_BANKS	5

#define AM43XX_NR_REG_BANKS	7

#define MAX_IRQS		160

#define AM43XX_IRQS		224

#define MAX_NR_REG_BANKS	AM43XX_NR_REG_BANKS

#define MAX_IRQS		AM43XX_IRQS

#define DEFAULT_NR_REG_BANKS	5

#define DEFAULT_IRQS		160

#define WKG_MASK_ALL		0x00000000

#define WKG_MASK_ALL		0x00000000

#define WKG_UNMASK_ALL		0xffffffff

#define WKG_UNMASK_ALL		0xffffffff

#define CPU_ENA_OFFSET		0x400

#define CPU_ENA_OFFSET		0x400
@@ -47,8 +51,8 @@ static void __iomem *wakeupgen_base; 
static void __iomem *sar_base;

static void __iomem *sar_base;

static DEFINE_RAW_SPINLOCK(wakeupgen_lock);

static DEFINE_RAW_SPINLOCK(wakeupgen_lock);

static unsigned int irq_target_cpu[MAX_IRQS];

static unsigned int irq_target_cpu[MAX_IRQS];

static unsigned int irq_banks = MAX_NR_REG_BANKS;

static unsigned int irq_banks = DEFAULT_NR_REG_BANKS;

static unsigned int max_irqs = MAX_IRQS;

static unsigned int max_irqs = DEFAULT_IRQS;

static unsigned int omap_secure_apis;

static unsigned int omap_secure_apis;





/*

/*
@@ -418,11 +422,15 @@ int __init omap_wakeupgen_init(void) 
		irq_banks = OMAP4_NR_BANKS;

		irq_banks = OMAP4_NR_BANKS;

		max_irqs = OMAP4_NR_IRQS;

		max_irqs = OMAP4_NR_IRQS;

		omap_secure_apis = 1;

		omap_secure_apis = 1;

	} else if (soc_is_am43xx()) {

		irq_banks = AM43XX_NR_REG_BANKS;

		max_irqs = AM43XX_IRQS;

	}

	}





	/* Clear all IRQ bitmasks at wakeupGen level */

	/* Clear all IRQ bitmasks at wakeupGen level */

	for (i = 0; i < irq_banks; i++) {

	for (i = 0; i < irq_banks; i++) {

		wakeupgen_writel(0, i, CPU0_ID);

		wakeupgen_writel(0, i, CPU0_ID);

		if (!soc_is_am43xx())

			wakeupgen_writel(0, i, CPU1_ID);

			wakeupgen_writel(0, i, CPU1_ID);

	}

	}