]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
cyclic: Use schedule() instead of WATCHDOG_RESET()
authorStefan Roese <sr@denx.de>
Fri, 2 Sep 2022 12:10:46 +0000 (14:10 +0200)
committerStefan Roese <sr@denx.de>
Sun, 18 Sep 2022 08:26:33 +0000 (10:26 +0200)
Globally replace all occurances of WATCHDOG_RESET() with schedule(),
which handles the HW_WATCHDOG functionality and the cyclic
infrastructure.

Signed-off-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Tom Rini <trini@konsulko.com> [am335x_evm, mx6cuboxi, rpi_3,dra7xx_evm, pine64_plus, am65x_evm, j721e_evm]
103 files changed:
arch/arm/mach-at91/phy.c
arch/arm/mach-imx/i2c-mxv7.c
arch/arm/mach-socfpga/spl_a10.c
arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c
arch/m68k/lib/time.c
arch/powerpc/cpu/mpc8xx/cpu_init.c
arch/powerpc/lib/bootm.c
arch/powerpc/lib/cache.c
arch/powerpc/lib/interrupts.c
board/astro/mcf5373l/fpga.c
board/dhelectronics/dh_stm32mp1/board.c
board/liebherr/display5/spl.c
board/nokia/rx51/rx51.c
board/st/stm32mp1/stm32mp1.c
boot/bootretry.c
boot/image-board.c
cmd/fastboot.c
cmd/mem.c
cmd/usb_mass_storage.c
cmd/ximg.c
common/board_f.c
common/board_r.c
common/cli_readline.c
common/console.c
common/dfu.c
common/lcd.c
common/menu.c
common/usb_kbd.c
common/xyzModem.c
drivers/block/ide.c
drivers/crypto/aspeed/aspeed_hace.c
drivers/crypto/hash/hash_sw.c
drivers/ddr/altera/sdram_arria10.c
drivers/ddr/altera/sdram_n5x.c
drivers/ddr/altera/sdram_soc64.c
drivers/fpga/intel_sdm_mb.c
drivers/fpga/socfpga_arria10.c
drivers/i2c/mxc_i2c.c
drivers/mmc/octeontx_hsmmc.c
drivers/mmc/sh_mmcif.c
drivers/mmc/stm32_sdmmc2.c
drivers/mtd/cfi_flash.c
drivers/mtd/nand/core.c
drivers/mtd/nand/raw/atmel_nand.c
drivers/mtd/nand/raw/nand_base.c
drivers/mtd/nand/raw/nand_util.c
drivers/mtd/nand/spi/core.c
drivers/mtd/onenand/onenand_base.c
drivers/mtd/spi/spi-nor-core.c
drivers/net/octeontx2/nix.c
drivers/net/octeontx2/nix_af.c
drivers/ram/stm32mp1/stm32mp1_tests.c
drivers/serial/atmel_usart.c
drivers/serial/ns16550.c
drivers/serial/serial-uclass.c
drivers/serial/serial_bcm283x_mu.c
drivers/serial/serial_lpuart.c
drivers/serial/serial_mpc8xx.c
drivers/serial/serial_mt7620.c
drivers/serial/serial_mtk.c
drivers/serial/serial_mxc.c
drivers/serial/serial_octeon_bootcmd.c
drivers/serial/serial_octeon_pcie_console.c
drivers/serial/serial_pl01x.c
drivers/serial/serial_sifive.c
drivers/serial/serial_zynq.c
drivers/spi/mtk_snfi_spi.c
drivers/spi/octeon_spi.c
drivers/spi/stm32_qspi.c
drivers/timer/mpc83xx_timer.c
drivers/usb/eth/lan7x.h
drivers/usb/gadget/f_acm.c
drivers/usb/gadget/f_sdp.c
drivers/usb/host/ehci-hcd.c
drivers/usb/musb-new/musb_uboot.c
drivers/video/video_bmp.c
env/common.c
fs/cramfs/uncompress.c
fs/jffs2/jffs2_1pass.c
include/linux/compat.h
include/wait_bit.h
include/watchdog.h
lib/bzip2/bzlib.c
lib/bzip2/bzlib_decompress.c
lib/crc32.c
lib/efi_loader/efi_boottime.c
lib/gunzip.c
lib/lzma/LzmaDec.c
lib/lzma/LzmaTools.c
lib/md5.c
lib/sha1.c
lib/sha256.c
lib/sha512.c
lib/time.c
lib/zlib/inflate.c
net/net.c
post/cpu/mpc83xx/ecc.c
post/drivers/memory.c
post/lib_powerpc/cpu.c
post/lib_powerpc/fpu/fpu.c
post/post.c
test/common/cyclic.c
test/dm/wdt.c

index 6101eee3589cba6b37bd05dbe1d7587ebe830101..f4484a77c7de525d7dc65533cf8c316152c10908 100644 (file)
@@ -42,7 +42,7 @@ void at91_phy_reset(void)
        /* Wait for end of hardware reset */
        while (!(readl(&rstc->sr) & AT91_RSTC_SR_NRSTL)) {
                /* avoid shutdown by watchdog */
-               WATCHDOG_RESET();
+               schedule();
                mdelay(10);
 
                /* timeout for not getting stuck in an endless loop */
index d36347d8e82461715eb3e959285bfedbf0978630..85d648b56ed44c4c564546606362fd1e468ae958 100644 (file)
@@ -46,7 +46,7 @@ int force_idle_bus(void *priv)
                scl = gpio_get_value(p->scl.gp);
                if ((sda & scl) == 1)
                        break;
-               WATCHDOG_RESET();
+               schedule();
                elapsed = get_timer(start_time);
                if (elapsed > (CONFIG_SYS_HZ / 5)) {    /* .2 seconds */
                        ret = -EBUSY;
index ec67a5b0eb7902dad2c5a2a33b20c565f1c008cc..2c567edd502ecc345a9f4b2080e4bb99e93e6b17 100644 (file)
@@ -117,7 +117,7 @@ void spl_board_init(void)
 
        /* enable console uart printing */
        preloader_console_init();
-       WATCHDOG_RESET();
+       schedule();
 
        arch_early_init_r();
 
@@ -203,7 +203,7 @@ void spl_board_init(void)
                         */
                        set_regular_boot(true);
 
-                       WATCHDOG_RESET();
+                       schedule();
 
                        reset_cpu();
                }
@@ -268,11 +268,11 @@ void board_init_f(ulong dummy)
 
        /* reconfigure and enable the watchdog */
        hw_watchdog_init();
-       WATCHDOG_RESET();
+       schedule();
 #endif /* CONFIG_HW_WATCHDOG */
 
        config_dedicated_pins(gd->fdt_blob);
-       WATCHDOG_RESET();
+       schedule();
 }
 
 /* board specific function prior loading SSBL / U-Boot proper */
index 2932eae7578de97d8cc228ce6166db3c361d7acf..1a69bc38979db9eafb1fc15dadfde2a951244360 100644 (file)
@@ -247,7 +247,7 @@ static int stm32prog_serial_getc_err(void)
                err = ops->getc(down_serial_dev);
                if (err == -EAGAIN) {
                        ctrlc();
-                       WATCHDOG_RESET();
+                       schedule();
                }
        } while ((err == -EAGAIN) && (!had_ctrlc()));
 
@@ -276,7 +276,7 @@ static bool stm32prog_serial_get_buffer(u8 *buffer, u32 *count)
                        *count -= 1;
                } else if (err == -EAGAIN) {
                        ctrlc();
-                       WATCHDOG_RESET();
+                       schedule();
                        if (get_timer(start) > TIMEOUT_SERIAL_BUFFER) {
                                err = -ETIMEDOUT;
                                break;
@@ -852,7 +852,7 @@ bool stm32prog_serial_loop(struct stm32prog_data *data)
                        stm32prog_serial_result(ACK_BYTE);
                        cmd_func[counter](data);
                }
-               WATCHDOG_RESET();
+               schedule();
        }
 
        /* clean device */
