Skip to contentSkip to conversation

subject: arm: qemu-arm: enable PL031 (RTC)

PATCH New AKASHI Takahiro 3 participants 14 messages Jul 11, 2018 – Sep 5, 2018

Subsystems (2)
Arm (32-bit) Real time clock (RTC)
lore
Share & tools
lore

AKASHI Takahiro

author
#0 lore raw

v3 cover subject: arm: qemu-arm: enable PL031 (RTC)

Virtual Machines provided by qemu for arm are already equipped with RTCdevice (PL031). With this patch set, PL031 driver is converted to driver model and by default enabled on qemu-arm.
It allows us not only to use date command but also to enable UEFI's GetTime/SetTime() services.

This work is motivated by running UEFI SCT(Self-Certification Test) and measuring time. Heinrich has already posted UEFI's GetTime() implementation.

This is a revised version of my proposal[1].

[1] https://lists.denx.de/pipermail/u-boot/2018-July/333534.html

Changes in v3 (July 11, 2018)
* compile drivers/rtc/date.c if DM_RTC
* rename pl031_rtc_xxx to pl031_xxx
* make struct pl031_platdata private to the driver
* add probe function, removing pl031_initted variable
* use readl/writel() instead of private macros
* add a debug message to pl031_rtc_set()
* remove CONFIG_SYS_RTC_PL031_BASE from config_whitelist.txt
* enable RTC_PL031 for QEMU_ARM in arch/arm/Kconfig

Changes in v2 (July 4, 2018)
* based on Heinrich's comments,
* remove legacy mode interface
* enable the driver in defconfig

AKASHI Takahiro (3):
rtc: compile date.c if DM_RTC
rtc: pl031: convert the driver to driver model
arm: qemu-arm: enable RTC (PL031) by default

 arch/arm/Kconfig             |   2 +
 drivers/rtc/Kconfig          |   6 ++
 drivers/rtc/date.c           |   3 +-
 drivers/rtc/pl031.c          | 126 ++++++++++++++++++++++-------------
 scripts/config_whitelist.txt |   1 -
 5 files changed, 90 insertions(+), 48 deletions(-)
Signature · 1 line
2.17.0
author
#1 lore raw

PATCH v3 1/3 rtc: compile date.c if DM_RTC

rtc_to_tm() and rtc_mktime() are required for some RTC drivers, at least PL031. Without this patch, we also need to enable CONFIG_CMD_DATE even if we don't want or need this command.

Signed-off-by AKASHI Takahiro <[email protected]>
---
 drivers/rtc/date.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/rtc/date.c +2 -1
index 1256ffe374..f1ac738a8a 100644
@@ -9,7 +9,8 @@
 #include <errno.h>
 #include <rtc.h>
 
-#if defined(CONFIG_CMD_DATE) || defined(CONFIG_TIMESTAMP)
+#if defined(CONFIG_CMD_DATE) || defined(CONFIG_DM_RTC) || \
+				defined(CONFIG_TIMESTAMP)
 
 #define FEBRUARY		2
 #define	STARTOFTIME		1970
Signature · 1 line
2.17.0
#3 lore raw

PATCH v3 1/3 rtc: compile date.c if DM_RTC

In reply to AKASHI Takahiro
Quoted 6 lines · AKASHI Takahiro

rtc_to_tm() and rtc_mktime() are required for some RTC drivers, at least PL031. Without this patch, we also need to enable CONFIG_CMD_DATE even if we don't want or need this command.

Signed-off-by AKASHI Takahiro <[email protected]>
Reviewed-by Heinrich Schuchardt <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180726/a39c2491/attachment.sig>
author
#4 lore raw

PATCH v3 2/3 rtc: pl031: convert the driver to driver model

In reply to AKASHI Takahiro

With this patch, PL031 driver is converted to driver-model-compliant driver. In addition, CONFIG_SYS_RTC_PL031_BASE is no longer valid.

Signed-off-by AKASHI Takahiro <[email protected]>
---
 drivers/rtc/Kconfig          |   6 ++
 drivers/rtc/pl031.c          | 126 ++++++++++++++++++++++-------------
 scripts/config_whitelist.txt |   1 -
 3 files changed, 86 insertions(+), 47 deletions(-)
drivers/rtc/Kconfig +6 -0
index a3f8c8aecc..96c4cce410 100644
@@ -55,6 +55,12 @@ config RTC_MV
 	  Enable Marvell RTC driver. This driver supports the rtc that is present
 	  on some Marvell SoCs.
 
+config RTC_PL031
+	bool "Enable ARM PL031 driver"
+	depends on DM_RTC
+	help
+	  Enable ARM PL031 driver.
+
 config RTC_S35392A
 	bool "Enable S35392A driver"
 	select BITREVERSE
drivers/rtc/pl031.c +80 -46

171 lines not on this page · raw message

scripts/config_whitelist.txt +0 -1
index 1219dcc3be..17bd2d681c 100644
@@ -4115,7 +4115,6 @@ CONFIG_SYS_RSTC_RMR_VAL
 CONFIG_SYS_RTC_BUS_NUM
 CONFIG_SYS_RTC_CNT
 CONFIG_SYS_RTC_OSCILLATOR
-CONFIG_SYS_RTC_PL031_BASE
 CONFIG_SYS_RTC_REG_BASE_ADDR
 CONFIG_SYS_RTC_SETUP
 CONFIG_SYS_RV3029_TCR
Signature · 1 line
2.17.0
#6 lore raw

PATCH v3 2/3 rtc: pl031: convert the driver to driver model

