Skip to contentSkip to conversation

timer: mchp-pit64b: add support for pit64b

PATCH New Claudiu Beznea 3 participants 9 messages Sep 7, 2020 – Oct 8, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 timer: mchp-pit64b: add support for pit64b

Add support for Microchip PIT64B timer. The timer is 64 bit length and is used as a free running counter (in continuous mode with highest values for period registers). The clock feeding the timer would be no more than 12.5MHz.

---
 drivers/timer/Kconfig             |   7 +++
 drivers/timer/Makefile            |   1 +
 drivers/timer/mchp-pit64b-timer.c | 109 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 117 insertions(+)
 create mode 100644 drivers/timer/mchp-pit64b-timer.c
drivers/timer/Kconfig +7 -0
index 5f4bc6edb67b..13a98be4ab92 100644
@@ -181,4 +181,11 @@ config MTK_TIMER
 	  Select this to enable support for the timer found on
 	  MediaTek devices.
 
+config MCHP_PIT64B_TIMER
+	bool "Microchip 64-bit periodic interval timer support"
+	depends on TIMER
+	help
+	  Select this to enable support for Microchip 64-bit periodic
+	  interval timer.
+
 endmenu
drivers/timer/Makefile +1 -0
index fa35bea6c5b2..4744a8d9c93c 100644
@@ -21,3 +21,4 @@ obj-$(CONFIG_STI_TIMER)		+= sti-timer.o
 obj-$(CONFIG_STM32_TIMER)	+= stm32_timer.o
 obj-$(CONFIG_X86_TSC_TIMER)	+= tsc_timer.o
 obj-$(CONFIG_MTK_TIMER)		+= mtk_timer.o
+obj-$(CONFIG_MCHP_PIT64B_TIMER)	+= mchp-pit64b-timer.o
drivers/timer/mchp-pit64b-timer.c new file +109 -0

109 lines not on this page · raw message

Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 timer: mchp-pit64b: add support for pit64b

Quoted 7 lines · Claudiu Beznea

Add support for Microchip PIT64B timer. The timer is 64 bit length and is used as a free running counter (in continuous mode with highest values for period registers). The clock feeding the timer would be no more than 12.5MHz.

---

Hi Claudiu,

To make CI/CD scripts happy, this new driver needs a MAINTAINERS entry

Thanks !
Eugen

#2 lore raw

PATCH 1/1 timer: mchp-pit64b: add support for pit64b

Hi Eugen,

Quoted 6 lines · On 22.09.2020 11:32, Eugen Hristev - M18282 wrote:
Quoted 5 lines · Claudiu Beznea

Add support for Microchip PIT64B timer. The timer is 64 bit length and is used as a free running counter (in continuous mode with highest values for period registers). The clock feeding the timer would be no more than 12.5MHz.

Quoted 6 lines
Quoted 2 lines

---

Hi Claudiu,

To make CI/CD scripts happy, this new driver needs a MAINTAINERS entry

Would you like me to create a new entry or add the file under the ARM MICROCHIP/ATMEL AT91 hood?

Thank you,
Claudiu Beznea

Quoted 4 lines

Thanks !
Eugen

#3 lore raw

PATCH 1/1 timer: mchp-pit64b: add support for pit64b

Quoted 12 lines · On 22.09.2020 13:49, Claudiu Beznea - M18063 wrote:

Hi Eugen,

Quoted 9 lines · On 22.09.2020 11:32, Eugen Hristev - M18282 wrote:
Quoted 7 lines · Claudiu Beznea

Add support for Microchip PIT64B timer. The timer is 64 bit length and is used as a free running counter (in continuous mode with highest values for period registers). The clock feeding the timer would be no more than 12.5MHz.

---

Quoted 6 lines
Quoted 3 lines

Hi Claudiu,

To make CI/CD scripts happy, this new driver needs a MAINTAINERS entry

Would you like me to create a new entry or add the file under the ARM MICROCHIP/ATMEL AT91 hood?

I am fine with both solutions, but I think one separate entry will be better.

Eugen

Quoted 7 lines

Thank you,
Claudiu Beznea

Quoted 3 lines

Thanks !
Eugen

