From e5e36306a9a5bf96ab8cc990d93bbd62030e635f Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Thu, 25 Sep 2014 10:05:15 -0500 Subject: [PATCH] timer: Add generic udelay() implementation Add GENERIC_UDELAY Kconfig option so that a generic udelay() implementation is provided utilizing the monotonic timer. That way each board/chipset doesn't need to duplicate the same udelay(). Additionally, assume that GENERIC_UDELAY implies init_timer() is not required. BUG=None BRANCH=None TEST=Built nyan, ryu, and rambi. May need help testing. Change-Id: I7f511a2324b5aa5d1b2959f4519be85a6a7360e8 Signed-off-by: Patrick Georgi Original-Commit-Id: 1a85fbcad778933d13eaef545135abe7e4de46ed Original-Change-Id: Idd26de19eefc91ee3b0ceddfb1bc2152e19fd8ab Original-Signed-off-by: Aaron Durbin Original-Reviewed-on: https://chromium-review.googlesource.com/219719 Original-Reviewed-by: Julius Werner Original-Reviewed-by: Furquan Shaikh Reviewed-on: http://review.coreboot.org/9334 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/Kconfig | 7 +++ src/arch/mips/Makefile.inc | 3 -- src/arch/mips/timer.c | 31 ------------- src/include/delay.h | 4 ++ src/lib/Makefile.inc | 5 +++ src/{soc/nvidia/tegra132 => lib}/timer.c | 7 +-- src/soc/nvidia/tegra124/Kconfig | 2 + src/soc/nvidia/tegra124/Makefile.inc | 4 -- src/soc/nvidia/tegra124/timer.c | 53 ---------------------- src/soc/nvidia/tegra132/Kconfig | 1 + src/soc/nvidia/tegra132/Makefile.inc | 3 -- src/soc/rockchip/rk3288/Kconfig | 1 + src/soc/rockchip/rk3288/timer.c | 27 ------------ src/soc/samsung/exynos5250/Kconfig | 1 + src/soc/samsung/exynos5250/Makefile.inc | 3 -- src/soc/samsung/exynos5250/timer.c | 52 ---------------------- src/soc/samsung/exynos5420/Kconfig | 1 + src/soc/samsung/exynos5420/Makefile.inc | 3 -- src/soc/samsung/exynos5420/timer.c | 56 ------------------------ 19 files changed, 24 insertions(+), 240 deletions(-) delete mode 100644 src/arch/mips/timer.c rename src/{soc/nvidia/tegra132 => lib}/timer.c (92%) delete mode 100644 src/soc/nvidia/tegra124/timer.c delete mode 100644 src/soc/samsung/exynos5250/timer.c delete mode 100644 src/soc/samsung/exynos5420/timer.c diff --git a/src/Kconfig b/src/Kconfig index cc87aec95a..f94fad4144 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -360,6 +360,13 @@ config HAVE_MONOTONIC_TIMER help The board/chipset provides a monotonic timer. +config GENERIC_UDELAY + def_bool n + depends on HAVE_MONOTONIC_TIMER + help + The board/chipset uses a generic udelay function utilizing the + monotonic timer. + config TIMER_QUEUE def_bool n depends on HAVE_MONOTONIC_TIMER diff --git a/src/arch/mips/Makefile.inc b/src/arch/mips/Makefile.inc index 9e88ba8ce8..1929140867 100644 --- a/src/arch/mips/Makefile.inc +++ b/src/arch/mips/Makefile.inc @@ -38,7 +38,6 @@ bootblock-y += boot.c bootblock-y += bootblock.S bootblock-y += bootblock_simple.c bootblock-y += stages.c -bootblock-y += timer.c bootblock-y += ../../lib/memcpy.c bootblock-y += ../../lib/memmove.c bootblock-y += ../../lib/memset.c @@ -64,7 +63,6 @@ ifeq ($(CONFIG_ARCH_ROMSTAGE_MIPS),y) romstage-y += boot.c romstage-$(CONFIG_EARLY_CONSOLE) += early_console.c romstage-y += stages.c -romstage-y += timer.c romstage-y += ../../lib/memcpy.c romstage-y += ../../lib/memmove.c romstage-y += ../../lib/memset.c @@ -85,7 +83,6 @@ ramstage-y += ashldi3.c ramstage-y += boot.c ramstage-y += stages.c ramstage-y += tables.c -ramstage-y += timer.c ramstage-y += ../../lib/memcpy.c ramstage-y += ../../lib/memmove.c ramstage-y += ../../lib/memset.c diff --git a/src/arch/mips/timer.c b/src/arch/mips/timer.c deleted file mode 100644 index c38601df80..0000000000 --- a/src/arch/mips/timer.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 Imagination Technologies - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include - -void init_timer(void) -{ - /* TODO */ -} - -void udelay(unsigned usec) -{ - /* TODO */ -} diff --git a/src/include/delay.h b/src/include/delay.h index b3d8ed95da..ab1f4f9829 100644 --- a/src/include/delay.h +++ b/src/include/delay.h @@ -1,7 +1,11 @@ #ifndef DELAY_H #define DELAY_H +#if IS_ENABLED(CONFIG_GENERIC_UDELAY) +static inline void init_timer(void) {} +#else void init_timer(void); +#endif void udelay(unsigned usecs); void mdelay(unsigned msecs); diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index e01d3473f6..079c855f68 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -22,6 +22,8 @@ bootblock-y += prog_ops.c bootblock-y += cbfs.c cbfs_core.c bootblock-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c +bootblock-$(CONFIG_GENERIC_UDELAY) += timer.c + bootblock-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c bootblock-y += memchr.c bootblock-y += memcmp.c @@ -61,6 +63,8 @@ romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += gcc.c ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += gcc.c endif +romstage-$(CONFIG_GENERIC_UDELAY) += timer.c + ramstage-y += prog_ops.c ramstage-y += hardwaremain.c ramstage-y += selfboot.c @@ -89,6 +93,7 @@ ramstage-y += memrange.c ramstage-$(CONFIG_COOP_MULTITASKING) += thread.c ramstage-$(CONFIG_TIMER_QUEUE) += timer_queue.c ramstage-$(CONFIG_TERTIARY_BOARD_ID) += tristate_gpios.c +ramstage-$(CONFIG_GENERIC_UDELAY) += timer.c romstage-y += cbmem_common.c dynamic_cbmem.c ramstage-y += cbmem_common.c dynamic_cbmem.c diff --git a/src/soc/nvidia/tegra132/timer.c b/src/lib/timer.c similarity index 92% rename from src/soc/nvidia/tegra132/timer.c rename to src/lib/timer.c index ed10340040..a2edc5c96d 100644 --- a/src/soc/nvidia/tegra132/timer.c +++ b/src/lib/timer.c @@ -22,16 +22,12 @@ #include #include -void init_timer(void) -{ -} - void udelay(unsigned usec) { struct stopwatch sw; /* - * As the hardware clock granularity is in microseconds pad the + * As the timer granularity is in microseconds pad the * requested delay by one to get at least >= requested usec delay. */ usec += 1; @@ -40,6 +36,7 @@ void udelay(unsigned usec) return; stopwatch_init_usecs_expire(&sw, usec); + while (!stopwatch_expired(&sw)) ; } diff --git a/src/soc/nvidia/tegra124/Kconfig b/src/soc/nvidia/tegra124/Kconfig index 1680f4554c..3ce368b95f 100644 --- a/src/soc/nvidia/tegra124/Kconfig +++ b/src/soc/nvidia/tegra124/Kconfig @@ -7,6 +7,8 @@ config SOC_NVIDIA_TEGRA124 select ARCH_RAMSTAGE_ARMV7 select HAVE_UART_SPECIAL select HAVE_HARD_RESET + select HAVE_MONOTONIC_TIMER + select GENERIC_UDELAY select BOOTBLOCK_CONSOLE select ARM_BOOTBLOCK_CUSTOM select ARM_LPAE diff --git a/src/soc/nvidia/tegra124/Makefile.inc b/src/soc/nvidia/tegra124/Makefile.inc index 6de142d4ce..49669ebd83 100644 --- a/src/soc/nvidia/tegra124/Makefile.inc +++ b/src/soc/nvidia/tegra124/Makefile.inc @@ -15,7 +15,6 @@ bootblock-$(CONFIG_SOFTWARE_I2C) += ../tegra/software_i2c.c bootblock-y += ../tegra/pingroup.c bootblock-y += ../tegra/pinmux.c bootblock-y += ../tegra/apbmisc.c -bootblock-y += timer.c ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y) bootblock-$(CONFIG_DRIVERS_UART) += uart.c endif @@ -25,7 +24,6 @@ verstage-y += cbfs.c verstage-y += dma.c verstage-y += monotonic_timer.c verstage-y += spi.c -verstage-y += timer.c verstage-$(CONFIG_DRIVERS_UART) += uart.c verstage-y += ../tegra/gpio.c verstage-y += ../tegra/i2c.c @@ -48,7 +46,6 @@ romstage-y += ../tegra/gpio.c romstage-y += ../tegra/i2c.c romstage-$(CONFIG_SOFTWARE_I2C) += ../tegra/software_i2c.c romstage-y += ../tegra/pinmux.c -romstage-y += timer.c romstage-y += cache.c romstage-$(CONFIG_DRIVERS_UART) += uart.c @@ -70,7 +67,6 @@ ramstage-y += ../tegra/i2c.c ramstage-$(CONFIG_SOFTWARE_I2C) += ../tegra/software_i2c.c ramstage-y += ../tegra/pinmux.c ramstage-y += ../tegra/usb.c -ramstage-y += timer.c ramstage-$(CONFIG_DRIVERS_UART) += uart.c rmodules_$(ARCH-romstage-y)-y += monotonic_timer.c diff --git a/src/soc/nvidia/tegra124/timer.c b/src/soc/nvidia/tegra124/timer.c deleted file mode 100644 index 83f499cbf1..0000000000 --- a/src/soc/nvidia/tegra124/timer.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2013 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include -#include -#include - -void init_timer(void) -{ -} - -/* delay x useconds */ -void udelay(unsigned usec) -{ - struct mono_time current, end; - - if (!thread_yield_microseconds(usec)) - return; - - timer_monotonic_get(¤t); - end = current; - mono_time_add_usecs(&end, usec); - - if (mono_time_after(¤t, &end)) { - printk(BIOS_EMERG, "udelay: 0x%08x is impossibly large\n", - usec); - /* There's not much we can do if usec is too big. Use a long, - * paranoid delay value and hope for the best... */ - end = current; - mono_time_add_usecs(&end, USECS_PER_SEC); - } - - while (mono_time_before(¤t, &end)) - timer_monotonic_get(¤t); -} - diff --git a/src/soc/nvidia/tegra132/Kconfig b/src/soc/nvidia/tegra132/Kconfig index c87698a8d2..0a1b28be66 100644 --- a/src/soc/nvidia/tegra132/Kconfig +++ b/src/soc/nvidia/tegra132/Kconfig @@ -8,6 +8,7 @@ config SOC_NVIDIA_TEGRA132 select BOOTBLOCK_CONSOLE select GIC select HAVE_MONOTONIC_TIMER + select GENERIC_UDELAY select HAVE_HARD_RESET select HAVE_UART_SPECIAL select HAVE_UART_MEMORY_MAPPED diff --git a/src/soc/nvidia/tegra132/Makefile.inc b/src/soc/nvidia/tegra132/Makefile.inc index 81d08f54df..8ad9b83059 100644 --- a/src/soc/nvidia/tegra132/Makefile.inc +++ b/src/soc/nvidia/tegra132/Makefile.inc @@ -1,7 +1,6 @@ bootblock-y += bootblock.c bootblock-y += bootblock_asm.S bootblock-y += cbfs.c -bootblock-y += timer.c bootblock-y += clock.c bootblock-y += spi.c bootblock-y += i2c.c @@ -26,7 +25,6 @@ romstage-y += romstage_asm.S romstage-y += addressmap.c romstage-y += cbfs.c romstage-y += cbmem.c -romstage-y += timer.c romstage-y += ccplex.c romstage-y += clock.c romstage-y += cpu.c @@ -53,7 +51,6 @@ ramstage-y += cbfs.c ramstage-y += cbmem.c ramstage-y += cpu.c ramstage-y += cpu_lib.S -ramstage-y += timer.c ramstage-y += clock.c ramstage-y += soc.c ramstage-y += spi.c diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig index 0865fe8f54..70951a5fa7 100644 --- a/src/soc/rockchip/rk3288/Kconfig +++ b/src/soc/rockchip/rk3288/Kconfig @@ -26,6 +26,7 @@ config SOC_ROCKCHIP_RK3288 select ARCH_RAMSTAGE_ARMV7 select CPU_HAS_BOOTBLOCK_INIT select HAVE_MONOTONIC_TIMER + select GENERIC_UDELAY select HAVE_UART_MEMORY_MAPPED select HAVE_UART_SPECIAL select BOOTBLOCK_CONSOLE diff --git a/src/soc/rockchip/rk3288/timer.c b/src/soc/rockchip/rk3288/timer.c index 7162482406..658f4d74f4 100644 --- a/src/soc/rockchip/rk3288/timer.c +++ b/src/soc/rockchip/rk3288/timer.c @@ -23,36 +23,9 @@ #include #include -void init_timer(void) -{ -} - void rk3288_init_timer(void) { write32(TIMER_LOAD_VAL, &timer7_ptr->timer_load_count0); write32(TIMER_LOAD_VAL, &timer7_ptr->timer_load_count1); write32(1, &timer7_ptr->timer_ctrl_reg); } - -/* delay x useconds */ -void udelay(unsigned usec) -{ - struct mono_time current, end; - - timer_monotonic_get(¤t); - end = current; - mono_time_add_usecs(&end, usec); - - if (mono_time_after(¤t, &end)) { - printk(BIOS_EMERG, "udelay: 0x%08x is impossibly large\n", - usec); - /* There's not much we can do if usec is too big. Use a long, - * paranoid delay value and hope for the best... */ - end = current; - mono_time_add_usecs(&end, USECS_PER_SEC); - } - - while (mono_time_before(¤t, &end)) - timer_monotonic_get(¤t); -} - diff --git a/src/soc/samsung/exynos5250/Kconfig b/src/soc/samsung/exynos5250/Kconfig index 4126ec1e59..7034e96201 100644 --- a/src/soc/samsung/exynos5250/Kconfig +++ b/src/soc/samsung/exynos5250/Kconfig @@ -5,6 +5,7 @@ config CPU_SAMSUNG_EXYNOS5250 select ARCH_RAMSTAGE_ARMV7 select CPU_HAS_BOOTBLOCK_INIT select HAVE_MONOTONIC_TIMER + select GENERIC_UDELAY select HAVE_UART_SPECIAL bool default n diff --git a/src/soc/samsung/exynos5250/Makefile.inc b/src/soc/samsung/exynos5250/Makefile.inc index 4483f820d0..4cf2d9675e 100644 --- a/src/soc/samsung/exynos5250/Makefile.inc +++ b/src/soc/samsung/exynos5250/Makefile.inc @@ -10,7 +10,6 @@ bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += uart.c endif bootblock-y += wakeup.c bootblock-y += gpio.c -bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += timer.c romstage-y += spi.c alternate_cbfs.c romstage-y += clock.c @@ -24,7 +23,6 @@ romstage-y += monotonic_timer.c romstage-$(CONFIG_DRIVERS_UART) += uart.c romstage-y += wakeup.c romstage-y += gpio.c -romstage-y += timer.c romstage-y += trustzone.c romstage-y += i2c.c #romstage-y += wdt.c @@ -40,7 +38,6 @@ ramstage-y += cpu.c ramstage-y += tmu.c ramstage-y += mct.c ramstage-y += monotonic_timer.c -ramstage-y += timer.c ramstage-y += gpio.c ramstage-y += i2c.c ramstage-y += dp-reg.c diff --git a/src/soc/samsung/exynos5250/timer.c b/src/soc/samsung/exynos5250/timer.c deleted file mode 100644 index 891c3d74cd..0000000000 --- a/src/soc/samsung/exynos5250/timer.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2009 Samsung Electronics - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include -#include -#include - -void init_timer(void) -{ - /* Nothing to do because we manually - * call mct_start() in the bootblock - */ -} - -/* delay x useconds */ -void udelay(unsigned usec) -{ - struct mono_time current, end; - - timer_monotonic_get(¤t); - end = current; - mono_time_add_usecs(&end, usec); - - if (mono_time_after(¤t, &end)) { - printk(BIOS_EMERG, "udelay: 0x%08x is impossibly large\n", - usec); - /* There's not much we can do if usec is too big. Use a long, - * paranoid delay value and hope for the best... */ - end = current; - mono_time_add_usecs(&end, USECS_PER_SEC); - } - - while (mono_time_before(¤t, &end)) - timer_monotonic_get(¤t); -} diff --git a/src/soc/samsung/exynos5420/Kconfig b/src/soc/samsung/exynos5420/Kconfig index ed9d2f8a84..072976a2ac 100644 --- a/src/soc/samsung/exynos5420/Kconfig +++ b/src/soc/samsung/exynos5420/Kconfig @@ -5,6 +5,7 @@ config CPU_SAMSUNG_EXYNOS5420 select ARCH_RAMSTAGE_ARMV7 select CPU_HAS_BOOTBLOCK_INIT select HAVE_MONOTONIC_TIMER + select GENERIC_UDELAY select HAVE_UART_SPECIAL select RELOCATABLE_MODULES bool diff --git a/src/soc/samsung/exynos5420/Makefile.inc b/src/soc/samsung/exynos5420/Makefile.inc index eab4fb38c6..4e92864d5e 100644 --- a/src/soc/samsung/exynos5420/Makefile.inc +++ b/src/soc/samsung/exynos5420/Makefile.inc @@ -10,7 +10,6 @@ bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += uart.c endif bootblock-y += wakeup.c bootblock-y += gpio.c -bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += timer.c romstage-y += spi.c alternate_cbfs.c romstage-y += smp.c @@ -25,7 +24,6 @@ romstage-y += monotonic_timer.c romstage-$(CONFIG_DRIVERS_UART) += uart.c romstage-y += wakeup.c romstage-y += gpio.c -romstage-y += timer.c romstage-y += i2c.c #romstage-y += wdt.c romstage-y += cbmem.c @@ -41,7 +39,6 @@ ramstage-y += cpu.c ramstage-y += tmu.c ramstage-y += mct.c ramstage-y += monotonic_timer.c -ramstage-y += timer.c ramstage-y += gpio.c ramstage-y += i2c.c ramstage-y += dp.c dp_lowlevel.c fimd.c diff --git a/src/soc/samsung/exynos5420/timer.c b/src/soc/samsung/exynos5420/timer.c deleted file mode 100644 index 7156a010af..0000000000 --- a/src/soc/samsung/exynos5420/timer.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2009 Samsung Electronics - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include -#include -#include -#include - -void init_timer(void) -{ - /* Nothing to do because we manually - * call mct_start() in the bootblock - */ -} - -/* delay x useconds */ -void udelay(unsigned usec) -{ - struct mono_time current, end; - - if (!thread_yield_microseconds(usec)) - return; - - timer_monotonic_get(¤t); - end = current; - mono_time_add_usecs(&end, usec); - - if (mono_time_after(¤t, &end)) { - printk(BIOS_EMERG, "udelay: 0x%08x is impossibly large\n", - usec); - /* There's not much we can do if usec is too big. Use a long, - * paranoid delay value and hope for the best... */ - end = current; - mono_time_add_usecs(&end, USECS_PER_SEC); - } - - while (mono_time_before(¤t, &end)) - timer_monotonic_get(¤t); -}