[U-Boot] [PATCH 00/10] dm: timer: x86: 64-bit counter support and tsc timer dm conversion

[U-Boot] [PATCH 00/10] dm: timer: x86: 64-bit counter support and tsc timer dm conversion

[Bin Meng]

This series enhances timer uclass driver to support 64-bit counter
value, and convert tsc timer to driver model to be used by all x86
boards.

As a result of dm conversion, the TSC_CALIBRATION_BYPASS Kconfig
option is no longer needed, and the TSC frequency can be specified
in the board device tree.


Bin Meng (10):
  dm: timer: Fix several nits
  dm: timer: Implement pre_probe()
  timer: altera: Remove the codes to get clock frequency
  dm: timer: Support 64-bit counter
  x86: Reomve MIN_PORT80_KCLOCKS_DELAY
  x86: tsc: Use notrace from <linux/compiler.h>
  x86: tsc: Add driver model timer support
  x86: Convert to use driver model timer
  x86: tsc: Remove legacy timer codes
  x86: tsc: Move tsc_timer.c to drivers/timer

 arch/x86/Kconfig                            |  20 ------
 arch/x86/cpu/baytrail/valleyview.c          |   3 -
 arch/x86/cpu/coreboot/timestamp.c           |  22 ------
 arch/x86/cpu/cpu.c                          |  18 -----
 arch/x86/cpu/efi/efi.c                      |   4 --
 arch/x86/cpu/ivybridge/cpu.c                |   1 -
 arch/x86/cpu/qemu/Kconfig                   |   1 -
 arch/x86/cpu/qemu/qemu.c                    |   3 -
 arch/x86/cpu/quark/Kconfig                  |   5 --
 arch/x86/cpu/quark/quark.c                  |   3 -
 arch/x86/cpu/queensbay/tnc.c                |   3 -
 arch/x86/dts/bayleybay.dts                  |   1 +
 arch/x86/dts/broadwell_som-6896.dts         |   1 +
 arch/x86/dts/chromebook_link.dts            |   1 +
 arch/x86/dts/chromebox_panther.dts          |   1 +
 arch/x86/dts/crownbay.dts                   |   1 +
 arch/x86/dts/efi.dts                        |   5 ++
 arch/x86/dts/galileo.dts                    |   5 ++
 arch/x86/dts/minnowmax.dts                  |   1 +
 arch/x86/dts/qemu-x86_i440fx.dts            |   5 ++
 arch/x86/dts/qemu-x86_q35.dts               |   5 ++
 arch/x86/dts/tsc_timer.dtsi                 |   7 ++
 arch/x86/include/asm/global_data.h          |   3 -
 arch/x86/lib/Makefile                       |   1 -
 configs/bayleybay_defconfig                 |   1 +
 configs/chromebook_link_defconfig           |   2 +-
 configs/chromebox_panther_defconfig         |   2 +-
 configs/coreboot-x86_defconfig              |   3 +-
 configs/crownbay_defconfig                  |   1 +
 configs/efi-x86_defconfig                   |   2 +-
 configs/galileo_defconfig                   |   1 +
 configs/minnowmax_defconfig                 |   1 +
 configs/qemu-x86_defconfig                  |   1 +
 drivers/timer/Kconfig                       |  17 +++--
 drivers/timer/Makefile                      |   1 +
 drivers/timer/altera_timer.c                |   8 +--
 drivers/timer/timer-uclass.c                |  43 ++++++++++--
 {arch/x86/lib => drivers/timer}/tsc_timer.c | 104 ++++++++++++++++------------
 include/configs/x86-common.h                |   2 -
 include/timer.h                             |  17 +++--
 lib/time.c                                  |   9 ++-
 41 files changed, 168 insertions(+), 167 deletions(-)
 create mode 100644 arch/x86/dts/tsc_timer.dtsi
 rename {arch/x86/lib => drivers/timer}/tsc_timer.c (87%)

-- 
1.8.2.1

[U-Boot] [PATCH 01/10] dm: timer: Fix several nits

[Bin Meng]

This changes 'Timer' to 'timer' at several places.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 drivers/timer/Kconfig        | 10 +++++-----
 drivers/timer/timer-uclass.c |  4 ++--
 include/timer.h              | 11 ++++++-----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
index 97c4128..895de38 100644
--- a/drivers/timer/Kconfig
+++ b/drivers/timer/Kconfig
@@ -1,19 +1,19 @@
 menu "Timer Support"
 
 config TIMER
-	bool "Enable Driver Model for Timer drivers"
+	bool "Enable driver model for timer drivers"
 	depends on DM
 	help
-	  Enable driver model for Timer access. It uses the same API as
-	  lib/time.c. But now implemented by the uclass. The first timer
+	  Enable driver model for timer access. It uses the same API as
+	  lib/time.c, but now implemented by the uclass. The first timer
 	  will be used. The timer is usually a 32 bits free-running up
 	  counter. There may be no real tick, and no timer interrupt.
 
 config ALTERA_TIMER
-	bool "Altera Timer support"
+	bool "Altera timer support"
 	depends on TIMER
 	help
-	  Select this to enable an timer for Altera devices. Please find
+	  Select this to enable a timer for Altera devices. Please find
 	  details on the "Embedded Peripherals IP User Guide" of Altera.
 
 endmenu
diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index 12aee5b..82c6897 100644
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -10,10 +10,10 @@
 #include <timer.h>
 
 /*
- * Implement a Timer uclass to work with lib/time.c. The timer is usually
+ * Implement a timer uclass to work with lib/time.c. The timer is usually
  * a 32 bits free-running up counter. The get_rate() method is used to get
  * the input clock frequency of the timer. The get_count() method is used
- * get the current 32 bits count value. If the hardware is counting down,
+ * to get the current 32 bits count value. If the hardware is counting down,
  * the value should be inversed inside the method. There may be no real
  * tick, and no timer interrupt.
  */
diff --git a/include/timer.h b/include/timer.h
index cdf385d..ed5c685 100644
--- a/include/timer.h
+++ b/include/timer.h
@@ -10,30 +10,31 @@
 /*
  * Get the current timer count
  *
- * @dev: The Timer device
+ * @dev: The timer device
  * @count: pointer that returns the current timer count
  * @return: 0 if OK, -ve on error
  */
 int timer_get_count(struct udevice *dev, unsigned long *count);
+
 /*
  * Get the timer input clock frequency
  *
- * @dev: The Timer device
+ * @dev: The timer device
  * @return: the timer input clock frequency
  */
 unsigned long timer_get_rate(struct udevice *dev);
 
 /*
- * struct timer_ops - Driver model Timer operations
+ * struct timer_ops - Driver model timer operations
  *
- * The uclass interface is implemented by all Timer devices which use
+ * The uclass interface is implemented by all timer devices which use
  * driver model.
  */
 struct timer_ops {
 	/*
 	 * Get the current timer count
 	 *
-	 * @dev: The Timer device
+	 * @dev: The timer device
 	 * @count: pointer that returns the current timer count
 	 * @return: 0 if OK, -ve on error
 	 */
-- 
1.8.2.1

[U-Boot] [PATCH 01/10] dm: timer: Fix several nits

[Thomas Chou]

Hi Bin,

On 2015?11?05? 22:02, Bin Meng wrote:
> This changes 'Timer' to 'timer' at several places.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>   drivers/timer/Kconfig        | 10 +++++-----
>   drivers/timer/timer-uclass.c |  4 ++--
>   include/timer.h              | 11 ++++++-----
>   3 files changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
> index 97c4128..895de38 100644
> --- a/drivers/timer/Kconfig
> +++ b/drivers/timer/Kconfig
> @@ -1,19 +1,19 @@
>   menu "Timer Support"
>
>   config TIMER
> -	bool "Enable Driver Model for Timer drivers"
> +	bool "Enable driver model for timer drivers"
>   	depends on DM
>   	help
> -	  Enable driver model for Timer access. It uses the same API as
> -	  lib/time.c. But now implemented by the uclass. The first timer
> +	  Enable driver model for timer access. It uses the same API as
> +	  lib/time.c, but now implemented by the uclass. The first timer
>   	  will be used. The timer is usually a 32 bits free-running up
>   	  counter. There may be no real tick, and no timer interrupt.
>
>   config ALTERA_TIMER
> -	bool "Altera Timer support"
> +	bool "Altera timer support"
>   	depends on TIMER
>   	help
> -	  Select this to enable an timer for Altera devices. Please find
> +	  Select this to enable a timer for Altera devices. Please find
>   	  details on the "Embedded Peripherals IP User Guide" of Altera.
>
>   endmenu
> diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
> index 12aee5b..82c6897 100644
> --- a/drivers/timer/timer-uclass.c
> +++ b/drivers/timer/timer-uclass.c
> @@ -10,10 +10,10 @@
>   #include <timer.h>
>
>   /*
> - * Implement a Timer uclass to work with lib/time.c. The timer is usually
> + * Implement a timer uclass to work with lib/time.c. The timer is usually
>    * a 32 bits free-running up counter. The get_rate() method is used to get
>    * the input clock frequency of the timer. The get_count() method is used
> - * get the current 32 bits count value. If the hardware is counting down,
> + * to get the current 32 bits count value. If the hardware is counting down,
>    * the value should be inversed inside the method. There may be no real
>    * tick, and no timer interrupt.
>    */
> diff --git a/include/timer.h b/include/timer.h
> index cdf385d..ed5c685 100644
> --- a/include/timer.h
> +++ b/include/timer.h
> @@ -10,30 +10,31 @@
>   /*
>    * Get the current timer count
>    *
> - * @dev: The Timer device
> + * @dev: The timer device
>    * @count: pointer that returns the current timer count
>    * @return: 0 if OK, -ve on error
>    */
>   int timer_get_count(struct udevice *dev, unsigned long *count);
> +
>   /*
>    * Get the timer input clock frequency
>    *
> - * @dev: The Timer device
> + * @dev: The timer device
>    * @return: the timer input clock frequency
>    */
>   unsigned long timer_get_rate(struct udevice *dev);
>
>   /*
> - * struct timer_ops - Driver model Timer operations
> + * struct timer_ops - Driver model timer operations
>    *
> - * The uclass interface is implemented by all Timer devices which use
> + * The uclass interface is implemented by all timer devices which use
>    * driver model.
>    */
>   struct timer_ops {
>   	/*
>   	 * Get the current timer count
>   	 *
> -	 * @dev: The Timer device
> +	 * @dev: The timer device
>   	 * @count: pointer that returns the current timer count
>   	 * @return: 0 if OK, -ve on error
>   	 */
>

Thanks. Might need rebase after nios2 timer cleaned up and sandbox timer 
added. Otherwise,

Ack-by: Thomas Chou <thomas@wytron.com.tw>

[U-Boot] [PATCH 01/10] dm: timer: Fix several nits

[Simon Glass]

On 5 November 2015 at 23:59, Thomas Chou <thomas@wytron.com.tw> wrote:
> Hi Bin,
>
>
> On 2015?11?05? 22:02, Bin Meng wrote:
>>
>> This changes 'Timer' to 'timer' at several places.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> ---
>>
>>   drivers/timer/Kconfig        | 10 +++++-----
>>   drivers/timer/timer-uclass.c |  4 ++--
>>   include/timer.h              | 11 ++++++-----
>>   3 files changed, 13 insertions(+), 12 deletions(-)
>>

Reviewed-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH 02/10] dm: timer: Implement pre_probe()

[Bin Meng]

Every timer device needs to have a valid clock frequency and it
can be specified in the device tree. Use pre_probe() to get this
in the timer uclass driver.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 drivers/timer/timer-uclass.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index 82c6897..0218591 100644
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -9,6 +9,8 @@
 #include <errno.h>
 #include <timer.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /*
  * Implement a timer uclass to work with lib/time.c. The timer is usually
  * a 32 bits free-running up counter. The get_rate() method is used to get
@@ -35,8 +37,19 @@ unsigned long timer_get_rate(struct udevice *dev)
 	return uc_priv->clock_rate;
 }
 
