On Thu, 31 Aug 2023 21:29:11 -0400
Gregory Price <gourry.memve...@gmail.com> wrote:
> Call CXL_TYPE3 once at top of function to avoid multiple invocations.
>
> Signed-off-by: Gregory Price <gregory.pr...@memverge.com>
Good cleanup on it's own.
I'll queue this one up on the backend of the sanitize set that
introduces the second use in each of these functions.
That series might take a while to land upstream though as the CCI rework is
in front of them currently. I'm not sure I want the pain of reording those
two series.
Jonathan
> ---
> hw/mem/cxl_type3.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c
> index fd9d134d46..80d596ee10 100644
> --- a/hw/mem/cxl_type3.c
> +++ b/hw/mem/cxl_type3.c
> @@ -1248,17 +1248,18 @@ static int cxl_type3_hpa_to_as_and_dpa(CXLType3Dev
> *ct3d,
> MemTxResult cxl_type3_read(PCIDevice *d, hwaddr host_addr, uint64_t *data,
> unsigned size, MemTxAttrs attrs)
> {
> + CXLType3Dev *ct3d = CXL_TYPE3(d);
> uint64_t dpa_offset = 0;
> AddressSpace *as = NULL;
> int res;
>
> - res = cxl_type3_hpa_to_as_and_dpa(CXL_TYPE3(d), host_addr, size,
> + res = cxl_type3_hpa_to_as_and_dpa(ct3d, host_addr, size,
> &as, &dpa_offset);
> if (res) {
> return MEMTX_ERROR;
> }
>
> - if (sanitize_running(&CXL_TYPE3(d)->cci)) {
> + if (sanitize_running(&ct3d->cci)) {
> qemu_guest_getrandom_nofail(data, size);
> return MEMTX_OK;
> }
> @@ -1268,16 +1269,17 @@ MemTxResult cxl_type3_read(PCIDevice *d, hwaddr
> host_addr, uint64_t *data,
> MemTxResult cxl_type3_write(PCIDevice *d, hwaddr host_addr, uint64_t data,
> unsigned size, MemTxAttrs attrs)
> {
> + CXLType3Dev *ct3d = CXL_TYPE3(d);
> uint64_t dpa_offset = 0;
> AddressSpace *as = NULL;
> int res;
>
> - res = cxl_type3_hpa_to_as_and_dpa(CXL_TYPE3(d), host_addr, size,
> + res = cxl_type3_hpa_to_as_and_dpa(ct3d, host_addr, size,
> &as, &dpa_offset);
> if (res) {
> return MEMTX_ERROR;
> }
> - if (sanitize_running(&CXL_TYPE3(d)->cci)) {
> + if (sanitize_running(&ct3d->cci)) {
> return MEMTX_OK;
> }
> return address_space_write(as, dpa_offset, attrs, &data, size);