In reply to AKASHI Takahiro
Quoted 15 lines · AKASHI Takahiro

With this patch, PL031 driver is converted to driver-model-compliant driver. In addition, CONFIG_SYS_RTC_PL031_BASE is no longer valid.

Signed-off-by AKASHI Takahiro <[email protected]>
---
 drivers/rtc/Kconfig          |   6 ++
 drivers/rtc/pl031.c          | 126 ++++++++++++++++++++++-------------
 scripts/config_whitelist.txt |   1 -
 3 files changed, 86 insertions(+), 47 deletions(-)
drivers/rtc/Kconfig +0 -0
index a3f8c8aecc..96c4cce410 100644

drivers/rtc/Kconfig config RTC_MV · line 63

Quoted 9 lines
drivers/rtc/Kconfig +6 -0
@@ -55,6 +55,12 @@ config RTC_MV
 	  Enable Marvell RTC driver. This driver supports the rtc that is present
 	  on some Marvell SoCs.
 
+config RTC_PL031
+	bool "Enable ARM PL031 driver"
+	depends on DM_RTC
+	help
+	  Enable ARM PL031 driver.
+

Tom merged
http://git.denx.de/?p=u-boot.git;a=commit;h=b19886b9469174213877ef37670ce35c55acb456
https://patchwork.ozlabs.org/patch/936533/
ARM: qemu-arm: enable RTC
which is superseeded by your patch series.

We should avoid duplicate entries CONFIG_RTC_PL031.

Symbol CONFIG_SYS_RTC_PL031_BASE can be removed in include/configs/qemu-arm.h with this patch.

Could you, please, respin your patch series.

Best regards

Heinrich

Quoted 193 lines
drivers/rtc/Kconfig +0 -0
 config RTC_S35392A
 	bool "Enable S35392A driver"
 	select BITREVERSE
drivers/rtc/pl031.c +80 -46
index 8955805e3b..b8fd944e44 100644
@@ -8,13 +8,11 @@
 
 #include <common.h>
 #include <command.h>
+#include <dm.h>
+#include <errno.h>
 #include <rtc.h>
-
-#if defined(CONFIG_CMD_DATE)
-
-#ifndef CONFIG_SYS_RTC_PL031_BASE
-#error CONFIG_SYS_RTC_PL031_BASE is not defined!
-#endif
+#include <asm/io.h>
+#include <asm/types.h>
 
 /*
  * Register definitions

@@ -30,78 +28,114 @@
 
 #define RTC_CR_START	(1 << 0)
 
-#define	RTC_WRITE_REG(addr, val) \
-			(*(volatile unsigned int *)(CONFIG_SYS_RTC_PL031_BASE + (addr)) = (val))
-#define	RTC_READ_REG(addr)	\
-			(*(volatile unsigned int *)(CONFIG_SYS_RTC_PL031_BASE + (addr)))
+struct pl031_platdata {
+	phys_addr_t base;
+};
 
-static int pl031_initted = 0;
+static inline u32 pl031_read_reg(struct udevice *dev, int reg)
+{
+	struct pl031_platdata *pdata = dev_get_platdata(dev);
 
-/* Enable RTC Start in Control register*/
-void rtc_init(void)
+	return readl(pdata->base + reg);
+}
+
+static inline u32 pl031_write_reg(struct udevice *dev, int reg, u32 value)
 {
-	RTC_WRITE_REG(RTC_CR, RTC_CR_START);
+	struct pl031_platdata *pdata = dev_get_platdata(dev);
 
-	pl031_initted = 1;
+	return writel(value, pdata->base + reg);
 }
 
 /*
- * Reset the RTC. We set the date back to 1970-01-01.
+ * Probe RTC device
+ */
+static int pl031_probe(struct udevice *dev)
+{
+	/* Enable RTC Start in Control register*/
+	pl031_write_reg(dev, RTC_CR, RTC_CR_START);
+
+	return 0;
+}
+
+/*
+ * Get the current time from the RTC
  */
-void rtc_reset(void)
+static int pl031_get(struct udevice *dev, struct rtc_time *tm)
 {
-	RTC_WRITE_REG(RTC_LR, 0x00);
-	if(!pl031_initted)
-		rtc_init();
+	unsigned long tim;
+
+	if (!tm)
+		return -EINVAL;
+
+	tim = pl031_read_reg(dev, RTC_DR);
+
+	rtc_to_tm(tim, tm);
+
+	debug("Get DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
+		tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday,
+		tm->tm_hour, tm->tm_min, tm->tm_sec);
+
+	return 0;
 }
 
 /*
  * Set the RTC
-*/
-int rtc_set(struct rtc_time *tmp)
+ */
+static int pl031_set(struct udevice *dev, const struct rtc_time *tm)
 {
 	unsigned long tim;
 
-	if(!pl031_initted)
-		rtc_init();
+	if (!tm)
+		return -EINVAL;
 
-	if (tmp == NULL) {
-		puts("Error setting the date/time\n");
-		return -1;
-	}
+	debug("Set DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
+		tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday,
+		tm->tm_hour, tm->tm_min, tm->tm_sec);
 
 	/* Calculate number of seconds this incoming time represents */
-	tim = rtc_mktime(tmp);
+	tim = rtc_mktime(tm);
 
-	RTC_WRITE_REG(RTC_LR, tim);
+	pl031_write_reg(dev, RTC_LR, tim);
 
-	return -1;
+	return 0;
 }
 
 /*
- * Get the current time from the RTC
+ * Reset the RTC. We set the date back to 1970-01-01.
  */