+static int timer_pre_probe(struct udevice *dev)
+{
+	struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+
+	uc_priv->clock_rate = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
+					     "clock-frequency", 0);
+
+	return 0;
+}
+
 UCLASS_DRIVER(timer) = {
 	.id		= UCLASS_TIMER,
 	.name		= "timer",
+	.pre_probe	= timer_pre_probe,
 	.per_device_auto_alloc_size = sizeof(struct timer_dev_priv),
 };
-- 
1.8.2.1

[U-Boot] [PATCH 02/10] dm: timer: Implement pre_probe()

[Thomas Chou]

Hi Bin,

On 2015?11?05? 22:02, Bin Meng wrote:
> Every timer device needs to have a valid clock frequency and it
> can be specified in the device tree. Use pre_probe() to get this
> in the timer uclass driver.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>   drivers/timer/timer-uclass.c | 13 +++++++++++++
>   1 file changed, 13 insertions(+)
>
> diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
> index 82c6897..0218591 100644
> --- a/drivers/timer/timer-uclass.c
> +++ b/drivers/timer/timer-uclass.c
> @@ -9,6 +9,8 @@
>   #include <errno.h>
>   #include <timer.h>
>
> +DECLARE_GLOBAL_DATA_PTR;
> +
>   /*
>    * Implement a timer uclass to work with lib/time.c. The timer is usually
>    * a 32 bits free-running up counter. The get_rate() method is used to get
> @@ -35,8 +37,19 @@ unsigned long timer_get_rate(struct udevice *dev)
>   	return uc_priv->clock_rate;
>   }
>
> +static int timer_pre_probe(struct udevice *dev)
> +{
> +	struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
> +
> +	uc_priv->clock_rate = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
> +					     "clock-frequency", 0);
> +
> +	return 0;
> +}
> +
>   UCLASS_DRIVER(timer) = {
>   	.id		= UCLASS_TIMER,
>   	.name		= "timer",
> +	.pre_probe	= timer_pre_probe,
>   	.per_device_auto_alloc_size = sizeof(struct timer_dev_priv),
>   };
>

Acked-by: Thomas Chou <thomas@wytron.com.tw>

[U-Boot] [PATCH 02/10] dm: timer: Implement pre_probe()

[Simon Glass]

On 6 November 2015 at 00:00, Thomas Chou <thomas@wytron.com.tw> wrote:
> Hi Bin,
>
>
> On 2015?11?05? 22:02, Bin Meng wrote:
>>
>> Every timer device needs to have a valid clock frequency and it
>> can be specified in the device tree. Use pre_probe() to get this
>> in the timer uclass driver.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> ---
>>
>>   drivers/timer/timer-uclass.c | 13 +++++++++++++
>>   1 file changed, 13 insertions(+)

Acked-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH 03/10] timer: altera: Remove the codes to get clock frequency

[Bin Meng]

Since we have timer uclass to get clock frequency for us, remove
the custom version in the altera timer driver.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 drivers/timer/altera_timer.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c
index 2ef9ad6..e4d0301 100644
--- a/drivers/timer/altera_timer.c
+++ b/drivers/timer/altera_timer.c
@@ -27,7 +27,6 @@ struct altera_timer_regs {
 
 struct altera_timer_platdata {
 	struct altera_timer_regs *regs;
-	unsigned long clock_rate;
 };
 
 /* control register */
@@ -54,12 +53,9 @@ static int altera_timer_get_count(struct udevice *dev, unsigned long *count)
 
 static int altera_timer_probe(struct udevice *dev)
 {
-	struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
 	struct altera_timer_platdata *plat = dev->platdata;
 	struct altera_timer_regs *const regs = plat->regs;
 
-	uc_priv->clock_rate = plat->clock_rate;
-
 	writel(0, &regs->status);
 	writel(0, &regs->control);
 	writel(ALTERA_TIMER_STOP, &regs->control);
@@ -77,8 +73,6 @@ static int altera_timer_ofdata_to_platdata(struct udevice *dev)
 
 	plat->regs = ioremap(dev_get_addr(dev),
 		sizeof(struct altera_timer_regs));
-	plat->clock_rate = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
-		"clock-frequency", 0);
 
 	return 0;
 }
-- 
1.8.2.1

[U-Boot] [PATCH 03/10] timer: altera: Remove the codes to get clock frequency

[Thomas Chou]

Hi Bin,

On 2015?11?05? 22:02, Bin Meng wrote:
> Since we have timer uclass to get clock frequency for us, remove
> the custom version in the altera timer driver.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>   drivers/timer/altera_timer.c | 6 ------
>   1 file changed, 6 deletions(-)
>
> diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c
> index 2ef9ad6..e4d0301 100644
> --- a/drivers/timer/altera_timer.c
> +++ b/drivers/timer/altera_timer.c
> @@ -27,7 +27,6 @@ struct altera_timer_regs {
>
>   struct altera_timer_platdata {
>   	struct altera_timer_regs *regs;
> -	unsigned long clock_rate;
>   };
>
>   /* control register */
> @@ -54,12 +53,9 @@ static int altera_timer_get_count(struct udevice *dev, unsigned long *count)
>
>   static int altera_timer_probe(struct udevice *dev)
>   {
> -	struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
>   	struct altera_timer_platdata *plat = dev->platdata;
>   	struct altera_timer_regs *const regs = plat->regs;
>
> -	uc_priv->clock_rate = plat->clock_rate;
> -
>   	writel(0, &regs->status);
>   	writel(0, &regs->control);
>   	writel(ALTERA_TIMER_STOP, &regs->control);
> @@ -77,8 +73,6 @@ static int altera_timer_ofdata_to_platdata(struct udevice *dev)
>
>   	plat->regs = ioremap(dev_get_addr(dev),
>   		sizeof(struct altera_timer_regs));
> -	plat->clock_rate = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
> -		"clock-frequency", 0);
>
>   	return 0;
>   }
>

Acked-by: Thomas Chou <thomas@wytron.com.tw>

[U-Boot] [PATCH 03/10] timer: altera: Remove the codes to get clock frequency

[Simon Glass]

On 6 November 2015 at 00:01, Thomas Chou <thomas@wytron.com.tw> wrote:
> Hi Bin,
>
>
> On 2015?11?05? 22:02, Bin Meng wrote:
>>
>> Since we have timer uclass to get clock frequency for us, remove
>> the custom version in the altera timer driver.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> ---
>>
>>   drivers/timer/altera_timer.c | 6 ------
>>   1 file changed, 6 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH 04/10] dm: timer: Support 64-bit counter

[Bin Meng]