#4 lore raw

PATCH 1/1 MAINTAINERS: add Microchip PIT64B timer

Add Microchip PIT64B timer.

---

Hi Eugen,

I chosed to have it under AT91 hood to not create an entry only for this driver as there are mostly architecture/subsystem related entries in MAINTAINERS file.

Thank you,
Claudiu Beznea

 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
index 438fb225ab0f..f0af12adb034 100644
@@ -257,6 +257,7 @@ T:	git https://gitlab.denx.de/u-boot/custodians/u-boot-atmel.git
 F:	arch/arm/mach-at91/
 F:	board/atmel/
 F:	drivers/misc/microchip_flexcom.c
+F:	drivers/timer/mchp-pit64b-timer.c
 
 ARM OWL
 M:	Manivannan Sadhasivam <[email protected]>
Signature · 1 line
2.7.4
#5 lore raw

PATCH 1/1 MAINTAINERS: add Microchip PIT64B timer

Quoted 5 lines · Claudiu Beznea

Add Microchip PIT64B timer.

---

Quoted 9 lines

Hi Eugen,

I chosed to have it under AT91 hood to not create an entry only for this driver as there are mostly architecture/subsystem related entries in MAINTAINERS file.

Thank you,
Claudiu Beznea

Applied to u-boot-atmel/next , thanks !

#6 lore raw

PATCH 1/1 timer: mchp-pit64b: add support for pit64b

In reply to Claudiu.Beznea at microchip.com
Quoted 14 lines · On 22.09.2020 13:49, Claudiu Beznea - M18063 wrote:

Hi Eugen,

Quoted 11 lines · On 22.09.2020 11:32, Eugen Hristev - M18282 wrote:
Quoted 7 lines · Claudiu Beznea

Add support for Microchip PIT64B timer. The timer is 64 bit length and is used as a free running counter (in continuous mode with highest values for period registers). The clock feeding the timer would be no more than 12.5MHz.

---

Hi Claudiu,

Quoted 11 lines
Quoted 1 line

To make CI/CD scripts happy, this new driver needs a MAINTAINERS entry

Would you like me to create a new entry or add the file under the ARM MICROCHIP/ATMEL AT91 hood?

Thank you,
Claudiu Beznea

Quoted 3 lines

Thanks !
Eugen

Applied to u-boot-atmel/next , thanks !

#7 lore raw

PATCH 1/1 timer: mchp-pit64b: add support for pit64b

In reply to Claudiu Beznea
Quoted 69 lines · Claudiu Beznea

Add support for Microchip PIT64B timer. The timer is 64 bit length and is used as a free running counter (in continuous mode with highest values for period registers). The clock feeding the timer would be no more than 12.5MHz.

---
 drivers/timer/Kconfig             |   7 +++
 drivers/timer/Makefile            |   1 +
 drivers/timer/mchp-pit64b-timer.c | 109 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 117 insertions(+)
 create mode 100644 drivers/timer/mchp-pit64b-timer.c
drivers/timer/Kconfig +7 -0
index 5f4bc6edb67b..13a98be4ab92 100644
@@ -181,4 +181,11 @@ config MTK_TIMER
 	  Select this to enable support for the timer found on
 	  MediaTek devices.
 
+config MCHP_PIT64B_TIMER
+	bool "Microchip 64-bit periodic interval timer support"
+	depends on TIMER
+	help
+	  Select this to enable support for Microchip 64-bit periodic
+	  interval timer.
+
 endmenu
drivers/timer/Makefile +1 -0
index fa35bea6c5b2..4744a8d9c93c 100644
@@ -21,3 +21,4 @@ obj-$(CONFIG_STI_TIMER)		+= sti-timer.o
 obj-$(CONFIG_STM32_TIMER)	+= stm32_timer.o
 obj-$(CONFIG_X86_TSC_TIMER)	+= tsc_timer.o
 obj-$(CONFIG_MTK_TIMER)		+= mtk_timer.o
