Skip to contentSkip to conversation

x86: Introduce INTEL_MID quirk option

PATCH Superseded Andy Shevchenko 4 participants 16 messages Feb 14, 2017 – Feb 17, 2017 x86

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 x86: Introduce INTEL_MID quirk option

Intel Mobile Internet Device (MID) platforms have special treatment in some cases, such as CPU enumeration or boot parameters configuration.

Here we introduce specific quirk option for such cases.

It is supposed to be selected by Intel MID platform boards, for example, Intel Edison.

---
 arch/x86/Kconfig | 4 ++++
 1 file changed, 4 insertions(+)
arch/x86/Kconfig +4 -0
index 5f9597b230..ba57bcfca4 100644
@@ -80,6 +80,10 @@ config VENDOR_INTEL
 
 endchoice
 
+# subarchitectures-specific options below
+config INTEL_MID
+	bool
+
 # board-specific options below
 source "board/advantech/Kconfig"
 source "board/congatec/Kconfig"
Signature · 1 line
2.11.0
#1 lore raw

PATCH 2/3 x86: zImage: add Intel MID platforms support

From: Vincent Tinelli <[email protected]>

Intel MID platform boards have special treatment, such as boot parameter setting.

Assign hardware_subarch accordingly if CONFIG_INTEL_MID is set.

---
 arch/x86/lib/zimage.c | 4 ++++
 1 file changed, 4 insertions(+)
arch/x86/lib/zimage.c +4 -0
index b6b0f2beb3..aafbeb01f9 100644
@@ -246,6 +246,10 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
 			hdr->setup_move_size = 0x9100;
 		}
 
+#if defined(CONFIG_INTEL_MID)
+		hdr->hardware_subarch = X86_SUBARCH_INTEL_MID;
+#endif
+
 		/* build command line at COMMAND_LINE_OFFSET */
 		build_command_line(cmd_line, auto_boot);
 	}
Signature · 1 line
2.11.0
#2 lore raw

PATCH 2/3 x86: zImage: add Intel MID platforms support

Quoted 5 lines · Andy Shevchenko

From: Vincent Tinelli <[email protected]>

Intel MID platform boards have special treatment, such as boot parameter setting.

Quoted 8 lines

Assign hardware_subarch accordingly if CONFIG_INTEL_MID is set.

---
 arch/x86/lib/zimage.c | 4 ++++
 1 file changed, 4 insertions(+)
#3 lore raw

PATCH 2/3 x86: zImage: add Intel MID platforms support

Quoted 9 lines · Bin Meng
Quoted 7 lines · Andy Shevchenko

From: Vincent Tinelli <[email protected]>

Intel MID platform boards have special treatment, such as boot parameter setting.

Assign hardware_subarch accordingly if CONFIG_INTEL_MID is set.

Quoted 8 lines
Quoted 6 lines
---
 arch/x86/lib/zimage.c | 4 ++++
 1 file changed, 4 insertions(+)
#4 lore raw

PATCH 3/3 x86: Intel MID platforms has no microcode update

In reply to Andy Shevchenko

There is no microcode update available for SoCs used on Intel MID platforms.

Use conditional to bypass it.

---
 arch/x86/cpu/mp_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/cpu/mp_init.c +1 -1
index 988073cc79..4e2f000f75 100644
@@ -248,7 +248,7 @@ static int load_sipi_vector(atomic_t **ap_countp, int num_cpus)
 	if (!stack)
 		return -ENOMEM;
 	params->stack_top = (u32)(stack + size);
-#if !defined(CONFIG_QEMU) && !defined(CONFIG_HAVE_FSP)
+#if !defined(CONFIG_QEMU) && !defined(CONFIG_HAVE_FSP) && !defined(CONFIG_INTEL_MID)
 	params->microcode_ptr = ucode_base;
 	debug("Microcode at %x\n", params->microcode_ptr);
 #endif
Signature · 1 line
2.11.0
#5 lore raw

PATCH 3/3 x86: Intel MID platforms has no microcode update

Hi Andy,

Quoted 15 lines · Andy Shevchenko

There is no microcode update available for SoCs used on Intel MID platforms.

Use conditional to bypass it.

