Skip to contentSkip to conversation

Cleanups and disable unnecessary features

PATCH In review Andrew Jeffery 2 participants 7 messages Jul 23, 2018 – Feb 11, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover Cleanups and disable unnecessary features

Hello,

This series is a mishmash of cleanups with an added dash of disabling value-add features that we don't require during normal BMC operation. It has been tested on OpenPOWER Palmetto (AST2400) and Witherspoon (AST2500) platforms.

Please review!

Cheers,

Andrew

Andrew Jeffery (4):
checkpatch: Fix unescaped brace warning
ast-g4: Fix typo in board_init() comment
arch-aspeed: Make AHBC and SDMC header guards unique
aspeed: Disable unnecessary features

 arch/arm/include/asm/arch-aspeed/regs-ahbc.h |  4 +-
 arch/arm/include/asm/arch-aspeed/regs-lpc.h  | 29 +++++++++++++++
 arch/arm/include/asm/arch-aspeed/regs-scu.h  |  8 +++-
 arch/arm/include/asm/arch-aspeed/regs-sdmc.h |  8 +++-
 board/aspeed/ast-g4/ast-g4.c                 | 35 +++++++++++++++++-
 board/aspeed/ast-g5/ast-g5.c                 | 39 +++++++++++++++++++-
 scripts/checkpatch.pl                        |  2 +-
 7 files changed, 116 insertions(+), 9 deletions(-)
 create mode 100644 arch/arm/include/asm/arch-aspeed/regs-lpc.h
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/4 checkpatch: Fix unescaped brace warning

Running checkpatch using Ubuntu 18.04's packaged perl (5.26.1-6ubuntu0.1) gave the following output:

