Menu
▾
▴
[Ipmitool-cvs] [SCM] ipmitool branch, master, updated. 38241decc77b57ac484ae6c70e281feb4947fc2f
|
From: Zdenek S. <st...@us...> - 2016-03-13 17:24:49
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "ipmitool".
The branch, master has been updated
via 38241decc77b57ac484ae6c70e281feb4947fc2f (commit)
via a6a67e5e9cedbc5318b737f0c18690c1f134b13a (commit)
via ac646c329b2d7e975513e9e74001644e40900a0e (commit)
via 25e39b337c00b0e1ee0193c0085900b2a8070d2a (commit)
from cacdd1b6ec9bf04ea7dcaf6d66cc5cacbce56aa7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 38241decc77b57ac484ae6c70e281feb4947fc2f
Author: Zdenek Styblik <st...@tu...>
Date: Sun Mar 13 18:21:38 2016 +0100
ID:427 - Cleanup comment in ipmi_sdr_get_header()
Commit cleans up comment in ipmi_sdr_get_header() a bit.
diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c
index 502e547..226a964 100644
--- a/lib/ipmi_sdr.c
+++ b/lib/ipmi_sdr.c
@@ -865,15 +865,9 @@ ipmi_sdr_get_header(struct ipmi_intf *intf, struct ipmi_sdr_iterator *itr)
* situation, we cheat and put the original record id back in.
* Otherwise, a later Get SDR Record command will fail with
* completion code CBh = "Requested Sensor, data, or record
- * not present"
+ * not present". Exception is if 'Record ID' is specified as 0000h.
+ * For further information see IPMI v2.0 Spec, Section 33.12
*/
- /*****************************************************************
- * Need to add one conditional statement for First Record ID 0x0000
- * IPMI v2.0 Spec, Section 33.12
- * If âRecord IDâ is specified as 0000h, this command returns
- * the Record Header for the âfirstâ SDR in the repository.
- * Therefore the Record ID will not equal
- ******************************************************************/
if ((itr->next != 0x0000) &&
(sdr_rs.id != itr->next)) {
lprintf(LOG_DEBUG, "SDR record id mismatch: 0x%04x", sdr_rs.id);
commit a6a67e5e9cedbc5318b737f0c18690c1f134b13a
Author: Puwen <puw...@gm...>
Date: Thu Mar 10 15:29:36 2016 +0800
ID:427 - The first two bytes of dumped raw SDR data is wrong.
When we dumped the raw SDR data, the first Record ID will overwrite by 0x0000
diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c
index 3bebbb7..502e547 100644
--- a/lib/ipmi_sdr.c
+++ b/lib/ipmi_sdr.c
@@ -867,7 +867,15 @@ ipmi_sdr_get_header(struct ipmi_intf *intf, struct ipmi_sdr_iterator *itr)
* completion code CBh = "Requested Sensor, data, or record
* not present"
*/
- if (sdr_rs.id != itr->next) {
+ /*****************************************************************
+ * Need to add one conditional statement for First Record ID 0x0000
+ * IPMI v2.0 Spec, Section 33.12
+ * If âRecord IDâ is specified as 0000h, this command returns
+ * the Record Header for the âfirstâ SDR in the repository.
+ * Therefore the Record ID will not equal
+ ******************************************************************/
+ if ((itr->next != 0x0000) &&
+ (sdr_rs.id != itr->next)) {
lprintf(LOG_DEBUG, "SDR record id mismatch: 0x%04x", sdr_rs.id);
sdr_rs.id = itr->next;
}
commit ac646c329b2d7e975513e9e74001644e40900a0e
Author: Puwen <puw...@gm...>
Date: Thu Mar 10 11:39:47 2016 +0800
ID:428 - Update IANA numbers / Product Name for IBM and ADLINK
Updated ID String of IANA Enterprise numbers for IBM and ADLINK
Updated ID String of ADLINK Products
diff --git a/include/ipmitool/ipmi.h b/include/ipmitool/ipmi.h
index beda0ad..b680f00 100644
--- a/include/ipmitool/ipmi.h
+++ b/include/ipmitool/ipmi.h
@@ -251,8 +251,15 @@ struct ipmi_rs {
/* These values are IANA numbers */
+/************************************************************************
+* Add ID String for IANA Enterprise Number of IBM & ADLINK
+* https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers
+************************************************************************/
+
typedef enum IPMI_OEM {
IPMI_OEM_UNKNOWN = 0,
+ /* 2 for [IBM] */
+ IPMI_OEM_IBM_2 = 2,
IPMI_OEM_HP = 11,
IPMI_OEM_SUN = 42,
IPMI_OEM_NOKIA = 94,
@@ -268,6 +275,8 @@ typedef enum IPMI_OEM {
IPMI_OEM_LMC = 2168,
IPMI_OEM_RADISYS = 4337,
IPMI_OEM_BROADCOM = 4413,
+ /* 4769 for [IBM Corporation] */
+ IPMI_OEM_IBM_4769 = 4769,
IPMI_OEM_MAGNUM = 5593,
IPMI_OEM_TYAN = 6653,
IPMI_OEM_QUANTA = 7244,
@@ -283,7 +292,11 @@ typedef enum IPMI_OEM {
IPMI_OEM_RARITAN = 13742,
IPMI_OEM_KONTRON = 15000,
IPMI_OEM_PPS = 16394,
+ /* 20301 for [IBM eServer X] */
+ IPMI_OEM_IBM_20301 = 20301,
IPMI_OEM_AMI = 20974,
+ /* 24339 for [ADLINK TECHNOLOGY INC.] */
+ IPMI_OEM_ADLINK_24339 = 24339,
IPMI_OEM_NOKIA_SIEMENS_NETWORKS = 28458,
IPMI_OEM_SUPERMICRO_47488 = 47488
} IPMI_OEM;
diff --git a/lib/ipmi_strings.c b/lib/ipmi_strings.c
index 4a1ff46..e9fba29 100644
--- a/lib/ipmi_strings.c
+++ b/lib/ipmi_strings.c
@@ -71,6 +71,30 @@ const struct valstr ipmi_oem_info[] = {
{ IPMI_OEM_ERICSSON, "Ericsson AB"},
{ IPMI_OEM_QUANTA, "Quanta" },
{ IPMI_OEM_ADVANTECH, "Advantech" },
+ /************************************************************************
+ * Add ID String for IANA Enterprise Number of IBM & ADLINK
+ * https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers
+ * 2
+ * IBM
+ * Kristine Adamson
+ * adamson&us.ibm.com
+ * 4769
+ * IBM Corporation
+ * Victor Sample
+ * vsample&us.ibm.com
+ * 20301
+ * IBM eServer X
+ * Lynn Fore
+ * sls&us.ibm.com
+ * 24339
+ * ADLINK TECHNOLOGY INC.
+ * Ryan Hsu
+ * ryan.hsu&adlinktech.com
+ ************************************************************************/
+ { IPMI_OEM_IBM_2, "IBM" },
+ { IPMI_OEM_IBM_4769, "IBM Corporation" },
+ { IPMI_OEM_IBM_20301, "IBM eServer X" },
+ { IPMI_OEM_ADLINK_24339, "ADLINK Technology Inc." },
{ 0xffff , NULL },
};
@@ -202,6 +226,62 @@ const struct oemvalstr ipmi_oem_product_info[] = {
{ IPMI_OEM_ADVANTECH, 0x9212, "ESP-9212" },
{ IPMI_OEM_ADVANTECH, 0x6000, "CGS-6000" },
{ IPMI_OEM_ADVANTECH, 0x6010, "CGS-6010" },
+ /* ADLINK Technology Inc. */
+ /* AdvancedTCA Processor Blades */
+ { IPMI_OEM_ADLINK_24339, 0x3100, "aTCA-3100" },
+ { IPMI_OEM_ADLINK_24339, 0x3110, "aTCA-3110" },
+ { IPMI_OEM_ADLINK_24339, 0x3150, "aTCA-3150" },
+ { IPMI_OEM_ADLINK_24339, 0x3420, "aTCA-3420" },
+ { IPMI_OEM_ADLINK_24339, 0x3710, "aTCA-3710" },
+ { IPMI_OEM_ADLINK_24339, 0x6100, "aTCA-6100" },
+ { IPMI_OEM_ADLINK_24339, 0x6200, "aTCA-6200" },
+ { IPMI_OEM_ADLINK_24339, 0x6250, "aTCA-6250/6250STW" },
+ { IPMI_OEM_ADLINK_24339, 0x6270, "aTCA-R6270" },
+ { IPMI_OEM_ADLINK_24339, 0x6280, "aTCA-R6280" },
+ { IPMI_OEM_ADLINK_24339, 0x6890, "aTCA-6890" },
+ { IPMI_OEM_ADLINK_24339, 0x6891, "aTCA-6891" },
+ { IPMI_OEM_ADLINK_24339, 0x6900, "aTCA-6900" },
+ { IPMI_OEM_ADLINK_24339, 0x6905, "aTCA-R6905" },
+ { IPMI_OEM_ADLINK_24339, 0x690A, "aTCA-R6900" },
+ { IPMI_OEM_ADLINK_24339, 0x8214, "aTCA-8214" },
+ { IPMI_OEM_ADLINK_24339, 0x8606, "aTCA-8606" },
+ { IPMI_OEM_ADLINK_24339, 0x9300, "aTCA-9300" },
+ { IPMI_OEM_ADLINK_24339, 0x9700, "aTCA-9700" },
+ { IPMI_OEM_ADLINK_24339, 0x9700, "aTCA-R9700" },
+ { IPMI_OEM_ADLINK_24339, 0x970D, "aTCA-9700D" },
+ { IPMI_OEM_ADLINK_24339, 0x9710, "aTCA-9710" },
+ { IPMI_OEM_ADLINK_24339, 0x9710, "aTCA-R9710" },
+ { IPMI_OEM_ADLINK_24339, 0xF001, "aTCA-FN001" },
+ { IPMI_OEM_ADLINK_24339, 0xF2A0, "aTCA-F2AX" },
+ { IPMI_OEM_ADLINK_24339, 0xF5A0, "aTCA-F5AX" },
+ /* CompactPCI Blades */
+ { IPMI_OEM_ADLINK_24339, 0x3510, "cPCI-3510" },
+ { IPMI_OEM_ADLINK_24339, 0x3970, "cPCI-3970" },
+ { IPMI_OEM_ADLINK_24339, 0x6010, "cPCI-6010" },
+ { IPMI_OEM_ADLINK_24339, 0x6210, "cPCI-6210" },
+ { IPMI_OEM_ADLINK_24339, 0x6510, "cPCI-6510" },
+ { IPMI_OEM_ADLINK_24339, 0x6520, "cPCI-6520" },
+ { IPMI_OEM_ADLINK_24339, 0x6525, "cPCI-6525" },
+ { IPMI_OEM_ADLINK_24339, 0x6530, "cPCI-6530/6530BL" },
+ { IPMI_OEM_ADLINK_24339, 0x6600, "cPCI-6600" },
+ { IPMI_OEM_ADLINK_24339, 0x6840, "cPCI-6840" },
+ { IPMI_OEM_ADLINK_24339, 0x6870, "cPCI-6870" },
+ { IPMI_OEM_ADLINK_24339, 0x6880, "cPCI-6880" },
+ { IPMI_OEM_ADLINK_24339, 0x6910, "cPCI-6910" },
+ { IPMI_OEM_ADLINK_24339, 0x6920, "cPCI-6920" },
+ { IPMI_OEM_ADLINK_24339, 0x6930, "cPCI-6930" },
+ { IPMI_OEM_ADLINK_24339, 0x6940, "cPCI-6940" },
+ /* VPX Blades */
+ { IPMI_OEM_ADLINK_24339, 0x3000, "VPX3000" },
+ { IPMI_OEM_ADLINK_24339, 0x3001, "VPX3001" },
+ { IPMI_OEM_ADLINK_24339, 0x3002, "VPX3002" },
+ { IPMI_OEM_ADLINK_24339, 0x3010, "VPX3010" },
+ { IPMI_OEM_ADLINK_24339, 0x3F10, "VPX3G10" },
+ { IPMI_OEM_ADLINK_24339, 0x6000, "VPX6000" },
+ /* Network Appliance */
+ { IPMI_OEM_ADLINK_24339, 0x0410, "MXN-0410" },
+ { IPMI_OEM_ADLINK_24339, 0x2600, "MCN-2600" },
+ { IPMI_OEM_ADLINK_24339, 0x1500, "MCN-1500" },
{ 0xffffff , 0xffff , NULL },
};
commit 25e39b337c00b0e1ee0193c0085900b2a8070d2a
Author: Zdenek Styblik <st...@tu...>
Date: Sun Mar 13 17:57:06 2016 +0100
ID:425 - Disable USB interface for OS X/darwin
Commit disables USB interface for OS X/darwin by default as it seems that
<scsi/sg.h> is absent.
diff --git a/configure.ac b/configure.ac
index 9f322a3..429783c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,6 +98,7 @@ solaris*)
xenable_intf_lipmi=no
xenable_intf_bmc=no
xenable_ipmishell=no
+ xenable_intf_usb=no
;;
*freebsd*)
xenable_intf_imb=no
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 1 +
include/ipmitool/ipmi.h | 13 +++++++
lib/ipmi_sdr.c | 6 ++-
lib/ipmi_strings.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 98 insertions(+), 2 deletions(-)
hooks/post-receive
--
ipmitool
|