+obj-$(CONFIG_MCHP_PIT64B_TIMER)	+= mchp-pit64b-timer.o
drivers/timer/mchp-pit64b-timer.c new file +25 -0
new file mode 100644
index 000000000000..ead8c9b84ad5
@@ -0,0 +1,109 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * 64-bit Periodic Interval Timer driver
+ *
+ * Copyright (C) 2020 Microchip Technology Inc. and its subsidiaries
+ *
+ * Author: Claudiu Beznea <[email protected]>
+ */
+
+#include <common.h>
+#include <clk.h>
+#include <dm.h>
+#include <timer.h>
+#include <asm/io.h>
+
+#define MCHP_PIT64B_CR			0x00	/* Control Register */
+#define		MCHP_PIT64B_CR_START	BIT(0)
+#define		MCHP_PIT64B_CR_SWRST	BIT(8)
+#define MCHP_PIT64B_MR			0x04	/* Mode Register */
+#define		MCHP_PIT64B_MR_CONT	BIT(0)
+#define MCHP_PIT64B_LSB_PR		0x08	/* LSB Period Register */
+#define MCHP_PIT64B_MSB_PR		0x0C	/* MSB Period Register */
+#define MCHP_PIT64B_TLSBR		0x20	/* Timer LSB Register */
+#define MCHP_PIT64B_TMSBR		0x24	/* Timer MSB Register */
+

drivers/timer/mchp-pit64b-timer.c line 35

Quoted 10 lines
drivers/timer/mchp-pit64b-timer.c new file +10 -0
+struct mchp_pit64b_priv {
+	void __iomem *base;
+};
+
+static int mchp_pit64b_get_count(struct udevice *dev, u64 *count)
+{
+	struct mchp_pit64b_priv *priv = dev_get_priv(dev);
+
+	u32 lsb = readl(priv->base + MCHP_PIT64B_TLSBR);
+	u32 msb = readl(priv->base + MCHP_PIT64B_TMSBR);

Is there a chance of rollover here? E.g. lets say the 64-bit counter is 0x0000_0000_FFFF_FFFF when we read lsb, but it increments to 0x0000_0001_0000_0000 when we read msb. Then the next time we read the timer, it will look like we jumped backward in time.

One way to get around this is by doing something like

	do {
		msb = readl(priv->base + MCHP_PIT64B_TMSBR);
		lsb = readl(priv->base + MCHP_PIT64B_TLSBR);
	} while (msb != readl(priv->base + MCHP_PIT64B_TMSBR));

That way, if we ever roll-over between the two reads, we just redo the lsb read. This is the method used by drivers/timer/riscv_timer.c on 32-bit systems.

--Sean

Quoted 75 lines
drivers/timer/mchp-pit64b-timer.c new file +74 -0
+
+	*count = ((u64)msb << 32) | lsb;
+
+	return 0;
+}
+
+static int mchp_pit64b_probe(struct udevice *dev)
+{
+	struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+	struct mchp_pit64b_priv *priv = dev_get_priv(dev);
+	struct clk clk;
+	ulong rate;
+	int ret;
+
+	priv->base = dev_read_addr_ptr(dev);
+	if (IS_ERR(priv->base))
+		return PTR_ERR(priv->base);
+
+	ret = clk_get_by_index(dev, 0, &clk);
+	if (ret)
+		return ret;
+
+	ret = clk_enable(&clk);
+	if (ret)
+		return ret;
+
+	rate = clk_get_rate(&clk);
+	if (!rate) {
+		clk_disable(&clk);
+		return -ENOTSUPP;
+	}
+
+	/* Reset the timer in case it was used by previous bootloaders. */
+	writel(MCHP_PIT64B_CR_SWRST, priv->base + MCHP_PIT64B_CR);
+
+	/*
+	 * Use highest prescaller (for a peripheral clock running at 200MHz
+	 * this will lead to the timer running at 12.5MHz) and continuous mode.
+	 */
+	writel((15 << 8) | MCHP_PIT64B_MR_CONT, priv->base + MCHP_PIT64B_MR);
+	uc_priv->clock_rate = rate / 16;
+
+	/*
+	 * Simulate free running counter by setting max values to period
+	 * registers.
+	 */
+	writel(~0UL, priv->base + MCHP_PIT64B_MSB_PR);
+	writel(~0UL, priv->base + MCHP_PIT64B_LSB_PR);
+
+	/* Start the timer. */
+	writel(MCHP_PIT64B_CR_START, priv->base + MCHP_PIT64B_CR);
+
+	return 0;
+}
+
+static const struct timer_ops mchp_pit64b_ops = {
+	.get_count = mchp_pit64b_get_count,
+};
+
+static const struct udevice_id mchp_pit64b_ids[] = {
+	{ .compatible = "microchip,sam9x60-pit64b", },
+	{ .compatible = "microchip,sama7g5-pit64b", },
+	{ }
+};
+
+U_BOOT_DRIVER(mchp_pit64b) = {
+	.name	= "mchp-pit64b",
+	.id	= UCLASS_TIMER,
+	.of_match = mchp_pit64b_ids,
+	.priv_auto_alloc_size = sizeof(struct mchp_pit64b_priv),
+	.probe	= mchp_pit64b_probe,
+	.ops	= &mchp_pit64b_ops,
+	.flags	= DM_FLAG_PRE_RELOC,
+};
#8 lore raw