There are timers with a 64-bit counter value but current timer
uclass driver assumes a 32-bit one. Introduce a device tree
property "counter-64bit", and modify timer_get_count() in the
timer uclass driver to handle the 32-bit/64-bit conversion
automatically.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 drivers/timer/altera_timer.c |  2 +-
 drivers/timer/timer-uclass.c | 28 ++++++++++++++++++++++++----
 include/timer.h              |  6 ++++--
 lib/time.c                   |  9 ++++++---
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c
index e4d0301..b363b19 100644
--- a/drivers/timer/altera_timer.c
+++ b/drivers/timer/altera_timer.c
@@ -34,7 +34,7 @@ struct altera_timer_platdata {
 #define ALTERA_TIMER_START	(1 << 2)	/* Start timer */
 #define ALTERA_TIMER_STOP	(1 << 3)	/* Stop timer */
 
-static int altera_timer_get_count(struct udevice *dev, unsigned long *count)
+static int altera_timer_get_count(struct udevice *dev, u64 *count)
 {
 	struct altera_timer_platdata *plat = dev->platdata;
 	struct altera_timer_regs *const regs = plat->regs;
diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index 0218591..8451b40 100644
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -13,21 +13,39 @@ DECLARE_GLOBAL_DATA_PTR;
 
 /*
  * Implement a timer uclass to work with lib/time.c. The timer is usually
- * a 32 bits free-running up counter. The get_rate() method is used to get
+ * a 32/64 bits free-running up counter. The get_rate() method is used to get
  * the input clock frequency of the timer. The get_count() method is used
- * to get the current 32 bits count value. If the hardware is counting down,
+ * to get the current 32/64 bits count value. If the hardware is counting down,
  * the value should be inversed inside the method. There may be no real
  * tick, and no timer interrupt.
  */
 
-int timer_get_count(struct udevice *dev, unsigned long *count)
+int timer_get_count(struct udevice *dev, u64 *count)
 {
 	const struct timer_ops *ops = device_get_ops(dev);
+	struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+	u32 now;
+	int ret;
 
 	if (!ops->get_count)
 		return -ENOSYS;
 
-	return ops->get_count(dev, count);
+	if (uc_priv->counter_64) {
+		return ops->get_count(dev, count);
+	} else {
+		ret = ops->get_count(dev, count);
+		if (ret)
+			return ret;
+
+		now = *count;
+		/* increment tbh if tbl has rolled over */
+		if (now < gd->timebase_l)
+			gd->timebase_h++;
+		gd->timebase_l = now;
+		*count = ((u64)gd->timebase_h << 32) | gd->timebase_l;
+
+		return 0;
+	}
 }
 
 unsigned long timer_get_rate(struct udevice *dev)
@@ -43,6 +61,8 @@ static int timer_pre_probe(struct udevice *dev)
 
 	uc_priv->clock_rate = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
 					     "clock-frequency", 0);
+	uc_priv->counter_64 = fdtdec_get_bool(gd->fdt_blob, dev->of_offset,
+					      "counter-64bit");
 
 	return 0;
 }
diff --git a/include/timer.h b/include/timer.h
index ed5c685..4e061ed 100644
--- a/include/timer.h
+++ b/include/timer.h
@@ -14,7 +14,7 @@
  * @count: pointer that returns the current timer count
  * @return: 0 if OK, -ve on error
  */
-int timer_get_count(struct udevice *dev, unsigned long *count);
+int timer_get_count(struct udevice *dev, u64 *count);
 
 /*
  * Get the timer input clock frequency
@@ -38,16 +38,18 @@ struct timer_ops {
 	 * @count: pointer that returns the current timer count
 	 * @return: 0 if OK, -ve on error
 	 */
-	int (*get_count)(struct udevice *dev, unsigned long *count);
+	int (*get_count)(struct udevice *dev, u64 *count);
 };
 
 /*
  * struct timer_dev_priv - information about a device used by the uclass
  *
  * @clock_rate: the timer input clock frequency
+ * @counter_64: the timer counter is a 64-bit value or not
  */
 struct timer_dev_priv {
 	unsigned long clock_rate;
+	bool counter_64;
 };
 
 #endif	/* _TIMER_H_ */
diff --git a/lib/time.c b/lib/time.c
index b001745..f37a662 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -69,9 +69,9 @@ ulong notrace get_tbclk(void)
 	return timer_get_rate(gd->timer);
 }
 
-unsigned long notrace timer_read_counter(void)
+uint64_t notrace get_ticks(void)
 {
-	unsigned long count;
+	u64 count;
 	int ret;
 
 	ret = dm_timer_init();
@@ -84,7 +84,8 @@ unsigned long notrace timer_read_counter(void)
 
 	return count;
 }
-#endif /* CONFIG_TIMER */
+
+#else /* !CONFIG_TIMER */
 
 uint64_t __weak notrace get_ticks(void)
 {
@@ -97,6 +98,8 @@ uint64_t __weak notrace get_ticks(void)
 	return ((uint64_t)gd->timebase_h << 32) | gd->timebase_l;
 }
 
+#endif /* CONFIG_TIMER */
+
 /* Returns time in milliseconds */
 static uint64_t notrace tick_to_time(uint64_t tick)
 {
-- 
1.8.2.1

[U-Boot] [PATCH 04/10] dm: timer: Support 64-bit counter

[Thomas Chou]

Hi Bin,

On 2015?11?05? 22:02, Bin Meng wrote:
> There are timers with a 64-bit counter value but current timer
> uclass driver assumes a 32-bit one. Introduce a device tree
> property "counter-64bit", and modify timer_get_count() in the
> timer uclass driver to handle the 32-bit/64-bit conversion
> automatically.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---

Thanks a lot. I tested patches [1-4] on nios2 boards with "ut time" and 
"sleep". It works fine.

I would suggest that we do not need the additional "counter-64bit" 
property by requiring the timer always return 64 bits count. We can 
provide an inline func to do the 32/64 conversion for all 32 bits timers.

Best regards,
Thomas

[U-Boot] [PATCH 04/10] dm: timer: Support 64-bit counter

[Bin Meng]

Hi Thomas,

On Fri, Nov 6, 2015 at 3:14 PM, Thomas Chou <thomas@wytron.com.tw> wrote:
> Hi Bin,
>
> On 2015?11?05? 22:02, Bin Meng wrote:
>>
>> There are timers with a 64-bit counter value but current timer
>> uclass driver assumes a 32-bit one. Introduce a device tree
>> property "counter-64bit", and modify timer_get_count() in the
>> timer uclass driver to handle the 32-bit/64-bit conversion
>> automatically.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> ---
>
>
> Thanks a lot. I tested patches [1-4] on nios2 boards with "ut time" and
> "sleep". It works fine.
>
> I would suggest that we do not need the additional "counter-64bit" property
> by requiring the timer always return 64 bits count. We can provide an inline
> func to do the 32/64 conversion for all 32 bits timers.
>

Do you mean we move the following codes:

+               /* increment tbh if tbl has rolled over */
+               if (now < gd->timebase_l)
+                       gd->timebase_h++;
+               gd->timebase_l = now;
+               *count = ((u64)gd->timebase_h << 32) | gd->timebase_l;

to an inline function, to have 32-bit timer driver to call this inline
function in their get_count() op?

This looks duplicate to me.

Regards,
Bin

[U-Boot] [PATCH 04/10] dm: timer: Support 64-bit counter

[Thomas Chou]

Hi Bin,

On 2015?11?06? 22:35, Bin Meng wrote:
> Hi Thomas,
>
> On Fri, Nov 6, 2015 at 3:14 PM, Thomas Chou <thomas@wytron.com.tw> wrote:
>> Hi Bin,
>>
>> On 2015?11?05? 22:02, Bin Meng wrote:
>>>
>>> There are timers with a 64-bit counter value but current timer
>>> uclass driver assumes a 32-bit one. Introduce a device tree
>>> property "counter-64bit", and modify timer_get_count() in the
>>> timer uclass driver to handle the 32-bit/64-bit conversion
>>> automatically.
>>>
>>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>>> ---
>>
>>
>> Thanks a lot. I tested patches [1-4] on nios2 boards with "ut time" and
>> "sleep". It works fine.
>>
>> I would suggest that we do not need the additional "counter-64bit" property
>> by requiring the timer always return 64 bits count. We can provide an inline
>> func to do the 32/64 conversion for all 32 bits timers.
>>
>
> Do you mean we move the following codes:
>
> +               /* increment tbh if tbl has rolled over */
> +               if (now < gd->timebase_l)
> +                       gd->timebase_h++;
> +               gd->timebase_l = now;
> +               *count = ((u64)gd->timebase_h << 32) | gd->timebase_l;
>
> to an inline function, to have 32-bit timer driver to call this inline
> function in their get_count() op?
>
> This looks duplicate to me.

Yes. If we want to support 64 bits count, it should be the driver's 
responsibility to return 64 bits count. It would be more natural than 
adding a property to tell the uclass to to the conversion. The 
"duplicate" you mentioned could be an alternative to the "counter-64bit" 
addition. I believe 64 bits hardware counter will become more popular in 
the future.

Best regards,
Thomas

[U-Boot] [PATCH 04/10] dm: timer: Support 64-bit counter

[Bin Meng]

Hi Thomas,

On Sat, Nov 7, 2015 at 6:40 AM, Thomas Chou <thomas@wytron.com.tw> wrote:
> Hi Bin,
>
>
> On 2015?11?06? 22:35, Bin Meng wrote:
>>
>> Hi Thomas,
>>
>> On Fri, Nov 6, 2015 at 3:14 PM, Thomas Chou <thomas@wytron.com.tw> wrote:
>>>
>>> Hi Bin,
>>>
>>> On 2015?11?05? 22:02, Bin Meng wrote:
>>>>
>>>>
>>>> There are timers with a 64-bit counter value but current timer
>>>> uclass driver assumes a 32-bit one. Introduce a device tree
>>>> property "counter-64bit", and modify timer_get_count() in the
>>>> timer uclass driver to handle the 32-bit/64-bit conversion
>>>> automatically.
>>>>
>>>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>>>> ---
>>>
>>>
>>>
>>> Thanks a lot. I tested patches [1-4] on nios2 boards with "ut time" and
>>> "sleep". It works fine.
>>>
>>> I would suggest that we do not need the additional "counter-64bit"
>>> property
>>> by requiring the timer always return 64 bits count. We can provide an
>>> inline
>>> func to do the 32/64 conversion for all 32 bits timers.
>>>
>>
>> Do you mean we move the following codes:
>>
>> +               /* increment tbh if tbl has rolled over */
>> +               if (now < gd->timebase_l)
>> +                       gd->timebase_h++;
>> +               gd->timebase_l = now;
>> +               *count = ((u64)gd->timebase_h << 32) | gd->timebase_l;
>>
>> to an inline function, to have 32-bit timer driver to call this inline
>> function in their get_count() op?
>>
>> This looks duplicate to me.
>
>
> Yes. If we want to support 64 bits count, it should be the driver's
> responsibility to return 64 bits count. It would be more natural than adding
> a property to tell the uclass to to the conversion. The "duplicate" you
> mentioned could be an alternative to the "counter-64bit" addition. I believe
> 64 bits hardware counter will become more popular in the future.
>

OK, will do in v2 and rebase on top of sandbox timer patches.

Regards,
Bin

[U-Boot] [PATCH 05/10] x86: Reomve MIN_PORT80_KCLOCKS_DELAY

[Bin Meng]

This is not referenced anywhere. Remove it, as well as
tsc_base_kclocks and tsc_prev in the global data.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 arch/x86/cpu/cpu.c                 | 18 ------------------
 arch/x86/include/asm/global_data.h |  2 --
 2 files changed, 20 deletions(-)

diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 812c5e4..1707993 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -641,24 +641,6 @@ int cpu_jump_to_64bit(ulong setup_base, ulong target)
 
 void show_boot_progress(int val)
 {
-#if MIN_PORT80_KCLOCKS_DELAY
-	/*
-	 * Scale the time counter reading to avoid using 64 bit arithmetics.
-	 * Can't use get_timer() here becuase it could be not yet
-	 * initialized or even implemented.
-	 */
-	if (!gd->arch.tsc_prev) {
-		gd->arch.tsc_base_kclocks = rdtsc() / 1000;
-		gd->arch.tsc_prev = 0;
-	} else {
-		uint32_t now;
-
-		do {
-			now = rdtsc() / 1000 - gd->arch.tsc_base_kclocks;
-		} while (now < (gd->arch.tsc_prev + MIN_PORT80_KCLOCKS_DELAY));
-		gd->arch.tsc_prev = now;
-	}
-#endif
 	outb(val, POST_PORT);
 }
 
diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
index 35148ab..5966b7c 100644
--- a/arch/x86/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
@@ -54,8 +54,6 @@ struct arch_global_data {
 	uint8_t x86_mask;
 	uint32_t x86_device;
 	uint64_t tsc_base;		/* Initial value returned by rdtsc() */
-	uint32_t tsc_base_kclocks;	/* Initial tsc as a kclocks value */
-	uint32_t tsc_prev;		/* For show_boot_progress() */
 	uint32_t tsc_mhz;		/* TSC frequency in MHz */
 	void *new_fdt;			/* Relocated FDT */
 	uint32_t bist;			/* Built-in self test value */
-- 
1.8.2.1

[U-Boot] [PATCH 05/10] x86: Reomve MIN_PORT80_KCLOCKS_DELAY

[Simon Glass]

On 5 November 2015 at 07:02, Bin Meng <bmeng.cn@gmail.com> wrote:
> This is not referenced anywhere. Remove it, as well as
> tsc_base_kclocks and tsc_prev in the global data.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  arch/x86/cpu/cpu.c                 | 18 ------------------
>  arch/x86/include/asm/global_data.h |  2 --
>  2 files changed, 20 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH 06/10] x86: tsc: Use notrace from <linux/compiler.h>

[Bin Meng]

Replace __attribute__((no_instrument_function)) with notrace from
<linux/compiler.h>.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 arch/x86/lib/tsc_timer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/lib/tsc_timer.c b/arch/x86/lib/tsc_timer.c
index e02b918..5a962ce 100644
--- a/arch/x86/lib/tsc_timer.c
+++ b/arch/x86/lib/tsc_timer.c
@@ -288,7 +288,7 @@ void timer_set_base(u64 base)
  * restart. This yields a free running counter guaranteed to take almost 6
  * years to wrap around even at 100GHz clock rate.
  */
-u64 __attribute__((no_instrument_function)) get_ticks(void)
+u64 notrace get_ticks(void)
 {
 	u64 now_tick = rdtsc();
 
@@ -299,7 +299,7 @@ u64 __attribute__((no_instrument_function)) get_ticks(void)
 }
 
 /* Get the speed of the TSC timer in MHz */
-unsigned __attribute__((no_instrument_function)) long get_tbclk_mhz(void)
+unsigned notrace long get_tbclk_mhz(void)
 {
 	unsigned long fast_calibrate;
 
@@ -337,7 +337,7 @@ ulong get_timer(ulong base)
 	return get_ms_timer() - base;
 }
 
-ulong __attribute__((no_instrument_function)) timer_get_us(void)
+ulong notrace timer_get_us(void)
 {
 	return get_ticks() / get_tbclk_mhz();
 }
-- 
1.8.2.1

[U-Boot] [PATCH 06/10] x86: tsc: Use notrace from <linux/compiler.h>

[Simon Glass]

On 5 November 2015 at 07:02, Bin Meng <bmeng.cn@gmail.com> wrote:
> Replace __attribute__((no_instrument_function)) with notrace from
> <linux/compiler.h>.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  arch/x86/lib/tsc_timer.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH 07/10] x86: tsc: Add driver model timer support

