From 530f068ba17f2e03c2a939eaebff75cd72c356b3 Mon Sep 17 00:00:00 2001 From: Lotus Xu Date: Tue, 20 Oct 2020 16:28:30 +0800 Subject: bytedance: g220a: Enable ipmb Tested : we can see /dev/ipmb-4 on g220a Use `busctl call xyz.openbmc_project.Ipmi.Channel.Ipmb \ "/xyz/openbmc_project/Ipmi/Channel/Ipmb" org.openbmc.Ipmb \ sendRequest yyyyay 0x01 0x0a 0x00 0x48 0` to get ME time correctly (From meta-bytedance rev: 58c6841aee1bd93c1070401ce7ca589367b8e6d0) Signed-off-by: Lotus Xu Change-Id: Ic45173405ec9cd1806b5caa7a5081b6ed0d8fc3e Signed-off-by: Andrew Geissler --- .../0001-bytedance-g220a-Enable-ipmb.patch | 30 ++++++++++++++++++++++ .../recipes-kernel/linux/linux-aspeed/g220a.cfg | 1 + .../recipes-kernel/linux/linux-aspeed_%.bbappend | 1 + .../ipmi/phosphor-ipmi-ipmb/ipmb-channels.json | 10 ++++++++ .../ipmi/phosphor-ipmi-ipmb_%.bbappend | 8 ++++++ 5 files changed, 50 insertions(+) create mode 100644 meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0001-bytedance-g220a-Enable-ipmb.patch create mode 100644 meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json create mode 100644 meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend (limited to 'meta-bytedance') diff --git a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0001-bytedance-g220a-Enable-ipmb.patch b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0001-bytedance-g220a-Enable-ipmb.patch new file mode 100644 index 000000000..de9f2a350 --- /dev/null +++ b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0001-bytedance-g220a-Enable-ipmb.patch @@ -0,0 +1,30 @@ +From 0604e82e69c673c3ce75fa1d856a54ab10611015 Mon Sep 17 00:00:00 2001 +From: Lotus Xu +Date: Wed, 21 Oct 2020 12:42:45 +0800 +Subject: [PATCH] bytedance: g220a:Enable ipmb + +Signed-off-by: Lotus Xu +--- + arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts b/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts +index b66854fa9ade..124b885b03ec 100644 +--- a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts ++++ b/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts +@@ -453,7 +453,11 @@ channel_3_3: i2c@3 { + + &i2c4 { + status = "okay"; +- ++ ipmb0@10 { ++ compatible = "ipmb-dev"; ++ reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>; ++ i2c-protocol; ++ }; + }; + + &i2c5 { +-- +2.25.1 + diff --git a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/g220a.cfg b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/g220a.cfg index 479d751a8..7efe900b0 100644 --- a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/g220a.cfg +++ b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/g220a.cfg @@ -7,3 +7,4 @@ CONFIG_SENSORS_PECI_CPUTEMP=y CONFIG_SENSORS_PECI_DIMMTEMP=y CONFIG_SENSORS_PECI_CPUPOWER=y CONFIG_SENSORS_PECI_DIMMPOWER=y +CONFIG_IPMB_DEVICE_INTERFACE=y diff --git a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend index 0df63c8a1..db7f7f726 100644 --- a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -4,4 +4,5 @@ SRC_URI_append_g220a = " file://g220a.cfg \ file://0003-misc-aspeed-Add-Aspeed-UART-routing-control-driver.patch \ file://0004-ARM-dts-aspeed-Add-uart-routing-node.patch \ file://0005-ARM-dts-aspeed-Enable-g220a-uart-route.patch \ + file://0001-bytedance-g220a-Enable-ipmb.patch \ " diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json new file mode 100644 index 000000000..3d901aee0 --- /dev/null +++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json @@ -0,0 +1,10 @@ +{ + "channels": [ + { + "type": "me", + "slave-path": "/dev/ipmb-4", + "bmc-addr": 32, + "remote-addr": 44 + } + ] +} diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend new file mode 100644 index 000000000..03c685d1d --- /dev/null +++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend @@ -0,0 +1,8 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI_append = " file://ipmb-channels.json" + +do_install_append(){ + install -m 0644 -D ${WORKDIR}/ipmb-channels.json \ + ${D}/usr/share/ipmbbridge/ +} -- cgit v1.2.3