PATCH 1/1 timer: mchp-pit64b: add support for pit64b

Quoted 79 lines · Sean Anderson

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

Quoted 76 lines · Claudiu Beznea

Add support for Microchip PIT64B timer. The timer is 64 bit length and is used as a free running counter (in continuous mode with highest values for period registers). The clock feeding the timer would be no more than 12.5MHz.

---
 drivers/timer/Kconfig             |   7 +++
 drivers/timer/Makefile            |   1 +
 drivers/timer/mchp-pit64b-timer.c | 109 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 117 insertions(+)
 create mode 100644 drivers/timer/mchp-pit64b-timer.c
drivers/timer/Kconfig +7 -0
index 5f4bc6edb67b..13a98be4ab92 100644
@@ -181,4 +181,11 @@ config MTK_TIMER
        Select this to enable support for the timer found on
        MediaTek devices.
 
+config MCHP_PIT64B_TIMER
+     bool "Microchip 64-bit periodic interval timer support"
+     depends on TIMER
+     help
+       Select this to enable support for Microchip 64-bit periodic
+       interval timer.
+
 endmenu
drivers/timer/Makefile +1 -0
index fa35bea6c5b2..4744a8d9c93c 100644
@@ -21,3 +21,4 @@ obj-$(CONFIG_STI_TIMER)             += sti-timer.o
 obj-$(CONFIG_STM32_TIMER)    += stm32_timer.o
 obj-$(CONFIG_X86_TSC_TIMER)  += tsc_timer.o
 obj-$(CONFIG_MTK_TIMER)              += mtk_timer.o