[Bin Meng]

This adds driver model timer support to x86 tsc timer driver.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 arch/x86/lib/tsc_timer.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/arch/x86/lib/tsc_timer.c b/arch/x86/lib/tsc_timer.c
index 5a962ce..0f03cc3 100644
--- a/arch/x86/lib/tsc_timer.c
+++ b/arch/x86/lib/tsc_timer.c
@@ -8,7 +8,9 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <malloc.h>
+#include <timer.h>
 #include <asm/io.h>
 #include <asm/i8254.h>
 #include <asm/ibmpc.h>
@@ -278,6 +280,7 @@ success:
 	return delta / 1000;
 }
 
+#ifndef CONFIG_TIMER
 void timer_set_base(u64 base)
 {
 	gd->arch.tsc_base = base;
@@ -297,10 +300,14 @@ u64 notrace get_ticks(void)
 		panic("No tick base available");
 	return now_tick - gd->arch.tsc_base;
 }
+#endif /* CONFIG_TIMER */
 
 /* Get the speed of the TSC timer in MHz */
 unsigned notrace long get_tbclk_mhz(void)
 {
+#ifdef CONFIG_TIMER
+	return get_tbclk() / 1000000;
+#else
 	unsigned long fast_calibrate;
 
 	if (gd->arch.tsc_mhz)
@@ -320,12 +327,15 @@ unsigned notrace long get_tbclk_mhz(void)
 
 	gd->arch.tsc_mhz = fast_calibrate;
 	return fast_calibrate;
+#endif
 }
 
+#ifndef CONFIG_TIMER
 unsigned long get_tbclk(void)
 {
 	return get_tbclk_mhz() * 1000 * 1000;
 }
+#endif
 
 static ulong get_ms_timer(void)
 {
@@ -375,3 +385,58 @@ int timer_init(void)
 
 	return 0;
 }
+
+#ifdef CONFIG_TIMER
+static int tsc_timer_get_count(struct udevice *dev, u64 *count)
+{
+	u64 now_tick = rdtsc();
+
+	*count = now_tick - gd->arch.tsc_base;
+
+	return 0;
+}
+
+static int tsc_timer_probe(struct udevice *dev)
+{
+	struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+
+	gd->arch.tsc_base = rdtsc();
+
+	/*
+	 * If there is no clock frequency specified in the device tree,
+	 * calibrate it by ourselves.
+	 */
+	if (!uc_priv->clock_rate) {
+		unsigned long fast_calibrate;
+
+		fast_calibrate = try_msr_calibrate_tsc();
+		if (!fast_calibrate) {
+			fast_calibrate = quick_pit_calibrate();
+			if (!fast_calibrate)
+				panic("TSC frequency is ZERO");
+		}
+
+	uc_priv->clock_rate = fast_calibrate * 1000 * 1000;
+	}
+
+	return 0;
+}
+
+static const struct timer_ops tsc_timer_ops = {
+	.get_count = tsc_timer_get_count,
+};
+
+static const struct udevice_id tsc_timer_ids[] = {
+	{ .compatible = "x86,tsc-timer", },
+	{ }
+};
+
+U_BOOT_DRIVER(tsc_timer) = {
+	.name	= "tsc_timer",
+	.id	= UCLASS_TIMER,
+	.of_match = tsc_timer_ids,
+	.probe = tsc_timer_probe,
+	.ops	= &tsc_timer_ops,
+	.flags = DM_FLAG_PRE_RELOC,
+};
+#endif /* CONFIG_TIMER */
-- 
1.8.2.1

[U-Boot] [PATCH 07/10] x86: tsc: Add driver model timer support

[Simon Glass]

On 5 November 2015 at 07:02, Bin Meng <bmeng.cn@gmail.com> wrote:
> This adds driver model timer support to x86 tsc timer driver.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  arch/x86/lib/tsc_timer.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 65 insertions(+)

Acked-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH 08/10] x86: Convert to use driver model timer

[Bin Meng]

