diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-23 00:01:54 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-23 00:48:48 +0300 |
commit | 456380bb272d3a301c887eee513a3937cc1f48e1 (patch) | |
tree | 124399167d539582befbe35ad28377eaea6cc8bc /meta-openbmc-mods/meta-ast2500/recipes-kernel | |
parent | 9722c6ee87766a45a337c094d1293de81cdcb106 (diff) | |
download | openbmc-456380bb272d3a301c887eee513a3937cc1f48e1.tar.xz |
Update to internal 10-22-19
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-ast2500/recipes-kernel')
9 files changed, 1 insertions, 926 deletions
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-Report-link-statistics-for-the-NCSI-channel.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-Report-link-statistics-for-the-NCSI-channel.patch deleted file mode 100644 index a79457962..000000000 --- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-Report-link-statistics-for-the-NCSI-channel.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 39ea8eb8a221646ce019bbb176e58be47f4ca03a Mon Sep 17 00:00:00 2001 -From: Johnathan Mantey <johnathanx.mantey@intel.com> -Date: Thu, 1 Aug 2019 11:29:41 -0700 -Subject: [PATCH] Report link statistics for the NCSI channel - -The ftgmac driver does not report the link statistics for the NCSI -channel used for the shared NICs attached to the BMC. Report a fixed -value for the NSCI interface. - -Change-Id: Idb65ca1ce07f06a883417ee44df30ea2c8483107 -Signed-off-by: Johnathan Mantey <johnathanx.mantey@intel.com> ---- - drivers/net/ethernet/faraday/ftgmac100.c | 22 +++++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c -index 055f77c70fa3..974ea44e9195 100644 ---- a/drivers/net/ethernet/faraday/ftgmac100.c -+++ b/drivers/net/ethernet/faraday/ftgmac100.c -@@ -1215,10 +1215,30 @@ static int ftgmac100_set_pauseparam(struct net_device *netdev, - return 0; - } - -+int ftgmac100_ethtool_get_link_ksettings(struct net_device *netdev, -+ struct ethtool_link_ksettings *cmd) -+{ -+ struct phy_device *phydev = netdev->phydev; -+ struct ftgmac100 *priv = netdev_priv(netdev); -+ int retval = 0; -+ -+ if (phydev) { -+ phy_ethtool_ksettings_get(phydev, cmd); -+ } else if (priv->use_ncsi) { -+ cmd->base.speed = SPEED_100; -+ cmd->base.duplex = DUPLEX_FULL; -+ cmd->base.autoneg = 0; -+ } else { -+ retval = -ENODEV; -+ } -+ -+ return retval; -+} -+ - static const struct ethtool_ops ftgmac100_ethtool_ops = { - .get_drvinfo = ftgmac100_get_drvinfo, - .get_link = ethtool_op_get_link, -- .get_link_ksettings = phy_ethtool_get_link_ksettings, -+ .get_link_ksettings = ftgmac100_ethtool_get_link_ksettings, - .set_link_ksettings = phy_ethtool_set_link_ksettings, - .nway_reset = phy_ethtool_nway_reset, - .get_ringparam = ftgmac100_get_ringparam, --- -2.20.1 - diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch deleted file mode 100644 index 782e5e795..000000000 --- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch +++ /dev/null @@ -1,466 +0,0 @@ -From 219406610ce816c56fa7cb5952bbec72fd94a3a9 Mon Sep 17 00:00:00 2001 -From: Yuan Li <yuan.li@linux.intel.com> -Date: Tue, 19 Sep 2017 15:55:39 +0800 -Subject: [PATCH] arm: dts: add DTS for Intel platforms - -Add the DTS file for Intel systems. - -Signed-off-by: Yuan Li <yuan.li@linux.intel.com> -Signed-off-by: Yong Li <yong.b.li@linux.intel.com> -Signed-off-by: James Feist <james.feist@linux.intel.com> -Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> -Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com> -Signed-off-by: Zhu, Yunge <yunge.zhu@linux.intel.com> -Signed-off-by: Qiang XU <qiang.xu@linux.intel.com> -Signed-off-by: Chen Yugang <yugang.chen@linux.intel.com> ---- - arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 437 ++++++++++++++++++++++++++ - 1 file changed, 436 insertions(+) - create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-purley.dts - -diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts -new file mode 100644 -index 0000000..9f8192f ---- /dev/null -+++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts -@@ -0,0 +1,437 @@ -+/dts-v1/; -+ -+#include "aspeed-g5.dtsi" -+#include <dt-bindings/gpio/aspeed-gpio.h> -+#include <dt-bindings/i2c/i2c.h> -+ -+/ { -+ model = "Purley BMC"; -+ compatible = "intel,purley-bmc", "aspeed,ast2500"; -+ -+ aliases { -+ serial4 = &uart5; -+ }; -+ -+ chosen { -+ stdout-path = &uart5; -+ bootargs = "console=ttyS4,115200 earlyprintk"; -+ }; -+ -+ memory@80000000 { -+ reg = <0x80000000 0x20000000>; -+ }; -+ -+ reserved-memory { -+ #address-cells = <1>; -+ #size-cells = <1>; -+ ranges; -+ -+ vga_memory: framebuffer@7f000000 { -+ no-map; -+ reg = <0x7f000000 0x01000000>; -+ }; -+ -+ gfx_memory: framebuffer { -+ size = <0x01000000>; -+ alignment = <0x01000000>; -+ compatible = "shared-dma-pool"; -+ reusable; -+ }; -+ -+ video_engine_memory: jpegbuffer { -+ size = <0x02000000>; /* 32M */ -+ alignment = <0x01000000>; -+ compatible = "shared-dma-pool"; -+ reusable; -+ }; -+ }; -+ -+ vga-shared-memory { -+ compatible = "aspeed,ast2500-vga-sharedmem"; -+ reg = <0x9ff00000 0x100000>; -+ }; -+ -+ iio-hwmon { -+ compatible = "iio-hwmon"; -+ io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>, -+ <&adc 4>, <&adc 5>, <&adc 6>, <&adc 7>, -+ <&adc 8>, <&adc 9>, <&adc 10>, <&adc 11>, -+ <&adc 12>, <&adc 13>, <&adc 14>, <&adc 15>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ identify { -+ default-state = "off"; -+ gpios = <&gpio ASPEED_GPIO(S, 6) GPIO_ACTIVE_LOW>; -+ }; -+ -+ status_amber { -+ default-state = "off"; -+ gpios = <&gpio ASPEED_GPIO(S, 5) GPIO_ACTIVE_LOW>; -+ }; -+ -+ status_green { -+ default-state = "keep"; -+ gpios = <&gpio ASPEED_GPIO(S, 4) GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ beeper { -+ compatible = "pwm-beeper"; -+ pwms = <&timer 5 1000000 0>; -+ }; -+}; -+ -+&fmc { -+ status = "okay"; -+ flash@0 { -+ status = "okay"; -+ m25p,fast-read; -+#include "openbmc-flash-layout-intel-64MB.dtsi" -+ }; -+}; -+ -+&espi { -+ status = "okay"; -+}; -+ -+&jtag { -+ status = "okay"; -+}; -+ -+&peci0 { -+ status = "okay"; -+ gpios = <&gpio ASPEED_GPIO(F, 6) 0>; -+}; -+ -+&syscon { -+ uart-clock-high-speed; -+ status = "okay"; -+}; -+ -+&adc { -+ status = "okay"; -+}; -+ -+&gpio { -+ status = "okay"; -+ gpio-line-names = -+ /*A0-A7*/ "","","","","","","","", -+ /*B0-B7*/ "","","","","","","","", -+ /*C0-C7*/ "","","","","","","","", -+ /*D0-D7*/ "","","","","","","","", -+ /*E0-E7*/ "RESET_BUTTON","RESET_OUT","POWER_BUTTON","POWER_OUT","","","","", -+ /*F0-F7*/ "NMI_OUT","","","","CPU_ERR0","CPU_ERR1","","", -+ /*G0-G7*/ "CPU_ERR2","CPU_CATERR","PCH_BMC_THERMTRIP","","","","","", -+ /*H0-H7*/ "","","","","","","","", -+ /*I0-I7*/ "","","","","","","","", -+ /*J0-J7*/ "","","","","","","","", -+ /*K0-K7*/ "","","","","","","","", -+ /*L0-L7*/ "","","","","","","","", -+ /*M0-M7*/ "","","","","","","","", -+ /*N0-N7*/ "","","","","","","","", -+ /*O0-O7*/ "","","","","","","","", -+ /*P0-P7*/ "","","","","","","","", -+ /*Q0-Q7*/ "","","","","","","","", -+ /*R0-R7*/ "","","","","","","","", -+ /*S0-S7*/ "","","","","","","","", -+ /*T0-T7*/ "","","","","","","","", -+ /*U0-U7*/ "","","","","","","","", -+ /*V0-V7*/ "","","","","","","","", -+ /*W0-W7*/ "","","","","","","","", -+ /*X0-X7*/ "","","","","","","","", -+ /*Y0-Y7*/ "SIO_S3","SIO_S5","","SIO_ONCONTROL","","","","", -+ /*Z0-Z7*/ "","SIO_POWER_GOOD","","","","","","", -+ /*AA0-AA7*/ "P3VBAT_BRIDGE_EN","","","","","","SMI","POST_COMPLETE", -+ /*AB0-AB7*/ "","NMI_BUTTON","ID_BUTTON","PS_PWROK","","","","", -+ /*AC0-AC7*/ "","","","","","","",""; -+}; -+ -+&sgpio { -+ status = "okay"; -+ gpio-line-names = -+ /* SGPIO output lines */ -+ /*OA0-OA7*/ "","","","","","","","", -+ /*OB0-OB7*/ "LED_CPU1_CH1_DIMM1_FAULT","LED_CPU1_CH1_DIMM2_FAULT","LED_CPU1_CH2_DIMM1_FAULT","LED_CPU1_CH2_DIMM2_FAULT","LED_CPU1_CH3_DIMM1_FAULT","LED_CPU1_CH3_DIMM2_FAULT","LED_CPU1_CH4_DIMM1_FAULT","LED_CPU1_CH4_DIMM2_FAULT", -+ /*OC0-OC7*/ "LED_CPU1_CH5_DIMM1_FAULT","LED_CPU1_CH5_DIMM2_FAULT","LED_CPU1_CH6_DIMM1_FAULT","LED_CPU1_CH6_DIMM2_FAULT","LED_FAN1_FAULT","LED_FAN2_FAULT","LED_FAN3_FAULT","LED_FAN4_FAULT", -+ /*OD0-OD7*/ "LED_FAN5_FAULT","LED_FAN6_FAULT","LED_FAN7_FAULT","LED_FAN8_FAULT","LED_CPU2_CH1_DIMM1_FAULT","LED_CPU1_CH1_DIMM2_FAULT","LED_CPU2_CH2_DIMM1_FAULT","LED_CPU2_CH2_DIMM2_FAULT", -+ /*OE0-OE7*/ "LED_CPU2_CH3_DIMM1_FAULT","LED_CPU2_CH3_DIMM2_FAULT","LED_CPU2_CH4_DIMM1_FAULT","LED_CPU2_CH4_DIMM2_FAULT","LED_CPU2_CH5_DIMM1_FAULT","LED_CPU2_CH5_DIMM2_FAULT","LED_CPU2_CH6_DIMM1_FAULT","LED_CPU2_CH6_DIMM2_FAULT", -+ /*OF0-OF7*/ "LED_CPU3_CH1_DIMM1_FAULT","LED_CPU3_CH1_DIMM2_FAULT","LED_CPU3_CH2_DIMM1_FAULT","LED_CPU3_CH2_DIMM2_FAULT","LED_CPU3_CH3_DIMM1_FAULT","LED_CPU3_CH3_DIMM2_FAULT","LED_CPU3_CH4_DIMM1_FAULT","LED_CPU3_CH4_DIMM2_FAULT", -+ /*OG0-OG7*/ "LED_CPU3_CH5_DIMM1_FAULT","LED_CPU3_CH5_DIMM2_FAULT","LED_CPU3_CH6_DIMM1_FAULT","LED_CPU3_CH6_DIMM2_FAULT","LED_CPU4_CH1_DIMM1_FAULT","LED_CPU4_CH1_DIMM2_FAULT","LED_CPU4_CH2_DIMM1_FAULT","LED_CPU4_CH2_DIMM2_FAULT", -+ /*OH0-OH7*/ "LED_CPU4_CH3_DIMM1_FAULT","LED_CPU4_CH3_DIMM2_FAULT","LED_CPU4_CH4_DIMM1_FAULT","LED_CPU4_CH4_DIMM2_FAULT","LED_CPU4_CH5_DIMM1_FAULT","LED_CPU4_CH5_DIMM2_FAULT","LED_CPU4_CH6_DIMM1_FAULT","LED_CPU4_CH6_DIMM2_FAULT", -+ /*OI0-OI7*/ "","","","","","","","", -+ /*OJ0-OJ7*/ "","","","","","","","", -+ /*DUMMY*/ "","","","","","","","", -+ /*DUMMY*/ "","","","","","","","", -+ -+ /* SGPIO input lines */ -+ /*IA0-IA7*/ "CPU1_PRESENCE","","","","","","","", -+ /*IB0-IB7*/ "","","CPU2_PRESENCE","","","","","", -+ /*IC0-IC7*/ "","","","","","","","", -+ /*ID0-ID7*/ "","","","","","","","", -+ /*IE0-IE7*/ "","","","","","","","", -+ /*IF0-IF7*/ "","","","","","","","", -+ /*IG0-IG7*/ "","","","","","","","", -+ /*IH0-IH7*/ "","","","","","","","", -+ /*II0-II7*/ "","","","","","","","", -+ /*IJ0-IJ7*/ "","","","","","","",""; -+}; -+ -+&kcs3 { -+ kcs_addr = <0xCA2>; -+ status = "okay"; -+}; -+ -+&kcs4 { -+ kcs_addr = <0xCA4>; -+ status = "okay"; -+}; -+ -+&lpc_sio { -+ status = "okay"; -+}; -+ -+&lpc_snoop { -+ snoop-ports = <0x80>; -+ status = "okay"; -+}; -+ -+&mbox { -+ status = "okay"; -+}; -+ -+/** -+ * SAFS through SPI1 is available only on Wilson Point. -+ * These pins are used as fan presence checking gpios in WFP -+ * so commenting it out for now. -+ * &spi1 { -+ * status = "okay"; -+ * -+ * flash@0 { -+ * m25p,fast-read; -+ * status = "okay"; -+ * }; -+ *}; -+ */ -+ -+&uart1 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_txd1_default -+ &pinctrl_rxd1_default -+ &pinctrl_nrts1_default -+ &pinctrl_ndtr1_default -+ &pinctrl_ndsr1_default -+ &pinctrl_ncts1_default -+ &pinctrl_ndcd1_default -+ &pinctrl_nri1_default>; -+}; -+ -+&uart2 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_txd2_default -+ &pinctrl_rxd2_default -+ &pinctrl_nrts2_default -+ &pinctrl_ndtr2_default -+ &pinctrl_ndsr2_default -+ &pinctrl_ncts2_default -+ &pinctrl_ndcd2_default -+ &pinctrl_nri2_default>; -+}; -+ -+&uart3 { -+ status = "okay"; -+}; -+ -+&uart4 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <>; -+}; -+ -+&uart5 { -+ status = "okay"; -+}; -+ -+&mac1 { -+ status = "okay"; -+ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>; -+}; -+ -+&mac0 { -+ status = "okay"; -+ use-ncsi; -+ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_rmii1_default>; -+}; -+ -+&i2c0 { -+ multi-master; -+ general-call; -+ aspeed,dma-buf-size = <4095>; -+ aspeed,hw-timeout-ms = <300>; -+ status = "okay"; -+}; -+ -+&i2c1 { -+ multi-master; -+ aspeed,dma-buf-size = <4095>; -+ aspeed,hw-timeout-ms = <300>; -+ status = "okay"; -+}; -+ -+&i2c2 { -+ multi-master; -+ aspeed,dma-buf-size = <4095>; -+ aspeed,hw-timeout-ms = <300>; -+ status = "okay"; -+}; -+ -+&i2c3 { -+ multi-master; -+ aspeed,dma-buf-size = <4095>; -+ aspeed,hw-timeout-ms = <300>; -+ status = "okay"; -+}; -+ -+&i2c4 { -+ multi-master; -+ aspeed,dma-buf-size = <4095>; -+ aspeed,hw-timeout-ms = <300>; -+ status = "okay"; -+ -+ hsbp0@10 { -+ compatible = "slave-mqueue"; -+ reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>; -+ }; -+}; -+ -+&i2c5 { -+ bus-frequency = <1000000>; -+ multi-master; -+ aspeed,dma-buf-size = <4095>; -+ aspeed,hw-timeout-ms = <300>; -+ status = "okay"; -+ -+ smlink0@10 { -+ compatible = "slave-mqueue"; -+ reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>; -+ }; -+}; -+ -+&i2c6 { -+ multi-master; -+ aspeed,dma-buf-size = <4095>; -+ aspeed,hw-timeout-ms = <300>; -+ status = "okay"; -+}; -+ -+&i2c7 { -+ multi-master; -+ #retries = <3>; -+ aspeed,dma-buf-size = <4095>; -+ aspeed,hw-timeout-ms = <300>; -+ status = "okay"; -+}; -+ -+&i2c9 { -+ multi-master; -+ aspeed,dma-buf-size = <4095>; -+ aspeed,hw-timeout-ms = <300>; -+ status = "okay"; -+}; -+ -+&i2c11 { -+ multi-master; -+ aspeed,dma-buf-size = <4095>; -+ aspeed,hw-timeout-ms = <300>; -+ status = "okay"; -+}; -+ -+&i2c13 { -+ multi-master; -+ aspeed,dma-buf-size = <4095>; -+ aspeed,hw-timeout-ms = <300>; -+ status = "okay"; -+}; -+ -+&gfx { -+ status = "okay"; -+ memory-region = <&gfx_memory>; -+}; -+ -+&vuart { -+ status = "okay"; -+}; -+ -+&pwm_tacho { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default -+ &pinctrl_pwm2_default &pinctrl_pwm3_default -+ &pinctrl_pwm4_default &pinctrl_pwm5_default -+ &pinctrl_pwm6_default &pinctrl_pwm7_default>; -+ -+ fan@0 { -+ reg = <0x00>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x00 0x01>; -+ }; -+ fan@1 { -+ reg = <0x01>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x02 0x03>; -+ }; -+ fan@2 { -+ reg = <0x02>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x04 0x05>; -+ }; -+ fan@3 { -+ reg = <0x03>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x06 0x07>; -+ }; -+ fan@4 { -+ reg = <0x04>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x08 0x09>; -+ }; -+ fan@5 { -+ reg = <0x05>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x0A 0x0B>; -+ }; -+ fan@6 { -+ reg = <0x06>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x0C 0x0D>; -+ }; -+ fan@7 { -+ reg = <0x07>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x0E 0x0F>; -+ }; -+ -+}; -+ -+&timer { -+/* -+ * Available settings: -+ * fttmr010,pwm-outputs = <5>, <6>, <7>, <8>; -+ * pinctrl-0 = <&pinctrl_timer5_default &pinctrl_timer6_default -+ * &pinctrl_timer7_default &pinctrl_timer8_default>; -+ */ -+ fttmr010,pwm-outputs = <5>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_timer5_default>; -+ #pwm-cells = <3>; -+ status = "okay"; -+}; -+ -+&video { -+ status = "okay"; -+ memory-region = <&video_engine_memory>; -+}; -+ -+&vhub { -+ status = "okay"; -+}; --- -2.7.4 - diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-aspeed-pwm-tacho-change-default-fan-speed.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-aspeed-pwm-tacho-change-default-fan-speed.patch deleted file mode 100644 index 40afce9be..000000000 --- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-aspeed-pwm-tacho-change-default-fan-speed.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 80795ca1de706c4111ac7e8874e1490e7ebf8100 Mon Sep 17 00:00:00 2001 -From: James Feist <james.feist@linux.intel.com> -Date: Tue, 2 Jul 2019 10:14:59 -0700 -Subject: [PATCH] aspeed-pwm-tacho: change default fan speed - -Change it from max to 58% - -Signed-off-by: James Feist <james.feist@linux.intel.com> ---- - drivers/hwmon/aspeed-pwm-tacho.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/hwmon/aspeed-pwm-tacho.c b/drivers/hwmon/aspeed-pwm-tacho.c -index 40c489be62ea..ae5771f881b5 100644 ---- a/drivers/hwmon/aspeed-pwm-tacho.c -+++ b/drivers/hwmon/aspeed-pwm-tacho.c -@@ -160,7 +160,7 @@ - */ - #define M_TACH_MODE 0x02 /* 10b */ - #define M_TACH_UNIT 0x0210 --#define INIT_FAN_CTRL 0xFF -+#define INIT_FAN_CTRL 150 /* 58% */ - - /* How long we sleep in us while waiting for an RPM result. */ - #define ASPEED_RPM_STATUS_SLEEP_USEC 500 --- -2.17.1 - diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch deleted file mode 100644 index 0ce4163dd..000000000 --- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 56faf4c5a3957012f3a3a8467b3dfde760093784 Mon Sep 17 00:00:00 2001 -From: "Jason M. Bills" <jason.m.bills@linux.intel.com> -Date: Fri, 3 May 2019 16:12:39 -0700 -Subject: [PATCH] Enable pass-through on GPIOE1 and GPIOE3 free - -This change adds a gpio_disable_free() implementation that checks -if the GPIO being freed is GPIOE1 (33) or GPIOE3 (35) and will -re-enable the pass-through mux. - -Tested: -Requested GPIOs 33 and 35 and used devmem to check that pass-through -was disabled. Then freed them and checked that pass-through was -enabled again. - -Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com> ---- - drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 1 + - drivers/pinctrl/aspeed/pinctrl-aspeed.c | 60 ++++++++++++++++++++++++++++++ - drivers/pinctrl/aspeed/pinctrl-aspeed.h | 3 ++ - 3 files changed, 64 insertions(+) - -diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c -index e20e2a259141..fbc9a68bd88c 100644 ---- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c -+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c -@@ -2605,6 +2605,7 @@ static const struct pinmux_ops aspeed_g5_pinmux_ops = { - .get_function_groups = aspeed_pinmux_get_fn_groups, - .set_mux = aspeed_pinmux_set_mux, - .gpio_request_enable = aspeed_gpio_request_enable, -+ .gpio_disable_free = aspeed_gpio_disable_free, - .strict = true, - }; - -diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.c b/drivers/pinctrl/aspeed/pinctrl-aspeed.c -index 18f46177b4af..6feea140b438 100644 ---- a/drivers/pinctrl/aspeed/pinctrl-aspeed.c -+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.c -@@ -356,6 +356,66 @@ int aspeed_gpio_request_enable(struct pinctrl_dev *pctldev, - return aspeed_sig_expr_enable(&pdata->pinmux, expr); - } - -+void aspeed_gpio_disable_free(struct pinctrl_dev *pctldev, -+ struct pinctrl_gpio_range *range, -+ unsigned int offset) -+{ -+ const struct aspeed_pinctrl_data *pdata = pinctrl_dev_get_drvdata(pctldev); -+ const struct aspeed_pin_desc *pdesc = pdata->pins[offset].drv_data; -+ const struct aspeed_sig_expr ***prios, **funcs, *expr; -+ int ret; -+ -+ /* -+ * If we're freeing GPIOE1 (33) or GPIOE3 (35) then re-enable the -+ * pass-through mux setting; otherwise, do nothing. -+ */ -+ if (offset != 33 && offset != 35) -+ return; -+ -+ dev_dbg(pctldev->dev, -+ "Freeing pass-through pin %s (%d). Re-enabling pass-through.\n", -+ pdesc->name, offset); -+ -+ if (!pdesc) -+ return; -+ -+ prios = pdesc->prios; -+ -+ if (!prios) -+ return; -+ -+ /* Disable any functions of higher priority than GPIO just in case */ -+ while ((funcs = *prios)) { -+ if (aspeed_gpio_in_exprs(funcs)) -+ break; -+ -+ ret = aspeed_disable_sig(&pdata->pinmux, funcs); -+ if (ret) -+ return; -+ -+ prios++; -+ } -+ -+ if (!funcs) { -+ char *signals = get_defined_signals(pdesc); -+ -+ pr_warn("No GPIO signal type found on pin %s (%d). Found: %s\n", -+ pdesc->name, offset, signals); -+ kfree(signals); -+ -+ return; -+ } -+ -+ /* -+ * Pass-through should be one priority higher than the GPIO function, -+ * so decrement our prios and enable that function -+ */ -+ prios--; -+ funcs = *prios; -+ expr = *funcs; -+ aspeed_sig_expr_enable(&pdata->pinmux, expr); -+} -+ - int aspeed_pinctrl_probe(struct platform_device *pdev, - struct pinctrl_desc *pdesc, - struct aspeed_pinctrl_data *pdata) -diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.h b/drivers/pinctrl/aspeed/pinctrl-aspeed.h -index 11cc0eb6666b..735162ebb855 100644 ---- a/drivers/pinctrl/aspeed/pinctrl-aspeed.h -+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.h -@@ -64,6 +64,9 @@ int aspeed_pinmux_set_mux(struct pinctrl_dev *pctldev, unsigned int function, - int aspeed_gpio_request_enable(struct pinctrl_dev *pctldev, - struct pinctrl_gpio_range *range, - unsigned int offset); -+void aspeed_gpio_disable_free(struct pinctrl_dev *pctldev, -+ struct pinctrl_gpio_range *range, -+ unsigned int offset); - int aspeed_pinctrl_probe(struct platform_device *pdev, - struct pinctrl_desc *pdesc, - struct aspeed_pinctrl_data *pdata); --- -2.7.4 - diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch deleted file mode 100644 index c38134b8c..000000000 --- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 7513371d16158cb638dd97e81b402bbef7ed3156 Mon Sep 17 00:00:00 2001 -From: "Jason M. Bills" <jason.m.bills@linux.intel.com> -Date: Mon, 6 May 2019 14:18:27 -0700 -Subject: [PATCH] Enable GPIOE0 and GPIOE2 pass-through by default - -This change sets the gpio DT pinctrl default configuration to -enable GPIOE0 and GPIOE2 pass-through. Since this causes -pinctrl_get_select_default() to be called automatically for -the gpio driver to claim the GPIO pins in those groups, we -also need to call pinctrl_put() to release claim on the -pass-through GPIOs so they can be requested at runtime. - -Tested: -Disabled pass-through in uboot and confirmed that after booting -Linux, pass-through is enabled and 'cat /sys/kernel/debug/pinctrl/ -1e6e2000.syscon\:pinctrl-aspeed-g5-pinctrl/pinmux-pins' shows that -the pass-through GPIOs are UNCLAIMED. - -Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com> ---- - arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 4 ++++ - drivers/gpio/gpio-aspeed.c | 10 ++++++++++ - 2 files changed, 14 insertions(+) - -diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts -index b049f816bf67..4815104459f1 100644 ---- a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts -+++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts -@@ -116,6 +116,10 @@ - - &gpio { - status = "okay"; -+ /* Enable GPIOE0 and GPIOE2 pass-through by default */ -+ pinctrl-names = "pass-through"; -+ pinctrl-0 = <&pinctrl_gpie0_default -+ &pinctrl_gpie2_default>; - gpio-line-names = - /*A0-A7*/ "","","","","","","","", - /*B0-B7*/ "","","","","","","","", -diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c -index 13d80bfbc3b6..e426452a28f7 100644 ---- a/drivers/gpio/gpio-aspeed.c -+++ b/drivers/gpio/gpio-aspeed.c -@@ -1152,6 +1152,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) - { - const struct of_device_id *gpio_id; - struct aspeed_gpio *gpio; -+ struct pinctrl *pinctrl; - int rc, i, banks; - - gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL); -@@ -1199,6 +1200,15 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) - return -ENOMEM; - - /* -+ * Select the pass-through pinctrl config to enable the pass-through -+ * mux for GPIOs E0 and E2. Then call pinctrl_put() to release claim -+ * of the GPIO pins, so they can be requested at runtime. -+ */ -+ pinctrl = pinctrl_get_select(&pdev->dev, "pass-through"); -+ if (pinctrl) -+ pinctrl_put(pinctrl); -+ -+ /* - * Populate it with initial values read from the HW and switch - * all command sources to the ARM by default - */ --- -2.7.4 - diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch deleted file mode 100644 index 14b7154bf..000000000 --- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9a71adc7aecbfdf066ba54c763c2ecd8fb09d3cd Mon Sep 17 00:00:00 2001 -From: Vikram Bodireddy <vikram.bodireddy@intel.com> -Date: Wed, 6 Feb 2019 15:59:34 +0530 -Subject: [PATCH] Selecting 128MB for PFR - -PFR platforms requires 128MB flash mapping. -This will override the existing 64MB flash map -and loads 128MB flash map. - -Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com> ---- - arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts -index 4815104459f1..df02bb1aaf36 100644 ---- a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts -+++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts -@@ -89,7 +89,7 @@ - flash@0 { - status = "okay"; - m25p,fast-read; --#include "openbmc-flash-layout-intel-64MB.dtsi" -+#include "openbmc-flash-layout-intel-128MB.dtsi" - }; - }; - --- -2.7.4 - diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0006-Allow-monitoring-of-power-control-input-GPIOs.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0006-Allow-monitoring-of-power-control-input-GPIOs.patch deleted file mode 100644 index c1207055d..000000000 --- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0006-Allow-monitoring-of-power-control-input-GPIOs.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 029cf5d5ff436ea14ab2d33da32238910be0a8b2 Mon Sep 17 00:00:00 2001 -From: "Jason M. Bills" <jason.m.bills@linux.intel.com> -Date: Fri, 24 May 2019 12:42:59 -0700 -Subject: [PATCH] Allow monitoring of power control input GPIOs - -The pass-through input GPIOs cannot be monitored because when -requested, pass-through is disabled which causes a change on the -pass-through output. - -The SIO GPIOs cannot be monitored because when requested, the -request is rejected based on the value of the ACPI strap. - -This change removes the register check condition from the pass- -through and desired SIO GPIOs so they can be requsted and -monitored from power control. - -Tested: -For pass-through, I used gpioset to hold a request on the input -GPIOs and confirmed that pass-through remained enabled. - -For SIO, I used gpioget to confirm that I can successfully request -and read the GPIO value. - -Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com> ---- - drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c -index fbc9a68bd88c..6f151e7c8d81 100644 ---- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c -+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c -@@ -272,7 +272,7 @@ FUNC_GROUP_DECL(SD2, F19, E21, F20, D20, D21, E20, G18, C21); - - #define B20 32 - SIG_EXPR_LIST_DECL_SINGLE(NCTS3, NCTS3, SIG_DESC_SET(SCU80, 16)); --SIG_EXPR_DECL(GPIE0IN, GPIE0, GPIE0_DESC); -+SIG_EXPR_DECL(GPIE0IN, GPIE0); - SIG_EXPR_DECL(GPIE0IN, GPIE, GPIE_DESC); - SIG_EXPR_LIST_DECL_DUAL(GPIE0IN, GPIE0, GPIE); - MS_PIN_DECL(B20, GPIOE0, NCTS3, GPIE0IN); -@@ -292,7 +292,7 @@ FUNC_GROUP_DECL(GPIE0, B20, C20); - - #define F18 34 - SIG_EXPR_LIST_DECL_SINGLE(NDSR3, NDSR3, SIG_DESC_SET(SCU80, 18)); --SIG_EXPR_DECL(GPIE2IN, GPIE2, GPIE2_DESC); -+SIG_EXPR_DECL(GPIE2IN, GPIE2); - SIG_EXPR_DECL(GPIE2IN, GPIE, GPIE_DESC); - SIG_EXPR_LIST_DECL_DUAL(GPIE2IN, GPIE2, GPIE); - MS_PIN_DECL(F18, GPIOE2, NDSR3, GPIE2IN); -@@ -1371,7 +1371,7 @@ FUNC_GROUP_DECL(ADC15, H4); - - #define R22 192 - SIG_EXPR_DECL(SIOS3, SIOS3, SIG_DESC_SET(SCUA4, 8)); --SIG_EXPR_DECL(SIOS3, ACPI, ACPI_DESC); -+SIG_EXPR_DECL(SIOS3, ACPI); - SIG_EXPR_LIST_DECL_DUAL(SIOS3, SIOS3, ACPI); - SIG_EXPR_LIST_DECL_SINGLE(DASHR22, DASHR22, SIG_DESC_SET(SCU94, 10)); - MS_PIN_DECL(R22, GPIOY0, SIOS3, DASHR22); -@@ -1379,7 +1379,7 @@ FUNC_GROUP_DECL(SIOS3, R22); - - #define R21 193 - SIG_EXPR_DECL(SIOS5, SIOS5, SIG_DESC_SET(SCUA4, 9)); --SIG_EXPR_DECL(SIOS5, ACPI, ACPI_DESC); -+SIG_EXPR_DECL(SIOS5, ACPI); - SIG_EXPR_LIST_DECL_DUAL(SIOS5, SIOS5, ACPI); - SIG_EXPR_LIST_DECL_SINGLE(DASHR21, DASHR21, SIG_DESC_SET(SCU94, 10)); - MS_PIN_DECL(R21, GPIOY1, SIOS5, DASHR21); -@@ -1395,7 +1395,7 @@ FUNC_GROUP_DECL(SIOPWREQ, P22); - - #define P21 195 - SIG_EXPR_DECL(SIOONCTRL, SIOONCTRL, SIG_DESC_SET(SCUA4, 11)); --SIG_EXPR_DECL(SIOONCTRL, ACPI, ACPI_DESC); -+SIG_EXPR_DECL(SIOONCTRL, ACPI); - SIG_EXPR_LIST_DECL_DUAL(SIOONCTRL, SIOONCTRL, ACPI); - SIG_EXPR_LIST_DECL_SINGLE(DASHP21, DASHP21, SIG_DESC_SET(SCU94, 11)); - MS_PIN_DECL(P21, GPIOY3, SIOONCTRL, DASHP21); --- -2.7.4 - diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg index 9860a2815..e69de29bb 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg +++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg @@ -1,68 +0,0 @@ -CONFIG_HWMON=y -CONFIG_SENSORS_ASPEED=y -CONFIG_SPI=y -CONFIG_SPI_MASTER=y -CONFIG_IIO=y -CONFIG_SENSORS_IIO_HWMON=y -CONFIG_ASPEED_ADC=y -CONFIG_SGPIO_ASPEED=y -CONFIG_CRC8=y -CONFIG_PECI=y -CONFIG_PECI_CHARDEV=y -CONFIG_PECI_ASPEED=y -CONFIG_SENSORS_PECI_CPUTEMP=y -CONFIG_SENSORS_PECI_DIMMTEMP=y -CONFIG_CONFIGFS_FS=y -CONFIG_BLK_DEV_RAM_SIZE=49152 -CONFIG_MAGIC_SYSRQ=y -CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01 -CONFIG_MAGIC_SYSRQ_SERIAL=y -CONFIG_ASPEED_ESPI_SLAVE=y -CONFIG_ASPEED_KCS_IPMI_BMC=y -CONFIG_I2C_SLAVE=y -CONFIG_I2C_SLAVE_MQUEUE=y -CONFIG_I2C_SLAVE_MQUEUE_MESSAGE_SIZE=256 -CONFIG_I2C_SLAVE_MQUEUE_QUEUE_SIZE=32 -CONFIG_ASPEED_BT_IPMI_BMC=n -CONFIG_ASPEED_LPC_CTRL=n -CONFIG_ASPEED_LPC_MBOX=y -CONFIG_ASPEED_LPC_SIO=y -CONFIG_JTAG=y -CONFIG_JTAG_ASPEED=y -CONFIG_FRAME_VECTOR=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_VIDEO_DEV=y -CONFIG_VIDEO_V4L2=y -CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VIDEO_ASPEED=y -CONFIG_VIDEOBUF2_CORE=y -CONFIG_VIDEOBUF2_V4L2=y -CONFIG_VIDEOBUF2_MEMOPS=y -CONFIG_VIDEOBUF2_DMA_CONTIG=y -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y -CONFIG_USB_GADGET_VBUS_DRAW=2 -CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 -CONFIG_USB_LIBCOMPOSITE=y -CONFIG_USB_F_HID=y -CONFIG_USB_GADGET=y -CONFIG_U_SERIAL_CONSOLE=y -CONFIG_USB_ASPEED_VHUB=y -CONFIG_USB_CONFIGFS=y -CONFIG_USB_CONFIGFS_MASS_STORAGE=y -CONFIG_USB_CONFIGFS_F_FS=y -CONFIG_USB_CONFIGFS_F_HID=y -CONFIG_ASPEED_UART_ROUTING=y -CONFIG_ASPEED_VGA_SHAREDMEM=y -CONFIG_PWM=y -CONFIG_PWM_FTTMR010=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_PWM_BEEPER=y -CONFIG_VFAT_FS=y -CONFIG_NLS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_UTF8=y - diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend index 909e7cccc..9cb4b4eb3 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,10 +1,2 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-aspeed:" -SRC_URI += "file://intel-ast2500.cfg \ - file://0001-arm-dts-add-DTS-for-Intel-platforms.patch \ - file://0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch \ - file://0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch \ - file://0006-Allow-monitoring-of-power-control-input-GPIOs.patch \ - file://0001-aspeed-pwm-tacho-change-default-fan-speed.patch \ - file://0001-Report-link-statistics-for-the-NCSI-channel.patch \ - " -SRC_URI += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'file://0005-128MB-flashmap-for-PFR.patch', '', d)}" +SRC_URI += "file://intel-ast2500.cfg"
\ No newline at end of file |