+obj-$(CONFIG_MCHP_PIT64B_TIMER)      += mchp-pit64b-timer.o
drivers/timer/mchp-pit64b-timer.c new file +32 -0
new file mode 100644
index 000000000000..ead8c9b84ad5
@@ -0,0 +1,109 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * 64-bit Periodic Interval Timer driver
+ *
+ * Copyright (C) 2020 Microchip Technology Inc. and its subsidiaries
+ *
+ * Author: Claudiu Beznea <[email protected]>
+ */
+
+#include <common.h>
+#include <clk.h>
+#include <dm.h>
+#include <timer.h>
+#include <asm/io.h>
+
+#define MCHP_PIT64B_CR                       0x00    /* Control Register */
+#define              MCHP_PIT64B_CR_START    BIT(0)
+#define              MCHP_PIT64B_CR_SWRST    BIT(8)
+#define MCHP_PIT64B_MR                       0x04    /* Mode Register */
+#define              MCHP_PIT64B_MR_CONT     BIT(0)
+#define MCHP_PIT64B_LSB_PR           0x08    /* LSB Period Register */
+#define MCHP_PIT64B_MSB_PR           0x0C    /* MSB Period Register */
+#define MCHP_PIT64B_TLSBR            0x20    /* Timer LSB Register */
+#define MCHP_PIT64B_TMSBR            0x24    /* Timer MSB Register */
+
+struct mchp_pit64b_priv {
+     void __iomem *base;
+};
+
+static int mchp_pit64b_get_count(struct udevice *dev, u64 *count)
+{
+     struct mchp_pit64b_priv *priv = dev_get_priv(dev);
Quoted 8 lines

drivers/timer/mchp-pit64b-timer.c line 35

Quoted 3 lines
drivers/timer/mchp-pit64b-timer.c new file +3 -0
+
+     u32 lsb = readl(priv->base + MCHP_PIT64B_TLSBR);
+     u32 msb = readl(priv->base + MCHP_PIT64B_TMSBR);

Is there a chance of rollover here? E.g. lets say the 64-bit counter is 0x0000_0000_FFFF_FFFF when we read lsb, but it increments to 0x0000_0001_0000_0000 when we read msb. Then the next time we read the timer, it will look like we jumped backward in time.

This should not happen as the hardware takes care of it as follows:
when using a 64 bit period TLSB must be read first, followed by the read of TMSB. This sequence generates an atomic read of the 64 bit timer value whatever the lapse of time between the accesses.

Thank you,
Claudiu Beznea

Quoted 90 lines

One way to get around this is by doing something like

        do {
                msb = readl(priv->base + MCHP_PIT64B_TMSBR);
                lsb = readl(priv->base + MCHP_PIT64B_TLSBR);
        } while (msb != readl(priv->base + MCHP_PIT64B_TMSBR));

That way, if we ever roll-over between the two reads, we just redo the lsb read. This is the method used by drivers/timer/riscv_timer.c on 32-bit systems.

--Sean

Quoted 75 lines
drivers/timer/mchp-pit64b-timer.c new file +74 -0
+
+     *count = ((u64)msb << 32) | lsb;
+
+     return 0;
+}
+
+static int mchp_pit64b_probe(struct udevice *dev)
+{
+     struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+     struct mchp_pit64b_priv *priv = dev_get_priv(dev);
+     struct clk clk;
+     ulong rate;
+     int ret;
+
+     priv->base = dev_read_addr_ptr(dev);
+     if (IS_ERR(priv->base))
+             return PTR_ERR(priv->base);
+
+     ret = clk_get_by_index(dev, 0, &clk);
+     if (ret)
+             return ret;
+
+     ret = clk_enable(&clk);
+     if (ret)
+             return ret;
+
+     rate = clk_get_rate(&clk);
+     if (!rate) {
+             clk_disable(&clk);
+             return -ENOTSUPP;
+     }
+
+     /* Reset the timer in case it was used by previous bootloaders. */
+     writel(MCHP_PIT64B_CR_SWRST, priv->base + MCHP_PIT64B_CR);
+
+     /*
+      * Use highest prescaller (for a peripheral clock running at 200MHz
+      * this will lead to the timer running at 12.5MHz) and continuous mode.
+      */
+     writel((15 << 8) | MCHP_PIT64B_MR_CONT, priv->base + MCHP_PIT64B_MR);
+     uc_priv->clock_rate = rate / 16;
+
+     /*
+      * Simulate free running counter by setting max values to period
+      * registers.
+      */
+     writel(~0UL, priv->base + MCHP_PIT64B_MSB_PR);
+     writel(~0UL, priv->base + MCHP_PIT64B_LSB_PR);
+
+     /* Start the timer. */
+     writel(MCHP_PIT64B_CR_START, priv->base + MCHP_PIT64B_CR);
+
+     return 0;
+}
+
+static const struct timer_ops mchp_pit64b_ops = {
+     .get_count = mchp_pit64b_get_count,
+};
+
+static const struct udevice_id mchp_pit64b_ids[] = {
+     { .compatible = "microchip,sam9x60-pit64b", },
+     { .compatible = "microchip,sama7g5-pit64b", },
+     { }
+};
+
+U_BOOT_DRIVER(mchp_pit64b) = {
+     .name   = "mchp-pit64b",
+     .id     = UCLASS_TIMER,
+     .of_match = mchp_pit64b_ids,
+     .priv_auto_alloc_size = sizeof(struct mchp_pit64b_priv),
+     .probe  = mchp_pit64b_probe,
+     .ops    = &mchp_pit64b_ops,
+     .flags  = DM_FLAG_PRE_RELOC,
+};