diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-03-16 22:22:23 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-03-16 22:22:23 +0300 |
| commit | cde54c4d6f7a200f7df9c301d60c3a9f668fc1db (patch) | |
| tree | 3d8f007f978ebaf536995870dba6aaa9f1f2436d /meta-ibm/meta-witherspoon | |
| parent | 6c1caca70063aa707ba809a6b4695d0f0c5646f1 (diff) | |
| parent | 182f903f414b31cd1c1aebb11bf476b73490dfad (diff) | |
| download | openbmc-cde54c4d6f7a200f7df9c301d60c3a9f668fc1db.tar.xz | |
Merge tag 'wht-0.44' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-ibm/meta-witherspoon')
5 files changed, 90 insertions, 0 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml index 386f4b7c7..2efbb0c7d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml @@ -146,6 +146,34 @@ groups: - /temperature/gpu5 - /temperature/gpu6 - /temperature/gpu7 + - name: zone0_nvme + description: Group of nvme temperature sensors for zone 0 + type: /xyz/openbmc_project/sensors + members: + - /temperature/nvme0 + - /temperature/nvme1 + - /temperature/nvme2 + - /temperature/nvme3 + - /temperature/nvme4 + - /temperature/nvme5 + - /temperature/nvme6 + - /temperature/nvme7 + - /temperature/nvme8 + - /temperature/nvme9 + - /temperature/nvme10 + - /temperature/nvme11 + - /temperature/nvme12 + - /temperature/nvme13 + - /temperature/nvme14 + - /temperature/nvme15 + - /temperature/nvme16 + - /temperature/nvme17 + - /temperature/nvme18 + - /temperature/nvme19 + - /temperature/nvme20 + - /temperature/nvme21 + - /temperature/nvme22 + - /temperature/nvme23 matches: - name: propertiesChanged parameters: @@ -549,6 +577,11 @@ events: property: name: Value type: int64_t + - name: zone0_nvme + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t triggers: - name: init method: getProperties @@ -772,3 +805,36 @@ events: delta: value: 5 type: uint64_t + # Speed changes based on nvme temps + - name: set_net_increase_speed + groups: + - name: zone0_nvme + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 55 + type: int64_t + factor: + value: 1 + type: int64_t + delta: + value: 13 + type: uint64_t + - name: set_net_decrease_speed + groups: + - name: zone0_nvme + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 52 + type: int64_t + factor: + value: 3 + type: int64_t + delta: + value: 5 + type: uint64_t diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-0.conf new file mode 100644 index 000000000..d4f7e1d44 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/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=37 +NAME=powersupply0 +DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0069 +EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-1.conf new file mode 100644 index 000000000..029912ea5 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/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=59 +NAME=powersupply1 +DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0068 +EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-0.conf new file mode 100644 index 000000000..15390ce42 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-0.conf @@ -0,0 +1,6 @@ +DEVPATH=/sys/bus/i2c/devices/3-0069 +INSTANCE=0 +INVENTORY=/system/chassis/motherboard/powersupply0 +NUM_HISTORY_RECORDS=120 +SYNC_GPIO_PATH=/dev/gpiochip0 +SYNC_GPIO_NUM=38 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-1.conf new file mode 100644 index 000000000..ce9f322a5 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-1.conf @@ -0,0 +1,6 @@ +DEVPATH=/sys/bus/i2c/devices/3-0068 +INSTANCE=1 +INVENTORY=/system/chassis/motherboard/powersupply1 +NUM_HISTORY_RECORDS=120 +SYNC_GPIO_PATH=/dev/gpiochip0 +SYNC_GPIO_NUM=38 |