ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

memremap: rename MEMORY_DEVICE_DEVDAX to MEMORY_DEVICE_GENERIC

Browse Source 
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: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Link: https://lore.kernel.org/r/20200901083326.21264-3-roger.pau@citrix.com
Signed-off-by: Juergen Gross <jgross@suse.com>
This commit is contained in:
Roger Pau Monne
2020-09-01 10:33:25 +02:00
committed by Juergen Gross
parent aecb2016c9
commit 4533d3aed8
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/dax/device.c
View File

@@ -429,7 +429,7 @@ int dev_dax_probe(struct device *dev)
return -EBUSY; return -EBUSY;
} }
dev_dax->pgmap.type = MEMORY_DEVICE_DEVDAX; dev_dax->pgmap.type = MEMORY_DEVICE_GENERIC;
addr = devm_memremap_pages(dev, &dev_dax->pgmap); addr = devm_memremap_pages(dev, &dev_dax->pgmap);
if (IS_ERR(addr)) if (IS_ERR(addr))
return PTR_ERR(addr); return PTR_ERR(addr);

9
include/linux/memremap.h
View File

@@ -46,11 +46,10 @@ struct vmem_altmap {
* wakeup is used to coordinate physical address space management (ex: * wakeup is used to coordinate physical address space management (ex:
* fs truncate/hole punch) vs pinned pages (ex: device dma). * 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 * Host memory that has similar access semantics as System RAM i.e. DMA
* coherent and supports page pinning. In contrast to * coherent and supports page pinning. This is for example used by DAX devices
* MEMORY_DEVICE_FS_DAX, this memory is access via a device-dax * that expose memory using a character device.
* character device.
* *
* MEMORY_DEVICE_PCI_P2PDMA: * MEMORY_DEVICE_PCI_P2PDMA:
* Device memory residing in a PCI BAR intended for use with Peer-to-Peer * 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 */ /* 0 is reserved to catch uninitialized type fields */
MEMORY_DEVICE_PRIVATE = 1, MEMORY_DEVICE_PRIVATE = 1,
MEMORY_DEVICE_FS_DAX, MEMORY_DEVICE_FS_DAX,
MEMORY_DEVICE_DEVDAX, MEMORY_DEVICE_GENERIC,
MEMORY_DEVICE_PCI_P2PDMA, MEMORY_DEVICE_PCI_P2PDMA,
}; };

2
mm/memremap.c
View File

@@ -216,7 +216,7 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
break; break;
case MEMORY_DEVICE_DEVDAX: case MEMORY_DEVICE_GENERIC:
need_devmap_managed = false; need_devmap_managed = false;
break; break;
case MEMORY_DEVICE_PCI_P2PDMA: case MEMORY_DEVICE_PCI_P2PDMA: