From: ira.weiny@intel.com
To: Dan Williams <dan.j.williams@intel.com>
Cc: Ira Weiny <ira.weiny@intel.com>,
Alison Schofield <alison.schofield@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>,
Ben Widawsky <ben.widawsky@intel.com>,
linux-cxl@vger.kernel.org
Subject: [PATCH 1/3] cxl/pci: Store memory capacity values
Date: Thu, 10 Jun 2021 17:22:22 -0700 [thread overview]
Message-ID: <20210611002224.1594913-2-ira.weiny@intel.com> (raw)
In-Reply-To: <20210611002224.1594913-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
The Identify Memory Device command returns information about the
volatile and persistent memory capacities. Store those values in the
cxl_mem structure for later use. While at it, reuse the calculation of
the volatile and persistent memory byte values to calculate the ram and
pmem ranges.
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
drivers/cxl/mem.h | 4 ++++
drivers/cxl/pci.c | 36 +++++++++++++++++++++++++++++++++---
2 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/drivers/cxl/mem.h b/drivers/cxl/mem.h
index 13868ff7cadf..8bd0d0506b97 100644
--- a/drivers/cxl/mem.h
+++ b/drivers/cxl/mem.h
@@ -75,5 +75,9 @@ struct cxl_mem {
struct range pmem_range;
struct range ram_range;
+ u64 total_cap_bytes;
+ u64 volatile_cap_bytes;
+ u64 persistent_cap_bytes;
+ u64 partition_align_bytes;
};
#endif /* __CXL_MEM_H__ */
diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c
index 5a1705b52278..9995f97d3b28 100644
--- a/drivers/cxl/pci.c
+++ b/drivers/cxl/pci.c
@@ -57,6 +57,15 @@ enum opcode {
CXL_MBOX_OP_MAX = 0x10000
};
+/*
+ * CXL 2.0 - Memory capacity multiplier
+ * See Section 8.2.9.5
+ *
+ * Volatile, Persistent, and Partition capacities are specified to be in
+ * multiples of 256MB - define a multiplier to convert to/from bytes.
+ */
+#define CXL_CAPACITY_MULTIPLIER SZ_256M
+
/**
* struct mbox_cmd - A command to be submitted to hardware.
* @opcode: (input) The command set and command submitted to hardware.
@@ -1542,16 +1551,37 @@ static int cxl_mem_identify(struct cxl_mem *cxlm)
if (rc < 0)
return rc;
+ cxlm->total_cap_bytes = le64_to_cpu(id.total_capacity);
+ cxlm->total_cap_bytes *= CXL_CAPACITY_MULTIPLIER;
+
+ cxlm->volatile_cap_bytes = le64_to_cpu(id.volatile_capacity);
+ cxlm->volatile_cap_bytes *= CXL_CAPACITY_MULTIPLIER;
+
+ cxlm->persistent_cap_bytes = le64_to_cpu(id.persistent_capacity);
+ cxlm->persistent_cap_bytes *= CXL_CAPACITY_MULTIPLIER;
+
+ cxlm->partition_align_bytes = le64_to_cpu(id.partition_align);
+ cxlm->partition_align_bytes *= CXL_CAPACITY_MULTIPLIER;
+
+ dev_dbg(&cxlm->pdev->dev, "Identify Memory Device\n"
+ " total_cap_bytes = %#llx\n"
+ " volatile_cap_bytes = %#llx\n"
+ " persistent_cap_bytes = %#llx\n"
+ " partition_align_bytes = %#llx\n",
+ cxlm->total_cap_bytes,
+ cxlm->volatile_cap_bytes,
+ cxlm->persistent_cap_bytes,
+ cxlm->partition_align_bytes);
+
/*
* TODO: enumerate DPA map, as 'ram' and 'pmem' do not alias.
* For now, only the capacity is exported in sysfs
*/
cxlm->ram_range.start = 0;
- cxlm->ram_range.end = le64_to_cpu(id.volatile_capacity) * SZ_256M - 1;
+ cxlm->ram_range.end = cxlm->volatile_cap_bytes - 1;
cxlm->pmem_range.start = 0;
- cxlm->pmem_range.end =
- le64_to_cpu(id.persistent_capacity) * SZ_256M - 1;
+ cxlm->pmem_range.end = cxlm->persistent_cap_bytes - 1;
cxlm->lsa_size = le32_to_cpu(id.lsa_size);
memcpy(cxlm->firmware_version, id.fw_revision, sizeof(id.fw_revision));
--
2.28.0.rc0.12.gb6a658bd00c9
next prev parent reply other threads:[~2021-06-11 0:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 0:22 [PATCH 0/3] Query and use Partition Info ira.weiny
2021-06-11 0:22 ` ira.weiny [this message]
2021-06-11 17:18 ` [PATCH 1/3] cxl/pci: Store memory capacity values Ben Widawsky
2021-06-11 17:26 ` Dan Williams
2021-06-11 17:50 ` Ben Widawsky
2021-06-11 19:58 ` Ira Weiny
2021-06-11 0:22 ` [PATCH 2/3] cxl/mem: Report correct ram/pmem size in sysfs ira.weiny
2021-06-11 11:00 ` Jonathan Cameron
2021-06-11 15:59 ` Ira Weiny
2021-06-11 17:14 ` Dan Williams
2021-06-11 19:59 ` Ira Weiny
2021-06-11 0:22 ` [PATCH 3/3] cxl/mem: Add partition information to sysfs ira.weiny
2021-06-11 11:05 ` Jonathan Cameron
2021-06-11 17:26 ` Ben Widawsky
2021-06-11 20:09 ` Ira Weiny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210611002224.1594913-2-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=alison.schofield@intel.com \
--cc=ben.widawsky@intel.com \
--cc=dan.j.williams@intel.com \
--cc=linux-cxl@vger.kernel.org \
--cc=vishal.l.verma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.