Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
hw/mem: Use memory_region_size() in cxl_type3
Accessors prefered over direct use of int128_get64() as they
clamp out of range values.  None are expected here but
cleaner to always use the accessor than mix and match.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

Message-Id: <20230421160827.2227-3-Jonathan.Cameron@huawei.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Gregory Price <gregory.price@memverge.com>
  • Loading branch information
jic23 authored and mstsirkin committed May 19, 2023
1 parent 847ea4e commit 3521176
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions hw/mem/cxl_type3.c
Expand Up @@ -52,7 +52,7 @@ static int ct3_build_cdat_entries_for_mr(CDATSubHeader **cdat_table,
.DSMADhandle = dsmad_handle,
.flags = CDAT_DSMAS_FLAG_NV,
.DPA_base = 0,
.DPA_length = int128_get64(mr->size),
.DPA_length = memory_region_size(mr),
};

/* For now, no memory side cache, plausiblish numbers */
Expand Down Expand Up @@ -133,7 +133,7 @@ static int ct3_build_cdat_entries_for_mr(CDATSubHeader **cdat_table,
/* Reserved - the non volatile from DSMAS matters */
.EFI_memory_type_attr = 2,
.DPA_offset = 0,
.DPA_length = int128_get64(mr->size),
.DPA_length = memory_region_size(mr),
};

/* Header always at start of structure */
Expand Down Expand Up @@ -698,7 +698,7 @@ MemTxResult cxl_type3_read(PCIDevice *d, hwaddr host_addr, uint64_t *data,
return MEMTX_ERROR;
}

if (dpa_offset > int128_get64(mr->size)) {
if (dpa_offset > memory_region_size(mr)) {
return MEMTX_ERROR;
}

Expand All @@ -721,7 +721,7 @@ MemTxResult cxl_type3_write(PCIDevice *d, hwaddr host_addr, uint64_t data,
return MEMTX_OK;
}

if (dpa_offset > int128_get64(mr->size)) {
if (dpa_offset > memory_region_size(mr)) {
return MEMTX_OK;
}
return address_space_write(&ct3d->hostmem_as, dpa_offset, attrs,
Expand Down

0 comments on commit 3521176

Please sign in to comment.