[PATCH openpower-host-ipmi-oem] Fixed byte swapped esel log name so logs are saved moved to tabs.. sorry that really messes up the changes
OpenBMC Patches
patches at stwcx.xyz
Sat Oct 31 05:52:37 AEDT 2015
From: Chris Austen <austenc at us.ibm.com>
---
oemhandler.C | 108 ++++++++++++++++++++++++++++-------------------------------
1 file changed, 51 insertions(+), 57 deletions(-)
diff --git a/oemhandler.C b/oemhandler.C
index ffff6c6..e351d5c 100644
--- a/oemhandler.C
+++ b/oemhandler.C
@@ -25,67 +25,61 @@ uint16_t g_record_id = 0x0100;
// storage. Likely via the ipmi add_sel command.
///////////////////////////////////////////////////////////////////////////////
ipmi_ret_t ipmi_ibm_oem_partial_esel(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
- ipmi_request_t request, ipmi_response_t response,
- ipmi_data_len_t data_len, ipmi_context_t context)
+ ipmi_request_t request, ipmi_response_t response,
+ ipmi_data_len_t data_len, ipmi_context_t context)
{
- esel_request_t *reqptr = (esel_request_t*) request;
- FILE *fp;
- short offset = 0;
- uint8_t rlen;
- ipmi_ret_t rc = IPMI_CC_OK;
- char string[64];
- const char *pio;
-
-
- offset = LSMSSWAP(reqptr->offsetls, reqptr->offsetms);
-
- snprintf(string, sizeof(string), "%s%s%02x%02x", g_esel_path, "esel", reqptr->selrecordms, reqptr->selrecordls);
-
-
- // Length is the number of request bytes minus the header itself.
- // The header contains an extra byte to indicate the start of
- // the data (so didn't need to worry about word/byte boundaries)
- // hence the -1...
- rlen = (*data_len) - (uint8_t) (sizeof(esel_request_t));
-
-
- printf("IPMI PARTIAL ESEL for %s Offset = %d Length = %d\n",
- string, offset, rlen);
-
-
- // Rules state for a Partial eSel that the first write of a
- // new esel will be the sensor data record. We will use that
- // to indicate this is a new record rather then an ofset in
- // my next commit TODO
- if (offset == 0) {
- pio = "wb";
- } else {
- pio = "rb+";
- }
-
- if ((fp = fopen(string, pio)) != NULL) {
- fseek(fp, offset, SEEK_SET);
- fwrite(reqptr+1,rlen,1,fp);
- fclose(fp);
-
-
- *data_len = sizeof(g_record_id);
- memcpy(response, &g_record_id, *data_len);
-
-
- } else {
- fprintf(stderr, "Error trying to perform %s for esel%s\n",pio, string);
- rc = IPMI_CC_INVALID;
- *data_len = 0;
- }
-
- return rc;
+ esel_request_t *reqptr = (esel_request_t*) request;
+ FILE *fp;
+ short recid, offset = 0;
+ uint8_t rlen;
+ ipmi_ret_t rc = IPMI_CC_OK;
+ char string[64];
+ const char *pio;
+
+ recid = LSMSSWAP(reqptr->selrecordls, reqptr->selrecordms);
+ offset = LSMSSWAP(reqptr->offsetls, reqptr->offsetms);
+
+ if (!recid && !offset) {
+ // OpenPOWER Host Interface spec says if RecordID and Offset are
+ // 0 then then this is a new request
+ pio = "wb";
+ snprintf(string, sizeof(string), "%s%s%02x%02x", g_esel_path, "esel", (g_record_id&0xFF00>>8), (g_record_id&0xFF));
+ } else {
+ pio = "rb+";
+ snprintf(string, sizeof(string), "%s%s%02x%02x", g_esel_path, "esel", reqptr->selrecordms, reqptr->selrecordls);
+ }
+
+ // Length is the number of request bytes minus the header itself.
+ // The header contains an extra byte to indicate the start of
+ // the data (so didn't need to worry about word/byte boundaries)
+ // hence the -1...
+ rlen = (*data_len) - (uint8_t) (sizeof(esel_request_t));
+
+
+ printf("IPMI PARTIAL ESEL for %s Offset = %d Length = %d\n",
+ string, offset, rlen);
+
+
+ if ((fp = fopen(string, pio)) != NULL) {
+ fseek(fp, offset, SEEK_SET);
+ fwrite(reqptr+1,rlen,1,fp);
+ fclose(fp);
+
+ *data_len = sizeof(g_record_id);
+ memcpy(response, &g_record_id, *data_len);
+ } else {
+ fprintf(stderr, "Error trying to perform %s for esel%s\n",pio, string);
+ rc = IPMI_CC_INVALID;
+ *data_len = 0;
+ }
+
+ return rc;
}
void register_netfn_oem_partial_esel()
{
- printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n",NETFUN_OEM, IPMI_CMD_PESEL);
- ipmi_register_callback(NETFUN_OEM, IPMI_CMD_PESEL, NULL, ipmi_ibm_oem_partial_esel);
- return;
+ printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n",NETFUN_OEM, IPMI_CMD_PESEL);
+ ipmi_register_callback(NETFUN_OEM, IPMI_CMD_PESEL, NULL, ipmi_ibm_oem_partial_esel);
+ return;
}
--
2.6.0
More information about the openbmc
mailing list