Merge pull request #124 from wistron-corporation/op940_20201105

Add mowgli platform function

meta-ibm/meta-witherspoon/conf/machine/mowgli.conf

@@ -18,7 +18,7 @@ require conf/distro/include/phosphor-aspeednic-use-mac2.inc
 PHOSPHOR_MRW_LICENSE = "Apache-2.0"
 PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 PHOSPHOR_MRW_URI = "git://github.com/ibm-op-release/mowgli-xml"
-PHOSPHOR_MRW_REV = "6fcb0a22cf2b098c7b5fb50974ad8403015b0708"
+PHOSPHOR_MRW_REV = "edbf47e969271c738a5e2ac1a0c688a8b056fb21"
 
 
 

meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/mowgli/obmc/gpio/phosphor-power-supply-0.conf

@@ -0,0 +1,6 @@
+INVENTORY=/system/chassis/motherboard/powersupply0
+DEVPATH=/dev/input/by-path/platform-gpio-keys-event
+KEY=202
+NAME=powersupply0
+DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0068
+EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply

meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/mowgli/obmc/gpio/phosphor-power-supply-1.conf

@@ -0,0 +1,6 @@
+INVENTORY=/system/chassis/motherboard/powersupply1
+DEVPATH=/dev/input/by-path/platform-gpio-keys-event
+KEY=200
+NAME=powersupply1
+DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0069
+EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply

meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend

@@ -7,8 +7,10 @@ FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_
 
 SYSTEMD_LINK_${PN}-presence_append_ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}"
 SYSTEMD_LINK_${PN}-presence_append_mihawk = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}"
+SYSTEMD_LINK_${PN}-presence_append_mowgli = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}"
 
 POWERSUPPLY_ENV_FMT  = "obmc/gpio/phosphor-power-supply-{0}.conf"
 
 SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
 SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_mihawk = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_mowgli = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"

meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mowgli/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf

@@ -0,0 +1,219 @@
+MODE_temp1 = "label"
+MODE_temp2 = "label"
+MODE_temp3 = "label"
+MODE_temp4 = "label"
+MODE_temp5 = "label"
+MODE_temp6 = "label"
+MODE_temp7 = "label"
+MODE_temp8 = "label"
+MODE_temp9 = "label"
+MODE_temp10 = "label"
+MODE_temp11 = "label"
+MODE_temp12 = "label"
+MODE_temp13 = "label"
+MODE_temp14 = "label"
+MODE_temp15 = "label"
+MODE_temp16 = "label"
+MODE_temp17 = "label"
+MODE_temp18 = "label"
+MODE_temp19 = "label"
+MODE_temp20 = "label"
+MODE_temp21 = "label"
+MODE_temp22 = "label"
+MODE_temp23 = "label"
+MODE_temp24 = "label"
+MODE_temp25 = "label"
+MODE_temp26 = "label"
+MODE_temp27 = "label"
+MODE_temp28 = "label"
+
+MODE_power1 = "label"
+MODE_power2 = "label"
+MODE_power3 = "label"
+MODE_power4 = "label"
+MODE_power5 = "label"
+MODE_power6 = "label"
+MODE_power7 = "label"
+MODE_power8 = "label"
+MODE_power9 = "label"
+MODE_power10 = "label"
+MODE_power11 = "label"
+MODE_power12 = "label"
+MODE_power13 = "label"
+MODE_power14 = "label"
+MODE_power15 = "label"
+
+LABEL_temp32 = "core0_temp"
+WARNHI_temp32 = "85000"
+WARNLO_temp32 = "0"
+CRITHI_temp32 = "90000"
+CRITLO_temp32 = "0"
+
+LABEL_temp35 = "core1_temp"
+WARNHI_temp35 = "85000"
+WARNLO_temp35 = "0"
+CRITHI_temp35 = "90000"
+CRITLO_temp35 = "0"
+
+LABEL_temp38 = "core2_temp"
+WARNHI_temp38 = "85000"
+WARNLO_temp38 = "0"
+CRITHI_temp38 = "90000"
+CRITLO_temp38 = "0"
+
+LABEL_temp41 = "core3_temp"
+WARNHI_temp41 = "85000"
+WARNLO_temp41 = "0"
+CRITHI_temp41 = "90000"
+CRITLO_temp41 = "0"
+
+LABEL_temp44 = "core4_temp"
+WARNHI_temp44 = "85000"
+WARNLO_temp44 = "0"
+CRITHI_temp44 = "90000"
+CRITLO_temp44 = "0"
+
+LABEL_temp47 = "core5_temp"
+WARNHI_temp47 = "85000"
+WARNLO_temp47 = "0"
+CRITHI_temp47 = "90000"
+CRITLO_temp47 = "0"
+
+LABEL_temp50 = "core6_temp"
+WARNHI_temp50 = "85000"
+WARNLO_temp50 = "0"
+CRITHI_temp50 = "90000"
+CRITLO_temp50 = "0"
+
+LABEL_temp53 = "core7_temp"
+WARNHI_temp53 = "85000"
+WARNLO_temp53 = "0"
+CRITHI_temp53 = "90000"
+CRITLO_temp53 = "0"
+
+LABEL_temp56 = "core8_temp"
+WARNHI_temp56 = "85000"
+WARNLO_temp56 = "0"
+CRITHI_temp56 = "90000"
+CRITLO_temp56 = "0"
+
+LABEL_temp59 = "core9_temp"
+WARNHI_temp59 = "85000"
+WARNLO_temp59 = "0"
+CRITHI_temp59 = "90000"
+CRITLO_temp59 = "0"
+
+LABEL_temp62 = "core10_temp"
+WARNHI_temp62 = "85000"
+WARNLO_temp62 = "0"
+CRITHI_temp62 = "90000"
+CRITLO_temp62 = "0"
+
+LABEL_temp65 = "core11_temp"
+WARNHI_temp65 = "85000"
+WARNLO_temp65 = "0"
+CRITHI_temp65 = "90000"
+CRITLO_temp65 = "0"
+
+LABEL_temp68 = "core12_temp"
+WARNHI_temp68 = "85000"
+WARNLO_temp68 = "0"
+CRITHI_temp68 = "90000"
+CRITLO_temp68 = "0"
+
+LABEL_temp71 = "core13_temp"
+WARNHI_temp71 = "85000"
+WARNLO_temp71 = "0"
+CRITHI_temp71 = "90000"
+CRITLO_temp71 = "0"
+
+LABEL_temp74 = "core14_temp"
+WARNHI_temp74 = "85000"
+WARNLO_temp74 = "0"
+CRITHI_temp74 = "90000"
+CRITLO_temp74 = "0"
+
+LABEL_temp77 = "core15_temp"
+WARNHI_temp77 = "85000"
+WARNLO_temp77 = "0"
+CRITHI_temp77 = "90000"
+CRITLO_temp77 = "0"
+
+LABEL_temp80 = "core16_temp"
+WARNHI_temp80 = "85000"
+WARNLO_temp80 = "0"
+CRITHI_temp80 = "90000"
+CRITLO_temp80 = "0"
+
+LABEL_temp83 = "core17_temp"
+WARNHI_temp83 = "85000"
+WARNLO_temp83 = "0"
+CRITHI_temp83 = "90000"
+CRITLO_temp83 = "0"
+
+LABEL_temp86 = "core18_temp"
+WARNHI_temp86 = "85000"
+WARNLO_temp86 = "0"
+CRITHI_temp86 = "90000"
+CRITLO_temp86 = "0"
+
+LABEL_temp89 = "core19_temp"
+WARNHI_temp89 = "85000"
+WARNLO_temp89 = "0"
+CRITHI_temp89 = "90000"
+CRITLO_temp89 = "0"
+
+LABEL_temp92 = "core20_temp"
+WARNHI_temp92 = "85000"
+WARNLO_temp92 = "0"
+CRITHI_temp92 = "90000"
+CRITLO_temp92 = "0"
+
+LABEL_temp95 = "core21_temp"
+WARNHI_temp95 = "85000"
+WARNLO_temp95 = "0"
+CRITHI_temp95 = "90000"
+CRITLO_temp95 = "0"
+
+LABEL_temp98 = "core22_temp"
+WARNHI_temp98 = "85000"
+WARNLO_temp98 = "0"
+CRITHI_temp98 = "90000"
+CRITLO_temp98 = "0"
+
+LABEL_temp101 = "core23_temp"
+WARNHI_temp101 = "85000"
+WARNLO_temp101 = "0"
+CRITHI_temp101 = "90000"
+CRITLO_temp101 = "0"
+
+LABEL_temp27 = "dimm0_temp"
+WARNHI_temp27 = "85000"
+WARNLO_temp27 = "0"
+CRITHI_temp27 = "95000"
+CRITLO_temp27 = "0"
+
+LABEL_temp28 = "dimm1_temp"
+WARNHI_temp28 = "85000"
+WARNLO_temp28 = "0"
+CRITHI_temp28 = "95000"
+CRITLO_temp28 = "0"
+
+LABEL_temp29 = "dimm2_temp"
+WARNHI_temp29 = "85000"
+WARNLO_temp29 = "0"
+CRITHI_temp29 = "95000"
+CRITLO_temp29 = "0"
+
+LABEL_temp30 = "dimm3_temp"
+WARNHI_temp30 = "85000"
+WARNLO_temp30 = "0"
+CRITHI_temp30 = "95000"
+CRITLO_temp30 = "0"
+
+LABEL_power0_1_1 = "mem_power"
+LABEL_power0_5_2 = "vdd_power"
+LABEL_power0_13_3 = "io_power"
+LABEL_power0_16_4 = "fan_power"
+LABEL_power0_18_5 = "storage_power"
+LABEL_powersystem = "total_power"

meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend

@@ -102,6 +102,9 @@ OCCS = " \
         00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \
         00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \
         "
+OCCS_mowgli = " \
+        00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \
+        "
 OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf"
 OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}"
 
@@ -111,6 +114,7 @@ SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS
 SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
 SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}"
 SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mowgli = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mowgli = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}"
 
 SYSTEMD_ENVIRONMENT_FILE_max31785-msl_append_ibm-ac-server = " obmc/hwmon-max31785/max31785.conf"
 SYSTEMD_LINK_max31785-msl_append_ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service"