-int rtc_get(struct rtc_time *tmp)
+static int pl031_reset(struct udevice *dev)
 {
-	ulong tim;
+	pl031_write_reg(dev, RTC_LR, 0);
 
-	if(!pl031_initted)
-		rtc_init();
+	return 0;
+}
 
-	if (tmp == NULL) {
-		puts("Error getting the date/time\n");
-		return -1;
-	}
+static const struct rtc_ops pl031_ops = {
+	.get = pl031_get,
+	.set = pl031_set,
+	.reset = pl031_reset,
+};
 
-	tim = RTC_READ_REG(RTC_DR);
+static const struct udevice_id pl031_ids[] = {
+	{ .compatible = "arm,pl031" },
+	{ }
+};
 
-	rtc_to_tm(tim, tmp);
+static int pl031_ofdata_to_platdata(struct udevice *dev)
+{
+	struct pl031_platdata *pdata = dev_get_platdata(dev);
 
-	debug ( "Get DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
-		tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
-		tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+	pdata->base = dev_read_addr(dev);
 
 	return 0;
 }
 
-#endif
+U_BOOT_DRIVER(rtc_pl031) = {
+	.name	= "rtc-pl031",
+	.id	= UCLASS_RTC,
+	.of_match = pl031_ids,
+	.probe	= pl031_probe,
+	.ofdata_to_platdata = pl031_ofdata_to_platdata,
+	.platdata_auto_alloc_size = sizeof(struct pl031_platdata),
+	.ops	= &pl031_ops,
+};
scripts/config_whitelist.txt +0 -1
index 1219dcc3be..17bd2d681c 100644
@@ -4115,7 +4115,6 @@ CONFIG_SYS_RSTC_RMR_VAL
 CONFIG_SYS_RTC_BUS_NUM
 CONFIG_SYS_RTC_CNT
 CONFIG_SYS_RTC_OSCILLATOR
-CONFIG_SYS_RTC_PL031_BASE
 CONFIG_SYS_RTC_REG_BASE_ADDR
 CONFIG_SYS_RTC_SETUP
 CONFIG_SYS_RV3029_TCR
author
#7 lore raw

PATCH v3 2/3 rtc: pl031: convert the driver to driver model

Quoted 32 lines · Heinrich Schuchardt
Quoted 15 lines · AKASHI Takahiro

With this patch, PL031 driver is converted to driver-model-compliant driver. In addition, CONFIG_SYS_RTC_PL031_BASE is no longer valid.

Signed-off-by AKASHI Takahiro <[email protected]>
---
 drivers/rtc/Kconfig          |   6 ++
 drivers/rtc/pl031.c          | 126 ++++++++++++++++++++++-------------
 scripts/config_whitelist.txt |   1 -
 3 files changed, 86 insertions(+), 47 deletions(-)
drivers/rtc/Kconfig +0 -0
index a3f8c8aecc..96c4cce410 100644

drivers/rtc/Kconfig config RTC_MV · line 63

Quoted 9 lines
drivers/rtc/Kconfig +6 -0
@@ -55,6 +55,12 @@ config RTC_MV
 	  Enable Marvell RTC driver. This driver supports the rtc that is present
 	  on some Marvell SoCs.
 
+config RTC_PL031
+	bool "Enable ARM PL031 driver"
+	depends on DM_RTC
+	help
+	  Enable ARM PL031 driver.
+

Tom merged
http://git.denx.de/?p=u-boot.git;a=commit;h=b19886b9469174213877ef37670ce35c55acb456
https://patchwork.ozlabs.org/patch/936533/
ARM: qemu-arm: enable RTC
which is superseeded by your patch series.

Quoted 6 lines

We should avoid duplicate entries CONFIG_RTC_PL031.

Symbol CONFIG_SYS_RTC_PL031_BASE can be removed in include/configs/qemu-arm.h with this patch.

Could you, please, respin your patch series.

I think that your patch be reverted first and my patch be merged (in this merge window or next -rc1) as u-boot master is still open.

-Takahiro AKASHI

Quoted 198 lines

Best regards

Heinrich

Quoted 193 lines
drivers/rtc/Kconfig +0 -0
 config RTC_S35392A
 	bool "Enable S35392A driver"
 	select BITREVERSE
drivers/rtc/pl031.c +80 -46
index 8955805e3b..b8fd944e44 100644
@@ -8,13 +8,11 @@
 
 #include <common.h>
 #include <command.h>
+#include <dm.h>
+#include <errno.h>
 #include <rtc.h>
-
-#if defined(CONFIG_CMD_DATE)
-
-#ifndef CONFIG_SYS_RTC_PL031_BASE
-#error CONFIG_SYS_RTC_PL031_BASE is not defined!
-#endif
+#include <asm/io.h>
+#include <asm/types.h>
 
 /*
  * Register definitions

@@ -30,78 +28,114 @@
 
 #define RTC_CR_START	(1 << 0)
 
-#define	RTC_WRITE_REG(addr, val) \
-			(*(volatile unsigned int *)(CONFIG_SYS_RTC_PL031_BASE + (addr)) = (val))
-#define	RTC_READ_REG(addr)	\
-			(*(volatile unsigned int *)(CONFIG_SYS_RTC_PL031_BASE + (addr)))
+struct pl031_platdata {
+	phys_addr_t base;
+};
 
-static int pl031_initted = 0;
+static inline u32 pl031_read_reg(struct udevice *dev, int reg)
+{
+	struct pl031_platdata *pdata = dev_get_platdata(dev);
 
-/* Enable RTC Start in Control register*/
-void rtc_init(void)
+	return readl(pdata->base + reg);
+}
+
+static inline u32 pl031_write_reg(struct udevice *dev, int reg, u32 value)
 {
-	RTC_WRITE_REG(RTC_CR, RTC_CR_START);
+	struct pl031_platdata *pdata = dev_get_platdata(dev);
 
-	pl031_initted = 1;
+	return writel(value, pdata->base + reg);
 }
 
 /*
- * Reset the RTC. We set the date back to 1970-01-01.
+ * Probe RTC device
+ */
+static int pl031_probe(struct udevice *dev)
+{
+	/* Enable RTC Start in Control register*/
+	pl031_write_reg(dev, RTC_CR, RTC_CR_START);
+
+	return 0;
+}
+
+/*
+ * Get the current time from the RTC
  */