Convert all x86 boards to use driver model tsc timer.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 arch/x86/cpu/baytrail/valleyview.c  |  3 ---
 arch/x86/cpu/coreboot/timestamp.c   | 22 ----------------------
 arch/x86/cpu/efi/efi.c              |  4 ----
 arch/x86/cpu/ivybridge/cpu.c        |  1 -
 arch/x86/cpu/qemu/qemu.c            |  3 ---
 arch/x86/cpu/quark/quark.c          |  3 ---
 arch/x86/cpu/queensbay/tnc.c        |  3 ---
 arch/x86/dts/bayleybay.dts          |  1 +
 arch/x86/dts/broadwell_som-6896.dts |  1 +
 arch/x86/dts/chromebook_link.dts    |  1 +
 arch/x86/dts/chromebox_panther.dts  |  1 +
 arch/x86/dts/crownbay.dts           |  1 +
 arch/x86/dts/efi.dts                |  5 +++++
 arch/x86/dts/galileo.dts            |  5 +++++
 arch/x86/dts/minnowmax.dts          |  1 +
 arch/x86/dts/qemu-x86_i440fx.dts    |  5 +++++
 arch/x86/dts/qemu-x86_q35.dts       |  5 +++++
 arch/x86/dts/tsc_timer.dtsi         |  7 +++++++
 configs/bayleybay_defconfig         |  1 +
 configs/chromebook_link_defconfig   |  2 +-
 configs/chromebox_panther_defconfig |  2 +-
 configs/coreboot-x86_defconfig      |  2 +-
 configs/crownbay_defconfig          |  1 +
 configs/efi-x86_defconfig           |  1 +
 configs/galileo_defconfig           |  1 +
 configs/minnowmax_defconfig         |  1 +
 configs/qemu-x86_defconfig          |  1 +
 27 files changed, 42 insertions(+), 42 deletions(-)
 create mode 100644 arch/x86/dts/tsc_timer.dtsi

diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c
index a009c14..9b30451 100644
--- a/arch/x86/cpu/baytrail/valleyview.c
+++ b/arch/x86/cpu/baytrail/valleyview.c
@@ -28,9 +28,6 @@ int arch_cpu_init(void)
 	int ret;
 
 	post_code(POST_CPU_INIT);
-#ifdef CONFIG_SYS_X86_TSC_TIMER
-	timer_set_base(rdtsc());
-#endif
 
 	ret = x86_cpu_init_f();
 	if (ret)
diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c
index 0edee6b..b382795 100644
--- a/arch/x86/cpu/coreboot/timestamp.c
+++ b/arch/x86/cpu/coreboot/timestamp.c
@@ -27,28 +27,6 @@ static struct timestamp_table *ts_table  __attribute__((section(".data")));
 
 void timestamp_init(void)
 {
-#ifdef CONFIG_SYS_X86_TSC_TIMER
-	uint64_t base_time;
-#endif
-
-	ts_table = lib_sysinfo.tstamp_table;
-#ifdef CONFIG_SYS_X86_TSC_TIMER
-	/*
-	 * If coreboot is built with CONFIG_COLLECT_TIMESTAMPS, use the value
-	 * of base_time in coreboot's timestamp table as our timer base,
-	 * otherwise TSC counter value will be used.
-	 *
-	 * Sometimes even coreboot is built with CONFIG_COLLECT_TIMESTAMPS,
-	 * the value of base_time in the timestamp table is still zero, so
-	 * we must exclude this case too (this is currently seen on booting
-	 * coreboot in qemu)
-	 */
-	if (ts_table && ts_table->base_time)
-		base_time = ts_table->base_time;
-	else
-		base_time = rdtsc();
-	timer_set_base(base_time);
-#endif
 	timestamp_add_now(TS_U_BOOT_INITTED);
 }
 
diff --git a/arch/x86/cpu/efi/efi.c b/arch/x86/cpu/efi/efi.c
index 75ba0d4..993ab8d 100644
--- a/arch/x86/cpu/efi/efi.c
+++ b/arch/x86/cpu/efi/efi.c
@@ -10,10 +10,6 @@
 
 int arch_cpu_init(void)
 {
-#ifdef CONFIG_SYS_X86_TSC_TIMER
-	timer_set_base(rdtsc());
-#endif
-
 	return 0;
 }
 
diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c
index 0e6512c..0387444 100644
--- a/arch/x86/cpu/ivybridge/cpu.c
+++ b/arch/x86/cpu/ivybridge/cpu.c
@@ -118,7 +118,6 @@ static void set_spi_speed(void)
 int arch_cpu_init(void)
 {
 	post_code(POST_CPU_INIT);
-	timer_set_base(rdtsc());
 
 	return x86_cpu_init_f();
 }
diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c
index 7c03e02..13e83a1 100644
--- a/arch/x86/cpu/qemu/qemu.c
+++ b/arch/x86/cpu/qemu/qemu.c
@@ -14,9 +14,6 @@ int arch_cpu_init(void)
 	int ret;
 
 	post_code(POST_CPU_INIT);
-#ifdef CONFIG_SYS_X86_TSC_TIMER
-	timer_set_base(rdtsc());
-#endif
 
 	ret = x86_cpu_init_f();
 	if (ret)
diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c
index f737e19..c2bf497 100644
--- a/arch/x86/cpu/quark/quark.c
+++ b/arch/x86/cpu/quark/quark.c
@@ -233,9 +233,6 @@ int arch_cpu_init(void)
 	int ret;
 
 	post_code(POST_CPU_INIT);
-#ifdef CONFIG_SYS_X86_TSC_TIMER
-	timer_set_base(rdtsc());
-#endif
 
 	ret = x86_cpu_init_f();
 	if (ret)
diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c
index 933d189..fb81919 100644
--- a/arch/x86/cpu/queensbay/tnc.c
+++ b/arch/x86/cpu/queensbay/tnc.c
@@ -52,9 +52,6 @@ int arch_cpu_init(void)
 	int ret;
 
 	post_code(POST_CPU_INIT);
-#ifdef CONFIG_SYS_X86_TSC_TIMER
-	timer_set_base(rdtsc());
-#endif
 
 	ret = x86_cpu_init_f();
 	if (ret)
diff --git a/arch/x86/dts/bayleybay.dts b/arch/x86/dts/bayleybay.dts
index 52d0999..f8901c3 100644
--- a/arch/x86/dts/bayleybay.dts
+++ b/arch/x86/dts/bayleybay.dts
@@ -12,6 +12,7 @@
 /include/ "skeleton.dtsi"
 /include/ "serial.dtsi"
 /include/ "rtc.dtsi"
