Commit 4533d3ae authored by Roger Pau Monne's avatar Roger Pau Monne Committed by Juergen Gross
Browse files

memremap: rename MEMORY_DEVICE_DEVDAX to MEMORY_DEVICE_GENERIC 



This is in preparation for the logic behind MEMORY_DEVICE_DEVDAX also
being used by non DAX devices.

No functional change intended.

Signed-off-by: default avatarRoger Pau Monné <roger.pau@citrix.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Acked-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarPankaj Gupta <pankaj.gupta.linux@gmail.com>
Link: https://lore.kernel.org/r/20200901083326.21264-3-roger.pau@citrix.com


Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent aecb2016

drivers/dax/device.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ int dev_dax_probe(struct device *dev) 
		return -EBUSY;

	}



	dev_dax->pgmap.type = MEMORY_DEVICE_DEVDAX;

	dev_dax->pgmap.type = MEMORY_DEVICE_GENERIC;

	addr = devm_memremap_pages(dev, &dev_dax->pgmap);

	if (IS_ERR(addr))

		return PTR_ERR(addr);

include/linux/memremap.h

+4 −5
Original line number Diff line number Diff line
@@ -46,11 +46,10 @@ struct vmem_altmap { 
 * wakeup is used to coordinate physical address space management (ex:

 * fs truncate/hole punch) vs pinned pages (ex: device dma).

 *

 * MEMORY_DEVICE_DEVDAX:

 * MEMORY_DEVICE_GENERIC:

 * Host memory that has similar access semantics as System RAM i.e. DMA

 * coherent and supports page pinning. In contrast to

 * MEMORY_DEVICE_FS_DAX, this memory is access via a device-dax

 * character device.

 * coherent and supports page pinning. This is for example used by DAX devices

 * that expose memory using a character device.

 *

 * MEMORY_DEVICE_PCI_P2PDMA:

 * Device memory residing in a PCI BAR intended for use with Peer-to-Peer
@@ -60,7 +59,7 @@ enum memory_type { 
	/* 0 is reserved to catch uninitialized type fields */

	MEMORY_DEVICE_PRIVATE = 1,

	MEMORY_DEVICE_FS_DAX,

	MEMORY_DEVICE_DEVDAX,

	MEMORY_DEVICE_GENERIC,

	MEMORY_DEVICE_PCI_P2PDMA,

};

mm/memremap.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid) 
			return ERR_PTR(-EINVAL);

		}

		break;

	case MEMORY_DEVICE_DEVDAX:

	case MEMORY_DEVICE_GENERIC:

		need_devmap_managed = false;

		break;

	case MEMORY_DEVICE_PCI_P2PDMA:

CRA Git | Maintained and supported by SUSTech CRA and CCSE