-void rtc_reset(void)
+static int pl031_get(struct udevice *dev, struct rtc_time *tm)
 {
-	RTC_WRITE_REG(RTC_LR, 0x00);
-	if(!pl031_initted)
-		rtc_init();
+	unsigned long tim;
+
+	if (!tm)
+		return -EINVAL;
+
+	tim = pl031_read_reg(dev, RTC_DR);
+
+	rtc_to_tm(tim, tm);
+
+	debug("Get DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
+		tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday,
+		tm->tm_hour, tm->tm_min, tm->tm_sec);
+
+	return 0;
 }
 
 /*
  * Set the RTC
-*/
-int rtc_set(struct rtc_time *tmp)
+ */
+static int pl031_set(struct udevice *dev, const struct rtc_time *tm)
 {
 	unsigned long tim;
 
-	if(!pl031_initted)
-		rtc_init();
+	if (!tm)
+		return -EINVAL;
 
-	if (tmp == NULL) {
-		puts("Error setting the date/time\n");
-		return -1;
-	}
+	debug("Set DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
+		tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday,
+		tm->tm_hour, tm->tm_min, tm->tm_sec);
 
 	/* Calculate number of seconds this incoming time represents */
-	tim = rtc_mktime(tmp);
+	tim = rtc_mktime(tm);
 
-	RTC_WRITE_REG(RTC_LR, tim);
+	pl031_write_reg(dev, RTC_LR, tim);
 
-	return -1;
+	return 0;
 }
 
 /*
- * Get the current time from the RTC
+ * Reset the RTC. We set the date back to 1970-01-01.
  */
-int rtc_get(struct rtc_time *tmp)
+static int pl031_reset(struct udevice *dev)
 {
-	ulong tim;
+	pl031_write_reg(dev, RTC_LR, 0);
 
-	if(!pl031_initted)
-		rtc_init();
+	return 0;
+}
 
-	if (tmp == NULL) {
-		puts("Error getting the date/time\n");
-		return -1;
-	}
+static const struct rtc_ops pl031_ops = {
+	.get = pl031_get,
+	.set = pl031_set,
+	.reset = pl031_reset,
+};
 
-	tim = RTC_READ_REG(RTC_DR);
+static const struct udevice_id pl031_ids[] = {
+	{ .compatible = "arm,pl031" },
+	{ }
+};
 
