Meru800bia: adds P2 devices and sensors to PM/sensor_service #195
+150
−3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@joancaneus has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
|
@adamcalabrigo can you please also add the P1 testing log in the testing section of this PR? |
|
@joancaneus has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
|
@adamcalabrigo has updated the pull request. You must reimport the pull request before landing. |
|
@joancaneus has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
facebook-github-bot
pushed a commit
that referenced
this pull request
Sep 19, 2024
Summary: # Description - Symlinks are now organized in the following order for each PMUnit starting from root: - Fpgas - I2c Buses - SMB Idrpom - I2c devices - Embedded sensors - Xcvrs - Spi Devices - Meru800BFA: Added symlinks to spi devices - Sensor service configs are sorted based on the order of i2c devices they’re on - Removed symlink for "/[IDPROM]" on Meru800BIA as PM handles creating the symlink without a config for it. - Meru800BIA now uses the lm75 driver instead of tmp75. The tmp75 driver is not compatible with some of the parts sourced from some vendors which can cause unexpected behavior. The lm75 is a more general driver and avoids any part specific configurations. - PM configs updated to configure temp sensors overtemp limits PR includes all changes in the following PRs: #195, #196 # Test ### Meru800BFA: - Flash devices symlinks ``` # ls -al /run/devmap/flashes/ total 0 drwxr-xr-x 2 root root 140 Aug 27 17:52 . drwxr-xr-x 9 root root 180 Aug 27 17:13 .. lrwxrwxrwx 1 root root 17 Aug 27 17:52 SMB_SPI0_MASTER0_DEVICE1 -> /dev/spidev2005.0 lrwxrwxrwx 1 root root 17 Aug 27 17:52 SMB_SPI1_MASTER0_DEVICE1 -> /dev/spidev3005.0 lrwxrwxrwx 1 root root 17 Aug 27 17:52 SMB_SPI2_MASTER0_DEVICE1 -> /dev/spidev4005.0 lrwxrwxrwx 1 root root 17 Aug 27 17:52 SMB_SPI3_MASTER0_DEVICE1 -> /dev/spidev5005.0 lrwxrwxrwx 1 root root 17 Aug 27 17:13 SMB_SPI_MASTER0_DEVICE1 -> /dev/spidev5005.0 ``` - PM initializes successfully. Some "failures" are reported but are not caused by this PR. - Wrong FAN CPLD firmware version path. The version files are located under hwmon directories that the check omits. . Likely introduced by 77d10bc - Known failure logs due to SCM_IDPROM_P1 ``` Failed to open firmware version file /run/devmap/cplds/FAN0_CPLD/cpld_ver: No such file or directory Failed to open firmware version file /run/devmap/cplds/FAN0_CPLD/cpld_sub_ver: No such file or directory Reporting firmware version for FAN0_CPLD - version string:0.0 ODS value:0 Failed to open firmware version file /run/devmap/cplds/FAN1_CPLD/cpld_ver: No such file or directory Failed to open firmware version file /run/devmap/cplds/FAN1_CPLD/cpld_sub_ver: No such file or directory Reporting firmware version for FAN1_CPLD - version string:0.0 ODS value:0 Failed to open firmware version file /run/devmap/cplds/FAN2_CPLD/cpld_ver: No such file or directory Failed to open firmware version file /run/devmap/cplds/FAN2_CPLD/cpld_sub_ver: No such file or directory Reporting firmware version for FAN2_CPLD - version string:0.0 ODS value:0 Reporting firmware version for MERU800BFA_SMB_CPLD - version string:4.4 ODS value:4004 Reporting firmware version for MERU800BFA_SMB_FPGA0 - version string:1.19 ODS value:1019 Reporting firmware version for MERU800BFA_SMB_FPGA1 - version string:1.19 ODS value:1019 Reporting firmware version for MERU800BFA_SMB_FPGA2 - version string:1.26 ODS value:1026 Reporting firmware version for MERU800BFA_SMB_FPGA3 - version string:1.23 ODS value:1023 Reporting firmware version for MERU_SCM_CPLD - version string:4.13 ODS value:4013 Completed setting up devices with errors Failures in PmUnit SCM at / 1. Failed to create i2c device for SCM_IDPROM_P1 (24c512) at bus: 3, addr: 0x50 with exit status 0 2. Failed to create a symlink /run/devmap/eeproms/MERU_SCM_EEPROM_P1 for DevicePath /[SCM_IDPROM_P1]. Reason: SCM_IDPROM_P1 is not plugged-in to the platform ``` - sensor_service ``` ======================================================== Processed 147 Sensors. 0 Failures. Using thread manager (resource pools not enabled) on address/port 5970: runtime: thriftFlagNotSet, , thrift flag: false, enable gflag: false, disable gflag: false Processed 147 Sensors. 0 Failures. Processed 147 Sensors. 0 Failures. Processed 147 Sensors. 0 Failures. ``` ### Meru800BIA: - PM initializes successfully. Some "failures" are reported but are not caused by this PR. - Wrong FAN CPLD firmware version path. The version files are located under hwmon directories that the check omits. Likely introduced by 77d10bc - Known failure logs due to SCM_IDPROM_P1 ``` Failed to open firmware version file /run/devmap/cplds/FAN_CPLD/cpld_ver: No such file or directory Failed to open firmware version file /run/devmap/cplds/FAN_CPLD/cpld_sub_ver: No such file or directory Reporting firmware version for FAN_CPLD - version string:0.0 ODS value:0 Reporting firmware version for MERU800BIA_SMB_FPGA - version string:4.13 ODS value:4013 Reporting firmware version for MERU_SCM_CPLD - version string:4.13 ODS value:4013 Completed setting up devices with errors Failures in PmUnit SCM at / 1. Failed to create i2c device for SCM_IDPROM_P1 (24c512) at bus: 3, addr: 0x50 with exit status 0 2. Failed to create a symlink /run/devmap/eeproms/MERU_SCM_EEPROM_P1 for DevicePath /[SCM_IDPROM_P1]. Reason: SCM_IDPROM_P1 is not plugged-in to the platform ``` - sensor_service ``` SMB_J3_BOARD_TEMP: Path=/run/devmap/sensors/SMB_MAX6581/temp1_input, Compute=@/1000.0, FRU=SMB SMB_J3_DIODE_CORE_TEMP: Path=/run/devmap/sensors/SMB_MAX6581/temp2_input, Compute=@/1000.0, FRU=SMB SMB_J3_DIODE_FAB0_TEMP: Path=/run/devmap/sensors/SMB_MAX6581/temp3_input, Compute=@/1000.0, FRU=SMB SMB_J3_DIODE_FAB1_TEMP: Path=/run/devmap/sensors/SMB_MAX6581/temp4_input, Compute=@/1000.0, FRU=SMB SMB_J3_DIODE_NIF0_TEMP: Path=/run/devmap/sensors/SMB_MAX6581/temp5_input, Compute=@/1000.0, FRU=SMB SMB_J3_DIODE_NIF1_TEMP: Path=/run/devmap/sensors/SMB_MAX6581/temp6_input, Compute=@/1000.0, FRU=SMB SMB_J3_DIODE_HBM0_TEMP: Path=/run/devmap/sensors/SMB_MAX6581/temp7_input, Compute=@/1000.0, FRU=SMB SMB_J3_DIODE_HBM1_TEMP: Path=/run/devmap/sensors/SMB_MAX6581/temp8_input, Compute=@/1000.0, FRU=SMB SMB_MGMT_INLET_TEMP: Path=/run/devmap/sensors/SMB_MGMT_TMP75/temp1_input, Compute=@/1000.0, FRU=SMB ======================================================== Processed 79 Sensors. 0 Failures. Using thread manager (resource pools not enabled) on address/port 5970: runtime: thriftFlagNotSet, , thrift flag: false, enable gflag: false, disable gflag: false Processed 79 Sensors. 0 Failures. Processed 79 Sensors. 0 Failures. Processed 79 Sensors. 0 Failures. ``` Pull Request resolved: #208 Reviewed By: kimdo8736 Differential Revision: D61759564 Pulled By: joancaneus fbshipit-source-id: 38ba3b449637e937ee5e450a9b82c57ad301c570
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Adds two devices (new to P2) to platform_manager.json then updates sensor_service.json to track the new sensors.
Also adds
initRegSettingsfor temperature sensor devices to override default hardware thresholds.Testing
Verified on Meru800bia.
Started
platform_manager, which succeeds and creates the correct new symlinks. From the service log:Started
sensor_serviceand verified that the new devices are being polled and are correctly reading sensors. From the service log:Registers are initialized correctly:
Also verified on P1:
PM will log failure in setting up P2 devices:
Registers for present devices are initialized correctly:
sensor_service logs missing sensors: