diff options
62 files changed, 1875 insertions, 91 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 642a16f..76ffdee 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -297,6 +297,11 @@ stages: qemu_arm64: TEST_PY_BD: "qemu_arm64" TEST_PY_TEST_SPEC: "not sleep" + qemu_m68k: + TEST_PY_BD: "M5208EVBE" + TEST_PY_ID: "--id qemu" + TEST_PY_TEST_SPEC: "not sleep and not efi" + OVERRIDE: "-a CONFIG_M68K_QEMU=y -a ~CONFIG_MCFTMR" qemu_malta: TEST_PY_BD: "malta" TEST_PY_ID: "--id qemu" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7509a7a..b193fee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -355,6 +355,14 @@ qemu_arm64 test.py: TEST_PY_TEST_SPEC: "not sleep" <<: *buildman_and_testpy_dfn +qemu_m68k test.py: + variables: + TEST_PY_BD: "M5208EVBE" + TEST_PY_ID: "--id qemu" + TEST_PY_TEST_SPEC: "not sleep and not efi" + OVERRIDE: "-a CONFIG_M68K_QEMU=y -a ~CONFIG_MCFTMR" + <<: *buildman_and_testpy_dfn + qemu_malta test.py: variables: TEST_PY_BD: "malta" diff --git a/MAINTAINERS b/MAINTAINERS index 4c17c6c..02a5a86 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1181,13 +1181,6 @@ S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-mmc.git F: drivers/mmc/ -NAND FLASH -M: Dario Binacchi <dario.binacchi@amarulasolutions.com> -M: Michael Trimarchi <michael@amarulasolutions.com> -S: Maintained -T: git https://source.denx.de/u-boot/custodians/u-boot-nand-flash.git -F: drivers/mtd/nand/raw/ - NETWORK M: Joe Hershberger <joe.hershberger@ni.com> M: Ramon Fried <rfried.dev@gmail.com> @@ -1306,6 +1299,13 @@ S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-mpc85xx.git F: arch/powerpc/cpu/mpc85xx/ +RAW NAND +M: Dario Binacchi <dario.binacchi@amarulasolutions.com> +M: Michael Trimarchi <michael@amarulasolutions.com> +S: Maintained +T: git https://source.denx.de/u-boot/custodians/u-boot-nand-flash.git +F: drivers/mtd/nand/raw/ + RISC-V M: Rick Chen <rick@andestech.com> M: Leo <ycliang@andestech.com> @@ -1398,6 +1398,14 @@ T: git https://source.denx.de/u-boot/custodians/u-boot-spi.git F: drivers/spi/ F: include/spi* +SPI NAND +M: Dario Binacchi <dario.binacchi@amarulasolutions.com> +M: Michael Trimarchi <michael@amarulasolutions.com> +R: Frieder Schrempf <frieder.schrempf@kontron.de> +S: Maintained +T: git https://source.denx.de/u-boot/custodians/u-boot-nand-flash.git +F: drivers/mtd/nand/spi/ + SPI-NOR M: Jagan Teki <jagan@amarulasolutions.com> M: Vignesh R <vigneshr@ti.com> diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 76233ef..1911563 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -198,7 +198,17 @@ source "board/freescale/m5373evb/Kconfig" source "board/sysam/amcore/Kconfig" source "board/sysam/stmark2/Kconfig" +config M68K_QEMU + bool "Build with workarounds for incomplete QEMU emulation" + default n + help + QEMU 8.x currently does not implement RAMBAR accesses and + DMA timers. Enable this option for U-Boot CI purposes only + to skip the RAMBAR accesses. + config MCFTMR bool "Use DMA timer" + default y if !M68K_QEMU + default n if M68K_QEMU endmenu diff --git a/arch/m68k/cpu/mcf523x/interrupts.c b/arch/m68k/cpu/mcf523x/interrupts.c index b02ea29..09c7f9e 100644 --- a/arch/m68k/cpu/mcf523x/interrupts.c +++ b/arch/m68k/cpu/mcf523x/interrupts.c @@ -22,7 +22,7 @@ int interrupt_init(void) return 0; } -#if defined(CFG_MCFTMR) +#if CONFIG_IS_ENABLED(MCFTMR) void dtimer_intr_setup(void) { int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE); diff --git a/arch/m68k/cpu/mcf52x2/interrupts.c b/arch/m68k/cpu/mcf52x2/interrupts.c index e787c76..c5ed060 100644 --- a/arch/m68k/cpu/mcf52x2/interrupts.c +++ b/arch/m68k/cpu/mcf52x2/interrupts.c @@ -34,7 +34,7 @@ int interrupt_init(void) return 0; } -#if defined(CFG_MCFTMR) +#if CONFIG_IS_ENABLED(MCFTMR) void dtimer_intr_setup(void) { intctrl_t *intp = (intctrl_t *) (CFG_SYS_INTR_BASE); @@ -42,7 +42,7 @@ void dtimer_intr_setup(void) clrbits_be32(&intp->int_icr1, INT_ICR1_TMR3MASK); setbits_be32(&intp->int_icr1, CFG_SYS_TMRINTR_PRI); } -#endif /* CFG_MCFTMR */ +#endif /* CONFIG_MCFTMR */ #endif /* CONFIG_M5272 */ #if defined(CONFIG_M5208) || defined(CONFIG_M5282) || \ @@ -63,7 +63,7 @@ int interrupt_init(void) return 0; } -#if defined(CFG_MCFTMR) +#if CONFIG_IS_ENABLED(MCFTMR) void dtimer_intr_setup(void) { int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE); @@ -72,7 +72,7 @@ void dtimer_intr_setup(void) clrbits_be32(&intp->imrl0, 0x00000001); clrbits_be32(&intp->imrl0, CFG_SYS_TMRINTR_MASK); } -#endif /* CFG_MCFTMR */ +#endif /* CONFIG_MCFTMR */ #endif /* CONFIG_M5282 | CONFIG_M5271 | CONFIG_M5275 */ #if defined(CONFIG_M5249) || defined(CONFIG_M5253) @@ -83,11 +83,11 @@ int interrupt_init(void) return 0; } -#if defined(CFG_MCFTMR) +#if CONFIG_IS_ENABLED(MCFTMR) void dtimer_intr_setup(void) { mbar_writeLong(MCFSIM_IMR, mbar_readLong(MCFSIM_IMR) & ~0x00000400); mbar_writeByte(MCFSIM_TIMER2ICR, CFG_SYS_TMRINTR_PRI); } -#endif /* CFG_MCFTMR */ +#endif /* CONFIG_MCFTMR */ #endif /* CONFIG_M5249 || CONFIG_M5253 */ diff --git a/arch/m68k/cpu/mcf52x2/start.S b/arch/m68k/cpu/mcf52x2/start.S index d48d019..51d2e23 100644 --- a/arch/m68k/cpu/mcf52x2/start.S +++ b/arch/m68k/cpu/mcf52x2/start.S @@ -98,7 +98,7 @@ _start: nop move.w #0x2700,%sr -#if defined(CONFIG_M5208) +#if defined(CONFIG_M5208) && !defined(CONFIG_M68K_QEMU) /* Initialize RAMBAR: locate SRAM and validate it */ move.l #(CFG_SYS_INIT_RAM_ADDR + CFG_SYS_INIT_RAM_CTRL), %d0 movec %d0, %RAMBAR1 @@ -120,7 +120,7 @@ _start: movec %d0, %RAMBAR0 #endif /* CONFIG_M5272 || CONFIG_M5249 || CONFIG_M5253 */ -#if defined(CONFIG_M5282) || defined(CONFIG_M5271) +#if (defined(CONFIG_M5282) || defined(CONFIG_M5271)) && !defined(CONFIG_M68K_QEMU) /* set MBAR address + valid flag */ move.l #(CFG_SYS_MBAR + 1), %d0 move.l %d0, 0x40000000 diff --git a/arch/m68k/cpu/mcf532x/interrupts.c b/arch/m68k/cpu/mcf532x/interrupts.c index bbe823c..4f72fa8 100644 --- a/arch/m68k/cpu/mcf532x/interrupts.c +++ b/arch/m68k/cpu/mcf532x/interrupts.c @@ -23,7 +23,7 @@ int interrupt_init(void) return 0; } -#if defined(CFG_MCFTMR) +#if CONFIG_IS_ENABLED(MCFTMR) void dtimer_intr_setup(void) { int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE); diff --git a/arch/m68k/cpu/mcf5445x/interrupts.c b/arch/m68k/cpu/mcf5445x/interrupts.c index fb80a87..400f3de 100644 --- a/arch/m68k/cpu/mcf5445x/interrupts.c +++ b/arch/m68k/cpu/mcf5445x/interrupts.c @@ -26,7 +26,7 @@ int interrupt_init(void) return 0; } -#if defined(CFG_MCFTMR) +#if CONFIG_IS_ENABLED(MCFTMR) void dtimer_intr_setup(void) { int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE); diff --git a/arch/m68k/include/asm/immap.h b/arch/m68k/include/asm/immap.h index 74516cc..aafa4f4 100644 --- a/arch/m68k/include/asm/immap.h +++ b/arch/m68k/include/asm/immap.h @@ -16,7 +16,7 @@ #define CFG_SYS_UART_BASE (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x4000)) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR1) #define CFG_SYS_TMRPND_REG (((volatile int0_t *)(CFG_SYS_INTR_BASE))->iprh0) @@ -25,6 +25,8 @@ #define CFG_SYS_TMRINTR_PEND (CFG_SYS_TMRINTR_MASK) #define CFG_SYS_TMRINTR_PRI (6) #define CFG_SYS_TIMER_PRESCALER (((gd->bus_clk / 1000000) - 1) << 8) +#else +#define CFG_SYS_UDELAY_BASE (MMAP_PIT0) #endif #define CFG_SYS_INTR_BASE (MMAP_INTC0) @@ -38,7 +40,7 @@ #define CFG_SYS_UART_BASE (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x40)) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR3) #define CFG_SYS_TMRPND_REG (((volatile int0_t *)(CFG_SYS_INTR_BASE))->iprl0) @@ -47,6 +49,8 @@ #define CFG_SYS_TMRINTR_PEND (CFG_SYS_TMRINTR_MASK) #define CFG_SYS_TMRINTR_PRI (0x1E) /* Level must include inorder to work */ #define CFG_SYS_TIMER_PRESCALER (((gd->bus_clk / 1000000) - 1) << 8) +#else +#define CFG_SYS_UDELAY_BASE (MMAP_PIT0) #endif #define CFG_SYS_INTR_BASE (MMAP_INTC0) @@ -63,7 +67,7 @@ #define CFG_SYS_NUM_IRQS (64) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR1) #define CFG_SYS_TMRPND_REG (mbar_readLong(MCFSIM_IPR)) @@ -72,6 +76,8 @@ #define CFG_SYS_TMRINTR_PEND (CFG_SYS_TMRINTR_MASK) #define CFG_SYS_TMRINTR_PRI (MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL7 | MCFSIM_ICR_PRI3) #define CFG_SYS_TIMER_PRESCALER (((gd->bus_clk / 2000000) - 1) << 8) +#else +#define CFG_SYS_UDELAY_BASE (MMAP_PIT0) #endif #endif /* CONFIG_M5249 */ @@ -86,7 +92,7 @@ #define CFG_SYS_NUM_IRQS (64) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR1) #define CFG_SYS_TMRPND_REG (mbar_readLong(MCFSIM_IPR)) @@ -95,6 +101,8 @@ #define CFG_SYS_TMRINTR_PEND (CFG_SYS_TMRINTR_MASK) #define CFG_SYS_TMRINTR_PRI (MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL3 | MCFSIM_ICR_PRI3) #define CFG_SYS_TIMER_PRESCALER (((gd->bus_clk / 2000000) - 1) << 8) +#else +#define CFG_SYS_UDELAY_BASE (MMAP_PIT0) #endif #endif /* CONFIG_M5253 */ @@ -105,7 +113,7 @@ #define CFG_SYS_UART_BASE (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x40)) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR3) #define CFG_SYS_TMRPND_REG (((volatile int0_t *)(CFG_SYS_INTR_BASE))->iprl0) @@ -114,6 +122,8 @@ #define CFG_SYS_TMRINTR_PEND (CFG_SYS_TMRINTR_MASK) #define CFG_SYS_TMRINTR_PRI (0x1E) /* Interrupt level 3, priority 6 */ #define CFG_SYS_TIMER_PRESCALER (((gd->bus_clk / 1000000) - 1) << 8) +#else +#define CFG_SYS_UDELAY_BASE (MMAP_PIT0) #endif #define CFG_SYS_INTR_BASE (MMAP_INTC0) @@ -130,7 +140,7 @@ #define CFG_SYS_NUM_IRQS (64) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_TMR0) #define CFG_SYS_TMR_BASE (MMAP_TMR3) #define CFG_SYS_TMRPND_REG (((volatile intctrl_t *)(CFG_SYS_INTR_BASE))->int_isr) @@ -139,6 +149,8 @@ #define CFG_SYS_TMRINTR_PEND (0) #define CFG_SYS_TMRINTR_PRI (INT_ICR1_TMR3PI | INT_ICR1_TMR3IPL(5)) #define CFG_SYS_TIMER_PRESCALER (((gd->bus_clk / 1000000) - 1) << 8) +#else +#define CFG_SYS_UDELAY_BASE (MMAP_PIT0) #endif #endif /* CONFIG_M5272 */ @@ -152,7 +164,7 @@ #define CFG_SYS_NUM_IRQS (192) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR3) #define CFG_SYS_TMRPND_REG (((volatile int0_t *)(CFG_SYS_INTR_BASE))->iprl0) @@ -161,6 +173,8 @@ #define CFG_SYS_TMRINTR_PEND (CFG_SYS_TMRINTR_MASK) #define CFG_SYS_TMRINTR_PRI (0x1E) #define CFG_SYS_TIMER_PRESCALER (((gd->bus_clk / 1000000) - 1) << 8) +#else +#define CFG_SYS_UDELAY_BASE (MMAP_PIT0) #endif #endif /* CONFIG_M5275 */ @@ -174,7 +188,7 @@ #define CFG_SYS_NUM_IRQS (128) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR3) #define CFG_SYS_TMRPND_REG (((volatile int0_t *)(CFG_SYS_INTR_BASE))->iprl0) @@ -183,6 +197,8 @@ #define CFG_SYS_TMRINTR_PEND (CFG_SYS_TMRINTR_MASK) #define CFG_SYS_TMRINTR_PRI (0x1E) /* Level must include inorder to work */ #define CFG_SYS_TIMER_PRESCALER (((gd->bus_clk / 1000000) - 1) << 8) +#else +#define CFG_SYS_UDELAY_BASE (MMAP_PIT0) #endif #endif /* CONFIG_M5282 */ @@ -196,7 +212,7 @@ #define CFG_SYS_NUM_IRQS (64) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR1) #define CFG_SYS_TMRPND_REG (((volatile intctrl_t *) \ @@ -207,6 +223,8 @@ #define CFG_SYS_TMRINTR_PRI (MCFSIM_ICR_AUTOVEC | \ MCFSIM_ICR_LEVEL7 | MCFSIM_ICR_PRI3) #define CFG_SYS_TIMER_PRESCALER (((gd->bus_clk / 1000000) - 1) << 8) +#else +#define CFG_SYS_UDELAY_BASE (MMAP_PIT0) #endif #endif /* CONFIG_M5307 */ @@ -217,7 +235,7 @@ #define CFG_SYS_UART_BASE (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x4000)) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR1) #define CFG_SYS_TMRPND_REG (((volatile int0_t *)(CFG_SYS_INTR_BASE))->iprh0) @@ -226,6 +244,8 @@ #define CFG_SYS_TMRINTR_PEND (CFG_SYS_TMRINTR_MASK) #define CFG_SYS_TMRINTR_PRI (6) #define CFG_SYS_TIMER_PRESCALER (((gd->bus_clk / 1000000) - 1) << 8) +#else +#define CFG_SYS_UDELAY_BASE (MMAP_PIT0) #endif #define CFG_SYS_INTR_BASE (MMAP_INTC0) @@ -239,7 +259,7 @@ #define CFG_SYS_UART_BASE (MMAP_UART0 + (CFG_SYS_UART_PORT * 0x4000)) /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR1) #define CFG_SYS_TMRPND_REG (((volatile int0_t *)(CFG_SYS_INTR_BASE))->iprh0) @@ -248,6 +268,8 @@ #define CFG_SYS_TMRINTR_PEND (CFG_SYS_TMRINTR_MASK) #define CFG_SYS_TMRINTR_PRI (6) #define CFG_SYS_TIMER_PRESCALER (((gd->bus_clk / 1000000) - 1) << 8) +#else +#define CFG_SYS_UDELAY_BASE (MMAP_PIT0) #endif #define CFG_SYS_INTR_BASE (MMAP_INTC0) @@ -269,7 +291,7 @@ #define MMAP_DSPI MMAP_DSPI0 /* Timer */ -#ifdef CFG_MCFTMR +#if CONFIG_IS_ENABLED(MCFTMR) #define CFG_SYS_UDELAY_BASE (MMAP_DTMR0) #define CFG_SYS_TMR_BASE (MMAP_DTMR1) #define CFG_SYS_TMRPND_REG (((int0_t *)(CFG_SYS_INTR_BASE))->iprh0) @@ -278,6 +300,8 @@ #define CFG_SYS_TMRINTR_PEND (CFG_SYS_TMRINTR_MASK) #define CFG_SYS_TMRINTR_PRI (6) #define CFG_SYS_TIMER_PRESCALER (((gd->bus_clk / 1000000) - 1) << 8) +#else +#define CFG_SYS_UDELAY_BASE (MMAP_PIT0) #endif #define CFG_SYS_INTR_BASE (MMAP_INTC0) diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c index ca8c039..61db1e6 100644 --- a/arch/m68k/lib/time.c +++ b/arch/m68k/lib/time.c @@ -25,7 +25,7 @@ static volatile ulong timestamp = 0; #define CFG_SYS_WATCHDOG_FREQ (CONFIG_SYS_HZ / 2) #endif -#if defined(CFG_MCFTMR) +#if CONFIG_IS_ENABLED(MCFTMR) #ifndef CFG_SYS_UDELAY_BASE # error "uDelay base not defined!" #endif @@ -111,8 +111,6 @@ ulong get_timer(ulong base) return (timestamp - base); } -#endif /* CFG_MCFTMR */ - /* * This function is derived from PowerPC code (read timebase as long long). * On M68K it just returns the timer value. @@ -121,6 +119,40 @@ unsigned long long get_ticks(void) { return get_timer(0); } +#else +static u64 timer64 __section(".data"); +static u16 timer16 __section(".data"); + +uint64_t __weak get_ticks(void) +{ + volatile pit_t *timerp = (pit_t *) (CFG_SYS_UDELAY_BASE); + u16 val = ~timerp->pcntr; + + if (timer16 > val) + timer64 += 0xffff - timer16 + val; + else + timer64 += val - timer16; + + timer16 = val; + + return timer64; +} + +/* PIT timer */ +int timer_init(void) +{ + volatile pit_t *timerp = (pit_t *) (CFG_SYS_UDELAY_BASE); + + timer16 = 0; + timer64 = 0; + + /* Set up PIT as timebase clock */ + timerp->pmr = 0xffff; + timerp->pcsr = PIT_PCSR_EN | PIT_PCSR_OVW; + + return 0; +} +#endif /* CONFIG_MCFTMR */ unsigned long usec2ticks(unsigned long usec) { diff --git a/bin/travis-ci/conf.M5208EVBE_qemu b/bin/travis-ci/conf.M5208EVBE_qemu new file mode 100644 index 0000000..947f13c --- /dev/null +++ b/bin/travis-ci/conf.M5208EVBE_qemu @@ -0,0 +1,27 @@ +# Copyright (c) 2023 Marek Vasut <marek.vasut+renesas@mailbox.org> +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +console_impl=qemu +qemu_machine="mcf5208evb" +qemu_binary="qemu-system-m68k" +qemu_extra_args="-nographic -serial mon:stdio -net user,tftp=${UBOOT_TRAVIS_BUILD_DIR} -net nic,model=mcf-fec" +qemu_kernel_args="-bios ${U_BOOT_BUILD_DIR}/u-boot.bin" +reset_impl=none +flash_impl=none diff --git a/board/freescale/m53017evb/README b/board/freescale/m53017evb/README index 5d5c5e7..34f05f3 100644 --- a/board/freescale/m53017evb/README +++ b/board/freescale/m53017evb/README @@ -87,7 +87,7 @@ CONFIG_SYS_FEC0_PINMUX -- Set FEC0 Pin configuration CONFIG_SYS_FEC0_MIIBASE -- Set FEC0 MII base register MCFFEC_TOUT_LOOP -- set FEC timeout loop -CFG_MCFTMR -- define to use DMA timer +CONFIG_MCFTMR -- define to use DMA timer CONFIG_SYS_I2C_FSL -- define to use FSL common I2C driver CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged diff --git a/board/freescale/m5373evb/README b/board/freescale/m5373evb/README index e8bf75f..7240648 100644 --- a/board/freescale/m5373evb/README +++ b/board/freescale/m5373evb/README @@ -86,7 +86,7 @@ CONFIG_SYS_FEC0_PINMUX -- Set FEC0 Pin configuration CONFIG_SYS_FEC0_MIIBASE -- Set FEC0 MII base register MCFFEC_TOUT_LOOP -- set FEC timeout loop -CFG_MCFTMR -- define to use DMA timer +CONFIG_MCFTMR -- define to use DMA timer CONFIG_SYS_I2C_FSL -- define to use FSL common I2C driver CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index 6007f110..48fdb1e 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -212,17 +212,6 @@ int checkboard(void) #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) int ft_board_setup(void *blob, struct bd_info *bd) { -#if defined(CONFIG_FDT_FIXUP_PARTITIONS) - static struct node_info nodes[] = { - { "fsl,imx6ull-gpmi-nand", MTD_DEV_TYPE_NAND, }, - { "fsl,imx6q-gpmi-nand", MTD_DEV_TYPE_NAND, }, - }; - - /* Update partition nodes using info from mtdparts env var */ - puts(" Updating MTD partitions...\n"); - fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); -#endif - return ft_common_board_setup(blob, bd); } #endif diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index 6ce4fa3..3e79ab9 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -303,16 +303,6 @@ int ft_board_setup(void *blob, struct bd_info *bd) fdt_status_disabled(blob, off); } #endif -#if defined(CONFIG_FDT_FIXUP_PARTITIONS) - static const struct node_info nodes[] = { - { "fsl,imx7d-gpmi-nand", MTD_DEV_TYPE_NAND, }, /* NAND flash */ - { "fsl,imx6q-gpmi-nand", MTD_DEV_TYPE_NAND, }, - }; - - /* Update partition nodes using info from mtdparts env var */ - puts(" Updating MTD partitions...\n"); - fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); -#endif return ft_common_board_setup(blob, bd); } diff --git a/common/board_f.c b/common/board_f.c index f3c1ab5..1688e27 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -863,7 +863,7 @@ static const init_fnc_t init_sequence_f[] = { /* get CPU and bus clocks according to the environment variable */ get_clocks, /* get CPU and bus clocks (etc.) */ #endif -#if !defined(CONFIG_M68K) +#if !defined(CONFIG_M68K) || (defined(CONFIG_M68K) && !defined(CONFIG_MCFTMR)) timer_init, /* initialize timer */ #endif #if defined(CONFIG_BOARD_POSTCLK_INIT) diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig index 72c0560..7b46580 100644 --- a/configs/M5208EVBE_defconfig +++ b/configs/M5208EVBE_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="M5208EVBE" -CONFIG_SYS_PROMPT="-> " CONFIG_SYS_LOAD_ADDR=0x40010000 CONFIG_ENV_ADDR=0x2000 CONFIG_TARGET_M5208EVBE=y diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig index 64f8a13..67991b5 100644 --- a/configs/M5235EVB_defconfig +++ b/configs/M5235EVB_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="M5235EVB" -CONFIG_SYS_PROMPT="-> " CONFIG_SYS_LOAD_ADDR=0x20000 CONFIG_ENV_ADDR=0xFFE04000 CONFIG_TARGET_M5235EVB=y diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig index 1c51c4a..6b46c6f 100644 --- a/configs/M5272C3_defconfig +++ b/configs/M5272C3_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="M5272C3" -CONFIG_SYS_PROMPT="-> " CONFIG_SYS_LOAD_ADDR=0x20000 CONFIG_ENV_ADDR=0xFFE04000 CONFIG_TARGET_M5272C3=y diff --git a/configs/M5275EVB_defconfig b/configs/M5275EVB_defconfig index 5ce9b74..557e694 100644 --- a/configs/M5275EVB_defconfig +++ b/configs/M5275EVB_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="M5275EVB" -CONFIG_SYS_PROMPT="-> " CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_ENV_ADDR=0xFFE04000 CONFIG_TARGET_M5275EVB=y diff --git a/configs/M5282EVB_defconfig b/configs/M5282EVB_defconfig index 2b053e3..1997f38 100644 --- a/configs/M5282EVB_defconfig +++ b/configs/M5282EVB_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_MALLOC_LEN=0x40000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="M5282EVB" -CONFIG_SYS_PROMPT="-> " CONFIG_SYS_LOAD_ADDR=0x20000 CONFIG_ENV_ADDR=0xFFE04000 CONFIG_TARGET_M5282EVB=y diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig index 7c31a68..7014e2f 100644 --- a/configs/M53017EVB_defconfig +++ b/configs/M53017EVB_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_SECT_SIZE=0x8000 CONFIG_DEFAULT_DEVICE_TREE="M53017EVB" -CONFIG_SYS_PROMPT="-> " CONFIG_SYS_LOAD_ADDR=0x40010000 CONFIG_ENV_ADDR=0x40000 CONFIG_TARGET_M53017EVB=y diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig index a5ee082..1857cf7 100644 --- a/configs/M5329AFEE_defconfig +++ b/configs/M5329AFEE_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="M5329AFEE" -CONFIG_SYS_PROMPT="-> " CONFIG_SYS_LOAD_ADDR=0x40010000 CONFIG_ENV_ADDR=0x4000 CONFIG_TARGET_M5329EVB=y diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig index c5abed9..449ad2a 100644 --- a/configs/M5329BFEE_defconfig +++ b/configs/M5329BFEE_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="M5329BFEE" -CONFIG_SYS_PROMPT="-> " CONFIG_SYS_LOAD_ADDR=0x40010000 CONFIG_ENV_ADDR=0x4000 CONFIG_TARGET_M5329EVB=y diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig index cbc91a5..05c3b37 100644 --- a/configs/M5373EVB_defconfig +++ b/configs/M5373EVB_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_MALLOC_LEN=0x20000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="M5373EVB" -CONFIG_SYS_PROMPT="-> " CONFIG_SYS_LOAD_ADDR=0x40010000 CONFIG_ENV_ADDR=0x4000 CONFIG_TARGET_M5373EVB=y diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index b50577f..2f1a201 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -104,4 +104,3 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT_OVERLAY=y -CONFIG_FDT_FIXUP_PARTITIONS=y diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index 3a67ea3..8439742 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -102,4 +102,3 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT_OVERLAY=y -CONFIG_FDT_FIXUP_PARTITIONS=y diff --git a/configs/r8a779f0_spider_defconfig b/configs/r8a779f0_spider_defconfig index c77ea84..895ce3d 100644 --- a/configs/r8a779f0_spider_defconfig +++ b/configs/r8a779f0_spider_defconfig @@ -59,6 +59,11 @@ CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_PHYLIB_10G=y +CONFIG_PHY_MARVELL_10G=y +CONFIG_DM_ETH_PHY=y +CONFIG_RENESAS_ETHER_SWITCH=y +CONFIG_PHY_R8A779F0_ETHERNET_SERDES=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c index 8d7ee48..d1e2681 100644 --- a/drivers/mmc/tmio-common.c +++ b/drivers/mmc/tmio-common.c @@ -378,7 +378,7 @@ static bool tmio_sd_addr_is_dmaable(struct mmc_data *data) } #ifdef CONFIG_SPL_BUILD - if (IS_ENABLED(CONFIG_ARCH_UNIPHIER) && !CONFIG_IS_ENABLED(CONFIG_ARM64)) { + if (IS_ENABLED(CONFIG_ARCH_UNIPHIER) && !IS_ENABLED(CONFIG_ARM64)) { /* * For UniPhier ARMv7 SoCs, the stack is allocated in locked * ways of L2, which is unreachable from the DMA engine. diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index 5c7b0d9..d115fcf 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -156,6 +156,13 @@ config NAND_BRCMNAND_63158 help Enable support for broadcom nand driver on bcm63158. +config NAND_BRCMNAND_IPROC + bool "Support Broadcom NAND controller on the iproc family" + depends on NAND_BRCMNAND + help + Enable support for broadcom nand driver on the Broadcom + iproc family such as Northstar (BCM5301x, BCM4708...) + config NAND_DAVINCI bool "Support TI Davinci NAND controller" select SYS_NAND_SELF_INIT if TARGET_DA850EVM diff --git a/drivers/mtd/nand/raw/brcmnand/Makefile b/drivers/mtd/nand/raw/brcmnand/Makefile index f46a7ed..0c6325a 100644 --- a/drivers/mtd/nand/raw/brcmnand/Makefile +++ b/drivers/mtd/nand/raw/brcmnand/Makefile @@ -6,5 +6,6 @@ obj-$(CONFIG_NAND_BRCMNAND_6753) += bcm6753_nand.o obj-$(CONFIG_NAND_BRCMNAND_68360) += bcm68360_nand.o obj-$(CONFIG_NAND_BRCMNAND_6838) += bcm6838_nand.o obj-$(CONFIG_NAND_BRCMNAND_6858) += bcm6858_nand.o +obj-$(CONFIG_NAND_BRCMNAND_IPROC) += iproc_nand.o obj-$(CONFIG_NAND_BRCMNAND) += brcmnand.o obj-$(CONFIG_NAND_BRCMNAND) += brcmnand_compat.o diff --git a/drivers/mtd/nand/raw/brcmnand/iproc_nand.c b/drivers/mtd/nand/raw/brcmnand/iproc_nand.c new file mode 100644 index 0000000..69711d9 --- /dev/null +++ b/drivers/mtd/nand/raw/brcmnand/iproc_nand.c @@ -0,0 +1,148 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Code borrowed from the Linux driver + * Copyright (C) 2015 Broadcom Corporation + */ + +#include <common.h> +#include <asm/io.h> +#include <memalign.h> +#include <nand.h> +#include <linux/bitops.h> +#include <linux/err.h> +#include <linux/errno.h> +#include <linux/io.h> +#include <linux/ioport.h> +#include <dm.h> + +#include "brcmnand.h" + +struct iproc_nand_soc { + struct brcmnand_soc soc; + void __iomem *idm_base; + void __iomem *ext_base; +}; + +#define IPROC_NAND_CTLR_READY_OFFSET 0x10 +#define IPROC_NAND_CTLR_READY BIT(0) + +#define IPROC_NAND_IO_CTRL_OFFSET 0x00 +#define IPROC_NAND_APB_LE_MODE BIT(24) +#define IPROC_NAND_INT_CTRL_READ_ENABLE BIT(6) + +static bool iproc_nand_intc_ack(struct brcmnand_soc *soc) +{ + struct iproc_nand_soc *priv = + container_of(soc, struct iproc_nand_soc, soc); + void __iomem *mmio = priv->ext_base + IPROC_NAND_CTLR_READY_OFFSET; + u32 val = brcmnand_readl(mmio); + + if (val & IPROC_NAND_CTLR_READY) { + brcmnand_writel(IPROC_NAND_CTLR_READY, mmio); + return true; + } + + return false; +} + +static void iproc_nand_intc_set(struct brcmnand_soc *soc, bool en) +{ + struct iproc_nand_soc *priv = + container_of(soc, struct iproc_nand_soc, soc); + void __iomem *mmio = priv->idm_base + IPROC_NAND_IO_CTRL_OFFSET; + u32 val = brcmnand_readl(mmio); + + if (en) + val |= IPROC_NAND_INT_CTRL_READ_ENABLE; + else + val &= ~IPROC_NAND_INT_CTRL_READ_ENABLE; + + brcmnand_writel(val, mmio); +} + +static void iproc_nand_apb_access(struct brcmnand_soc *soc, bool prepare, + bool is_param) +{ + struct iproc_nand_soc *priv = + container_of(soc, struct iproc_nand_soc, soc); + void __iomem *mmio = priv->idm_base + IPROC_NAND_IO_CTRL_OFFSET; + u32 val; + + val = brcmnand_readl(mmio); + + /* + * In the case of BE or when dealing with NAND data, always configure + * the APB bus to LE mode before accessing the FIFO and back to BE mode + * after the access is done + */ + if (IS_ENABLED(CONFIG_SYS_BIG_ENDIAN) || !is_param) { + if (prepare) + val |= IPROC_NAND_APB_LE_MODE; + else + val &= ~IPROC_NAND_APB_LE_MODE; + } else { /* when in LE accessing the parameter page, keep APB in BE */ + val &= ~IPROC_NAND_APB_LE_MODE; + } + + brcmnand_writel(val, mmio); +} + +static int iproc_nand_probe(struct udevice *dev) +{ + struct udevice *pdev = dev; + struct iproc_nand_soc *priv = dev_get_priv(dev); + struct brcmnand_soc *soc; + struct resource res; + int ret; + + soc = &priv->soc; + + ret = dev_read_resource_byname(pdev, "iproc-idm", &res); + if (ret) + return ret; + + priv->idm_base = devm_ioremap(dev, res.start, resource_size(&res)); + if (IS_ERR(priv->idm_base)) + return PTR_ERR(priv->idm_base); + + ret = dev_read_resource_byname(pdev, "iproc-ext", &res); + if (ret) + return ret; + + priv->ext_base = devm_ioremap(dev, res.start, resource_size(&res)); + if (IS_ERR(priv->ext_base)) + return PTR_ERR(priv->ext_base); + + soc->ctlrdy_ack = iproc_nand_intc_ack; + soc->ctlrdy_set_enabled = iproc_nand_intc_set; + soc->prepare_data_bus = iproc_nand_apb_access; + + return brcmnand_probe(pdev, soc); +} + +static const struct udevice_id iproc_nand_dt_ids[] = { + { + .compatible = "brcm,nand-iproc", + }, + { /* sentinel */ } +}; + +U_BOOT_DRIVER(iproc_nand) = { + .name = "iproc-nand", + .id = UCLASS_MTD, + .of_match = iproc_nand_dt_ids, + .probe = iproc_nand_probe, + .priv_auto = sizeof(struct iproc_nand_soc), +}; + +void board_nand_init(void) +{ + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MTD, + DM_DRIVER_GET(iproc_nand), &dev); + if (ret && ret != -ENODEV) + pr_err("Failed to initialize %s. (error %d)\n", dev->name, + ret); +} diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 9eba360..c173fd0 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4487,6 +4487,7 @@ EXPORT_SYMBOL(nand_detect); static int nand_dt_init(struct mtd_info *mtd, struct nand_chip *chip, ofnode node) { int ret, ecc_mode = -1, ecc_strength, ecc_step; + int ecc_algo = NAND_ECC_UNKNOWN; const char *str; ret = ofnode_read_s32_default(node, "nand-bus-width", -1); @@ -4512,10 +4513,13 @@ static int nand_dt_init(struct mtd_info *mtd, struct nand_chip *chip, ofnode nod ecc_mode = NAND_ECC_SOFT_BCH; } - if (ecc_mode == NAND_ECC_SOFT) { - str = ofnode_read_string(node, "nand-ecc-algo"); - if (str && !strcmp(str, "bch")) + str = ofnode_read_string(node, "nand-ecc-algo"); + if (str && !strcmp(str, "bch")) { + ecc_algo = NAND_ECC_BCH; + if (ecc_mode == NAND_ECC_SOFT) ecc_mode = NAND_ECC_SOFT_BCH; + } else if (!strcmp(str, "hamming")) { + ecc_algo = NAND_ECC_HAMMING; } ecc_strength = ofnode_read_s32_default(node, @@ -4529,6 +4533,8 @@ static int nand_dt_init(struct mtd_info *mtd, struct nand_chip *chip, ofnode nod return -EINVAL; } + chip->ecc.algo = ecc_algo; + if (ecc_mode >= 0) chip->ecc.mode = ecc_mode; diff --git a/drivers/mtd/nand/raw/octeontx_bch.c b/drivers/mtd/nand/raw/octeontx_bch.c index fc16b77..056a685 100644 --- a/drivers/mtd/nand/raw/octeontx_bch.c +++ b/drivers/mtd/nand/raw/octeontx_bch.c @@ -27,7 +27,7 @@ #include <asm/arch/clock.h> #include "octeontx_bch.h" -LIST_HEAD(octeontx_bch_devices); +static LIST_HEAD(octeontx_bch_devices); static unsigned int num_vfs = BCH_NR_VF; static void *bch_pf; static void *bch_vf; diff --git a/drivers/mtd/nand/raw/octeontx_nand.c b/drivers/mtd/nand/raw/octeontx_nand.c index 1ffadad..65a03d2 100644 --- a/drivers/mtd/nand/raw/octeontx_nand.c +++ b/drivers/mtd/nand/raw/octeontx_nand.c @@ -354,7 +354,7 @@ struct octeontx_probe_device { static struct bch_vf *bch_vf; /** Deferred devices due to BCH not being ready */ -LIST_HEAD(octeontx_pci_nand_deferred_devices); +static LIST_HEAD(octeontx_pci_nand_deferred_devices); /** default parameters used for probing chips */ #define MAX_ONFI_MODE 5 diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 5c29e63..09039a2 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -752,6 +752,14 @@ config GMAC_ROCKCHIP This driver provides Rockchip SoCs network support based on the Synopsys Designware driver. +config RENESAS_ETHER_SWITCH + bool "Renesas Ethernet Switch support" + depends on DM_ETH && R8A779F0 + select PHYLIB + help + This driver implements support for the Renesas Ethernet Switch + which is available on R-Car S4 SoC (r8a779f0). + config RENESAS_RAVB bool "Renesas Ethernet AVB MAC" depends on RCAR_64 diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 75daa5e..46a40e2 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -76,6 +76,7 @@ obj-$(CONFIG_OCTEONTX_SMI) += octeontx/smi.o obj-$(CONFIG_PCH_GBE) += pch_gbe.o obj-$(CONFIG_PCNET) += pcnet.o obj-$(CONFIG_PIC32_ETH) += pic32_mdio.o pic32_eth.o +obj-$(CONFIG_RENESAS_ETHER_SWITCH) += rswitch.o obj-$(CONFIG_RENESAS_RAVB) += ravb.o obj-$(CONFIG_RTL8139) += rtl8139.o obj-$(CONFIG_RTL8169) += rtl8169.o diff --git a/drivers/net/rswitch.c b/drivers/net/rswitch.c new file mode 100644 index 0000000..5a69ca1 --- /dev/null +++ b/drivers/net/rswitch.c @@ -0,0 +1,1139 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Driver for Renesas Ethernet RSwitch2 (Ethernet-TSN). + * + * Copyright (C) 2021 Renesas Electronics Corporation + * + * Based on the Renesas Ethernet AVB driver. + */ + +#include <asm/io.h> +#include <clk.h> +#include <common.h> +#include <dm.h> +#include <dm/device-internal.h> +#include <dm/device_compat.h> +#include <dm/lists.h> +#include <errno.h> +#include <generic-phy.h> +#include <linux/bitops.h> +#include <linux/delay.h> +#include <linux/iopoll.h> +#include <linux/mii.h> +#include <eth_phy.h> +#include <log.h> +#include <malloc.h> +#include <miiphy.h> + +#define RSWITCH_SLEEP_US 1000 +#define RSWITCH_TIMEOUT_US 1000000 + +#define RSWITCH_NUM_HW 5 + +#define ETHA_TO_GWCA(i) ((i) % 2) +#define GWCA_TO_HW_INDEX(i) ((i) + 3) +#define HW_INDEX_TO_GWCA(i) ((i) - 3) + +#define RSWITCH_MAX_CTAG_PCP 7 + +/* Registers */ +#define RSWITCH_COMA_OFFSET 0x00009000 +#define RSWITCH_ETHA_OFFSET 0x0000a000 /* with RMAC */ +#define RSWITCH_ETHA_SIZE 0x00002000 /* with RMAC */ +#define RSWITCH_GWCA_OFFSET 0x00010000 +#define RSWITCH_GWCA_SIZE 0x00002000 + +#define FWRO 0 +#define CARO RSWITCH_COMA_OFFSET +#define GWRO 0 +#define TARO 0 +#define RMRO 0x1000 + +enum rswitch_reg { + EAMC = TARO + 0x0000, + EAMS = TARO + 0x0004, + EATDQDC = TARO + 0x0060, + EATTFC = TARO + 0x0138, + EATASRIRM = TARO + 0x03E4, + + GWMC = GWRO + 0x0000, + GWMS = GWRO + 0x0004, + GWMTIRM = GWRO + 0x0100, + GWVCC = GWRO + 0x0130, + GWTTFC = GWRO + 0x0138, + GWDCBAC0 = GWRO + 0x0194, + GWDCBAC1 = GWRO + 0x0198, + GWTRC = GWRO + 0x0200, + GWARIRM = GWRO + 0x0380, + GWDCC = GWRO + 0x0400, + + RRC = CARO + 0x0004, + RCEC = CARO + 0x0008, + RCDC = CARO + 0x000C, + CABPIRM = CARO + 0x0140, + + FWPC0 = FWRO + 0x0100, + FWPBFC = FWRO + 0x4A00, + FWPBFCSDC = FWRO + 0x4A04, + + MPSM = RMRO + 0x0000, + MPIC = RMRO + 0x0004, + MRMAC0 = RMRO + 0x0084, + MRMAC1 = RMRO + 0x0088, + MRAFC = RMRO + 0x008C, + MRSCE = RMRO + 0x0090, + MRSCP = RMRO + 0x0094, + MLVC = RMRO + 0x0180, + MLBC = RMRO + 0x0188, + MXGMIIC = RMRO + 0x0190, + MPCH = RMRO + 0x0194, + MANM = RMRO + 0x019C, + MMIS0 = RMRO + 0x0210, + MMIS1 = RMRO + 0x0220, +}; + +/* COMA */ +#define RRC_RR BIT(0) +#define RCEC_RCE BIT(16) + +#define CABPIRM_BPIOG BIT(0) +#define CABPIRM_BPR BIT(1) + +/* MFWD */ +#define FWPC0(i) (FWPC0 + (i) * 0x10) +#define FWPC0_LTHTA BIT(0) +#define FWPC0_IP4UE BIT(3) +#define FWPC0_IP4TE BIT(4) +#define FWPC0_IP4OE BIT(5) +#define FWPC0_L2SE BIT(9) +#define FWPC0_IP4EA BIT(10) +#define FWPC0_IPDSA BIT(12) +#define FWPC0_IPHLA BIT(18) +#define FWPC0_MACSDA BIT(20) +#define FWPC0_MACHLA BIT(26) +#define FWPC0_MACHMA BIT(27) +#define FWPC0_VLANSA BIT(28) + +#define FWPC0_DEFAULT (FWPC0_LTHTA | FWPC0_IP4UE | FWPC0_IP4TE | \ + FWPC0_IP4OE | FWPC0_L2SE | FWPC0_IP4EA | \ + FWPC0_IPDSA | FWPC0_IPHLA | FWPC0_MACSDA | \ + FWPC0_MACHLA | FWPC0_MACHMA | FWPC0_VLANSA) + +#define FWPBFC(i) (FWPBFC + (i) * 0x10) +#define FWPBFCSDC(j, i) (FWPBFCSDC + (i) * 0x10 + (j) * 0x04) + +/* ETHA */ +#define EATASRIRM_TASRIOG BIT(0) +#define EATASRIRM_TASRR BIT(1) +#define EATDQDC(q) (EATDQDC + (q) * 0x04) +#define EATDQDC_DQD (0xff) + +/* RMAC */ +#define MPIC_PIS_GMII 0x02 +#define MPIC_LSC_MASK (0x07 << 3) +#define MPIC_LSC_100 (0x01 << 3) +#define MPIC_LSC_1000 (0x02 << 3) +#define MPIC_LSC_2500 (0x03 << 3) +#define MLVC_PLV BIT(16) +#define MLVC_LVT 0x09 +#define MMIS0_LVSS 0x02 + +#define MPIC_PSMCS_MASK (0x7f << 16) +#define MPIC_PSMHT_MASK (0x06 << 24) +#define MPIC_MDC_CLK_SET (0x06050000) + +#define MPSM_MFF_C45 BIT(2) +#define MPSM_MFF_C22 0x0 +#define MPSM_PSME BIT(0) + +#define MDIO_READ_C45 0x03 +#define MDIO_WRITE_C45 0x01 +#define MDIO_ADDR_C45 0x00 + +#define MDIO_READ_C22 0x02 +#define MDIO_WRITE_C22 0x01 + +#define MPSM_POP_MASK (0x03 << 13) +#define MPSM_PRA_MASK (0x1f << 8) +#define MPSM_PDA_MASK (0x1f << 3) +#define MPSM_PRD_MASK (0xffff << 16) + +/* Completion flags */ +#define MMIS1_PAACS BIT(2) /* Address */ +#define MMIS1_PWACS BIT(1) /* Write */ +#define MMIS1_PRACS BIT(0) /* Read */ +#define MMIS1_CLEAR_FLAGS 0xf + +/* ETHA */ +enum rswitch_etha_mode { + EAMC_OPC_RESET, + EAMC_OPC_DISABLE, + EAMC_OPC_CONFIG, + EAMC_OPC_OPERATION, +}; + +#define EAMS_OPS_MASK EAMC_OPC_OPERATION + +/* GWCA */ +enum rswitch_gwca_mode { + GWMC_OPC_RESET, + GWMC_OPC_DISABLE, + GWMC_OPC_CONFIG, + GWMC_OPC_OPERATION, +}; + +#define GWMS_OPS_MASK GWMC_OPC_OPERATION + +#define GWMTIRM_MTIOG BIT(0) +#define GWMTIRM_MTR BIT(1) +#define GWARIRM_ARIOG BIT(0) +#define GWARIRM_ARR BIT(1) +#define GWVCC_VEM_SC_TAG (0x3 << 16) +#define GWDCBAC0_DCBAUP (0xff) +#define GWTRC(i) (GWTRC + (i) * 0x04) +#define GWDCC(i) (GWDCC + (i) * 0x04) +#define GWDCC_DQT BIT(11) +#define GWDCC_BALR BIT(24) + +struct rswitch_etha { + int index; + void __iomem *addr; + struct phy_device *phydev; + struct mii_dev *bus; + unsigned char *enetaddr; +}; + +struct rswitch_gwca { + int index; + void __iomem *addr; + int num_chain; +}; + +/* Setting value */ +#define LINK_SPEED_100 100 +#define LINK_SPEED_1000 1000 +#define LINK_SPEED_2500 2500 + +/* Decriptor */ +#define RSWITCH_NUM_BASE_DESC 2 +#define RSWITCH_TX_CHAIN_INDEX 0 +#define RSWITCH_RX_CHAIN_INDEX 1 +#define RSWITCH_NUM_TX_DESC 8 +#define RSWITCH_NUM_RX_DESC 8 + +enum RX_DS_CC_BIT { + RX_DS = 0x0fff, /* Data size */ + RX_TR = 0x1000, /* Truncation indication */ + RX_EI = 0x2000, /* Error indication */ + RX_PS = 0xc000, /* Padding selection */ +}; + +enum DIE_DT { + /* Frame data */ + DT_FSINGLE = 0x80, + DT_FSTART = 0x90, + DT_FMID = 0xa0, + DT_FEND = 0xb8, + + /* Chain control */ + DT_LEMPTY = 0xc0, + DT_EEMPTY = 0xd0, + DT_LINKFIX = 0x00, + DT_LINK = 0xe0, + DT_EOS = 0xf0, + /* HW/SW arbitration */ + DT_FEMPTY = 0x40, + DT_FEMPTY_IS = 0x10, + DT_FEMPTY_IC = 0x20, + DT_FEMPTY_ND = 0x38, + DT_FEMPTY_START = 0x50, + DT_FEMPTY_MID = 0x60, + DT_FEMPTY_END = 0x70, + + DT_MASK = 0xf0, + DIE = 0x08, /* Descriptor Interrupt Enable */ +}; + +struct rswitch_desc { + __le16 info_ds; /* Descriptor size */ + u8 die_dt; /* Descriptor interrupt enable and type */ + __u8 dptrh; /* Descriptor pointer MSB */ + __le32 dptrl; /* Descriptor pointer LSW */ +} __packed; + +struct rswitch_rxdesc { + struct rswitch_desc data; + struct rswitch_desc link; + u8 __pad[48]; + u8 packet[PKTSIZE_ALIGN]; +} __packed; + +struct rswitch_port_priv { + void __iomem *addr; + struct phy serdes; + struct rswitch_etha etha; + struct rswitch_gwca gwca; + struct rswitch_desc bat_desc[RSWITCH_NUM_BASE_DESC]; + struct rswitch_desc tx_desc[RSWITCH_NUM_TX_DESC]; + struct rswitch_rxdesc rx_desc[RSWITCH_NUM_RX_DESC]; + u32 rx_desc_index; + u32 tx_desc_index; +}; + +struct rswitch_priv { + void __iomem *addr; + struct clk *rsw_clk; +}; + +static inline void rswitch_flush_dcache(u32 addr, u32 len) +{ + flush_dcache_range(addr, addr + len); +} + +static inline void rswitch_invalidate_dcache(u32 addr, u32 len) +{ + u32 start = addr & ~((uintptr_t)ARCH_DMA_MINALIGN - 1); + u32 end = roundup(addr + len, ARCH_DMA_MINALIGN); + + invalidate_dcache_range(start, end); +} + +static void rswitch_agent_clock_ctrl(struct rswitch_port_priv *priv, int port, int enable) +{ + u32 val; + + if (enable) { + val = readl(priv->addr + RCEC); + if ((val & (RCEC_RCE | BIT(port))) != (RCEC_RCE | BIT(port))) + writel(val | RCEC_RCE | BIT(port), priv->addr + RCEC); + } else { + setbits_le32(priv->addr + RCDC, BIT(port)); + } +} + +static int rswitch_etha_change_mode(struct rswitch_port_priv *priv, + enum rswitch_etha_mode mode) +{ + struct rswitch_etha *etha = &priv->etha; + u32 pval; + int ret; + + /* Enable clock */ + rswitch_agent_clock_ctrl(priv, etha->index, 1); + + writel(mode, etha->addr + EAMC); + + ret = readl_poll_sleep_timeout(etha->addr + EAMS, pval, + (pval & EAMS_OPS_MASK) == mode, + RSWITCH_SLEEP_US, RSWITCH_TIMEOUT_US); + + /* Disable clock */ + if (mode == EAMC_OPC_DISABLE) + rswitch_agent_clock_ctrl(priv, etha->index, 0); + + return ret; +} + +static int rswitch_gwca_change_mode(struct rswitch_port_priv *priv, + enum rswitch_gwca_mode mode) +{ + struct rswitch_gwca *gwca = &priv->gwca; + u32 pval; + int ret; + + /* Enable clock */ + rswitch_agent_clock_ctrl(priv, gwca->index, 1); + + writel(mode, gwca->addr + GWMC); + + ret = readl_poll_sleep_timeout(gwca->addr + GWMS, pval, + (pval & GWMS_OPS_MASK) == mode, + RSWITCH_SLEEP_US, RSWITCH_TIMEOUT_US); + + /* Disable clock */ + if (mode == GWMC_OPC_DISABLE) + rswitch_agent_clock_ctrl(priv, gwca->index, 0); + + return ret; +} + +static int rswitch_mii_access_c45(struct rswitch_etha *etha, bool read, + int phyad, int devad, int regad, int data) +{ + u32 pval, val; + int ret; + + /* No match device */ + if (devad == 0xffffffff) + return 0; + + /* Clear completion flags */ + writel(MMIS1_CLEAR_FLAGS, etha->addr + MMIS1); + + /* Submit address to PHY (MDIO_ADDR_C45 << 13) */ + val = MPSM_PSME | MPSM_MFF_C45 | (devad << 8) | (phyad << 3); + writel((regad << 16) | val, etha->addr + MPSM); + + ret = readl_poll_sleep_timeout(etha->addr + MMIS1, pval, + pval & MMIS1_PAACS, + RSWITCH_SLEEP_US, RSWITCH_TIMEOUT_US); + if (ret) + return ret; + + /* Clear address completion flag */ + setbits_le32(etha->addr + MMIS1, MMIS1_PAACS); + + /* Read/Write PHY register */ + if (read) { + val |= MDIO_READ_C45 << 13; + writel(val, etha->addr + MPSM); + + ret = readl_poll_sleep_timeout(etha->addr + MMIS1, pval, + pval & MMIS1_PRACS, + RSWITCH_SLEEP_US, + RSWITCH_TIMEOUT_US); + if (ret) + return ret; + + /* Read data */ + ret = (readl(etha->addr + MPSM) & MPSM_PRD_MASK) >> 16; + + /* Clear read completion flag */ + setbits_le32(etha->addr + MMIS1, MMIS1_PRACS); + } else { + val |= MDIO_WRITE_C45 << 13; + val |= data << 16; + writel(val, etha->addr + MPSM); + + ret = readl_poll_sleep_timeout(etha->addr + MMIS1, pval, + pval & MMIS1_PWACS, + RSWITCH_SLEEP_US, + RSWITCH_TIMEOUT_US); + } + + return ret; +} + +static int rswitch_mii_read_c45(struct mii_dev *miidev, int phyad, int devad, int regad) +{ + struct rswitch_port_priv *priv = miidev->priv; + struct rswitch_etha *etha = &priv->etha; + int val; + int reg; + + /* Change to disable mode */ + rswitch_etha_change_mode(priv, EAMC_OPC_DISABLE); + + /* Change to config mode */ + rswitch_etha_change_mode(priv, EAMC_OPC_CONFIG); + + /* Enable Station Management clock */ + reg = readl(etha->addr + MPIC); + reg &= ~MPIC_PSMCS_MASK & ~MPIC_PSMHT_MASK; + writel(reg | MPIC_MDC_CLK_SET, etha->addr + MPIC); + + /* Set Station Management Mode : Clause 45 */ + setbits_le32(etha->addr + MPSM, MPSM_MFF_C45); + + /* Access PHY register */ + val = rswitch_mii_access_c45(etha, true, phyad, devad, regad, 0); + + /* Disable Station Management Clock */ + clrbits_le32(etha->addr + MPIC, MPIC_PSMCS_MASK); + + /* Change to disable mode */ + rswitch_etha_change_mode(priv, EAMC_OPC_DISABLE); + + return val; +} + +int rswitch_mii_write_c45(struct mii_dev *miidev, int phyad, int devad, int regad, u16 data) +{ + struct rswitch_port_priv *priv = miidev->priv; + struct rswitch_etha *etha = &priv->etha; + int reg; + + /* Change to disable mode */ + rswitch_etha_change_mode(priv, EAMC_OPC_DISABLE); + + /* Change to config mode */ + rswitch_etha_change_mode(priv, EAMC_OPC_CONFIG); + + /* Enable Station Management clock */ + reg = readl(etha->addr + MPIC); + reg &= ~MPIC_PSMCS_MASK & ~MPIC_PSMHT_MASK; + writel(reg | MPIC_MDC_CLK_SET, etha->addr + MPIC); + + /* Set Station Management Mode : Clause 45 */ + setbits_le32(etha->addr + MPSM, MPSM_MFF_C45); + + /* Access PHY register */ + rswitch_mii_access_c45(etha, false, phyad, devad, regad, data); + + /* Disable Station Management Clock */ + clrbits_le32(etha->addr + MPIC, MPIC_PSMCS_MASK); + + /* Change to disable mode */ + rswitch_etha_change_mode(priv, EAMC_OPC_DISABLE); + + return 0; +} + +static int rswitch_check_link(struct rswitch_etha *etha) +{ + u32 pval; + int ret; + + /* Request Link Verification */ + writel(MLVC_PLV, etha->addr + MLVC); + + /* Complete Link Verification */ + ret = readl_poll_sleep_timeout(etha->addr + MLVC, pval, + !(pval & MLVC_PLV), + RSWITCH_SLEEP_US, RSWITCH_TIMEOUT_US); + if (ret) { + debug("\n%s: Link verification timeout!", __func__); + return ret; + } + + return 0; +} + +static int rswitch_reset(struct rswitch_port_priv *priv) +{ + int ret; + + setbits_le32(priv->addr + RRC, RRC_RR); + clrbits_le32(priv->addr + RRC, RRC_RR); + + ret = rswitch_gwca_change_mode(priv, GWMC_OPC_DISABLE); + if (ret) + return ret; + + ret = rswitch_etha_change_mode(priv, EAMC_OPC_DISABLE); + if (ret) + return ret; + + return 0; +} + +static void rswitch_bat_desc_init(struct rswitch_port_priv *priv) +{ + const u32 desc_size = RSWITCH_NUM_BASE_DESC * sizeof(struct rswitch_desc); + int i; + + /* Initialize all descriptors */ + memset(priv->bat_desc, 0x0, desc_size); + + for (i = 0; i < RSWITCH_NUM_BASE_DESC; i++) + priv->bat_desc[i].die_dt = DT_EOS; + + rswitch_flush_dcache((uintptr_t)priv->bat_desc, desc_size); +} + +static void rswitch_tx_desc_init(struct rswitch_port_priv *priv) +{ + const u32 desc_size = RSWITCH_NUM_TX_DESC * sizeof(struct rswitch_desc); + u64 tx_desc_addr; + int i; + + /* Initialize all descriptor */ + memset(priv->tx_desc, 0x0, desc_size); + priv->tx_desc_index = 0; + + for (i = 0; i < RSWITCH_NUM_TX_DESC; i++) + priv->tx_desc[i].die_dt = DT_EEMPTY; + + /* Mark the end of the descriptors */ + priv->tx_desc[RSWITCH_NUM_TX_DESC - 1].die_dt = DT_LINKFIX; + tx_desc_addr = (uintptr_t)priv->tx_desc; + priv->tx_desc[RSWITCH_NUM_TX_DESC - 1].dptrl = lower_32_bits(tx_desc_addr); + priv->tx_desc[RSWITCH_NUM_TX_DESC - 1].dptrh = upper_32_bits(tx_desc_addr); + rswitch_flush_dcache(tx_desc_addr, desc_size); + + /* Point the controller to the TX descriptor list */ + priv->bat_desc[RSWITCH_TX_CHAIN_INDEX].die_dt = DT_LINKFIX; + priv->bat_desc[RSWITCH_TX_CHAIN_INDEX].dptrl = lower_32_bits(tx_desc_addr); + priv->bat_desc[RSWITCH_TX_CHAIN_INDEX].dptrh = upper_32_bits(tx_desc_addr); + rswitch_flush_dcache((uintptr_t)&priv->bat_desc[RSWITCH_TX_CHAIN_INDEX], + sizeof(struct rswitch_desc)); +} + +static void rswitch_rx_desc_init(struct rswitch_port_priv *priv) +{ + const u32 desc_size = RSWITCH_NUM_RX_DESC * sizeof(struct rswitch_rxdesc); + int i; + u64 packet_addr; + u64 next_rx_desc_addr; + u64 rx_desc_addr; + + /* Initialize all descriptor */ + memset(priv->rx_desc, 0x0, desc_size); + priv->rx_desc_index = 0; + + for (i = 0; i < RSWITCH_NUM_RX_DESC; i++) { + priv->rx_desc[i].data.die_dt = DT_EEMPTY; + priv->rx_desc[i].data.info_ds = PKTSIZE_ALIGN; + packet_addr = (uintptr_t)priv->rx_desc[i].packet; + priv->rx_desc[i].data.dptrl = lower_32_bits(packet_addr); + priv->rx_desc[i].data.dptrh = upper_32_bits(packet_addr); + + priv->rx_desc[i].link.die_dt = DT_LINKFIX; + next_rx_desc_addr = (uintptr_t)&priv->rx_desc[i + 1]; + priv->rx_desc[i].link.dptrl = lower_32_bits(next_rx_desc_addr); + priv->rx_desc[i].link.dptrh = upper_32_bits(next_rx_desc_addr); + } + + /* Mark the end of the descriptors */ + priv->rx_desc[RSWITCH_NUM_RX_DESC - 1].link.die_dt = DT_LINKFIX; + rx_desc_addr = (uintptr_t)priv->rx_desc; + priv->rx_desc[RSWITCH_NUM_RX_DESC - 1].link.dptrl = lower_32_bits(rx_desc_addr); + priv->rx_desc[RSWITCH_NUM_RX_DESC - 1].link.dptrh = upper_32_bits(rx_desc_addr); + rswitch_flush_dcache(rx_desc_addr, desc_size); + + /* Point the controller to the rx descriptor list */ + priv->bat_desc[RSWITCH_RX_CHAIN_INDEX].die_dt = DT_LINKFIX; + priv->bat_desc[RSWITCH_RX_CHAIN_INDEX].dptrl = lower_32_bits(rx_desc_addr); + priv->bat_desc[RSWITCH_RX_CHAIN_INDEX].dptrh = upper_32_bits(rx_desc_addr); + rswitch_flush_dcache((uintptr_t)&priv->bat_desc[RSWITCH_RX_CHAIN_INDEX], + sizeof(struct rswitch_desc)); +} + +static void rswitch_clock_enable(struct rswitch_port_priv *priv) +{ + struct rswitch_etha *etha = &priv->etha; + struct rswitch_gwca *gwca = &priv->gwca; + + setbits_le32(priv->addr + RCEC, BIT(etha->index) | BIT(gwca->index) | RCEC_RCE); +} + +static int rswitch_bpool_init(struct rswitch_port_priv *priv) +{ + u32 pval; + + writel(CABPIRM_BPIOG, priv->addr + CABPIRM); + + return readl_poll_sleep_timeout(priv->addr + CABPIRM, pval, + pval & CABPIRM_BPR, + RSWITCH_SLEEP_US, RSWITCH_TIMEOUT_US); +} + +static void rswitch_mfwd_init(struct rswitch_port_priv *priv) +{ + struct rswitch_etha *etha = &priv->etha; + struct rswitch_gwca *gwca = &priv->gwca; + + writel(FWPC0_DEFAULT, priv->addr + FWPC0(etha->index)); + writel(FWPC0_DEFAULT, priv->addr + FWPC0(gwca->index)); + + writel(RSWITCH_RX_CHAIN_INDEX, + priv->addr + FWPBFCSDC(HW_INDEX_TO_GWCA(gwca->index), etha->index)); + + writel(BIT(gwca->index), + priv->addr + FWPBFC(etha->index)); + + writel(BIT(etha->index), + priv->addr + FWPBFC(gwca->index)); +} + +static void rswitch_rmac_init(struct rswitch_etha *etha) +{ + unsigned char *mac = etha->enetaddr; + + /* Set MAC address */ + writel((mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5], + etha->addr + MRMAC1); + + writel((mac[0] << 8) | mac[1], etha->addr + MRMAC0); + + /* Set MIIx */ + writel(MPIC_PIS_GMII | MPIC_LSC_1000, etha->addr + MPIC); + + writel(0x07E707E7, etha->addr + MRAFC); +} + +static int rswitch_gwca_mcast_table_reset(struct rswitch_gwca *gwca) +{ + u32 pval; + + writel(GWMTIRM_MTIOG, gwca->addr + GWMTIRM); + + return readl_poll_sleep_timeout(gwca->addr + GWMTIRM, pval, + pval & GWMTIRM_MTR, + RSWITCH_SLEEP_US, RSWITCH_TIMEOUT_US); +} + +static int rswitch_gwca_axi_ram_reset(struct rswitch_gwca *gwca) +{ + u32 pval; + + writel(GWARIRM_ARIOG, gwca->addr + GWARIRM); + + return readl_poll_sleep_timeout(gwca->addr + GWARIRM, pval, + pval & GWARIRM_ARR, + RSWITCH_SLEEP_US, RSWITCH_TIMEOUT_US); +} + +static int rswitch_gwca_init(struct rswitch_port_priv *priv) +{ + struct rswitch_gwca *gwca = &priv->gwca; + int ret; + + ret = rswitch_gwca_change_mode(priv, GWMC_OPC_DISABLE); + if (ret) + return ret; + + ret = rswitch_gwca_change_mode(priv, GWMC_OPC_CONFIG); + if (ret) + return ret; + + ret = rswitch_gwca_mcast_table_reset(gwca); + if (ret) + return ret; + + ret = rswitch_gwca_axi_ram_reset(gwca); + if (ret) + return ret; + + /* Setting flow */ + writel(GWVCC_VEM_SC_TAG, gwca->addr + GWVCC); + writel(0, gwca->addr + GWTTFC); + writel(upper_32_bits((uintptr_t)priv->bat_desc) & GWDCBAC0_DCBAUP, gwca->addr + GWDCBAC0); + writel(lower_32_bits((uintptr_t)priv->bat_desc), gwca->addr + GWDCBAC1); + writel(GWDCC_DQT | GWDCC_BALR, gwca->addr + GWDCC(RSWITCH_TX_CHAIN_INDEX)); + writel(GWDCC_BALR, gwca->addr + GWDCC(RSWITCH_RX_CHAIN_INDEX)); + + ret = rswitch_gwca_change_mode(priv, GWMC_OPC_DISABLE); + if (ret) + return ret; + + ret = rswitch_gwca_change_mode(priv, GWMC_OPC_OPERATION); + if (ret) + return ret; + + return 0; +} + +static int rswitch_etha_tas_ram_reset(struct rswitch_etha *etha) +{ + u32 pval; + + writel(EATASRIRM_TASRIOG, etha->addr + EATASRIRM); + + return readl_poll_sleep_timeout(etha->addr + EATASRIRM, pval, + pval & EATASRIRM_TASRR, + RSWITCH_SLEEP_US, RSWITCH_TIMEOUT_US); +} + +static int rswitch_etha_init(struct rswitch_port_priv *priv) +{ + struct rswitch_etha *etha = &priv->etha; + int ret; + u32 prio; + + ret = rswitch_etha_change_mode(priv, EAMC_OPC_DISABLE); + if (ret) + return ret; + + ret = rswitch_etha_change_mode(priv, EAMC_OPC_CONFIG); + if (ret) + return ret; + + ret = rswitch_etha_tas_ram_reset(etha); + if (ret) + return ret; + + /* Setting flow */ + writel(0, etha->addr + EATTFC); + + for (prio = 0; prio < RSWITCH_MAX_CTAG_PCP; prio++) + writel(EATDQDC_DQD, etha->addr + EATDQDC(prio)); + + rswitch_rmac_init(etha); + + ret = rswitch_etha_change_mode(priv, EAMC_OPC_OPERATION); + if (ret) + return ret; + + /* Link Verification */ + ret = rswitch_check_link(etha); + if (ret) + return ret; + + return 0; +} + +static int rswitch_init(struct rswitch_port_priv *priv) +{ + struct rswitch_etha *etha = &priv->etha; + int ret; + + ret = rswitch_reset(priv); + if (ret) + return ret; + + ret = generic_phy_set_mode(&priv->serdes, PHY_MODE_ETHERNET, + etha->phydev->interface); + if (ret) + return ret; + + ret = generic_phy_set_speed(&priv->serdes, etha->phydev->speed); + if (ret) + return ret; + + ret = generic_phy_init(&priv->serdes); + if (ret) + return ret; + + ret = generic_phy_power_on(&priv->serdes); + if (ret) + return ret; + + ret = phy_startup(etha->phydev); + if (ret) + return ret; + + rswitch_bat_desc_init(priv); + rswitch_tx_desc_init(priv); + rswitch_rx_desc_init(priv); + + rswitch_clock_enable(priv); + + ret = rswitch_bpool_init(priv); + if (ret) + return ret; + + rswitch_mfwd_init(priv); + + ret = rswitch_gwca_init(priv); + if (ret) + return ret; + + ret = rswitch_etha_init(priv); + if (ret) + return ret; + + return 0; +} + +static int rswitch_start(struct udevice *dev) +{ + struct rswitch_port_priv *priv = dev_get_priv(dev); + int ret; + + ret = rswitch_init(priv); + if (ret) + return ret; + + return 0; +} + +#define RSWITCH_TX_TIMEOUT_MS 1000 +static int rswitch_send(struct udevice *dev, void *packet, int len) +{ + struct rswitch_port_priv *priv = dev_get_priv(dev); + struct rswitch_desc *desc = &priv->tx_desc[priv->tx_desc_index]; + struct rswitch_gwca *gwca = &priv->gwca; + u32 gwtrc_index, start; + + /* Update TX descriptor */ + rswitch_flush_dcache((uintptr_t)packet, len); + memset(desc, 0x0, sizeof(*desc)); + desc->die_dt = DT_FSINGLE; + desc->info_ds = len; + desc->dptrl = lower_32_bits((uintptr_t)packet); + desc->dptrh = upper_32_bits((uintptr_t)packet); + rswitch_flush_dcache((uintptr_t)desc, sizeof(*desc)); + + /* Start transmission */ + gwtrc_index = RSWITCH_TX_CHAIN_INDEX / 32; + setbits_le32(gwca->addr + GWTRC(gwtrc_index), BIT(RSWITCH_TX_CHAIN_INDEX)); + + /* Wait until packet is transmitted */ + start = get_timer(0); + while (get_timer(start) < RSWITCH_TX_TIMEOUT_MS) { + rswitch_invalidate_dcache((uintptr_t)desc, sizeof(*desc)); + if ((desc->die_dt & DT_MASK) != DT_FSINGLE) + break; + udelay(10); + } + + if (get_timer(start) >= RSWITCH_TX_TIMEOUT_MS) { + dev_dbg(dev, "\n%s: Timeout", __func__); + return -ETIMEDOUT; + } + + priv->tx_desc_index = (priv->tx_desc_index + 1) % (RSWITCH_NUM_TX_DESC - 1); + + return 0; +} + +static int rswitch_recv(struct udevice *dev, int flags, uchar **packetp) +{ + struct rswitch_port_priv *priv = dev_get_priv(dev); + struct rswitch_rxdesc *desc = &priv->rx_desc[priv->rx_desc_index]; + u8 *packet; + int len; + + /* Check if the rx descriptor is ready */ + rswitch_invalidate_dcache((uintptr_t)desc, sizeof(*desc)); + if ((desc->data.die_dt & DT_MASK) == DT_FEMPTY) + return -EAGAIN; + + len = desc->data.info_ds & RX_DS; + packet = (u8 *)(((uintptr_t)(desc->data.dptrh) << 32) | (uintptr_t)desc->data.dptrl); + rswitch_invalidate_dcache((uintptr_t)packet, len); + + *packetp = packet; + + return len; +} + +static int rswitch_free_pkt(struct udevice *dev, uchar *packet, int length) +{ + struct rswitch_port_priv *priv = dev_get_priv(dev); + struct rswitch_rxdesc *desc = &priv->rx_desc[priv->rx_desc_index]; + + /* Make current descritor available again */ + desc->data.die_dt = DT_FEMPTY; + desc->data.info_ds = PKTSIZE_ALIGN; + rswitch_flush_dcache((uintptr_t)desc, sizeof(*desc)); + + /* Point to the next descriptor */ + priv->rx_desc_index = (priv->rx_desc_index + 1) % RSWITCH_NUM_RX_DESC; + desc = &priv->rx_desc[priv->rx_desc_index]; + rswitch_invalidate_dcache((uintptr_t)desc, sizeof(*desc)); + + return 0; +} + +static void rswitch_stop(struct udevice *dev) +{ + struct rswitch_port_priv *priv = dev_get_priv(dev); + + phy_shutdown(priv->etha.phydev); + + generic_phy_power_off(&priv->serdes); +} + +static int rswitch_write_hwaddr(struct udevice *dev) +{ + struct rswitch_port_priv *priv = dev_get_priv(dev); + struct rswitch_etha *etha = &priv->etha; + struct eth_pdata *pdata = dev_get_plat(dev); + unsigned char *mac = pdata->enetaddr; + + writel((mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5], + etha->addr + MRMAC1); + + writel((mac[0] << 8) | mac[1], etha->addr + MRMAC0); + + return 0; +} + +static int rswitch_phy_config(struct udevice *dev) +{ + struct rswitch_port_priv *priv = dev_get_priv(dev); + struct rswitch_etha *etha = &priv->etha; + struct eth_pdata *pdata = dev_get_plat(dev); + struct phy_device *phydev; + int phy_addr; + + phy_addr = eth_phy_get_addr(dev); + if (phy_addr < 0) + return phy_addr; + + phydev = phy_connect(etha->bus, phy_addr, dev, pdata->phy_interface); + if (!phydev) + return -ENODEV; + + etha->phydev = phydev; + phydev->speed = SPEED_1000; + + phy_config(phydev); + + return 0; +} + +static int rswitch_port_probe(struct udevice *dev) +{ + struct rswitch_priv *rpriv = + (struct rswitch_priv *)dev_get_driver_data(dev); + struct eth_pdata *pdata = dev_get_plat(dev); + struct rswitch_port_priv *priv = dev_get_priv(dev); + struct rswitch_etha *etha = &priv->etha; + struct rswitch_gwca *gwca = &priv->gwca; + struct mii_dev *mdiodev; + int ret; + + priv->addr = rpriv->addr; + + etha->enetaddr = pdata->enetaddr; + + etha->index = dev_read_u32_default(dev, "reg", 0); + etha->addr = priv->addr + RSWITCH_ETHA_OFFSET + etha->index * RSWITCH_ETHA_SIZE; + + gwca->index = 1; + gwca->addr = priv->addr + RSWITCH_GWCA_OFFSET + gwca->index * RSWITCH_GWCA_SIZE; + gwca->index = GWCA_TO_HW_INDEX(gwca->index); + + ret = generic_phy_get_by_index(dev, 0, &priv->serdes); + if (ret) + return ret; + + /* Toggle the reset so we can access the PHYs */ + ret = rswitch_reset(priv); + if (ret) + return ret; + + mdiodev = mdio_alloc(); + if (!mdiodev) + return -ENOMEM; + + mdiodev->priv = priv; + mdiodev->read = rswitch_mii_read_c45; + mdiodev->write = rswitch_mii_write_c45; + snprintf(mdiodev->name, sizeof(mdiodev->name), dev->name); + + ret = mdio_register(mdiodev); + if (ret) + goto err_mdio_register; + + priv->etha.bus = miiphy_get_dev_by_name(dev->name); + + ret = rswitch_phy_config(dev); + if (ret) + goto err_mdio_register; + + return 0; + +err_mdio_register: + mdio_free(mdiodev); + return ret; +} + +static int rswitch_port_remove(struct udevice *dev) +{ + struct rswitch_port_priv *priv = dev_get_priv(dev); + + mdio_unregister(priv->etha.bus); + free(priv->etha.phydev); + + return 0; +} + +int rswitch_ofdata_to_platdata(struct udevice *dev) +{ + struct eth_pdata *pdata = dev_get_plat(dev); + + pdata->phy_interface = dev_read_phy_mode(dev); + if (pdata->phy_interface == PHY_INTERFACE_MODE_NA) + return -EINVAL; + + pdata->max_speed = dev_read_u32_default(dev, "max-speed", 1000); + + return 0; +} + +static const struct eth_ops rswitch_port_ops = { + .start = rswitch_start, + .send = rswitch_send, + .recv = rswitch_recv, + .free_pkt = rswitch_free_pkt, + .stop = rswitch_stop, + .write_hwaddr = rswitch_write_hwaddr, +}; + +U_BOOT_DRIVER(rswitch_port) = { + .name = "rswitch-port", + .id = UCLASS_ETH, + .of_to_plat = rswitch_ofdata_to_platdata, + .probe = rswitch_port_probe, + .remove = rswitch_port_remove, + .ops = &rswitch_port_ops, + .priv_auto = sizeof(struct rswitch_port_priv), + .plat_auto = sizeof(struct eth_pdata), + .flags = DM_FLAG_ALLOC_PRIV_DMA | DM_FLAG_OS_PREPARE, +}; + +static int rswitch_probe(struct udevice *dev) +{ + struct rswitch_priv *priv = dev_get_plat(dev); + fdt_addr_t secure_base; + fdt_size_t size; + int ret; + + secure_base = dev_read_addr_size_name(dev, "secure_base", &size); + if (!secure_base) + return -EINVAL; + + priv->addr = map_physmem(secure_base, size, MAP_NOCACHE); + if (!priv->addr) + return -EINVAL; + + priv->rsw_clk = devm_clk_get(dev, NULL); + if (ret) + goto err_map; + + ret = clk_prepare_enable(priv->rsw_clk); + if (ret) + goto err_map; + + return 0; + +err_map: + unmap_physmem(priv->addr, MAP_NOCACHE); + return ret; +} + +static int rswitch_remove(struct udevice *dev) +{ + struct rswitch_priv *priv = dev_get_plat(dev); + + clk_disable_unprepare(priv->rsw_clk); + unmap_physmem(priv->addr, MAP_NOCACHE); + + return 0; +} + +static int rswitch_bind(struct udevice *parent) +{ + struct rswitch_port_priv *priv = dev_get_plat(parent); + ofnode ports_np, node; + struct udevice *dev; + struct driver *drv; + int ret; + + drv = lists_driver_lookup_name("rswitch-port"); + if (!drv) + return -ENOENT; + + ports_np = dev_read_subnode(parent, "ethernet-ports"); + if (!ofnode_valid(ports_np)) + return -ENOENT; + + ofnode_for_each_subnode(node, ports_np) { + ret = device_bind_with_driver_data(parent, drv, + ofnode_get_name(node), + (ulong)priv, node, &dev); + if (ret) + return ret; + } + + return 0; +} + +static const struct udevice_id rswitch_ids[] = { + { .compatible = "renesas,r8a779f0-ether-switch" }, + { } +}; + +U_BOOT_DRIVER(rswitch) = { + .name = "rswitch", + .id = UCLASS_NOP, + .of_match = rswitch_ids, + .bind = rswitch_bind, + .probe = rswitch_probe, + .remove = rswitch_remove, + .plat_auto = sizeof(struct rswitch_priv), +}; diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index cf4d590..7a2d54f 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -285,5 +285,6 @@ source "drivers/phy/rockchip/Kconfig" source "drivers/phy/cadence/Kconfig" source "drivers/phy/ti/Kconfig" source "drivers/phy/qcom/Kconfig" +source "drivers/phy/renesas/Kconfig" endmenu diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile index a3b9f3c..aca365d 100644 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile @@ -41,3 +41,4 @@ obj-$(CONFIG_PHY_XILINX_ZYNQMP) += phy-zynqmp.o obj-y += cadence/ obj-y += ti/ obj-y += qcom/ +obj-y += renesas/ diff --git a/drivers/phy/renesas/Kconfig b/drivers/phy/renesas/Kconfig new file mode 100644 index 0000000..0efb0f8 --- /dev/null +++ b/drivers/phy/renesas/Kconfig @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Phy drivers for Renesas platforms + +config PHY_R8A779F0_ETHERNET_SERDES + tristate "Renesas R-Car S4-8 Ethernet SERDES driver" + depends on RCAR_64 && PHY + help + Support for Ethernet SERDES found on Renesas R-Car S4-8 SoCs. diff --git a/drivers/phy/renesas/Makefile b/drivers/phy/renesas/Makefile new file mode 100644 index 0000000..fd6b8d9 --- /dev/null +++ b/drivers/phy/renesas/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_PHY_R8A779F0_ETHERNET_SERDES) += r8a779f0-ether-serdes.o diff --git a/drivers/phy/renesas/r8a779f0-ether-serdes.c b/drivers/phy/renesas/r8a779f0-ether-serdes.c new file mode 100644 index 0000000..bd1fdd3 --- /dev/null +++ b/drivers/phy/renesas/r8a779f0-ether-serdes.c @@ -0,0 +1,384 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Renesas Ethernet SERDES device driver + * + * Copyright (C) 2022 Renesas Electronics Corporation + */ + +#include <asm/io.h> +#include <clk-uclass.h> +#include <clk.h> +#include <common.h> +#include <div64.h> +#include <dm.h> +#include <dm/device_compat.h> +#include <dm/lists.h> +#include <dm/of_access.h> +#include <generic-phy.h> +#include <linux/bitfield.h> +#include <linux/bitops.h> +#include <linux/delay.h> +#include <linux/iopoll.h> +#include <log.h> +#include <reset.h> +#include <syscon.h> + +#define R8A779F0_ETH_SERDES_NUM 3 +#define R8A779F0_ETH_SERDES_OFFSET 0x0400 +#define R8A779F0_ETH_SERDES_BANK_SELECT 0x03fc +#define R8A779F0_ETH_SERDES_TIMEOUT_US 100000 +#define R8A779F0_ETH_SERDES_NUM_RETRY_LINKUP 3 + +struct r8a779f0_eth_serdes_drv_data; +struct r8a779f0_eth_serdes_channel { + struct r8a779f0_eth_serdes_drv_data *dd; + struct phy *phy; + void __iomem *addr; + phy_interface_t phy_interface; + int speed; + int index; +}; + +struct r8a779f0_eth_serdes_drv_data { + void __iomem *addr; + struct reset_ctl *reset; + struct r8a779f0_eth_serdes_channel channel[R8A779F0_ETH_SERDES_NUM]; + bool initialized; +}; + +/* + * The datasheet describes initialization procedure without any information + * about registers' name/bits. So, this is all black magic to initialize + * the hardware. + */ +static void r8a779f0_eth_serdes_write32(void __iomem *addr, u32 offs, u32 bank, u32 data) +{ + writel(bank, addr + R8A779F0_ETH_SERDES_BANK_SELECT); + writel(data, addr + offs); +} + +static int +r8a779f0_eth_serdes_reg_wait(struct r8a779f0_eth_serdes_channel *channel, + u32 offs, u32 bank, u32 mask, u32 expected) +{ + u32 val = 0; + int ret; + + writel(bank, channel->addr + R8A779F0_ETH_SERDES_BANK_SELECT); + + ret = readl_poll_timeout(channel->addr + offs, val, + (val & mask) == expected, + R8A779F0_ETH_SERDES_TIMEOUT_US); + if (ret) + dev_dbg(channel->phy->dev, + "%s: index %d, offs %x, bank %x, mask %x, expected %x\n", + __func__, channel->index, offs, bank, mask, expected); + + return ret; +} + +static int +r8a779f0_eth_serdes_common_init_ram(struct r8a779f0_eth_serdes_drv_data *dd) +{ + struct r8a779f0_eth_serdes_channel *channel; + int i, ret; + + for (i = 0; i < R8A779F0_ETH_SERDES_NUM; i++) { + channel = &dd->channel[i]; + ret = r8a779f0_eth_serdes_reg_wait(channel, 0x026c, 0x180, BIT(0), 0x01); + if (ret) + return ret; + } + + r8a779f0_eth_serdes_write32(dd->addr, 0x026c, 0x180, 0x03); + + return ret; +} + +static int +r8a779f0_eth_serdes_common_setting(struct r8a779f0_eth_serdes_channel *channel) +{ + struct r8a779f0_eth_serdes_drv_data *dd = channel->dd; + + switch (channel->phy_interface) { + case PHY_INTERFACE_MODE_SGMII: + r8a779f0_eth_serdes_write32(dd->addr, 0x0244, 0x180, 0x0097); + r8a779f0_eth_serdes_write32(dd->addr, 0x01d0, 0x180, 0x0060); + r8a779f0_eth_serdes_write32(dd->addr, 0x01d8, 0x180, 0x2200); + r8a779f0_eth_serdes_write32(dd->addr, 0x01d4, 0x180, 0x0000); + r8a779f0_eth_serdes_write32(dd->addr, 0x01e0, 0x180, 0x003d); + return 0; + default: + return -EOPNOTSUPP; + } +} + +static int +r8a779f0_eth_serdes_chan_setting(struct r8a779f0_eth_serdes_channel *channel) +{ + int ret; + + switch (channel->phy_interface) { + case PHY_INTERFACE_MODE_SGMII: + r8a779f0_eth_serdes_write32(channel->addr, 0x0000, 0x380, 0x2000); + r8a779f0_eth_serdes_write32(channel->addr, 0x01c0, 0x180, 0x0011); + r8a779f0_eth_serdes_write32(channel->addr, 0x0248, 0x180, 0x0540); + r8a779f0_eth_serdes_write32(channel->addr, 0x0258, 0x180, 0x0015); + r8a779f0_eth_serdes_write32(channel->addr, 0x0144, 0x180, 0x0100); + r8a779f0_eth_serdes_write32(channel->addr, 0x01a0, 0x180, 0x0000); + r8a779f0_eth_serdes_write32(channel->addr, 0x00d0, 0x180, 0x0002); + r8a779f0_eth_serdes_write32(channel->addr, 0x0150, 0x180, 0x0003); + r8a779f0_eth_serdes_write32(channel->addr, 0x00c8, 0x180, 0x0100); + r8a779f0_eth_serdes_write32(channel->addr, 0x0148, 0x180, 0x0100); + r8a779f0_eth_serdes_write32(channel->addr, 0x0174, 0x180, 0x0000); + r8a779f0_eth_serdes_write32(channel->addr, 0x0160, 0x180, 0x0007); + r8a779f0_eth_serdes_write32(channel->addr, 0x01ac, 0x180, 0x0000); + r8a779f0_eth_serdes_write32(channel->addr, 0x00c4, 0x180, 0x0310); + r8a779f0_eth_serdes_write32(channel->addr, 0x00c8, 0x180, 0x0101); + ret = r8a779f0_eth_serdes_reg_wait(channel, 0x00c8, 0x0180, BIT(0), 0); + if (ret) + return ret; + + r8a779f0_eth_serdes_write32(channel->addr, 0x0148, 0x180, 0x0101); + ret = r8a779f0_eth_serdes_reg_wait(channel, 0x0148, 0x0180, BIT(0), 0); + if (ret) + return ret; + + r8a779f0_eth_serdes_write32(channel->addr, 0x00c4, 0x180, 0x1310); + r8a779f0_eth_serdes_write32(channel->addr, 0x00d8, 0x180, 0x1800); + r8a779f0_eth_serdes_write32(channel->addr, 0x00dc, 0x180, 0x0000); + r8a779f0_eth_serdes_write32(channel->addr, 0x001c, 0x300, 0x0001); + r8a779f0_eth_serdes_write32(channel->addr, 0x0000, 0x380, 0x2100); + ret = r8a779f0_eth_serdes_reg_wait(channel, 0x0000, 0x0380, BIT(8), 0); + if (ret) + return ret; + + if (channel->speed == 1000) + r8a779f0_eth_serdes_write32(channel->addr, 0x0000, 0x1f00, 0x0140); + else if (channel->speed == 100) + r8a779f0_eth_serdes_write32(channel->addr, 0x0000, 0x1f00, 0x2100); + + /* For AN_ON */ + r8a779f0_eth_serdes_write32(channel->addr, 0x0004, 0x1f80, 0x0005); + r8a779f0_eth_serdes_write32(channel->addr, 0x0028, 0x1f80, 0x07a1); + r8a779f0_eth_serdes_write32(channel->addr, 0x0000, 0x1f80, 0x0208); + break; + default: + return -EOPNOTSUPP; + } + + return 0; +} + +static int +r8a779f0_eth_serdes_chan_speed(struct r8a779f0_eth_serdes_channel *channel) +{ + int ret; + + switch (channel->phy_interface) { + case PHY_INTERFACE_MODE_SGMII: + /* For AN_ON */ + if (channel->speed == 1000) + r8a779f0_eth_serdes_write32(channel->addr, 0x0000, 0x1f00, 0x1140); + else if (channel->speed == 100) + r8a779f0_eth_serdes_write32(channel->addr, 0x0000, 0x1f00, 0x3100); + ret = r8a779f0_eth_serdes_reg_wait(channel, 0x0008, 0x1f80, BIT(0), 1); + if (ret) + return ret; + r8a779f0_eth_serdes_write32(channel->addr, 0x0008, 0x1f80, 0x0000); + break; + default: + return -EOPNOTSUPP; + } + + return 0; +} + +static int r8a779f0_eth_serdes_monitor_linkup(struct r8a779f0_eth_serdes_channel *channel) +{ + int i, ret; + + for (i = 0; i < R8A779F0_ETH_SERDES_NUM_RETRY_LINKUP; i++) { + ret = r8a779f0_eth_serdes_reg_wait(channel, 0x0004, 0x300, + BIT(2), BIT(2)); + if (!ret) + break; + + /* restart */ + r8a779f0_eth_serdes_write32(channel->addr, 0x0144, 0x180, 0x0100); + udelay(1); + r8a779f0_eth_serdes_write32(channel->addr, 0x0144, 0x180, 0x0000); + } + + return ret; +} + +static int r8a779f0_eth_serdes_hw_init(struct r8a779f0_eth_serdes_channel *channel) +{ + struct r8a779f0_eth_serdes_drv_data *dd = channel->dd; + int i, ret; + + if (dd->initialized) + return 0; + + ret = r8a779f0_eth_serdes_common_init_ram(dd); + if (ret) + return ret; + + for (i = 0; i < R8A779F0_ETH_SERDES_NUM; i++) { + ret = r8a779f0_eth_serdes_reg_wait(&dd->channel[i], 0x0000, + 0x300, BIT(15), 0); + if (ret) + return ret; + } + + for (i = 0; i < R8A779F0_ETH_SERDES_NUM; i++) + r8a779f0_eth_serdes_write32(dd->channel[i].addr, 0x03d4, 0x380, 0x0443); + + ret = r8a779f0_eth_serdes_common_setting(channel); + if (ret) + return ret; + + for (i = 0; i < R8A779F0_ETH_SERDES_NUM; i++) + r8a779f0_eth_serdes_write32(dd->channel[i].addr, 0x03d0, 0x380, 0x0001); + + r8a779f0_eth_serdes_write32(dd->addr, 0x0000, 0x380, 0x8000); + + ret = r8a779f0_eth_serdes_common_init_ram(dd); + if (ret) + return ret; + + return r8a779f0_eth_serdes_reg_wait(&dd->channel[0], 0x0000, 0x380, BIT(15), 0); +} + +static int r8a779f0_eth_serdes_init(struct phy *p) +{ + struct r8a779f0_eth_serdes_drv_data *dd = dev_get_priv(p->dev); + struct r8a779f0_eth_serdes_channel *channel = dd->channel + p->id; + int ret; + + ret = r8a779f0_eth_serdes_hw_init(channel); + if (!ret) + channel->dd->initialized = true; + + return ret; +} + +static int r8a779f0_eth_serdes_hw_init_late(struct r8a779f0_eth_serdes_channel *channel) +{ + int ret; + + ret = r8a779f0_eth_serdes_chan_setting(channel); + if (ret) + return ret; + + ret = r8a779f0_eth_serdes_chan_speed(channel); + if (ret) + return ret; + + r8a779f0_eth_serdes_write32(channel->addr, 0x03c0, 0x380, 0x0000); + + r8a779f0_eth_serdes_write32(channel->addr, 0x03d0, 0x380, 0x0000); + + return r8a779f0_eth_serdes_monitor_linkup(channel); +} + +static int r8a779f0_eth_serdes_power_on(struct phy *p) +{ + struct r8a779f0_eth_serdes_drv_data *dd = dev_get_priv(p->dev); + struct r8a779f0_eth_serdes_channel *channel = dd->channel + p->id; + + return r8a779f0_eth_serdes_hw_init_late(channel); +} + +static int r8a779f0_eth_serdes_set_mode(struct phy *p, enum phy_mode mode, + int submode) +{ + struct r8a779f0_eth_serdes_drv_data *dd = dev_get_priv(p->dev); + struct r8a779f0_eth_serdes_channel *channel = dd->channel + p->id; + + if (mode != PHY_MODE_ETHERNET) + return -EOPNOTSUPP; + + switch (submode) { + case PHY_INTERFACE_MODE_GMII: + case PHY_INTERFACE_MODE_SGMII: + case PHY_INTERFACE_MODE_USXGMII: + channel->phy_interface = submode; + return 0; + default: + return -EOPNOTSUPP; + } +} + +static int r8a779f0_eth_serdes_set_speed(struct phy *p, int speed) +{ + struct r8a779f0_eth_serdes_drv_data *dd = dev_get_priv(p->dev); + struct r8a779f0_eth_serdes_channel *channel = dd->channel + p->id; + + channel->speed = speed; + + return 0; +} + +static int r8a779f0_eth_serdes_of_xlate(struct phy *phy, + struct ofnode_phandle_args *args) +{ + if (args->args_count < 1) + return -ENODEV; + + if (args->args[0] >= R8A779F0_ETH_SERDES_NUM) + return -ENODEV; + + phy->id = args->args[0]; + + return 0; +} + +static const struct phy_ops r8a779f0_eth_serdes_ops = { + .init = r8a779f0_eth_serdes_init, + .power_on = r8a779f0_eth_serdes_power_on, + .set_mode = r8a779f0_eth_serdes_set_mode, + .set_speed = r8a779f0_eth_serdes_set_speed, + .of_xlate = r8a779f0_eth_serdes_of_xlate, +}; + +static const struct udevice_id r8a779f0_eth_serdes_of_table[] = { + { .compatible = "renesas,r8a779f0-ether-serdes", }, + { } +}; + +static int r8a779f0_eth_serdes_probe(struct udevice *dev) +{ + struct r8a779f0_eth_serdes_drv_data *dd = dev_get_priv(dev); + int i; + + dd->addr = dev_read_addr_ptr(dev); + if (!dd->addr) + return -EINVAL; + + dd->reset = devm_reset_control_get(dev, NULL); + if (IS_ERR(dd->reset)) + return PTR_ERR(dd->reset); + + reset_assert(dd->reset); + reset_deassert(dd->reset); + + for (i = 0; i < R8A779F0_ETH_SERDES_NUM; i++) { + struct r8a779f0_eth_serdes_channel *channel = &dd->channel[i]; + + channel->addr = dd->addr + R8A779F0_ETH_SERDES_OFFSET * i; + channel->dd = dd; + channel->index = i; + } + + return 0; +} + +U_BOOT_DRIVER(r8a779f0_eth_serdes_driver_platform) = { + .name = "r8a779f0_eth_serdes", + .id = UCLASS_PHY, + .of_match = r8a779f0_eth_serdes_of_table, + .probe = r8a779f0_eth_serdes_probe, + .ops = &r8a779f0_eth_serdes_ops, + .priv_auto = sizeof(struct r8a779f0_eth_serdes_drv_data), +}; diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 4b89f31..d4c1e06 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -111,6 +111,5 @@ #define CFG_SYS_CS0_MASK 0x007F0001 #define CFG_SYS_CS0_CTRL 0x00001FA0 -#define CFG_MCFTMR #endif /* _M5208EVBE_H */ diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 14d4617..e542818 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -130,6 +130,5 @@ # define CFG_SYS_CS0_CTRL 0x00001D80 #endif -#define CFG_MCFTMR #endif /* _M5329EVB_H */ diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index b240423..2f4743c 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -120,6 +120,5 @@ #define CFG_SYS_GPIO1_OUT 0x00c70000 /* Set outputs to default state */ #define CFG_SYS_GPIO1_LED 0x00400000 /* user led */ -#define CFG_MCFTMR #endif /* M5249 */ diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 008c725..0ff0bfc 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -132,6 +132,5 @@ #define CFG_SYS_GPIO1_OUT 0x00c70000 /* Set outputs to default state */ #define CFG_SYS_GPIO1_LED 0x00400000 /* user led */ -#define CFG_MCFTMR #endif /* _M5253DEMO_H */ diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 49cf3e8..98a1718 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -107,6 +107,5 @@ #define CFG_SYS_PBDAT 0x0000 #define CFG_SYS_PDCNT 0x00000000 -#define CFG_MCFTMR #endif /* _M5272C3_H */ diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 965327d..77ddf71 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -116,6 +116,5 @@ #define CFG_SYS_CS1_CTRL 0x00001900 #define CFG_SYS_CS1_MASK 0x00070001 -#define CFG_MCFTMR #endif /* _M5275EVB_H */ diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index f04d9b1..e289a23 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -127,6 +127,5 @@ #define CFG_SYS_DDRUA 0x05 #define CFG_SYS_PJPAR 0xFF -#define CFG_MCFTMR #endif /* _CONFIG_M5282EVB_H */ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 04c456f..dcc5701 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -132,6 +132,5 @@ #define CFG_SYS_CS1_MASK 0x00070001 #define CFG_SYS_CS1_CTRL 0x00001FA0 -#define CFG_MCFTMR #endif /* _M53017EVB_H */ diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 0aa1ffd..dd5d4c9 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -138,6 +138,5 @@ #define CFG_SYS_CS2_CTRL 0x00001f60 #endif -#define CFG_MCFTMR #endif /* _M5329EVB_H */ diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 8b9e65d..4bb9948 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -136,6 +136,5 @@ #define CFG_SYS_CS2_MASK (16 << 20) #define CFG_SYS_CS2_CTRL 0x00001f60 -#define CFG_MCFTMR #endif /* _M5373EVB_H */ diff --git a/include/configs/amcore.h b/include/configs/amcore.h index ca8d17b..4c695fb 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -10,7 +10,6 @@ #define CFG_SYS_UART_PORT 0 -#define CFG_MCFTMR #define CFG_SYS_UART_PORT 0 #define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 80f8c41..f3bfefa 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -184,6 +184,5 @@ #define CFG_SYS_CACHE_ICACR (CF_CACR_EC | CF_CACR_CINVA | \ CF_CACR_DCM_P) -#define CFG_MCFTMR #endif /* _CONFIG_ASTRO_MCF5373L_H */ diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 276ecc3..556705f 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -184,6 +184,5 @@ configuration */ #define CFG_SYS_PBDAT 0x0000 /* PortB value reg. */ #define CFG_SYS_PDCNT 0x00000000 /* PortD control reg. */ -#define CFG_MCFTMR #endif /* _CONFIG_COBRA5272_H */ diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index ba45ee4..561a61e 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -99,7 +99,7 @@ "${board}/flash_blk.img && source ${loadaddr}\0" \ "setup=setenv setupargs " \ "console=tty1 console=${console}" \ - ",${baudrate}n8 ${memargs} consoleblank=0\0" \ + ",${baudrate}n8 ${memargs} ${mtdparts} consoleblank=0\0" \ "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ "setusbupdate=usb start && setenv interface usb && " \ "fatload ${interface} 0:1 ${loadaddr} " \ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index c568643..03f8ed1 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -141,7 +141,7 @@ "${board}/flash_blk.img && source ${loadaddr}\0" \ "setup=setenv setupargs " \ "console=tty1 console=${console}" \ - ",${baudrate}n8 ${memargs} consoleblank=0\0" \ + ",${baudrate}n8 ${memargs} ${mtdparts} consoleblank=0\0" \ "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ "setusbupdate=usb start && setenv interface usb && " \ "fatload ${interface} 0:1 ${loadaddr} " \ diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index 9503ab6..e2c9d9c 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -138,7 +138,6 @@ #define CFG_SYS_DDRUA 0x05 #define CFG_SYS_PJPAR 0xFF -#define CFG_MCFTMR #endif /* _CONFIG_M5282EVB_H */ /*---------------------------------------------------------------------*/ diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index 6edaf73..af5da09 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -95,7 +95,6 @@ #define CACR_STATUS (CFG_SYS_INIT_RAM_ADDR + \ CFG_SYS_INIT_RAM_SIZE - 12) -#define CFG_MCFTMR #define CFG_SYS_I2C_0 diff --git a/py/travis-ci/u_boot_boardenv_M5208EVBE_qemu.py b/py/travis-ci/u_boot_boardenv_M5208EVBE_qemu.py new file mode 100644 index 0000000..4e100cd --- /dev/null +++ b/py/travis-ci/u_boot_boardenv_M5208EVBE_qemu.py @@ -0,0 +1,6 @@ +import os +import travis_tftp + +env__net_uses_pci = False +env__net_dhcp_server = True +env__net_tftp_readable_file = travis_tftp.file2env('u-boot') |