yosemite4: enable mctp-i3c between BMC and SD BIC
Use MCTP-I3C between BMC and SD BIC for ASPEED BMC.
Change-Id: Ic2af8fe54e8995549e04b64fff2f052a7137b331
Signed-off-by: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
diff --git a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/mctp-config b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/mctp-config
index ded51ae..e988280 100644
--- a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/mctp-config
+++ b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/mctp-config
@@ -6,28 +6,15 @@
# shellcheck source=meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions
. /usr/libexec/yosemite4-common-functions
-is_nuvoton_board="$(check_nuvoton_board)"
-
busnum=0
-if [ -n "$is_nuvoton_board" ]; then
- # Enable MCTP-I3C for Nuvoton BMC
- # The Sentinel Dome BICs are after the I3C hub on I3C bus0 and bus1.
- while [ $busnum -le 1 ]
- do
- mctp link set mctpi3c${busnum} up
- mctp addr add ${localEid} dev mctpi3c${busnum}
- busnum=$((busnum+1))
- done
-else
- # Enable MCTP-I2C for ASPEED BMC
- # The Sentinel Dome BICs are on the i2c bus0 to bus7.
- while [ $busnum -le 7 ]
- do
- mctp link set mctpi2c${busnum} up
- mctp addr add ${localEid} dev mctpi2c${busnum}
- busnum=$((busnum+1))
- done
-fi
+# Enable MCTP-I3C for BMC
+# The Sentinel Dome BICs are after the I3C hub on I3C bus0 and bus1.
+while [ $busnum -le 1 ]
+do
+ mctp link set mctpi3c${busnum} up
+ mctp addr add ${localEid} dev mctpi3c${busnum}
+ busnum=$((busnum+1))
+done
# The NICs are on the i2c bus24 to bus27.
busnum=24
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/probe-slot-device b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/probe-slot-device
index f99c7ee..1b3da3a 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/probe-slot-device
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/probe-slot-device
@@ -2,8 +2,6 @@
# shellcheck source=meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions
source /usr/libexec/yosemite4-common-functions
-is_nuvoton_board="$(check_nuvoton_board)"
-
HOST_BUS=$(($1 - 1))
HOST_VIRTUAL_BUS=$(($1 + 15))
# probe server board cpld I/O expander
@@ -17,9 +15,6 @@
echo $HOST_VIRTUAL_BUS-0051 > /sys/bus/i2c/drivers/at24/bind
echo $HOST_VIRTUAL_BUS-0054 > /sys/bus/i2c/drivers/at24/bind
-if [ -n "$is_nuvoton_board" ]
-then
- # Set interface of SD BIC to I3C
- GPIOCHIP=$(basename /sys/bus/i2c/devices/$HOST_BUS-0023/*gpiochip*)
- gpioset "$GPIOCHIP" 24=1
-fi
+# Set interface of SD BIC to I3C
+GPIOCHIP=$(basename /sys/bus/i2c/devices/$HOST_BUS-0023/*gpiochip*)
+gpioset "$GPIOCHIP" 24=1
diff --git a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-early-sys-init b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-early-sys-init
index 4b21d8d..cef96b2 100644
--- a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-early-sys-init
+++ b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-early-sys-init
@@ -34,6 +34,13 @@
set_sd_bic_interface_to_i3c()
{
+ if [ -z "$is_nuvoton_board" ]
+ then
+ # enable hot-join for I3C devices
+ echo "1" > /sys/bus/i3c/devices/i3c-0/hotjoin
+ echo "1" > /sys/bus/i3c/devices/i3c-1/hotjoin
+ fi
+
for host_bus in $(seq 0 7);
do
GPIOCHIP=$(basename /sys/bus/i2c/devices/"$host_bus"-0023/*gpiochip*)
@@ -88,10 +95,7 @@
# Set all fan PWM to 80%
set_all_fan_pwm_80_percent
-if [ -n "$is_nuvoton_board" ]
-then
- # Set interface to SD BIC to I3C for Nuvoton BMC
- set_sd_bic_interface_to_i3c
-fi
+# Set interface to SD BIC to I3C for BMC
+set_sd_bic_interface_to_i3c
exit 0