index ebb2ac54db56fd62205c2013d7c71e0a0a4e09f3..cd7437b3e22ec03a7cba8fde918dd8fb3e876740 100644 (file)
@@ -72,7 +72,7 @@ void dtimer_interrupt(void *not_used)
 
                #if defined(CONFIG_WATCHDOG) || defined (CONFIG_HW_WATCHDOG)
                if (CONFIG_SYS_WATCHDOG_FREQ && (timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0) {
-                       WATCHDOG_RESET ();
+                       schedule();
                }
                #endif    /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */
                return;
index c8d06b0508d732170923d5bd91700cba15ef4109..86b08a61749bdf884f1c7c19198acec4620591b9 100644 (file)
@@ -31,7 +31,7 @@ void cpu_init_f(immap_t __iomem *immr)
        out_be32(&immr->im_siu_conf.sc_sypcr, CONFIG_SYS_SYPCR & ~SYPCR_SWE);
 #endif
 
-       WATCHDOG_RESET();
+       schedule();
 
        /* SIUMCR - contains debug pin configuration (11-6) */
        setbits_be32(&immr->im_siu_conf.sc_siumcr, CONFIG_SYS_SIUMCR);
index e52aa75703f3534f2d4beb06a2be1e48ef947cbe..b92df9543ebf6159a2a3ebb152d8cabf87d831b5 100644 (file)
@@ -84,7 +84,7 @@ static void boot_jump_linux(bootm_headers_t *images)
                 *   r9: 0
                 */
                debug("   Booting using OF flat tree...\n");
-               WATCHDOG_RESET ();
+               schedule();
                (*kernel) ((struct bd_info *)of_flat_tree, 0, 0, EPAPR_MAGIC,
                           env_get_bootm_mapsize(), 0, 0);
                /* does not return */
@@ -108,7 +108,7 @@ static void boot_jump_linux(bootm_headers_t *images)
                struct bd_info *kbd = images->kbd;
 
                debug("   Booting using board info...\n");
-               WATCHDOG_RESET ();
+               schedule();
                (*kernel) (kbd, initrd_start, initrd_end,
                           cmd_start, cmd_end, 0, 0);
                /* does not return */
@@ -319,7 +319,7 @@ void boot_jump_vxworks(bootm_headers_t *images)
         *      r9: 0
         *      TCR: WRC = 0, no watchdog timer reset will occur
         */
-       WATCHDOG_RESET();
+       schedule();
 
        ((void (*)(void *, ulong, ulong, ulong,
                ulong, ulong, ulong))images->ep)(images->ft_addr,
index 19162511ceaf93516dedbb3358e5c4b69207df1a..c4c5c2d45138ab532151d5414840bcd8de397515 100644 (file)
@@ -13,7 +13,7 @@ static ulong maybe_watchdog_reset(ulong flushed)
 {
        flushed += CONFIG_SYS_CACHELINE_SIZE;
        if (flushed >= CONFIG_CACHE_FLUSH_WATCHDOG_THRESHOLD) {
-               WATCHDOG_RESET();
+               schedule();
                flushed = 0;
        }
        return flushed;
index 5ba4cd0c13ac9d3db432a146a12e2f1bb64fe34c..bdb8030c27f065fd2da2b997269358e6099139bc 100644 (file)
@@ -81,7 +81,7 @@ void timer_interrupt(struct pt_regs *regs)
 
 #if defined(CONFIG_WATCHDOG) || defined (CONFIG_HW_WATCHDOG)
        if (CONFIG_SYS_WATCHDOG_FREQ && (timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0)
-               WATCHDOG_RESET ();
+               schedule();
 #endif    /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */
 
 #ifdef CONFIG_LED_STATUS
index 50a3830b8573c5fee24366aedf44b83032a34f47..f85737432b3155d81821d26aa31d9448d27069c7 100644 (file)
@@ -123,7 +123,7 @@ int altera_write_fn(const void *buf, size_t len, int flush, int cookie)
 
                if (bytecount % len_40 == 0) {
 #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
-                       WATCHDOG_RESET();
+                       schedule();
 #endif
 #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
                        putc('.');      /* let them know we are alive */
@@ -343,7 +343,7 @@ int xilinx_fastwr_config_fn(void *buf, size_t len, int flush, int cookie)
                }
                if (bytecount % len_40 == 0) {
 #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
-                       WATCHDOG_RESET();
+                       schedule();
 #endif
 #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
                        putc('.');      /* let them know we are alive */
index e3c7ed104924c1394e4f9c51279b8df23603575c..7e4f3ff157f81743aee5396fa2ebf6a997872480 100644 (file)
@@ -423,7 +423,7 @@ static void __maybe_unused led_error_blink(u32 nb_blink)
                for (i = 0; i < 2 * nb_blink; i++) {
                        led_set_state(led, LEDST_TOGGLE);
                        mdelay(125);
-                       WATCHDOG_RESET();
+                       schedule();
                }
        }
 #endif
index 5c1af1a7720fded226e29904d0ed2c81a1e7541d..4219d002fec5eba122d492e6347e5011dc634eca 100644 (file)
@@ -329,7 +329,7 @@ void board_init_f(ulong dummy)
        /* Initialize and reset WDT in SPL */
 #ifdef CONFIG_SPL_WATCHDOG
        hw_watchdog_init();
-       WATCHDOG_RESET();
+       schedule();
 #endif
 
        /* load/boot image from boot device */
index 460d248eaaebb2ea543de84953ca9fa59df363b7..9548c3c7be71ab8b7ae4bace4e0284cab328f2ab 100644 (file)
@@ -722,7 +722,7 @@ static int rx51_kp_getc(struct udevice *dev)
 {
        keybuf_head %= KEYBUF_SIZE;
        while (!rx51_kp_tstc(dev))
-               WATCHDOG_RESET();
+               schedule();
        return keybuf[keybuf_head++];
 }
 
index 9496890d164194c92787f07c643c0272f589f72b..6028a0b6de458963ab3735797f2c1942472bf175 100644 (file)
@@ -289,7 +289,7 @@ static void __maybe_unused led_error_blink(u32 nb_blink)
                        for (i = 0; i < 2 * nb_blink; i++) {
                                led_set_state(led, LEDST_TOGGLE);
                                mdelay(125);
-                               WATCHDOG_RESET();
+                               schedule();
                        }
                        led_set_state(led, LEDST_ON);
                }
index 2bc9c6866e03940365e77eb21fde1c9c821e3400..8d850df9d4875c41cadabdeb4df9c6fde3fed99a 100644 (file)
@@ -44,7 +44,7 @@ int bootretry_tstc_timeout(void)
        while (!tstc()) {       /* while no incoming data */
                if (retry_time >= 0 && get_ticks() > endtime)
                        return -ETIMEDOUT;
-               WATCHDOG_RESET();
+               schedule();
        }
 
        return 0;
index 1be0a359aba712d0df2cac69486cc73cab419a0b..98f903f93fb9ab49fbd352dae15db61a975bf559 100644 (file)
@@ -181,7 +181,7 @@ void memmove_wd(void *to, void *from, size_t len, ulong chunksz)
                while (len > 0) {
                        size_t tail = (len > chunksz) ? chunksz : len;
 
-                       WATCHDOG_RESET();
+                       schedule();
                        if (to > from) {
                                to -= tail;
                                from -= tail;
index 033a2c95e8f0b64524204d207874569ca0ccb6be..dd223b1554dadba5271c51b17bdc2bea172efae6 100644 (file)
@@ -76,7 +76,7 @@ static int do_fastboot_usb(int argc, char *const argv[],
                        break;
                if (ctrlc())
                        break;
-               WATCHDOG_RESET();
+               schedule();
                usb_gadget_handle_interrupts(controller_index);
        }
 
index 6a7b4014edcd5fa2c5bea1052ab9f8004eaf2b56..1e39348195a000ff80ba5c475561487f6d15aefe 100644 (file)
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -300,7 +300,7 @@ static int do_mem_cmp(struct cmd_tbl *cmdtp, int flag, int argc,
 
                /* reset watchdog from time to time */
                if ((ngood % (64 << 10)) == 0)
-                       WATCHDOG_RESET();
+                       schedule();
        }
        unmap_sysmem(buf1);
        unmap_sysmem(buf2);
@@ -848,7 +848,7 @@ static ulong mem_test_alt(vu_long *buf, ulong start_addr, ulong end_addr,
                }
        }
        addr[test_offset] = pattern;
-       WATCHDOG_RESET();
+       schedule();
 
        /*
         * Check for addr bits stuck low or shorted.
@@ -890,7 +890,7 @@ static ulong mem_test_alt(vu_long *buf, ulong start_addr, ulong end_addr,
         * Fill memory with a known pattern.
         */
        for (pattern = 1, offset = 0; offset < num_words; pattern++, offset++) {
-               WATCHDOG_RESET();
+               schedule();
                addr[offset] = pattern;
        }
 
@@ -898,7 +898,7 @@ static ulong mem_test_alt(vu_long *buf, ulong start_addr, ulong end_addr,
         * Check each location and invert it for the second pass.
         */
        for (pattern = 1, offset = 0; offset < num_words; pattern++, offset++) {
-               WATCHDOG_RESET();
+               schedule();
                temp = addr[offset];
                if (temp != pattern) {
                        printf("\nFAILURE (read/write) @ 0x%.8lx:"
@@ -918,7 +918,7 @@ static ulong mem_test_alt(vu_long *buf, ulong start_addr, ulong end_addr,
         * Check each location for the inverted pattern and zero it.
         */
        for (pattern = 1, offset = 0; offset < num_words; pattern++, offset++) {
-               WATCHDOG_RESET();
+               schedule();
                anti_pattern = ~pattern;
                temp = addr[offset];
                if (temp != anti_pattern) {
@@ -972,7 +972,7 @@ static ulong test_bitflip_comparison(volatile unsigned long *bufa,
        for (k = 0; k < max; k++) {
                q = 0x00000001L << k;
                for (j = 0; j < 8; j++) {
-                       WATCHDOG_RESET();
+                       schedule();
                        q = ~q;
                        p1 = (volatile unsigned long *)bufa;
                        p2 = (volatile unsigned long *)bufb;
@@ -1033,7 +1033,7 @@ static ulong mem_test_quick(vu_long *buf, ulong start_addr, ulong end_addr,
                pattern, "");
 
        for (addr = buf, val = pattern; addr < end; addr++) {
-               WATCHDOG_RESET();
+               schedule();
                *addr = val;
                val += incr;
        }
@@ -1041,7 +1041,7 @@ static ulong mem_test_quick(vu_long *buf, ulong start_addr, ulong end_addr,
        puts("Reading...");
 
        for (addr = buf, val = pattern; addr < end; addr++) {
-               WATCHDOG_RESET();
+               schedule();
                readback = *addr;
                if (readback != val) {
                        ulong offset = addr - buf;
index d4e619b842c8b3dfda3be3edc58f940654d3f1a4..b7daaa6e8e842390472c2ae4b70dd26a491a9a4e 100644 (file)
@@ -231,7 +231,7 @@ static int do_usb_mass_storage(struct cmd_tbl *cmdtp, int flag,
                        goto cleanup_register;
                }
 
-               WATCHDOG_RESET();
+               schedule();
        }
 
 cleanup_register:
index 65ba41320a02350234e96b1f0769ea2a9e128c48..8533d0d2389de140acada06f38004c5019ddc499 100644 (file)
@@ -200,7 +200,7 @@ do_imgextract(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 
                                while (l > 0) {
                                        tail = (l > CHUNKSZ) ? CHUNKSZ : l;
-                                       WATCHDOG_RESET();
+                                       schedule();
                                        memmove(to, from, tail);
                                        to += tail;
                                        from += tail;
index deb46be1822754d23d4b6d78da89e667bbf91bf0..f92d7b9faf4cb7dfa7844d3e3dc7d5662a67484f 100644 (file)
@@ -114,14 +114,14 @@ static int init_func_watchdog_init(void)
        hw_watchdog_init();
        puts("       Watchdog enabled\n");
 # endif
-       WATCHDOG_RESET();
+       schedule();
 
        return 0;
 }
 
 int init_func_watchdog_reset(void)
 {
-       WATCHDOG_RESET();
+       schedule();
 
        return 0;
 }
index 062bc3e688c6ef4ac27e3707f0ae8f9097bd8b1c..50670b5615a5d3fae5b8d408b76b8559372bc5e0 100644 (file)
@@ -341,7 +341,7 @@ static int initr_flash(void)
        /*
         * Compute and print flash CRC if flashchecksum is set to 'y'
         *
-        * NOTE: Maybe we should add some WATCHDOG_RESET()? XXX
+        * NOTE: Maybe we should add some schedule()? XXX
         */
        if (env_get_yesno("flashchecksum") == 1) {
                const uchar *flash_base = (const uchar *)CONFIG_SYS_FLASH_BASE;
index f883b7ffac8e0108485e97ecec248a5e632ff699..f6e2bcdeceb20bdf08890444dc179e005c7d32c6 100644 (file)
@@ -274,7 +274,7 @@ static int cread_line(const char *const prompt, char *buf, unsigned int *len,
                        while (!tstc()) {       /* while no incoming data */
                                if (get_ticks() >= etime)
                                        return -2;      /* timed out */
-                               WATCHDOG_RESET();
+                               schedule();
                        }
                        first = 0;
                }
@@ -595,7 +595,7 @@ int cli_readline_into_buffer(const char *const prompt, char *buffer,
        for (;;) {
                if (bootretry_tstc_timeout())
                        return -2;      /* timed out */
-               WATCHDOG_RESET();       /* Trigger watchdog, if needed */
+               schedule();     /* Trigger watchdog, if needed */
 
                c = getchar();
 
index bde941223997345dd9ec1dca6be125d76acc08bb..66b9813b3a7ec31deb5f1fc09c72ff8a1b5bc33d 100644 (file)
@@ -480,7 +480,7 @@ int fgetc(int file)
                 * Effectively poll for input wherever it may be available.
                 */
                for (;;) {
-                       WATCHDOG_RESET();
+                       schedule();
                        if (CONFIG_IS_ENABLED(CONSOLE_MUX)) {
                                /*
                                 * Upper layer may have already called tstc() so
index 16bd1ba588ad5f02a97342710fec9b1eca2354de..96190889ab770ed5a445aab8036439a956b7007b 100644 (file)
@@ -101,7 +101,7 @@ int run_usb_dnl_gadget(int usbctrl_index, char *usb_dnl_gadget)
                if (dfu_reinit_needed)
                        goto exit;
 
-               WATCHDOG_RESET();
+               schedule();
                usb_gadget_handle_interrupts(usbctrl_index);
        }
 exit:
index 0898bc025d679758eb851372e35edca58f3582f4..a462b22a477a9d5ac825cbc70ff922399184cc5c 100644 (file)
@@ -294,9 +294,9 @@ void lcd_logo_plot(int x, int y)
              BMP_LOGO_WIDTH, BMP_LOGO_HEIGHT, BMP_LOGO_COLORS);
 
        if (bpix < 12) {
-               WATCHDOG_RESET();
+               schedule();
                lcd_logo_set_cmap();
-               WATCHDOG_RESET();
+               schedule();
 
                for (i = 0; i < BMP_LOGO_HEIGHT; ++i) {
                        memcpy(fb, bmap, BMP_LOGO_WIDTH);
@@ -320,7 +320,7 @@ void lcd_logo_plot(int x, int y)
                }
        }
 
-       WATCHDOG_RESET();
+       schedule();
        lcd_sync();
 }
 #else
@@ -459,7 +459,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
                        byte_width = width * 2;
 
                for (i = 0; i < height; ++i) {
-                       WATCHDOG_RESET();
+                       schedule();
                        for (j = 0; j < width; j++) {
                                if (bpix != 16) {
                                        fb_put_byte(&fb, &bmap);
@@ -488,7 +488,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
 #if defined(CONFIG_BMP_16BPP)
        case 16:
                for (i = 0; i < height; ++i) {
-                       WATCHDOG_RESET();
+                       schedule();
                        for (j = 0; j < width; j++)
                                fb_put_word(&fb, &bmap);
 
index 0d19601cf538c1d9d049afb780374d3ea21ffe2b..8fe00965c0cd5405bc537c3ff77a1a2507386778 100644 (file)
@@ -435,7 +435,7 @@ void bootmenu_autoboot_loop(struct bootmenu_data *menu,
                printf("Hit any key to stop autoboot: %d ", menu->delay);
                for (i = 0; i < 100; ++i) {
                        if (!tstc()) {
-                               WATCHDOG_RESET();
+                               schedule();
                                mdelay(10);
                                continue;
                        }
@@ -483,7 +483,7 @@ void bootmenu_loop(struct bootmenu_data *menu,
                if (tstc()) {
                        c = getchar();
                } else {
-                       WATCHDOG_RESET();
+                       schedule();
                        mdelay(10);
                        if (tstc())
                                c = getchar();
@@ -492,7 +492,7 @@ void bootmenu_loop(struct bootmenu_data *menu,
                }
        } else {
                while (!tstc()) {
-                       WATCHDOG_RESET();
+                       schedule();
                        mdelay(10);
                }
                c = getchar();
index d385bea532e24d86259c937f29a788cfce6a46c3..4cbc9acb73800091a9d3ecc654d4e0d10526a3d1 100644 (file)
@@ -446,7 +446,7 @@ static int usb_kbd_getc(struct stdio_dev *sdev)
        data = usb_kbd_dev->privptr;
 
        while (data->usb_in_pointer == data->usb_out_pointer) {
-               WATCHDOG_RESET();
+               schedule();
                usb_kbd_poll_for_event(usb_kbd_dev);
        }
 
index a68d3929024b9819e1627fa3f244623109d250f8..fb319f71190735a9fd07dad187deaeb1dca70a71 100644 (file)
@@ -68,7 +68,7 @@ CYGACC_COMM_IF_GETC_TIMEOUT (char chan, char *c)
 {
 
   ulong now = get_timer(0);
-  WATCHDOG_RESET();
+  schedule();
   while (!tstc ())
     {
       if (get_timer(now) > xyzModem_CHAR_TIMEOUT)
index 73da29ad552b010c343a6b184df75417a30d5eed..b8840d29c288a340232af7d1f84370001645f4bd 100644 (file)
@@ -62,7 +62,7 @@ static void ide_reset(void)
        /* the reset signal shall be asserted for et least 25 us */
        udelay(25);
 
-       WATCHDOG_RESET();
+       schedule();
 
        /* de-assert RESET signal */
        ide_set_reset(0);
@@ -695,7 +695,7 @@ void ide_init(void)
        unsigned char c;
        int i, bus;
 
-       WATCHDOG_RESET();
+       schedule();
 
        /* ATAPI Drives seems to need a proper IDE Reset */
        ide_reset();
@@ -745,7 +745,7 @@ void ide_init(void)
                        puts("OK ");
                        ide_bus_ok[bus] = 1;
                }
-               WATCHDOG_RESET();
+               schedule();
        }
 
        putc('\n');
@@ -775,7 +775,7 @@ void ide_init(void)
                }
 #endif
        }
-       WATCHDOG_RESET();
+       schedule();
 
 #ifdef CONFIG_BLK
        struct udevice *dev;
index 1178cc6a76947fbf5d963ef6b3ea9593117a7612..a1b0b9f564b1e53f97449ab029a7777ac74dc545 100644 (file)
@@ -302,7 +302,7 @@ static int aspeed_hace_digest_wd(struct udevice *dev, enum HASH_ALGO algo,
                                return rc;
 
                        cur += chunk;
-                       WATCHDOG_RESET();
+                       schedule();
                }
        } else {
                rc = aspeed_hace_update(dev, ctx, ibuf, ilen);
index fea9d12609679b7737520483df18600c8588ce51..553c068010ca7a062c85a04ec20163143feb8de5 100644 (file)
@@ -258,7 +258,7 @@ static int sw_hash_digest_wd(struct udevice *dev, enum HASH_ALGO algo,
                                return rc;
 
                        cur += chunk;
-                       WATCHDOG_RESET();
+                       schedule();
                }
        } else {
                rc = sw_hash_update(dev, ctx, ibuf, ilen);
index 4a8f8dea1c4df8bbe909960dffc249f4f7c063a9..8ef5fa4c481c3d4ffb79365808dc52bde890398a 100644 (file)
@@ -671,7 +671,7 @@ static int of_sdram_firewall_setup(const void *blob)
 
 int ddr_calibration_sequence(void)
 {
-       WATCHDOG_RESET();
+       schedule();
 
        /* Check to see if SDRAM cal was success */
        if (sdram_startup()) {
@@ -681,7 +681,7 @@ int ddr_calibration_sequence(void)
 
        puts("DDRCAL: Success\n");
 
-       WATCHDOG_RESET();
+       schedule();
 
        /* initialize the MMR register */
        sdram_mmr_init();
index 737a4e2ff18b2ad7cfe0f3ac5bc3ddf184a58d65..d9039443b91cfd71bca7c67c6ffb8457eb87f97d 100644 (file)
@@ -517,7 +517,7 @@ static int ensure_retry_procedure_complete(phys_addr_t umctl2_base)
                              DDR4_CRCPARSTAT_CMD_IN_ERR_WINDOW;
 
                udelay(1);
-               WATCHDOG_RESET();
+               schedule();
        }
 
        return 0;
@@ -1349,7 +1349,7 @@ static int ddr_post_handoff_config(phys_addr_t umctl2_base,
                }
 
                udelay(1);
-               WATCHDOG_RESET();
+               schedule();
 
                /* Polling until SDRAM entered normal operating mode */
                value = readl(umctl2_base + DDR4_STAT_OFFSET) &
index 9b1710c13509c3791789d04a0c5b91d53002baba..4716abfc9a8b051aa562e8bc9a1f54f089d32e6d 100644 (file)
@@ -161,7 +161,7 @@ void sdram_init_ecc_bits(struct bd_info *bd)
                        sdram_clear_mem(start_addr, size_init);
                        size -= size_init;
                        start_addr += size_init;
-                       WATCHDOG_RESET();
+                       schedule();
                }
 
                bank++;
index f5fd9a14c266861ab06fb474d37d3b1aba09cb9b..903d143a361c4b35848a5db5af2f6f41707ff9df 100644 (file)
@@ -44,7 +44,7 @@ static int reconfig_status_polling_resp(void)
 
                puts(".");
                udelay(RECONFIG_STATUS_INTERVAL_DELAY_US);
-               WATCHDOG_RESET();
+               schedule();
        }
 
        return -ETIMEDOUT;
@@ -104,7 +104,7 @@ static int send_bitstream(const void *rbf_data, size_t rbf_size)
 
                        udelay(20000);
                }
-               WATCHDOG_RESET();
+               schedule();
        }
 
        return 0;
@@ -252,7 +252,7 @@ static int reconfig_status_polling_resp(void)
 
                puts(".");
                udelay(RECONFIG_STATUS_INTERVAL_DELAY_US);
-               WATCHDOG_RESET();
+               schedule();
        }
 
        return -ETIMEDOUT;
@@ -378,7 +378,7 @@ static int send_reconfig_data(const void *rbf_data, size_t rbf_size,
                        if (resp_err && !xfer_count)
                                return resp_err;
                }
-               WATCHDOG_RESET();
+               schedule();
        }
 
        return 0;
index d8089122af1d35666f1f0342bc3558e7fc982c34..e86e3b743171308dec3d4f6b04093a33dbcb9a79 100644 (file)
@@ -383,7 +383,7 @@ static int fpgamgr_program_poll_cd(void)
                        printf("nstatus == 0 while waiting for condone\n");
                        return -EPERM;
                }
-               WATCHDOG_RESET();
+               schedule();
        }
 
        if (i == FPGA_TIMEOUT_CNT)
@@ -534,7 +534,7 @@ static void get_rbf_image_info(struct rbf_info *rbf, u16 *buffer)
                rbf->section = unknown;
                break;
 
-               WATCHDOG_RESET();
+               schedule();
        }
 }
 
@@ -635,7 +635,7 @@ static int first_loading_rbf_to_buffer(struct udevice *dev,
                                break;
                        }
                }
-               WATCHDOG_RESET();
+               schedule();
        }
 
        if (!fpga_node_name) {
@@ -879,7 +879,7 @@ int socfpga_loadfs(fpga_fs_info *fpga_fsinfo, const void *buf, size_t bsize,
 
                total_sizeof_image += buffer_sizebytes_ori;
 
-               WATCHDOG_RESET();
+               schedule();
        }
        wait_for_fifo_empty();
 
index aa13af3ae109bfdcd8830402b11b39450b68e693..f80ff5383bc3063a425c7e9099c5fe6350953744 100644 (file)
@@ -199,7 +199,7 @@ static int wait_for_sr_state(struct mxc_i2c_bus *i2c_bus, unsigned state)
                }
                if ((sr & (state >> 8)) == (unsigned char)state)
                        return sr;
-               WATCHDOG_RESET();
+               schedule();
                elapsed = get_timer(start_time);
                if (elapsed > (CONFIG_SYS_HZ / 10))     /* .1 seconds */
                        break;
@@ -447,7 +447,7 @@ int i2c_idle_bus(struct mxc_i2c_bus *i2c_bus)
                sda = dm_gpio_get_value(sda_gpio);
                if ((sda & scl) == 1)
                        break;
-               WATCHDOG_RESET();
+               schedule();
                elapsed = get_timer(start_time);
                if (elapsed > (CONFIG_SYS_HZ / 5)) {    /* .2 seconds */
                        ret = -EBUSY;
index 6e9acf7310aa5f2ddbffc9265e94df6f4f40ca98..4ee62df9d408eaae535b5b85530829d167fb9f41 100644 (file)
@@ -1023,7 +1023,7 @@ static void octeontx_mmc_cleanup_dma(struct mmc *mmc,
                start = get_timer(0);
                do {
                        rsp_sts.u = read_csr(mmc, MIO_EMM_RSP_STS());
-                       WATCHDOG_RESET();
+                       schedule();
                } while (get_timer(start) < 100 &&
                         (rsp_sts.s.dma_val || rsp_sts.s.dma_pend));
        } while (retries-- >= 0 && rsp_sts.s.dma_pend);
@@ -1107,7 +1107,7 @@ static int octeontx_mmc_wait_dma(struct mmc *mmc, bool write, ulong timeout,
                } else if (!rsp_sts.s.dma_val && emm_dma_int.s.done) {
                        break;
                }
-               WATCHDOG_RESET();
+               schedule();
                timed_out = (get_timer(start_time) > timeout);
        } while (!timed_out);
 
@@ -1219,7 +1219,7 @@ static int octeontx_mmc_read_blocks(struct mmc *mmc, struct mmc_cmd *cmd,
                                }
                                return blkcnt - count;
                        }
-                       WATCHDOG_RESET();
+                       schedule();
                } while (--count);
        }
 #ifdef DEBUG
@@ -1253,7 +1253,7 @@ static int octeontx_mmc_poll_ready(struct mmc *mmc, ulong timeout)
                } else if (cmd.response[0] & R1_READY_FOR_DATA) {
                        return 0;
                }
-               WATCHDOG_RESET();
+               schedule();
        } while (get_timer(start) < timeout);
 
        if (not_ready)
@@ -1328,7 +1328,7 @@ static ulong octeontx_mmc_write_blocks(struct mmc *mmc, struct mmc_cmd *cmd,
                                       read_csr(mmc, MIO_EMM_DMA()));
                                return blkcnt - count;
                        }
-                       WATCHDOG_RESET();
+                       schedule();
                } while (--count);
        }
 
@@ -1491,7 +1491,7 @@ static int octeontx_mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
        start = get_timer(0);
        do {
                rsp_sts.u = read_csr(mmc, MIO_EMM_RSP_STS());
-               WATCHDOG_RESET();
+               schedule();
        } while (!rsp_sts.s.cmd_done && !rsp_sts.s.rsp_timeout &&
                 (get_timer(start) < timeout + 10));
        octeontx_mmc_print_rsp_errors(mmc, rsp_sts);
index 830e29cdd4147b3279f4ede6db1a15f3e7aeff51..76dc1c68b821d30c3c7764763148ace565ff94d2 100644 (file)
@@ -242,7 +242,7 @@ static int sh_mmcif_multi_read(struct sh_mmcif_host *host,
                for (i = 0; i < blocksize / 4; i++)
                        *p++ = sh_mmcif_read(&host->regs->ce_data);
 
-               WATCHDOG_RESET();
+               schedule();
        }
        return 0;
 }
@@ -309,7 +309,7 @@ static int sh_mmcif_multi_write(struct sh_mmcif_host *host,
                for (i = 0; i < blocksize / 4; i++)
                        sh_mmcif_write(*p++, &host->regs->ce_data);
 
-               WATCHDOG_RESET();
+               schedule();
        }
        return 0;
 }
