diff mbox

[U-Boot,v2,8/9] x86: baytrail: Tidy up interrupt and FSP init

Message ID 1439044022-14481-9-git-send-email-sjg@chromium.org
State Superseded
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass Aug. 8, 2015, 2:27 p.m. UTC
We should signal to the FSP that PCI enumeration is complete. Perform this
task in a suitable place.

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

Changes in v2:
- Add new patch to tidy up interrupt and FSP init

 arch/x86/cpu/baytrail/valleyview.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Comments

Bin Meng Aug. 10, 2015, 6:19 a.m. UTC | #1
Hi Simon,

On Sat, Aug 8, 2015 at 10:27 PM, Simon Glass <sjg@chromium.org> wrote:
> We should signal to the FSP that PCI enumeration is complete. Perform this
> task in a suitable place.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v2:
> - Add new patch to tidy up interrupt and FSP init
>
>  arch/x86/cpu/baytrail/valleyview.c | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c
> index 225ea38..bbb352f 100644
> --- a/arch/x86/cpu/baytrail/valleyview.c
> +++ b/arch/x86/cpu/baytrail/valleyview.c
> @@ -7,8 +7,10 @@
>  #include <common.h>
>  #include <mmc.h>
>  #include <pci_ids.h>
> +#include <asm/interrupt.h>

This is not needed. Please remove.

>  #include <asm/irq.h>
>  #include <asm/post.h>
> +#include <asm/fsp/fsp_support.h>
>
>  static struct pci_device_id mmc_supported[] = {
>         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SDIO },
> @@ -40,6 +42,12 @@ int arch_cpu_init(void)
>
>  int arch_misc_init(void)
>  {
> -       return pirq_init();
> +       int ret;
> +
> +       ret = pirq_init();
> +       if (ret)
> +               return ret;
> +
> +       return fsp_init_phase_pci();
>  }
>  #endif
> --

Regards,
Bin
diff mbox

Patch

diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c
index 225ea38..bbb352f 100644
--- a/arch/x86/cpu/baytrail/valleyview.c
+++ b/arch/x86/cpu/baytrail/valleyview.c
@@ -7,8 +7,10 @@ 
 #include <common.h>
 #include <mmc.h>
 #include <pci_ids.h>
+#include <asm/interrupt.h>
 #include <asm/irq.h>
 #include <asm/post.h>
+#include <asm/fsp/fsp_support.h>
 
 static struct pci_device_id mmc_supported[] = {
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SDIO },
@@ -40,6 +42,12 @@  int arch_cpu_init(void)
 
 int arch_misc_init(void)
 {
-	return pirq_init();
+	int ret;
+
+	ret = pirq_init();
+	if (ret)
+		return ret;
+
+	return fsp_init_phase_pci();
 }
 #endif