commit 72e53ab85482c114733fa56940f69a9ee50d820e
author Patrick Rudolph <patrick.rudolph@9elements.com> Mon Nov 20 08:55:55 2023 +0100
committer Patrick Rudolph <patrick.rudolph@9elements.com> Wed Apr 24 06:10:13 2024 +0000
tree cec9fe5d21e591cc7b516fb2d9f25e31c8e2c05b
parent 0236541519468a0477c9a5f398e070fb0a7d3593

configurations: Add Intel P5520 SSD

Add support for PCIe Gen4 P5520 SSD by extending the existing
config for P4500 SSDs.

Tests on P5520 showed that they use the correct address for
NVMe-MI (0x6a).

Tested: Can read the temperature of P5520 SSD.

Change-Id: I698c0307ea8919407e11e1f448a20ae4970ce114
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>

configurations/nvme_intel_p_series.json

diff --git a/configurations/nvme_intel_p_series.json b/configurations/nvme_intel_p_series.json
index 6db00fd..2405468 100644
--- a/configurations/nvme_intel_p_series.json
+++ b/configurations/nvme_intel_p_series.json
@@ -42,7 +42,7 @@
     ],
     "Logging": "Off",
     "Name": "NVMe $index",
-    "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'P(31|33|35|36|37|41|43|44|46|48|53|55|56|58)\\d\\d\\w?', 'PRODUCT_MANUFACTURER': '(Intel|INTEL).*'})",
+    "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'P(31|33|35|36|37|41|43|44|46|48|53|56|58)\\d\\d\\w?', 'PRODUCT_MANUFACTURER': '(Intel|INTEL).*'})",
     "Type": "NVMe",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$PRODUCT_MANUFACTURER",

configurations/nvme_p4500_p5500.json

diff --git a/configurations/nvme_p4500.json b/configurations/nvme_p4500_p5500.json
similarity index 95%
rename from configurations/nvme_p4500.json
rename to configurations/nvme_p4500_p5500.json
index a7397e8..bafbdf6 100644
--- a/configurations/nvme_p4500.json
+++ b/configurations/nvme_p4500_p5500.json
@@ -42,7 +42,7 @@
     ],
     "Logging": "Off",
     "Name": "NVMe $index",
-    "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'P45\\d\\d\\w?', 'PRODUCT_MANUFACTURER': '(Intel|INTEL).*'})",
+    "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'P(45|55)\\d\\d\\w?', 'PRODUCT_MANUFACTURER': '(Intel|INTEL).*'})",
     "Type": "NVMe",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$PRODUCT_MANUFACTURER",

meson.build

diff --git a/meson.build b/meson.build
index b7f5098..33a7c9c 100644
--- a/meson.build
+++ b/meson.build
@@ -151,7 +151,7 @@
     'mudflap.json',
     'nisqually.json',
     'nvme_intel_p_series.json',
-    'nvme_p4500.json',
+    'nvme_p4500_p5500.json',
     'pcie_ssd_retimer.json',
     'pennybacker.json',
     'pssf132202a.json',