diff options
author | Ed Tanous <ed.tanous@intel.com> | 2019-05-29 19:22:39 +0300 |
---|---|---|
committer | Ed Tanous <ed.tanous@intel.com> | 2019-05-29 19:22:39 +0300 |
commit | 5364646cb66fa75cdcbf148e039e0383cda94f2a (patch) | |
tree | 78b1711f353235e812435be90e124eab4037294e /meta-quanta | |
parent | 816d793003e93c1e5eec0a2e90fbd8b9dde9f7a5 (diff) | |
parent | 7b595c2f82912a170774e84e5bb81d1b6030bf6b (diff) | |
download | openbmc-5364646cb66fa75cdcbf148e039e0383cda94f2a.tar.xz |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into intel
Diffstat (limited to 'meta-quanta')
41 files changed, 818 insertions, 298 deletions
diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf index 9ff2efe1b..6bc649299 100644 --- a/meta-quanta/conf/layer.conf +++ b/meta-quanta/conf/layer.conf @@ -1,8 +1,13 @@ # We have a conf and classes directory, add to BBPATH BBPATH .= ":${LAYERDIR}" -BBFILE_COLLECTIONS += "quanta" -BBFILE_PATTERN_quanta = "" +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "quanta-layer" +BBFILE_PATTERN_quanta-layer := "^${LAYERDIR}/" +LAYERSERIES_COMPAT_quanta-layer = "thud warrior" # Provide a variable that points the base of the quanta layer. QUANTABASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-quanta/meta-gsj/conf/layer.conf b/meta-quanta/meta-gsj/conf/layer.conf index f29b93af8..e7dcbfeab 100644 --- a/meta-quanta/meta-gsj/conf/layer.conf +++ b/meta-quanta/meta-gsj/conf/layer.conf @@ -6,5 +6,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "gsj-layer" -BBFILE_PATTERN_gsj-layer = "" +BBFILE_PATTERN_gsj-layer := "^${LAYERDIR}/" LAYERSERIES_COMPAT_gsj-layer = "thud warrior" diff --git a/meta-quanta/meta-gsj/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton/fw_env.config b/meta-quanta/meta-gsj/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton/fw_env.config new file mode 100644 index 000000000..0c384273f --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton/fw_env.config @@ -0,0 +1,24 @@ +# Configuration file for fw_(printenv/setenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# Notice, that the "Number of sectors" is not required on NOR and SPI-dataflash. +# Futhermore, if the Flash sector size is ommitted, this value is assumed to +# be the same as the Environment size, which is valid for NOR and SPI-dataflash + +# NOR example +# MTD device name Device offset Env. size Flash sector size Number of sectors +/dev/mtd2 0x0000 0x40000 0x4000 + +# MTD SPI-dataflash example +# MTD device name Device offset Env. size Flash sector size Number of sectors +#/dev/mtd5 0x4200 0x4200 +#/dev/mtd6 0x4200 0x4200 + +# NAND example +#/dev/mtd0 0x4000 0x4000 0x20000 2 + +# Block device example +#/dev/mmcblk0 0xc0000 0x20000 + +# VFAT example +#/boot/uboot.env 0x0000 0x4000 diff --git a/meta-quanta/meta-gsj/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend b/meta-quanta/meta-gsj/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend new file mode 100644 index 000000000..c5aea4089 --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:" + +SRC_URI_append_gsj = " file://fw_env.config" + +do_install_append_gsj () { + install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config +} diff --git a/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb b/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb index 322ba35f5..69172383d 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb @@ -24,9 +24,7 @@ RDEPENDS_${PN}-chassis = " \ " SUMMARY_${PN}-fans = "GSJ Fans" -RDEPENDS_${PN}-fans = " \ - obmc-control-fan \ - " +RDEPENDS_${PN}-fans = "" SUMMARY_${PN}-flash = "GSJ Flash" RDEPENDS_${PN}-flash = " \ diff --git a/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/README.md b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/README.md new file mode 100644 index 000000000..63b52d746 --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/README.md @@ -0,0 +1,46 @@ +### NVME SSD Power Control Manager + +#### Description + The package mantains for SSD power control and related noification handle Deamon + +#### Design + + The service power supply design follow PCI Express Card Electromechanical Specification Revision 3.0 in Section 2.2 + + nvme_gpio.service follow section 2.2.1 Initial power-Up to initinal and adjust related signal. + + nvme_powermanager.service follow section 2.2.2 power management states monitor PRESENT signal and update related signal. + +#### Process + + * Plugging + 1. U2_[SSD_index] PRSNT_N will be input low + 2. Set PWR_U2_[SSD_index]_EN to high + 3. Check PWRGD_U2_[SSD_index] is high + 4-1. If PWRGD_U2_[SSD_index] is high (PWR Good) + - Wait 5ms + - Enable PCI Clock by SMBus 9FGL0851 + - Wait 100ms + - Set RST_BMC_U2 to high + + 4-2. If PWRGD_U2_[SSD_index] is low (PWR Fail) + - Set RST_BMC_U2_[SSD_index]_R_N to low + - Wait 100ms + - Disable PCI Clock by SMBus + + * Removing + 1. U2_[SSD_index] PRSNT_N will be input high + 2. Set RST_BMC_U2 to low + 3. Wait 100ms + 4. Disable PCI Clock by SMBus + 5. Wait 5ms + 6. PWR_U2_[SSD_index]_EN to low + +#### Test + + 1. PRESENT detect SSD: The hardware design has been implemented. + 2. Initial SSD slot Power output: nvme_gpio service has tested on Module. It could sucess initial gpios and set correct power output. + 3. Detect PRESENT and change power setting: nvme_powermanager service has tested on Module. It could success detect SSD plugged or removal change power output. + 4. Improve initial power-up sequence: For matched hardware default initial power-up setting, the nvme_gpio service only set unplugged slot related signal. + 5. Improve service execute sequence: nvme_powermanager.service must wait for nvme_gpio.service ensure gpio export complete. + diff --git a/meta-quanta/meta-gsj/recipes-phosphor/quanta-nvme-powerctrl/files/init_once.sh b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/files/init_once.sh index 2ea02ef8d..2ea02ef8d 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/quanta-nvme-powerctrl/files/init_once.sh +++ b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/files/init_once.sh diff --git a/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/files/nvme_gpio.service b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/files/nvme_gpio.service new file mode 100644 index 000000000..f104cfa12 --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/files/nvme_gpio.service @@ -0,0 +1,13 @@ +[Unit] +Description = configure GPIO for SSD Power Control +Before=nvme_powermanager.service + +[Service] +Restart=no +RemainAfterExit=true +Type=oneshot +ExecStart=/usr/bin/init_once.sh +StandardOutput=syslog + +[Install] +WantedBy=multi-user.target diff --git a/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/files/nvme_powermanager.service b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/files/nvme_powermanager.service new file mode 100644 index 000000000..1f8c0567e --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/files/nvme_powermanager.service @@ -0,0 +1,12 @@ +[Unit] +Description=SSD NVME Power Manager +Requires=nvme_gpio.service +After=nvme_gpio.service + +[Service] +ExecStart=/usr/bin/nvme_powermanager.sh +Restart=always +StandardOutput=syslog + +[Install] +WantedBy=multi-user.target diff --git a/meta-quanta/meta-gsj/recipes-phosphor/quanta-nvme-powerctrl/files/nvme_powermanager.sh b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/files/nvme_powermanager.sh index 91beec566..91beec566 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/quanta-nvme-powerctrl/files/nvme_powermanager.sh +++ b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/files/nvme_powermanager.sh diff --git a/meta-quanta/meta-gsj/recipes-phosphor/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb index 8d0aa8c72..8d0aa8c72 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb diff --git a/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/00-bmc-usb0.network b/meta-quanta/meta-gsj/recipes-gsj/usb-network/files/00-bmc-usb0.network index 94839637b..ef6a19955 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/00-bmc-usb0.network +++ b/meta-quanta/meta-gsj/recipes-gsj/usb-network/files/00-bmc-usb0.network @@ -3,5 +3,5 @@ Name=usb0 [Address] Address=169.254.95.118/16 [Network] -LinkLocalAddressing=yes +LinkLocalAddressing=no IPv6AcceptRA=no diff --git a/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.service b/meta-quanta/meta-gsj/recipes-gsj/usb-network/files/usb_network.service index 913f5fbee..913f5fbee 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.service +++ b/meta-quanta/meta-gsj/recipes-gsj/usb-network/files/usb_network.service diff --git a/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.sh b/meta-quanta/meta-gsj/recipes-gsj/usb-network/files/usb_network.sh index 45fa888be..45fa888be 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.sh +++ b/meta-quanta/meta-gsj/recipes-gsj/usb-network/files/usb_network.sh diff --git a/meta-quanta/meta-gsj/recipes-phosphor/usb-network/usb-network.bb b/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb index 591ca5afd..591ca5afd 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/usb-network/usb-network.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb diff --git a/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton/gsj.cfg b/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton/gsj.cfg index 9435516b4..b95eddfec 100644 --- a/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton/gsj.cfg +++ b/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton/gsj.cfg @@ -46,3 +46,18 @@ CONFIG_USB_CONFIGFS_RNDIS=y CONFIG_USB_CONFIGFS_EEM=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_HID=y + +CONFIG_MEDIA_SUPPORT=y +CONFIG_FORCE_MAX_ZONEORDER=12 +CONFIG_SENSORS_LM25066=y +CONFIG_I2C_SLAVE=y +CONFIG_I2C_SLAVE_MQUEUE=y +CONFIG_NUVOTON_JTAG=y +CONFIG_EDAC_ATOMIC_SCRUB=y +CONFIG_EDAC_SUPPORT=y +CONFIG_EDAC=y +CONFIG_EDAC_LEGACY_SYSFS=y +CONFIG_EDAC_DEBUG=y +CONFIG_EDAC_NPCM7XX=y +CONFIG_RAS=y +CONFIG_SENSORS_UCD9000=y
\ No newline at end of file diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/files/config.yaml b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/files/config.yaml index b5d323f4e..798c7f690 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/files/config.yaml +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/files/config.yaml @@ -1,22 +1,6 @@ -0x01: - /system: - entityID: 23 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - /system/chassis: - entityID: 23 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - /system/chassis/hsbp: - entityID: 16 +0x00: + /system/chassis/bmc: + entityID: 6 entityInstance: 1 interfaces: xyz.openbmc_project.Inventory.Decorator.Asset: @@ -40,10 +24,9 @@ Version: IPMIFruProperty: FRU File ID IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item.Board: -0x02: - /system/chassis/bmc: - entityID: 6 +0x01: + /system/chassis/hsbp: + entityID: 16 entityInstance: 1 interfaces: xyz.openbmc_project.Inventory.Decorator.Asset: @@ -59,9 +42,6 @@ Manufacturer: IPMIFruProperty: Manufacturer IPMIFruSection: Board - CustomField: - IPMIFruProperty: CustomField - IPMIFruSection: Board xyz.openbmc_project.Inventory.Item: PrettyName: IPMIFruProperty: Name diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map/config.yaml b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map/config.yaml index daba925cf..e9ef9e743 100755 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map/config.yaml +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map/config.yaml @@ -195,7 +195,7 @@ entityID: 0x0A entityInstance: 7 sensorType: 0x03 - path: /xyz/openbmc_project/sensors/current/P12V_BRIC_Current + path: /xyz/openbmc_project/sensors/current/P12V_BRIC_Curr sensorReadingType: 0x01 multiplierM: 200 offsetB: 0 @@ -244,7 +244,7 @@ sensorType: 0x04 path: /xyz/openbmc_project/sensors/fan_tach/Fan0_0_RPM sensorReadingType: 0x01 - multiplierM: 100 + multiplierM: 79 offsetB: 0 bExp: 0 rExp: 0 @@ -265,7 +265,7 @@ sensorType: 0x04 path: /xyz/openbmc_project/sensors/fan_tach/Fan0_1_RPM sensorReadingType: 0x01 - multiplierM: 100 + multiplierM: 79 offsetB: 0 bExp: 0 rExp: 0 @@ -286,7 +286,7 @@ sensorType: 0x04 path: /xyz/openbmc_project/sensors/fan_tach/Fan1_0_RPM sensorReadingType: 0x01 - multiplierM: 100 + multiplierM: 79 offsetB: 0 bExp: 0 rExp: 0 @@ -307,7 +307,7 @@ sensorType: 0x04 path: /xyz/openbmc_project/sensors/fan_tach/Fan1_1_RPM sensorReadingType: 0x01 - multiplierM: 100 + multiplierM: 79 offsetB: 0 bExp: 0 rExp: 0 @@ -328,7 +328,7 @@ sensorType: 0x04 path: /xyz/openbmc_project/sensors/fan_tach/Fan2_0_RPM sensorReadingType: 0x01 - multiplierM: 100 + multiplierM: 79 offsetB: 0 bExp: 0 rExp: 0 @@ -349,7 +349,7 @@ sensorType: 0x04 path: /xyz/openbmc_project/sensors/fan_tach/Fan2_1_RPM sensorReadingType: 0x01 - multiplierM: 100 + multiplierM: 79 offsetB: 0 bExp: 0 rExp: 0 @@ -365,16 +365,41 @@ 0xFF: type: int64_t +0xC0: &fan_pwm + sensorType: 0x04 + path: /xyz/openbmc_project/sensors/fan_tach/Fan0_0_RPM + sensorReadingType: 0x01 + multiplierM: 1 + offsetB: 0 + bExp: 0 + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Control.FanPwm: + Target: + Offsets: + 0xFF: + type: uint64_t + +0xC1: + <<: *fan_pwm + path: /xyz/openbmc_project/sensors/fan_tach/Fan1_0_RPM + +0xC2: + <<: *fan_pwm + path: /xyz/openbmc_project/sensors/fan_tach/Fan2_0_RPM + 0x34: entityID: 0x07 entityInstance: 1 sensorType: 0x01 - path: /xyz/openbmc_project/nvme/1 + path: /xyz/openbmc_project/sensors/temperature/nvme0 sensorReadingType: 0x01 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData - sensorNamePattern: nameParentLeaf + sensorNamePattern: nameLeaf unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC interfaces: xyz.openbmc_project.Sensor.Value: @@ -386,12 +411,12 @@ entityID: 0x07 entityInstance: 2 sensorType: 0x01 - path: /xyz/openbmc_project/nvme/2 + path: /xyz/openbmc_project/sensors/temperature/nvme1 sensorReadingType: 0x01 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData - sensorNamePattern: nameParentLeaf + sensorNamePattern: nameLeaf unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC interfaces: xyz.openbmc_project.Sensor.Value: @@ -403,12 +428,12 @@ entityID: 0x07 entityInstance: 3 sensorType: 0x01 - path: /xyz/openbmc_project/nvme/3 + path: /xyz/openbmc_project/sensors/temperature/nvme2 sensorReadingType: 0x01 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData - sensorNamePattern: nameParentLeaf + sensorNamePattern: nameLeaf unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC interfaces: xyz.openbmc_project.Sensor.Value: @@ -420,12 +445,12 @@ entityID: 0x07 entityInstance: 4 sensorType: 0x01 - path: /xyz/openbmc_project/nvme/4 + path: /xyz/openbmc_project/sensors/temperature/nvme3 sensorReadingType: 0x01 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData - sensorNamePattern: nameParentLeaf + sensorNamePattern: nameLeaf unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC interfaces: xyz.openbmc_project.Sensor.Value: @@ -437,12 +462,12 @@ entityID: 0x07 entityInstance: 5 sensorType: 0x01 - path: /xyz/openbmc_project/nvme/5 + path: /xyz/openbmc_project/sensors/temperature/nvme4 sensorReadingType: 0x01 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData - sensorNamePattern: nameParentLeaf + sensorNamePattern: nameLeaf unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC interfaces: xyz.openbmc_project.Sensor.Value: @@ -454,12 +479,12 @@ entityID: 0x07 entityInstance: 6 sensorType: 0x01 - path: /xyz/openbmc_project/nvme/6 + path: /xyz/openbmc_project/sensors/temperature/nvme5 sensorReadingType: 0x01 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData - sensorNamePattern: nameParentLeaf + sensorNamePattern: nameLeaf unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC interfaces: xyz.openbmc_project.Sensor.Value: @@ -471,12 +496,12 @@ entityID: 0x07 entityInstance: 7 sensorType: 0x01 - path: /xyz/openbmc_project/nvme/7 + path: /xyz/openbmc_project/sensors/temperature/nvme6 sensorReadingType: 0x01 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData - sensorNamePattern: nameParentLeaf + sensorNamePattern: nameLeaf unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC interfaces: xyz.openbmc_project.Sensor.Value: @@ -488,12 +513,12 @@ entityID: 0x07 entityInstance: 8 sensorType: 0x01 - path: /xyz/openbmc_project/nvme/8 + path: /xyz/openbmc_project/sensors/temperature/nvme7 sensorReadingType: 0x01 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData - sensorNamePattern: nameParentLeaf + sensorNamePattern: nameLeaf unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC interfaces: xyz.openbmc_project.Sensor.Value: @@ -502,11 +527,299 @@ 0xFF: type: int64_t +0x40: + entityID: 0x07 + entityInstance: 9 + sensorType: 0x21 + path: /xyz/openbmc_project/led/groups/led_u2_0_locate + sensorReadingType: 0x6F + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Led.Group: + Asserted: + Offsets: + 0x01: + type: bool + assert: true + +0x41: + entityID: 0x07 + entityInstance: 10 + sensorType: 0x21 + path: /xyz/openbmc_project/led/groups/led_u2_1_locate + sensorReadingType: 0x6F + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Led.Group: + Asserted: + Offsets: + 0x01: + type: bool + assert: true + +0x42: + entityID: 0x07 + entityInstance: 11 + sensorType: 0x21 + path: /xyz/openbmc_project/led/groups/led_u2_2_locate + sensorReadingType: 0x6F + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Led.Group: + Asserted: + Offsets: + 0x01: + type: bool + assert: true + +0x43: + entityID: 0x07 + entityInstance: 12 + sensorType: 0x21 + path: /xyz/openbmc_project/led/groups/led_u2_3_locate + sensorReadingType: 0x6F + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Led.Group: + Asserted: + Offsets: + 0x01: + type: bool + assert: true + +0x44: + entityID: 0x07 + entityInstance: 13 + sensorType: 0x21 + path: /xyz/openbmc_project/led/groups/led_u2_4_locate + sensorReadingType: 0x6F + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Led.Group: + Asserted: + Offsets: + 0x01: + type: bool + assert: true + +0x45: + entityID: 0x07 + entityInstance: 14 + sensorType: 0x21 + path: /xyz/openbmc_project/led/groups/led_u2_5_locate + sensorReadingType: 0x6F + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Led.Group: + Asserted: + Offsets: + 0x01: + type: bool + assert: true + +0x46: + entityID: 0x07 + entityInstance: 15 + sensorType: 0x21 + path: /xyz/openbmc_project/led/groups/led_u2_6_locate + sensorReadingType: 0x6F + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Led.Group: + Asserted: + Offsets: + 0x01: + type: bool + assert: true + +0x47: + entityID: 0x07 + entityInstance: 16 + sensorType: 0x21 + path: /xyz/openbmc_project/led/groups/led_u2_7_locate + sensorReadingType: 0x6F + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Led.Group: + Asserted: + Offsets: + 0x01: + type: bool + assert: true + +0x50: + entityID: 0x07 + entityInstance: 17 + sensorType: 0x21 + path: /xyz/openbmc_project/led/groups/led_u2_0_fault + sensorReadingType: 0x6F + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Led.Group: + Asserted: + Offsets: + 0x00: + type: bool + assert: true + +0x51: + entityID: 0x07 + entityInstance: 18 + sensorType: 0x21 + path: /xyz/openbmc_project/led/groups/led_u2_1_fault + sensorReadingType: 0x6F + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Led.Group: + Asserted: + Offsets: + 0x00: + type: bool + assert: true + +0x52: + entityID: 0x07 + entityInstance: 19 + sensorType: 0x21 + path: /xyz/openbmc_project/led/groups/led_u2_2_fault + sensorReadingType: 0x6F + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Led.Group: + Asserted: + Offsets: + 0x00: + type: bool + assert: true + +0x53: + entityID: 0x07 + entityInstance: 20 + sensorType: 0x21 + path: /xyz/openbmc_project/led/groups/led_u2_3_fault + sensorReadingType: 0x6F + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Led.Group: + Asserted: + Offsets: + 0x00: + type: bool + assert: true + +0x54: + entityID: 0x07 + entityInstance: 21 + sensorType: 0x21 + path: /xyz/openbmc_project/led/groups/led_u2_4_fault + sensorReadingType: 0x6F + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Led.Group: + Asserted: + Offsets: + 0x00: + type: bool + assert: true + +0x55: + entityID: 0x07 + entityInstance: 22 + sensorType: 0x21 + path: /xyz/openbmc_project/led/groups/led_u2_5_fault + sensorReadingType: 0x6F + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Led.Group: + Asserted: + Offsets: + 0x00: + type: bool + assert: true + +0x56: + entityID: 0x07 + entityInstance: 23 + sensorType: 0x21 + path: /xyz/openbmc_project/led/groups/led_u2_6_fault + sensorReadingType: 0x6F + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Led.Group: + Asserted: + Offsets: + 0x00: + type: bool + assert: true + +0x57: + entityID: 0x07 + entityInstance: 24 + sensorType: 0x21 + path: /xyz/openbmc_project/led/groups/led_u2_7_fault + sensorReadingType: 0x6F + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Led.Group: + Asserted: + Offsets: + 0x00: + type: bool + assert: true + 0xB0: entityID: 0x20 entityInstance: 1 sensorType: 0x0C - path: /xyz/openbmc_project/memory/BmcECC + path: /xyz/openbmc_project/metrics/memory/BmcECC sensorReadingType: 0x6F serviceInterface: org.freedesktop.DBus.Properties readingType: assertion @@ -518,10 +831,171 @@ Offsets: 0x00: type: string - assert: xyz.openbmc_project.Sensor.Memory.MemoryECC.ECCStatus.CE + assert: xyz.openbmc_project.Memory.MemoryECC.ECCStatus.CE 0x01: type: string - assert: xyz.openbmc_project.Sensor.Memory.MemoryECC.ECCStatus.UE + assert: xyz.openbmc_project.Memory.MemoryECC.ECCStatus.UE 0x05: type: string - assert: xyz.openbmc_project.Sensor.Memory.MemoryECC.ECCStatus.LogFulled
\ No newline at end of file + assert: xyz.openbmc_project.Memory.MemoryECC.ECCStatus.LogFull + +0x62: + entityID: 0x0A + entityInstance: 7 + sensorType: 0x02 + path: /xyz/openbmc_project/sensors/voltage/P3V3_STBY_Vol + sensorReadingType: 0x01 + multiplierM: 156 + offsetB: 0 + bExp: 0 + rExp: -4 + scale: -3 + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + sensorNamePattern: nameLeaf + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + +0x64: + entityID: 0x0A + entityInstance: 8 + sensorType: 0x02 + path: /xyz/openbmc_project/sensors/voltage/P2V5_BMC_Vol + sensorReadingType: 0x01 + multiplierM: 117 + offsetB: 0 + bExp: 0 + rExp: -4 + scale: -3 + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + sensorNamePattern: nameLeaf + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + +0x65: + entityID: 0x0A + entityInstance: 9 + sensorType: 0x02 + path: /xyz/openbmc_project/sensors/voltage/P1V8_BMC_Vol + sensorReadingType: 0x01 + multiplierM: 78 + offsetB: 0 + bExp: 0 + rExp: -4 + scale: -3 + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + sensorNamePattern: nameLeaf + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + +0x66: + entityID: 0x0A + entityInstance: 10 + sensorType: 0x02 + path: /xyz/openbmc_project/sensors/voltage/P1V2_BMC_Vol + sensorReadingType: 0x01 + multiplierM: 78 + offsetB: 0 + bExp: 0 + rExp: -4 + scale: -3 + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + sensorNamePattern: nameLeaf + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + +0x67: + entityID: 0x0A + entityInstance: 11 + sensorType: 0x02 + path: /xyz/openbmc_project/sensors/voltage/PVTT_BMC_Vol + sensorReadingType: 0x01 + multiplierM: 392 + offsetB: 0 + bExp: 0 + rExp: -5 + scale: -3 + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + sensorNamePattern: nameLeaf + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + +0x68: + entityID: 0x0A + entityInstance: 12 + sensorType: 0x02 + path: /xyz/openbmc_project/sensors/voltage/P1V175_BMC_Vol + sensorReadingType: 0x01 + multiplierM: 78 + offsetB: 0 + bExp: 0 + rExp: -4 + scale: -3 + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + sensorNamePattern: nameLeaf + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + +0x69: + entityID: 0x0A + entityInstance: 13 + sensorType: 0x02 + path: /xyz/openbmc_project/sensors/voltage/P3V3_PEVPH_Vol + sensorReadingType: 0x01 + multiplierM: 156 + offsetB: 0 + bExp: 0 + rExp: -4 + scale: -3 + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + sensorNamePattern: nameLeaf + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t
\ No newline at end of file diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc index 02f429851..9a3b21e2b 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc @@ -1,2 +1,2 @@ SYSFS_PATH=/sys/bus/i2c/devices/10-0055/eeprom -FRUID=2 +FRUID=0 diff --git a/meta-quanta/meta-gsj/recipes-phosphor/phosphor-ipmi-host/gsj-ipmid-whitelist.conf b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host/gsj-ipmid-whitelist.conf index a0d18b480..a0d18b480 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/phosphor-ipmi-host/gsj-ipmid-whitelist.conf +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host/gsj-ipmid-whitelist.conf diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend new file mode 100644 index 000000000..f695261ba --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +# Replace the default whitelist for GSJ board. +SRC_URI_append_gsj = " file://gsj-ipmid-whitelist.conf" + +WHITELIST_CONF_remove_gsj = " ${S}/host-ipmid-whitelist.conf" +WHITELIST_CONF_append_gsj = " ${WORKDIR}/gsj-ipmid-whitelist.conf" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/leds/gsj-led-manager-config/led.yaml b/meta-quanta/meta-gsj/recipes-phosphor/leds/gsj-led-manager-config/led.yaml index 4b465692e..e1046067a 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/leds/gsj-led-manager-config/led.yaml +++ b/meta-quanta/meta-gsj/recipes-phosphor/leds/gsj-led-manager-config/led.yaml @@ -9,36 +9,76 @@ LED_BMC_TRAY_PWRGD: Period: 1000 LED_U2_0_LOCATE: LED_U2_0_LOCATE: - Action: 'On' - Period: 1000 + Action: 'Blink' + DutyOn: 50 + Period: 250 + LED_U2_0_FAULT: + Action: 'Blink' + DutyOn: 50 + Period: 250 LED_U2_1_LOCATE: LED_U2_1_LOCATE: - Action: 'On' - Period: 1000 + Action: 'Blink' + DutyOn: 50 + Period: 250 + LED_U2_1_FAULT: + Action: 'Blink' + DutyOn: 50 + Period: 250 LED_U2_2_LOCATE: LED_U2_2_LOCATE: - Action: 'On' - Period: 1000 + Action: 'Blink' + DutyOn: 50 + Period: 250 + LED_U2_2_FAULT: + Action: 'Blink' + DutyOn: 50 + Period: 250 LED_U2_3_LOCATE: LED_U2_3_LOCATE: - Action: 'On' - Period: 1000 + Action: 'Blink' + DutyOn: 50 + Period: 250 + LED_U2_3_FAULT: + Action: 'Blink' + DutyOn: 50 + Period: 250 LED_U2_4_LOCATE: LED_U2_4_LOCATE: - Action: 'On' - Period: 1000 + Action: 'Blink' + DutyOn: 50 + Period: 250 + LED_U2_4_FAULT: + Action: 'Blink' + DutyOn: 50 + Period: 250 LED_U2_5_LOCATE: LED_U2_5_LOCATE: - Action: 'On' - Period: 1000 + Action: 'Blink' + DutyOn: 50 + Period: 250 + LED_U2_5_FAULT: + Action: 'Blink' + DutyOn: 50 + Period: 250 LED_U2_6_LOCATE: LED_U2_6_LOCATE: - Action: 'On' - Period: 1000 + Action: 'Blink' + DutyOn: 50 + Period: 250 + LED_U2_6_FAULT: + Action: 'Blink' + DutyOn: 50 + Period: 250 LED_U2_7_LOCATE: LED_U2_7_LOCATE: - Action: 'On' - Period: 1000 + Action: 'Blink' + DutyOn: 50 + Period: 250 + LED_U2_7_FAULT: + Action: 'Blink' + DutyOn: 50 + Period: 250 LED_U2_0_FAULT: LED_U2_0_FAULT: Action: 'On' diff --git a/meta-quanta/meta-gsj/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/network/phosphor-network_%.bbappend new file mode 100644 index 000000000..730c62d5f --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/network/phosphor-network_%.bbappend @@ -0,0 +1 @@ +EXTRA_OECONF_gsj += " --disable-link-local-autoconfiguration" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/phosphor-ipmi-host_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/phosphor-ipmi-host_%.bbappend deleted file mode 100644 index 8b24bf754..000000000 --- a/meta-quanta/meta-gsj/recipes-phosphor/phosphor-ipmi-host_%.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -# Replace the default whitelist for GSJ board. -SRC_URI += " file://gsj-ipmid-whitelist.conf" - -WHITELIST_CONF_remove = " ${S}/host-ipmid-whitelist.conf" -WHITELIST_CONF_append = " ${WORKDIR}/gsj-ipmid-whitelist.conf" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/quanta-nvme-powerctrl/README.md b/meta-quanta/meta-gsj/recipes-phosphor/quanta-nvme-powerctrl/README.md deleted file mode 100644 index 51a9e8fe5..000000000 --- a/meta-quanta/meta-gsj/recipes-phosphor/quanta-nvme-powerctrl/README.md +++ /dev/null @@ -1,50 +0,0 @@ -### NVME SSD Power Control Manager - -#### Description - The Package is Mantain for SSD power control and related noification handle Deamon - -#### Design - nvme_gpio.service for initinal related GPIOs ( PRESENT, PWR, PWRGD, RST_U2 ) and according PRESENT signal fix HW PWR default output signal. - - nvme_powermanager.service loop for monitor PRESENT signal and update PWR output. - -#### Process - - * Plugging - 1. U2_[SSD_index]PRSNT_N will be input low - 2. Set PWR_U2_[SSD_index]_EN to high - 3. Check PWRGD_U2_[SSD_index] is high - 4-1. If PWRGD_U2_[SSD_index] is high (PWR Good) - - Wait 5ms - - Enable PCI Clock by SMBus 9FGL0851 - - Wait 100ms - - Reset RST_BMC_U2 [low->high] - - Send Assert to tell package could read SSD status. - - 4-2. If PWRGD_U2_[SSD_index] is low (PWR Fail) - - Disable Clock by SMBus - - Wait 100ms - - Set RST_BMC_U2_[SSD_index]_R_N to low - - Set LED_U2_FAULT to high - - * Removing - 1. U2_[SSD_index]PRSNT_N will be input high - 2. Disable Clock by SMBus 9FGL0851 - 3. PWR_U2_[SSD_index]_EN to low - 4. Check PWRGD_U2_[SSD_index] is low - 5. Send Assert to tell package update SSD status. - - -#### TODO - - 1. After power on ssd, bmc send command to 9FGL0851 (on SMBus8 0x68) for enable PCI clock, and send RST_BMC_U2 pin rsing event (set low, wait 500ms, set high). The Host could rescan PCI and detect SSD device. - -#### Test - - 1. PRESENT detect SSD: The Default Hardware is implement. - 2. Initial SSD slot Power output: nvme_gpio service has test on Module. It could sucess initial gpios and setting correct power output. - 3. Detect PRESENT and change power setting: nvme_powermanager service has tested on Module. It could success detect SSD plugged or removal change PWR output. - 4. NVME-MI connect: Ensure SSD power is ready then it will notify quanta NVME-MI package could read SSD information. - 5. FAULT LED handle: When detect power output irregular by PWRGD pin, the service will trigger related FAULT LED. - - diff --git a/meta-quanta/meta-gsj/recipes-phosphor/quanta-nvme-powerctrl/files/nvme_gpio.service b/meta-quanta/meta-gsj/recipes-phosphor/quanta-nvme-powerctrl/files/nvme_gpio.service deleted file mode 100644 index a5073d3a5..000000000 --- a/meta-quanta/meta-gsj/recipes-phosphor/quanta-nvme-powerctrl/files/nvme_gpio.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description = configure GPIO for SSD Power Control -Wants=org.openbmc.records.events.service -After=org.openbmc.records.events.service xyz.openbmc_project.nvme.manager.service - -[Service] -ExecStart=/usr/bin/init_once.sh - -[Install] -WantedBy=obmc-standby.target
\ No newline at end of file diff --git a/meta-quanta/meta-gsj/recipes-phosphor/quanta-nvme-powerctrl/files/nvme_powermanager.service b/meta-quanta/meta-gsj/recipes-phosphor/quanta-nvme-powerctrl/files/nvme_powermanager.service deleted file mode 100644 index 4a4cd6288..000000000 --- a/meta-quanta/meta-gsj/recipes-phosphor/quanta-nvme-powerctrl/files/nvme_powermanager.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=SSD NVME Power Manager -Wants=org.openbmc.records.events.service -After=org.openbmc.records.events.service nvme_gpio.service xyz.openbmc_project.nvme.manager.service - -[Service] -ExecStart=/usr/bin/nvme_powermanager.sh -Restart=always - - -[Install] -WantedBy=obmc-standby.target
\ No newline at end of file diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@81000/lm75@5c.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@81000/lm75@5c.conf index 721c54fda..721c54fda 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@81000/lm75@5c.conf +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@81000/lm75@5c.conf diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@82000/lm75@5c.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/lm75@5c.conf index 9adca0b72..179d1224e 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@82000/lm75@5c.conf +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/lm75@5c.conf @@ -1,7 +1,7 @@ LABEL_temp1= "KL1" WARNLO_temp1= "5000" -WARNHI_temp1= "58000" -CRITHI_temp1 = "60000" +WARNHI_temp1= "53000" +CRITHI_temp1 = "56000" CRITLO_temp1 = "0" MINVALUE_temp1 = "-128" MAXVALUE_temp1 = "127" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@83000/lm75@5c.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@83000/lm75@5c.conf index 80f2eb30b..4662ed0c2 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@83000/lm75@5c.conf +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@83000/lm75@5c.conf @@ -1,7 +1,7 @@ LABEL_temp1= "KL2" WARNLO_temp1= "5000" WARNHI_temp1= "58000" -CRITHI_temp1 = "60000" +CRITHI_temp1 = "61000" CRITLO_temp1 = "0" MINVALUE_temp1 = "-128" MAXVALUE_temp1 = "127" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@84000/lm75@5c.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@84000/lm75@5c.conf index b58691493..d947a4126 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@84000/lm75@5c.conf +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@84000/lm75@5c.conf @@ -1,7 +1,7 @@ LABEL_temp1= "KL3" WARNLO_temp1= "5000" -WARNHI_temp1= "68000" -CRITHI_temp1 = "75000" +WARNHI_temp1= "42000" +CRITHI_temp1 = "44000" CRITLO_temp1 = "0" MINVALUE_temp1 = "-128" MAXVALUE_temp1 = "127" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@8b000/hotswap@15.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/hotswap@15.conf index 5241409dd..b1dc82192 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@8b000/hotswap@15.conf +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/hotswap@15.conf @@ -1,7 +1,7 @@ LABEL_temp1= "P48V_HSC_Temp" -WARNHI_temp1= "95000" +WARNHI_temp1= "60000" WARNLO_temp1= "5000" -CRITHI_temp1= "105000" +CRITHI_temp1= "65000" CRITLO_temp1= "0" MINVALUE_temp1 = "-128" MAXVALUE_temp1 = "127" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@8b000/power-brick@36.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/power-brick@36.conf index 3f7d908ef..913774219 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c-bus@8b000/power-brick@36.conf +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/power-brick@36.conf @@ -1,13 +1,13 @@ LABEL_temp1= "P12V_BRIC_Temp" -WARNHI_temp1= "110000" +WARNHI_temp1= "88000" WARNLO_temp1= "5000" -CRITHI_temp1= "120000" +CRITHI_temp1= "93000" CRITLO_temp1= "0" MINVALUE_temp1 = "-128" MAXVALUE_temp1 = "127" EVENT_temp1 = "WARNHI,WARNLO,CRITHI,CRITLO" -LABEL_curr1= "P12V_BRIC_Current" +LABEL_curr1= "P12V_BRIC_Curr" WARNLO_curr1= "9" CRITLO_curr1= "0" WARNHI_curr1= "45800" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/ucd90160@6b.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/ucd90160@6b.conf new file mode 100644 index 000000000..5d91da79b --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/ucd90160@6b.conf @@ -0,0 +1,62 @@ +LABEL_in1= "P3V3_STBY_Vol" +WARNLO_in1= "3135" +CRITLO_in1= "3135" +WARNHI_in1= "3465" +CRITHI_in1= "3465" +MINVALUE_in1= "0" +MAXVALUE_in1= "4" +EVENT_in1= "WARNHI,WARNLO,CRITHI,CRITLO" + +LABEL_in2= "P2V5_BMC_Vol" +WARNLO_in2= "2375" +CRITLO_in2= "2375" +WARNHI_in2= "2625" +CRITHI_in2= "2625" +MINVALUE_in2= "0" +MAXVALUE_in2= "3" +EVENT_in2= "WARNHI,WARNLO,CRITHI,CRITLO" + +LABEL_in3= "P1V8_BMC_Vol" +WARNLO_in3= "1710" +CRITLO_in3= "1710" +WARNHI_in3= "1890" +CRITHI_in3= "1890" +MINVALUE_in3= "0" +MAXVALUE_in3= "2" +EVENT_in3= "WARNHI,WARNLO,CRITHI,CRITLO" + +LABEL_in4= "P1V2_BMC_Vol" +WARNLO_in4= "1140" +CRITLO_in4= "1140" +WARNHI_in4= "1260" +CRITHI_in4= "1260" +MINVALUE_in4= "0" +MAXVALUE_in4= "2" +EVENT_in4= "WARNHI,WARNLO,CRITHI,CRITLO" + +LABEL_in5= "PVTT_BMC_Vol" +WARNLO_in5= "571" +CRITLO_in5= "571" +WARNHI_in5= "626" +CRITHI_in5= "626" +MINVALUE_in5= "0" +MAXVALUE_in5= "1" +EVENT_in5= "WARNHI,WARNLO,CRITHI,CRITLO" + +LABEL_in6= "P1V175_BMC_Vol" +WARNLO_in6= "1139" +CRITLO_in6= "1139" +WARNHI_in6= "1210" +CRITHI_in6= "1210" +MINVALUE_in6= "0" +MAXVALUE_in6= "2" +EVENT_in6= "WARNHI,WARNLO,CRITHI,CRITLO" + +LABEL_in7= "P3V3_PEVPH_Vol" +WARNLO_in7= "3135" +CRITLO_in7= "3135" +WARNHI_in7= "3465" +CRITHI_in7= "3465" +MINVALUE_in7= "0" +MAXVALUE_in7= "4" +EVENT_in7= "WARNHI,WARNLO,CRITHI,CRITLO"
\ No newline at end of file diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf index 48f8c26e2..9eaee659e 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf @@ -1,59 +1,65 @@ LABEL_fan1= "Fan0_0_RPM" TARGET_fan1= "Fan0_0_RPM" -WARNHI_fan1= "21000" -WARNLO_fan1= "250" -CRITHI_fan1= "23000" -CRITLO_fan1= "250" +WARNHI_fan1= "19000" +WARNLO_fan1= "230" +CRITHI_fan1= "20000" +CRITLO_fan1= "150" MINVALUE_fan1 = "0" -MAXVALUE_fan1 = "25500" +MAXVALUE_fan1 = "20145" +PWM_TARGET_fan1 = 1 EVENT_fan1= "WARNHI,WARNLO,CRITHI,CRITLO" LABEL_fan2= "Fan0_1_RPM" TARGET_fan2= "Fan0_1_RPM" -WARNHI_fan2= "21000" -WARNLO_fan2= "250" -CRITHI_fan2= "23000" -CRITLO_fan2= "250" +WARNHI_fan2= "19000" +WARNLO_fan2= "230" +CRITHI_fan2= "20000" +CRITLO_fan2= "150" MINVALUE_fan2 = "0" -MAXVALUE_fan2 = "25500" +MAXVALUE_fan2 = "20145" +PWM_TARGET_fan2 = 1 EVENT_fan2= "WARNHI,WARNLO,CRITHI,CRITLO" LABEL_fan3= "Fan1_0_RPM" TARGET_fan3= "Fan1_0_RPM" -WARNHI_fan3= "21000" -WARNLO_fan3= "250" -CRITHI_fan3= "23000" -CRITLO_fan3= "250" +WARNHI_fan3= "19000" +WARNLO_fan3= "230" +CRITHI_fan3= "20000" +CRITLO_fan3= "150" MINVALUE_fan3 = "0" -MAXVALUE_fan3 = "25500" +MAXVALUE_fan3 = "20145" +PWM_TARGET_fan3 = 2 EVENT_fan3= "WARNHI,WARNLO,CRITHI,CRITLO" LABEL_fan4= "Fan1_1_RPM" TARGET_fan4= "Fan1_1_RPM" -WARNHI_fan4= "21000" -WARNLO_fan4= "250" -CRITHI_fan4= "23000" -CRITLO_fan4= "250" +WARNHI_fan4= "19000" +WARNLO_fan4= "230" +CRITHI_fan4= "20000" +CRITLO_fan4= "150" MINVALUE_fan4 = "0" -MAXVALUE_fan4 = "25500" +MAXVALUE_fan4 = "20145" +PWM_TARGET_fan4 = 2 EVENT_fan4= "WARNHI,WARNLO,CRITHI,CRITLO" LABEL_fan5= "Fan2_0_RPM" TARGET_fan5= "Fan2_0_RPM" -WARNHI_fan5= "21000" -WARNLO_fan5= "250" -CRITHI_fan5= "23000" -CRITLO_fan5= "250" +WARNHI_fan5= "19000" +WARNLO_fan5= "230" +CRITHI_fan5= "20000" +CRITLO_fan5= "150" MINVALUE_fan5 = "0" -MAXVALUE_fan5 = "25500" +MAXVALUE_fan5 = "20145" +PWM_TARGET_fan5 = 3 EVENT_fan5= "WARNHI,WARNLO,CRITHI,CRITLO" LABEL_fan6= "Fan2_1_RPM" TARGET_fan6= "Fan2_1_RPM" -WARNHI_fan6= "21000" -WARNLO_fan6= "250" -CRITHI_fan6= "23000" -CRITLO_fan6= "250" +WARNHI_fan6= "19000" +WARNLO_fan6= "230" +CRITHI_fan6= "20000" +CRITLO_fan6= "150" MINVALUE_fan6 = "0" -MAXVALUE_fan6 = "25500" +MAXVALUE_fan6 = "20145" +PWM_TARGET_fan6 = 3 EVENT_fan6= "WARNHI,WARNLO,CRITHI,CRITLO"
\ No newline at end of file diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 57ec7a3a9..0313b0444 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -2,12 +2,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" NAMES = " \ - i2c-bus@81000/lm75@5c \ - i2c-bus@82000/lm75@5c \ - i2c-bus@83000/lm75@5c \ - i2c-bus@84000/lm75@5c \ - i2c-bus@8b000/hotswap@15 \ - i2c-bus@8b000/power-brick@36 \ + i2c@81000/lm75@5c \ + i2c@82000/lm75@5c \ + i2c@83000/lm75@5c \ + i2c@84000/lm75@5c \ + i2c@8b000/hotswap@15 \ + i2c@8b000/power-brick@36 \ + i2c@8c000/ucd90160@6b \ " ITEMSFMT = "ahb/apb/{0}.conf" diff --git a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf index ef127e967..05ebc8262 100644 --- a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf +++ b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf @@ -23,11 +23,6 @@ FLASH_SIZE = "32768" # " # But we don't, and it's ok :D We're pulling in specific packages in an image recipe. -# This sets up our own Quanta-q71l.py inclusion based on the Zaius.py in the skeleton repo. -# As something temporarily required. -VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" -PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" - # These are meant to include the inventory config.yaml and so on. PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "q71l-ipmi-inventory-map-native" PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory = "q71l-ipmi-sensor-map-native" diff --git a/meta-quanta/meta-q71l/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/images/obmc-phosphor-image.bbappend index 760a6b886..d77d9a024 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-quanta/meta-q71l/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,4 +1,3 @@ -OBMC_IMAGE_EXTRA_INSTALL_append_quanta-q71l = " spictrl" OBMC_IMAGE_EXTRA_INSTALL_append_quanta-q71l = " quanta-powerctrl" # dts for q71l includes snooping, so let's leverage that. diff --git a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb index 940b72d3f..f6f6458bf 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb +++ b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb @@ -21,8 +21,8 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "host-gpio.service host-poweron.service host-poweroff.service" do_install() { - install -d ${D}/usr/sbin - install -m 0755 ${S}init_once.sh ${D}/${sbindir}/ - install -m 0755 ${S}poweroff.sh ${D}/${sbindir}/ - install -m 0755 ${S}poweron.sh ${D}/${sbindir}/ + install -d ${D}/${bindir} + install -m 0755 ${S}init_once.sh ${D}/${bindir}/ + install -m 0755 ${S}poweroff.sh ${D}/${bindir}/ + install -m 0755 ${S}poweron.sh ${D}/${bindir}/ } diff --git a/meta-quanta/meta-q71l/recipes-phosphor/workbook/quanta-q71l-config.bb b/meta-quanta/meta-q71l/recipes-phosphor/workbook/quanta-q71l-config.bb deleted file mode 100644 index e15bbd956..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/workbook/quanta-q71l-config.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Quanta Q71l board wiring" -DESCRIPTION = "Board wiring information for the Quanta Q71l system." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit allarch -inherit setuptools -inherit pythonnative - -PROVIDES += "virtual/obmc-inventory-data" -RPROVIDES_${PN} += "virtual-obmc-inventory-data" - -DEPENDS += "python" - -S = "${WORKDIR}" -SRC_URI += "file://Quanta-q71l.py" - -# the following is unnecessary. -python() { - machine = d.getVar('MACHINE', True).capitalize() + '.py' - d.setVar('_config_in_skeleton', machine) -} - -do_make_setup() { - cp ${S}/${_config_in_skeleton} \ - ${S}/obmc_system_config.py - cat <<EOF > ${S}/setup.py -from distutils.core import setup - -setup(name='${BPN}', - version='${PR}', - py_modules=['obmc_system_config'], - ) -EOF -} - -addtask make_setup after do_patch before do_configure diff --git a/meta-quanta/meta-q71l/recipes-phosphor/workbook/quanta-q71l-config/Quanta-q71l.py b/meta-quanta/meta-q71l/recipes-phosphor/workbook/quanta-q71l-config/Quanta-q71l.py deleted file mode 100644 index ca7cb2098..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/workbook/quanta-q71l-config/Quanta-q71l.py +++ /dev/null @@ -1,48 +0,0 @@ -## System states -## state can change to next state in 2 ways: -## - a process emits a GotoSystemState signal with state name to goto -## - objects specified in EXIT_STATE_DEPEND have started -SYSTEM_STATES = [ - 'BASE_APPS', - 'BMC_STARTING', - 'BMC_READY', - 'HOST_POWERING_ON', - 'HOST_POWERED_ON', - 'HOST_BOOTING', - 'HOST_BOOTED', - 'HOST_POWERED_OFF', -] - -EXIT_STATE_DEPEND = { - 'BASE_APPS' : { - '/xyz/openbmc_poroject/sensors': 0, - }, - 'BMC_STARTING' : { - '/xyz/openbmc_project/control/chassis0': 0, - }, -} - -FRU_INSTANCES = {} - -# I believe these numbers need to match the yaml file used to create the c++ ipmi map. -# the devices have types, but I don't believe that factors in here, I think these are -# just unique IDs. -ID_LOOKUP = { - 'FRU' : {}, - # The number at the end needs to match the FRU ID. - # https://github.com/openbmc/skeleton/blob/master/pysystemmgr/system_manager.py#L143 - # The parameter for it is of type 'y' (unsigned 8-bit integer) presumably decimal? - 'FRU_STR' : {}, - 'SENSOR' : {}, - 'GPIO_PRESENT' : {} -} - -GPIO_CONFIG = {} -HWMON_CONFIG = {} -GPIO_CONFIGS = {} - -# Miscellaneous non-poll sensor with system specific properties. -# The sensor id is the same as those defined in ID_LOOKUP['SENSOR']. -MISC_SENSORS = {} - -# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 |