Update OCC monitoring services for new paths

6 files changed, 28 insertions, 11 deletions

diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig
index 949846c5a..8b7c57c18 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig
@@ -196,7 +196,7 @@ CONFIG_FSI_MASTER_GPIO=y
 CONFIG_FSI_MASTER_HUB=y
 CONFIG_FSI_SCOM=y
 CONFIG_FSI_SBEFIFO=y
-CONFIG_OCCFIFO=y
+CONFIG_FSI_OCC=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FANOTIFY=y
 CONFIG_OVERLAY_FS=y
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/occ-active.sh b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/occ-active.sh
index f378b566b..ffd1e6bd0 100755
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/occ-active.sh
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/occ-active.sh
@@ -47,6 +47,12 @@ if [ "$value" == "true" ]; then
 
 	# Rescan bus to find OCCs
 	openpower-proc-control scanFSI
+
+	# Bind OCCs
+	echo occ-hwmon.1 > /sys/bus/platform/drivers/occ-hwmon/bind
+	if [ $CPU_COUNT -gt 1 ]; then
+		echo occ-hwmon.2 > /sys/bus/platform/drivers/occ-hwmon/bind
+	fi
 fi
 
 busctl tree $OCC_CONTROL_SERVICE --list | grep occ | xargs -r -n1 -I{} \
@@ -59,8 +65,8 @@ if [ "$value" == "true" ]; then
 	systemctl restart phosphor-fan-control@0.service
 else
         # Unbind all OCC drivers to avoid bus contention on next IPL
-	echo occ1-dev0 > /sys/bus/platform/drivers/occ-hwmon/unbind || true
-	echo occ2-dev0 > /sys/bus/platform/drivers/occ-hwmon/unbind || true
+	echo occ-hwmon.1 > /sys/bus/platform/drivers/occ-hwmon/unbind || true
+	echo occ-hwmon.2 > /sys/bus/platform/drivers/occ-hwmon/unbind || true
 	echo sbefifo1-dev0 > /sys/bus/platform/drivers/occ/unbind || true
 	echo sbefifo2-dev0 > /sys/bus/platform/drivers/occ/unbind || true
 fi
@@ -76,19 +82,20 @@ if [ "$1" == "watchdog" ]; then
 		fi
 
 		OCC_FAULT=0
-		if [ ! -e /sys/bus/platform/drivers/occ/sbefifo1-dev0/occ1-dev0/occ_error ]; then
+		if [ ! -e /sys/bus/platform/drivers/occ/sbefifo1-dev0/occ-hwmon.1/occ_error ]; then
 			OCC_FAULT=1
 		else
-			STATUS=$(cat /sys/bus/platform/drivers/occ/sbefifo1-dev0/occ1-dev0/occ_error)
+			STATUS=$(cat /sys/bus/platform/drivers/occ/sbefifo1-dev0/occ-hwmon.1/occ_error)
 			if [ $STATUS != 0 ]; then
 				OCC_FAULT=1
 			fi
 		fi
 		if [ $CPU_COUNT -gt 1 ]; then
-			if [ ! -e /sys/bus/platform/drivers/occ/sbefifo2-dev0/occ2-dev0/occ_error ]; then
+			if [ ! -e /sys/bus/platform/drivers/occ/sbefifo2-dev0/occ-hwmon.2/occ_error ]; then
 				OCC_FAULT=1
 			fi
 		else
+			STATUS=$(cat /sys/bus/platform/drivers/occ/sbefifo2-dev0/occ-hwmon.2/occ_error)
 			if [ $STATUS != 0 ]; then
 				OCC_FAULT=1
 			fi
@@ -105,8 +112,8 @@ if [ "$1" == "watchdog" ]; then
 			sleep 5
 
 			# Unbind all OCC drivers
-			echo occ1-dev0 > /sys/bus/platform/drivers/occ-hwmon/unbind || true
-			echo occ2-dev0 > /sys/bus/platform/drivers/occ-hwmon/unbind || true
+			echo occ-hwmon.1 > /sys/bus/platform/drivers/occ-hwmon/unbind || true
+			echo occ-hwmon.2 > /sys/bus/platform/drivers/occ-hwmon/unbind || true
 			echo sbefifo1-dev0 > /sys/bus/platform/drivers/occ/unbind || true
 			echo sbefifo2-dev0 > /sys/bus/platform/drivers/occ/unbind || true
 
@@ -119,8 +126,15 @@ if [ "$1" == "watchdog" ]; then
 				exit 0
 			fi
 
+			# Rescan bus to find OCCs
 			openpower-proc-control scanFSI
 
+			# Bind OCCs
+			echo occ-hwmon.1 > /sys/bus/platform/drivers/occ-hwmon/bind
+			if [ $CPU_COUNT -gt 1 ]; then
+				echo occ-hwmon.2 > /sys/bus/platform/drivers/occ-hwmon/bind
+			fi
+
 			# Re-enable OCC service
 			busctl tree $OCC_CONTROL_SERVICE --list | grep occ | xargs -r -n1 -I{} \
 				busctl set-property $OCC_CONTROL_SERVICE {} org.open_power.OCC.Status \
diff --git a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/conf/machine/talos.conf b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/conf/machine/talos.conf
index 092c38e23..352dea78e 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/conf/machine/talos.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/conf/machine/talos.conf
@@ -33,5 +33,8 @@ DISTRO_FEATURES_append = "\
         "
 MACHINE_EXTRA_RDEPENDS += "obmc-ipl-status-led-monitor obmc-hardbeep"
 
+# For kernel debug
+# MACHINE_EXTRA_RDEPENDS += " kernel-modules"
+
 PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "talos-ipmi-inventory-map-native"
 PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "talos-led-manager-config-native"
diff --git a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
index e2d3a1f88..b794bef1a 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
+++ b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
@@ -10,11 +10,11 @@ TALOS_ITEMSFMT = "ahb/apb/{0}.conf"
 TALOS_ITEMS = "${@compose_list(d, 'TALOS_ITEMSFMT', 'TALOS_CHIPS')}"
 
 TALOS_OCCS = " \
-       sbefifo@2400/occ@1/occ-hwmon@1 \
-       hub@3400/cfam@1,0/sbefifo@2400/occ@2/occ-hwmon@2 \
+       00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \
+       00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \
        "
 
-TALOS_OCCSFMT = "gpio-fsi/cfam@0,0/{0}.conf"
+TALOS_OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf"
 TALOS_OCCITEMS = "${@compose_list(d, 'TALOS_OCCSFMT', 'TALOS_OCCS')}"
 
 ENVS = "obmc/hwmon/{0}"
diff --git a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1/occ-hwmon@1.conf b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
index 792ae092c..792ae092c 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1/occ-hwmon@1.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
diff --git a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/gpio-fsi/cfam@0,0/hub@3400/cfam@1,0/sbefifo@2400/occ@2/occ-hwmon@2.conf b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
index 383c70dac..383c70dac 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/gpio-fsi/cfam@0,0/hub@3400/cfam@1,0/sbefifo@2400/occ@2/occ-hwmon@2.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf