From 87a65e63bac789bca0607e0b4ab09d62517b95e7 Mon Sep 17 00:00:00 2001
From: Ed Tanous <ed.tanous@intel.com>
Date: Wed, 29 May 2019 10:29:58 -0700
Subject: Update to internal

Signed-off-by: Ed Tanous <ed.tanous@intel.com>
---
 .../ipmi/phosphor-ipmi-config/channel_config.json  | 34 ++++++++--------
 .../master_write_read_white_list.json              | 45 +++++++++++++++++-----
 2 files changed, 53 insertions(+), 26 deletions(-)

(limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config')

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"
     }
   ]
 }
-- 
cgit v1.2.3