-	rtc_to_tm(tim, tmp);
+static int pl031_ofdata_to_platdata(struct udevice *dev)
+{
+	struct pl031_platdata *pdata = dev_get_platdata(dev);
 
-	debug ( "Get DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
-		tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
-		tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+	pdata->base = dev_read_addr(dev);
 
 	return 0;
 }
 
-#endif
+U_BOOT_DRIVER(rtc_pl031) = {
+	.name	= "rtc-pl031",
+	.id	= UCLASS_RTC,
+	.of_match = pl031_ids,
+	.probe	= pl031_probe,
+	.ofdata_to_platdata = pl031_ofdata_to_platdata,
+	.platdata_auto_alloc_size = sizeof(struct pl031_platdata),
+	.ops	= &pl031_ops,
+};
scripts/config_whitelist.txt +0 -1
index 1219dcc3be..17bd2d681c 100644
@@ -4115,7 +4115,6 @@ CONFIG_SYS_RSTC_RMR_VAL
 CONFIG_SYS_RTC_BUS_NUM
 CONFIG_SYS_RTC_CNT
 CONFIG_SYS_RTC_OSCILLATOR
-CONFIG_SYS_RTC_PL031_BASE
 CONFIG_SYS_RTC_REG_BASE_ADDR
 CONFIG_SYS_RTC_SETUP
 CONFIG_SYS_RV3029_TCR
#8 lore raw

PATCH v3 2/3 rtc: pl031: convert the driver to driver model

Quoted 38 lines · AKASHI Takahiro
Quoted 37 lines · Heinrich Schuchardt
Quoted 15 lines · AKASHI Takahiro

With this patch, PL031 driver is converted to driver-model-compliant driver. In addition, CONFIG_SYS_RTC_PL031_BASE is no longer valid.

Signed-off-by AKASHI Takahiro <[email protected]>
---
 drivers/rtc/Kconfig          |   6 ++
 drivers/rtc/pl031.c          | 126 ++++++++++++++++++++++-------------
 scripts/config_whitelist.txt |   1 -
 3 files changed, 86 insertions(+), 47 deletions(-)
drivers/rtc/Kconfig +0 -0
index a3f8c8aecc..96c4cce410 100644

drivers/rtc/Kconfig config RTC_MV · line 63

Quoted 9 lines
drivers/rtc/Kconfig +6 -0
@@ -55,6 +55,12 @@ config RTC_MV
 	  Enable Marvell RTC driver. This driver supports the rtc that is present
 	  on some Marvell SoCs.
 
+config RTC_PL031
+	bool "Enable ARM PL031 driver"
+	depends on DM_RTC
+	help
+	  Enable ARM PL031 driver.
+

Tom merged
http://git.denx.de/?p=u-boot.git;a=commit;h=b19886b9469174213877ef37670ce35c55acb456
https://patchwork.ozlabs.org/patch/936533/
ARM: qemu-arm: enable RTC
which is superseeded by your patch series.

We should avoid duplicate entries CONFIG_RTC_PL031.

Symbol CONFIG_SYS_RTC_PL031_BASE can be removed in include/configs/qemu-arm.h with this patch.

Quoted 9 lines
Quoted 1 line

Could you, please, respin your patch series.

I think that your patch be reverted first and my patch be merged (in this merge window or next -rc1) as u-boot master is still open.

-Takahiro AKASHI

Hello Takahiro,

I think the changes you planned make perfectly sense.

Will you rework this patch series, so that it will be included into v2018.11?

Best regards

Heinrich

Quoted 199 lines
Quoted 198 lines

Best regards

Heinrich

Quoted 193 lines
drivers/rtc/Kconfig +0 -0
 config RTC_S35392A
 	bool "Enable S35392A driver"
 	select BITREVERSE
drivers/rtc/pl031.c +80 -46
index 8955805e3b..b8fd944e44 100644
@@ -8,13 +8,11 @@
 
 #include <common.h>
 #include <command.h>
+#include <dm.h>
+#include <errno.h>
 #include <rtc.h>
-
-#if defined(CONFIG_CMD_DATE)
-
-#ifndef CONFIG_SYS_RTC_PL031_BASE
-#error CONFIG_SYS_RTC_PL031_BASE is not defined!
-#endif
+#include <asm/io.h>
+#include <asm/types.h>
 
 /*
  * Register definitions

@@ -30,78 +28,114 @@
 
 #define RTC_CR_START	(1 << 0)
 
-#define	RTC_WRITE_REG(addr, val) \
-			(*(volatile unsigned int *)(CONFIG_SYS_RTC_PL031_BASE + (addr)) = (val))
-#define	RTC_READ_REG(addr)	\
-			(*(volatile unsigned int *)(CONFIG_SYS_RTC_PL031_BASE + (addr)))
+struct pl031_platdata {
+	phys_addr_t base;
+};
 
-static int pl031_initted = 0;
+static inline u32 pl031_read_reg(struct udevice *dev, int reg)
+{
+	struct pl031_platdata *pdata = dev_get_platdata(dev);
 
-/* Enable RTC Start in Control register*/
-void rtc_init(void)
+	return readl(pdata->base + reg);
+}
+
+static inline u32 pl031_write_reg(struct udevice *dev, int reg, u32 value)
 {
-	RTC_WRITE_REG(RTC_CR, RTC_CR_START);
+	struct pl031_platdata *pdata = dev_get_platdata(dev);
 
-	pl031_initted = 1;
+	return writel(value, pdata->base + reg);
 }
 
 /*
- * Reset the RTC. We set the date back to 1970-01-01.
+ * Probe RTC device
+ */
+static int pl031_probe(struct udevice *dev)
+{
+	/* Enable RTC Start in Control register*/
+	pl031_write_reg(dev, RTC_CR, RTC_CR_START);
+
+	return 0;
+}
+
+/*
+ * Get the current time from the RTC
  */
-void rtc_reset(void)
+static int pl031_get(struct udevice *dev, struct rtc_time *tm)
 {
-	RTC_WRITE_REG(RTC_LR, 0x00);
-	if(!pl031_initted)
-		rtc_init();
+	unsigned long tim;
+
+	if (!tm)
+		return -EINVAL;
+
+	tim = pl031_read_reg(dev, RTC_DR);
+
+	rtc_to_tm(tim, tm);
+
+	debug("Get DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
+		tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday,
+		tm->tm_hour, tm->tm_min, tm->tm_sec);
+
+	return 0;
 }
 
 /*
  * Set the RTC
-*/
-int rtc_set(struct rtc_time *tmp)
+ */
+static int pl031_set(struct udevice *dev, const struct rtc_time *tm)
 {
 	unsigned long tim;
 
-	if(!pl031_initted)
-		rtc_init();
+	if (!tm)
+		return -EINVAL;
 
-	if (tmp == NULL) {
-		puts("Error setting the date/time\n");
-		return -1;
-	}
+	debug("Set DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
+		tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday,
+		tm->tm_hour, tm->tm_min, tm->tm_sec);
 
 	/* Calculate number of seconds this incoming time represents */
-	tim = rtc_mktime(tmp);
+	tim = rtc_mktime(tm);
 
-	RTC_WRITE_REG(RTC_LR, tim);
+	pl031_write_reg(dev, RTC_LR, tim);
 
-	return -1;
+	return 0;
 }
 
 /*
- * Get the current time from the RTC
+ * Reset the RTC. We set the date back to 1970-01-01.
  */
-int rtc_get(struct rtc_time *tmp)
+static int pl031_reset(struct udevice *dev)
 {
-	ulong tim;
+	pl031_write_reg(dev, RTC_LR, 0);
 
-	if(!pl031_initted)
-		rtc_init();
+	return 0;
+}
 
