From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48161) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afpz7-0000Zt-5T for qemu-devel@nongnu.org; Tue, 15 Mar 2016 10:30:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afpz4-0005GF-Ms for qemu-devel@nongnu.org; Tue, 15 Mar 2016 10:30:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43064) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afpz4-0005Ed-G9 for qemu-devel@nongnu.org; Tue, 15 Mar 2016 10:30:06 -0400 Date: Tue, 15 Mar 2016 16:30:02 +0200 From: "Michael S. Tsirkin" Message-ID: <20160315162859-mutt-send-email-mst@redhat.com> References: <1457618643-32310-1-git-send-email-clg@fr.ibm.com> <1457618643-32310-11-git-send-email-clg@fr.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1457618643-32310-11-git-send-email-clg@fr.ibm.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 10/10] ipmi: provide support for FRUs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-1?Q?C=E9dric?= Le Goater Cc: Marcel Apfelbaum , Corey Minyard , qemu-devel@nongnu.org On Thu, Mar 10, 2016 at 03:04:03PM +0100, C=E9dric Le Goater wrote: > This patch provides a simple FRU support for the BMC simulator. FRUs > are loaded from a file which name is specified in the object > properties, each entry having a fixed size, also specified in the > properties. If the file is unknown or not accessible for some reason, > a unique entry of 1024 bytes is created as a default. Just enough to > start some simulation. >=20 > These commands complies with the IPMI spec : "34. FRU Inventory Device > Commands". >=20 > Signed-off-by: C=E9dric Le Goater > Acked-by: Corey Minyard Since pull failed, I decided to hold this off until after release. Loading new files needs some thought. > --- >=20 > Changes since v2: >=20 > - changed 'struct rsp_buffer' to 'RspBuffer' > =20 > Changes since v1: >=20 > - change property name to 'fruareasize' and 'frudatafile' > - add documentation of new properties > =20 > hw/ipmi/ipmi_bmc_sim.c | 131 ++++++++++++++++++++++++++++++++++++++++= +++++++++ > qemu-options.hx | 8 ++ > 2 files changed, 137 insertions(+), 2 deletions(-) >=20 > Index: qemu-powernv.git/hw/ipmi/ipmi_bmc_sim.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- qemu-powernv.git.orig/hw/ipmi/ipmi_bmc_sim.c > +++ qemu-powernv.git/hw/ipmi/ipmi_bmc_sim.c > @@ -80,6 +80,9 @@ > #define IPMI_CMD_ENTER_SDR_REP_UPD_MODE 0x2A > #define IPMI_CMD_EXIT_SDR_REP_UPD_MODE 0x2B > #define IPMI_CMD_RUN_INIT_AGENT 0x2C > +#define IPMI_CMD_GET_FRU_AREA_INFO 0x10 > +#define IPMI_CMD_READ_FRU_DATA 0x11 > +#define IPMI_CMD_WRITE_FRU_DATA 0x12 > #define IPMI_CMD_GET_SEL_INFO 0x40 > #define IPMI_CMD_GET_SEL_ALLOC_INFO 0x41 > #define IPMI_CMD_RESERVE_SEL 0x42 > @@ -122,6 +125,13 @@ typedef struct IPMISdr { > uint8_t overflow; > } IPMISdr; > =20 > +typedef struct IPMIFru { > + char *filename; > + unsigned int nentries; > + uint16_t areasize; > + uint8_t *data; > +} IPMIFru; > + > typedef struct IPMISensor { > uint8_t status; > uint8_t reading; > @@ -213,6 +223,7 @@ struct IPMIBmcSim { > =20 > IPMISel sel; > IPMISdr sdr; > + IPMIFru fru; > IPMISensor sensors[MAX_SENSORS]; > char *sdr_filename; > =20 > @@ -1322,6 +1333,94 @@ static void get_sel_info(IPMIBmcSim *ibs > rsp_buffer_push(rsp, (ibs->sel.overflow << 7) | 0x02); > } > =20 > +static void get_fru_area_info(IPMIBmcSim *ibs, > + uint8_t *cmd, unsigned int cmd_len, > + RspBuffer *rsp) > +{ > + uint8_t fruid; > + uint16_t fru_entry_size; > + > + fruid =3D cmd[2]; > + > + if (fruid >=3D ibs->fru.nentries) { > + rsp_buffer_set_error(rsp, IPMI_CC_INVALID_DATA_FIELD); > + return; > + } > + > + fru_entry_size =3D ibs->fru.areasize; > + > + rsp_buffer_push(rsp, fru_entry_size & 0xff); > + rsp_buffer_push(rsp, fru_entry_size >> 8 & 0xff); > + rsp_buffer_push(rsp, 0x0); > +} > + > +#define min(x, y) ((x) < (y) ? (x) : (y)) > +#define max(x, y) ((x) > (y) ? (x) : (y)) > + > +static void read_fru_data(IPMIBmcSim *ibs, > + uint8_t *cmd, unsigned int cmd_len, > + RspBuffer *rsp) > +{ > + uint8_t fruid; > + uint16_t offset; > + int i; > + uint8_t *fru_entry; > + unsigned int count; > + > + fruid =3D cmd[2]; > + offset =3D (cmd[3] | cmd[4] << 8); > + > + if (fruid >=3D ibs->fru.nentries) { > + rsp_buffer_set_error(rsp, IPMI_CC_INVALID_DATA_FIELD); > + return; > + } > + > + if (offset >=3D ibs->fru.areasize - 1) { > + rsp_buffer_set_error(rsp, IPMI_CC_INVALID_DATA_FIELD); > + return; > + } > + > + fru_entry =3D &ibs->fru.data[fruid * ibs->fru.areasize]; > + > + count =3D min(cmd[5], ibs->fru.areasize - offset); > + > + rsp_buffer_push(rsp, count & 0xff); > + for (i =3D 0; i < count; i++) { > + rsp_buffer_push(rsp, fru_entry[offset + i]); > + } > +} > + > +static void write_fru_data(IPMIBmcSim *ibs, > + uint8_t *cmd, unsigned int cmd_len, > + RspBuffer *rsp) > +{ > + uint8_t fruid; > + uint16_t offset; > + uint8_t *fru_entry; > + unsigned int count; > + > + fruid =3D cmd[2]; > + offset =3D (cmd[3] | cmd[4] << 8); > + > + if (fruid >=3D ibs->fru.nentries) { > + rsp_buffer_set_error(rsp, IPMI_CC_INVALID_DATA_FIELD); > + return; > + } > + > + if (offset >=3D ibs->fru.areasize - 1) { > + rsp_buffer_set_error(rsp, IPMI_CC_INVALID_DATA_FIELD); > + return; > + } > + > + fru_entry =3D &ibs->fru.data[fruid * ibs->fru.areasize]; > + > + count =3D min(cmd_len - 5, ibs->fru.areasize - offset); > + > + memcpy(fru_entry + offset, cmd + 5, count); > + > + rsp_buffer_push(rsp, count & 0xff); > +} > + > static void reserve_sel(IPMIBmcSim *ibs, > uint8_t *cmd, unsigned int cmd_len, > RspBuffer *rsp) > @@ -1658,6 +1757,9 @@ static const IPMINetfn app_netfn =3D { > }; > =20 > static const IPMICmdHandler storage_cmds[] =3D { > + [IPMI_CMD_GET_FRU_AREA_INFO] =3D { get_fru_area_info, 3 }, > + [IPMI_CMD_READ_FRU_DATA] =3D { read_fru_data, 5 }, > + [IPMI_CMD_WRITE_FRU_DATA] =3D { write_fru_data, 5 }, > [IPMI_CMD_GET_SDR_REP_INFO] =3D { get_sdr_rep_info }, > [IPMI_CMD_RESERVE_SDR_REP] =3D { reserve_sdr_rep }, > [IPMI_CMD_GET_SDR] =3D { get_sdr, 8 }, > @@ -1760,6 +1862,31 @@ static const VMStateDescription vmstate_ > } > }; > =20 > +static void ipmi_fru_init(IPMIFru *fru) > +{ > + int fsize; > + int size =3D 0; > + > + fsize =3D get_image_size(fru->filename); > + if (fsize > 0) { > + size =3D QEMU_ALIGN_UP(fsize, fru->areasize); > + fru->data =3D g_malloc0(size); > + if (load_image_size(fru->filename, fru->data, fsize) !=3D fsiz= e) { > + error_report("Could not load file '%s'", fru->filename); > + g_free(fru->data); > + fru->data =3D NULL; > + } > + } > + > + if (!fru->data) { > + /* give one default FRU */ > + size =3D fru->areasize; > + fru->data =3D g_malloc0(size); > + } > + > + fru->nentries =3D size / fru->areasize; > +} > + > static void ipmi_sim_realize(DeviceState *dev, Error **errp) > { > IPMIBmc *b =3D IPMI_BMC(dev); > @@ -1782,6 +1909,8 @@ static void ipmi_sim_realize(DeviceState > =20 > ipmi_sdr_init(ibs); > =20 > + ipmi_fru_init(&ibs->fru); > + > ibs->acpi_power_state[0] =3D 0; > ibs->acpi_power_state[1] =3D 0; > =20 > @@ -1800,6 +1929,8 @@ static void ipmi_sim_realize(DeviceState > } > =20 > static Property ipmi_sim_properties[] =3D { > + DEFINE_PROP_UINT16("fruareasize", IPMIBmcSim, fru.areasize, 1024), > + DEFINE_PROP_STRING("frudatafile", IPMIBmcSim, fru.filename), > DEFINE_PROP_STRING("sdrfile", IPMIBmcSim, sdr_filename), > DEFINE_PROP_END_OF_LIST(), > }; > Index: qemu-powernv.git/qemu-options.hx > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- qemu-powernv.git.orig/qemu-options.hx > +++ qemu-powernv.git/qemu-options.hx > @@ -387,7 +387,7 @@ possible drivers and properties, use @co > @code{-device @var{driver},help}. > =20 > Some drivers are: > -@item -device ipmi-bmc-sim,id=3D@var{id}[,slave_addr=3D@var{val}][,sdr= file=3D@var{file}] > +@item -device ipmi-bmc-sim,id=3D@var{id}[,slave_addr=3D@var{val}][,sdr= file=3D@var{file}][,furareasize=3D@var{val}][,furdatafile=3D@var{file}] > =20 > Add an IPMI BMC. This is a simulation of a hardware management > interface processor that normally sits on a system. It provides > @@ -405,7 +405,11 @@ The BMC to connect to, one of ipmi-bmc-s > @item slave_addr=3D@var{val} > Define slave address to use for the BMC. The default is 0x20. > @item sdrfile=3D@var{file} > -file containing raw Sensor Data Records (SDR) data. The default is no= ne. > +file containing raw Sensor Data Records (SDR) data. The default is non= e. > +@item fruareasize=3D@var{val} > +size of a Field Replaceable Unit (FRU) area. The default is 1024. > +@item frudatafile=3D@var{file} > +file containing raw Field Replaceable Unit (FRU) inventory data. The d= efault is none. > @end table > =20 > @item -device ipmi-bmc-extern,id=3D@var{id},chardev=3D@var{id}[,slave_= addr=3D@var{val}]