Update to internal 2020-02-27

Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>

4 files changed, 25 insertions, 22 deletions

diff --git a/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp/0001-Smbus-changes-for-libmctp.patch b/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp/0001-Smbus-changes-for-libmctp.patch
index 88da437fc..7bba22ede 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp/0001-Smbus-changes-for-libmctp.patch
+++ b/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp/0001-Smbus-changes-for-libmctp.patch
@@ -1,31 +1,29 @@
-From 40303196d9f07b71042cd7ba87dcab6fdad29422 Mon Sep 17 00:00:00 2001
+From ab1634441f4dd218486f6bb3b94e90e2110ccc2a Mon Sep 17 00:00:00 2001
 From: Nikhil Potade <nikhil.potade@linux.intel.com>
 Date: Tue, 19 Feb 2019 14:16:20 +0800
 Subject: [PATCH 1/1] Smbus changes for libmctp
 
 Signed-off-by: James Feist <james.feist@linux.intel.com>
 ---
- CMakeLists.txt |  6 ++++--
+ CMakeLists.txt |  5 +++--
  core.c         |  2 ++
  libmctp.h      | 40 ++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 46 insertions(+), 2 deletions(-)
+ 3 files changed, 45 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a5b1042..249b12b 100644
+index f3f05bd..7991b11 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -2,8 +2,9 @@ cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
- 
- add_definitions (-DMCTP_LOG_STDERR)
- add_definitions (-DMCTP_HAVE_FILEIO)
-+add_definitions (-DMCTP_DEFAULT_ALLOC)
+@@ -5,7 +5,7 @@ add_definitions (-DMCTP_HAVE_FILEIO)
+ add_definitions (-DMCTP_HAVE_STDIO)
+ add_definitions (-DMCTP_DEFAULT_ALLOC)
  
 -add_library (libmctp STATIC alloc.c core.c log.c libmctp.h serial.c)
 +add_library (libmctp STATIC alloc.c core.c log.c libmctp.h serial.c smbus.c crc32c.c)
  
  target_include_directories (libmctp PUBLIC
                              $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-@@ -18,5 +19,6 @@ add_executable (test_seq tests/test_seq.c tests/test-utils.c)
+@@ -20,5 +20,6 @@ add_executable (test_seq tests/test_seq.c tests/test-utils.c)
  target_link_libraries (test_seq libmctp)
  
  install (TARGETS libmctp DESTINATION lib)
@@ -34,7 +32,7 @@ index a5b1042..249b12b 100644
 +       include)
  
 diff --git a/core.c b/core.c
-index 61356e9..622bc5e 100644
+index f8abbb1..79a681c 100644
 --- a/core.c
 +++ b/core.c
 @@ -17,6 +17,7 @@
@@ -54,7 +52,7 @@ index 61356e9..622bc5e 100644
  #ifndef BUILD_ASSERT
  #define BUILD_ASSERT(x) \
 diff --git a/libmctp.h b/libmctp.h
-index b36a943..4f211f9 100644
+index 69ec46a..b7212be 100644
 --- a/libmctp.h
 +++ b/libmctp.h
 @@ -15,6 +15,7 @@ extern "C" {
@@ -71,9 +69,9 @@ index b36a943..4f211f9 100644
  #define MCTP_HDR_TAG_MASK	(0x7)
 +/* clang-format on */
  
- /* Baseline maximum size of a MCTP packet */
- #define MCTP_BMTU_PAYLOAD	64
- #define MCTP_BMTU		(MCTP_BMTU_PAYLOAD + sizeof(struct mctp_hdr))
+ /* Baseline Transmission Unit and packet size */
+ #define MCTP_BTU		64
+ #define MCTP_PACKET_SIZE(unit)	((unit) + sizeof(struct mctp_hdr))
  
 +#define MCTP_CONTROL_MESSAGE_TYPE	0x00
 +
diff --git a/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp/libmctp-smbus.h b/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp/libmctp-smbus.h
index 5ecaa6b74..67690bcb3 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp/libmctp-smbus.h
+++ b/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp/libmctp-smbus.h
@@ -20,6 +20,10 @@ int mctp_smbus_read(struct mctp_binding_smbus *smbus);
 int mctp_smbus_open_bus(struct mctp_binding_smbus *smbus, int out_bus_num,
 			int root_bus_num);
 void mctp_smbus_free(struct mctp_binding_smbus *smbus);
+int mctp_smbus_open_in_bus(struct mctp_binding_smbus *smbus, int in_bus);
+int mctp_smbus_open_out_bus(struct mctp_binding_smbus *smbus, int out_bus);
+int mctp_smbus_set_in_fd(struct mctp_binding_smbus *smbus, int fd);
+int mctp_smbus_set_out_fd(struct mctp_binding_smbus *smbus, int fd);
 
 #ifdef __cplusplus
 }
