configurations/nvme_p4000: Improve regex
As discussed on [1] use an improved regex covering all known
Intel Pxxxx SSDs available so far.
This allows to move SSDs into a separate file with a different NVMe-MI
address without using a blacklist. Update the filename as its no longer
only covering P4000 series.
1: https://gerrit.openbmc.org/c/openbmc/entity-manager/+/66365
Change-Id: I602eb224f2288edbe8d43ffd7568d9ce628650a8
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
diff --git a/configurations/nvme_p4000.json b/configurations/nvme_intel_p_series.json
similarity index 93%
rename from configurations/nvme_p4000.json
rename to configurations/nvme_intel_p_series.json
index 5a26c8e..1416473 100644
--- a/configurations/nvme_p4000.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\\d{4}\\w?', 'PRODUCT_MANUFACTURER': '(Intel|INTEL).*'})",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'P(31|33|35|36|37|41|43|44|45|46|48|53|55|56|58)\\d\\d\\w?', 'PRODUCT_MANUFACTURER': '(Intel|INTEL).*'})",
"Type": "NVMe",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$PRODUCT_MANUFACTURER",
diff --git a/meson.build b/meson.build
index 75536cd..3d8e231 100644
--- a/meson.build
+++ b/meson.build
@@ -150,7 +150,7 @@
'mtmitchell_mb.json',
'mudflap.json',
'nisqually.json',
- 'nvme_p4000.json',
+ 'nvme_intel_p_series.json',
'pcie_ssd_retimer.json',
'pennybacker.json',
'pssf132202a.json',