[PATCH 00/17] Fix Firestone IPL failure

[PATCH 00/17] Fix Firestone IPL failure

[Timothy Pearson]

This patch series fixes the Firestone IPL failure.
This is v2 of the patch series sent previously.
It includes the following changes:
 * Remove the unneccessary direct setup of the SCU pinmux.
 * Connect the host serial console to SUART1 instead of the VUART.
   This matches the stock configuration of Firestone, where a
   serial cable can be directly attached to the back of the machine
   for hostboot access.
 * Add commit messages and Signed-Off-By lines that were inadvertently
   overlooked in the first series.

Cyril Bur (1):
  arm/dts: Remove mac hardware checksum from Firestone BMC Board

Gavin Shan (1):
  net/phy: Expose 100base-T capability only

Joel Stanley (1):
  phy/broadcom: Add support for the BCM54210E

Timothy Pearson (14):
  Ensure that the old style MDIO interface is active before registering
        the MDIO bus on Faraday style MACs.  Without this patch the
    hardware     may continue to expect new style commands, yielding
    MDIO timeouts     and general lack of communication with the MII.
  Allow no-hw-checksum override in devicetree outside of NCSI mode.
  mach-aspeed: Add missing Firestone setup method and call
  pinctrl-aspeed-g4: Add definition for GPIO pins J2 and O2
  pinctrl-aspeed-g4: Add missing MDIO1 pingroup
  Add missing LEDs to Firestone DT
  Add missing console UART to Firestone DT
  Add missing UARTs to Firestone DT
  Fix Turismo I2C OCC mapping on Firestone
  Enable I2C hub and connected devices in Firestone DT
  Enable RGMII pin functions in Firestone DT
  Enable vuart in Firestone DT
  Add LED expander mapping to Firestone DT
  Enable FSI buffer on Firestone

 arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts |  134 +++++++++++++++++++++++-
 arch/arm/boot/dts/aspeed-g4.dtsi               |    5 +
 arch/arm/mach-aspeed/aspeed.c                  |   14 +++
 drivers/net/ethernet/faraday/ftgmac100.c       |    9 +-
 drivers/net/ethernet/faraday/ftgmac100.h       |    2 +
 drivers/net/phy/broadcom.c                     |   13 +++
 drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c     |   15 ++-
 include/linux/brcmphy.h                        |    2 +
 8 files changed, 185 insertions(+), 9 deletions(-)

-- 
1.7.9.5

[PATCH 01/17] phy/broadcom: Add support for the BCM54210E

[Timothy Pearson]

From: Joel Stanley <joel@jms.id.au>

Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Cyril Bur <cyrilbur@gmail.com>
---
 drivers/net/phy/broadcom.c |   13 +++++++++++++
 include/linux/brcmphy.h    |    2 ++
 2 files changed, 15 insertions(+)

diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 870327e..2d5ba6a 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -592,6 +592,18 @@ static struct phy_driver broadcom_drivers[] = {
 	.read_status	= genphy_read_status,
 	.ack_interrupt	= brcm_fet_ack_interrupt,
 	.config_intr	= brcm_fet_config_intr,
+}, {
+	.phy_id         = PHY_ID_BCM54210E,
+	.phy_id_mask    = 0xfffffff0,
+	.name           = "Broadcom BCM54210E",
+	.features       = PHY_GBIT_FEATURES |
+				SUPPORTED_Pause | SUPPORTED_Asym_Pause,
+	.flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+	.config_init    = bcm54xx_config_init,
+	.config_aneg    = genphy_config_aneg,
+	.read_status    = genphy_read_status,
+	.ack_interrupt  = bcm_phy_ack_intr,
+	.config_intr    = bcm_phy_config_intr,
 } };
 
 module_phy_driver(broadcom_drivers);
@@ -609,6 +621,7 @@ static struct mdio_device_id __maybe_unused broadcom_tbl[] = {
 	{ PHY_ID_BCM57780, 0xfffffff0 },
 	{ PHY_ID_BCMAC131, 0xfffffff0 },
 	{ PHY_ID_BCM5241, 0xfffffff0 },
+	{ PHY_ID_BCM54210E, 0xfffffff0},
 	{ }
 };
 
diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
index e3354b7..f26fc51 100644
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
@@ -35,6 +35,8 @@
 
 #define PHY_ID_BCM_CYGNUS		0xae025200
 
+#define PHY_ID_BCM54210E		0x600d84a0
+
 #define PHY_BCM_OUI_MASK		0xfffffc00
 #define PHY_BCM_OUI_1			0x00206000
 #define PHY_BCM_OUI_2			0x0143bc00
-- 
1.7.9.5

[PATCH 02/17] net/phy: Expose 100base-T capability only

[Timothy Pearson]

From: Gavin Shan <gwshan@linux.vnet.ibm.com>

I don't know the specific PHY model deployed on Firestone BMC, but
currently used one (PHY_ID_BCM54210E) isn't correct. BCM54210E
supports 1000base-T but the PHY on Firestone BMC shouldn't support
that mode as uboot uses 100base-T mode.

When exposing 1000base-T capability, the MAC is forced to have the
same mode though the PHY is working in 100base-T mode in fact. It
causes the mode mismatch between PHY/MAC and the ethernet network
doesn't work.

It's a temporary fix. After the PHY model is confirmed, we need
to enable the correct PHY driver instead current one for BCM54210E.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>

[Cyril]
The plot thickens, it does appear that this IS the correct PHY on
firestones. This patch is definitely required for networking to be
functional though.

