[PATCH v3 1/3] x86/tsc_msr: Use named struct initializers

[PATCH v3 1/3] x86/tsc_msr: Use named struct initializers

[Hans de Goede]

Use named struct initializers for the freq_desc struct-s initialization
and change the "u8 msr_plat" to a "bool use_msr_plat" to make its meaning
more clear instead of relying on a comment to explain it.

Cc: stable@vger.kernel.org
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 arch/x86/kernel/tsc_msr.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/arch/x86/kernel/tsc_msr.c b/arch/x86/kernel/tsc_msr.c
index e0cbe4f2af49..5fa41ac3feb1 100644
--- a/arch/x86/kernel/tsc_msr.c
+++ b/arch/x86/kernel/tsc_msr.c
@@ -22,10 +22,10 @@
  * read in MSR_PLATFORM_ID[12:8], otherwise in MSR_PERF_STAT[44:40].
  * Unfortunately some Intel Atom SoCs aren't quite compliant to this,
  * so we need manually differentiate SoC families. This is what the
- * field msr_plat does.
+ * field use_msr_plat does.
  */
 struct freq_desc {
-	u8 msr_plat;	/* 1: use MSR_PLATFORM_INFO, 0: MSR_IA32_PERF_STATUS */
+	bool use_msr_plat;
 	u32 freqs[MAX_NUM_FREQS];
 };
 
