From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aS8Ih-0002ef-2J for qemu-devel@nongnu.org; Sat, 06 Feb 2016 14:13:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aS8If-0002Vh-CS for qemu-devel@nongnu.org; Sat, 06 Feb 2016 14:13:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54742) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aS8If-0002VX-2R for qemu-devel@nongnu.org; Sat, 06 Feb 2016 14:13:41 -0500 Date: Sat, 6 Feb 2016 21:13:36 +0200 From: "Michael S. Tsirkin" Message-ID: <1454784308-21177-23-git-send-email-mst@redhat.com> References: <1454784308-21177-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1454784308-21177-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 22/45] ipmi: introduce a struct ipmi_sdr_compact List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Eduardo Habkost , Corey Minyard , =?us-ascii?B?PT9VVEYtOD9xP0M9QzM9QTlkcmljPTIwTGU9MjBHb2F0ZXI/PQ==?= , Marcel Apfelbaum , Greg Kurz From: C=E9dric Le Goater Currently, sdr attributes are identified using byte offsets and this can be a bit confusing. This patch adds a struct ipmi_sdr_compact conforming to the IPMI specs and replaces byte offsets with names. It also introduces and uses a struct ipmi_sdr_header in sections of the code where no assumption is made on the type of SDR. This leave rooms to potential usage of other types in the future. Signed-off-by: C=E9dric Le Goater Acked-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/ipmi/ipmi.h | 45 +++++++++++++++++++++++++++++++ hw/ipmi/ipmi_bmc_sim.c | 72 ++++++++++++++++++++++++++++++--------------= ------ 2 files changed, 89 insertions(+), 28 deletions(-) diff --git a/include/hw/ipmi/ipmi.h b/include/hw/ipmi/ipmi.h index 32bac0f..74a2b5a 100644 --- a/include/hw/ipmi/ipmi.h +++ b/include/hw/ipmi/ipmi.h @@ -210,4 +210,49 @@ IPMIFwInfo *ipmi_next_fwinfo(IPMIFwInfo *current); #define ipmi_debug(fs, ...) #endif =20 +struct ipmi_sdr_header { + uint8_t rec_id[2]; + uint8_t sdr_version; /* 0x51 */ + uint8_t rec_type; + uint8_t rec_length; +}; +#define IPMI_SDR_HEADER_SIZE sizeof(struct ipmi_sdr_header) + +#define ipmi_sdr_recid(sdr) ((sdr)->rec_id[0] | ((sdr)->rec_id[1] << 8)) +#define ipmi_sdr_length(sdr) ((sdr)->rec_length + IPMI_SDR_HEADER_SIZE) + +/* + * 43.2 SDR Type 02h. Compact Sensor Record + */ +#define IPMI_SDR_COMPACT_TYPE 2 + +struct ipmi_sdr_compact { + struct ipmi_sdr_header header; + + uint8_t sensor_owner_id; + uint8_t sensor_owner_lun; + uint8_t sensor_owner_number; /* byte 8 */ + uint8_t entity_id; + uint8_t entity_instance; + uint8_t sensor_init; + uint8_t sensor_caps; + uint8_t sensor_type; + uint8_t reading_type; + uint8_t assert_mask[2]; /* byte 16 */ + uint8_t deassert_mask[2]; + uint8_t discrete_mask[2]; + uint8_t sensor_unit1; + uint8_t sensor_unit2; + uint8_t sensor_unit3; + uint8_t sensor_direction[2]; /* byte 24 */ + uint8_t positive_threshold; + uint8_t negative_threshold; + uint8_t reserved[3]; + uint8_t oem; + uint8_t id_str_len; /* byte 32 */ + uint8_t id_string[16]; +}; + +typedef uint8_t ipmi_sdr_compact_buffer[sizeof(struct ipmi_sdr_compact)]= ; + #endif diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index 73a4f6a..84fbcd2 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -318,14 +318,18 @@ static void sdr_inc_reservation(IPMISdr *sdr) } } =20 -static int sdr_add_entry(IPMIBmcSim *ibs, const uint8_t *entry, +static int sdr_add_entry(IPMIBmcSim *ibs, + const struct ipmi_sdr_header *sdrh_entry, unsigned int len, uint16_t *recid) { - if ((len < 5) || (len > 255)) { + struct ipmi_sdr_header *sdrh =3D + (struct ipmi_sdr_header *) &ibs->sdr.sdr[ibs->sdr.next_free]; + + if ((len < IPMI_SDR_HEADER_SIZE) || (len > 255)) { return 1; } =20 - if (entry[4] !=3D len - 5) { + if (ipmi_sdr_length(sdrh_entry) !=3D len) { return 1; } =20 @@ -334,10 +338,10 @@ static int sdr_add_entry(IPMIBmcSim *ibs, const uin= t8_t *entry, return 1; } =20 - memcpy(ibs->sdr.sdr + ibs->sdr.next_free, entry, len); - ibs->sdr.sdr[ibs->sdr.next_free] =3D ibs->sdr.next_rec_id & 0xff; - ibs->sdr.sdr[ibs->sdr.next_free+1] =3D (ibs->sdr.next_rec_id >> 8) &= 0xff; - ibs->sdr.sdr[ibs->sdr.next_free+2] =3D 0x51; /* Conform to IPMI 1.5 = spec */ + memcpy(sdrh, sdrh_entry, len); + sdrh->rec_id[0] =3D ibs->sdr.next_rec_id & 0xff; + sdrh->rec_id[1] =3D (ibs->sdr.next_rec_id >> 8) & 0xff; + sdrh->sdr_version =3D 0x51; /* Conform to IPMI 1.5 spec */ =20 if (recid) { *recid =3D ibs->sdr.next_rec_id; @@ -355,8 +359,10 @@ static int sdr_find_entry(IPMISdr *sdr, uint16_t rec= id, unsigned int pos =3D *retpos; =20 while (pos < sdr->next_free) { - uint16_t trec =3D sdr->sdr[pos] | (sdr->sdr[pos + 1] << 8); - unsigned int nextpos =3D pos + sdr->sdr[pos + 4] + 5; + struct ipmi_sdr_header *sdrh =3D + (struct ipmi_sdr_header *) &sdr->sdr[pos]; + uint16_t trec =3D ipmi_sdr_recid(sdrh); + unsigned int nextpos =3D pos + ipmi_sdr_length(sdrh); =20 if (trec =3D=3D recid) { if (nextrec) { @@ -505,29 +511,32 @@ static void ipmi_init_sensors_from_sdrs(IPMIBmcSim = *s) =20 pos =3D 0; for (i =3D 0; !sdr_find_entry(&s->sdr, i, &pos, NULL); i++) { - uint8_t *sdr =3D s->sdr.sdr + pos; - unsigned int len =3D sdr[4]; + struct ipmi_sdr_compact *sdr =3D + (struct ipmi_sdr_compact *) &s->sdr.sdr[pos]; + unsigned int len =3D sdr->header.rec_length; =20 if (len < 20) { continue; } - if ((sdr[3] < 1) || (sdr[3] > 2)) { + if (sdr->header.rec_type !=3D IPMI_SDR_COMPACT_TYPE) { continue; /* Not a sensor SDR we set from */ } =20 - if (sdr[7] > MAX_SENSORS) { + if (sdr->sensor_owner_number > MAX_SENSORS) { continue; } - sens =3D s->sensors + sdr[7]; + sens =3D s->sensors + sdr->sensor_owner_number; =20 IPMI_SENSOR_SET_PRESENT(sens, 1); - IPMI_SENSOR_SET_SCAN_ON(sens, (sdr[10] >> 6) & 1); - IPMI_SENSOR_SET_EVENTS_ON(sens, (sdr[10] >> 5) & 1); - sens->assert_suppt =3D sdr[14] | (sdr[15] << 8); - sens->deassert_suppt =3D sdr[16] | (sdr[17] << 8); - sens->states_suppt =3D sdr[18] | (sdr[19] << 8); - sens->sensor_type =3D sdr[12]; - sens->evt_reading_type_code =3D sdr[13] & 0x7f; + IPMI_SENSOR_SET_SCAN_ON(sens, (sdr->sensor_init >> 6) & 1); + IPMI_SENSOR_SET_EVENTS_ON(sens, (sdr->sensor_init >> 5) & 1); + sens->assert_suppt =3D sdr->assert_mask[0] | (sdr->assert_mask[1= ] << 8); + sens->deassert_suppt =3D + sdr->deassert_mask[0] | (sdr->deassert_mask[1] << 8); + sens->states_suppt =3D + sdr->discrete_mask[0] | (sdr->discrete_mask[1] << 8); + sens->sensor_type =3D sdr->sensor_type; + sens->evt_reading_type_code =3D sdr->reading_type & 0x7f; =20 /* Enable all the events that are supported. */ sens->assert_enable =3D sens->assert_suppt; @@ -1153,6 +1162,7 @@ static void get_sdr(IPMIBmcSim *ibs, { unsigned int pos; uint16_t nextrec; + struct ipmi_sdr_header *sdrh; =20 IPMI_CHECK_CMD_LEN(8); if (cmd[6]) { @@ -1164,7 +1174,10 @@ static void get_sdr(IPMIBmcSim *ibs, rsp[2] =3D IPMI_CC_REQ_ENTRY_NOT_PRESENT; return; } - if (cmd[6] > (ibs->sdr.sdr[pos + 4] + 5)) { + + sdrh =3D (struct ipmi_sdr_header *) &ibs->sdr.sdr[pos]; + + if (cmd[6] > ipmi_sdr_length(sdrh)) { rsp[2] =3D IPMI_CC_PARM_OUT_OF_RANGE; return; } @@ -1173,7 +1186,7 @@ static void get_sdr(IPMIBmcSim *ibs, IPMI_ADD_RSP_DATA((nextrec >> 8) & 0xff); =20 if (cmd[7] =3D=3D 0xff) { - cmd[7] =3D ibs->sdr.sdr[pos + 4] + 5 - cmd[6]; + cmd[7] =3D ipmi_sdr_length(sdrh) - cmd[6]; } =20 if ((cmd[7] + *rsp_len) > max_rsp_len) { @@ -1190,8 +1203,9 @@ static void add_sdr(IPMIBmcSim *ibs, unsigned int max_rsp_len) { uint16_t recid; + struct ipmi_sdr_header *sdrh =3D (struct ipmi_sdr_header *) cmd + 2; =20 - if (sdr_add_entry(ibs, cmd + 2, cmd_len - 2, &recid)) { + if (sdr_add_entry(ibs, sdrh, cmd_len - 2, &recid)) { rsp[2] =3D IPMI_CC_INVALID_DATA_FIELD; return; } @@ -1642,13 +1656,15 @@ static void ipmi_sim_init(Object *obj) } =20 for (i =3D 0;;) { + struct ipmi_sdr_header *sdrh; int len; - if ((i + 5) > sizeof(init_sdrs)) { + if ((i + IPMI_SDR_HEADER_SIZE) > sizeof(init_sdrs)) { error_report("Problem with recid 0x%4.4x", i); return; } - len =3D init_sdrs[i + 4] + 5; - recid =3D init_sdrs[i] | (init_sdrs[i + 1] << 8); + sdrh =3D (struct ipmi_sdr_header *) &init_sdrs[i]; + len =3D ipmi_sdr_length(sdrh); + recid =3D ipmi_sdr_recid(sdrh); if (recid =3D=3D 0xffff) { break; } @@ -1656,7 +1672,7 @@ static void ipmi_sim_init(Object *obj) error_report("Problem with recid 0x%4.4x", i); return; } - sdr_add_entry(ibs, init_sdrs + i, len, NULL); + sdr_add_entry(ibs, sdrh, len, NULL); i +=3D len; } =20 --=20 MST