Signed-off-by: Cyril Bur <cyrilbur@gmail.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
 drivers/net/phy/broadcom.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 2d5ba6a..4fd7c53 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -596,7 +596,7 @@ static struct phy_driver broadcom_drivers[] = {
 	.phy_id         = PHY_ID_BCM54210E,
 	.phy_id_mask    = 0xfffffff0,
 	.name           = "Broadcom BCM54210E",
-	.features       = PHY_GBIT_FEATURES |
+	.features       = PHY_BASIC_FEATURES |
 				SUPPORTED_Pause | SUPPORTED_Asym_Pause,
 	.flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
 	.config_init    = bcm54xx_config_init,
-- 
1.7.9.5

[PATCH 03/17] Ensure that the old style MDIO interface is active before registering the MDIO bus on Faraday style MACs. Without this patch the hardware may continue to expect new style commands, yielding MDIO timeouts and general lack of communication with the MII.

[Timothy Pearson]

Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
---
 drivers/net/ethernet/faraday/ftgmac100.c |    6 ++++++
 drivers/net/ethernet/faraday/ftgmac100.h |    2 ++
 2 files changed, 8 insertions(+)

diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index c20f767..778c625 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -1250,6 +1250,7 @@ static int ftgmac100_setup_mdio(struct net_device *netdev)
 {
 	struct ftgmac100 *priv = netdev_priv(netdev);
 	struct platform_device *pdev = to_platform_device(priv->dev);
+	uint32_t revcr;
 	int i, err = 0;
 
 	/* initialize mdio bus */
@@ -1257,6 +1258,11 @@ static int ftgmac100_setup_mdio(struct net_device *netdev)
 	if (!priv->mii_bus)
 		return -EIO;
 
+	/* This driver only supports the old MDIO interface -- enable it */
+	revcr = ioread32(priv->base + FTGMAC100_OFFSET_REVR);
+	revcr &= ~FTGMAC100_OFFSET_REVR_NEW_INTERFACE;
+	iowrite32(revcr, priv->base + FTGMAC100_OFFSET_REVR);
+
 	priv->mii_bus->name = "ftgmac100_mdio";
 	snprintf(priv->mii_bus->id, MII_BUS_ID_SIZE, "%s-%d",
 		 pdev->name, pdev->id);
diff --git a/drivers/net/ethernet/faraday/ftgmac100.h b/drivers/net/ethernet/faraday/ftgmac100.h
index d07b6ea..ee5f758 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.h
+++ b/drivers/net/ethernet/faraday/ftgmac100.h
@@ -133,6 +133,8 @@
 #define FTGMAC100_DMAFIFOS_RXDMA_REQ		(1 << 30)
 #define FTGMAC100_DMAFIFOS_TXDMA_REQ		(1 << 31)
 
+#define FTGMAC100_OFFSET_REVR_NEW_INTERFACE	(1 << 31)
+
 /*
  * Receive buffer size register
  */
-- 
1.7.9.5

[PATCH 04/17] Allow no-hw-checksum override in devicetree outside of NCSI mode.

[Timothy Pearson]

This is required for Firestone networking to function correctly.

Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
---
 drivers/net/ethernet/faraday/ftgmac100.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 778c625..3a6367d 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -1423,8 +1423,7 @@ static int ftgmac100_probe(struct platform_device *pdev)
 	 * in that case.
 	 */
 	netdev->features = NETIF_F_IP_CSUM | NETIF_F_GRO;
-	if (priv->use_ncsi &&
-	    of_get_property(pdev->dev.of_node, "no-hw-checksum", NULL))
+	if (of_get_property(pdev->dev.of_node, "no-hw-checksum", NULL))
 		netdev->features &= ~NETIF_F_IP_CSUM;
 
 
-- 
1.7.9.5

[PATCH 05/17] arm/dts: Remove mac hardware checksum from Firestone BMC Board

[Timothy Pearson]

From: Cyril Bur <cyrilbur@gmail.com>

Hardware checksumming doesn't work.

Without this patch pings work but more complex network interactions like SSH
fail.

Signed-off-by: Cyril Bur <cyrilbur@gmail.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
 arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
index 2ec9e44..ae1a633 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
@@ -51,6 +51,8 @@
 
 &mac0 {
 	status = "okay";
+
+	no-hw-checksum;
 };
 
 &i2c0 {
-- 
1.7.9.5

[PATCH 06/17] mach-aspeed: Add missing Firestone setup method and call

[Timothy Pearson]

Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
---
 arch/arm/mach-aspeed/aspeed.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm/mach-aspeed/aspeed.c b/arch/arm/mach-aspeed/aspeed.c
index 1b0ee11..12a63db 100644
--- a/arch/arm/mach-aspeed/aspeed.c
+++ b/arch/arm/mach-aspeed/aspeed.c
@@ -119,6 +119,18 @@ static void __init do_palmetto_setup(void)
 	writel(0x01C0007F, AST_IO(AST_BASE_SCU | 0x88));
 }
 
+static void __init do_firestone_setup(void)
+{
+	do_common_setup();
+
+	/* Setup PNOR address mapping for 64M flash */
+	writel(0x30000C00, AST_IO(AST_BASE_LPC | 0x88));
+	writel(0xFC0003FF, AST_IO(AST_BASE_LPC | 0x8C));
+
+	/* Override serial destination to use the dedicated serial port */
+	writel(0x00004000, AST_IO(AST_BASE_LPC | 0x174));
+}
+
 static void __init do_garrison_setup(void)
 {
 	do_common_setup();
@@ -196,6 +208,8 @@ static void __init aspeed_init_early(void)
 		do_barreleye_setup();
 	if (of_machine_is_compatible("tyan,palmetto-bmc"))
 		do_palmetto_setup();
+	if (of_machine_is_compatible("ibm,firestone-bmc"))
+		do_firestone_setup();
 	if (of_machine_is_compatible("ibm,garrison-bmc"))
 		do_garrison_setup();
 	if (of_machine_is_compatible("aspeed,ast2500-evb"))
-- 
1.7.9.5

[PATCH 07/17] pinctrl-aspeed-g4: Add definition for GPIO pins J2 and O2

[Timothy Pearson]

This is required for Firestone to boot.

Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
---
 drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
index e356619..610ab48 100644
--- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
@@ -499,6 +499,9 @@ MS_PIN_DECL(E7, GPIOH7, ROMD15, RXD6);
 
 FUNC_GROUP_DECL(UART6, A8, C7, B7, A7, D7, B6, A6, E7);
 
+#define K5 74
+SSSF_PIN_DECL(K5, GPIOJ2, SGPMO, SIG_DESC_SET(SCU84, 10));
+
 #define J3 75
 SSSF_PIN_DECL(J3, GPIOJ3, SGPMI, SIG_DESC_SET(SCU84, 11));
 
@@ -727,10 +730,14 @@ SS_PIN_DECL(V6, GPIOO0, VPIG8);
 SIG_EXPR_LIST_DECL_SINGLE(VPIG9, VPI24, VPI24_DESC, SIG_DESC_SET(SCU88, 9));
 SS_PIN_DECL(Y5, GPIOO1, VPIG9);
 
+#define AA4 114
+SIG_EXPR_LIST_DECL_SINGLE(VPIR0, VPI30, VPI30_DESC, SIG_DESC_SET(SCU88, 10));
+SS_PIN_DECL(AA4, GPIOO2, VPIR0);
+
 FUNC_GROUP_DECL(VPI18, T5, U3, V1, U4, V2, AA22, W5, Y4, AA3, AB2);
 FUNC_GROUP_DECL(VPI24, T5, U3, V1, U4, V2, AA22, W5, Y4, AA3, AB2, V6, Y5);
-FUNC_GROUP_DECL(VPI30, T5, U3, V1, U4, V2, W1, U5, W4, Y3, AA22, W5, Y4, AA3,
-		AB2);
+FUNC_GROUP_DECL(VPI30, T5, U3, V1, U4, V2, W1, U5, W4, Y3, AA4, AA22, W5, Y4,
+		AA3, AB2);
 
 #define Y7 125
 SIG_EXPR_LIST_DECL_SINGLE(GPIOP5, GPIOP5);
@@ -1154,6 +1161,7 @@ static struct pinctrl_pin_desc aspeed_g4_pins[ASPEED_G4_NR_PINS] = {
 	ASPEED_PINCTRL_PIN(J20),
 	ASPEED_PINCTRL_PIN(J21),
 	ASPEED_PINCTRL_PIN(J3),
+	ASPEED_PINCTRL_PIN(K5),
 	ASPEED_PINCTRL_PIN(K18),
 	ASPEED_PINCTRL_PIN(L22),
 	ASPEED_PINCTRL_PIN(N21),
@@ -1189,6 +1197,7 @@ static struct pinctrl_pin_desc aspeed_g4_pins[ASPEED_G4_NR_PINS] = {
 	ASPEED_PINCTRL_PIN(Y4),
 	ASPEED_PINCTRL_PIN(Y5),
 	ASPEED_PINCTRL_PIN(Y7),
+	ASPEED_PINCTRL_PIN(AA4),
 };
 
 static const struct aspeed_pin_group aspeed_g4_groups[] = {
@@ -1231,6 +1240,7 @@ static const struct aspeed_pin_group aspeed_g4_groups[] = {
 	ASPEED_PINCTRL_GROUP(FLBUSY),
 	ASPEED_PINCTRL_GROUP(FLWP),
 	ASPEED_PINCTRL_GROUP(UART6),
+	ASPEED_PINCTRL_GROUP(SGPMO),
 	ASPEED_PINCTRL_GROUP(SGPMI),
 	ASPEED_PINCTRL_GROUP(VGAHS),
 	ASPEED_PINCTRL_GROUP(VGAVS),
@@ -1341,6 +1351,7 @@ static const struct aspeed_pin_function aspeed_g4_functions[] = {
 	ASPEED_PINCTRL_FUNC(FLBUSY),
 	ASPEED_PINCTRL_FUNC(FLWP),
 	ASPEED_PINCTRL_FUNC(UART6),
+	ASPEED_PINCTRL_FUNC(SGPMO),
 	ASPEED_PINCTRL_FUNC(SGPMI),
 	ASPEED_PINCTRL_FUNC(VGAHS),
 	ASPEED_PINCTRL_FUNC(VGAVS),
-- 
1.7.9.5

[PATCH 08/17] pinctrl-aspeed-g4: Add missing MDIO1 pingroup

[Timothy Pearson]

Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
---
 arch/arm/boot/dts/aspeed-g4.dtsi |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 072a921..b2c6b53 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -122,6 +122,11 @@
 						groups = "TIMER6";
 					};
 
+					pinctrl_mdio1_default: mdio1_default {
+						function = "MDIO1";
+						groups = "MDIO1";
+					};
+
 					pinctrl_mdio2_default: mdio2_default {
 						function = "MDIO2";
 						groups = "MDIO2";
-- 
1.7.9.5

[PATCH 09/17] Add missing LEDs to Firestone DT

[Timothy Pearson]

Enable the front panel LEDs controlled directly by BMC GPIOs.

Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
---
 arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
index ae1a633..4f04e76 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
@@ -2,6 +2,8 @@
 
 #include "aspeed-g4.dtsi"
 
+#include <dt-bindings/gpio/aspeed-gpio.h>
+
 / {
 	model = "Firestone BMC";
 	compatible = "ibm,firestone-bmc", "aspeed,ast2400";
@@ -19,6 +21,22 @@
 		reg = < 0x40000000 0x10000000 >;
 	};
 
+	leds {
+		compatible = "gpio-leds";
+
+		heartbeat {
+			gpios = <&gpio ASPEED_GPIO(R, 4) GPIO_ACTIVE_LOW>;
+		};
+
+		power {
+			gpios = <&gpio ASPEED_GPIO(R, 5) GPIO_ACTIVE_LOW>;
+		};
+
+		identify {
+			gpios = <&gpio ASPEED_GPIO(A, 2) GPIO_ACTIVE_LOW>;
+		};
+	};
+
 	ahb {
 		fmc@1e620000 {
 			reg = < 0x1e620000 0x94
-- 
1.7.9.5

[PATCH 10/17] Add missing console UART to Firestone DT

[Timothy Pearson]

This is required for the BMC serial console to function.

Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
---
 arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
index 4f04e76..82df794 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
@@ -73,6 +73,10 @@
 	no-hw-checksum;
 };
 
+&uart5 {
+	status = "okay";
+};
+
 &i2c0 {
 	// grounded
 	status = "disabled";
-- 
1.7.9.5

[PATCH 11/17] Add missing UARTs to Firestone DT

[Timothy Pearson]

Firestone has two additional UARTs.  One is the rear panel
RS-232 serial port, and another is an internal TTL port.

Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
---
 arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
index 82df794..c6e81f4 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
@@ -9,6 +9,8 @@
 	compatible = "ibm,firestone-bmc", "aspeed,ast2400";
 
 	aliases {
+		serial1 = &uart1;
+		serial2 = &uart2;
 		serial4 = &uart5;
 	};
 
@@ -73,6 +75,14 @@
 	no-hw-checksum;
 };
 
+&uart1 {
+	status = "okay";
+};
+
+&uart2 {
+	status = "okay";
+};
+
 &uart5 {
 	status = "okay";
 };
-- 
1.7.9.5

[PATCH 12/17] Fix Turismo I2C OCC mapping on Firestone

[Timothy Pearson]

The existing mapping was looking for only one CPU, and on
the wrong I2C bus.

Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
---
 arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts |   19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
index c6e81f4..9a56510 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
@@ -106,12 +106,29 @@
 };
 
 &i2c4 {
+	status = "okay";
+
 	// turismo
+	occ@50 {
+		compatible = "ibm,occ-i2c";
+		reg = <0x50>;
+	};
+
+	tmp423@98 {
+		compatible = "ti,tmp423";
+		reg = <0x80000098>;
+	};
 };
 
 &i2c5 {
 	status = "okay";
 
+	// turismo
+	occ@50 {
+		compatible = "ibm,occ-i2c";
+		reg = <0x50>;
+	};
+
 	tmp423@98 {
 		compatible = "ti,tmp423";
 		reg = <0x80000098>;
@@ -129,7 +146,7 @@
 };
 
 &i2c8 {
-	// FSI
+	// FSI (bit-banged interface via GPIO)
 	status = "disabled";
 };
 
-- 
1.7.9.5

[PATCH 13/17] Enable I2C hub and connected devices in Firestone DT

[Timothy Pearson]

Firestone contains an I2C hub with mostly uninteresting
(i.e. manufacturing only) devices, except for the main
chassis fan controller.  Add this hub and the fan controller
to the device tree in anticipation of a Linux driver for the
fan controller.

Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
---
 arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
index 9a56510..053fafe 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
@@ -102,7 +102,17 @@
 };
 
 &i2c3 {
+	status = "okay";
+
 	// i2c hub PCA9516A
+	// spruce / madrone PDB
+	// APSS
+	// FIR (fan / SATA backplane)
+	fanctl@52 {
+		compatible = "max,max31785";
+		reg = <0x52>;
+	};
+
 };
 
 &i2c4 {
-- 
1.7.9.5

[PATCH 14/17] Enable RGMII pin functions in Firestone DT

[Timothy Pearson]

This is required for BMC networking to function.

Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
---
 arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
index 053fafe..36c95a0 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
@@ -72,6 +72,9 @@
 &mac0 {
 	status = "okay";
 
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_rgmii1_default &pinctrl_mdio1_default>;
+
 	no-hw-checksum;
 };
 
-- 
1.7.9.5

[PATCH 15/17] Enable vuart in Firestone DT

[Timothy Pearson]

This allows the "startup-hacks" service to load.

Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
---
 arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
index 36c95a0..38f1b4b 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
@@ -9,6 +9,7 @@
 	compatible = "ibm,firestone-bmc", "aspeed,ast2400";
 
 	aliases {
+		serial0 = &vuart;
 		serial1 = &uart1;
 		serial2 = &uart2;
 		serial4 = &uart5;
@@ -209,3 +210,7 @@
 &i2c13 {
 	// i2c hub PCA9516A
 };
+
+&vuart {
+	status = "okay";
+};
-- 
1.7.9.5

[PATCH 16/17] Add LED expander mapping to Firestone DT

[Timothy Pearson]

There is a driver in the Linux kernel for the PCA9552 but it
is not yet devicetree-enabled.

Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
---
 arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts |   54 ++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
index 38f1b4b..8b25ba7 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
@@ -176,11 +176,57 @@
 	status = "okay";
 
 	leds@c0 {
-		compatible = "pca,pca9552led";
+		compatible = "nxp,pca9552";
 		reg = <0x800000c0>;
-		// led9 - led_fault_n
-		// led10 - pwr_led_n
-		// led11 - rear_id_led_n
+
+		centaur_present_0 {
+			//
+		};
+		centaur_present_1 {
+			//
+		};
+		centaur_present_2 {
+			//
+		};
+		centaur_present_3 {
+			//
+		};
+		centaur_present_4 {
+			//
+		};
+		centaur_present_5 {
+			//
+		};
+		centaur_present_6 {
+			//
+		};
+		centaur_present_7 {
+			//
+		};
+		no-connect-0 {
+			//
+		};
+		fault {
+			//
+		};
+		power {
+			//
+		};
+		identify-rear {
+			//
+		};
+		no-connect-1 {
+			//
+		};
+		power-supply-smbus-reset {
+			//
+		};
+		spi-vid-standby-reset {
+			//
+		};
+		apss-reset {
+			//
+		};
 	};
 
 	rtc@d0 {
-- 
1.7.9.5

[PATCH 17/17] Enable FSI buffer on Firestone

[Timothy Pearson]

Firestone contains a buffer in the FSI path that can be disabled.
Ensure that this buffer is enabled to allow boot.

Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
---
 arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
index 8b25ba7..65e9549 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
@@ -257,6 +257,15 @@
 	// i2c hub PCA9516A
 };
 
+&gpio {
+	cp0_fsi0_data_en {
+		gpio-hog;
+		gpios = <ASPEED_GPIO(H, 6) GPIO_ACTIVE_HIGH>;
+		output-high;
+		line-name = "cp0_fsi0_data_en";
+	};
+};
+
 &vuart {
 	status = "okay";
 };
-- 
1.7.9.5

Re: [PATCH 03/17] Ensure that the old style MDIO interface is active before registering the MDIO bus on Faraday style MACs. Without this patch the hardware may continue to expect new style commands, yielding MDIO timeouts and general lack of communication with the MII.

[Andrew Jeffery]

[-- Attachment #1: Type: text/plain, Size: 1991 bytes --]

It looks like your entire commit message went into the subject...

On Fri, 2016-09-16 at 15:35 -0500, Timothy Pearson wrote:
> Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
> ---
>  drivers/net/ethernet/faraday/ftgmac100.c |    6 ++++++
>  drivers/net/ethernet/faraday/ftgmac100.h |    2 ++
>  2 files changed, 8 insertions(+)
> 
> diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
> index c20f767..778c625 100644
> --- a/drivers/net/ethernet/faraday/ftgmac100.c
> +++ b/drivers/net/ethernet/faraday/ftgmac100.c
> @@ -1250,6 +1250,7 @@ static int ftgmac100_setup_mdio(struct net_device *netdev)
>  {
>  	struct ftgmac100 *priv = netdev_priv(netdev);
>  	struct platform_device *pdev = to_platform_device(priv->dev);
> +	uint32_t revcr;
>  	int i, err = 0;
>  
>  	/* initialize mdio bus */
> @@ -1257,6 +1258,11 @@ static int ftgmac100_setup_mdio(struct net_device *netdev)
>  	if (!priv->mii_bus)
>  		return -EIO;
>  
> +	/* This driver only supports the old MDIO interface -- enable it */
> +	revcr = ioread32(priv->base + FTGMAC100_OFFSET_REVR);
> +	revcr &= ~FTGMAC100_OFFSET_REVR_NEW_INTERFACE;
> +	iowrite32(revcr, priv->base + FTGMAC100_OFFSET_REVR);

Did you have any thoughts on my comments from v1 for this change?

Cheers,

Andrew

> +
>  	priv->mii_bus->name = "ftgmac100_mdio";
>  	snprintf(priv->mii_bus->id, MII_BUS_ID_SIZE, "%s-%d",
>  		 pdev->name, pdev->id);
> diff --git a/drivers/net/ethernet/faraday/ftgmac100.h b/drivers/net/ethernet/faraday/ftgmac100.h
> index d07b6ea..ee5f758 100644
> --- a/drivers/net/ethernet/faraday/ftgmac100.h
> +++ b/drivers/net/ethernet/faraday/ftgmac100.h
> @@ -133,6 +133,8 @@
>  #define FTGMAC100_DMAFIFOS_RXDMA_REQ		(1 << 30)
>  #define FTGMAC100_DMAFIFOS_TXDMA_REQ		(1 << 31)
>  
> +#define FTGMAC100_OFFSET_REVR_NEW_INTERFACE	(1 << 31)
> +
>  /*
>   * Receive buffer size register
>   */

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 14/17] Enable RGMII pin functions in Firestone DT

[Andrew Jeffery]

[-- Attachment #1: Type: text/plain, Size: 803 bytes --]

On Fri, 2016-09-16 at 15:35 -0500, Timothy Pearson wrote:
> This is required for BMC networking to function.
> 
> Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>

Acked-by: Andrew Jeffery <andrew@aj.id.au>

> ---
>  arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts |    3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
> index 053fafe..36c95a0 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
> @@ -72,6 +72,9 @@
>  &mac0 {
>  	status = "okay";
>  
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&pinctrl_rgmii1_default &pinctrl_mdio1_default>;
> +
>  	no-hw-checksum;
>  };
>  

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 08/17] pinctrl-aspeed-g4: Add missing MDIO1 pingroup

[Andrew Jeffery]

[-- Attachment #1: Type: text/plain, Size: 784 bytes --]

On Fri, 2016-09-16 at 15:35 -0500, Timothy Pearson wrote:
> Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>

Reviewed-by: Andrew Jeffery <andrew@aj.id.au>

> ---
>  arch/arm/boot/dts/aspeed-g4.dtsi |    5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
> index 072a921..b2c6b53 100644
> --- a/arch/arm/boot/dts/aspeed-g4.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g4.dtsi
> @@ -122,6 +122,11 @@
>  						groups = "TIMER6";
>  					};
>  
> +					pinctrl_mdio1_default: mdio1_default {
> +						function = "MDIO1";
> +						groups = "MDIO1";
> +					};
> +
>  					pinctrl_mdio2_default: mdio2_default {
>  						function = "MDIO2";
>  						groups = "MDIO2";

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 07/17] pinctrl-aspeed-g4: Add definition for GPIO pins J2 and O2

[Andrew Jeffery]

[-- Attachment #1: Type: text/plain, Size: 3283 bytes --]

On Fri, 2016-09-16 at 15:35 -0500, Timothy Pearson wrote:
> This is required for Firestone to boot.
> 
> Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>

As mentioned I will integrate this with my patches to add the rest of
the pins, but regardless:

Reviewed-by: Andrew Jeffery <andrew@aj.id.au>

> ---
>  drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c |   15 +++++++++++++--
>  1 file changed, 13 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
> index e356619..610ab48 100644
> --- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
> +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
> @@ -499,6 +499,9 @@ MS_PIN_DECL(E7, GPIOH7, ROMD15, RXD6);
>  
>  FUNC_GROUP_DECL(UART6, A8, C7, B7, A7, D7, B6, A6, E7);
>  
> +#define K5 74
> +SSSF_PIN_DECL(K5, GPIOJ2, SGPMO, SIG_DESC_SET(SCU84, 10));
> +
>  #define J3 75
>  SSSF_PIN_DECL(J3, GPIOJ3, SGPMI, SIG_DESC_SET(SCU84, 11));
>  
> @@ -727,10 +730,14 @@ SS_PIN_DECL(V6, GPIOO0, VPIG8);
>  SIG_EXPR_LIST_DECL_SINGLE(VPIG9, VPI24, VPI24_DESC, SIG_DESC_SET(SCU88, 9));
>  SS_PIN_DECL(Y5, GPIOO1, VPIG9);
>  
> +#define AA4 114
> +SIG_EXPR_LIST_DECL_SINGLE(VPIR0, VPI30, VPI30_DESC, SIG_DESC_SET(SCU88, 10));
> +SS_PIN_DECL(AA4, GPIOO2, VPIR0);
> +
>  FUNC_GROUP_DECL(VPI18, T5, U3, V1, U4, V2, AA22, W5, Y4, AA3, AB2);
>  FUNC_GROUP_DECL(VPI24, T5, U3, V1, U4, V2, AA22, W5, Y4, AA3, AB2, V6, Y5);
> -FUNC_GROUP_DECL(VPI30, T5, U3, V1, U4, V2, W1, U5, W4, Y3, AA22, W5, Y4, AA3,
> -		AB2);
> +FUNC_GROUP_DECL(VPI30, T5, U3, V1, U4, V2, W1, U5, W4, Y3, AA4, AA22, W5, Y4,
> +		AA3, AB2);
>  
>  #define Y7 125
>  SIG_EXPR_LIST_DECL_SINGLE(GPIOP5, GPIOP5);
> @@ -1154,6 +1161,7 @@ static struct pinctrl_pin_desc aspeed_g4_pins[ASPEED_G4_NR_PINS] = {
>  	ASPEED_PINCTRL_PIN(J20),
>  	ASPEED_PINCTRL_PIN(J21),
>  	ASPEED_PINCTRL_PIN(J3),
> +	ASPEED_PINCTRL_PIN(K5),
>  	ASPEED_PINCTRL_PIN(K18),
>  	ASPEED_PINCTRL_PIN(L22),
>  	ASPEED_PINCTRL_PIN(N21),
> @@ -1189,6 +1197,7 @@ static struct pinctrl_pin_desc aspeed_g4_pins[ASPEED_G4_NR_PINS] = {
>  	ASPEED_PINCTRL_PIN(Y4),
>  	ASPEED_PINCTRL_PIN(Y5),
>  	ASPEED_PINCTRL_PIN(Y7),
> +	ASPEED_PINCTRL_PIN(AA4),

We just use sort(1) across the members rather than define them in
datasheet order.

Joel: If you apply this patch can you please sort(1) this list?

>  };
>  
>  static const struct aspeed_pin_group aspeed_g4_groups[] = {
> @@ -1231,6 +1240,7 @@ static const struct aspeed_pin_group aspeed_g4_groups[] = {
>  	ASPEED_PINCTRL_GROUP(FLBUSY),
>  	ASPEED_PINCTRL_GROUP(FLWP),
>  	ASPEED_PINCTRL_GROUP(UART6),
> +	ASPEED_PINCTRL_GROUP(SGPMO),
>  	ASPEED_PINCTRL_GROUP(SGPMI),
>  	ASPEED_PINCTRL_GROUP(VGAHS),
>  	ASPEED_PINCTRL_GROUP(VGAVS),
> @@ -1341,6 +1351,7 @@ static const struct aspeed_pin_function aspeed_g4_functions[] = {
>  	ASPEED_PINCTRL_FUNC(FLBUSY),
>  	ASPEED_PINCTRL_FUNC(FLWP),
>  	ASPEED_PINCTRL_FUNC(UART6),
> +	ASPEED_PINCTRL_FUNC(SGPMO),
>  	ASPEED_PINCTRL_FUNC(SGPMI),
>  	ASPEED_PINCTRL_FUNC(VGAHS),
>  	ASPEED_PINCTRL_FUNC(VGAVS),

Similarly these should be sort(1):ed as well, but I'm not sure we did
that before applying the patches...

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 03/17] Ensure that the old style MDIO interface is active before registering the MDIO bus on Faraday style MACs. Without this patch the hardware may continue to expect new style commands, yielding MDIO timeouts and general lack of communication with the MII.

[Timothy Pearson]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/18/2016 07:51 PM, Andrew Jeffery wrote:
> It looks like your entire commit message went into the subject...

That's what I get for using git format-patch and git send-email.  I
can't wait to find out how those tools managed to mess this one up...

- -- 
Timothy Pearson
Raptor Engineering
+1 (415) 727-8645 (direct line)
+1 (512) 690-0200 (switchboard)
https://www.raptorengineering.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJX4BozAAoJEK+E3vEXDOFbqXgIAItU2ZYI+pgsGQbyGYpX2z6T
dhKgJVnu+giiShEUTt9v5Jf/bhqSyjlZ+IL0tcHOmu8jpw93/JXIUTfAUxEM3j2a
T4SlWJxBhCSyDy2ppJK4DMuoyung1DBWYV0M3nq3H+C87Zv6rMBzfEGKCX5DN7oV
k4jjN9m+V1QM5hdgxQkGNfpN8pnr/q11Ao0a+birGWXA/zmovkhSNWf4Mia3rmG4
jkkzQYWJ0xd/t/GvTaAJIIVKN/Uxa14iX85XLLjiqG2LcB6NS9DyCylCM/+UqDx3
J+L9IhoiTss/56cyHkutaGwtKFMDiMPtUA87YwR9m4kSLPlrhUFTKyVuDCsTVME=
=A33o
-----END PGP SIGNATURE-----

Re: [PATCH 03/17] Ensure that the old style MDIO interface is active before registering the MDIO bus on Faraday style MACs. Without this patch the hardware may continue to expect new style commands, yielding MDIO timeouts and general lack of communication with the MII.

[Timothy Pearson]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/18/2016 07:51 PM, Andrew Jeffery wrote:

I'm going to manually re-send this.  git send-email was the problem.

- -- 
Timothy Pearson
Raptor Engineering
+1 (415) 727-8645 (direct line)
+1 (512) 690-0200 (switchboard)
https://www.raptorengineering.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJX4GtmAAoJEK+E3vEXDOFbOucIAJfGO7qJULaG1hMhHOZmFI+2
axC2eMgGKVAbCMVlcRpfiPH9ekKvQTrIdhdDheOVuOkliLPoxSlJWTMXFwfZuA2q
REGT93tJNASxjSyuHKOIAXi+DON8t5NF4sQpdpZ5yiQm6vmwjplGstuNRTStaf2Z
SznyxvEvhpdmg/0TleqFnZ6qFspjWMe26VXX36emupakf7Rbn3Z5gpa2J9CKUhNP
ETXdXGryQqXMenZBbzCBMLWK/L/56jGF+Py+zgPA64TGlNxTgWA9eE1qXCFl0zV1
z8lRocXLNmxk9Q6IkmzYaiuECL5+i93H+mJNP87aY7g0I6MmXjWQamTkf+1gmNg=
=BG38
-----END PGP SIGNATURE-----

Re: [PATCH 03/17] Ensure that the old style MDIO interface is active before registering the MDIO bus on Faraday style MACs. Without this patch the hardware may continue to expect new style commands, yielding MDIO timeouts and general lack of communication with the MII.

[Andrew Jeffery]

[-- Attachment #1: Type: text/plain, Size: 619 bytes --]

On Mon, 2016-09-19 at 12:02 -0500, Timothy Pearson wrote:
> On 09/18/2016 07:51 PM, Andrew Jeffery wrote:
> > 
> > It looks like your entire commit message went into the subject...
> That's what I get for using git format-patch and git send-email.  I
> can't wait to find out how those tools managed to mess this one up...
> 

Are you generating the patches with `git format-patch`? If so it
/should/ spit out a well-formed patch ready for mailing, and it seems
surprising that patches would be mangled this way.

I'm curious about what the cause was; if it is one of the git tools
please tell!

Andrew

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 03/17] Ensure that the old style MDIO interface is active before registering the MDIO bus on Faraday style MACs. Without this patch the hardware may continue to expect new style commands, yielding MDIO timeouts and general lack of communication with the MII.

[Andrew Jeffery]

[-- Attachment #1: Type: text/plain, Size: 280 bytes --]

On Mon, 2016-09-19 at 17:49 -0500, Timothy Pearson wrote:
> I'm going to manually re-send this.  git send-email was the problem.

Ah; should have read this before replying to the previous email. What
was the problem? It might be helpful to others to explain what went
wrong.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 04/17] Allow no-hw-checksum override in devicetree outside of NCSI mode.

[Joel Stanley]

On Sat, Sep 17, 2016 at 6:05 AM, Timothy Pearson
<tpearson@raptorengineering.com> wrote:
> This is required for Firestone networking to function correctly.
>

This should not be required. Can you please test without this patch
and see if networking works?


> Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
> ---
>  drivers/net/ethernet/faraday/ftgmac100.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
> index 778c625..3a6367d 100644
> --- a/drivers/net/ethernet/faraday/ftgmac100.c
> +++ b/drivers/net/ethernet/faraday/ftgmac100.c
> @@ -1423,8 +1423,7 @@ static int ftgmac100_probe(struct platform_device *pdev)
>          * in that case.
>          */
>         netdev->features = NETIF_F_IP_CSUM | NETIF_F_GRO;
> -       if (priv->use_ncsi &&
> -           of_get_property(pdev->dev.of_node, "no-hw-checksum", NULL))
> +       if (of_get_property(pdev->dev.of_node, "no-hw-checksum", NULL))
>                 netdev->features &= ~NETIF_F_IP_CSUM;
>
>
> --
> 1.7.9.5
>
> _______________________________________________
> openbmc mailing list
> openbmc@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/openbmc

Re: [PATCH 10/17] Add missing console UART to Firestone DT

[Joel Stanley]

On Sat, Sep 17, 2016 at 6:05 AM, Timothy Pearson
<tpearson@raptorengineering.com> wrote:
> This is required for the BMC serial console to function.
>
> Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>

Applied to dev-4.7 as 7b57dfe39d113a776a359226cf7a173d55cd6966.

Cheers,

Joel

Re: [PATCH 11/17] Add missing UARTs to Firestone DT

[Joel Stanley]

On Sat, Sep 17, 2016 at 6:05 AM, Timothy Pearson
<tpearson@raptorengineering.com> wrote:
> Firestone has two additional UARTs.  One is the rear panel
> RS-232 serial port, and another is an internal TTL port.
>
> Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>

Applied to dev-4.7 as 7b57dfe39d113a776a359226cf7a173d55cd6966.

Cheers,

Joel

Re: [PATCH 13/17] Enable I2C hub and connected devices in Firestone DT

[Joel Stanley]

On Sat, Sep 17, 2016 at 6:05 AM, Timothy Pearson
<tpearson@raptorengineering.com> wrote:
> Firestone contains an I2C hub with mostly uninteresting
> (i.e. manufacturing only) devices, except for the main
> chassis fan controller.  Add this hub and the fan controller
> to the device tree in anticipation of a Linux driver for the
> fan controller.
>
> Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>

Applied to dev-4.7 as 8bb42b321129916ba8827e807949eb9a56061781.

Cheers,

Joel

Re: [PATCH 15/17] Enable vuart in Firestone DT

[Joel Stanley]

On Sat, Sep 17, 2016 at 6:05 AM, Timothy Pearson
<tpearson@raptorengineering.com> wrote:
> This allows the "startup-hacks" service to load.
>
> Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>

Applied to dev-4.7 as 3723080882903fc43531867bdcedad7fe92e3f07.

Cheers,

Joel

Re: [PATCH 08/17] pinctrl-aspeed-g4: Add missing MDIO1 pingroup

[Joel Stanley]

On Mon, Sep 19, 2016 at 10:31 AM, Andrew Jeffery <andrew@aj.id.au> wrote:
> On Fri, 2016-09-16 at 15:35 -0500, Timothy Pearson wrote:
>> Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
>
> Reviewed-by: Andrew Jeffery <andrew@aj.id.au>

Thanks for testing this Timothy. Andrew and rolled up your patch into
a larger series that adds all of the ast2400 pins. I will apply his
patches once they are submitted.

Cheers,

Joel

Re: [PATCH 16/17] Add LED expander mapping to Firestone DT

[Joel Stanley]

On Sat, Sep 17, 2016 at 6:05 AM, Timothy Pearson
<tpearson@raptorengineering.com> wrote:
> There is a driver in the Linux kernel for the PCA9552 but it
> is not yet devicetree-enabled.

I will hold off until we have the driver working and can define some
bindings for it.

Cheers,

Joel
>
> Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
> ---
>  arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts |   54 ++++++++++++++++++++++--
>  1 file changed, 50 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
> index 38f1b4b..8b25ba7 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
> @@ -176,11 +176,57 @@
>         status = "okay";
>
>         leds@c0 {
> -               compatible = "pca,pca9552led";
> +               compatible = "nxp,pca9552";
>                 reg = <0x800000c0>;
> -               // led9 - led_fault_n
> -               // led10 - pwr_led_n
> -               // led11 - rear_id_led_n
> +
> +               centaur_present_0 {
> +                       //
> +               };
> +               centaur_present_1 {
> +                       //
> +               };
> +               centaur_present_2 {
> +                       //
> +               };
> +               centaur_present_3 {
> +                       //
> +               };
> +               centaur_present_4 {
> +                       //
> +               };
> +               centaur_present_5 {
> +                       //
> +               };
> +               centaur_present_6 {
> +                       //
> +               };
> +               centaur_present_7 {
> +                       //
> +               };
> +               no-connect-0 {
> +                       //
> +               };
> +               fault {
> +                       //
> +               };
> +               power {
> +                       //
> +               };
> +               identify-rear {
> +                       //
> +               };
> +               no-connect-1 {
> +                       //
> +               };
> +               power-supply-smbus-reset {
> +                       //
> +               };
> +               spi-vid-standby-reset {
> +                       //
> +               };
> +               apss-reset {
> +                       //
> +               };
>         };
>
>         rtc@d0 {
> --
> 1.7.9.5
>
> _______________________________________________
> openbmc mailing list
> openbmc@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/openbmc

Re: [PATCH 02/17] net/phy: Expose 100base-T capability only

[Joel Stanley]

On Sat, Sep 17, 2016 at 6:05 AM, Timothy Pearson
<tpearson@raptorengineering.com> wrote:
> From: Gavin Shan <gwshan@linux.vnet.ibm.com>
>
> I don't know the specific PHY model deployed on Firestone BMC, but
> currently used one (PHY_ID_BCM54210E) isn't correct. BCM54210E
> supports 1000base-T but the PHY on Firestone BMC shouldn't support
> that mode as uboot uses 100base-T mode.
>
> When exposing 1000base-T capability, the MAC is forced to have the
> same mode though the PHY is working in 100base-T mode in fact. It
> causes the mode mismatch between PHY/MAC and the ethernet network
> doesn't work.
>
> It's a temporary fix. After the PHY model is confirmed, we need
> to enable the correct PHY driver instead current one for BCM54210E.

Gavin, have we learnt any more about why this patch might be needed?

Cheers,

Joel

>
> Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
>
> [Cyril]
> The plot thickens, it does appear that this IS the correct PHY on
> firestones. This patch is definitely required for networking to be
> functional though.
>
> Signed-off-by: Cyril Bur <cyrilbur@gmail.com>
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> ---
>  drivers/net/phy/broadcom.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
> index 2d5ba6a..4fd7c53 100644
> --- a/drivers/net/phy/broadcom.c
> +++ b/drivers/net/phy/broadcom.c
> @@ -596,7 +596,7 @@ static struct phy_driver broadcom_drivers[] = {
>         .phy_id         = PHY_ID_BCM54210E,
>         .phy_id_mask    = 0xfffffff0,
>         .name           = "Broadcom BCM54210E",
> -       .features       = PHY_GBIT_FEATURES |
> +       .features       = PHY_BASIC_FEATURES |
>                                 SUPPORTED_Pause | SUPPORTED_Asym_Pause,
>         .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
>         .config_init    = bcm54xx_config_init,
> --
> 1.7.9.5
>

Re: [PATCH 04/17] Allow no-hw-checksum override in devicetree outside of NCSI mode.

[Timothy Pearson]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/23/2016 01:57 AM, Joel Stanley wrote:
> On Sat, Sep 17, 2016 at 6:05 AM, Timothy Pearson
> <tpearson@raptorengineering.com> wrote:
>> This is required for Firestone networking to function correctly.
>>

I did.  It did not work.  DHCP and ping worked but anything more complex
failed; SSH connections timed out, no HTTP access, etc.

- -- 
Timothy Pearson
Raptor Engineering
+1 (415) 727-8645 (direct line)
+1 (512) 690-0200 (switchboard)
https://www.raptorengineering.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJX5UPBAAoJEK+E3vEXDOFbRakH/3g6MII/5bEXjQJiBw9n8AiR
av3vtBecuhaF/hk/wJbxf8LkZKg6gdXTGxy57AY2om/lxv3J/3fYfYzDeV0Y5j8u
k6QTJxFea1XK7Pjj5YlqZ9/58wlN3BGef9X+eQXZOMMGbAYfyTJ5AAf69mOcML45
yazvdzu8+hmrKUX2HFrpzZQ2KCQ3TK9bthDLm3PXicE4f5BYjoOBGJu0Zm2+38Mt
1H8XkMNoJP8r2tcsrX01awR56AqDfctdp06oOhKrLpTsyizxNkTwnOqOO84B8eGA
a9axVamYiHQ+zGqAHtmrX2AWUr8yLK0Dl8YJC8zTNXz+vUPXstsE02ak24Jc7Ko=
=Hr8f
-----END PGP SIGNATURE-----

Re: [PATCH 16/17] Add LED expander mapping to Firestone DT

[Timothy Pearson]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/23/2016 02:42 AM, Joel Stanley wrote:
> On Sat, Sep 17, 2016 at 6:05 AM, Timothy Pearson
> <tpearson@raptorengineering.com> wrote:
>> There is a driver in the Linux kernel for the PCA9552 but it
>> is not yet devicetree-enabled.
> 
> I will hold off until we have the driver working and can define some
> bindings for it.
> 
> Cheers,
> 
> Joel

This is reasonable.  The functions driven by this particular expander
are non-critical.

- -- 
Timothy Pearson
Raptor Engineering
+1 (415) 727-8645 (direct line)
+1 (512) 690-0200 (switchboard)
https://www.raptorengineering.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJX5USvAAoJEK+E3vEXDOFbuqsH/0HoLbsq8Nmc3Hyb+vQ7wQQp
JxifvYc7ptiWEuVNiu+fmYwKfbbrrylcmexQUBAqAhTL3uhy074TQorEXygdLgxq
6KwvX4g4T5olScwzU6oT7sGS58joEMJw7yF3NBFhrUHdVZNqgYz1bgzRp/MDDRDa
kqtenNjSL4LtYF5MdvUSsS1Jq1tlYqkB9hbqKcE9MbjXwBWC+8WaNj11NQJllfVw
3QQDGO1sCnHmlBbPUYBarRv1MVicus4U2V1X6Pph70LqT6RcekqL8ilW0t6ePYDq
LRkDx9WkPKk3binX+Ujyuld4MAQnCwzbgGh8j9sT2yRrht8UzMa9a9pK+Hru8Zo=
=fikF
-----END PGP SIGNATURE-----

Re: [PATCH 07/17] pinctrl-aspeed-g4: Add definition for GPIO pins J2 and O2

[Joel Stanley]

On Sat, Sep 17, 2016 at 6:35 AM, Timothy Pearson
<tpearson@raptorengineering.com> wrote:
> This is required for Firestone to boot.
>
> Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>

These are now part of the dev-4.7 tree as part of Andrew's work.

Cheers,

Joel


> ---
>  drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c |   15 +++++++++++++--
>  1 file changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
> index e356619..610ab48 100644
> --- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
> +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
> @@ -499,6 +499,9 @@ MS_PIN_DECL(E7, GPIOH7, ROMD15, RXD6);
>
>  FUNC_GROUP_DECL(UART6, A8, C7, B7, A7, D7, B6, A6, E7);
>
> +#define K5 74
> +SSSF_PIN_DECL(K5, GPIOJ2, SGPMO, SIG_DESC_SET(SCU84, 10));
> +
>  #define J3 75
>  SSSF_PIN_DECL(J3, GPIOJ3, SGPMI, SIG_DESC_SET(SCU84, 11));
>
> @@ -727,10 +730,14 @@ SS_PIN_DECL(V6, GPIOO0, VPIG8);
>  SIG_EXPR_LIST_DECL_SINGLE(VPIG9, VPI24, VPI24_DESC, SIG_DESC_SET(SCU88, 9));
>  SS_PIN_DECL(Y5, GPIOO1, VPIG9);
>
> +#define AA4 114
> +SIG_EXPR_LIST_DECL_SINGLE(VPIR0, VPI30, VPI30_DESC, SIG_DESC_SET(SCU88, 10));
> +SS_PIN_DECL(AA4, GPIOO2, VPIR0);
> +
>  FUNC_GROUP_DECL(VPI18, T5, U3, V1, U4, V2, AA22, W5, Y4, AA3, AB2);
>  FUNC_GROUP_DECL(VPI24, T5, U3, V1, U4, V2, AA22, W5, Y4, AA3, AB2, V6, Y5);
> -FUNC_GROUP_DECL(VPI30, T5, U3, V1, U4, V2, W1, U5, W4, Y3, AA22, W5, Y4, AA3,
> -               AB2);
> +FUNC_GROUP_DECL(VPI30, T5, U3, V1, U4, V2, W1, U5, W4, Y3, AA4, AA22, W5, Y4,
> +               AA3, AB2);
>
>  #define Y7 125
>  SIG_EXPR_LIST_DECL_SINGLE(GPIOP5, GPIOP5);
> @@ -1154,6 +1161,7 @@ static struct pinctrl_pin_desc aspeed_g4_pins[ASPEED_G4_NR_PINS] = {
>         ASPEED_PINCTRL_PIN(J20),
>         ASPEED_PINCTRL_PIN(J21),
>         ASPEED_PINCTRL_PIN(J3),
> +       ASPEED_PINCTRL_PIN(K5),
>         ASPEED_PINCTRL_PIN(K18),
>         ASPEED_PINCTRL_PIN(L22),
>         ASPEED_PINCTRL_PIN(N21),
> @@ -1189,6 +1197,7 @@ static struct pinctrl_pin_desc aspeed_g4_pins[ASPEED_G4_NR_PINS] = {
>         ASPEED_PINCTRL_PIN(Y4),
>         ASPEED_PINCTRL_PIN(Y5),
>         ASPEED_PINCTRL_PIN(Y7),
> +       ASPEED_PINCTRL_PIN(AA4),
>  };
>
>  static const struct aspeed_pin_group aspeed_g4_groups[] = {
> @@ -1231,6 +1240,7 @@ static const struct aspeed_pin_group aspeed_g4_groups[] = {
>         ASPEED_PINCTRL_GROUP(FLBUSY),
>         ASPEED_PINCTRL_GROUP(FLWP),
>         ASPEED_PINCTRL_GROUP(UART6),
> +       ASPEED_PINCTRL_GROUP(SGPMO),
>         ASPEED_PINCTRL_GROUP(SGPMI),
>         ASPEED_PINCTRL_GROUP(VGAHS),
>         ASPEED_PINCTRL_GROUP(VGAVS),
> @@ -1341,6 +1351,7 @@ static const struct aspeed_pin_function aspeed_g4_functions[] = {
>         ASPEED_PINCTRL_FUNC(FLBUSY),
>         ASPEED_PINCTRL_FUNC(FLWP),
>         ASPEED_PINCTRL_FUNC(UART6),
> +       ASPEED_PINCTRL_FUNC(SGPMO),
>         ASPEED_PINCTRL_FUNC(SGPMI),
>         ASPEED_PINCTRL_FUNC(VGAHS),
>         ASPEED_PINCTRL_FUNC(VGAVS),
> --
> 1.7.9.5
>
> _______________________________________________
> openbmc mailing list
> openbmc@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/openbmc

Re: [PATCH 14/17] Enable RGMII pin functions in Firestone DT

[Joel Stanley]

On Mon, Sep 19, 2016 at 11:00 AM, Andrew Jeffery <andrew@aj.id.au> wrote:
> On Fri, 2016-09-16 at 15:35 -0500, Timothy Pearson wrote:
>> This is required for BMC networking to function.
>>
>> Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
>
> Acked-by: Andrew Jeffery <andrew@aj.id.au>

This is now applied to the dev-4.7 tree.

Cheers,

Joel

>
>> ---
>>  arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts |    3 +++
>>  1 file changed, 3 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
>> index 053fafe..36c95a0 100644
>> --- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
>> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
>> @@ -72,6 +72,9 @@
>>  &mac0 {
>>       status = "okay";
>>
>> +     pinctrl-names = "default";
>> +     pinctrl-0 = <&pinctrl_rgmii1_default &pinctrl_mdio1_default>;
>> +
>>       no-hw-checksum;
>>  };
>>
>
> _______________________________________________
> openbmc mailing list
> openbmc@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/openbmc
>