+/include/ "tsc_timer.dtsi"
 
 / {
 	model = "Intel Bayley Bay";
diff --git a/arch/x86/dts/broadwell_som-6896.dts b/arch/x86/dts/broadwell_som-6896.dts
index a6b5d0f..194f0eb 100644
--- a/arch/x86/dts/broadwell_som-6896.dts
+++ b/arch/x86/dts/broadwell_som-6896.dts
@@ -3,6 +3,7 @@
 /include/ "skeleton.dtsi"
 /include/ "serial.dtsi"
 /include/ "rtc.dtsi"
+/include/ "tsc_timer.dtsi"
 
 / {
 	model = "Advantech SOM-6896";
diff --git a/arch/x86/dts/chromebook_link.dts b/arch/x86/dts/chromebook_link.dts
index f27263a..d3e0758 100644
--- a/arch/x86/dts/chromebook_link.dts
+++ b/arch/x86/dts/chromebook_link.dts
@@ -3,6 +3,7 @@
 /include/ "skeleton.dtsi"
 /include/ "serial.dtsi"
 /include/ "rtc.dtsi"
+/include/ "tsc_timer.dtsi"
 
 / {
 	model = "Google Link";
diff --git a/arch/x86/dts/chromebox_panther.dts b/arch/x86/dts/chromebox_panther.dts
index 61e8f2f..4e2b517 100644
--- a/arch/x86/dts/chromebox_panther.dts
+++ b/arch/x86/dts/chromebox_panther.dts
@@ -3,6 +3,7 @@
 /include/ "skeleton.dtsi"
 /include/ "serial.dtsi"
 /include/ "rtc.dtsi"
+/include/ "tsc_timer.dtsi"
 
 / {
 	model = "Google Panther";
diff --git a/arch/x86/dts/crownbay.dts b/arch/x86/dts/crownbay.dts
index 3e354c4..c0a640d 100644
--- a/arch/x86/dts/crownbay.dts
+++ b/arch/x86/dts/crownbay.dts
@@ -11,6 +11,7 @@
 /include/ "skeleton.dtsi"
 /include/ "serial.dtsi"
 /include/ "rtc.dtsi"
+/include/ "tsc_timer.dtsi"
 
 / {
 	model = "Intel Crown Bay";
diff --git a/arch/x86/dts/efi.dts b/arch/x86/dts/efi.dts
index 1f50428..68b42e7 100644
--- a/arch/x86/dts/efi.dts
+++ b/arch/x86/dts/efi.dts
@@ -7,6 +7,7 @@
 /dts-v1/;
 
 /include/ "skeleton.dtsi"
+/include/ "tsc_timer.dtsi"
 
 / {
 	model = "EFI";
@@ -16,6 +17,10 @@
 		stdout-path = &serial;
 	};
 
+	tsc-timer {
+		clock-frequency = <100000000>;
+	};
+
 	serial: serial {
 		compatible = "efi,uart";
 	};
diff --git a/arch/x86/dts/galileo.dts b/arch/x86/dts/galileo.dts
index b49b1f5..2342de7 100644
--- a/arch/x86/dts/galileo.dts
+++ b/arch/x86/dts/galileo.dts
@@ -11,6 +11,7 @@
 
 /include/ "skeleton.dtsi"
 /include/ "rtc.dtsi"
+/include/ "tsc_timer.dtsi"
 
 / {
 	model = "Intel Galileo";
@@ -28,6 +29,10 @@
 		stdout-path = &pciuart0;
 	};
 
+	tsc-timer {
+		clock-frequency = <400000000>;
+	};
+
 	mrc {
 		compatible = "intel,quark-mrc";
 		flags = <MRC_FLAG_SCRAMBLE_EN>;
diff --git a/arch/x86/dts/minnowmax.dts b/arch/x86/dts/minnowmax.dts
index b03f987..bbfd6d4 100644
--- a/arch/x86/dts/minnowmax.dts
+++ b/arch/x86/dts/minnowmax.dts
@@ -12,6 +12,7 @@
 /include/ "skeleton.dtsi"
 /include/ "serial.dtsi"
 /include/ "rtc.dtsi"
+/include/ "tsc_timer.dtsi"
 
 / {
 	model = "Intel Minnowboard Max";
diff --git a/arch/x86/dts/qemu-x86_i440fx.dts b/arch/x86/dts/qemu-x86_i440fx.dts
index fc74cd0..4861b09 100644
--- a/arch/x86/dts/qemu-x86_i440fx.dts
+++ b/arch/x86/dts/qemu-x86_i440fx.dts
@@ -11,6 +11,7 @@
 /include/ "skeleton.dtsi"
 /include/ "serial.dtsi"
 /include/ "rtc.dtsi"
+/include/ "tsc_timer.dtsi"
 
 / {
 	model = "QEMU x86 (I440FX)";
@@ -43,6 +44,10 @@
 		};
 	};
 
+	tsc-timer {
+		clock-frequency = <100000000>;
+	};
+
 	pci {
 		compatible = "pci-x86";
 		#address-cells = <3>;
diff --git a/arch/x86/dts/qemu-x86_q35.dts b/arch/x86/dts/qemu-x86_q35.dts
index 7f16971..ff293fe 100644
--- a/arch/x86/dts/qemu-x86_q35.dts
+++ b/arch/x86/dts/qemu-x86_q35.dts
@@ -21,6 +21,7 @@
 /include/ "skeleton.dtsi"
 /include/ "serial.dtsi"
 /include/ "rtc.dtsi"
+/include/ "tsc_timer.dtsi"
 
 / {
 	model = "QEMU x86 (Q35)";
@@ -54,6 +55,10 @@
 		};
 	};
 
+	tsc-timer {
+		clock-frequency = <100000000>;
+	};
+
 	pci {
 		compatible = "pci-x86";
 		#address-cells = <3>;
diff --git a/arch/x86/dts/tsc_timer.dtsi b/arch/x86/dts/tsc_timer.dtsi
new file mode 100644
index 0000000..d1cc31e
--- /dev/null
+++ b/arch/x86/dts/tsc_timer.dtsi
@@ -0,0 +1,7 @@
+/ {
+	tsc-timer {
+		compatible = "x86,tsc-timer";
+		u-boot,dm-pre-reloc;
+		counter-64bit;
+	};
+};
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index fc40da8..e9abbd0 100644
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -24,6 +24,7 @@ CONFIG_DM_ETH=y
 CONFIG_E1000=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
+CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_VIDEO_VESA=y
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 78a9470..c280478 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -26,7 +26,7 @@ CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
 CONFIG_DEBUG_UART_BOARD_INIT=y
-CONFIG_DM_TPM=y
+CONFIG_TIMER=y
 CONFIG_TPM_TIS_LPC=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 663aab0..fca6e53 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -21,7 +21,7 @@ CONFIG_CROS_EC_LPC=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
-CONFIG_DM_TPM=y
+CONFIG_TIMER=y
 CONFIG_TPM_TIS_LPC=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 438e43b..3f2cff8 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -17,7 +17,7 @@ CONFIG_DM_ETH=y
 CONFIG_E1000=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
-CONFIG_DM_TPM=y
+CONFIG_TIMER=y
 CONFIG_TPM_TIS_LPC=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index d036c05..7ae36b6 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -23,6 +23,7 @@ CONFIG_E1000=y
 CONFIG_PCH_GBE=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
+CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_VIDEO_VESA=y
diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig
index 43fb0c4..fd90739 100644
--- a/configs/efi-x86_defconfig
+++ b/configs/efi-x86_defconfig
@@ -13,4 +13,5 @@ CONFIG_DEBUG_EFI_CONSOLE=y
 CONFIG_DEBUG_UART_BASE=0
 CONFIG_DEBUG_UART_CLOCK=0
 # CONFIG_X86_SERIAL is not set
+CONFIG_TIMER=y
 CONFIG_EFI=y
diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index 1e1ce95..6421e5b 100644
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -18,6 +18,7 @@ CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
+CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index 8f99f0e..ef3b816 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -25,6 +25,7 @@ CONFIG_DM_RTC=y
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
+CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_VIDEO_VESA=y
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index f4cc862..2835e03 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -18,6 +18,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_DM_RTC=y
+CONFIG_TIMER=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
-- 
1.8.2.1

[U-Boot] [PATCH 08/10] x86: Convert to use driver model timer

[Simon Glass]

Hi Bin,

On 5 November 2015 at 06:02, Bin Meng <bmeng.cn@gmail.com> wrote:
> Convert all x86 boards to use driver model tsc timer.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  arch/x86/cpu/baytrail/valleyview.c  |  3 ---
>  arch/x86/cpu/coreboot/timestamp.c   | 22 ----------------------
>  arch/x86/cpu/efi/efi.c              |  4 ----
>  arch/x86/cpu/ivybridge/cpu.c        |  1 -
>  arch/x86/cpu/qemu/qemu.c            |  3 ---
>  arch/x86/cpu/quark/quark.c          |  3 ---
>  arch/x86/cpu/queensbay/tnc.c        |  3 ---
>  arch/x86/dts/bayleybay.dts          |  1 +
>  arch/x86/dts/broadwell_som-6896.dts |  1 +
>  arch/x86/dts/chromebook_link.dts    |  1 +
>  arch/x86/dts/chromebox_panther.dts  |  1 +
>  arch/x86/dts/crownbay.dts           |  1 +
>  arch/x86/dts/efi.dts                |  5 +++++
>  arch/x86/dts/galileo.dts            |  5 +++++
>  arch/x86/dts/minnowmax.dts          |  1 +
>  arch/x86/dts/qemu-x86_i440fx.dts    |  5 +++++
>  arch/x86/dts/qemu-x86_q35.dts       |  5 +++++
>  arch/x86/dts/tsc_timer.dtsi         |  7 +++++++
>  configs/bayleybay_defconfig         |  1 +
>  configs/chromebook_link_defconfig   |  2 +-
>  configs/chromebox_panther_defconfig |  2 +-
>  configs/coreboot-x86_defconfig      |  2 +-
>  configs/crownbay_defconfig          |  1 +
>  configs/efi-x86_defconfig           |  1 +
>  configs/galileo_defconfig           |  1 +
>  configs/minnowmax_defconfig         |  1 +
>  configs/qemu-x86_defconfig          |  1 +
>  27 files changed, 42 insertions(+), 42 deletions(-)
>  create mode 100644 arch/x86/dts/tsc_timer.dtsi
>
> diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c
> index a009c14..9b30451 100644
> --- a/arch/x86/cpu/baytrail/valleyview.c
> +++ b/arch/x86/cpu/baytrail/valleyview.c
> @@ -28,9 +28,6 @@ int arch_cpu_init(void)
>         int ret;
>
>         post_code(POST_CPU_INIT);
> -#ifdef CONFIG_SYS_X86_TSC_TIMER
> -       timer_set_base(rdtsc());
> -#endif
>
>         ret = x86_cpu_init_f();
>         if (ret)
> diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c
> index 0edee6b..b382795 100644
> --- a/arch/x86/cpu/coreboot/timestamp.c
> +++ b/arch/x86/cpu/coreboot/timestamp.c
> @@ -27,28 +27,6 @@ static struct timestamp_table *ts_table  __attribute__((section(".data")));
>
>  void timestamp_init(void)
>  {
> -#ifdef CONFIG_SYS_X86_TSC_TIMER
> -       uint64_t base_time;
> -#endif
> -
> -       ts_table = lib_sysinfo.tstamp_table;
> -#ifdef CONFIG_SYS_X86_TSC_TIMER
> -       /*
> -        * If coreboot is built with CONFIG_COLLECT_TIMESTAMPS, use the value
> -        * of base_time in coreboot's timestamp table as our timer base,
> -        * otherwise TSC counter value will be used.
> -        *
> -        * Sometimes even coreboot is built with CONFIG_COLLECT_TIMESTAMPS,
> -        * the value of base_time in the timestamp table is still zero, so
> -        * we must exclude this case too (this is currently seen on booting
> -        * coreboot in qemu)
> -        */
> -       if (ts_table && ts_table->base_time)
> -               base_time = ts_table->base_time;
> -       else
> -               base_time = rdtsc();
> -       timer_set_base(base_time);
> -#endif

Where does this code end up now? It seems to be deleted.

Regards,
Simon

[U-Boot] [PATCH 08/10] x86: Convert to use driver model timer

[Bin Meng]

Hi Simon,

On Fri, Nov 6, 2015 at 8:08 PM, Simon Glass <sjg@chromium.org> wrote:
> Hi Bin,
>
> On 5 November 2015 at 06:02, Bin Meng <bmeng.cn@gmail.com> wrote:
>> Convert all x86 boards to use driver model tsc timer.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> ---
>>
>>  arch/x86/cpu/baytrail/valleyview.c  |  3 ---
>>  arch/x86/cpu/coreboot/timestamp.c   | 22 ----------------------
>>  arch/x86/cpu/efi/efi.c              |  4 ----
>>  arch/x86/cpu/ivybridge/cpu.c        |  1 -
>>  arch/x86/cpu/qemu/qemu.c            |  3 ---
>>  arch/x86/cpu/quark/quark.c          |  3 ---
>>  arch/x86/cpu/queensbay/tnc.c        |  3 ---
>>  arch/x86/dts/bayleybay.dts          |  1 +
>>  arch/x86/dts/broadwell_som-6896.dts |  1 +
>>  arch/x86/dts/chromebook_link.dts    |  1 +
>>  arch/x86/dts/chromebox_panther.dts  |  1 +
>>  arch/x86/dts/crownbay.dts           |  1 +
>>  arch/x86/dts/efi.dts                |  5 +++++
>>  arch/x86/dts/galileo.dts            |  5 +++++
>>  arch/x86/dts/minnowmax.dts          |  1 +
>>  arch/x86/dts/qemu-x86_i440fx.dts    |  5 +++++
>>  arch/x86/dts/qemu-x86_q35.dts       |  5 +++++
>>  arch/x86/dts/tsc_timer.dtsi         |  7 +++++++
>>  configs/bayleybay_defconfig         |  1 +
>>  configs/chromebook_link_defconfig   |  2 +-
>>  configs/chromebox_panther_defconfig |  2 +-
>>  configs/coreboot-x86_defconfig      |  2 +-
>>  configs/crownbay_defconfig          |  1 +
>>  configs/efi-x86_defconfig           |  1 +
>>  configs/galileo_defconfig           |  1 +
>>  configs/minnowmax_defconfig         |  1 +
>>  configs/qemu-x86_defconfig          |  1 +
>>  27 files changed, 42 insertions(+), 42 deletions(-)
>>  create mode 100644 arch/x86/dts/tsc_timer.dtsi
>>
>> diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c
>> index a009c14..9b30451 100644
>> --- a/arch/x86/cpu/baytrail/valleyview.c
>> +++ b/arch/x86/cpu/baytrail/valleyview.c
>> @@ -28,9 +28,6 @@ int arch_cpu_init(void)
>>         int ret;
>>
>>         post_code(POST_CPU_INIT);
>> -#ifdef CONFIG_SYS_X86_TSC_TIMER
>> -       timer_set_base(rdtsc());
>> -#endif
>>
>>         ret = x86_cpu_init_f();
>>         if (ret)
>> diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c
>> index 0edee6b..b382795 100644
>> --- a/arch/x86/cpu/coreboot/timestamp.c
>> +++ b/arch/x86/cpu/coreboot/timestamp.c
>> @@ -27,28 +27,6 @@ static struct timestamp_table *ts_table  __attribute__((section(".data")));
>>
>>  void timestamp_init(void)
>>  {
>> -#ifdef CONFIG_SYS_X86_TSC_TIMER
>> -       uint64_t base_time;
>> -#endif
>> -
>> -       ts_table = lib_sysinfo.tstamp_table;
>> -#ifdef CONFIG_SYS_X86_TSC_TIMER
>> -       /*
>> -        * If coreboot is built with CONFIG_COLLECT_TIMESTAMPS, use the value
>> -        * of base_time in coreboot's timestamp table as our timer base,
>> -        * otherwise TSC counter value will be used.
>> -        *
>> -        * Sometimes even coreboot is built with CONFIG_COLLECT_TIMESTAMPS,
>> -        * the value of base_time in the timestamp table is still zero, so
>> -        * we must exclude this case too (this is currently seen on booting
>> -        * coreboot in qemu)
>> -        */
>> -       if (ts_table && ts_table->base_time)
>> -               base_time = ts_table->base_time;
>> -       else
>> -               base_time = rdtsc();
>> -       timer_set_base(base_time);
>> -#endif
>
> Where does this code end up now? It seems to be deleted.
>

The TSC base was saved when TSC timer driver is probed. Please see
tsc_timer.c::tsc_timer_probe().

Regards,
Bin

[U-Boot] [PATCH 08/10] x86: Convert to use driver model timer

[Simon Glass]

On 6 November 2015 at 06:28, Bin Meng <bmeng.cn@gmail.com> wrote:
> Hi Simon,
>
> On Fri, Nov 6, 2015 at 8:08 PM, Simon Glass <sjg@chromium.org> wrote:
>> Hi Bin,
>>
>> On 5 November 2015 at 06:02, Bin Meng <bmeng.cn@gmail.com> wrote:
>>> Convert all x86 boards to use driver model tsc timer.
>>>
>>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>>> ---
>>>
>>>  arch/x86/cpu/baytrail/valleyview.c  |  3 ---
>>>  arch/x86/cpu/coreboot/timestamp.c   | 22 ----------------------
>>>  arch/x86/cpu/efi/efi.c              |  4 ----
>>>  arch/x86/cpu/ivybridge/cpu.c        |  1 -
>>>  arch/x86/cpu/qemu/qemu.c            |  3 ---
>>>  arch/x86/cpu/quark/quark.c          |  3 ---
>>>  arch/x86/cpu/queensbay/tnc.c        |  3 ---
>>>  arch/x86/dts/bayleybay.dts          |  1 +
>>>  arch/x86/dts/broadwell_som-6896.dts |  1 +
>>>  arch/x86/dts/chromebook_link.dts    |  1 +
>>>  arch/x86/dts/chromebox_panther.dts  |  1 +
>>>  arch/x86/dts/crownbay.dts           |  1 +
>>>  arch/x86/dts/efi.dts                |  5 +++++
>>>  arch/x86/dts/galileo.dts            |  5 +++++
>>>  arch/x86/dts/minnowmax.dts          |  1 +
>>>  arch/x86/dts/qemu-x86_i440fx.dts    |  5 +++++
>>>  arch/x86/dts/qemu-x86_q35.dts       |  5 +++++
>>>  arch/x86/dts/tsc_timer.dtsi         |  7 +++++++
>>>  configs/bayleybay_defconfig         |  1 +
>>>  configs/chromebook_link_defconfig   |  2 +-
>>>  configs/chromebox_panther_defconfig |  2 +-
>>>  configs/coreboot-x86_defconfig      |  2 +-
>>>  configs/crownbay_defconfig          |  1 +
>>>  configs/efi-x86_defconfig           |  1 +
>>>  configs/galileo_defconfig           |  1 +
>>>  configs/minnowmax_defconfig         |  1 +
>>>  configs/qemu-x86_defconfig          |  1 +
>>>  27 files changed, 42 insertions(+), 42 deletions(-)
>>>  create mode 100644 arch/x86/dts/tsc_timer.dtsi
>>>
>>> diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c
>>> index a009c14..9b30451 100644
>>> --- a/arch/x86/cpu/baytrail/valleyview.c
>>> +++ b/arch/x86/cpu/baytrail/valleyview.c
>>> @@ -28,9 +28,6 @@ int arch_cpu_init(void)
>>>         int ret;
>>>
>>>         post_code(POST_CPU_INIT);
>>> -#ifdef CONFIG_SYS_X86_TSC_TIMER
>>> -       timer_set_base(rdtsc());
>>> -#endif
>>>
>>>         ret = x86_cpu_init_f();
>>>         if (ret)
>>> diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c
>>> index 0edee6b..b382795 100644
>>> --- a/arch/x86/cpu/coreboot/timestamp.c
>>> +++ b/arch/x86/cpu/coreboot/timestamp.c
>>> @@ -27,28 +27,6 @@ static struct timestamp_table *ts_table  __attribute__((section(".data")));
>>>
>>>  void timestamp_init(void)
>>>  {
>>> -#ifdef CONFIG_SYS_X86_TSC_TIMER
>>> -       uint64_t base_time;
>>> -#endif
>>> -
>>> -       ts_table = lib_sysinfo.tstamp_table;
>>> -#ifdef CONFIG_SYS_X86_TSC_TIMER
>>> -       /*
>>> -        * If coreboot is built with CONFIG_COLLECT_TIMESTAMPS, use the value
>>> -        * of base_time in coreboot's timestamp table as our timer base,
>>> -        * otherwise TSC counter value will be used.
>>> -        *
>>> -        * Sometimes even coreboot is built with CONFIG_COLLECT_TIMESTAMPS,
>>> -        * the value of base_time in the timestamp table is still zero, so
>>> -        * we must exclude this case too (this is currently seen on booting
>>> -        * coreboot in qemu)
>>> -        */
>>> -       if (ts_table && ts_table->base_time)
>>> -               base_time = ts_table->base_time;
>>> -       else
>>> -               base_time = rdtsc();
>>> -       timer_set_base(base_time);
>>> -#endif
>>
>> Where does this code end up now? It seems to be deleted.
>>
>
> The TSC base was saved when TSC timer driver is probed. Please see
> tsc_timer.c::tsc_timer_probe().
>

Thanks.

Acked-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH 09/10] x86: tsc: Remove legacy timer codes

[Bin Meng]

Now that we have converted all x86 boards to use driver model timer,
remove these legacy timer codes in the tsc driver.

Note this also removes the TSC_CALIBRATION_BYPASS Kconfig option,
as it is not needed with driver model.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 arch/x86/Kconfig                   | 20 --------------
 arch/x86/cpu/qemu/Kconfig          |  1 -
 arch/x86/cpu/quark/Kconfig         |  5 ----
 arch/x86/include/asm/global_data.h |  1 -
 arch/x86/lib/tsc_timer.c           | 53 --------------------------------------
 configs/coreboot-x86_defconfig     |  1 -
 configs/efi-x86_defconfig          |  1 -
 7 files changed, 82 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 8914be3..fef5601 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -279,26 +279,6 @@ config AP_STACK_SIZE
 	  the memory used by this initialisation process. Typically 4KB is
 	  enough space.
 
-config TSC_CALIBRATION_BYPASS
-	bool "Bypass Time-Stamp Counter (TSC) calibration"
-	default n
-	help
-	  By default U-Boot automatically calibrates Time-Stamp Counter (TSC)
-	  running frequency via Model-Specific Register (MSR) and Programmable
-	  Interval Timer (PIT). If the calibration does not work on your board,
-	  select this option and provide a hardcoded TSC running frequency with
-	  CONFIG_TSC_FREQ_IN_MHZ below.
-
-	  Normally this option should be turned on in a simulation environment
-	  like qemu.
-
-config TSC_FREQ_IN_MHZ
-	int "Time-Stamp Counter (TSC) running frequency in MHz"
-	depends on TSC_CALIBRATION_BYPASS
-	default 1000
-	help
-	  The running frequency in MHz of Time-Stamp Counter (TSC).
-
 config HAVE_VGA_BIOS
 	bool "Add a VGA BIOS image"
 	help
diff --git a/arch/x86/cpu/qemu/Kconfig b/arch/x86/cpu/qemu/Kconfig
index fb775d7..4f98621 100644
--- a/arch/x86/cpu/qemu/Kconfig
+++ b/arch/x86/cpu/qemu/Kconfig
@@ -6,7 +6,6 @@
 
 config QEMU
 	bool
-	select TSC_CALIBRATION_BYPASS
 
 if QEMU
 
diff --git a/arch/x86/cpu/quark/Kconfig b/arch/x86/cpu/quark/Kconfig
index bc961ef..163caac 100644
--- a/arch/x86/cpu/quark/Kconfig
+++ b/arch/x86/cpu/quark/Kconfig
@@ -7,7 +7,6 @@
 config INTEL_QUARK
 	bool
 	select HAVE_RMU
-	select TSC_CALIBRATION_BYPASS
 
 if INTEL_QUARK
 
@@ -119,8 +118,4 @@ config SYS_CAR_SIZE
 	  Space in bytes in eSRAM used as Cache-As-ARM (CAR).
 	  Note this size must not exceed eSRAM's total size.
 
-config TSC_FREQ_IN_MHZ
-	int
-	default 400
-
 endif
diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
index 5966b7c..0ca518c 100644
--- a/arch/x86/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
@@ -54,7 +54,6 @@ struct arch_global_data {
 	uint8_t x86_mask;
 	uint32_t x86_device;
 	uint64_t tsc_base;		/* Initial value returned by rdtsc() */
-	uint32_t tsc_mhz;		/* TSC frequency in MHz */
 	void *new_fdt;			/* Relocated FDT */
 	uint32_t bist;			/* Built-in self test value */
 	enum pei_boot_mode_t pei_boot_mode;
diff --git a/arch/x86/lib/tsc_timer.c b/arch/x86/lib/tsc_timer.c
index 0f03cc3..ab0bec8 100644
--- a/arch/x86/lib/tsc_timer.c
+++ b/arch/x86/lib/tsc_timer.c
@@ -280,63 +280,12 @@ success:
 	return delta / 1000;
 }
 
-#ifndef CONFIG_TIMER
-void timer_set_base(u64 base)
-{
-	gd->arch.tsc_base = base;
-}
-
-/*
- * Get the number of CPU time counter ticks since it was read first time after
- * restart. This yields a free running counter guaranteed to take almost 6
- * years to wrap around even at 100GHz clock rate.
- */
-u64 notrace get_ticks(void)
-{
-	u64 now_tick = rdtsc();
-
-	/* We assume that 0 means the base hasn't been set yet */
-	if (!gd->arch.tsc_base)
-		panic("No tick base available");
-	return now_tick - gd->arch.tsc_base;
-}
-#endif /* CONFIG_TIMER */
-
 /* Get the speed of the TSC timer in MHz */
 unsigned notrace long get_tbclk_mhz(void)
 {
-#ifdef CONFIG_TIMER
 	return get_tbclk() / 1000000;
-#else
-	unsigned long fast_calibrate;
-
-	if (gd->arch.tsc_mhz)
-		return gd->arch.tsc_mhz;
-
-#ifdef CONFIG_TSC_CALIBRATION_BYPASS
-	fast_calibrate = CONFIG_TSC_FREQ_IN_MHZ;
-#else
-	fast_calibrate = try_msr_calibrate_tsc();
-	if (!fast_calibrate) {
-
-		fast_calibrate = quick_pit_calibrate();
-		if (!fast_calibrate)
-			panic("TSC frequency is ZERO");
-	}
-#endif
-
-	gd->arch.tsc_mhz = fast_calibrate;
-	return fast_calibrate;
-#endif
 }
 
-#ifndef CONFIG_TIMER
-unsigned long get_tbclk(void)
-{
-	return get_tbclk_mhz() * 1000 * 1000;
-}
-#endif
-
 static ulong get_ms_timer(void)
 {
 	return (get_ticks() * 1000) / get_tbclk();
@@ -386,7 +335,6 @@ int timer_init(void)
 	return 0;
 }
 
-#ifdef CONFIG_TIMER
 static int tsc_timer_get_count(struct udevice *dev, u64 *count)
 {
 	u64 now_tick = rdtsc();
@@ -439,4 +387,3 @@ U_BOOT_DRIVER(tsc_timer) = {
 	.ops	= &tsc_timer_ops,
 	.flags = DM_FLAG_PRE_RELOC,
 };
-#endif /* CONFIG_TIMER */
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 3f2cff8..6fb38f0 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -1,7 +1,6 @@
 CONFIG_X86=y
 CONFIG_VENDOR_COREBOOT=y
 CONFIG_TARGET_COREBOOT=y
-CONFIG_TSC_CALIBRATION_BYPASS=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig
index fd90739..7354f04 100644
--- a/configs/efi-x86_defconfig
+++ b/configs/efi-x86_defconfig
@@ -2,7 +2,6 @@ CONFIG_X86=y
 CONFIG_VENDOR_EFI=y
 CONFIG_DEFAULT_DEVICE_TREE="efi"
 CONFIG_TARGET_EFI=y
-CONFIG_TSC_CALIBRATION_BYPASS=y
 # CONFIG_CMD_BOOTM is not set
 # CONFIG_CMD_NET is not set
 CONFIG_OF_CONTROL=y
-- 
1.8.2.1

[U-Boot] [PATCH 09/10] x86: tsc: Remove legacy timer codes

[Simon Glass]

On 5 November 2015 at 06:02, Bin Meng <bmeng.cn@gmail.com> wrote:
> Now that we have converted all x86 boards to use driver model timer,
> remove these legacy timer codes in the tsc driver.
>
> Note this also removes the TSC_CALIBRATION_BYPASS Kconfig option,
> as it is not needed with driver model.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  arch/x86/Kconfig                   | 20 --------------
>  arch/x86/cpu/qemu/Kconfig          |  1 -
>  arch/x86/cpu/quark/Kconfig         |  5 ----
>  arch/x86/include/asm/global_data.h |  1 -
>  arch/x86/lib/tsc_timer.c           | 53 --------------------------------------
>  configs/coreboot-x86_defconfig     |  1 -
>  configs/efi-x86_defconfig          |  1 -
>  7 files changed, 82 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH 10/10] x86: tsc: Move tsc_timer.c to drivers/timer

[Bin Meng]

To group all dm timer drivers together, move tsc timer to
drivers/timer directory.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

---

 arch/x86/lib/Makefile                       | 1 -
 drivers/timer/Kconfig                       | 7 +++++++
 drivers/timer/Makefile                      | 1 +
 {arch/x86/lib => drivers/timer}/tsc_timer.c | 0
 include/configs/x86-common.h                | 2 --
 5 files changed, 8 insertions(+), 3 deletions(-)
 rename {arch/x86/lib => drivers/timer}/tsc_timer.c (100%)

diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index d676e2c..cd5ecb6 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -34,7 +34,6 @@ obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += smbios.o
 obj-y	+= string.o
 obj-$(CONFIG_GENERATE_ACPI_TABLE) += acpi_table.o
 obj-y	+= tables.o
-obj-$(CONFIG_SYS_X86_TSC_TIMER)	+= tsc_timer.o
 obj-$(CONFIG_CMD_ZBOOT)	+= zimage.o
 obj-$(CONFIG_HAVE_FSP) += fsp/
 
diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
index 895de38..570d479 100644
--- a/drivers/timer/Kconfig
+++ b/drivers/timer/Kconfig
@@ -16,4 +16,11 @@ config ALTERA_TIMER
 	  Select this to enable a timer for Altera devices. Please find
 	  details on the "Embedded Peripherals IP User Guide" of Altera.
 
+config X86_TSC_TIMER
+	bool "x86 Time-Stamp Counter (TSC) timer support"
+	depends on TIMER && X86
+	default y if X86
+	help
+	  Select this to enable Time-Stamp Counter (TSC) timer for x86.
+
 endmenu
diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile
index ae66c07..882c89a 100644
--- a/drivers/timer/Makefile
+++ b/drivers/timer/Makefile
@@ -6,3 +6,4 @@
 
 obj-$(CONFIG_TIMER)		+= timer-uclass.o
 obj-$(CONFIG_ALTERA_TIMER)	+= altera_timer.o
+obj-$(CONFIG_X86_TSC_TIMER)	+= tsc_timer.o
diff --git a/arch/x86/lib/tsc_timer.c b/drivers/timer/tsc_timer.c
similarity index 100%
rename from arch/x86/lib/tsc_timer.c
rename to drivers/timer/tsc_timer.c
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index ab9fa0b..7c3b673 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -154,8 +154,6 @@
  * CPU Features
  */
 
-#define CONFIG_SYS_X86_TSC_TIMER
-
 #define CONFIG_SYS_STACK_SIZE			(32 * 1024)
 #define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MALLOC_LEN			0x200000
-- 
1.8.2.1

[U-Boot] [PATCH 10/10] x86: tsc: Move tsc_timer.c to drivers/timer

[Simon Glass]

On 5 November 2015 at 06:02, Bin Meng <bmeng.cn@gmail.com> wrote:
> To group all dm timer drivers together, move tsc timer to
> drivers/timer directory.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>
> ---
>
>  arch/x86/lib/Makefile                       | 1 -
>  drivers/timer/Kconfig                       | 7 +++++++
>  drivers/timer/Makefile                      | 1 +
>  {arch/x86/lib => drivers/timer}/tsc_timer.c | 0
>  include/configs/x86-common.h                | 2 --
>  5 files changed, 8 insertions(+), 3 deletions(-)
>  rename {arch/x86/lib => drivers/timer}/tsc_timer.c (100%)

Acked-by: Simon Glass <sjg@chromium.org>