-	if (tmp == NULL) {
-		puts("Error getting the date/time\n");
-		return -1;
-	}
+static const struct rtc_ops pl031_ops = {
+	.get = pl031_get,
+	.set = pl031_set,
+	.reset = pl031_reset,
+};
 
-	tim = RTC_READ_REG(RTC_DR);
+static const struct udevice_id pl031_ids[] = {
+	{ .compatible = "arm,pl031" },
+	{ }
+};
 
-	rtc_to_tm(tim, tmp);
+static int pl031_ofdata_to_platdata(struct udevice *dev)
+{
+	struct pl031_platdata *pdata = dev_get_platdata(dev);
 
-	debug ( "Get DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
-		tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
-		tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+	pdata->base = dev_read_addr(dev);
 
 	return 0;
 }
 
-#endif
+U_BOOT_DRIVER(rtc_pl031) = {
+	.name	= "rtc-pl031",
+	.id	= UCLASS_RTC,
+	.of_match = pl031_ids,
+	.probe	= pl031_probe,
+	.ofdata_to_platdata = pl031_ofdata_to_platdata,
+	.platdata_auto_alloc_size = sizeof(struct pl031_platdata),
+	.ops	= &pl031_ops,
+};
scripts/config_whitelist.txt +0 -1
index 1219dcc3be..17bd2d681c 100644
@@ -4115,7 +4115,6 @@ CONFIG_SYS_RSTC_RMR_VAL
 CONFIG_SYS_RTC_BUS_NUM
 CONFIG_SYS_RTC_CNT
 CONFIG_SYS_RTC_OSCILLATOR
-CONFIG_SYS_RTC_PL031_BASE
 CONFIG_SYS_RTC_REG_BASE_ADDR
 CONFIG_SYS_RTC_SETUP
 CONFIG_SYS_RV3029_TCR
author
#9 lore raw

PATCH v3 2/3 rtc: pl031: convert the driver to driver model

Quoted 34 lines · Heinrich Schuchardt
Quoted 33 lines · AKASHI Takahiro
Quoted 32 lines · Heinrich Schuchardt
Quoted 15 lines · AKASHI Takahiro

With this patch, PL031 driver is converted to driver-model-compliant driver. In addition, CONFIG_SYS_RTC_PL031_BASE is no longer valid.

Signed-off-by AKASHI Takahiro <[email protected]>
---
 drivers/rtc/Kconfig          |   6 ++
 drivers/rtc/pl031.c          | 126 ++++++++++++++++++++++-------------
 scripts/config_whitelist.txt |   1 -
 3 files changed, 86 insertions(+), 47 deletions(-)
drivers/rtc/Kconfig +0 -0
index a3f8c8aecc..96c4cce410 100644

drivers/rtc/Kconfig config RTC_MV · line 63

Quoted 9 lines
drivers/rtc/Kconfig +6 -0
@@ -55,6 +55,12 @@ config RTC_MV
 	  Enable Marvell RTC driver. This driver supports the rtc that is present
 	  on some Marvell SoCs.
 
+config RTC_PL031
+	bool "Enable ARM PL031 driver"
+	depends on DM_RTC
+	help
+	  Enable ARM PL031 driver.
+

Tom merged
http://git.denx.de/?p=u-boot.git;a=commit;h=b19886b9469174213877ef37670ce35c55acb456
https://patchwork.ozlabs.org/patch/936533/
ARM: qemu-arm: enable RTC
which is superseeded by your patch series.

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

We should avoid duplicate entries CONFIG_RTC_PL031.

Symbol CONFIG_SYS_RTC_PL031_BASE can be removed in include/configs/qemu-arm.h with this patch.

Could you, please, respin your patch series.

Thank you for this reminder.
While it's nothing much for me to respin my patch, I wonder how maintainers handle coming patches in ML. I submitted my first counterpart patch just a few days after your post in a form of a *reply* to your e-mail. Then your patch was merged and mine was just ignored.

Thanks,
-Takahiro AKASHI

Quoted 220 lines
Quoted 7 lines

I think that your patch be reverted first and my patch be merged (in this merge window or next -rc1) as u-boot master is still open.

-Takahiro AKASHI

Hello Takahiro,

I think the changes you planned make perfectly sense.

Will you rework this patch series, so that it will be included into v2018.11?

Best regards

Heinrich

Quoted 199 lines
Quoted 198 lines

Best regards

Heinrich

Quoted 193 lines
drivers/rtc/Kconfig +0 -0
 config RTC_S35392A
 	bool "Enable S35392A driver"
 	select BITREVERSE
drivers/rtc/pl031.c +80 -46
index 8955805e3b..b8fd944e44 100644
@@ -8,13 +8,11 @@
 
 #include <common.h>
 #include <command.h>
+#include <dm.h>
+#include <errno.h>
 #include <rtc.h>
-
-#if defined(CONFIG_CMD_DATE)
-
-#ifndef CONFIG_SYS_RTC_PL031_BASE
-#error CONFIG_SYS_RTC_PL031_BASE is not defined!
-#endif
+#include <asm/io.h>
+#include <asm/types.h>
 
 /*
  * Register definitions

@@ -30,78 +28,114 @@
 
 #define RTC_CR_START	(1 << 0)
 
-#define	RTC_WRITE_REG(addr, val) \
-			(*(volatile unsigned int *)(CONFIG_SYS_RTC_PL031_BASE + (addr)) = (val))
-#define	RTC_READ_REG(addr)	\
-			(*(volatile unsigned int *)(CONFIG_SYS_RTC_PL031_BASE + (addr)))
+struct pl031_platdata {
+	phys_addr_t base;
+};
 
-static int pl031_initted = 0;
+static inline u32 pl031_read_reg(struct udevice *dev, int reg)
+{
+	struct pl031_platdata *pdata = dev_get_platdata(dev);
 
-/* Enable RTC Start in Control register*/
-void rtc_init(void)
+	return readl(pdata->base + reg);
+}
+
+static inline u32 pl031_write_reg(struct udevice *dev, int reg, u32 value)
 {
-	RTC_WRITE_REG(RTC_CR, RTC_CR_START);
+	struct pl031_platdata *pdata = dev_get_platdata(dev);
 
-	pl031_initted = 1;
+	return writel(value, pdata->base + reg);
 }
 
 /*
- * Reset the RTC. We set the date back to 1970-01-01.
+ * Probe RTC device
+ */
+static int pl031_probe(struct udevice *dev)
+{
+	/* Enable RTC Start in Control register*/
+	pl031_write_reg(dev, RTC_CR, RTC_CR_START);
+
+	return 0;
+}
+
+/*
+ * Get the current time from the RTC
  */
