mmc: octeontx_hsmmc.c: Remove test debug message
Subsystems (3)
PATCH 1/4 mmc: octeontx_hsmmc.c: Remove test debug message
Remove a left-over debug test message from the Octeon TX / TX2 MMC driver.
--- drivers/mmc/octeontx_hsmmc.c | 1 - 1 file changed, 1 deletion(-)
drivers/mmc/octeontx_hsmmc.c +0 -1
@@ -3638,7 +3638,6 @@ static int octeontx_mmc_slot_probe(struct udevice *dev)struct mmc *mmc;int err; -printk ("%s (%d)\n" , __func__, __LINE__);// test-only debug ("%s(%s)\n" , __func__, dev->name);if (!host_probed) { pr_err("%s(%s): Error: host not probed yet\n",
Signature · 1 line
2.28.0
PATCH 1/4 mmc: octeontx_hsmmc.c: Remove test debug message
Quoted 7 lines · Stefan Roese
Remove a left-over debug test message from the Octeon TX / TX2 MMC driver.
Signed-off-by Stefan Roese <[email protected]>Cc Aaron Williams <[email protected]>Cc Suneel Garapati <[email protected]>Cc Chandrakala Chavva <[email protected]>
Applied to u-boot-marvell/master
Thanks,
Stefan
Quoted 10 lines
--- drivers/mmc/octeontx_hsmmc.c | 1 - 1 file changed, 1 deletion(-)drivers/mmc/octeontx_hsmmc.c +0
-0
drivers/mmc/octeontx_hsmmc.c static int octeontx_mmc_slot_probe(struct udevice *dev) · line 3643
Quoted 7 lines
drivers/mmc/octeontx_hsmmc.c +0
-1@@ -3638,7 +3638,6 @@ static int octeontx_mmc_slot_probe(struct udevice *dev)struct mmc *mmc;int err; -printk ("%s (%d)\n" , __func__, __LINE__);// test-only debug ("%s(%s)\n" , __func__, dev->name);if (!host_probed) { pr_err("%s(%s): Error: host not probed yet\n",
Viele Gr??e,
Stefan
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
PATCH 2/4 arm: octeontx: Select CLK
In reply to Stefan RoeseClock support is needed for all Octeon TX/TX2 boards. This patch selects CONFIG_CLK so that it is available.
--- arch/arm/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/Kconfig +2 -0
@@ -1739,6 +1739,7 @@ config ARCH_ROCKCHIP config ARCH_OCTEONTX bool "Support OcteonTX SoCs" + select CLK select DM select ARM64 select OF_CONTROL
@@ -1748,6 +1749,7 @@ config ARCH_OCTEONTX config ARCH_OCTEONTX2 bool "Support OcteonTX2 SoCs" + select CLK select DM select ARM64 select OF_CONTROL
Signature · 1 line
2.28.0
PATCH 2/4 arm: octeontx: Select CLK
Quoted 7 lines · Stefan Roese
Clock support is needed for all Octeon TX/TX2 boards. This patch selects
CONFIG_CLKso that it is available.Signed-off-by Stefan Roese <[email protected]>Cc Aaron Williams <[email protected]>Cc Suneel Garapati <[email protected]>Cc Chandrakala Chavva <[email protected]>
Applied to u-boot-marvell/master
Thanks,
Stefan
Quoted 18 lines
--- arch/arm/Kconfig | 2 ++ 1 file changed, 2 insertions(+)arch/arm/Kconfig +1
-0@@ -1739,6 +1739,7 @@ config ARCH_ROCKCHIP config ARCH_OCTEONTX bool "Support OcteonTX SoCs" + select CLK select DM select ARM64 select OF_CONTROL
arch/arm/Kconfig config ARCH_OCTEONTX · line 1755
Quoted 7 lines
arch/arm/Kconfig +1
-0@@ -1748,6 +1749,7 @@ config ARCH_OCTEONTX config ARCH_OCTEONTX2 bool "Support OcteonTX2 SoCs" + select CLK select DM select ARM64 select OF_CONTROL
Viele Gr??e,
Stefan
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
PATCH 3/4 watchdog: octeontx_wdt: Add support for start and stop
In reply to Stefan RoeseFrom: Suneel Garapati <[email protected]>
This patch enhances the Octeon TX/TX2 watchdog driver to fully enable the WDT. With this changes, the "wdt" command is now also supported on these platforms.
--- drivers/watchdog/octeontx_wdt.c | 88 +++++++++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 5 deletions(-)
drivers/watchdog/octeontx_wdt.c +83 -5
@@ -5,25 +5,90 @@* https://spdx.org/licenses */ +#include <clk.h> #include <dm.h> #include <errno.h> #include <wdt.h> #include <asm/io.h> +#include <linux/bitfield.h> DECLARE_GLOBAL_DATA_PTR ; +#define CORE0_WDOG_OFFSET 0x40000#define CORE0_POKE_OFFSET 0x50000#define CORE0_POKE_OFFSET_MASK 0xfffffULL +#define WDOG_MODE GENMASK_ULL(1, 0) +#define WDOG_LEN GENMASK_ULL(19, 4) +#define WDOG_CNT GENMASK_ULL(43, 20) +struct octeontx_wdt {void __iomem *reg; +struct clk clk; }; +static int octeontx_wdt_start (struct udevice *dev,u64 timeout_ms,ulong flags) +{ +struct octeontx_wdt *priv =dev_get_priv (dev); +u64 clk_rate, val; +u64 tout_wdog; + + clk_rate =clk_get_rate (&priv->clk); +if (IS_ERR_VALUE (clk_rate)) +return -EINVAL ; + +/* Watchdog counts in 1024 cycle steps */ + tout_wdog = (clk_rate * timeout_ms /1000 ) >>10 ; + +/* +* We can only specify the upper 16 bits of a 24 bit value. +* Round up +*/ + tout_wdog = (tout_wdog +0xff ) >>8 ; + +/* If the timeout overflows the hardware limit, set max */ +if (tout_wdog >=0x10000 ) + tout_wdog =0xffff ; + + val =FIELD_PREP (WDOG_MODE ,0x3 ) | +FIELD_PREP (WDOG_LEN , tout_wdog) | +FIELD_PREP (WDOG_CNT , tout_wdog <<8 ); +writeq (val, priv->reg +CORE0_WDOG_OFFSET ); + +return 0 ; +} + +static int octeontx_wdt_stop (struct udevice *dev) +{ +struct octeontx_wdt *priv =dev_get_priv (dev); + +writeq (0 , priv->reg +CORE0_WDOG_OFFSET ); + +return 0 ; +} + +static int octeontx_wdt_expire_now (struct udevice *dev,ulong flags) +{ +octeontx_wdt_stop (dev); + +/* Start with 100ms timeout to expire immediately */ +octeontx_wdt_start (dev,100 , flags); + +return 0 ; +} +static int octeontx_wdt_reset (struct udevice *dev) {struct octeontx_wdt *priv =dev_get_priv (dev); -writeq (~0ULL , priv->reg); +writeq (~0ULL , priv->reg +CORE0_POKE_OFFSET ); + +return 0 ; +} + +static int octeontx_wdt_remove (struct udevice *dev) +{ +octeontx_wdt_stop (dev);return 0 ; }
@@ -31,24 +96,35 @@ static int octeontx_wdt_reset(struct udevice *dev)static int octeontx_wdt_probe (struct udevice *dev) {struct octeontx_wdt *priv =dev_get_priv (dev); +int ret; priv->reg =dev_remap_addr (dev);if (!priv->reg)return -EINVAL ;/* -* Save core poke register address in reg (its not 0xa0000 as -* extracted from the DT but 0x50000 instead) +* Save base register address in reg masking lower 20 bits +* as 0xa0000 appears when extracted from the DT */ priv->reg = (void __iomem *)(((u64 )priv->reg & - ~CORE0_POKE_OFFSET_MASK ) | -CORE0_POKE_OFFSET ); + ~CORE0_POKE_OFFSET_MASK )); + + ret =clk_get_by_index (dev,0 , &priv->clk); +if (ret <0 ) +return ret; + + ret =clk_enable (&priv->clk); +if (ret) +return ret;return 0 ; }static const struct wdt_ops octeontx_wdt_ops = { .reset = octeontx_wdt_reset, + .start = octeontx_wdt_start, + .stop = octeontx_wdt_stop, + .expire_now = octeontx_wdt_expire_now, };static const struct udevice_id octeontx_wdt_ids[] = {
@@ -63,4 +139,6 @@ U_BOOT_DRIVER(wdt_octeontx) = { .ops = &octeontx_wdt_ops, .priv_auto_alloc_size = sizeof(struct octeontx_wdt), .probe = octeontx_wdt_probe, + .remove = octeontx_wdt_remove, + .flags = DM_FLAG_OS_PREPARE, };
Signature · 1 line
2.28.0
PATCH 3/4 watchdog: octeontx_wdt: Add support for start and stop
Quoted 11 lines · Stefan Roese
From: Suneel Garapati <[email protected]>
This patch enhances the Octeon TX/TX2 watchdog driver to fully enable the WDT. With this changes, the "wdt" command is now also supported on these platforms.
Signed-off-by Suneel Garapati <[email protected]>Signed-off-by Stefan Roese <[email protected]>Cc Aaron Williams <[email protected]>Cc Suneel Garapati <[email protected]>Cc Chandrakala Chavva <[email protected]>
Applied to u-boot-marvell/master
Thanks,
Stefan
Quoted 142 lines
--- drivers/watchdog/octeontx_wdt.c | 88 +++++++++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 5 deletions(-)drivers/watchdog/octeontx_wdt.c +81
-5@@ -5,25 +5,90 @@* https://spdx.org/licenses */ +#include <clk.h> #include <dm.h> #include <errno.h> #include <wdt.h> #include <asm/io.h> +#include <linux/bitfield.h> DECLARE_GLOBAL_DATA_PTR ; +#define CORE0_WDOG_OFFSET 0x40000#define CORE0_POKE_OFFSET 0x50000#define CORE0_POKE_OFFSET_MASK 0xfffffULL +#define WDOG_MODE GENMASK_ULL(1, 0) +#define WDOG_LEN GENMASK_ULL(19, 4) +#define WDOG_CNT GENMASK_ULL(43, 20) +struct octeontx_wdt {void __iomem *reg; +struct clk clk; }; +static int octeontx_wdt_start (struct udevice *dev,u64 timeout_ms,ulong flags) +{ +struct octeontx_wdt *priv =dev_get_priv (dev); +u64 clk_rate, val; +u64 tout_wdog; + + clk_rate =clk_get_rate (&priv->clk); +if (IS_ERR_VALUE (clk_rate)) +return -EINVAL ; + +/* Watchdog counts in 1024 cycle steps */ + tout_wdog = (clk_rate * timeout_ms /1000 ) >>10 ; + +/* +* We can only specify the upper 16 bits of a 24 bit value. +* Round up +*/ + tout_wdog = (tout_wdog +0xff ) >>8 ; + +/* If the timeout overflows the hardware limit, set max */ +if (tout_wdog >=0x10000 ) + tout_wdog =0xffff ; + + val =FIELD_PREP (WDOG_MODE ,0x3 ) | +FIELD_PREP (WDOG_LEN , tout_wdog) | +FIELD_PREP (WDOG_CNT , tout_wdog <<8 ); +writeq (val, priv->reg +CORE0_WDOG_OFFSET ); + +return 0 ; +} + +static int octeontx_wdt_stop (struct udevice *dev) +{ +struct octeontx_wdt *priv =dev_get_priv (dev); + +writeq (0 , priv->reg +CORE0_WDOG_OFFSET ); + +return 0 ; +} + +static int octeontx_wdt_expire_now (struct udevice *dev,ulong flags) +{ +octeontx_wdt_stop (dev); + +/* Start with 100ms timeout to expire immediately */ +octeontx_wdt_start (dev,100 , flags); + +return 0 ; +} +static int octeontx_wdt_reset (struct udevice *dev) {struct octeontx_wdt *priv =dev_get_priv (dev); -writeq (~0ULL , priv->reg); +writeq (~0ULL , priv->reg +CORE0_POKE_OFFSET ); + +return 0 ; +} + +static int octeontx_wdt_remove (struct udevice *dev) +{ +octeontx_wdt_stop (dev);return 0 ; }@@ -31,24 +96,35 @@ static int octeontx_wdt_reset(struct udevice *dev)static int octeontx_wdt_probe (struct udevice *dev) {struct octeontx_wdt *priv =dev_get_priv (dev); +int ret; priv->reg =dev_remap_addr (dev);if (!priv->reg)return -EINVAL ;/* -* Save core poke register address in reg (its not 0xa0000 as -* extracted from the DT but 0x50000 instead) +* Save base register address in reg masking lower 20 bits +* as 0xa0000 appears when extracted from the DT */ priv->reg = (void __iomem *)(((u64 )priv->reg & - ~CORE0_POKE_OFFSET_MASK ) | -CORE0_POKE_OFFSET ); + ~CORE0_POKE_OFFSET_MASK )); + + ret =clk_get_by_index (dev,0 , &priv->clk); +if (ret <0 ) +return ret; + + ret =clk_enable (&priv->clk); +if (ret) +return ret;return 0 ; }static const struct wdt_ops octeontx_wdt_ops = { .reset = octeontx_wdt_reset, + .start = octeontx_wdt_start, + .stop = octeontx_wdt_stop, + .expire_now = octeontx_wdt_expire_now, };static const struct udevice_id octeontx_wdt_ids[] = {
drivers/watchdog/octeontx_wdt.c U_BOOT_DRIVER(wdt_octeontx) = { · line 144
Quoted 6 lines
drivers/watchdog/octeontx_wdt.c +2
-0@@ -63,4 +139,6 @@ U_BOOT_DRIVER(wdt_octeontx) = { .ops = &octeontx_wdt_ops, .priv_auto_alloc_size = sizeof(struct octeontx_wdt), .probe = octeontx_wdt_probe, + .remove = octeontx_wdt_remove, + .flags = DM_FLAG_OS_PREPARE, };
Viele Gr??e,
Stefan
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
PATCH 4/4 arm: octeontx: Add CMD_WDT
In reply to Stefan RoeseEnable WDT command for Octeon TX/TX2 boards.
--- configs/octeontx2_95xx_defconfig | 1 + configs/octeontx2_96xx_defconfig | 1 + configs/octeontx_81xx_defconfig | 1 + configs/octeontx_83xx_defconfig | 1 + 4 files changed, 4 insertions(+)
configs/octeontx2_95xx_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_CMD_BKOPS_ENABLE=y CONFIG_CMD_PART=y CONFIG_CMD_PCI=y CONFIG_CMD_SF_TEST=y +CONFIG_CMD_WDT=y CONFIG_CMD_DHCP=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=y
configs/octeontx2_96xx_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_CMD_PART=y CONFIG_CMD_PCI=y CONFIG_CMD_SF_TEST=y CONFIG_CMD_USB=y +CONFIG_CMD_WDT=y CONFIG_CMD_DHCP=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=y
configs/octeontx_81xx_defconfig +1 -0
@@ -43,6 +43,7 @@ CONFIG_CMD_PART=y CONFIG_CMD_PCI=y CONFIG_CMD_SF_TEST=y CONFIG_CMD_USB=y +CONFIG_CMD_WDT=y CONFIG_CMD_DHCP=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=y
configs/octeontx_83xx_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_CMD_PART=y CONFIG_CMD_PCI=y CONFIG_CMD_SF_TEST=y CONFIG_CMD_USB=y +CONFIG_CMD_WDT=y CONFIG_CMD_DHCP=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=y
Signature · 1 line
2.28.0
PATCH 4/4 arm: octeontx: Add CMD_WDT
Quoted 6 lines · Stefan Roese
Enable WDT command for Octeon TX/TX2 boards.
Signed-off-by Stefan Roese <[email protected]>Cc Aaron Williams <[email protected]>Cc Suneel Garapati <[email protected]>Cc Chandrakala Chavva <[email protected]>
Applied to u-boot-marvell/master
Thanks,
Stefan
Quoted 49 lines
--- configs/octeontx2_95xx_defconfig | 1 + configs/octeontx2_96xx_defconfig | 1 + configs/octeontx_81xx_defconfig | 1 + configs/octeontx_83xx_defconfig | 1 + 4 files changed, 4 insertions(+)configs/octeontx2_95xx_defconfig +1
-0@@ -41,6 +41,7 @@ CONFIG_CMD_BKOPS_ENABLE=y CONFIG_CMD_PART=y CONFIG_CMD_PCI=y CONFIG_CMD_SF_TEST=y +CONFIG_CMD_WDT=y CONFIG_CMD_DHCP=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=yconfigs/octeontx2_96xx_defconfig +1
-0@@ -42,6 +42,7 @@ CONFIG_CMD_PART=y CONFIG_CMD_PCI=y CONFIG_CMD_SF_TEST=y CONFIG_CMD_USB=y +CONFIG_CMD_WDT=y CONFIG_CMD_DHCP=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=yconfigs/octeontx_81xx_defconfig +1
-0@@ -43,6 +43,7 @@ CONFIG_CMD_PART=y CONFIG_CMD_PCI=y CONFIG_CMD_SF_TEST=y CONFIG_CMD_USB=y +CONFIG_CMD_WDT=y CONFIG_CMD_DHCP=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=yconfigs/octeontx_83xx_defconfig +0
-0
configs/octeontx_83xx_defconfig CONFIG_CMD_PART=y · line 47
Quoted 7 lines
configs/octeontx_83xx_defconfig +1
-0@@ -41,6 +41,7 @@ CONFIG_CMD_PART=y CONFIG_CMD_PCI=y CONFIG_CMD_SF_TEST=y CONFIG_CMD_USB=y +CONFIG_CMD_WDT=y CONFIG_CMD_DHCP=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=y
Viele Gr??e,
Stefan
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de