@@ -523,7 +523,7 @@ static int sh_mmcif_send_cmd_common(struct sh_mmcif_host *host,
 {
        int ret;
 
-       WATCHDOG_RESET();
+       schedule();
 
        switch (cmd->cmdidx) {
        case MMC_CMD_APP_CMD:
index bfce8a2e4a6cd410394b3738031d795ec2aac1c4..7ab4d949e74da300493743cd91d2e485558fd882 100644 (file)
@@ -445,7 +445,7 @@ static int stm32_sdmmc2_send_cmd(struct udevice *dev, struct mmc_cmd *cmd,
        u32 cmdat = data ? SDMMC_CMD_CMDTRANS : 0;
        int ret, retry = 3;
 
-       WATCHDOG_RESET();
+       schedule();
 
 retry_cmd:
        ctx.data_length = 0;
index 495041070650f70a5f0cbc5f5356698e87a55b93..d34d8ee976716d711813897f708f6ffde8787b8a 100644 (file)
@@ -584,7 +584,7 @@ static int flash_status_check(flash_info_t *info, flash_sect_t sector,
        reset_timer();
 #endif
        start = get_timer(0);
-       WATCHDOG_RESET();
+       schedule();
        while (flash_is_busy(info, sector)) {
                if (get_timer(start) > tout) {
                        printf("Flash %s timeout at address %lx data %lx\n",
@@ -677,7 +677,7 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst,
        reset_timer();
 #endif
        start = get_timer(0);
-       WATCHDOG_RESET();
+       schedule();
        while (1) {
                switch (info->portwidth) {
                case FLASH_CFI_8BIT:
index 090834a495facf119b1b66cf5008c549dd323762..99c29670c75e9dba69f4e61ba16178e7b216cc14 100644 (file)
@@ -173,7 +173,7 @@ int nanddev_mtd_erase(struct mtd_info *mtd, struct erase_info *einfo)
        nanddev_offs_to_pos(nand, einfo->addr, &pos);
        nanddev_offs_to_pos(nand, einfo->addr + einfo->len - 1, &last);
        while (nanddev_pos_cmp(&pos, &last) <= 0) {
-               WATCHDOG_RESET();
+               schedule();
                ret = nanddev_erase(nand, &pos);
                if (ret) {
                        einfo->fail_addr = nanddev_pos_to_offs(nand, &pos);
index 06bf5ac18ffcdfb5321e1f8737ea3de194701f3f..61bfd175be40b95382b8db40472817ff31279fbc 100644 (file)
@@ -420,7 +420,7 @@ static int pmecc_err_location(struct mtd_info *mtd)
        while (--timeout) {
                if (pmecc_readl(host->pmerrloc, elisr) & PMERRLOC_CALC_DONE)
                        break;
-               WATCHDOG_RESET();
+               schedule();
                udelay(1);
        }
 
@@ -558,7 +558,7 @@ static int atmel_nand_pmecc_read_page(struct mtd_info *mtd,
        while (--timeout) {
                if (!(pmecc_readl(host->pmecc, sr) & PMECC_SR_BUSY))
                        break;
-               WATCHDOG_RESET();
+               schedule();
                udelay(1);
        }
 
@@ -598,7 +598,7 @@ static int atmel_nand_pmecc_write_page(struct mtd_info *mtd,
        while (--timeout) {
                if (!(pmecc_readl(host->pmecc, sr) & PMECC_SR_BUSY))
                        break;
-               WATCHDOG_RESET();
+               schedule();
                udelay(1);
        }
 
index 1a1a7579328a05cde1d8ea014688eb29a822b69c..215b9ba84fd86ac93e118730cbc8bf85e256105e 100644 (file)
@@ -595,7 +595,7 @@ static void nand_wait_status_ready(struct mtd_info *mtd, unsigned long timeo)
 
                if (status & NAND_STATUS_READY)
                        break;
-               WATCHDOG_RESET();
+               schedule();
        }
 };
 
@@ -2342,7 +2342,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
        while (1) {
                unsigned int ecc_failures = mtd->ecc_stats.failed;
 
-               WATCHDOG_RESET();
+               schedule();
                bytes = min(mtd->writesize - col, readlen);
                aligned = (bytes == mtd->writesize);
 
@@ -2695,7 +2695,7 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
        page = realpage & chip->pagemask;
 
        while (1) {
-               WATCHDOG_RESET();
+               schedule();
 
                if (ops->mode == MTD_OPS_RAW)
                        ret = chip->ecc.read_oob_raw(mtd, chip, page);
@@ -3263,7 +3263,7 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
                else
                        use_bufpoi = 0;
 
-               WATCHDOG_RESET();
+               schedule();
                /* Partial page write?, or need to use bounce buffer */
                if (use_bufpoi) {
                        pr_debug("%s: using write bounce buffer for buf@%p\n",
@@ -3556,7 +3556,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
        instr->state = MTD_ERASING;
 
        while (len) {
-               WATCHDOG_RESET();
+               schedule();
 
                /* Check if we have a bad block, we do not erase bad blocks! */
                if (!instr->scrub && nand_block_checkbad(mtd, ((loff_t) page) <<
index 5150607d8a175fb97783c76860e1cae21636b276..b2345dca7f71f233585b90c7ecb863436a623474 100644 (file)
@@ -103,7 +103,7 @@ int nand_erase_opts(struct mtd_info *mtd,
             erased_length < erase_length;
             erase.addr += mtd->erasesize) {
 
-               WATCHDOG_RESET();
+               schedule();
 
                if (opts->lim && (erase.addr >= (opts->offset + opts->lim))) {
                        puts("Size of erase exceeds limit\n");
@@ -638,7 +638,7 @@ int nand_write_skip_bad(struct mtd_info *mtd, loff_t offset, size_t *length,
                size_t block_offset = offset & (mtd->erasesize - 1);
                size_t write_size, truncated_write_size;
 
-               WATCHDOG_RESET();
+               schedule();
 
                if (nand_block_isbad(mtd, block_start)) {
                        printf("Skip bad block 0x%08llx\n", block_start);
@@ -753,7 +753,7 @@ int nand_read_skip_bad(struct mtd_info *mtd, loff_t offset, size_t *length,
                size_t block_offset = offset & (mtd->erasesize - 1);
                size_t read_length;
 
-               WATCHDOG_RESET();
+               schedule();
 
                if (nand_block_isbad(mtd, offset & ~(mtd->erasesize - 1))) {
                        printf("Skipping bad block 0x%08llx\n",
index e5330958c7e135b6ecac7e06b862d43b1b5cdfb2..134bf22c80553977bf71cebaf413201c5c8cdc73 100644 (file)
@@ -579,7 +579,7 @@ static int spinand_mtd_read(struct mtd_info *mtd, loff_t from,
 #endif
 
        nanddev_io_for_each_page(nand, from, ops, &iter) {
-               WATCHDOG_RESET();
+               schedule();
                ret = spinand_select_target(spinand, iter.req.pos.target);
                if (ret)
                        break;
@@ -631,7 +631,7 @@ static int spinand_mtd_write(struct mtd_info *mtd, loff_t to,
 #endif
 
        nanddev_io_for_each_page(nand, to, ops, &iter) {
-               WATCHDOG_RESET();
+               schedule();
                ret = spinand_select_target(spinand, iter.req.pos.target);
                if (ret)
                        break;
index f94597c06119868f18eb2f669ccf5ee3d472afac..08fe7d427acf9e132b2504429a8cfc4b7ff658e6 100644 (file)
@@ -478,7 +478,7 @@ static int onenand_wait(struct mtd_info *mtd, int state)
        u32 timeo = (CONFIG_SYS_HZ * 20) / 1000;
        u32 time_start = get_timer(0);
        do {
-               WATCHDOG_RESET();
+               schedule();
                if (get_timer(time_start) > timeo)
                        return -EIO;
                interrupt = this->read_word(this->base + ONENAND_REG_INTERRUPT);
@@ -1170,7 +1170,7 @@ static int onenand_bbt_wait(struct mtd_info *mtd, int state)
        u32 timeo = (CONFIG_SYS_HZ * 20) / 1000;
        u32 time_start = get_timer(0);
        do {
-               WATCHDOG_RESET();
+               schedule();
                if (get_timer(time_start) > timeo)
                        return ONENAND_BBT_READ_FATAL_ERROR;
                interrupt = this->read_word(this->base + ONENAND_REG_INTERRUPT);
index f236e87510744e382858b741ce2ba3fa3157de9d..c73636d7d117a4d91d0b32348824a3ca76460cc9 100644 (file)
@@ -958,7 +958,7 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr)
        addr_known = true;
 
        while (len) {
-               WATCHDOG_RESET();
+               schedule();
                if (!IS_ENABLED(CONFIG_SPL_BUILD) && ctrlc()) {
                        addr_known = false;
                        ret = -EINTR;
@@ -1721,7 +1721,7 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, size_t len,
        for (i = 0; i < len; ) {
                ssize_t written;
                loff_t addr = to + i;
-               WATCHDOG_RESET();
+               schedule();
 
                /*
                 * If page_size is a power of two, the offset can be quickly
index a5665a25f2af867625f33b94c0071802fd622fc7..f596b6bca876d2e0a855f6e3e546bd71451ddf09 100644 (file)
@@ -580,7 +580,7 @@ int nix_lf_xmit(struct udevice *dev, void *pkt, int pkt_len)
                __iowmb();
                result = lmt_submit((u64)(nix->nix_base +
                                               NIXX_LF_OP_SENDX(0)));
-               WATCHDOG_RESET();
+               schedule();
        } while (result == 0);
 
        return 0;
index cd098d6cd6acad6ae3343f7aaf47914c5b9a0ff3..c945ea0f5f22fcefe26aa8f85622a7a3714bbaaf 100644 (file)
@@ -65,7 +65,7 @@ int npa_attach_aura(struct nix_af *nix_af, int lf,
        start = get_timer(0);
        while ((res->s.compcode == NPA_AQ_COMP_E_NOTDONE) &&
               (get_timer(start) < 1000))
-               WATCHDOG_RESET();
+               schedule();
        if (res->s.compcode != NPA_AQ_COMP_E_GOOD) {
                printf("%s: Error: result 0x%x not good\n",
                       __func__, res->s.compcode);
@@ -111,7 +111,7 @@ int npa_attach_pool(struct nix_af *nix_af, int lf,
        start = get_timer(0);
        while ((res->s.compcode == NPA_AQ_COMP_E_NOTDONE) &&
               (get_timer(start) < 1000))
-               WATCHDOG_RESET();
+               schedule();
 
        if (res->s.compcode != NPA_AQ_COMP_E_GOOD) {
                printf("%s: Error: result 0x%x not good\n",
@@ -136,7 +136,7 @@ int npa_lf_admin_setup(struct npa *npa, int lf, dma_addr_t aura_base)
 
        do {
                lf_rst.u = npa_af_reg_read(npa_af, NPA_AF_LF_RST());
-               WATCHDOG_RESET();
+               schedule();
        } while (lf_rst.s.exec);
 
        /* Set Aura size and enable caching of contexts */
@@ -199,7 +199,7 @@ int npa_lf_admin_shutdown(struct nix_af *nix_af, int lf, u32 pool_count)
                start = get_timer(0);
                while ((res->s.compcode == NPA_AQ_COMP_E_NOTDONE) &&
                       (get_timer(start) < 1000))
-                       WATCHDOG_RESET();
+                       schedule();
 
                if (res->s.compcode != NPA_AQ_COMP_E_GOOD) {
                        printf("%s: Error: result 0x%x not good for lf %d\n"
@@ -235,7 +235,7 @@ int npa_lf_admin_shutdown(struct nix_af *nix_af, int lf, u32 pool_count)
                start = get_timer(0);
                while ((res->s.compcode == NPA_AQ_COMP_E_NOTDONE) &&
                       (get_timer(start) < 1000))
-                       WATCHDOG_RESET();
+                       schedule();
 
                if (res->s.compcode != NPA_AQ_COMP_E_GOOD) {
                        printf("%s: Error: result 0x%x not good for lf %d\n"
@@ -255,7 +255,7 @@ int npa_lf_admin_shutdown(struct nix_af *nix_af, int lf, u32 pool_count)
 
        do {
                lf_rst.u = npa_af_reg_read(npa, NPA_AF_LF_RST());
-               WATCHDOG_RESET();
+               schedule();
        } while (lf_rst.s.exec);
 
        return 0;
@@ -286,7 +286,7 @@ int npa_af_setup(struct npa_af *npa_af)
        /* Wait for reset to complete */
        do {
                blk_rst.u = npa_af_reg_read(npa_af, NPA_AF_BLK_RST());
-               WATCHDOG_RESET();
+               schedule();
        } while (blk_rst.s.busy);
 
        /* Set little Endian */
@@ -318,7 +318,7 @@ int npa_af_shutdown(struct npa_af *npa_af)
        /* Wait for reset to complete */
        do {
                blk_rst.u = npa_af_reg_read(npa_af, NPA_AF_BLK_RST());
-               WATCHDOG_RESET();
+               schedule();
        } while (blk_rst.s.busy);
 
        rvu_aq_free(&npa_af->aq);
@@ -481,7 +481,7 @@ static int nix_aq_issue_command(struct nix_af *nix_af,
        start = get_timer(0);
        /* Wait for completion */
        do {
-               WATCHDOG_RESET();
+               schedule();
                dsb();
        } while (result->s.compcode == 0 && get_timer(start) < 2);
 
@@ -645,7 +645,7 @@ int nix_lf_admin_setup(struct nix *nix)
 
        do {
                lf_rst.u = nix_af_reg_read(nix_af, NIXX_AF_LF_RST());
-               WATCHDOG_RESET();
+               schedule();
        } while (lf_rst.s.exec);
 
        /* Config NIX RQ HW context and base*/
@@ -767,7 +767,7 @@ int nix_lf_admin_shutdown(struct nix_af *nix_af, int lf,
 
        do {
                sw_sync.u = nix_af_reg_read(nix_af, NIXX_AF_RX_SW_SYNC());
-               WATCHDOG_RESET();
+               schedule();
        } while (sw_sync.s.ena);
 
        for (index = 0; index < rq_count; index++) {
@@ -832,7 +832,7 @@ int nix_lf_admin_shutdown(struct nix_af *nix_af, int lf,
 
        do {
                lf_rst.u = nix_af_reg_read(nix_af, NIXX_AF_LF_RST());
-               WATCHDOG_RESET();
+               schedule();
        } while (lf_rst.s.exec);
 
        return 0;
@@ -972,7 +972,7 @@ int npc_af_shutdown(struct nix_af *nix_af)
        /* Wait for reset to complete */
        do {
                blk_rst.u = npc_af_reg_read(nix_af, NPC_AF_BLK_RST());
-               WATCHDOG_RESET();
+               schedule();
        } while (blk_rst.s.busy);
 
        debug("%s: npc af reset --\n", __func__);
@@ -1008,7 +1008,7 @@ int nix_af_setup(struct nix_af *nix_af)
        /* Wait for reset to complete */
        do {
                blk_rst.u = nix_af_reg_read(nix_af, NIXX_AF_BLK_RST());
-               WATCHDOG_RESET();
+               schedule();
        } while (blk_rst.s.busy);
 
        /* Put in LE mode */
@@ -1031,7 +1031,7 @@ int nix_af_setup(struct nix_af *nix_af)
        /* Wait for calibration to complete */
        do {
                af_status.u = nix_af_reg_read(nix_af, NIXX_AF_STATUS());
-               WATCHDOG_RESET();
+               schedule();
        } while (af_status.s.calibrate_done == 0);
 
        af_cfg.u = nix_af_reg_read(nix_af, NIXX_AF_CFG());
@@ -1091,7 +1091,7 @@ int nix_af_shutdown(struct nix_af *nix_af)
        /* Wait for reset to complete */
        do {
                blk_rst.u = nix_af_reg_read(nix_af, NIXX_AF_BLK_RST());
-               WATCHDOG_RESET();
+               schedule();
        } while (blk_rst.s.busy);
 
        rvu_aq_free(&nix_af->aq);
index 64262f1aa90105408109ce6de0dc56771abfb8c8..c5f33544144f1c1f80108cee02c39aa47255216f 100644 (file)
@@ -169,7 +169,7 @@ static int test_loop_end(u32 *loop, u32 nb_loop, u32 progress)
                return 1;
        }
        printf("loop #%d\n", *loop);
-       WATCHDOG_RESET();
+       schedule();
 
        return 0;
 }
index 1fb9ee5cc94a34a47ade95a8667b684446550539..90ccdf6b2945cf4b96c0551862dde7ce78a0cc87 100644 (file)
@@ -103,7 +103,7 @@ static int atmel_serial_getc(void)
        atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;
 
        while (!(readl(&usart->csr) & USART3_BIT(RXRDY)))
-                WATCHDOG_RESET();
+                schedule();
        return readl(&usart->rhr);
 }
 
index 47bad6f8e2a9613f97e3c3756de0a6c5f09590e1..7592979cab5d0dd4fdf21d510161b27115b8ac25 100644 (file)
@@ -296,7 +296,7 @@ void ns16550_putc(struct ns16550 *com_port, char c)
         * in puts().
         */
        if (c == '\n')
-               WATCHDOG_RESET();
+               schedule();
 }
 
 #ifndef CONFIG_NS16550_MIN_FUNCTIONS
@@ -307,7 +307,7 @@ char ns16550_getc(struct ns16550 *com_port)
                extern void usbtty_poll(void);
                usbtty_poll();
 #endif
-               WATCHDOG_RESET();
+               schedule();
        }
        return serial_in(&com_port->rbr);
 }
@@ -395,7 +395,7 @@ static int ns16550_serial_putc(struct udevice *dev, const char ch)
         * in puts().
         */
        if (ch == '\n')
-               WATCHDOG_RESET();
+               schedule();
 
        return 0;
 }
index 30650e37b0d7f3d0139d6c918947c03031d82ba4..0d43e9b62589e1cefb7a284257711983dfe0a52c 100644 (file)
@@ -246,7 +246,7 @@ static int __serial_getc(struct udevice *dev)
        do {
                err = ops->getc(dev);
                if (err == -EAGAIN)
-                       WATCHDOG_RESET();
+                       schedule();
        } while (err == -EAGAIN);
 
        return err >= 0 ? err : 0;
index f0756c37c849fb5303eb4f207f6b93f77929fe19..493a42b4ccc2046b263e502e45b3b84286ecbfd4 100644 (file)
@@ -114,7 +114,7 @@ static int bcm283x_mu_serial_pending(struct udevice *dev, bool input)
        lsr = readl(&regs->lsr);
 
        if (input) {
-               WATCHDOG_RESET();
+               schedule();
                return (lsr & BCM283X_MU_LSR_RX_READY) ? 1 : 0;
        } else {
                return (lsr & BCM283X_MU_LSR_TX_IDLE) ? 0 : 1;
index ca49ef73723b80f6142d59eb7a3204668f0f142a..ff576da516d42b56cb2325d3e886a4b22720e50b 100644 (file)
@@ -169,7 +169,7 @@ static int _lpuart_serial_getc(struct lpuart_serial_plat *plat)
 {
        struct lpuart_fsl *base = plat->reg;
        while (!(__raw_readb(&base->us1) & (US1_RDRF | US1_OR)))
-               WATCHDOG_RESET();
+               schedule();
 
        barrier();
 
@@ -182,7 +182,7 @@ static void _lpuart_serial_putc(struct lpuart_serial_plat *plat,
        struct lpuart_fsl *base = plat->reg;
 
        while (!(__raw_readb(&base->us1) & US1_TDRE))
-               WATCHDOG_RESET();
+               schedule();
 
        __raw_writeb(c, &base->ud);
 }
@@ -330,7 +330,7 @@ static int _lpuart32_serial_getc(struct lpuart_serial_plat *plat)
        lpuart_read32(plat->flags, &base->stat, &stat);
        while ((stat & STAT_RDRF) == 0) {
                lpuart_write32(plat->flags, &base->stat, STAT_FLAGS);
-               WATCHDOG_RESET();
+               schedule();
                lpuart_read32(plat->flags, &base->stat, &stat);
        }
 
@@ -358,7 +358,7 @@ static void _lpuart32_serial_putc(struct lpuart_serial_plat *plat,
                if ((stat & STAT_TDRE))
                        break;
 
-               WATCHDOG_RESET();
+               schedule();
        }
 
        lpuart_write32(plat->flags, &base->data, c);
index 0978930dcd4f10a2b82aecbc3e2961dd7c2d9e89..aeae6ae6cd250831eb477674db1d6a280050be5b 100644 (file)
@@ -187,7 +187,7 @@ static int serial_mpc8xx_putc(struct udevice *dev, const char c)
        setbits_be16(&rtx->txbd.cbd_sc, BD_SC_READY);
 
        while (in_be16(&rtx->txbd.cbd_sc) & BD_SC_READY)
-               WATCHDOG_RESET();
+               schedule();
 
        return 0;
 }
@@ -204,7 +204,7 @@ static int serial_mpc8xx_getc(struct udevice *dev)
 
        /* Wait for character to show up. */
        while (in_be16(&rtx->rxbd.cbd_sc) & BD_SC_EMPTY)
-               WATCHDOG_RESET();
+               schedule();
 
        /* the characters are read one by one,
         * use the rxindex to know the next char to deliver
index 5c5264bc962927589f3c6813f8747fa094d3680c..b00e2f2c366dcb792a2a3e34785bdf55ac515663 100644 (file)
@@ -102,7 +102,7 @@ static int mt7620_serial_putc(struct udevice *dev, const char ch)
        writel(ch, &plat->regs->thr);
 
        if (ch == '\n')
-               WATCHDOG_RESET();
+               schedule();
 
        return 0;
 }
index a84f39b3fa2ea1396b6a425590a54a93885ff113..22251c5f4ce4f8828ed06a80a5802a04e0107970 100644 (file)
@@ -141,7 +141,7 @@ static int _mtk_serial_putc(struct mtk_serial_priv *priv, const char ch)
        writel(ch, &priv->regs->thr);
 
        if (ch == '\n')
-               WATCHDOG_RESET();
+               schedule();
 
        return 0;
 }
@@ -295,7 +295,7 @@ DECLARE_GLOBAL_DATA_PTR;
                do { \
                        err = _mtk_serial_getc(&mtk_hsuart##port); \
                        if (err == -EAGAIN) \
-                               WATCHDOG_RESET(); \
+                               schedule(); \
                } while (err == -EAGAIN); \
                return err >= 0 ? err : 0; \
        } \
index 70a0e5e9197d8b5f560a87dbfcda1a13dbce5cb9..315c136ef872a6a0c78240dbc9d38904df1a5a19 100644 (file)
@@ -200,7 +200,7 @@ static void mxc_serial_setbrg(void)
 static int mxc_serial_getc(void)
 {
        while (readl(&mxc_base->ts) & UTS_RXEMPTY)
-               WATCHDOG_RESET();
+               schedule();
        return (readl(&mxc_base->rxd) & URXD_RX_DATA); /* mask out status from upper word */
 }
 
@@ -214,7 +214,7 @@ static void mxc_serial_putc(const char c)
 
        /* wait for transmitter to be ready */
        while (!(readl(&mxc_base->ts) & UTS_TXEMPTY))
-               WATCHDOG_RESET();
+               schedule();
 }
 
 /* Test whether a character is in the RX buffer */
@@ -384,7 +384,7 @@ static inline void _debug_uart_putc(int ch)
        struct mxc_uart *base = (struct mxc_uart *)CONFIG_VAL(DEBUG_UART_BASE);
 
        while (!(readl(&base->ts) & UTS_TXEMPTY))
-               WATCHDOG_RESET();
+               schedule();
 
        writel(ch, &base->txd);
 }
index 4bcff77eb88709729d262de6bb3092b0af13dc03..eff5c43e2a5500536103b16da079e1df4c4b875a 100644 (file)
@@ -98,7 +98,7 @@ static int octeon_bootcmd_getc(struct udevice *dev)
        }
 
        while (!octeon_bootcmd_pending(dev, true)) {
-               WATCHDOG_RESET();
+               schedule();
                /*
                 * ToDo:
                 * The original code calls octeon_board_poll() here. We may
index c76e787d03084162dbb7426da6aaced02899b4ff..b0eafe7ad8667b6c76ae600c3759556a2a2f1a01 100644 (file)
@@ -134,7 +134,7 @@ static int octeon_pcie_console_read(struct udevice *dev,
                                                        cons_ptr->input_write_index,
                                                        cons_ptr->input_read_index))) {
                        mdelay(10);
-                       WATCHDOG_RESET();
+                       schedule();
                }
        }
 
@@ -210,7 +210,7 @@ static int octeon_pcie_console_write(struct udevice *dev,
                        if (flags & OCT_PCI_CON_FLAG_NONBLOCK)
                                goto done;
 
-                       WATCHDOG_RESET();
+                       schedule();
                        mdelay(10);     /* Delay if we are spinning */
                } else {
                        bytes_written = -1;
index 9b0d16f1645b2260c5893c0987c326e163f4f5fa..d3c3d3e2d1882eb375513af58fc5533bd91a2f27 100644 (file)
@@ -70,7 +70,7 @@ static int pl01x_getc(struct pl01x_regs *regs)
 
 static int pl01x_tstc(struct pl01x_regs *regs)
 {
-       WATCHDOG_RESET();
+       schedule();
        return !(readl(&regs->fr) & UART_PL01x_FR_RXFE);
 }
 
@@ -227,7 +227,7 @@ static int pl01x_serial_getc(void)
                int ch = pl01x_getc(base_regs);
 
                if (ch == -EAGAIN) {
-                       WATCHDOG_RESET();
+                       schedule();
                        continue;
                }
 
@@ -247,9 +247,9 @@ static void pl01x_serial_setbrg(void)
         * crap in console
         */
        while (!(readl(&base_regs->fr) & UART_PL01x_FR_TXFE))
-               WATCHDOG_RESET();
+               schedule();
        while (readl(&base_regs->fr) & UART_PL01x_FR_BUSY)
-               WATCHDOG_RESET();
+               schedule();
        pl01x_serial_init_baud(gd->baudrate);
 }
 
index 4af1ff5060a93eaee51db681ca0e260c2db8d1cf..c449f3fd02d90a72c945ec357270f042206e6b81 100644 (file)
@@ -225,7 +225,7 @@ static inline void _debug_uart_putc(int ch)
                        (struct uart_sifive *)CONFIG_VAL(DEBUG_UART_BASE);
 
        while (_sifive_serial_putc(regs, ch) == -EAGAIN)
-               WATCHDOG_RESET();
+               schedule();
 }
 
 DEBUG_UART_FUNCS
index 295337a817637391ff3e30d270f75b0062c26a1d..4b1818313a8bd5b62aeaa9cd785c5c44d4de30d1 100644 (file)
@@ -307,7 +307,7 @@ static inline void _debug_uart_putc(int ch)
        struct uart_zynq *regs = (struct uart_zynq *)CONFIG_VAL(DEBUG_UART_BASE);
 
        while (_uart_zynq_serial_putc(regs, ch) == -EAGAIN)
-               WATCHDOG_RESET();
+               schedule();
 }
 
 DEBUG_UART_FUNCS
index 65d0ce0981b6404edc88d40e8a78229ad707dab1..5ea62776b4ec58a9f0416d0c69b536f59482d71c 100644 (file)
@@ -202,7 +202,7 @@ static int mtk_snfi_exec_op(struct spi_slave *slave,
        int addr_sh;
        int ret;
 
-       WATCHDOG_RESET();
+       schedule();
 
        ret = mtk_snfi_mac_reset(priv);
        if (ret)
index c2a7ee232b9493992ab6d2769a905dd6efd294a3..4bc38beaa68bae0a96786eccddb566508c81ca71 100644 (file)
@@ -126,7 +126,7 @@ static void octeon_spi_wait_ready(struct udevice *dev)
 
        do {
                mpi_sts = readq(base + MPI_STS);
-               WATCHDOG_RESET();
+               schedule();
        } while (mpi_sts & MPI_STS_BUSY);
 
        debug("%s(%s)\n", __func__, dev->name);
index ceba413727e925b5e47eea91f799d20b38ae80b3..90c207d518451a8b579c60c42eb1dd1cf129d3c8 100644 (file)
@@ -172,7 +172,7 @@ static int _stm32_qspi_wait_cmd(struct stm32_qspi_priv *priv,
 static void _stm32_qspi_read_fifo(u8 *val, void __iomem *addr)
 {
        *val = readb(addr);
-       WATCHDOG_RESET();
+       schedule();
 }
 
 static void _stm32_qspi_write_fifo(u8 *val, void __iomem *addr)
index 952293195f8deaf54641c536f515f11fb7ba9d84..410bf723d6b42234b2c62351639a830a1d1a4573 100644 (file)
@@ -176,7 +176,7 @@ void timer_interrupt(struct pt_regs *regs)
 
 #if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG)
        if (CONFIG_SYS_WATCHDOG_FREQ && (priv->timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0)
-               WATCHDOG_RESET();
+               schedule();
 #endif    /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */
 
 #ifdef CONFIG_LED_STATUS
@@ -189,7 +189,7 @@ void wait_ticks(ulong ticks)
        ulong end = get_ticks() + ticks;
 
        while (end > get_ticks())
-               WATCHDOG_RESET();
+               schedule();
 }
 
 static u64 mpc83xx_timer_get_count(struct udevice *dev)
index f71e8c7268c601da476c442f2bdf7492299f6099..9480f4f6d15331a288d5ae3298f9c4ba09fbfe63 100644 (file)
@@ -157,7 +157,7 @@ static inline int lan7x_wait_for_bit(struct usb_device *udev,
                }
 
                udelay(1);
-               WATCHDOG_RESET();
+               schedule();
        }
 
        debug("%s: Timeout (reg=0x%x mask=%08x wait_set=%i)\n", prefix, reg,
@@ -199,7 +199,7 @@ static inline int lan7x_mdio_wait_for_bit(struct usb_device *udev,
                }
 
                udelay(1);
-               WATCHDOG_RESET();
+               schedule();
        }
 
        debug("%s: Timeout (reg=0x%x mask=%08x wait_set=%i)\n", prefix, reg,
index 388f73d1bc8dff0861867199a4e7987ee69d7c4c..b2ddd1ada8bac668275240e0e5b935a79c743dc1 100644 (file)
@@ -579,7 +579,7 @@ static int acm_stdio_getc(struct stdio_dev *dev)
 
        /* Wait for a character to arrive. */
        while (!acm_stdio_tstc(dev))
-               WATCHDOG_RESET();
+               schedule();
 
        buf_pop(&f_acm->rx_buf, &c, 1);
 
@@ -639,7 +639,7 @@ static int acm_stdio_start(struct stdio_dev *dev)
                if (ctrlc())
                        return -ECANCELED;
 
-               WATCHDOG_RESET();
+               schedule();
        }
 
        return 0;
index 0fa7230b992a58c9a5825c020949d26ba6e0a7a8..74548ab603bd9655a7a3bf754b30b47942ebd47c 100644 (file)
@@ -711,7 +711,7 @@ int sdp_init(int controller_index)
                        return 1;
                }
 
-               WATCHDOG_RESET();
+               schedule();
                usb_gadget_handle_interrupts(controller_index);
        }
 
@@ -927,7 +927,7 @@ int spl_sdp_handle(int controller_index, struct spl_image_info *spl_image,
                if (flag == SDP_EXIT)
                        return 0;
 
-               WATCHDOG_RESET();
+               schedule();
                usb_gadget_handle_interrupts(controller_index);
 
 #ifdef CONFIG_SPL_BUILD
index f033198a7c193231ab26d84770d63d6314c1f221..d30f2a0d13b4f94ed82781a535f482fbf117d63f 100644 (file)
@@ -641,7 +641,7 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
                token = hc32_to_cpu(vtd->qt_token);
                if (!(QT_TOKEN_GET_STATUS(token) & QT_TOKEN_STATUS_ACTIVE))
                        break;
-               WATCHDOG_RESET();
+               schedule();
        } while (get_timer(ts) < timeout);
        qhtoken = hc32_to_cpu(qh->qh_overlay.qt_token);
 
index d186facc7e029c2f8871dd7b7f217014dcb13810..62c5e8e5fa4c6a237233c5535a2862bdef409bed 100644 (file)
@@ -378,7 +378,7 @@ static struct musb *gadget;
 
 int usb_gadget_handle_interrupts(int index)
 {
-       WATCHDOG_RESET();
+       schedule();
        if (!gadget || !gadget->isr)
                return -EINVAL;
 
index 4d2d961696aa950a4545514a622f528e02fe127d..082895a50ec4bc22c162f0071bf0e87091d83c3b 100644 (file)
@@ -329,7 +329,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y,
                        byte_width = width;
 
                for (i = 0; i < height; ++i) {
-                       WATCHDOG_RESET();
+                       schedule();
                        for (j = 0; j < width; j++) {
                                write_pix8(fb, bpix, eformat, palette, bmap);
                                bmap++;
@@ -342,7 +342,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y,
        case 16:
                if (IS_ENABLED(CONFIG_BMP_16BPP)) {
                        for (i = 0; i < height; ++i) {
-                               WATCHDOG_RESET();
+                               schedule();
                                for (j = 0; j < width; j++) {
                                        *fb++ = *bmap++;
                                        *fb++ = *bmap++;
index f9226e0690d0a01f8316e4c6ba8acd50a1f73ebf..8dd05ff76d94010cc6f509e85ec8abc51000de77 100644 (file)
@@ -115,7 +115,7 @@ char *env_get(const char *name)
        if (gd->flags & GD_FLG_ENV_READY) { /* after import into hashtable */
                struct env_entry e, *ep;
 
-               WATCHDOG_RESET();
+               schedule();
 
                e.key   = name;
                e.data  = NULL;
index 38e10e2e44224bff41d0c9c9641f1befd59f9e1b..0d071b69f4cc560d439dec76807a7286b1b24698 100644 (file)
@@ -21,6 +21,7 @@
  */
 
 #include <common.h>
+#include <cyclic.h>
 #include <malloc.h>
 #include <watchdog.h>
 #include <u-boot/zlib.h>
@@ -62,7 +63,7 @@ int cramfs_uncompress_init (void)
        stream.avail_in = 0;
 
 #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
-       stream.outcb = (cb_func)watchdog_reset_func;
+       stream.outcb = (cb_func)cyclic_run;
 #else
        stream.outcb = Z_NULL;
 #endif /* CONFIG_HW_WATCHDOG */
index ef7b302725cad76fde3c81d2967eadfdc32cea78..49ba82ef959690597dc31160eca02b0a4cd0d1af 100644 (file)
@@ -1523,7 +1523,7 @@ jffs2_1pass_build_lists(struct part_info * part)
 
                /* Set buf_size to maximum length */
                buf_size = DEFAULT_EMPTY_SCAN_SIZE;
-               WATCHDOG_RESET();
+               schedule();
 
 #ifdef CONFIG_JFFS2_SUMMARY
                buf_len = sizeof(*sm);
index 3d0acbd582eff67491b20c603d48e6c795e51d16..921e698f407c7deb57ad0046be6d3485c2dc1cd6 100644 (file)
@@ -2,6 +2,7 @@
 #define _LINUX_COMPAT_H_
 
 #include <console.h>
+#include <cyclic.h>
 #include <log.h>
 #include <malloc.h>
 
@@ -230,7 +231,6 @@ typedef unsigned long blkcnt_t;
 #define try_to_freeze(...)             0
 #define set_current_state(...)         do { } while (0)
 #define kthread_should_stop(...)       0
-#define schedule()                     do { } while (0)
 
 #define setup_timer(timer, func, data) do {} while (0)
 #define del_timer_sync(timer) do {} while (0)
index dcc5c4fd396cac24de9d07eb4c47d250ac3bf1d9..f1d70aef873dd7afdc7d7d8323c87773733521dd 100644 (file)
@@ -63,7 +63,7 @@ static inline int wait_for_bit_##sfx(const void *reg,                 \
                }                                                       \
                                                                        \
                udelay(1);                                              \
-               WATCHDOG_RESET();                                       \
+               schedule();                                     \
        }                                                               \
                                                                        \
        debug("%s: Timeout (reg=%p mask=%x wait_set=%i)\n", __func__,   \
index 0a9777edcbad40348a0b000ff3d01d98673161b5..7a09346a0959329ba8beee99752c3162e4c3b922 100644 (file)
@@ -88,14 +88,6 @@ int init_func_watchdog_reset(void);
        #endif /* CONFIG_WATCHDOG && !__ASSEMBLY__ */
 #endif /* CONFIG_HW_WATCHDOG */
 
-#if !defined(__ASSEMBLY__)
-/* Currently only needed for fs/cramfs/uncompress.c */
-static inline void watchdog_reset_func(void)
-{
-       WATCHDOG_RESET();
-}
-#endif
-
 /*
  * Prototypes from $(CPU)/cpu.c.
  */
index 377b269b06db55737347d396d60e0dac8ee3433c..bd589aa810c1aa1c72e01565a3661c92de801cff 100644 (file)
@@ -844,7 +844,7 @@ int BZ_API(BZ2_bzDecompress) ( bz_stream *strm )
 
    while (True) {
 #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
-       WATCHDOG_RESET();
+       schedule();
 #endif
       if (s->state == BZ_X_IDLE) return BZ_SEQUENCE_ERROR;
       if (s->state == BZ_X_OUTPUT) {
index 4412b8a23eab95d2c36568249edc0ae3e6ca8902..3b417d57b2763d9a30a0b33c3640dd4e38ee1a88 100644 (file)
@@ -418,7 +418,7 @@ Int32 BZ2_decompress ( DState* s )
       while (True) {
 
 #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
-       WATCHDOG_RESET();
+       schedule();
 #endif
         if (nextSym == EOB) break;
 
@@ -503,7 +503,7 @@ Int32 BZ2_decompress ( DState* s )
                     kk = MTFA_SIZE-1;
                     for (ii = 256 / MTFL_SIZE-1; ii >= 0; ii--) {
 #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
-                       WATCHDOG_RESET();
+                       schedule();
 #endif
                        for (jj = MTFL_SIZE-1; jj >= 0; jj--) {
                           s->mtfa[kk] = s->mtfa[s->mtfbase[ii] + jj];
@@ -568,7 +568,7 @@ Int32 BZ2_decompress ( DState* s )
            while (i != s->origPtr);
 
 #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
-       WATCHDOG_RESET();
+       schedule();
 #endif
         s->tPos = s->origPtr;
         s->nblock_used = 0;
@@ -583,7 +583,7 @@ Int32 BZ2_decompress ( DState* s )
       } else {
 
 #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
-       WATCHDOG_RESET();
+       schedule();
 #endif
         /*-- compute the T^(-1) vector --*/
         for (i = 0; i < nblock; i++) {
index 5a3127e03adad2cb77449696452d11d283df5563..aa94d70ef3e6b0d08d3456538299eee714a439db 100644 (file)
@@ -255,7 +255,7 @@ uint32_t crc32_wd(uint32_t crc, const unsigned char *buf, uInt len,
                        chunk = chunk_sz;
                crc = crc32(crc, curr, chunk);
                curr += chunk;
-               WATCHDOG_RESET ();
+               schedule();
        }
 #else
        crc = crc32(crc, buf, len);
index 1233418e77381b34259ac8d38697ec2ab0eb07fe..8da3bb29aa720f1129fe1c93938018b3fb2b76ea 100644 (file)
@@ -828,7 +828,7 @@ void efi_timer_check(void)
                efi_signal_event(evt);
        }
        efi_process_event_queue();
-       WATCHDOG_RESET();
+       schedule();
 }
 
 /**
@@ -2193,7 +2193,7 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle,
 
        /* Give the payload some time to boot */
        efi_set_watchdog(0);
-       WATCHDOG_RESET();
+       schedule();
 out:
        if (IS_ENABLED(CONFIG_EFI_TCG2_PROTOCOL)) {
                if (ret != EFI_SUCCESS)
index a8e498d98d8a0151c5f2f07f2b8ae42c48a38902..932e3e8036d162217a752ae3d7f5535a55ff46b5 100644 (file)
@@ -251,7 +251,7 @@ int gzwrite(unsigned char *src, int len,
                                puts("abort\n");
                                goto out;
                        }
-                       WATCHDOG_RESET();
+                       schedule();
                } while (s.avail_out == 0);
                /* done when inflate() says it's done */
        } while (r != Z_STREAM_END);
index 4f45f80fe26477f04b516cff23ffb417551cd30d..341149f766b6a2948d949a65bb0d87775ff110bb 100644 (file)
@@ -153,7 +153,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
   UInt32 range = p->range;
   UInt32 code = p->code;
 
-  WATCHDOG_RESET();
+  schedule();
 
   do
   {
@@ -177,7 +177,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
         state -= (state < 4) ? state : 3;
         symbol = 1;
 
-        WATCHDOG_RESET();
+        schedule();
 
         do { GET_BIT(prob + symbol, symbol) } while (symbol < 0x100);
       }
@@ -188,7 +188,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
         state -= (state < 10) ? 3 : 6;
         symbol = 1;
 
-        WATCHDOG_RESET();
+        schedule();
 
         do
         {
@@ -321,7 +321,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
               UInt32 mask = 1;
               unsigned i = 1;
 
-              WATCHDOG_RESET();
+              schedule();
 
               do
               {
@@ -335,7 +335,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
           {
             numDirectBits -= kNumAlignBits;
 
-            WATCHDOG_RESET();
+            schedule();
 
             do
             {
@@ -409,7 +409,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
           const Byte *lim = dest + curLen;
           dicPos += curLen;
 
-          WATCHDOG_RESET();
+          schedule();
 
           do
             *(dest) = (Byte)*(dest + src);
@@ -418,7 +418,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
         else
         {
 
-          WATCHDOG_RESET();
+          schedule();
 
           do
           {
@@ -433,7 +433,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit, const Byte
   }
   while (dicPos < limit && buf < bufLimit);
 
-  WATCHDOG_RESET();
+  schedule();
 
   NORMALIZE;
   p->buf = buf;
index af88900d315febc31e80396460c628a718ed312e..55f64cd28908e801fa150a3ce492da5437cedf98 100644 (file)
@@ -104,7 +104,7 @@ int lzmaBuffToBuffDecompress(unsigned char *outStream, SizeT *uncompressedSize,
     /* Decompress */
     outProcessed = min(outSizeFull, *uncompressedSize);
 
-    WATCHDOG_RESET();
+    schedule();
 
     res = LzmaDecode(
         outStream, &outProcessed,
index 9d34465564e34ce48131eb5deb92e5489cd1b2a9..1636ab9366195c179a3f0b4ef69a79e49c273222 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -304,7 +304,7 @@ md5_wd(const unsigned char *input, unsigned int len, unsigned char output[16],
                        chunk = chunk_sz;
                MD5Update(&context, curr, chunk);
                curr += chunk;
-               WATCHDOG_RESET ();
+               schedule();
        }
 #else
        MD5Update(&context, input, len);
index e5e42bc9fe38d0a2b58335c67acdd54821e902d1..8d07407893492be9c7c0f0093381638d443df16f 100644 (file)
@@ -344,7 +344,7 @@ void sha1_csum_wd(const unsigned char *input, unsigned int ilen,
                        chunk = chunk_sz;
                sha1_update (&ctx, curr, chunk);
                curr += chunk;
-               WATCHDOG_RESET ();
+               schedule();
        }
 #else
        sha1_update (&ctx, input, ilen);
index 50b0b511834fb840075f327b3e97b771a853cc2c..4d26aea1c8ceb2bf9dbe41dd86205c28a953952c 100644 (file)
@@ -293,7 +293,7 @@ void sha256_csum_wd(const unsigned char *input, unsigned int ilen,
                        chunk = chunk_sz;
                sha256_update(&ctx, curr, chunk);
                curr += chunk;
-               WATCHDOG_RESET();
+               schedule();
        }
 #else
        sha256_update(&ctx, input, ilen);
index a421f249ba2cc1a50e7d94a4bb74ae0546112b1f..fbe8d5f5bfe93265cfcefb14db636b2f42a2c3d7 100644 (file)
@@ -309,7 +309,7 @@ void sha384_csum_wd(const unsigned char *input, unsigned int ilen,
                        chunk = chunk_sz;
                sha384_update(&ctx, curr, chunk);
                curr += chunk;
-               WATCHDOG_RESET();
+               schedule();
        }
 #else
        sha384_update(&ctx, input, ilen);
@@ -372,7 +372,7 @@ void sha512_csum_wd(const unsigned char *input, unsigned int ilen,
                        chunk = chunk_sz;
                sha512_update(&ctx, curr, chunk);
                curr += chunk;
-               WATCHDOG_RESET();
+               schedule();
        }
 #else
        sha512_update(&ctx, input, ilen);
index bbf191f6732381d9c1cf223a65c10c82f04f7514..f3aaf472d10384e8b03ca8d60a217498f28b5e76 100644 (file)
@@ -198,7 +198,7 @@ void udelay(unsigned long usec)
        ulong kv;
 
        do {
-               WATCHDOG_RESET();
+               schedule();
                kv = usec > CONFIG_WD_PERIOD ? CONFIG_WD_PERIOD : usec;
                __udelay(kv);
                usec -= kv;
index 6411c4793252a1f299e6f8d57cf90a2cbe589ce6..30dfe155995530aaac562e3424fa3c34ec9ea96d 100644 (file)
@@ -25,7 +25,7 @@ int ZEXPORT inflateReset(z_streamp strm)
     state->hold = 0;
     state->bits = 0;
     state->lencode = state->distcode = state->next = state->codes;
-    WATCHDOG_RESET();
+    schedule();
     Tracev((stderr, "inflate: reset\n"));
     return Z_OK;
 }
@@ -543,7 +543,7 @@ int ZEXPORT inflate(z_streamp strm, int flush)
             strm->adler = state->check = adler32(0L, Z_NULL, 0);
             state->mode = TYPE;
         case TYPE:
-           WATCHDOG_RESET();
+           schedule();
             if (flush == Z_BLOCK) goto inf_leave;
         case TYPEDO:
             if (state->last) {
@@ -721,7 +721,7 @@ int ZEXPORT inflate(z_streamp strm, int flush)
             Tracev((stderr, "inflate:       codes ok\n"));
             state->mode = LEN;
         case LEN:
-           WATCHDOG_RESET();
+           schedule();
             if (have >= 6 && left >= 258) {
                 RESTORE();
                 inflate_fast(strm, out);
@@ -933,7 +933,7 @@ int ZEXPORT inflateEnd(z_streamp strm)
         return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
     if (state->window != Z_NULL) {
-       WATCHDOG_RESET();
+       schedule();
        ZFREE(strm, state->window);
     }
     ZFREE(strm, strm->state);
index 81905f631592ae8f97fd34927185a53aa07251bc..f9d11c08d2e96701cceb66d4e6214b1af5c7e677 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -559,7 +559,7 @@ restart:
         *      someone sets `net_state' to a state that terminates.
         */
        for (;;) {
-               WATCHDOG_RESET();
+               schedule();
                if (arp_timeout_check() > 0)
                        time_start = get_timer(0);
 
index f88eff8998f9184085b83a396df6f82c820a1348..edd74115672b7bb9e64174e5ebd20abec7c4e8c3 100644 (file)
@@ -73,7 +73,7 @@ int ecc_post_test(int flags)
        for (addr = (u64*)CONFIG_SYS_POST_ECC_START_ADDR, errbit=0;
             addr < (u64*)CONFIG_SYS_POST_ECC_STOP_ADDR; addr++, errbit++ ) {
 
-               WATCHDOG_RESET();
+               schedule();
 
                ecc_clear(ddr);
 
index 4fb9355d6036cebbfee92dee1e0658a3e062d748..d249942af0685bbf0a8aa6f96f0f6bb40d9bedf0 100644 (file)
@@ -279,7 +279,7 @@ static int memory_post_test1(unsigned long start,
        for (i = 0; i < size / sizeof (ulong); i++) {
                mem[i] = val;
                if (i % 1024 == 0)
-                       WATCHDOG_RESET();
+                       schedule();
        }
 
        for (i = 0; i < size / sizeof (ulong) && !ret; i++) {
@@ -292,7 +292,7 @@ static int memory_post_test1(unsigned long start,
                        break;
                }
                if (i % 1024 == 0)
-                       WATCHDOG_RESET();
+                       schedule();
        }
 
        return ret;
@@ -308,7 +308,7 @@ static int memory_post_test2(unsigned long start, unsigned long size)
        for (i = 0; i < size / sizeof (ulong); i++) {
                mem[i] = 1 << (i % 32);
                if (i % 1024 == 0)
-                       WATCHDOG_RESET();
+                       schedule();
        }
 
        for (i = 0; i < size / sizeof (ulong) && !ret; i++) {
@@ -321,7 +321,7 @@ static int memory_post_test2(unsigned long start, unsigned long size)
                        break;
                }
                if (i % 1024 == 0)
-                       WATCHDOG_RESET();
+                       schedule();
        }
 
        return ret;
@@ -337,7 +337,7 @@ static int memory_post_test3(unsigned long start, unsigned long size)
        for (i = 0; i < size / sizeof (ulong); i++) {
                mem[i] = i;
                if (i % 1024 == 0)
-                       WATCHDOG_RESET();
+                       schedule();
        }
 
        for (i = 0; i < size / sizeof (ulong) && !ret; i++) {
@@ -350,7 +350,7 @@ static int memory_post_test3(unsigned long start, unsigned long size)
                        break;
                }
                if (i % 1024 == 0)
-                       WATCHDOG_RESET();
+                       schedule();
        }
 
        return ret;
@@ -366,7 +366,7 @@ static int memory_post_test4(unsigned long start, unsigned long size)
        for (i = 0; i < size / sizeof (ulong); i++) {
                mem[i] = ~i;
                if (i % 1024 == 0)
-                       WATCHDOG_RESET();
+                       schedule();
        }
 
        for (i = 0; i < size / sizeof (ulong) && !ret; i++) {
@@ -379,7 +379,7 @@ static int memory_post_test4(unsigned long start, unsigned long size)
                        break;
                }
                if (i % 1024 == 0)
-                       WATCHDOG_RESET();
+                       schedule();
        }
 
        return ret;
@@ -390,15 +390,15 @@ static int memory_post_test_lines(unsigned long start, unsigned long size)
        int ret = 0;
 
        ret = memory_post_dataline((unsigned long long *)start);
-       WATCHDOG_RESET();
+       schedule();
        if (!ret)
                ret = memory_post_addrline((ulong *)start, (ulong *)start,
                                size);
-       WATCHDOG_RESET();
+       schedule();
        if (!ret)
                ret = memory_post_addrline((ulong *)(start+size-8),
                                (ulong *)start, size);
-       WATCHDOG_RESET();
+       schedule();
 
        return ret;
 }
@@ -408,25 +408,25 @@ static int memory_post_test_patterns(unsigned long start, unsigned long size)
        int ret = 0;
 
        ret = memory_post_test1(start, size, 0x00000000);
-       WATCHDOG_RESET();
+       schedule();
        if (!ret)
                ret = memory_post_test1(start, size, 0xffffffff);
-       WATCHDOG_RESET();
+       schedule();
        if (!ret)
                ret = memory_post_test1(start, size, 0x55555555);
-       WATCHDOG_RESET();
+       schedule();
        if (!ret)
                ret = memory_post_test1(start, size, 0xaaaaaaaa);
-       WATCHDOG_RESET();
+       schedule();
        if (!ret)
                ret = memory_post_test2(start, size);
-       WATCHDOG_RESET();
+       schedule();
        if (!ret)
                ret = memory_post_test3(start, size);
-       WATCHDOG_RESET();
+       schedule();
        if (!ret)
                ret = memory_post_test4(start, size);
-       WATCHDOG_RESET();
+       schedule();
 
        return ret;
 }
index 8506fd6b71528c4a9209a60da1c0fd76195fca0a..1d47107342915edf4e9de00301a532f5db35486b 100644 (file)
@@ -61,7 +61,7 @@ int cpu_post_test (int flags)
        int ic = icache_status();
        int ret = 0;
 
-       WATCHDOG_RESET();
+       schedule();
        if (ic)
                icache_disable();
 
@@ -73,7 +73,7 @@ int cpu_post_test (int flags)
                ret = cpu_post_test_two ();
        if (ret == 0)
                ret = cpu_post_test_twox ();
-       WATCHDOG_RESET();
+       schedule();
        if (ret == 0)
                ret = cpu_post_test_three ();
        if (ret == 0)
@@ -82,7 +82,7 @@ int cpu_post_test (int flags)
                ret = cpu_post_test_threei ();
        if (ret == 0)
                ret = cpu_post_test_andi ();
-       WATCHDOG_RESET();
+       schedule();
        if (ret == 0)
                ret = cpu_post_test_srawi ();
        if (ret == 0)
@@ -91,7 +91,7 @@ int cpu_post_test (int flags)
                ret = cpu_post_test_rlwinm ();
        if (ret == 0)
                ret = cpu_post_test_rlwimi ();
-       WATCHDOG_RESET();
+       schedule();
        if (ret == 0)
                ret = cpu_post_test_store ();
        if (ret == 0)
@@ -100,20 +100,20 @@ int cpu_post_test (int flags)
                ret = cpu_post_test_cr ();
        if (ret == 0)
                ret = cpu_post_test_b ();
-       WATCHDOG_RESET();
+       schedule();
        if (ret == 0)
                ret = cpu_post_test_multi ();
-       WATCHDOG_RESET();
+       schedule();
        if (ret == 0)
                ret = cpu_post_test_string ();
        if (ret == 0)
                ret = cpu_post_test_complex ();
-       WATCHDOG_RESET();
+       schedule();
 
        if (ic)
                icache_enable();
 
-       WATCHDOG_RESET();
+       schedule();
 
        return ret;
 }
index 0de76ce0514f7dca7b2626a6957cca73acebaf55..bd65f623d5009eb4e6c2a4397b75d56c72f82ae7 100644 (file)
@@ -43,7 +43,7 @@ int fpu_post_test (int flags)
 
        int ret = 0;
 
-       WATCHDOG_RESET ();
+       schedule();
 
        if (!fpu)
                fpu_enable ();
@@ -66,7 +66,7 @@ int fpu_post_test (int flags)
        if (!fpu)
                fpu_disable ();
 
-       WATCHDOG_RESET ();
+       schedule();
 
        return ret;
 }
index d67c43ed8ae8fa93b99835412714feacc7e62ed5..b81425d8cf81501ba206f5ab97c07e6f50996f4f 100644 (file)
@@ -245,7 +245,7 @@ static int post_run_single(struct post_test *test,
 {
        if ((flags & test_flags & POST_ALWAYS) &&
                (flags & test_flags & POST_MEM)) {
-               WATCHDOG_RESET();
+               schedule();
 
                if (!(flags & POST_REBOOT)) {
                        if ((test_flags & POST_REBOOT) &&
@@ -350,7 +350,7 @@ int post_run(char *name, int flags)
                }
 
                if (i < post_list_size) {
-                       WATCHDOG_RESET();
+                       schedule();
                        return post_run_single(post_list + i,
                                                test_flags[i],
                                                flags, i);
index a5c4e78989b976253ecfc51012dae360c5876216..6e758e89dbdb456b366385d581d51d52f6731067 100644 (file)
@@ -27,7 +27,7 @@ static int dm_test_cyclic_running(struct unit_test_state *uts)
                                         NULL));
 
        /* Execute all registered cyclic functions */
-       WATCHDOG_RESET();
+       schedule();
        ut_asserteq(true, cyclic_active);
 
        return 0;
index 535f00a874032393d5dd3bc6531f427605efbc95..653d7b1c8b36a8f07377491ad93c4ddd27157326 100644 (file)
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <cyclic.h>
 #include <dm.h>
 #include <wdt.h>
 #include <asm/gpio.h>
@@ -130,7 +131,7 @@ static int dm_test_wdt_watchdog_reset(struct unit_test_state *uts)
        /* Neither device should be "started", so watchdog_reset() should be a no-op. */
        reset_count = state->wdt.reset_count;
        val = sandbox_gpio_get_value(gpio, offset);
-       watchdog_reset();
+       cyclic_run();
        ut_asserteq(reset_count, state->wdt.reset_count);
        ut_asserteq(val, sandbox_gpio_get_value(gpio, offset));
 
@@ -140,19 +141,19 @@ static int dm_test_wdt_watchdog_reset(struct unit_test_state *uts)
 
        /* Make sure both devices have just been pinged. */
        timer_test_add_offset(100);
-       watchdog_reset();
+       cyclic_run();
        reset_count = state->wdt.reset_count;
        val = sandbox_gpio_get_value(gpio, offset);
 
        /* The gpio watchdog should be pinged, the sandbox one not. */
        timer_test_add_offset(30);
-       watchdog_reset();
+       cyclic_run();
        ut_asserteq(reset_count, state->wdt.reset_count);
        ut_asserteq(!val, sandbox_gpio_get_value(gpio, offset));
 
        /* After another ~30ms, both devices should get pinged. */
        timer_test_add_offset(30);
-       watchdog_reset();
+       cyclic_run();
        ut_asserteq(reset_count + 1, state->wdt.reset_count);
        ut_asserteq(val, sandbox_gpio_get_value(gpio, offset));