summaryrefslogtreecommitdiff
path: root/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config
diff options
context:
space:
mode:
authorEd Tanous <ed.tanous@intel.com>2019-05-29 20:29:58 +0300
committerEd Tanous <ed.tanous@intel.com>2019-06-06 04:30:22 +0300
commit87a65e63bac789bca0607e0b4ab09d62517b95e7 (patch)
tree3254b912d6468012543e127a19ba2f1cd13b108f /meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config
parent5364646cb66fa75cdcbf148e039e0383cda94f2a (diff)
downloadopenbmc-87a65e63bac789bca0607e0b4ab09d62517b95e7.tar.xz
Update to internal
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config')
-rw-r--r--meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json34
-rw-r--r--meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/master_write_read_white_list.json45
2 files changed, 53 insertions, 26 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json
index 13b945fd0..a7815a9a9 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json
@@ -55,12 +55,12 @@
}
},
"5" : {
- "name" : "ICMB",
+ "name" : "RESERVED",
"is_valid" : false,
"active_sessions" : 0,
"channel_info" : {
- "medium_type" : "ipmb",
- "protocol_type" : "ipmb-1.0",
+ "medium_type" : "reserved",
+ "protocol_type" : "na",
"session_supported" : "session-less",
"is_ipmi" : true
}
@@ -77,12 +77,12 @@
}
},
"7" : {
- "name" : "SMM",
+ "name" : "ipmi-kcs4",
"is_valid" : true,
"active_sessions" : 0,
"channel_info" : {
- "medium_type" : "ipmb",
- "protocol_type" : "ipmb-1.0",
+ "medium_type" : "system-interface",
+ "protocol_type" : "kcs",
"session_supported" : "session-less",
"is_ipmi" : true
}
@@ -92,8 +92,8 @@
"is_valid" : true,
"active_sessions" : 0,
"channel_info" : {
- "medium_type" : "ipmb",
- "protocol_type" : "ipmb-1.0",
+ "medium_type" : "oem",
+ "protocol_type" : "oem",
"session_supported" : "session-less",
"is_ipmi" : true
}
@@ -125,8 +125,8 @@
"is_valid" : false,
"active_sessions" : 0,
"channel_info" : {
- "medium_type" : "ipmb",
- "protocol_type" : "ipmb-1.0",
+ "medium_type" : "reserved",
+ "protocol_type" : "na",
"session_supported" : "session-less",
"is_ipmi" : true
}
@@ -147,8 +147,8 @@
"is_valid" : false,
"active_sessions" : 0,
"channel_info" : {
- "medium_type" : "ipmb",
- "protocol_type" : "ipmb-1.0",
+ "medium_type" : "reserved",
+ "protocol_type" : "na",
"session_supported" : "session-less",
"is_ipmi" : true
}
@@ -158,19 +158,19 @@
"is_valid" : false,
"active_sessions" : 0,
"channel_info" : {
- "medium_type" : "ipmb",
- "protocol_type" : "ipmb-1.0",
+ "medium_type" : "unknown",
+ "protocol_type" : "na",
"session_supported" : "session-less",
"is_ipmi" : true
}
},
"15" : {
- "name" : "SMS",
+ "name" : "ipmi-kcs3",
"is_valid" : true,
"active_sessions" : 0,
"channel_info" : {
- "medium_type" : "ipmb",
- "protocol_type" : "ipmb-1.0",
+ "medium_type" : "system-interface",
+ "protocol_type" : "kcs",
"session_supported" : "session-less",
"is_ipmi" : true
}
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/master_write_read_white_list.json b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/master_write_read_white_list.json
index 9fdb3c916..6fc46f452 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/master_write_read_white_list.json
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/master_write_read_white_list.json
@@ -1,49 +1,76 @@
{
"filters": [
{
+ "Description": "Allow full read - ignore first byte write value",
"busId": "0x01",
"slaveAddr": "0x4d",
- "command": "0x00"
+ "slaveAddrMask": "0x00",
+ "command": "0x00",
+ "commandMask": "0xFF"
},
{
+ "Description": "Allow full read - ignore first byte write value",
"busId": "0x01",
"slaveAddr": "0x57",
- "command": "0x00"
+ "slaveAddrMask": "0x00",
+ "command": "0x00",
+ "commandMask": "0xFF"
},
{
+ "Description": "Allow full read - ignore first byte write value",
"busId": "0x02",
"slaveAddr": "0x40",
- "command": "0x00"
+ "slaveAddrMask": "0x00",
+ "command": "0x00",
+ "commandMask": "0xFF"
},
{
+ "Description": "Allow full read - ignore first byte write value",
"busId": "0x02",
"slaveAddr": "0x49",
- "command": "0x00"
+ "slaveAddrMask": "0x00",
+ "command": "0x00",
+ "commandMask": "0xFF"
},
{
+ "Description": "Allow full read - ignore first byte write value",
"busId": "0x02",
"slaveAddr": "0x51",
- "command": "0x00"
+ "slaveAddrMask": "0x00",
+ "command": "0x00",
+ "commandMask": "0xFF"
},
{
+ "Description": "Allow full read - ignore first byte write value",
"busId": "0x03",
"slaveAddr": "0x44",
- "command": "0x00"
+ "slaveAddrMask": "0x00",
+ "command": "0x00",
+ "commandMask": "0xFF"
},
{
+ "Description": "Allow full read - ignore first byte write value",
"busId": "0x03",
"slaveAddr": "0x68",
- "command": "0x00"
+ "slaveAddrMask": "0x00",
+ "command": "0x00",
+ "commandMask": "0xFF"
},
{
+ "Description": "Allow full read - ignore first byte write value",
"busId": "0x06",
"slaveAddr": "0x40",
- "command": "0x00"
+ "slaveAddrMask": "0x00",
+ "command": "0x00",
+ "commandMask": "0xFF"
},
{
+ "Description": "Allow full read - ignore first byte write value",
"busId": "0x07",
"slaveAddr": "0x51",
- "command": "0x00"
+ "slaveAddrMask": "0x00",
+ "command": "0x00",
+ "commandMask": "0xFF"
}
]
}