From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4Vwk-0001oJ-SR for qemu-devel@nongnu.org; Wed, 09 Nov 2016 11:42:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c4Vwj-0004c8-Hd for qemu-devel@nongnu.org; Wed, 09 Nov 2016 11:41:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43482) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c4Vwj-0004bc-9R for qemu-devel@nongnu.org; Wed, 09 Nov 2016 11:41:57 -0500 Date: Wed, 9 Nov 2016 17:41:53 +0100 From: Igor Mammedov Message-ID: <20161109174153.25a8b524@nial.brq.redhat.com> In-Reply-To: <1478517229-140028-15-git-send-email-guangrong.xiao@linux.intel.com> References: <1478517229-140028-1-git-send-email-guangrong.xiao@linux.intel.com> <1478517229-140028-15-git-send-email-guangrong.xiao@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 14/14] nvdimm acpi: introduce NVDIMM_DSM_MEMORY_SIZE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Xiao Guangrong Cc: pbonzini@redhat.com, gleb@kernel.org, mtosatti@redhat.com, stefanha@redhat.com, mst@redhat.com, rth@twiddle.net, ehabkost@redhat.com, dan.j.williams@intel.com, kvm@vger.kernel.org, qemu-devel@nongnu.org On Mon, 7 Nov 2016 19:13:49 +0800 Xiao Guangrong wrote: > and use it to replace the raw number > > Suggested-by: Igor Mammedov > Signed-off-by: Xiao Guangrong Reviewed-by: Igor Mammedov > --- > hw/acpi/nvdimm.c | 30 +++++++++++++++++------------- > 1 file changed, 17 insertions(+), 13 deletions(-) > > diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c > index 5f48b75..8e7d6ec 100644 > --- a/hw/acpi/nvdimm.c > +++ b/hw/acpi/nvdimm.c > @@ -404,6 +404,8 @@ static void nvdimm_build_nfit(AcpiNVDIMMState *state, GArray *table_offsets, > sizeof(NvdimmNfitHeader) + fit_buf->fit->len, 1, NULL, NULL); > } > > +#define NVDIMM_DSM_MEMORY_SIZE 4096 > + > struct NvdimmDsmIn { > uint32_t handle; > uint32_t revision; > @@ -414,7 +416,7 @@ struct NvdimmDsmIn { > }; > } QEMU_PACKED; > typedef struct NvdimmDsmIn NvdimmDsmIn; > -QEMU_BUILD_BUG_ON(sizeof(NvdimmDsmIn) != 4096); > +QEMU_BUILD_BUG_ON(sizeof(NvdimmDsmIn) != NVDIMM_DSM_MEMORY_SIZE); > > struct NvdimmDsmOut { > /* the size of buffer filled by QEMU. */ > @@ -422,7 +424,7 @@ struct NvdimmDsmOut { > uint8_t data[4092]; > } QEMU_PACKED; > typedef struct NvdimmDsmOut NvdimmDsmOut; > -QEMU_BUILD_BUG_ON(sizeof(NvdimmDsmOut) != 4096); > +QEMU_BUILD_BUG_ON(sizeof(NvdimmDsmOut) != NVDIMM_DSM_MEMORY_SIZE); > > struct NvdimmDsmFunc0Out { > /* the size of buffer filled by QEMU. */ > @@ -450,7 +452,7 @@ struct NvdimmFuncGetLabelSizeOut { > uint32_t max_xfer; > } QEMU_PACKED; > typedef struct NvdimmFuncGetLabelSizeOut NvdimmFuncGetLabelSizeOut; > -QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncGetLabelSizeOut) > 4096); > +QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncGetLabelSizeOut) > NVDIMM_DSM_MEMORY_SIZE); > > struct NvdimmFuncGetLabelDataIn { > uint32_t offset; /* the offset in the namespace label data area. */ > @@ -458,7 +460,7 @@ struct NvdimmFuncGetLabelDataIn { > } QEMU_PACKED; > typedef struct NvdimmFuncGetLabelDataIn NvdimmFuncGetLabelDataIn; > QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncGetLabelDataIn) + > - offsetof(NvdimmDsmIn, arg3) > 4096); > + offsetof(NvdimmDsmIn, arg3) > NVDIMM_DSM_MEMORY_SIZE); > > struct NvdimmFuncGetLabelDataOut { > /* the size of buffer filled by QEMU. */ > @@ -467,7 +469,7 @@ struct NvdimmFuncGetLabelDataOut { > uint8_t out_buf[0]; /* the data got via Get Namesapce Label function. */ > } QEMU_PACKED; > typedef struct NvdimmFuncGetLabelDataOut NvdimmFuncGetLabelDataOut; > -QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncGetLabelDataOut) > 4096); > +QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncGetLabelDataOut) > NVDIMM_DSM_MEMORY_SIZE); > > struct NvdimmFuncSetLabelDataIn { > uint32_t offset; /* the offset in the namespace label data area. */ > @@ -476,14 +478,14 @@ struct NvdimmFuncSetLabelDataIn { > } QEMU_PACKED; > typedef struct NvdimmFuncSetLabelDataIn NvdimmFuncSetLabelDataIn; > QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncSetLabelDataIn) + > - offsetof(NvdimmDsmIn, arg3) > 4096); > + offsetof(NvdimmDsmIn, arg3) > NVDIMM_DSM_MEMORY_SIZE); > > struct NvdimmFuncReadFITIn { > uint32_t offset; /* the offset into FIT buffer. */ > } QEMU_PACKED; > typedef struct NvdimmFuncReadFITIn NvdimmFuncReadFITIn; > QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncReadFITIn) + > - offsetof(NvdimmDsmIn, arg3) > 4096); > + offsetof(NvdimmDsmIn, arg3) > NVDIMM_DSM_MEMORY_SIZE); > > struct NvdimmFuncReadFITOut { > /* the size of buffer filled by QEMU. */ > @@ -492,7 +494,7 @@ struct NvdimmFuncReadFITOut { > uint8_t fit[0]; /* the FIT data. */ > } QEMU_PACKED; > typedef struct NvdimmFuncReadFITOut NvdimmFuncReadFITOut; > -QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncReadFITOut) > 4096); > +QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncReadFITOut) > NVDIMM_DSM_MEMORY_SIZE); > > static void > nvdimm_dsm_function0(uint32_t supported_func, hwaddr dsm_mem_addr) > @@ -556,7 +558,7 @@ static void nvdimm_dsm_func_read_fit(AcpiNVDIMMState *state, NvdimmDsmIn *in, > > func_ret_status = NVDIMM_DSM_RET_STATUS_SUCCESS; > read_len = MIN(fit->len - read_fit->offset, > - 4096 - sizeof(NvdimmFuncReadFITOut)); > + NVDIMM_DSM_MEMORY_SIZE - sizeof(NvdimmFuncReadFITOut)); > > exit: > size = sizeof(NvdimmFuncReadFITOut) + read_len; > @@ -610,7 +612,9 @@ static void nvdimm_dsm_root(NvdimmDsmIn *in, hwaddr dsm_mem_addr) > */ > static uint32_t nvdimm_get_max_xfer_label_size(void) > { > - uint32_t max_get_size, max_set_size, dsm_memory_size = 4096; > + uint32_t max_get_size, max_set_size, dsm_memory_size; > + > + dsm_memory_size = NVDIMM_DSM_MEMORY_SIZE; > > /* > * the max data ACPI can read one time which is transferred by > @@ -707,7 +711,7 @@ static void nvdimm_dsm_get_label_data(NVDIMMDevice *nvdimm, NvdimmDsmIn *in, > } > > size = sizeof(*get_label_data_out) + get_label_data->length; > - assert(size <= 4096); > + assert(size <= NVDIMM_DSM_MEMORY_SIZE); > get_label_data_out = g_malloc(size); > > get_label_data_out->len = cpu_to_le32(size); > @@ -745,8 +749,8 @@ static void nvdimm_dsm_set_label_data(NVDIMMDevice *nvdimm, NvdimmDsmIn *in, > return; > } > > - assert(offsetof(NvdimmDsmIn, arg3) + > - sizeof(*set_label_data) + set_label_data->length <= 4096); > + assert(offsetof(NvdimmDsmIn, arg3) + sizeof(*set_label_data) + > + set_label_data->length <= NVDIMM_DSM_MEMORY_SIZE); > > nvc->write_label_data(nvdimm, set_label_data->in_buf, > set_label_data->length, set_label_data->offset);