diff options
Diffstat (limited to 'meta-quanta/meta-gbs/recipes-phosphor')
13 files changed, 99 insertions, 29 deletions
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml index 26a785fbe..6747280fd 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml +++ b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml @@ -1082,8 +1082,8 @@ type: string assert: xyz.openbmc_project.Memory.MemoryECC.ECCStatus.LogFull -#SlimSAS Cable0~3 connection -0xF1: &slimsas +#GPIO present connection +0xF1: &gpio_prsnt entityID: 0x1F entityInstance: 0 interfaces: @@ -1097,7 +1097,7 @@ assert: false type: bool mutability: Mutability::Write|Mutability::Read - path: /xyz/openbmc_project/inventory/system/chassis/cable/ss_cab0_prsnt + path: /xyz/openbmc_project/inventory/system/chassis/gpios/ss_cab0_prsnt readingType: assertion sensorNamePattern: nameLeaf sensorReadingType: 0x6f @@ -1105,16 +1105,46 @@ serviceInterface: org.freedesktop.DBus.Properties 0xF2: - <<: *slimsas + <<: *gpio_prsnt entityInstance: 1 - path: /xyz/openbmc_project/inventory/system/chassis/cable/ss_cab1_prsnt + path: /xyz/openbmc_project/inventory/system/chassis/gpios/ss_cab1_prsnt 0xF3: - <<: *slimsas + <<: *gpio_prsnt entityInstance: 2 - path: /xyz/openbmc_project/inventory/system/chassis/cable/ss_cab2_prsnt + path: /xyz/openbmc_project/inventory/system/chassis/gpios/ss_cab2_prsnt 0xF4: - <<: *slimsas + <<: *gpio_prsnt entityInstance: 3 - path: /xyz/openbmc_project/inventory/system/chassis/cable/ss_cab3_prsnt + path: /xyz/openbmc_project/inventory/system/chassis/gpios/ss_cab3_prsnt + +0xF5: + <<: *gpio_prsnt + entityInstance: 4 + path: /xyz/openbmc_project/inventory/system/chassis/gpios/sata0_prsnt + +0xF6: + <<: *gpio_prsnt + entityInstance: 5 + path: /xyz/openbmc_project/inventory/system/chassis/gpios/hsbp_cab_prsnt + +0xF7: + <<: *gpio_prsnt + entityInstance: 6 + path: /xyz/openbmc_project/inventory/system/chassis/gpios/fanbd_cab_prsnt + +0xF8: + <<: *gpio_prsnt + entityInstance: 7 + path: /xyz/openbmc_project/inventory/system/chassis/gpios/bp12v_cab_prsnt + +0xF9: + <<: *gpio_prsnt + entityInstance: 8 + path: /xyz/openbmc_project/inventory/system/chassis/gpios/pe_slot0_prsnt + +0xFA: + <<: *gpio_prsnt + entityInstance: 9 + path: /xyz/openbmc_project/inventory/system/chassis/gpios/pe_slot1_prsnt diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/slimsas-cable-0.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-0.conf index e26c8f50e..e6dfdac67 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/slimsas-cable-0.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-0.conf @@ -1,6 +1,6 @@ #The gpio 70 is a real gpio, which is used to #store the sas cable 0 present signal -INVENTORY=/system/chassis/cable/ss_cab0_prsnt +INVENTORY=/system/chassis/gpios/ss_cab0_prsnt DEVPATH=/dev/input/event0 KEY=70 NAME=ss_cab0_prsnt diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/slimsas-cable-1.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-1.conf index e6a18ee6c..2f3e5f5bc 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/slimsas-cable-1.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-1.conf @@ -1,6 +1,6 @@ #The gpio 71 is a real gpio, which is used to #store the sas cable 1 present signal -INVENTORY=/system/chassis/cable/ss_cab1_prsnt +INVENTORY=/system/chassis/gpios/ss_cab1_prsnt DEVPATH=/dev/input/event0 KEY=71 NAME=ss_cab1_prsnt diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/slimsas-cable-2.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-2.conf index 490f97f49..719311d5f 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/slimsas-cable-2.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-2.conf @@ -1,6 +1,6 @@ #The gpio 72 is a real gpio, which is used to #store the sas cable 2 present signal -INVENTORY=/system/chassis/cable/ss_cab2_prsnt +INVENTORY=/system/chassis/gpios/ss_cab2_prsnt DEVPATH=/dev/input/event0 KEY=72 NAME=ss_cab2_prsnt diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/slimsas-cable-3.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-3.conf index f3579ab97..2e1a82836 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/slimsas-cable-3.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-3.conf @@ -1,6 +1,6 @@ #The gpio 73 is a real gpio, which is used to #store the sas cable 3 present signal -INVENTORY=/system/chassis/cable/ss_cab3_prsnt +INVENTORY=/system/chassis/gpios/ss_cab3_prsnt DEVPATH=/dev/input/event0 KEY=73 NAME=ss_cab3_prsnt diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-4.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-4.conf new file mode 100644 index 000000000..ecd074791 --- /dev/null +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-4.conf @@ -0,0 +1,6 @@ +#The gpio 57 is a real gpio, which is used to +#store the HSBP cable present signal +INVENTORY=/system/chassis/gpios/hsbp_cab_prsnt +DEVPATH=/dev/input/event0 +KEY=57 +NAME=hsbp_cab_prsnt diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-5.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-5.conf new file mode 100644 index 000000000..2838872f8 --- /dev/null +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-5.conf @@ -0,0 +1,6 @@ +#The gpio 58 is a real gpio, which is used to +#store the fan board cable present signal +INVENTORY=/system/chassis/gpios/fanbd_cab_prsnt +DEVPATH=/dev/input/event0 +KEY=58 +NAME=fanbd_cab_prsnt diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-6.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-6.conf new file mode 100644 index 000000000..ca3fbd4b1 --- /dev/null +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-6.conf @@ -0,0 +1,6 @@ +#The gpio 69 is a real gpio, which is used to +#store the HSBP 12V standby cable present signal +INVENTORY=/system/chassis/gpios/bp12v_cab_prsnt +DEVPATH=/dev/input/event0 +KEY=69 +NAME=bp12v_cab_prsnt diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-7.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-7.conf new file mode 100644 index 000000000..0a0aed7c7 --- /dev/null +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-7.conf @@ -0,0 +1,6 @@ +#The gpio 5 is a real gpio, which is used to +#store the SATA0 present signal +INVENTORY=/system/chassis/gpios/sata0_prsnt +DEVPATH=/dev/input/event0 +KEY=5 +NAME=sata0_prsnt diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-8.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-8.conf new file mode 100644 index 000000000..342aaf0a9 --- /dev/null +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-8.conf @@ -0,0 +1,6 @@ +#The gpio 120 is a real gpio, which is used to +#store the PE0 present signal +INVENTORY=/system/chassis/gpios/pe_slot0_prsnt +DEVPATH=/dev/input/event0 +KEY=120 +NAME=pe_slot0_prsnt diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-9.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-9.conf new file mode 100644 index 000000000..10d3a2ee7 --- /dev/null +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-9.conf @@ -0,0 +1,6 @@ +#The gpio 121 is a real gpio, which is used to +#store the PE1 present signal +INVENTORY=/system/chassis/gpios/pe_slot1_prsnt +DEVPATH=/dev/input/event0 +KEY=121 +NAME=pe_slot1_prsnt diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service.replace b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service.replace index 3ab99702f..fe782d60e 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service.replace +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service.replace @@ -2,12 +2,10 @@ Description=Phosphor GPIO %I Presence Wants=mapper-wait@-xyz-openbmc_project-inventory.service After=mapper-wait@-xyz-openbmc_project-inventory.service -ConditionPathExists=/etc/default/obmc/gpio/slimsas-cable-%i.conf -StartLimitBurst=10 +ConditionPathExists=/etc/default/obmc/gpio/gpios-%i.conf [Service] -Restart=on-failure -EnvironmentFile=/etc/default/obmc/gpio/slimsas-cable-%i.conf +EnvironmentFile=/etc/default/obmc/gpio/gpios-%i.conf ExecStart=/usr/bin/phosphor-gpio-presence --path=${DEVPATH} --inventory=${INVENTORY} --key=${KEY} --name=${NAME} --drivers=${DRIVERS} --extra-ifaces=${EXTRA_IFACES} [Install] diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 50974f7ee..d45636609 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -4,21 +4,27 @@ FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:" SRC_URI_append_gbs = " file://phosphor-gpio-presence@.service.replace" -TMPL_SLIMSASCABLE = "phosphor-gpio-presence@.service" -INSTFMT_SLIMSASCABLE = "phosphor-gpio-presence@{0}.service" -SLIMSASCABLE_TGT = "multi-user.target" -FMT_SLIMSASCABLE = "../${TMPL_SLIMSASCABLE}:${SLIMSASCABLE_TGT}.requires/${INSTFMT_SLIMSASCABLE}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/slimsas-cable-0.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/slimsas-cable-1.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/slimsas-cable-2.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/slimsas-cable-3.conf" -GBS_OBMC_SLIMSAS_CABLE_INSTANCES = "0 1 2 3" +TMPL_PRESENT = "phosphor-gpio-presence@.service" +INSTFMT_PRESENT = "phosphor-gpio-presence@{0}.service" +PRESENT_TGT = "multi-user.target" +FMT_PRESENT = "../${TMPL_PRESENT}:${PRESENT_TGT}.requires/${INSTFMT_PRESENT}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-0.conf" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-1.conf" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-2.conf" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-3.conf" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-4.conf" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-5.conf" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-6.conf" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-7.conf" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-8.conf" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-9.conf" +GBS_OBMC_PRESENT_INSTANCES = "0 1 2 3 4 5 6 7 8 9" -SYSTEMD_LINK_${PN}-presence_append_gbs = " ${@compose_list(d, 'FMT_SLIMSASCABLE', 'GBS_OBMC_SLIMSAS_CABLE_INSTANCES')}" +SYSTEMD_LINK_${PN}-presence_append_gbs = " ${@compose_list(d, 'FMT_PRESENT', 'GBS_OBMC_PRESENT_INSTANCES')}" -GBS_SLIMSASCABLE_ENV_FMT = "obmc/gpio/slimsas-cable-{0}.conf" +GBS_PRESENT_ENV_FMT = "obmc/gpio/gpios-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_gbs = " ${@compose_list(d, 'GBS_SLIMSASCABLE_ENV_FMT', 'GBS_OBMC_SLIMSAS_CABLE_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_gbs = " ${@compose_list(d, 'GBS_PRESENT_ENV_FMT', 'GBS_OBMC_PRESENT_INSTANCES')}" do_install_append_gbs() { install -d ${D}${systemd_system_unitdir} |