---
 arch/x86/cpu/mp_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/cpu/mp_init.c +0 -0
index 988073cc79..4e2f000f75 100644

arch/x86/cpu/mp_init.c static int load_sipi_vector(atomic_t **ap_countp, int num_cpus) · line 254

Quoted 8 lines
arch/x86/cpu/mp_init.c +1 -1
@@ -248,7 +248,7 @@ static int load_sipi_vector(atomic_t **ap_countp, int num_cpus)
        if (!stack)
                return -ENOMEM;
        params->stack_top = (u32)(stack + size);
-#if !defined(CONFIG_QEMU) && !defined(CONFIG_HAVE_FSP)
+#if !defined(CONFIG_QEMU) && !defined(CONFIG_HAVE_FSP) && !defined(CONFIG_INTEL_MID)
        params->microcode_ptr = ucode_base;
        debug("Microcode at %x\n", params->microcode_ptr);
 #endif

Is this patch necessary? If Intel MID does not define CONFIG_QEMU or CONFIG_HAVE_FSP, current logic should work.

Regards,
Bin

#6 lore raw

PATCH 3/3 x86: Intel MID platforms has no microcode update

Quoted 24 lines · Bin Meng

Hi Andy,

Quoted 20 lines · Andy Shevchenko

There is no microcode update available for SoCs used on Intel MID platforms.

Use conditional to bypass it.

---
?arch/x86/cpu/mp_init.c | 2 +-
?1 file changed, 1 insertion(+), 1 deletion(-)

arch/x86/cpu/mp_init.c +0 -1
index 988073cc79..4e2f000f75 100644
@@ -248,7 +248,7 @@ static int load_sipi_vector(atomic_t
 **ap_countp, int num_cpus)
 ????????if (!stack)
 ????????????????return -ENOMEM;
 ????????params->stack_top = (u32)(stack + size);
-#if !defined(CONFIG_QEMU) && !defined(CONFIG_HAVE_FSP)
Quoted 8 lines
Quoted 5 lines
arch/x86/cpu/mp_init.c +1 -0
+#if !defined(CONFIG_QEMU) && !defined(CONFIG_HAVE_FSP) &&
 !defined(CONFIG_INTEL_MID)
 ????????params->microcode_ptr = ucode_base;

????????debug("Microcode at %x\n", params->microcode_ptr); ?#endif

Is this patch necessary? If Intel MID does not define CONFIG_QEMU or CONFIG_HAVE_FSP, current logic should work.

This code is executed when neither of option is defined. For Intel MID we do *not* need to have this code executed.

I dunno how it possible can work otherwise (ucode_base is not defined).

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#7 lore raw

PATCH 3/3 x86: Intel MID platforms has no microcode update

Hi Andy,

Quoted 34 lines · Andy Shevchenko
Quoted 24 lines · Bin Meng

Hi Andy,

Quoted 20 lines · Andy Shevchenko

There is no microcode update available for SoCs used on Intel MID platforms.

Use conditional to bypass it.

---
 arch/x86/cpu/mp_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/cpu/mp_init.c +0 -1
index 988073cc79..4e2f000f75 100644
@@ -248,7 +248,7 @@ static int load_sipi_vector(atomic_t
 **ap_countp, int num_cpus)
        if (!stack)
                return -ENOMEM;
        params->stack_top = (u32)(stack + size);
-#if !defined(CONFIG_QEMU) && !defined(CONFIG_HAVE_FSP)
Quoted 8 lines
Quoted 5 lines
arch/x86/cpu/mp_init.c +1 -0
+#if !defined(CONFIG_QEMU) && !defined(CONFIG_HAVE_FSP) &&
 !defined(CONFIG_INTEL_MID)
        params->microcode_ptr = ucode_base;
        debug("Microcode at %x\n", params->microcode_ptr);

#endif

Is this patch necessary? If Intel MID does not define CONFIG_QEMU or CONFIG_HAVE_FSP, current logic should work.

Quoted 5 lines

This code is executed when neither of option is defined. For Intel MID we do *not* need to have this code executed.

I dunno how it possible can work otherwise (ucode_base is not defined).

OK, is this common feature for all Intel MID device? This mp_init.c is conditionally built by CONFIG_SMP. So I believe this Tangier SoC is a multi-core processor, but does not have any microcode.

