Merge tag '0.75' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update

23 files changed, 473 insertions, 44 deletions

diff --git a/meta-bytedance/meta-g220a/conf/layer.conf b/meta-bytedance/meta-g220a/conf/layer.conf
index 0d28b4a09..e5a5f96dc 100644
--- a/meta-bytedance/meta-g220a/conf/layer.conf
+++ b/meta-bytedance/meta-g220a/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "g220a-layer"
 BBFILE_PATTERN_g220a-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_g220a-layer = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_g220a-layer = "hardknott honister"
diff --git a/meta-bytedance/meta-g220a/conf/local.conf.sample b/meta-bytedance/meta-g220a/conf/local.conf.sample
index 207786200..f931cdd21 100644
--- a/meta-bytedance/meta-g220a/conf/local.conf.sample
+++ b/meta-bytedance/meta-g220a/conf/local.conf.sample
@@ -1,7 +1,7 @@
 MACHINE ??= "g220a"
 DISTRO ?= "openbmc-phosphor"
 PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " *"
+SANITY_TESTED_DISTROS:append ?= " *"
 EXTRA_IMAGE_FEATURES = "debug-tweaks"
 USER_CLASSES ?= "buildstats image-prelink"
 PATCHRESOLVE = "noop"
@@ -14,4 +14,4 @@ BB_DISKMON_DIRS = "\
     ABORT,${DL_DIR},100M,1K \
     ABORT,${SSTATE_DIR},100M,1K \
     ABORT,/tmp,10M,1K"
-CONF_VERSION = "1"
+CONF_VERSION = "2"
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 db7f7f726..3189e509d 100644
--- a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append_g220a = " file://g220a.cfg \
+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 \
diff --git a/meta-bytedance/meta-g220a/recipes-network/network/static-mac-addr.bb b/meta-bytedance/meta-g220a/recipes-network/network/static-mac-addr.bb
index 130187dd8..5045577a2 100644
--- a/meta-bytedance/meta-g220a/recipes-network/network/static-mac-addr.bb
+++ b/meta-bytedance/meta-g220a/recipes-network/network/static-mac-addr.bb
@@ -2,7 +2,7 @@ SUMMARY = "Enforce static MAC addresses"
 DESCRIPTION = "Set a priority on MAC addresses to run with: \
                factory-specified > u-boot-specified > random"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 PR = "r1"
 LICENSE = "Apache-2.0"
@@ -16,7 +16,7 @@ SRC_URI = "\
 
 inherit obmc-phosphor-systemd
 