diff --git a/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp/smbus.c b/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp/smbus.c
index bbdfe2aa4..2f099a7e5 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp/smbus.c
+++ b/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp/smbus.c
@@ -52,6 +52,7 @@ struct mctp_binding_smbus {
 #define SMBUS_PEC_BYTE_SIZE 1
 #define SMBUS_COMMAND_CODE_SIZE 1
 #define SMBUS_LENGTH_FIELD_SIZE 1
+#define SMBUS_ADDR_OFFSET_SLAVE 0x1000
 
 struct mctp_smbus_header_tx {
 	uint8_t source_slave_address;
@@ -312,7 +313,7 @@ int mctp_smbus_open_in_bus(struct mctp_binding_smbus *smbus, int in_bus)
 
 	snprintf(filename, size,
 		 "/sys/bus/i2c/devices/i2c-%d/%d-%04x/slave-mqueue", in_bus,
-		 in_bus, (address_7_bit << 8) + address_7_bit);
+		 in_bus, SMBUS_ADDR_OFFSET_SLAVE | address_7_bit);
 
 	ret = open(filename, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
 	if (ret >= 0) {
@@ -333,7 +334,7 @@ int mctp_smbus_open_in_bus(struct mctp_binding_smbus *smbus, int in_bus)
 
 	mqueue_size = sizeof(slave_mqueue);
 	snprintf(slave_mqueue, mqueue_size, "slave-mqueue %#04x",
-		 (address_7_bit << 8) + address_7_bit);
+		 SMBUS_ADDR_OFFSET_SLAVE | address_7_bit);
 
 	size = write(fd, slave_mqueue, mqueue_size);
 	close(fd);
@@ -345,7 +346,7 @@ int mctp_smbus_open_in_bus(struct mctp_binding_smbus *smbus, int in_bus)
 	size = sizeof(filename);
 	snprintf(filename, size,
 		 "/sys/bus/i2c/devices/i2c-%d/%d-%04x/slave-mqueue", in_bus,
-		 in_bus, (address_7_bit << 8) + address_7_bit);
+		 in_bus, SMBUS_ADDR_OFFSET_SLAVE | address_7_bit);
 
 	return open(filename, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
 }
@@ -375,7 +376,7 @@ int mctp_smbus_open_bus(struct mctp_binding_smbus *smbus, int out_bus_num,
 	snprintf(filename, size,
 		 "/sys/bus/i2c/devices/i2c-%d/%d-%04x/slave-mqueue",
 		 root_bus_num, root_bus_num,
-		 (address_7_bit << 8) + address_7_bit);
+		 SMBUS_ADDR_OFFSET_SLAVE | address_7_bit);
 
 	smbus->in_fd = open(filename, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
 	if (smbus->in_fd < 0) {
@@ -394,7 +395,7 @@ int mctp_smbus_open_bus(struct mctp_binding_smbus *smbus, int out_bus_num,
 
 		mqueue_size = sizeof(slave_mqueue);
 		snprintf(slave_mqueue, mqueue_size, "slave-mqueue %#04x",
-			 (address_7_bit << 8) + address_7_bit);
+			 SMBUS_ADDR_OFFSET_SLAVE | address_7_bit);
 
 		size = write(fd, slave_mqueue, mqueue_size);
 		close(fd);
@@ -408,7 +409,7 @@ int mctp_smbus_open_bus(struct mctp_binding_smbus *smbus, int out_bus_num,
 		snprintf(filename, size,
 			 "/sys/bus/i2c/devices/i2c-%d/%d-%04x/slave-mqueue",
 			 root_bus_num, root_bus_num,
-			 (address_7_bit << 8) + address_7_bit);
+			 SMBUS_ADDR_OFFSET_SLAVE | address_7_bit);
 
 		smbus->in_fd =
 			open(filename, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
diff --git a/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb b/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb
index 132db31c7..97ce1179f 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "libmctp"
 DESCRIPTION = "Implementation of MCTP (DTMF DSP0236)"
 
 SRC_URI = "git://github.com/openbmc/libmctp.git"
-SRCREV = "34b9b3d82b049610775aea4460ff0f3bb9f02b1d"
+SRCREV = "b6516a083c622a76e3e485f56b743b2a63171881"
 
 PV = "0.1+git${SRCPV}"