The "hmem" platform-devices that are created to represent the platform-advertised "Soft Reserved" memory ranges end up inserting a resource that causes the iomem_resource tree to look like this:

340000000-43fffffff : hmem.0 340000000-43fffffff : Soft Reserved 340000000-43fffffff : dax0.0

This is because insert_resource() reparents ranges when they completely intersect an existing range.

This matters because code that uses region_intersects() to scan for a given IORES_DESC will only check that top-level 'hmem.0' resource and not the 'Soft Reserved' descendant.

So, to support EINJ (via einj_error_inject()) to inject errors into memory hosted by a dax-device, be sure to describe the memory as IORES_DESC_SOFT_RESERVED. This is a follow-on to:

commit b13a3e5fd40b ("ACPI: APEI: Fix _EINJ vs EFI_MEMORY_SP")

...that fixed EINJ support for "Soft Reserved" ranges in the first instance.

Fixes: 262b45ae3ab4 ("x86/efi: EFI soft reservation to E820 enumeration") Reported-by: Ricardo Sandoval Torres ricardo.sandoval.torres@intel.com Tested-by: Ricardo Sandoval Torres ricardo.sandoval.torres@intel.com Cc: stable@vger.kernel.org Cc: Tony Luck tony.luck@intel.com Cc: Omar Avelar omar.avelar@intel.com Cc: Rafael J. Wysocki rafael.j.wysocki@intel.com Cc: Mark Gross markgross@kernel.org Signed-off-by: Dan Williams dan.j.williams@intel.com --- drivers/dax/hmem/device.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/drivers/dax/hmem/device.c b/drivers/dax/hmem/device.c index cb6401c9e9a4..acf31cc1dbcc 100644 --- a/drivers/dax/hmem/device.c +++ b/drivers/dax/hmem/device.c @@ -15,6 +15,7 @@ void hmem_register_device(int target_nid, struct resource *r) .start = r->start, .end = r->end, .flags = IORESOURCE_MEM, + .desc = IORES_DESC_SOFT_RESERVED, }; struct platform_device *pdev; struct memregion_info info;