On Tue, 25 Jul 2023 18:39:55 +0000
Fan Ni <fan...@samsung.com> wrote:
> From: Fan Ni <ni...@outlook.com>
>
> Rename mem_size as static_mem_size for type3 memdev to cover static RAM and
> pmem capacity, preparing for the introduction of dynamic capacity to support
> dynamic capacity devices.
>
> Signed-off-by: Fan Ni <fan...@samsung.com>
Looks good. I've picked this up with the author change.
Note that just because I've starting picking these up, doesn't
mean you can't keep changing them, but if you start from where my
gitlab.com/jic23/qemu tree is that will make life easier given
we have a lot of stuff in flight.
Jonathan
p.s. that assumes I've actually pushed the result of this out before
you get back to it!
> ---
> hw/cxl/cxl-mailbox-utils.c | 5 +++--
> hw/mem/cxl_type3.c | 8 ++++----
> include/hw/cxl/cxl_device.h | 2 +-
> 3 files changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c
> index 0fe9f3eb5d..dd5ea95af8 100644
> --- a/hw/cxl/cxl-mailbox-utils.c
> +++ b/hw/cxl/cxl-mailbox-utils.c
> @@ -540,7 +540,8 @@ static CXLRetCode cmd_identify_memory_device(struct
> cxl_cmd *cmd,
>
> snprintf(id->fw_revision, 0x10, "BWFW VERSION %02d", 0);
>
> - stq_le_p(&id->total_capacity, cxl_dstate->mem_size /
> CXL_CAPACITY_MULTIPLIER);
> + stq_le_p(&id->total_capacity,
> + cxl_dstate->static_mem_size / CXL_CAPACITY_MULTIPLIER);
> stq_le_p(&id->persistent_capacity, cxl_dstate->pmem_size /
> CXL_CAPACITY_MULTIPLIER);
> stq_le_p(&id->volatile_capacity, cxl_dstate->vmem_size /
> CXL_CAPACITY_MULTIPLIER);
> stl_le_p(&id->lsa_size, cvc->get_lsa_size(ct3d));
> @@ -879,7 +880,7 @@ static CXLRetCode cmd_media_clear_poison(struct cxl_cmd
> *cmd,
> struct clear_poison_pl *in = (void *)cmd->payload;
>
> dpa = ldq_le_p(&in->dpa);
> - if (dpa + CXL_CACHE_LINE_SIZE > cxl_dstate->mem_size) {
> + if (dpa + CXL_CACHE_LINE_SIZE > cxl_dstate->static_mem_size) {
> return CXL_MBOX_INVALID_PA;
> }
>
> diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c
> index 4d68824dfe..3d7acffcb7 100644
> --- a/hw/mem/cxl_type3.c
> +++ b/hw/mem/cxl_type3.c
> @@ -748,7 +748,7 @@ static bool cxl_setup_memory(CXLType3Dev *ct3d, Error
> **errp)
> }
> address_space_init(&ct3d->hostvmem_as, vmr, v_name);
> ct3d->cxl_dstate.vmem_size = memory_region_size(vmr);
> - ct3d->cxl_dstate.mem_size += memory_region_size(vmr);
> + ct3d->cxl_dstate.static_mem_size += memory_region_size(vmr);
> g_free(v_name);
> }
>
> @@ -771,7 +771,7 @@ static bool cxl_setup_memory(CXLType3Dev *ct3d, Error
> **errp)
> }
> address_space_init(&ct3d->hostpmem_as, pmr, p_name);
> ct3d->cxl_dstate.pmem_size = memory_region_size(pmr);
> - ct3d->cxl_dstate.mem_size += memory_region_size(pmr);
> + ct3d->cxl_dstate.static_mem_size += memory_region_size(pmr);
> g_free(p_name);
> }
>
> @@ -984,7 +984,7 @@ static int cxl_type3_hpa_to_as_and_dpa(CXLType3Dev *ct3d,
> return -EINVAL;
> }
>
> - if (*dpa_offset > ct3d->cxl_dstate.mem_size) {
> + if (*dpa_offset > ct3d->cxl_dstate.static_mem_size) {
> return -EINVAL;
> }
>
> @@ -1148,7 +1148,7 @@ static bool set_cacheline(CXLType3Dev *ct3d, uint64_t
> dpa_offset, uint8_t *data)
> return false;
> }
>
> - if (dpa_offset + CXL_CACHE_LINE_SIZE > ct3d->cxl_dstate.mem_size) {
> + if (dpa_offset + CXL_CACHE_LINE_SIZE > ct3d->cxl_dstate.static_mem_size)
> {
> return false;
> }
>
> diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h
> index dae39da438..503c344326 100644
> --- a/include/hw/cxl/cxl_device.h
> +++ b/include/hw/cxl/cxl_device.h
> @@ -209,7 +209,7 @@ typedef struct cxl_device_state {
> } timestamp;
>
> /* memory region size, HDM */
> - uint64_t mem_size;
> + uint64_t static_mem_size;
> uint64_t pmem_size;
> uint64_t vmem_size;
> bool is_dcd;