-void rtc_reset(void)
+static int pl031_get(struct udevice *dev, struct rtc_time *tm)
 {
-	RTC_WRITE_REG(RTC_LR, 0x00);
-	if(!pl031_initted)
-		rtc_init();
+	unsigned long tim;
+
+	if (!tm)
+		return -EINVAL;
+
+	tim = pl031_read_reg(dev, RTC_DR);
+
+	rtc_to_tm(tim, tm);
+
+	debug("Get DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
+		tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday,
+		tm->tm_hour, tm->tm_min, tm->tm_sec);
+
+	return 0;
 }
 
 /*
  * Set the RTC
-*/
-int rtc_set(struct rtc_time *tmp)
+ */
+static int pl031_set(struct udevice *dev, const struct rtc_time *tm)
 {
 	unsigned long tim;
 
-	if(!pl031_initted)
-		rtc_init();
+	if (!tm)
+		return -EINVAL;
 
-	if (tmp == NULL) {
-		puts("Error setting the date/time\n");
-		return -1;
-	}
+	debug("Set DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
+		tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday,
+		tm->tm_hour, tm->tm_min, tm->tm_sec);
 
 	/* Calculate number of seconds this incoming time represents */
-	tim = rtc_mktime(tmp);
+	tim = rtc_mktime(tm);
 
-	RTC_WRITE_REG(RTC_LR, tim);
+	pl031_write_reg(dev, RTC_LR, tim);
 
-	return -1;
+	return 0;
 }
 
 /*
- * Get the current time from the RTC
+ * Reset the RTC. We set the date back to 1970-01-01.
  */
-int rtc_get(struct rtc_time *tmp)
+static int pl031_reset(struct udevice *dev)
 {
-	ulong tim;
+	pl031_write_reg(dev, RTC_LR, 0);
 
-	if(!pl031_initted)
-		rtc_init();
+	return 0;
+}
 
-	if (tmp == NULL) {
-		puts("Error getting the date/time\n");
-		return -1;
-	}
+static const struct rtc_ops pl031_ops = {
+	.get = pl031_get,
+	.set = pl031_set,
+	.reset = pl031_reset,
+};
 
-	tim = RTC_READ_REG(RTC_DR);
+static const struct udevice_id pl031_ids[] = {
+	{ .compatible = "arm,pl031" },
+	{ }
+};
 