Regards,
Bin

#8 lore raw

PATCH 3/3 x86: Intel MID platforms has no microcode update

Quoted 6 lines · Bin Meng
Quoted 3 lines · Andy Shevchenko
Quoted 2 lines · Bin Meng

On Tue, Feb 14, 2017 at 10:47 PM, Andy Shevchenko
<[email protected]> wrote:

Quoted 8 lines
Quoted 4 lines

This code is executed when neither of option is defined. For Intel MID we do *not* need to have this code executed.

I dunno how it possible can work otherwise (ucode_base is not defined).

OK, is this common feature for all Intel MID device? This mp_init.c is conditionally built by CONFIG_SMP. So I believe this Tangier SoC is a multi-core processor, but does not have any microcode.

Correct.
I will leave this patch as is in v3 which I'm about to submit.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#10 lore raw

PATCH 1/3 x86: Introduce INTEL_MID quirk option

In reply to Andy Shevchenko

Hi Andy,

Quoted 7 lines · Andy Shevchenko

Intel Mobile Internet Device (MID) platforms have special treatment in some cases, such as CPU enumeration or boot parameters configuration.

Here we introduce specific quirk option for such cases.

It is supposed to be selected by Intel MID platform boards, for example, Intel Edison.

Does this mean you have plan to upstream the Intel Edison support?

Quoted 11 lines
---
 arch/x86/Kconfig | 4 ++++
 1 file changed, 4 insertions(+)
arch/x86/Kconfig +0 -0
index 5f9597b230..ba57bcfca4 100644

arch/x86/Kconfig config VENDOR_INTEL · line 85

Quoted 6 lines
arch/x86/Kconfig +3 -0
@@ -80,6 +80,10 @@ config VENDOR_INTEL
 
 endchoice
 
+# subarchitectures-specific options below
+config INTEL_MID
+       bool

What's the architecture of Intel Edison? Normally such platform Kconfig option should go to arch/x86/cpu/<platform>/Kconfig

Regards,
Bin

#11 lore raw

PATCH 1/3 x86: Introduce INTEL_MID quirk option

Quoted 9 lines · Bin Meng

Hi Andy,

Quoted 5 lines · Andy Shevchenko

Intel Mobile Internet Device (MID) platforms have special treatment in
some cases, such as CPU enumeration or boot parameters configuration.

Quoted 7 lines
Quoted 5 lines

Here we introduce specific quirk option for such cases.

It is supposed to be selected by Intel MID platform boards, for example,
Intel Edison.

Does this mean you have plan to upstream the Intel Edison support?

Yes.

Quoted 13 lines
Quoted 13 lines

---
?arch/x86/Kconfig | 4 ++++
?1 file changed, 4 insertions(+)

arch/x86/Kconfig +0 -0
index 5f9597b230..ba57bcfca4 100644
@@ -80,6 +80,10 @@ config VENDOR_INTEL
 
Quoted 8 lines

arch/x86/Kconfig config VENDOR_INTEL

Quoted 5 lines

?endchoice

arch/x86/Kconfig +3 -0
+# subarchitectures-specific options below
+config INTEL_MID
+???????bool

What's the architecture of Intel Edison? Normally such platform Kconfig option should go to arch/x86/cpu/<platform>/Kconfig

What do you mean?
x86_64.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#12 lore raw

PATCH 1/3 x86: Introduce INTEL_MID quirk option

Hi Andy,

Quoted 42 lines · Andy Shevchenko
Quoted 9 lines · Bin Meng

Hi Andy,

Quoted 5 lines · Andy Shevchenko

Intel Mobile Internet Device (MID) platforms have special treatment in
some cases, such as CPU enumeration or boot parameters configuration.

Quoted 7 lines
Quoted 5 lines

Here we introduce specific quirk option for such cases.

It is supposed to be selected by Intel MID platform boards, for example,
Intel Edison.

Does this mean you have plan to upstream the Intel Edison support?

Yes.

Quoted 13 lines
Quoted 13 lines
---
 arch/x86/Kconfig | 4 ++++
 1 file changed, 4 insertions(+)
