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

Commit ec7cb87b authored by Vineet Gupta's avatar Vineet Gupta
Browse files

ARC: timer: gfrc, rtc: Read BCR to detect whether hardware exists ... 



... don't rely on cpuinfo populated in arc boot code. This paves way for
moving this code in drivers/clocksource/

And while at it, convert the WARN() to pr_warn() as sugested by Daniel

Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
parent 2cd690ea

arch/arc/kernel/time.c

+13 −5
Original line number Diff line number Diff line
@@ -111,11 +111,14 @@ static struct clocksource arc_counter_gfrc = { 


static int __init arc_cs_setup_gfrc(struct device_node *node)

{

	int exists = cpuinfo_arc700[0].extn.gfrc;

	struct mcip_bcr mp;

	int ret;



	if (WARN(!exists, "Global-64-bit-Ctr clocksource not detected"))

	READ_BCR(ARC_REG_MCIP_BCR, mp);

	if (!mp.gfrc) {

		pr_warn("Global-64-bit-Ctr clocksource not detected");

		return -ENXIO;

	}



	ret = arc_get_timer_clk(node);

	if (ret)
@@ -163,15 +166,20 @@ static struct clocksource arc_counter_rtc = { 


static int __init arc_cs_setup_rtc(struct device_node *node)

{

	int exists = cpuinfo_arc700[smp_processor_id()].extn.rtc;

	struct bcr_timer timer;

	int ret;



	if (WARN(!exists, "Local-64-bit-Ctr clocksource not detected"))

	READ_BCR(ARC_REG_TIMERS_BCR, timer);

	if (!timer.rtc) {

		pr_warn("Local-64-bit-Ctr clocksource not detected");

		return -ENXIO;

	}



	/* Local to CPU hence not usable in SMP */

	if (WARN(IS_ENABLED(CONFIG_SMP), "Local-64-bit-Ctr not usable in SMP"))

	if (IS_ENABLED(CONFIG_SMP)) {

		pr_warn("Local-64-bit-Ctr not usable in SMP");

		return -EINVAL;

	}



	ret = arc_get_timer_clk(node);

	if (ret)