-	rtc_to_tm(tim, tmp);
+static int pl031_ofdata_to_platdata(struct udevice *dev)
+{
+	struct pl031_platdata *pdata = dev_get_platdata(dev);
 
-	debug ( "Get DATE: %4d-%02d-%02d (wday=%d)  TIME: %2d:%02d:%02d\n",
-		tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
-		tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+	pdata->base = dev_read_addr(dev);
 
 	return 0;
 }
 
-#endif
+U_BOOT_DRIVER(rtc_pl031) = {
+	.name	= "rtc-pl031",
+	.id	= UCLASS_RTC,
+	.of_match = pl031_ids,
+	.probe	= pl031_probe,
+	.ofdata_to_platdata = pl031_ofdata_to_platdata,
+	.platdata_auto_alloc_size = sizeof(struct pl031_platdata),
+	.ops	= &pl031_ops,
+};
scripts/config_whitelist.txt +0 -1
index 1219dcc3be..17bd2d681c 100644
@@ -4115,7 +4115,6 @@ CONFIG_SYS_RSTC_RMR_VAL
 CONFIG_SYS_RTC_BUS_NUM
 CONFIG_SYS_RTC_CNT
 CONFIG_SYS_RTC_OSCILLATOR
-CONFIG_SYS_RTC_PL031_BASE
 CONFIG_SYS_RTC_REG_BASE_ADDR
 CONFIG_SYS_RTC_SETUP
 CONFIG_SYS_RV3029_TCR
#10 lore raw

PATCH v3 2/3 rtc: pl031: convert the driver to driver model

Quoted 40 lines · AKASHI Takahiro
Quoted 39 lines · Heinrich Schuchardt
Quoted 38 lines · AKASHI Takahiro
Quoted 37 lines · Heinrich Schuchardt
Quoted 15 lines · AKASHI Takahiro

With this patch, PL031 driver is converted to driver-model-compliant driver. In addition, CONFIG_SYS_RTC_PL031_BASE is no longer valid.

Signed-off-by AKASHI Takahiro <[email protected]>
---
 drivers/rtc/Kconfig          |   6 ++
 drivers/rtc/pl031.c          | 126 ++++++++++++++++++++++-------------
 scripts/config_whitelist.txt |   1 -
 3 files changed, 86 insertions(+), 47 deletions(-)
drivers/rtc/Kconfig +0 -0
index a3f8c8aecc..96c4cce410 100644

drivers/rtc/Kconfig config RTC_MV · line 63

Quoted 9 lines
drivers/rtc/Kconfig +6 -0
@@ -55,6 +55,12 @@ config RTC_MV
 	  Enable Marvell RTC driver. This driver supports the rtc that is present
 	  on some Marvell SoCs.
 
+config RTC_PL031
+	bool "Enable ARM PL031 driver"
+	depends on DM_RTC
+	help
+	  Enable ARM PL031 driver.
+

Tom merged
http://git.denx.de/?p=u-boot.git;a=commit;h=b19886b9469174213877ef37670ce35c55acb456
https://patchwork.ozlabs.org/patch/936533/
ARM: qemu-arm: enable RTC
which is superseeded by your patch series.

We should avoid duplicate entries CONFIG_RTC_PL031.

Symbol CONFIG_SYS_RTC_PL031_BASE can be removed in include/configs/qemu-arm.h with this patch.

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

Could you, please, respin your patch series.

Thank you for this reminder.
While it's nothing much for me to respin my patch, I wonder how maintainers handle coming patches in ML. I submitted my first counterpart patch just a few days after your post in a form of a *reply* to your e-mail. Then your patch was merged and mine was just ignored.

I think https://www.denx.de/wiki/U-Boot/ReleaseCycle is somewhat informative here. We're about a week away from the next release so I am taking some things like typo fixes and documentation updates (and I'm weighing the i.mx PR). But new features aren't going in right now. After the window, big things that are ready can come in, things like this for example. I am hopeful that the various FAT stuff you've been working on can at least be partially brought in. Hope this helps!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180904/f8d2b086/attachment.sig>
#11 lore raw

PATCH v3 2/3 rtc: pl031: convert the driver to driver model

Quoted 36 lines · Tom Rini
Quoted 35 lines · AKASHI Takahiro
Quoted 34 lines · Heinrich Schuchardt
Quoted 33 lines · AKASHI Takahiro
Quoted 32 lines · Heinrich Schuchardt
Quoted 15 lines · AKASHI Takahiro

With this patch, PL031 driver is converted to driver-model-compliant driver. In addition, CONFIG_SYS_RTC_PL031_BASE is no longer valid.

Signed-off-by AKASHI Takahiro <[email protected]>
---
 drivers/rtc/Kconfig          |   6 ++
 drivers/rtc/pl031.c          | 126 ++++++++++++++++++++++-------------
 scripts/config_whitelist.txt |   1 -
 3 files changed, 86 insertions(+), 47 deletions(-)
drivers/rtc/Kconfig +0 -0
index a3f8c8aecc..96c4cce410 100644

drivers/rtc/Kconfig config RTC_MV · line 63

Quoted 9 lines
drivers/rtc/Kconfig +6 -0
@@ -55,6 +55,12 @@ config RTC_MV
 	  Enable Marvell RTC driver. This driver supports the rtc that is present
 	  on some Marvell SoCs.
 
+config RTC_PL031
+	bool "Enable ARM PL031 driver"
+	depends on DM_RTC
+	help
+	  Enable ARM PL031 driver.
+

Tom merged
http://git.denx.de/?p=u-boot.git;a=commit;h=b19886b9469174213877ef37670ce35c55acb456
https://patchwork.ozlabs.org/patch/936533/
ARM: qemu-arm: enable RTC
which is superseeded by your patch series.

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

We should avoid duplicate entries CONFIG_RTC_PL031.

Symbol CONFIG_SYS_RTC_PL031_BASE can be removed in include/configs/qemu-arm.h with this patch.

Could you, please, respin your patch series.

The patch series needs rework as described above (duplicate entries CONFIG_RTC_PL031).

Best regards

Heinrich

Quoted 15 lines
Quoted 6 lines

Thank you for this reminder.
While it's nothing much for me to respin my patch, I wonder how maintainers handle coming patches in ML. I submitted my first counterpart patch just a few days after your post in a form of a *reply* to your e-mail. Then your patch was merged and mine was just ignored.

I think https://www.denx.de/wiki/U-Boot/ReleaseCycle is somewhat informative here. We're about a week away from the next release so I am taking some things like typo fixes and documentation updates (and I'm weighing the i.mx PR). But new features aren't going in right now. After the window, big things that are ready can come in, things like this for example. I am hopeful that the various FAT stuff you've been working on can at least be partially brought in. Hope this helps!

author
#12 lore raw

PATCH v3 3/3 arm: qemu-arm: enable RTC (PL031) by default

In reply to AKASHI Takahiro

Virtual machine provided by qemu-arm has a ARM PL031 Real Time Clock device. With this patch, the driver is enabled by default.

Signed-off-by AKASHI Takahiro <[email protected]>
---
 arch/arm/Kconfig | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/Kconfig +2 -0
index 00b28480b4..b7b1dca289 100644
@@ -714,6 +714,8 @@ config ARCH_QEMU
 	select DM_SERIAL
 	select OF_CONTROL
 	select PL01X_SERIAL
+	imply DM_RTC
+	imply RTC_PL031
 
 config ARCH_RMOBILE
 	bool "Renesas ARM SoCs"
Signature · 1 line
2.17.0