arch/x86/Kconfig +0 -0
index 5f9597b230..ba57bcfca4 100644
@@ -80,6 +80,10 @@ config VENDOR_INTEL
 
Quoted 8 lines

arch/x86/Kconfig config VENDOR_INTEL · line 85

Quoted 5 lines
arch/x86/Kconfig +3 -0
 endchoice
 
+# subarchitectures-specific options below
+config INTEL_MID
+       bool

What's the architecture of Intel Edison? Normally such platform Kconfig option should go to arch/x86/cpu/<platform>/Kconfig

Quoted 2 lines

What do you mean?
x86_64.

Sorry I should say what the platform is, like Ivybridge, Baytrail, Quark that U-Boot currently supports. If this is a new platform, we should probably move it to arch/x86/cpu/<platform>/Kconfig.

Regards,
Bin

#13 lore raw

PATCH 1/3 x86: Introduce INTEL_MID quirk option

Quoted 8 lines · Bin Meng

Hi Andy,

Quoted 3 lines · Andy Shevchenko
Quoted 2 lines · Bin Meng

On Tue, Feb 14, 2017 at 10:47 PM, Andy Shevchenko
<[email protected]> wrote:

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

What's the architecture of Intel Edison? Normally such platform Kconfig option should go to arch/x86/cpu/<platform>/Kconfig

What do you mean?
x86_64.

Sorry I should say what the platform is, like Ivybridge, Baytrail, Quark that U-Boot currently supports.

It's misunderstanding here. arch/x86/cpu/<SoC/CPU/platform>/
So, all of above either SoC or platform. A little mess.

So, we will put the code to tangier folder because Intel Tangier is SoC. Platform is Intel Merrifield.

Quoted 1 line

If this is a new platform,

Yes.

Quoted 2 lines

we
should probably move it to arch/x86/cpu/<platform>/Kconfig.

Probably not. Intel MID covers more than one SoC/platform. This option is x86 scope.

I dunno that U-Boot will run on the rest MID devices, but for sake of logic and consistency it is not about Edison or Merrifield or Tangier.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#14 lore raw

PATCH 1/3 x86: Introduce INTEL_MID quirk option

Hi Andy,

Quoted 15 lines · Andy Shevchenko
Quoted 14 lines · Bin Meng

Hi Andy,

Quoted 9 lines · Andy Shevchenko
Quoted 5 lines · Bin Meng

On Tue, Feb 14, 2017 at 10:47 PM, Andy Shevchenko
<[email protected]> wrote:

What's the architecture of Intel Edison? Normally such platform Kconfig option should go to arch/x86/cpu/<platform>/Kconfig

What do you mean?
x86_64.

Quoted 7 lines
Quoted 2 lines

Sorry I should say what the platform is, like Ivybridge, Baytrail, Quark that U-Boot currently supports.

It's misunderstanding here. arch/x86/cpu/<SoC/CPU/platform>/
So, all of above either SoC or platform. A little mess.

Yes, it's either SoC (single chipset), or platform (CPU plus platform controller).

Quoted 5 lines

So, we will put the code to tangier folder because Intel Tangier is SoC. Platform is Intel Merrifield.

Quoted 1 line

If this is a new platform,

Quoted 8 lines

Yes.

Quoted 2 lines

we
should probably move it to arch/x86/cpu/<platform>/Kconfig.

Probably not. Intel MID covers more than one SoC/platform. This option is x86 scope.

OK, so can you please add a help text for the new config to describe what MID is and its features? I assume it has some difference that worth introducing such a sub-arch option.

Quoted 2 lines

I dunno that U-Boot will run on the rest MID devices, but for sake of logic and consistency it is not about Edison or Merrifield or Tangier.

Regards,
Bin

#15 lore raw

PATCH 1/3 x86: Introduce INTEL_MID quirk option

In reply to Andy Shevchenko
Quoted 5 lines · Andy Shevchenko

Intel Mobile Internet Device (MID) platforms have special treatment in some cases, such as CPU enumeration or boot parameters configuration.

Here we introduce specific quirk option for such cases.

Quoted 7 lines

It is supposed to be selected by Intel MID platform boards, for example, Intel Edison.

---
 arch/x86/Kconfig | 4 ++++
 1 file changed, 4 insertions(+)