@@ -35,31 +35,39 @@ struct freq_desc {
  * by MSR based on SDM.
  */
 static const struct freq_desc freq_desc_pnw = {
-	0, { 0, 0, 0, 0, 0, 99840, 0, 83200 }
+	.use_msr_plat = false,
+	.freqs = { 0, 0, 0, 0, 0, 99840, 0, 83200 },
 };
 
 static const struct freq_desc freq_desc_clv = {
-	0, { 0, 133200, 0, 0, 0, 99840, 0, 83200 }
+	.use_msr_plat = false,
+	.freqs = { 0, 133200, 0, 0, 0, 99840, 0, 83200 },
 };
 
 static const struct freq_desc freq_desc_byt = {
-	1, { 83300, 100000, 133300, 116700, 80000, 0, 0, 0 }
+	.use_msr_plat = true,
+	.freqs = { 83300, 100000, 133300, 116700, 80000, 0, 0, 0 },
 };
 
 static const struct freq_desc freq_desc_cht = {
-	1, { 83300, 100000, 133300, 116700, 80000, 93300, 90000, 88900, 87500 }
+	.use_msr_plat = true,
+	.freqs = { 83300, 100000, 133300, 116700, 80000, 93300, 90000,
+		   88900, 87500 },
 };
 
 static const struct freq_desc freq_desc_tng = {
-	1, { 0, 100000, 133300, 0, 0, 0, 0, 0 }
+	.use_msr_plat = true,
+	.freqs = { 0, 100000, 133300, 0, 0, 0, 0, 0 },
 };
 
 static const struct freq_desc freq_desc_ann = {
-	1, { 83300, 100000, 133300, 100000, 0, 0, 0, 0 }
+	.use_msr_plat = true,
+	.freqs = { 83300, 100000, 133300, 100000, 0, 0, 0, 0 },
 };
 
 static const struct freq_desc freq_desc_lgm = {
-	1, { 78000, 78000, 78000, 78000, 78000, 78000, 78000, 78000 }
+	.use_msr_plat = true,
+	.freqs = { 78000, 78000, 78000, 78000, 78000, 78000, 78000, 78000 },
 };
 
 static const struct x86_cpu_id tsc_msr_cpu_ids[] = {
@@ -91,7 +99,7 @@ unsigned long cpu_khz_from_msr(void)
 		return 0;
 
 	freq_desc = (struct freq_desc *)id->driver_data;
-	if (freq_desc->msr_plat) {
+	if (freq_desc->use_msr_plat) {
 		rdmsr(MSR_PLATFORM_INFO, lo, hi);
 		ratio = (lo >> 8) & 0xff;
 	} else {
-- 
2.25.0

[PATCH v3 2/3] x86/tsc_msr: Fix MSR_FSB_FREQ mask for Cherry Trail devices

[Hans de Goede]

According to the "Intel 64 and IA-32 Architectures Software Developer’s
Manual Volume 4: Model-Specific Registers" on Cherry Trail (Airmont)
devices the 4 lowest bits of the MSR_FSB_FREQ mask indicate the bus freq
unlike on e.g. Bay Trail where only the lowest 3 bits are used.

This is also the reason why MAX_NUM_FREQS is defined as 9, since
Cherry Trail SoCs have 9 possible frequencies, so we need to mask
the lo value from the MSR with 0x0f, not with 0x07 otherwise the
9th frequency will get interpreted as the 1st.

This commits bumps MAX_NUM_FREQS to 16 to avoid any possibility of
addressing the array out of bounds and makes the mask part of
the cpufreq struct so that we can set it per model.

While at it also log an error when the index points to an uninitialized
part of the freqs lookup-table.

Cc: stable@vger.kernel.org
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 arch/x86/kernel/tsc_msr.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/tsc_msr.c b/arch/x86/kernel/tsc_msr.c
index 5fa41ac3feb1..95030895fffa 100644
--- a/arch/x86/kernel/tsc_msr.c
+++ b/arch/x86/kernel/tsc_msr.c
@@ -15,7 +15,7 @@
 #include <asm/param.h>
 #include <asm/tsc.h>
 
-#define MAX_NUM_FREQS	9
+#define MAX_NUM_FREQS	16 /* 4 bits to select the frequency */
 
 /*
  * If MSR_PERF_STAT[31] is set, the maximum resolved bus ratio can be
@@ -27,6 +27,7 @@
 struct freq_desc {
 	bool use_msr_plat;
 	u32 freqs[MAX_NUM_FREQS];
+	u32 mask;
 };
 
 /*
@@ -37,37 +38,44 @@ struct freq_desc {
 static const struct freq_desc freq_desc_pnw = {
 	.use_msr_plat = false,
 	.freqs = { 0, 0, 0, 0, 0, 99840, 0, 83200 },
+	.mask = 0x07,
 };
 
 static const struct freq_desc freq_desc_clv = {
 	.use_msr_plat = false,
 	.freqs = { 0, 133200, 0, 0, 0, 99840, 0, 83200 },
+	.mask = 0x07,
 };
 
 static const struct freq_desc freq_desc_byt = {
 	.use_msr_plat = true,
 	.freqs = { 83300, 100000, 133300, 116700, 80000, 0, 0, 0 },
+	.mask = 0x07,
 };
 
 static const struct freq_desc freq_desc_cht = {
 	.use_msr_plat = true,
 	.freqs = { 83300, 100000, 133300, 116700, 80000, 93300, 90000,
 		   88900, 87500 },
+	.mask = 0x0f,
 };
 
 static const struct freq_desc freq_desc_tng = {
 	.use_msr_plat = true,
 	.freqs = { 0, 100000, 133300, 0, 0, 0, 0, 0 },
+	.mask = 0x07,
 };
 
 static const struct freq_desc freq_desc_ann = {
 	.use_msr_plat = true,
 	.freqs = { 83300, 100000, 133300, 100000, 0, 0, 0, 0 },
+	.mask = 0x0f,
 };
 
 static const struct freq_desc freq_desc_lgm = {
 	.use_msr_plat = true,
 	.freqs = { 78000, 78000, 78000, 78000, 78000, 78000, 78000, 78000 },
+	.mask = 0x0f,
 };
 
 static const struct x86_cpu_id tsc_msr_cpu_ids[] = {
@@ -93,6 +101,7 @@ unsigned long cpu_khz_from_msr(void)
 	const struct freq_desc *freq_desc;
 	const struct x86_cpu_id *id;
 	unsigned long res;
+	int index;
 
 	id = x86_match_cpu(tsc_msr_cpu_ids);
 	if (!id)
@@ -109,13 +118,17 @@ unsigned long cpu_khz_from_msr(void)
 
 	/* Get FSB FREQ ID */
 	rdmsr(MSR_FSB_FREQ, lo, hi);
+	index = lo & freq_desc->mask;
 
 	/* Map CPU reference clock freq ID(0-7) to CPU reference clock freq(KHz) */
-	freq = freq_desc->freqs[lo & 0x7];
+	freq = freq_desc->freqs[index];
 
 	/* TSC frequency = maximum resolved freq * maximum resolved bus ratio */
 	res = freq * ratio;
 
+	if (freq == 0)
+		pr_err("Error MSR_FSB_FREQ index %d is unknown\n", index);
+
 #ifdef CONFIG_X86_LOCAL_APIC
 	lapic_timer_period = (freq * 1000) / HZ;
 #endif
-- 
2.25.0

[PATCH v3 3/3] x86/tsc_msr: Make MSR derived TSC frequency more accurate

[Hans de Goede]

The "Intel 64 and IA-32 Architectures Software Developer’s Manual
Volume 4: Model-Specific Registers" has the following table for the
values from freq_desc_byt:

   000B: 083.3 MHz
   001B: 100.0 MHz
   010B: 133.3 MHz
   011B: 116.7 MHz
   100B: 080.0 MHz

Notice how for e.g the 83.3 MHz value there are 3 significant digits,
which translates to an accuracy of a 1000 ppm, where as your typical
crystal oscillator is 20 - 100 ppm, so the accuracy of the frequency
format used in the Software Developer’s Manual is not really helpful.

As far as we know Bay Trail SoCs use a 25 MHz crystal and Cherry Trail
uses a 19.2 MHz crystal, the crystal is the source clk for a root PLL
which outputs 1600 and 100 MHz. It is unclear if the root PLL outputs are
used directly by the CPU clock PLL or if there is another PLL in between.

This does not matter though, we can model the chain of PLLs as a single
PLL with a quotient equal to the quotients of all PLLs in the chain
multiplied.

So we can create a simplified model of the CPU clock setup using a
reference clock of 100 MHz plus a quotient which gets us as close to the
frequency from the SDM as possible.

For the 83.3 MHz example from above this would give us 100 MHz * 5 / 6 =
83 and 1/3 MHz, which matches exactly what has been measured on actual hw.

This commit makes the tsc_msr.c code use a simplified PLL model with a
reference clock of 100 MHz for all Bay and Cherry Trail models.

This has been tested on the following models:

              CPU freq before:        CPU freq after this commit:
Intel N2840   2165.800 MHz            2166.667 MHz
Intel Z3736   1332.800 MHz            1333.333 MHz
Intel Z3775   1466.300 MHz            1466.667 MHz
Intel Z8350   1440.000 MHz            1440.000 MHz
Intel Z8750   1600.000 MHz            1600.000 MHz

This fixes the time drifting by about 1 second per hour (20 - 30 seconds
per day) on (some) devices which rely on the tsc_msr.c code to determine
the TSC frequency.

Cc: stable@vger.kernel.org
Reported-by: Vipul Kumar <vipulk0511@gmail.com>
Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
Changes in v2:
-s/DSM/SDM/
-Do not refer to Merrifield / Moorefield as BYT / CHT, they only share the
 CPU core design and otherwise are significantly different

Changes in v3:
-Some code style tweaks and variable renames suggested by Andy Shevchenko
---
 arch/x86/kernel/tsc_msr.c | 92 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 82 insertions(+), 10 deletions(-)

diff --git a/arch/x86/kernel/tsc_msr.c b/arch/x86/kernel/tsc_msr.c
index 95030895fffa..fbd8afe0ab56 100644
--- a/arch/x86/kernel/tsc_msr.c
+++ b/arch/x86/kernel/tsc_msr.c
@@ -17,6 +17,23 @@
 
 #define MAX_NUM_FREQS	16 /* 4 bits to select the frequency */
 
+/*
+ * The frequency numbers in the SDM are e.g. 83.3 MHz, which does not contain a
+ * lot of accuracy which leads to clock drift. As far as we know Bay Trail SoCs
+ * use a 25 MHz crystal and Cherry Trail uses a 19.2 MHz crystal, the crystal
+ * is the source clk for a root PLL which outputs 1600 and 100 MHz. It is
+ * unclear if the root PLL outputs are used directly by the CPU clock PLL or
+ * if there is another PLL in between.
+ * This does not matter though, we can model the chain of PLLs as a single PLL
+ * with a quotient equal to the quotients of all PLLs in the chain multiplied.
+ * So we can create a simplified model of the CPU clock setup using a reference
+ * clock of 100 MHz plus a quotient which gets us as close to the frequency
+ * from the SDM as possible.
+ * For the 83.3 MHz example from above this would give us 100 MHz * 5 / 6 =
+ * 83 and 1/3 MHz, which matches exactly what has been measured on actual hw.
+ */
+#define TSC_REFERENCE_KHZ 100000
+
 /*
  * If MSR_PERF_STAT[31] is set, the maximum resolved bus ratio can be
  * read in MSR_PLATFORM_ID[12:8], otherwise in MSR_PERF_STAT[44:40].
@@ -26,6 +43,14 @@
  */
 struct freq_desc {
 	bool use_msr_plat;
+	struct {
+		u32 multiplier;
+		u32 divider;
+	} muldiv[MAX_NUM_FREQS];
+	/*
+	 * Some CPU frequencies in the SDM do not map to known PLL freqs, in
+	 * that case the muldiv arrays is empty and the freqs array is used.
+	 */
 	u32 freqs[MAX_NUM_FREQS];
 	u32 mask;
 };
@@ -47,31 +72,66 @@ static const struct freq_desc freq_desc_clv = {
 	.mask = 0x07,
 };
 
+/*
+ * Bay Trail SDM MSR_FSB_FREQ frequencies simplified PLL model:
+ *  000:   100 *  5 /  6  =  83.3333 MHz
+ *  001:   100 *  1 /  1  = 100.0000 MHz
+ *  010:   100 *  4 /  3  = 133.3333 MHz
+ *  011:   100 *  7 /  6  = 116.6667 MHz
+ *  100:   100 *  4 /  5  =  80.0000 MHz
+ */
 static const struct freq_desc freq_desc_byt = {
 	.use_msr_plat = true,
-	.freqs = { 83300, 100000, 133300, 116700, 80000, 0, 0, 0 },
+	.muldiv = { { 5, 6 }, { 1, 1 }, { 4, 3 }, { 7, 6 },
+		    { 4, 5 } },
 	.mask = 0x07,
 };
 
+/*
+ * Cherry Trail SDM MSR_FSB_FREQ frequencies simplified PLL model:
+ * 0000:   100 *  5 /  6  =  83.3333 MHz
+ * 0001:   100 *  1 /  1  = 100.0000 MHz
+ * 0010:   100 *  4 /  3  = 133.3333 MHz
+ * 0011:   100 *  7 /  6  = 116.6667 MHz
+ * 0100:   100 *  4 /  5  =  80.0000 MHz
+ * 0101:   100 * 14 / 15  =  93.3333 MHz
+ * 0110:   100 *  9 / 10  =  90.0000 MHz
+ * 0111:   100 *  8 /  9  =  88.8889 MHz
+ * 1000:   100 *  7 /  8  =  87.5000 MHz
+ */
 static const struct freq_desc freq_desc_cht = {
 	.use_msr_plat = true,
-	.freqs = { 83300, 100000, 133300, 116700, 80000, 93300, 90000,
-		   88900, 87500 },
+	.muldiv = { { 5, 6 }, {  1,  1 }, { 4,  3 }, { 7, 6 },
+		    { 4, 5 }, { 14, 15 }, { 9, 10 }, { 8, 9 },
+		    { 7, 8 } },
 	.mask = 0x0f,
 };
 
+/*
+ * Merriefield SDM MSR_FSB_FREQ frequencies simplified PLL model:
+ * 0001:   100 *  1 /  1  = 100.0000 MHz
+ * 0010:   100 *  4 /  3  = 133.3333 MHz
+ */
 static const struct freq_desc freq_desc_tng = {
 	.use_msr_plat = true,
-	.freqs = { 0, 100000, 133300, 0, 0, 0, 0, 0 },
+	.muldiv = { { 0, 0 }, { 1, 1 }, { 4, 3 } },
 	.mask = 0x07,
 };
 
+/*
+ * Moorefield SDM MSR_FSB_FREQ frequencies simplified PLL model:
+ * 0000:   100 *  5 /  6  =  83.3333 MHz
+ * 0001:   100 *  1 /  1  = 100.0000 MHz
+ * 0010:   100 *  4 /  3  = 133.3333 MHz
+ * 0011:   100 *  1 /  1  = 100.0000 MHz
+ */
 static const struct freq_desc freq_desc_ann = {
 	.use_msr_plat = true,
-	.freqs = { 83300, 100000, 133300, 100000, 0, 0, 0, 0 },
+	.muldiv = { { 5, 6 }, { 1, 1 }, { 4, 3 }, { 1, 1 } },
 	.mask = 0x0f,
 };
 
+/* 24 MHz crystal? : 24 * 13 / 4 = 78 MHz */
 static const struct freq_desc freq_desc_lgm = {
 	.use_msr_plat = true,
 	.freqs = { 78000, 78000, 78000, 78000, 78000, 78000, 78000, 78000 },
@@ -120,11 +180,23 @@ unsigned long cpu_khz_from_msr(void)
 	rdmsr(MSR_FSB_FREQ, lo, hi);
 	index = lo & freq_desc->mask;
 
-	/* Map CPU reference clock freq ID(0-7) to CPU reference clock freq(KHz) */
-	freq = freq_desc->freqs[index];
-
-	/* TSC frequency = maximum resolved freq * maximum resolved bus ratio */
-	res = freq * ratio;
+	/*
+	 * Note this also catches cases where the index points to an unpopulated
+	 * part of muldiv, in that case the else will set freq and res to 0.
+	 */
+	if (freq_desc->muldiv[index].divider) {
+		freq = DIV_ROUND_CLOSEST(TSC_REFERENCE_KHZ *
+					   freq_desc->muldiv[index].multiplier,
+					 freq_desc->muldiv[index].divider);
+		/* Multiply by ratio before the divide for better accuracy */
+		res = DIV_ROUND_CLOSEST(TSC_REFERENCE_KHZ *
+					   freq_desc->muldiv[index].multiplier *
+					   ratio,
+					freq_desc->muldiv[index].divider);
+	} else {
+		freq = freq_desc->freqs[index];
+		res = freq * ratio;
+	}
 
 	if (freq == 0)
 		pr_err("Error MSR_FSB_FREQ index %d is unknown\n", index);
-- 
2.25.0

Re: [PATCH v3 3/3] x86/tsc_msr: Make MSR derived TSC frequency more accurate

[Andy Shevchenko]

On Fri, Feb 7, 2020 at 10:55 PM Hans de Goede <hdegoede@redhat.com> wrote:
>
> The "Intel 64 and IA-32 Architectures Software Developer’s Manual
> Volume 4: Model-Specific Registers" has the following table for the
> values from freq_desc_byt:

For the LGM people in Cc list. Hans included you in order to confirm
what's going on with TSC on LGM SoC.
Can you do it in a way that we certainly know clocks with good
precision (and if Spread Spectrum is in use what should we put here)?

Tony, by the way, do you have any information about the rest?

>    000B: 083.3 MHz
>    001B: 100.0 MHz
>    010B: 133.3 MHz
>    011B: 116.7 MHz
>    100B: 080.0 MHz
>
> Notice how for e.g the 83.3 MHz value there are 3 significant digits,
> which translates to an accuracy of a 1000 ppm, where as your typical
> crystal oscillator is 20 - 100 ppm, so the accuracy of the frequency
> format used in the Software Developer’s Manual is not really helpful.
>
> As far as we know Bay Trail SoCs use a 25 MHz crystal and Cherry Trail
> uses a 19.2 MHz crystal, the crystal is the source clk for a root PLL
> which outputs 1600 and 100 MHz. It is unclear if the root PLL outputs are
> used directly by the CPU clock PLL or if there is another PLL in between.
>
> This does not matter though, we can model the chain of PLLs as a single
> PLL with a quotient equal to the quotients of all PLLs in the chain
> multiplied.
>
> So we can create a simplified model of the CPU clock setup using a
> reference clock of 100 MHz plus a quotient which gets us as close to the
> frequency from the SDM as possible.
>
> For the 83.3 MHz example from above this would give us 100 MHz * 5 / 6 =
> 83 and 1/3 MHz, which matches exactly what has been measured on actual hw.
>
> This commit makes the tsc_msr.c code use a simplified PLL model with a
> reference clock of 100 MHz for all Bay and Cherry Trail models.
>
> This has been tested on the following models:
>
>               CPU freq before:        CPU freq after this commit:
> Intel N2840   2165.800 MHz            2166.667 MHz
> Intel Z3736   1332.800 MHz            1333.333 MHz
> Intel Z3775   1466.300 MHz            1466.667 MHz
> Intel Z8350   1440.000 MHz            1440.000 MHz
> Intel Z8750   1600.000 MHz            1600.000 MHz
>
> This fixes the time drifting by about 1 second per hour (20 - 30 seconds
> per day) on (some) devices which rely on the tsc_msr.c code to determine
> the TSC frequency.
>
> Cc: stable@vger.kernel.org
> Reported-by: Vipul Kumar <vipulk0511@gmail.com>
> Suggested-by: Thomas Gleixner <tglx@linutronix.de>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> Changes in v2:
> -s/DSM/SDM/
> -Do not refer to Merrifield / Moorefield as BYT / CHT, they only share the
>  CPU core design and otherwise are significantly different
>
> Changes in v3:
> -Some code style tweaks and variable renames suggested by Andy Shevchenko
> ---
>  arch/x86/kernel/tsc_msr.c | 92 ++++++++++++++++++++++++++++++++++-----
>  1 file changed, 82 insertions(+), 10 deletions(-)
>
> diff --git a/arch/x86/kernel/tsc_msr.c b/arch/x86/kernel/tsc_msr.c
> index 95030895fffa..fbd8afe0ab56 100644
> --- a/arch/x86/kernel/tsc_msr.c
> +++ b/arch/x86/kernel/tsc_msr.c
> @@ -17,6 +17,23 @@
>
>  #define MAX_NUM_FREQS  16 /* 4 bits to select the frequency */
>
> +/*
> + * The frequency numbers in the SDM are e.g. 83.3 MHz, which does not contain a
> + * lot of accuracy which leads to clock drift. As far as we know Bay Trail SoCs
> + * use a 25 MHz crystal and Cherry Trail uses a 19.2 MHz crystal, the crystal
> + * is the source clk for a root PLL which outputs 1600 and 100 MHz. It is
> + * unclear if the root PLL outputs are used directly by the CPU clock PLL or
> + * if there is another PLL in between.
> + * This does not matter though, we can model the chain of PLLs as a single PLL
> + * with a quotient equal to the quotients of all PLLs in the chain multiplied.
> + * So we can create a simplified model of the CPU clock setup using a reference
> + * clock of 100 MHz plus a quotient which gets us as close to the frequency
> + * from the SDM as possible.
> + * For the 83.3 MHz example from above this would give us 100 MHz * 5 / 6 =
> + * 83 and 1/3 MHz, which matches exactly what has been measured on actual hw.
> + */
> +#define TSC_REFERENCE_KHZ 100000
> +
>  /*
>   * If MSR_PERF_STAT[31] is set, the maximum resolved bus ratio can be
>   * read in MSR_PLATFORM_ID[12:8], otherwise in MSR_PERF_STAT[44:40].
> @@ -26,6 +43,14 @@
>   */
>  struct freq_desc {
>         bool use_msr_plat;
> +       struct {
> +               u32 multiplier;
> +               u32 divider;
> +       } muldiv[MAX_NUM_FREQS];
> +       /*
> +        * Some CPU frequencies in the SDM do not map to known PLL freqs, in
> +        * that case the muldiv arrays is empty and the freqs array is used.
> +        */
>         u32 freqs[MAX_NUM_FREQS];
>         u32 mask;
>  };
> @@ -47,31 +72,66 @@ static const struct freq_desc freq_desc_clv = {
>         .mask = 0x07,
>  };
>
> +/*
> + * Bay Trail SDM MSR_FSB_FREQ frequencies simplified PLL model:
> + *  000:   100 *  5 /  6  =  83.3333 MHz
> + *  001:   100 *  1 /  1  = 100.0000 MHz
> + *  010:   100 *  4 /  3  = 133.3333 MHz
> + *  011:   100 *  7 /  6  = 116.6667 MHz
> + *  100:   100 *  4 /  5  =  80.0000 MHz
> + */
>  static const struct freq_desc freq_desc_byt = {
>         .use_msr_plat = true,
> -       .freqs = { 83300, 100000, 133300, 116700, 80000, 0, 0, 0 },
> +       .muldiv = { { 5, 6 }, { 1, 1 }, { 4, 3 }, { 7, 6 },
> +                   { 4, 5 } },
>         .mask = 0x07,
>  };
>
> +/*
> + * Cherry Trail SDM MSR_FSB_FREQ frequencies simplified PLL model:
> + * 0000:   100 *  5 /  6  =  83.3333 MHz
> + * 0001:   100 *  1 /  1  = 100.0000 MHz
> + * 0010:   100 *  4 /  3  = 133.3333 MHz
> + * 0011:   100 *  7 /  6  = 116.6667 MHz
> + * 0100:   100 *  4 /  5  =  80.0000 MHz
> + * 0101:   100 * 14 / 15  =  93.3333 MHz
> + * 0110:   100 *  9 / 10  =  90.0000 MHz
> + * 0111:   100 *  8 /  9  =  88.8889 MHz
> + * 1000:   100 *  7 /  8  =  87.5000 MHz
> + */
>  static const struct freq_desc freq_desc_cht = {
>         .use_msr_plat = true,
> -       .freqs = { 83300, 100000, 133300, 116700, 80000, 93300, 90000,
> -                  88900, 87500 },
> +       .muldiv = { { 5, 6 }, {  1,  1 }, { 4,  3 }, { 7, 6 },
> +                   { 4, 5 }, { 14, 15 }, { 9, 10 }, { 8, 9 },
> +                   { 7, 8 } },
>         .mask = 0x0f,
>  };
>
> +/*
> + * Merriefield SDM MSR_FSB_FREQ frequencies simplified PLL model:
> + * 0001:   100 *  1 /  1  = 100.0000 MHz
> + * 0010:   100 *  4 /  3  = 133.3333 MHz
> + */
>  static const struct freq_desc freq_desc_tng = {
>         .use_msr_plat = true,
> -       .freqs = { 0, 100000, 133300, 0, 0, 0, 0, 0 },
> +       .muldiv = { { 0, 0 }, { 1, 1 }, { 4, 3 } },
>         .mask = 0x07,
>  };
>
> +/*
> + * Moorefield SDM MSR_FSB_FREQ frequencies simplified PLL model:
> + * 0000:   100 *  5 /  6  =  83.3333 MHz
> + * 0001:   100 *  1 /  1  = 100.0000 MHz
> + * 0010:   100 *  4 /  3  = 133.3333 MHz
> + * 0011:   100 *  1 /  1  = 100.0000 MHz
> + */
>  static const struct freq_desc freq_desc_ann = {
>         .use_msr_plat = true,
> -       .freqs = { 83300, 100000, 133300, 100000, 0, 0, 0, 0 },
> +       .muldiv = { { 5, 6 }, { 1, 1 }, { 4, 3 }, { 1, 1 } },
>         .mask = 0x0f,
>  };
>
> +/* 24 MHz crystal? : 24 * 13 / 4 = 78 MHz */
>  static const struct freq_desc freq_desc_lgm = {
>         .use_msr_plat = true,
>         .freqs = { 78000, 78000, 78000, 78000, 78000, 78000, 78000, 78000 },
> @@ -120,11 +180,23 @@ unsigned long cpu_khz_from_msr(void)
>         rdmsr(MSR_FSB_FREQ, lo, hi);
>         index = lo & freq_desc->mask;
>
> -       /* Map CPU reference clock freq ID(0-7) to CPU reference clock freq(KHz) */
> -       freq = freq_desc->freqs[index];
> -
> -       /* TSC frequency = maximum resolved freq * maximum resolved bus ratio */
> -       res = freq * ratio;
> +       /*
> +        * Note this also catches cases where the index points to an unpopulated
> +        * part of muldiv, in that case the else will set freq and res to 0.
> +        */
> +       if (freq_desc->muldiv[index].divider) {
> +               freq = DIV_ROUND_CLOSEST(TSC_REFERENCE_KHZ *
> +                                          freq_desc->muldiv[index].multiplier,
> +                                        freq_desc->muldiv[index].divider);
> +               /* Multiply by ratio before the divide for better accuracy */
> +               res = DIV_ROUND_CLOSEST(TSC_REFERENCE_KHZ *
> +                                          freq_desc->muldiv[index].multiplier *
> +                                          ratio,
> +                                       freq_desc->muldiv[index].divider);
> +       } else {
> +               freq = freq_desc->freqs[index];
> +               res = freq * ratio;
> +       }
>
>         if (freq == 0)
>                 pr_err("Error MSR_FSB_FREQ index %d is unknown\n", index);
> --
> 2.25.0
>


-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v3 3/3] x86/tsc_msr: Make MSR derived TSC frequency more accurate

[Thomas Gleixner]

Hans,

Hans de Goede <hdegoede@redhat.com> writes:
> @@ -120,11 +180,23 @@ unsigned long cpu_khz_from_msr(void)
>  	rdmsr(MSR_FSB_FREQ, lo, hi);
>  	index = lo & freq_desc->mask;
>  
> -	/* Map CPU reference clock freq ID(0-7) to CPU reference clock freq(KHz) */
> -	freq = freq_desc->freqs[index];
> -
> -	/* TSC frequency = maximum resolved freq * maximum resolved bus ratio */
> -	res = freq * ratio;
> +	/*
> +	 * Note this also catches cases where the index points to an unpopulated
> +	 * part of muldiv, in that case the else will set freq and res to 0.
> +	 */
> +	if (freq_desc->muldiv[index].divider) {
> +		freq = DIV_ROUND_CLOSEST(TSC_REFERENCE_KHZ *
> +					   freq_desc->muldiv[index].multiplier,
> +					 freq_desc->muldiv[index].divider);
> +		/* Multiply by ratio before the divide for better accuracy */
> +		res = DIV_ROUND_CLOSEST(TSC_REFERENCE_KHZ *
> +					   freq_desc->muldiv[index].multiplier *
> +					   ratio,
> +					freq_desc->muldiv[index].divider);

What about:

        struct muldiv *md = &freq_desc->muldiv[index];

        if (md->divider) {
		tscref = TSC_REFERENCE_KHZ * md->multiplier;
        	freq = DIV_ROUND_CLOSEST(tscref, md->divider);
		/*
                 * Multiplying by ratio before the division has better
                 * accuracy than just calculating freq * ratio
                 */
                res = DIV_ROUND_CLOSEST(tscref * ratio, md->divider);

Hmm?

Thanks,

        tglx

RE: [PATCH v3 3/3] x86/tsc_msr: Make MSR derived TSC frequency more accurate

[David Laight]

From: Andy Shevchenko
> Sent: 07 February 2020 22:12
> On Fri, Feb 7, 2020 at 10:55 PM Hans de Goede <hdegoede@redhat.com> wrote:
> >
> > The "Intel 64 and IA-32 Architectures Software Developer’s Manual
> > Volume 4: Model-Specific Registers" has the following table for the
> > values from freq_desc_byt:
> 
> For the LGM people in Cc list. Hans included you in order to confirm
> what's going on with TSC on LGM SoC.
> Can you do it in a way that we certainly know clocks with good
> precision (and if Spread Spectrum is in use what should we put here)?

Isn't 'Spread Spectrum' just a scam so that the resonant detector
used by the test equipment fails to register anything?

	David

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)

Re: [PATCH v3 3/3] x86/tsc_msr: Make MSR derived TSC frequency more accurate

[Hans de Goede]

Hi,

On 2/8/20 1:05 AM, Thomas Gleixner wrote:
> Hans,
> 
> Hans de Goede <hdegoede@redhat.com> writes:
>> @@ -120,11 +180,23 @@ unsigned long cpu_khz_from_msr(void)
>>   	rdmsr(MSR_FSB_FREQ, lo, hi);
>>   	index = lo & freq_desc->mask;
>>   
>> -	/* Map CPU reference clock freq ID(0-7) to CPU reference clock freq(KHz) */
>> -	freq = freq_desc->freqs[index];
>> -
>> -	/* TSC frequency = maximum resolved freq * maximum resolved bus ratio */
>> -	res = freq * ratio;
>> +	/*
>> +	 * Note this also catches cases where the index points to an unpopulated
>> +	 * part of muldiv, in that case the else will set freq and res to 0.
>> +	 */
>> +	if (freq_desc->muldiv[index].divider) {
>> +		freq = DIV_ROUND_CLOSEST(TSC_REFERENCE_KHZ *
>> +					   freq_desc->muldiv[index].multiplier,
>> +					 freq_desc->muldiv[index].divider);
>> +		/* Multiply by ratio before the divide for better accuracy */
>> +		res = DIV_ROUND_CLOSEST(TSC_REFERENCE_KHZ *
>> +					   freq_desc->muldiv[index].multiplier *
>> +					   ratio,
>> +					freq_desc->muldiv[index].divider);
> 
> What about:
> 
>          struct muldiv *md = &freq_desc->muldiv[index];
> 
>          if (md->divider) {
> 		tscref = TSC_REFERENCE_KHZ * md->multiplier;
>          	freq = DIV_ROUND_CLOSEST(tscref, md->divider);
> 		/*
>                   * Multiplying by ratio before the division has better
>                   * accuracy than just calculating freq * ratio
>                   */
>                  res = DIV_ROUND_CLOSEST(tscref * ratio, md->divider);
> 
> Hmm?

That indeed looks nicer, I've prepared (and tested) a v4 with the
suggested change, I'll send out v4 right after this email.

Regards,

Hans