Commit f49ae864 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Conor Dooley
Browse files

memregion: Drop unused IORES_DESC_* parameter from cpu_cache_invalidate_memregion() 

The res_desc parameter was originally introduced for documentation purposes
and with the idea that with HDM-DB CXL invalidation could be triggered from
the device. That has not come to pass and the continued existence of the
option is confusing when we add a range in the following patch which might
not be a strict subset of the res_desc. So avoid that confusion by dropping
the parameter.

Link: https://lore.kernel.org/linux-mm/686eedb25ed02_24471002e@dwillia2-xfh.jf.intel.com.notmuch/


Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Suggested-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>
parent d52341da

arch/x86/mm/pat/set_memory.c

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ bool cpu_cache_has_invalidate_memregion(void) 
}

EXPORT_SYMBOL_NS_GPL(cpu_cache_has_invalidate_memregion, "DEVMEM");



int cpu_cache_invalidate_memregion(int res_desc)

int cpu_cache_invalidate_memregion(void)

{

	if (WARN_ON_ONCE(!cpu_cache_has_invalidate_memregion()))

		return -ENXIO;

drivers/cxl/core/region.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int cxl_region_invalidate_memregion(struct cxl_region *cxlr) 
		return -ENXIO;

	}



	cpu_cache_invalidate_memregion(IORES_DESC_CXL);

	cpu_cache_invalidate_memregion();

	return 0;

}

drivers/nvdimm/region.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static void nd_region_remove(struct device *dev) 
	 * here is ok.

	 */

	if (cpu_cache_has_invalidate_memregion())

		cpu_cache_invalidate_memregion(IORES_DESC_PERSISTENT_MEMORY);

		cpu_cache_invalidate_memregion();

}



static int child_notify(struct device *dev, void *data)

drivers/nvdimm/region_devs.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static int nd_region_invalidate_memregion(struct nd_region *nd_region) 
		}

	}



	cpu_cache_invalidate_memregion(IORES_DESC_PERSISTENT_MEMORY);

	cpu_cache_invalidate_memregion();

out:

	for (i = 0; i < nd_region->ndr_mappings; i++) {

		struct nd_mapping *nd_mapping = &nd_region->mapping[i];

include/linux/memregion.h

+3 −4
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ static inline void memregion_free(int id) 


/**

 * cpu_cache_invalidate_memregion - drop any CPU cached data for

 *     memregions described by @res_desc

 * @res_desc: one of the IORES_DESC_* types

 *     memregion

 *

 * Perform cache maintenance after a memory event / operation that

 * changes the contents of physical memory in a cache-incoherent manner.
@@ -46,7 +45,7 @@ static inline void memregion_free(int id) 
 * the cache maintenance.

 */

#ifdef CONFIG_ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION

int cpu_cache_invalidate_memregion(int res_desc);

int cpu_cache_invalidate_memregion(void);

bool cpu_cache_has_invalidate_memregion(void);

#else

static inline bool cpu_cache_has_invalidate_memregion(void)
@@ -54,7 +53,7 @@ static inline bool cpu_cache_has_invalidate_memregion(void) 
	return false;

}



static inline int cpu_cache_invalidate_memregion(int res_desc)

static inline int cpu_cache_invalidate_memregion(void)

{

	WARN_ON_ONCE("CPU cache invalidation required");

	return -ENXIO;