Unescaped left brace in regex is deprecated here (and will be fatal in Perl 5.30), passed through in regex; marked by <-- HERE in m/^(\+.*(?:do|\))){ <-- HERE / at ./scripts/checkpatch.pl line 3267

Escape the brace to avoid the warning.

---
 scripts/checkpatch.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/checkpatch.pl +1 -1
index 24831b3166e2..d38369638c6a 100755
@@ -3264,7 +3264,7 @@ sub process {
 			if (ERROR("SPACING",
 				  "space required before the open brace '{'\n" . $herecurr) &&
 			    $fix) {
-				$fixed[$linenr - 1] =~ s/^(\+.*(?:do|\))){/$1 {/;
+				$fixed[$linenr - 1] =~ s/^(\+.*(?:do|\)))\{/$1 {/;
 			}
 		}
 
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/4 ast-g4: Fix typo in board_init() comment

In reply to Andrew Jeffery
---
 board/aspeed/ast-g4/ast-g4.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
board/aspeed/ast-g4/ast-g4.c +1 -1
index cc26a78529bc..656495307b03 100644
@@ -19,7 +19,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
-	/* adress of boot parameters */
+	/* address of boot parameters */
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 	gd->flags = 0;
 	return 0;
Signature · 1 line
2.17.1
#3 lore raw

PATCH 3/4 arch-aspeed: Make AHBC and SDMC header guards unique

In reply to Andrew Jeffery

Otherwise we get mysterious missing symbols if we include both those and the ast-{ahbc,sdmc}.h files.

---
 arch/arm/include/asm/arch-aspeed/regs-ahbc.h | 4 ++--
 arch/arm/include/asm/arch-aspeed/regs-sdmc.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/include/asm/arch-aspeed/regs-ahbc.h +2 -2
index 66e29839e8f1..4f403c45d3a5 100644
@@ -10,8 +10,8 @@
  *    1. 2012/12/29 Ryan Chen Create
  *
  ******************************************************************************/
-#ifndef __AST_AHBC_H
-#define __AST_AHBC_H
+#ifndef __AST_REGS_AHBC_H
+#define __AST_REGS_AHBC_H
 
 #include <asm/arch/aspeed.h>
 
arch/arm/include/asm/arch-aspeed/regs-sdmc.h +2 -2
index 2861f3b2c947..2cc26d29aa9e 100644
@@ -10,8 +10,8 @@
  *    1. 2012/12/29 Ryan Chen Create
  *
  ******************************************************************************/
-#ifndef __AST_SDMC_H
-#define __AST_SDMC_H
+#ifndef __AST_REGS_SDMC_H
+#define __AST_REGS_SDMC_H
 
 /*
  *  Register for SDMC
Signature · 1 line
2.17.1
#4 lore raw

PATCH 4/4 aspeed: Disable unnecessary features

In reply to Andrew Jeffery

Adjust board_init() to disable hardware features that we don't need available during normal BMC operation.

---
 arch/arm/include/asm/arch-aspeed/regs-lpc.h  | 29 +++++++++++++++
 arch/arm/include/asm/arch-aspeed/regs-scu.h  |  8 +++-
 arch/arm/include/asm/arch-aspeed/regs-sdmc.h |  4 ++
 board/aspeed/ast-g4/ast-g4.c                 | 33 ++++++++++++++++-
 board/aspeed/ast-g5/ast-g5.c                 | 39 +++++++++++++++++++-
 5 files changed, 110 insertions(+), 3 deletions(-)
 create mode 100644 arch/arm/include/asm/arch-aspeed/regs-lpc.h
arch/arm/include/asm/arch-aspeed/regs-lpc.h new file +29 -0
new file mode 100644
index 000000000000..b0162ae4f37c
@@ -0,0 +1,29 @@
+/* arch/arm/mach-aspeed/include/mach/regs-sdmc.h
+ *
+ * Copyright (C) 2018  IBM Corp
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ *   History      :
+ *    1. 2018/07/23 Andrew Jeffery Create
+ *
+ ******************************************************************************/
+#ifndef __AST_REGS_LPC_H
+#define __AST_REGS_LPC_H
+
+/*
+ *  Register for LPC
+ */
+
+#define AST_LPC_HICR5		0x80
+#define AST_LPC_HICRB		0x100
+
+/*	AST_LPC_HICR5 : 0x80	Host Interface Control Register 5 */
+#define LPC_HICR5_ENFWH		(0x1 << 10)
+
+/*	AST_LPC_HICRB : 0x100	Host Interface Control Register B */
+#define LPC_HICRB_ILPC2AHB	(0x1 << 6)
+
+#endif
arch/arm/include/asm/arch-aspeed/regs-scu.h +7 -1
index b714fa92341d..c9b91795d1aa 100644
@@ -466,6 +466,7 @@
 #define SCU_MISC_JTAG__M_TO_PCIE_EN	(0x1 << 14)
 #define SCU_MISC_VUART_TO_CTRL		(0x1 << 13)
 #define SCU_MISC_DIV13_EN		(0x1 << 12)
+#define SCU_MISC_DEBUG_UART             (0x1 << 10)
 #define SCU_MISC_Y_CLK_INVERT		(0x1 << 11)
 #define SCU_MISC_OUT_DELAY		(0x1 << 9)
 #define SCU_MISC_PCI_TO_AHB_DIS		(0x1 << 8)
@@ -548,6 +549,7 @@
 /* AST_SCU_VGA_SCRATCH7			0x6c - VGA Scratch register */
 
 /* AST_SCU_HW_STRAP1			0x70 - hardware strapping register */
+#define SCU_HW_STRAP_LPC_DEC_SUPER_IO	(0x1 << 20)
 #ifdef AST_SOC_G5
 
 #define CLK_25M_IN			(0x1 << 23)
@@ -593,7 +595,6 @@
 
 #define SCU_HW_STRAP_GPIOE_PT_EN	(0x1 << 22)
 #define SCU_HW_STRAP_GPIOD_PT_EN	(0x1 << 21)
-#define SCU_HW_STRAP_LPC_DEC_SUPER_IO	(0x1 << 20)
 #define SCU_HW_STRAP_ACPI_DIS		(0x1 << 19)
 
 /* bit 23, 18 [1,0] */
@@ -940,6 +941,11 @@
 
 /* AST_SCU_UART24_REF			0x160 - Generate UART 24Mhz Ref from H-PLL when CLKIN is 25Mhz */
 /* AST_SCU_PCIE_CONFIG_SET		0x180 - PCI-E Configuration Setting Control Register */
+#define SCU_PCIE_CONFIG_SET_BMC_DMA     (0x1 << 14)
+#define SCU_PCIE_CONFIG_SET_BMC_MMIO    (0x1 << 9)
+#define SCU_PCIE_CONFIG_SET_BMC_EN      (0x1 << 8)
+#define SCU_PCIE_CONFIG_SET_VGA_MMIO    (0x1 << 1)
+
 /* AST_SCU_BMC_MMIO_DEC			0x184 - BMC MMIO Decode Setting Register */
 /* AST_SCU_DEC_AREA1			0x188 - 1st relocated controller decode area location */
 /* AST_SCU_DEC_AREA2			0x18C - 2nd relocated controller decode area location */
arch/arm/include/asm/arch-aspeed/regs-sdmc.h +4 -0
index 2cc26d29aa9e..3b516ecccdde 100644
@@ -18,6 +18,7 @@
  */
 #define AST_SDMC_PROTECT	0x00		/* protection key register */
 #define AST_SDMC_CONFIG		0x04		/* Configuration register */
+#define AST_SDMC_GFX_PROT	0x08		/* Graphics protection register */
 
 /*	AST_SDMC_PROTECT: 0x00  - protection key register */
 #define SDMC_PROTECT_UNLOCK			0xFC600309
@@ -29,4 +30,7 @@
 #define SDMC_CONFIG_CACHE_EN		(0x1 << 10)
 #define SDMC_CONFIG_EEC_EN		(0x1 << 7)
 
+/*	AST_SDMC_GFX_PROT : 0x08 - Graphics protection register */
+#define SDMC_GFX_PROT_XDMA	(0x1 << 16)
+
 #endif
board/aspeed/ast-g4/ast-g4.c +32 -1
index 656495307b03..eda087fa5c17 100644
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002 Ryan Chen
- * Copyright 2016 IBM Corporation
+ * Copyright 2016,2018 IBM Corporation
  *
  * SPDX-License-Identifier:     GPL-2.0+
  */
@@ -12,13 +12,44 @@
 #include <asm/arch/ast-sdmc.h>
 #include <asm/arch/ast_scu.h>
 #include <asm/arch/regs-ahbc.h>
+#include <asm/arch/regs-lpc.h>
 #include <asm/arch/regs-scu.h>
+#include <asm/arch/regs-sdmc.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
+	u32 val;
+
+	/* iLPC2AHB */
+	val = readl(AST_SCU_BASE + AST_SCU_HW_STRAP1);
+	val |= SCU_HW_STRAP_LPC_DEC_SUPER_IO;
+	writel(val, AST_SCU_BASE + AST_SCU_HW_STRAP1);
+
+	val = readl(AST_LPC_BASE + AST_LPC_HICRB);
+	val |= LPC_HICRB_ILPC2AHB;
+	writel(val, AST_LPC_BASE + AST_LPC_HICRB);
+
+	/* P2A, PCIe BMC */
+	val = readl(AST_SCU_BASE + AST_SCU_PCIE_CONFIG_SET);
+	val &= ~(SCU_PCIE_CONFIG_SET_BMC_DMA
+			| SCU_PCIE_CONFIG_SET_BMC_MMIO
+			| SCU_PCIE_CONFIG_SET_BMC_EN
+			| SCU_PCIE_CONFIG_SET_VGA_MMIO);
+	writel(val, AST_SCU_BASE + AST_SCU_PCIE_CONFIG_SET);
+
+	/* X-DMA */
+	val = readl(AST_SDMC_BASE + AST_SDMC_GFX_PROT);
+	val |= SDMC_GFX_PROT_XDMA;
+	writel(val, AST_SDMC_BASE + AST_SDMC_GFX_PROT);
+
+	/* LPC2AHB */
+	val = readl(AST_LPC_BASE + AST_LPC_HICR5);
+	val &= ~LPC_HICR5_ENFWH;
+	writel(val, AST_LPC_BASE + AST_LPC_HICR5);
+
 	/* address of boot parameters */
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 	gd->flags = 0;
board/aspeed/ast-g5/ast-g5.c +38 -1
index e67a4bf8b2b4..e8827524e3b2 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IBM Corporation
+ * Copyright 2016,2018 IBM Corporation
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -12,12 +12,49 @@
 
 #include <asm/arch/ast_scu.h>
 #include <asm/arch/ast-sdmc.h>
+#include <asm/arch/regs-lpc.h>
+#include <asm/arch/regs-scu.h>
+#include <asm/arch/regs-sdmc.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
+	u32 val;
+
+	/* iLPC2AHB */
+	val = readl(AST_SCU_BASE + AST_SCU_HW_STRAP1);
+	val |= SCU_HW_STRAP_LPC_DEC_SUPER_IO;
+	writel(val, AST_SCU_BASE + AST_SCU_HW_STRAP1);
+
+	val = readl(AST_LPC_BASE + AST_LPC_HICRB);
+	val |= LPC_HICRB_ILPC2AHB;
+	writel(val, AST_LPC_BASE + AST_LPC_HICRB);
+
+	/* P2A, PCIe BMC */
+	val = readl(AST_SCU_BASE + AST_SCU_PCIE_CONFIG_SET);
+	val &= ~(SCU_PCIE_CONFIG_SET_BMC_DMA
+			| SCU_PCIE_CONFIG_SET_BMC_MMIO
+			| SCU_PCIE_CONFIG_SET_BMC_EN
+			| SCU_PCIE_CONFIG_SET_VGA_MMIO);
+	writel(val, AST_SCU_BASE + AST_SCU_PCIE_CONFIG_SET);
+
+	/* Debug UART */
+	val = readl(AST_SCU_BASE + AST_SCU_MISC1_CTRL);
+	val |= SCU_MISC_DEBUG_UART;
+	writel(val, AST_SCU_BASE + AST_SCU_MISC1_CTRL);
+
+	/* X-DMA */
+	val = readl(AST_SDMC_BASE + AST_SDMC_GFX_PROT);
+	val |= SDMC_GFX_PROT_XDMA;
+	writel(val, AST_SDMC_BASE + AST_SDMC_GFX_PROT);
+
+	/* LPC2AHB */
+	val = readl(AST_LPC_BASE + AST_LPC_HICR5);
+	val &= ~LPC_HICR5_ENFWH;
+	writel(val, AST_LPC_BASE + AST_LPC_HICR5);
+
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 	gd->flags = 0;
 
Signature · 1 line
2.17.1
#5 lore raw

Re: [PATCH u-boot 4/4] aspeed: Disable unnecessary features

Thanks for sending the patch Andrew. I think it's a viable solution since linux upstream didn't like the idea of misc controls.

My feature request would be that we add config options for selectively turning these features on/off. For example, we actually use LPC2AHB and PCIe2AHB downstream for host-BMC mailbox typed transfers.. It would be nice if we could take this patch and define the flags to enable what we needed.

Quoted 244 lines · Andrew Jeffery

Adjust board_init() to disable hardware features that we don't need available during normal BMC operation.

---
 arch/arm/include/asm/arch-aspeed/regs-lpc.h  | 29 +++++++++++++++
 arch/arm/include/asm/arch-aspeed/regs-scu.h  |  8 +++-
 arch/arm/include/asm/arch-aspeed/regs-sdmc.h |  4 ++
 board/aspeed/ast-g4/ast-g4.c                 | 33 ++++++++++++++++-
 board/aspeed/ast-g5/ast-g5.c                 | 39 +++++++++++++++++++-
 5 files changed, 110 insertions(+), 3 deletions(-)
 create mode 100644 arch/arm/include/asm/arch-aspeed/regs-lpc.h
arch/arm/include/asm/arch-aspeed/regs-lpc.h new file +12 -0
new file mode 100644
index 000000000000..b0162ae4f37c
@@ -0,0 +1,29 @@
+/* arch/arm/mach-aspeed/include/mach/regs-sdmc.h
+ *
+ * Copyright (C) 2018  IBM Corp
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ *   History      :
+ *    1. 2018/07/23 Andrew Jeffery Create
+ *
+

******************************************************************************/

arch/arm/include/asm/arch-aspeed/regs-lpc.h new file +17 -0
+#ifndef __AST_REGS_LPC_H
+#define __AST_REGS_LPC_H
+
+/*
+ *  Register for LPC
+ */
+
+#define AST_LPC_HICR5          0x80
+#define AST_LPC_HICRB          0x100
+
+/*     AST_LPC_HICR5 : 0x80    Host Interface Control Register 5 */
+#define LPC_HICR5_ENFWH                (0x1 << 10)
+
+/*     AST_LPC_HICRB : 0x100   Host Interface Control Register B */
+#define LPC_HICRB_ILPC2AHB     (0x1 << 6)
+
+#endif
arch/arm/include/asm/arch-aspeed/regs-scu.h +1 -0
index b714fa92341d..c9b91795d1aa 100644
@@ -466,6 +466,7 @@
 #define SCU_MISC_JTAG__M_TO_PCIE_EN    (0x1 << 14)
 #define SCU_MISC_VUART_TO_CTRL         (0x1 << 13)
 #define SCU_MISC_DIV13_EN              (0x1 << 12)
+#define SCU_MISC_DEBUG_UART             (0x1 << 10)
 #define SCU_MISC_Y_CLK_INVERT          (0x1 << 11)
 #define SCU_MISC_OUT_DELAY             (0x1 << 9)
 #define SCU_MISC_PCI_TO_AHB_DIS                (0x1 << 8)
@@ -548,6 +549,7 @@
 /* AST_SCU_VGA_SCRATCH7                        0x6c - VGA Scratch

register */

/* AST_SCU_HW_STRAP1 0x70 - hardware strapping register
*/

arch/arm/include/asm/arch-aspeed/regs-scu.h +1 -1
+#define SCU_HW_STRAP_LPC_DEC_SUPER_IO  (0x1 << 20)
 #ifdef AST_SOC_G5
 
 #define CLK_25M_IN                     (0x1 << 23)
@@ -593,7 +595,6 @@
 
 #define SCU_HW_STRAP_GPIOE_PT_EN       (0x1 << 22)
 #define SCU_HW_STRAP_GPIOD_PT_EN       (0x1 << 21)
-#define SCU_HW_STRAP_LPC_DEC_SUPER_IO  (0x1 << 20)
 #define SCU_HW_STRAP_ACPI_DIS          (0x1 << 19)
 
 /* bit 23, 18 [1,0] */
@@ -940,6 +941,11 @@
 
 /* AST_SCU_UART24_REF                  0x160 - Generate UART 24Mhz Ref

from H-PLL when CLKIN is 25Mhz */
/* AST_SCU_PCIE_CONFIG_SET 0x180 - PCI-E Configuration
Setting Control Register */

arch/arm/include/asm/arch-aspeed/regs-scu.h +5 -0
+#define SCU_PCIE_CONFIG_SET_BMC_DMA     (0x1 << 14)
+#define SCU_PCIE_CONFIG_SET_BMC_MMIO    (0x1 << 9)
+#define SCU_PCIE_CONFIG_SET_BMC_EN      (0x1 << 8)
+#define SCU_PCIE_CONFIG_SET_VGA_MMIO    (0x1 << 1)
+
 /* AST_SCU_BMC_MMIO_DEC                        0x184 - BMC MMIO Decode

Setting Register */
/* AST_SCU_DEC_AREA1 0x188 - 1st relocated controller
decode area location */
/* AST_SCU_DEC_AREA2 0x18C - 2nd relocated controller
decode area location */

arch/arm/include/asm/arch-aspeed/regs-sdmc.h +0 -0
index 2cc26d29aa9e..3b516ecccdde 100644
@@ -18,6 +18,7 @@
  */
 #define AST_SDMC_PROTECT       0x00            /* protection key register
 */
 #define AST_SDMC_CONFIG                0x04            /* Configuration

register */
+#define AST_SDMC_GFX_PROT 0x08 /* Graphics protection
register */

/* AST_SDMC_PROTECT: 0x00 - protection key register */
#define SDMC_PROTECT_UNLOCK 0xFC600309

arch/arm/include/asm/arch-aspeed/regs-sdmc.h +3 -0
@@ -29,4 +30,7 @@
 #define SDMC_CONFIG_CACHE_EN           (0x1 << 10)
 #define SDMC_CONFIG_EEC_EN             (0x1 << 7)
 
+/*     AST_SDMC_GFX_PROT : 0x08 - Graphics protection register */
+#define SDMC_GFX_PROT_XDMA     (0x1 << 16)
+
 #endif
board/aspeed/ast-g4/ast-g4.c +32 -1
index 656495307b03..eda087fa5c17 100644
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002 Ryan Chen
- * Copyright 2016 IBM Corporation
+ * Copyright 2016,2018 IBM Corporation
  *
  * SPDX-License-Identifier:     GPL-2.0+
  */
@@ -12,13 +12,44 @@
 #include <asm/arch/ast-sdmc.h>
 #include <asm/arch/ast_scu.h>
 #include <asm/arch/regs-ahbc.h>
+#include <asm/arch/regs-lpc.h>
 #include <asm/arch/regs-scu.h>
+#include <asm/arch/regs-sdmc.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
+       u32 val;
+
+       /* iLPC2AHB */
+       val = readl(AST_SCU_BASE + AST_SCU_HW_STRAP1);
+       val |= SCU_HW_STRAP_LPC_DEC_SUPER_IO;
+       writel(val, AST_SCU_BASE + AST_SCU_HW_STRAP1);
+
+       val = readl(AST_LPC_BASE + AST_LPC_HICRB);
+       val |= LPC_HICRB_ILPC2AHB;
+       writel(val, AST_LPC_BASE + AST_LPC_HICRB);
+
+       /* P2A, PCIe BMC */
+       val = readl(AST_SCU_BASE + AST_SCU_PCIE_CONFIG_SET);
+       val &= ~(SCU_PCIE_CONFIG_SET_BMC_DMA
+                       | SCU_PCIE_CONFIG_SET_BMC_MMIO
+                       | SCU_PCIE_CONFIG_SET_BMC_EN
+                       | SCU_PCIE_CONFIG_SET_VGA_MMIO);
+       writel(val, AST_SCU_BASE + AST_SCU_PCIE_CONFIG_SET);
+
+       /* X-DMA */
+       val = readl(AST_SDMC_BASE + AST_SDMC_GFX_PROT);
+       val |= SDMC_GFX_PROT_XDMA;
+       writel(val, AST_SDMC_BASE + AST_SDMC_GFX_PROT);
+
+       /* LPC2AHB */
+       val = readl(AST_LPC_BASE + AST_LPC_HICR5);
+       val &= ~LPC_HICR5_ENFWH;
+       writel(val, AST_LPC_BASE + AST_LPC_HICR5);
+
        /* address of boot parameters */
        gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
        gd->flags = 0;
board/aspeed/ast-g5/ast-g5.c +38 -2
index e67a4bf8b2b4..e8827524e3b2 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IBM Corporation
+ * Copyright 2016,2018 IBM Corporation
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -12,12 +12,49 @@
 
 #include <asm/arch/ast_scu.h>
 #include <asm/arch/ast-sdmc.h>
+#include <asm/arch/regs-lpc.h>
+#include <asm/arch/regs-scu.h>
+#include <asm/arch/regs-sdmc.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
+       u32 val;
+
+       /* iLPC2AHB */
+       val = readl(AST_SCU_BASE + AST_SCU_HW_STRAP1);
+       val |= SCU_HW_STRAP_LPC_DEC_SUPER_IO;
+       writel(val, AST_SCU_BASE + AST_SCU_HW_STRAP1);
+
+       val = readl(AST_LPC_BASE + AST_LPC_HICRB);
+       val |= LPC_HICRB_ILPC2AHB;
+       writel(val, AST_LPC_BASE + AST_LPC_HICRB);
+
+       /* P2A, PCIe BMC */
+       val = readl(AST_SCU_BASE + AST_SCU_PCIE_CONFIG_SET);
+       val &= ~(SCU_PCIE_CONFIG_SET_BMC_DMA
+                       | SCU_PCIE_CONFIG_SET_BMC_MMIO
+                       | SCU_PCIE_CONFIG_SET_BMC_EN
+                       | SCU_PCIE_CONFIG_SET_VGA_MMIO);
+       writel(val, AST_SCU_BASE + AST_SCU_PCIE_CONFIG_SET);
+
+       /* Debug UART */
+       val = readl(AST_SCU_BASE + AST_SCU_MISC1_CTRL);
+       val |= SCU_MISC_DEBUG_UART;
+       writel(val, AST_SCU_BASE + AST_SCU_MISC1_CTRL);
+
+       /* X-DMA */
+       val = readl(AST_SDMC_BASE + AST_SDMC_GFX_PROT);
+       val |= SDMC_GFX_PROT_XDMA;
+       writel(val, AST_SDMC_BASE + AST_SDMC_GFX_PROT);
+
+       /* LPC2AHB */
+       val = readl(AST_LPC_BASE + AST_LPC_HICR5);
+       val &= ~LPC_HICR5_ENFWH;
+       writel(val, AST_LPC_BASE + AST_LPC_HICR5);
+
        gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
        gd->flags = 0;
 
--

2.17.1

Signature · 2 lines
Regards,
Kun
#6 lore raw

Re: [PATCH u-boot 4/4] aspeed: Disable unnecessary features

Hi Kun,

It's probably safe to reply to this now :)

Quoted 7 lines · Kun Yi

Thanks for sending the patch Andrew. I think it's a viable solution since linux upstream didn't like the idea of misc controls.

My feature request would be that we add config options for selectively turning these features on/off. For example, we actually use LPC2AHB and PCIe2AHB downstream for host-BMC mailbox typed transfers.. It would be nice if we could take this patch and define the flags to enable what we needed.

We've included the patch via bitbake but I think wee should work to get it applied to the u-boot repository. I think you're probably right - having some control over which features are enabled or disabled would be nice. The way I see this working is that the bitbake magic simply selects the desired configuration rather than applying the patch.

Andrew