57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
|
From b1c29cfa125f6da219bfcec732a8290bb124cdce Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dan Williams <dan.j.williams@intel.com>
|
||
|
|
Date: Thu, 14 Jul 2022 10:02:38 -0700
|
||
|
|
Subject: [PATCH 183/217] cxl/set-partition: Accept 'ram' as an alias for
|
||
|
|
'volatile'
|
||
|
|
|
||
|
|
'ram' is a more convenient shorthand for volatile memory.
|
||
|
|
|
||
|
|
Link: https://lore.kernel.org/r/165781815878.1555691.12251226240559355924.stgit@dwillia2-xfh.jf.intel.com
|
||
|
|
Cc: Alison Schofield <alison.schofield@intel.com>
|
||
|
|
Reviewed-by: Davidlohr Bueso <dave@stgolabs.net>
|
||
|
|
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
|
||
|
|
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
|
||
|
|
---
|
||
|
|
Documentation/cxl/cxl-set-partition.txt | 2 +-
|
||
|
|
cxl/memdev.c | 4 +++-
|
||
|
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Documentation/cxl/cxl-set-partition.txt b/Documentation/cxl/cxl-set-partition.txt
|
||
|
|
index 1e548af..f0126da 100644
|
||
|
|
--- a/Documentation/cxl/cxl-set-partition.txt
|
||
|
|
+++ b/Documentation/cxl/cxl-set-partition.txt
|
||
|
|
@@ -37,7 +37,7 @@ include::memdev-option.txt[]
|
||
|
|
|
||
|
|
-t::
|
||
|
|
--type=::
|
||
|
|
- Type of partition, 'pmem' or 'volatile', to modify.
|
||
|
|
+ Type of partition, 'pmem' or 'ram' (volatile), to modify.
|
||
|
|
Default: 'pmem'
|
||
|
|
|
||
|
|
-s::
|
||
|
|
diff --git a/cxl/memdev.c b/cxl/memdev.c
|
||
|
|
index 9fcd8ae..1cecad2 100644
|
||
|
|
--- a/cxl/memdev.c
|
||
|
|
+++ b/cxl/memdev.c
|
||
|
|
@@ -65,7 +65,7 @@ OPT_BOOLEAN('f', "force", ¶m.force, \
|
||
|
|
|
||
|
|
#define SET_PARTITION_OPTIONS() \
|
||
|
|
OPT_STRING('t', "type", ¶m.type, "type", \
|
||
|
|
- "'pmem' or 'volatile' (Default: 'pmem')"), \
|
||
|
|
+ "'pmem' or 'ram' (volatile) (Default: 'pmem')"), \
|
||
|
|
OPT_STRING('s', "size", ¶m.size, "size", \
|
||
|
|
"size in bytes (Default: all available capacity)"), \
|
||
|
|
OPT_BOOLEAN('a', "align", ¶m.align, \
|
||
|
|
@@ -355,6 +355,8 @@ static int action_setpartition(struct cxl_memdev *memdev,
|
||
|
|
/* default */;
|
||
|
|
else if (strcmp(param.type, "volatile") == 0)
|
||
|
|
type = CXL_SETPART_VOLATILE;
|
||
|
|
+ else if (strcmp(param.type, "ram") == 0)
|
||
|
|
+ type = CXL_SETPART_VOLATILE;
|
||
|
|
else {
|
||
|
|
log_err(&ml, "invalid type '%s'\n", param.type);
|
||
|
|
return -EINVAL;
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|