-SYSTEMD_SERVICE_${PN} += "${PN}.service"
+SYSTEMD_SERVICE:${PN} += "${PN}.service"
 
 do_install() {
     install -d ${D}${bindir}
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/chassis/x86-power-control_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/chassis/x86-power-control_%.bbappend
index 6ec2a728c..4f9b9ac9e 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/chassis/x86-power-control_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/chassis/x86-power-control_%.bbappend
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += " file://power-config-host0.json"
 
-do_install_append() {
-	    install -d {D}/usr/share/x86-power-control/
+do_install:append() {
+	    install -d ${D}/usr/share/x86-power-control/
 	    install -m 0644 ${WORKDIR}/power-config-host0.json ${D}/usr/share/x86-power-control/
 }
 
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/entity-manager_%.bbappend
index 64ce5cff1..e675c7007 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/entity-manager_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-SRC_URI_append = " file://g220a_baseboard.json \
+FILESEXTRAPATHS:append := ":${THISDIR}/${PN}"
+SRC_URI:append = " file://g220a_baseboard.json \
 		"
-do_install_append() {
+do_install:append() {
      install -d ${D}/usr/share/entity-manager/configurations
      install -m 0444 ${WORKDIR}/*.json ${D}/usr/share/entity-manager/configurations
 }
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config.bb b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config.bb
index 62fe8fe6d..f91dc628a 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config.bb
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config.bb
@@ -25,11 +25,11 @@ do_install() {
         ${D}${datadir}/${BPN}/ipmi-sensors.yaml
 }
 
-FILES_${PN}-dev = " \
+FILES:${PN}-dev = " \
     ${datadir}/${BPN}/ipmi-extra-properties.yaml \
     ${datadir}/${BPN}/ipmi-fru-read.yaml \
     ${datadir}/${BPN}/ipmi-inventory-sensors.yaml \
     ${datadir}/${BPN}/ipmi-sensors.yaml \
     "
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config/g220a-ipmi-inventory-sensors.yaml b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config/g220a-ipmi-inventory-sensors.yaml
index bb2502d1f..26360234d 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config/g220a-ipmi-inventory-sensors.yaml
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config/g220a-ipmi-inventory-sensors.yaml
@@ -1,5 +1,5 @@
 /xyz/openbmc_project/inventory/system/board/G220A:
     eventReadingType: 111
     offset: 2
-    sensorID: 144
+    sensorID: 251
     sensorType: 18
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config/g220a-ipmi-sensors.yaml b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config/g220a-ipmi-sensors.yaml
index 3e68a7aa1..2c731b0a9 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config/g220a-ipmi-sensors.yaml
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config/g220a-ipmi-sensors.yaml
@@ -834,7 +834,7 @@
   sensorType: 4
   serviceInterface: org.freedesktop.DBus.Properties
   unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-165:
+150:
   bExp: 0
   entityID: 50
   entityInstance: 1
@@ -856,7 +856,7 @@
   sensorType: 11
   serviceInterface: org.freedesktop.DBus.Properties
   unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-166:
+151:
   bExp: 0
   entityID: 50
   entityInstance: 1
@@ -878,3 +878,25 @@
   sensorType: 11
   serviceInterface: org.freedesktop.DBus.Properties
   unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
+165:
+  bExp: 0
+  entityID: 10
+  entityInstance: 0
+  interfaces:
+    xyz.openbmc_project.Sensor.Value:
+      Value:
+        Offsets:
+          255:
+            type: double
+  multiplierM: 96
+  mutability: Mutability::Read
+  path: /xyz/openbmc_project/sensors/power/total_power
+  offsetB: 0
+  rExp: 0
+  readingType: readingData
+  scale: 0
+  sensorNamePattern: nameLeaf
+  sensorReadingType: 1
+  sensorType: 11
+  serviceInterface: org.freedesktop.DBus.Properties
+  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend
index a5d722fda..2a5efdb09 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,14 +1,14 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
+FILESEXTRAPATHS:append := ":${THISDIR}/${PN}"
 OBMC_CONSOLE_HOST_TTY = "ttyS2"
 SRC_URI += "file://obmc-console@.service \
            "
 inherit obmc-phosphor-systemd
 
-SYSTEMD_SERVICE_${PN} += " \
+SYSTEMD_SERVICE:${PN} += " \
         ${PN}@${OBMC_CONSOLE_HOST_TTY}.service \
         "
 
-do_install_append() {
-        rm -rf ${D}${base_libdir}/udev/rules.d/80-obmc-console-uart.rules
+do_install:append() {
+        rm -rf ${D}${nonarch_base_libdir}/udev/rules.d/80-obmc-console-uart.rules
         install -m 0644 ${WORKDIR}/${PN}@.service ${D}${systemd_system_unitdir}
 }
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/datetime/me-time-sync.bb b/meta-bytedance/meta-g220a/recipes-phosphor/datetime/me-time-sync.bb
index 776bccfd0..2cb5dfaba 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/datetime/me-time-sync.bb
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/datetime/me-time-sync.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5
 inherit allarch
 inherit obmc-phosphor-systemd
 
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
 S = "${WORKDIR}"
 
@@ -17,4 +17,4 @@ do_install() {
     install -m 0755 ${S}/me-time-sync.sh ${D}${bindir}/me-time-sync.sh
 }
 
-SYSTEMD_SERVICE_${PN} += "me-time-sync.service"
+SYSTEMD_SERVICE:${PN} += "me-time-sync.service"
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
index 66646996c..6e528dcb6 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 inherit obmc-phosphor-systemd
 
-SYSTEMD_SERVICE_${PN} = "phosphor-pid-control.service"
+SYSTEMD_SERVICE:${PN} = "phosphor-pid-control.service"
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 3059e809a..038e65ec8 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1,6 +1,7 @@
-OBMC_IMAGE_EXTRA_INSTALL_append_g220a = " \
+OBMC_IMAGE_EXTRA_INSTALL:append:g220a = " \
     webui-vue \
     me-time-sync \
     static-mac-addr \
     phosphor-node-manager-proxy \
+    phosphor-virtual-sensor \
 "
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 72d991c7e..4fc41d058 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
new file mode 100644
index 000000000..b06eab144
--- /dev/null
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
@@ -0,0 +1,2 @@
+{"id": 32, "revision": 0, "addn_dev_support": 141,
+    "manuf_id": 46045, "prod_id": 0, "aux": 0}
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index 3658c6f85..877a6ef44 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -1,6 +1,6 @@
-DEPENDS_append_g220a= " g220a-yaml-config"
+DEPENDS:append:g220a= " g220a-yaml-config"
 
-EXTRA_OECONF_g220a= " \
+EXTRA_OECONF:g220a= " \
     YAML_GEN=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-fru-read.yaml \
     PROP_YAML=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-extra-properties.yaml \
     "
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 4b5cc5e30..41a26d76c 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-DEPENDS_append_g220a= " g220a-yaml-config"
+DEPENDS:append:g220a= " g220a-yaml-config"
 
-EXTRA_OECONF_g220a= " \
+EXTRA_OECONF:g220a= " \
     SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-sensors.yaml \
     INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-inventory-sensors.yaml \
     FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-fru-read.yaml \
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
index 03c685d1d..c088629fa 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append = " file://ipmb-channels.json"
+SRC_URI:append = " file://ipmb-channels.json"
 
-do_install_append(){
+do_install:append(){
     install -m 0644 -D ${WORKDIR}/ipmb-channels.json \
                    ${D}/usr/share/ipmbbridge/
 }
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
index 8547d9b9b..de2b22cfa 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 KCS_DEVICE = "ipmi_kcs3"
 SMM_DEVICE = "ipmi_kcs4"
-SYSTEMD_SERVICE_${PN}_append = " ${PN}@${SMM_DEVICE}.service "
+SYSTEMD_SERVICE:${PN}:append = " ${PN}@${SMM_DEVICE}.service "
 
 SRC_URI += "file://99-ipmi-kcs.rules"
 
-do_install_append() {
-    install -d ${D}${base_libdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-ipmi-kcs.rules ${D}${base_libdir}/udev/rules.d/
+do_install:append() {
+    install -d ${D}${nonarch_base_libdir}/udev/rules.d
+    install -m 0644 ${WORKDIR}/99-ipmi-kcs.rules ${D}${nonarch_base_libdir}/udev/rules.d/
 }
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
index ff6edc92b..e0f7094d7 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
@@ -1,5 +1,5 @@
 RMCPP_EXTRA = "eth1"
-SYSTEMD_SERVICE_${PN} += " \
+SYSTEMD_SERVICE:${PN} += " \
         ${PN}@${RMCPP_EXTRA}.service \
         ${PN}@${RMCPP_EXTRA}.socket \
         "
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb
index 1fa04843f..4d9dd1b99 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb
@@ -9,7 +9,7 @@ PV = "0.1+git${SRCPV}"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
-SYSTEMD_SERVICE_${PN} = "node-manager-proxy.service"
+SYSTEMD_SERVICE:${PN} = "node-manager-proxy.service"
 
 DEPENDS = "sdbusplus \
            phosphor-logging \
@@ -18,6 +18,6 @@ DEPENDS = "sdbusplus \
 S = "${WORKDIR}/git/"
 inherit cmake systemd
 
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0001-Remove-Total_Power-sensor.patch \
 "
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-bytedance/meta-g220a/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
new file mode 100644
index 000000000..dec59d5fd
--- /dev/null
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
@@ -0,0 +1,396 @@
+[
+    {
+        "Desc":
+        {
+            "Name": "total_power",
+            "SensorType": "power"
+        },
+        "Associations":
+        [
+            [
+                "chassis",
+                "all_sensors",
+                "/xyz/openbmc_project/inventory/system/board/G220A"
+            ]
+        ],
+        "Params":
+        {
+            "DbusParam":
+            [
+                {
+                    "ParamName": "T0",
+                    "Desc":
+                    {
+                        "Name": "PSU0_Input_Power",
+                        "SensorType": "power"
+                    }
+                },
+                {
+                    "ParamName": "T1",
+                    "Desc":
+                    {
+                        "Name": "PSU1_Input_Power",
+                        "SensorType": "power"
+                    }
+                }
+            ]
+        },
+        "Expression": "T0 + T1"
+    },
+    {
+        "Desc":
+        {
+            "Name": "P0_DIMM_VR_Pwr",
+            "SensorType": "power"
+        },
+        "Associations":
+        [
+            [
+                "chassis",
+                "all_sensors",
+                "/xyz/openbmc_project/inventory/system/board/G220A"
+            ]
+        ],
+        "Params":
+        {
+            "DbusParam":
+            [
+                {
+                    "ParamName": "T0",
+                    "Desc":
+                    {
+                        "Name": "CPU0_DIMM_VR_0_Input_Power",
+                        "SensorType": "power"
+                    }
+                },
+                {
+                    "ParamName": "T1",
+                    "Desc":
+                    {
+                        "Name": "CPU0_DIMM_VR_1_Input_Power",
+                        "SensorType": "power"
+                    }
+                }
+            ]
+        },
+        "Expression": "T0 + T1"
+    },
+    {
+        "Desc":
+        {
+            "Name": "P1_DIMM_VR_Pwr",
+            "SensorType": "power"
+        },
+        "Associations":
+        [
+            [
+                "chassis",
+                "all_sensors",
+                "/xyz/openbmc_project/inventory/system/board/G220A"
+            ]
+        ],
+        "Params":
+        {
+            "DbusParam":
+            [
+                {
+                    "ParamName": "T0",
+                    "Desc":
+                    {
+                        "Name": "CPU1_DIMM_VR_0_Input_Power",
+                        "SensorType": "power"
+                    }
+                },
+                {
+                    "ParamName": "T1",
+                    "Desc":
+                    {
+                        "Name": "CPU1_DIMM_VR_1_Input_Power",
+                        "SensorType": "power"
+                    }
+                }
+            ]
+        },
+        "Expression": "T0 + T1"
+    },
+    {
+        "Desc":
+        {
+            "Name": "CPU0_VR_Pwr",
+            "SensorType": "power"
+        },
+        "Associations":
+        [
+            [
+                "chassis",
+                "all_sensors",
+                "/xyz/openbmc_project/inventory/system/board/G220A"
+            ]
+        ],
+        "Params":
+        {
+            "DbusParam":
+            [
+                {
+                    "ParamName": "T0",
+                    "Desc":
+                    {
+                        "Name": "CPU0_VR_0_Input_Power",
+                        "SensorType": "power"
+                    }
+                },
+                {
+                    "ParamName": "T1",
+                    "Desc":
+                    {
+                        "Name": "CPU0_VR_1_Input_Power",
+                        "SensorType": "power"
+                    }
+                },
+                {
+                    "ParamName": "T2",
+                    "Desc":
+                    {
+                        "Name": "CPU0_VR_2_Input_Power",
+                        "SensorType": "power"
+                    }
+                }
+            ]
+        },
+        "Expression": "T0 + T1 + T2"
+    },
+    {
+        "Desc":
+        {
+            "Name": "CPU1_VR_Pwr",
+            "SensorType": "power"
+        },
+        "Associations":
+        [
+            [
+                "chassis",
+                "all_sensors",
+                "/xyz/openbmc_project/inventory/system/board/G220A"
+            ]
+        ],
+        "Params":
+        {
+            "DbusParam":
+            [
+                {
+                    "ParamName": "T0",
+                    "Desc":
+                    {
+                        "Name": "CPU1_VR_0_Input_Power",
+                        "SensorType": "power"
+                    }
+                },
+                {
+                    "ParamName": "T1",
+                    "Desc":
+                    {
+                        "Name": "CPU1_VR_1_Input_Power",
+                        "SensorType": "power"
+                    }
+                },
+                {
+                    "ParamName": "T2",
+                    "Desc":
+                    {
+                        "Name": "CPU1_VR_2_Input_Power",
+                        "SensorType": "power"
+                    }
+                }
+            ]
+        },
+        "Expression": "T0 + T1 + T2"
+    },
+    {
+        "Desc":
+        {
+            "Name": "P0_DIMM_VR_Temp",
+            "SensorType": "temperature"
+        },
+		"Threshold" :
+		{
+			"CriticalHigh": 125,
+			"WarningHigh": 105
+		},
+        "Associations":
+        [
+            [
+                "chassis",
+                "all_sensors",
+                "/xyz/openbmc_project/inventory/system/board/G220A"
+            ]
+        ],
+        "Params":
+        {
+            "DbusParam":
+            [
+                {
+                    "ParamName": "T0",
+                    "Desc":
+                    {
+                        "Name": "CPU0_DIMM_VR_0_Temperature",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "T1",
+                    "Desc":
+                    {
+                        "Name": "CPU0_DIMM_VR_1_Temperature",
+                        "SensorType": "temperature"
+                    }
+                }
+            ]
+        },
+        "Expression": "max(T0, T1)"
+    },
+    {
+        "Desc":
+        {
+            "Name": "P1_DIMM_VR_Temp",
+            "SensorType": "temperature"
+        },
+		"Threshold" :
+		{
+			"CriticalHigh": 125,
+			"WarningHigh": 105
+		},
+        "Associations":
+        [
+            [
+                "chassis",
+                "all_sensors",
+                "/xyz/openbmc_project/inventory/system/board/G220A"
+            ]
+        ],
+        "Params":
+        {
+            "DbusParam":
+            [
+                {
+                    "ParamName": "T0",
+                    "Desc":
+                    {
+                        "Name": "CPU1_DIMM_VR_0_Temperature",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "T1",
+                    "Desc":
+                    {
+                        "Name": "CPU1_DIMM_VR_1_Temperature",
+                        "SensorType": "temperature"
+                    }
+                }
+            ]
+        },
+        "Expression": "max(T0, T1)"
+    },
+    {
+        "Desc":
+        {
+            "Name": "CPU0_VR_Temp",
+            "SensorType": "temperature"
+        },
+		"Threshold" :
+		{
+			"CriticalHigh": 125,
+			"WarningHigh": 105
+		},
+        "Associations":
+        [
+            [
+                "chassis",
+                "all_sensors",
+                "/xyz/openbmc_project/inventory/system/board/G220A"
+            ]
+        ],
+        "Params":
+        {
+            "DbusParam":
+            [
+                {
+                    "ParamName": "T0",
+                    "Desc":
+                    {
+                        "Name": "CPU0_VR_0_Temperature",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "T1",
+                    "Desc":
+                    {
+                        "Name": "CPU0_VR_1_Temperature",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "T2",
+                    "Desc":
+                    {
+                        "Name": "CPU0_VR_2_Temperature",
+                        "SensorType": "temperature"
+                    }
+                }
+            ]
+        },
+        "Expression": "max(T0, T1, T2)"
+    },
+    {
+        "Desc":
+        {
+            "Name": "CPU1_VR_Temp",
+            "SensorType": "temperature"
+        },
+		"Threshold" :
+		{
+			"CriticalHigh": 125,
+			"WarningHigh": 105
+		},
+        "Associations":
+        [
+            [
+                "chassis",
+                "all_sensors",
+                "/xyz/openbmc_project/inventory/system/board/G220A"
+            ]
+        ],
+        "Params":
+        {
+            "DbusParam":
+            [
+                {
+                    "ParamName": "T0",
+                    "Desc":
+                    {
+                        "Name": "CPU1_VR_0_Temperature",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "T1",
+                    "Desc":
+                    {
+                        "Name": "CPU1_VR_1_Temperature",
+                        "SensorType": "temperature"
+                    }
+                },
+                {
+                    "ParamName": "T2",
+                    "Desc":
+                    {
+                        "Name": "CPU1_VR_2_Temperature",
+                        "SensorType": "temperature"
+                    }
+                }
+            ]
+        },
+        "Expression": "max(T0, T1, T2)"
+    }
+]
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
new file mode 100644
index 000000000..9c853669f
--- /dev/null
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI += " \
+    file://virtual_sensor_config.json \
+"
+
+do_install:append() {
+    install -m 0644 -D ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/
+}