summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Jeffery <andrew@aj.id.au>2018-03-02 09:13:31 +1030
committerAndrew Jeffery <andrew@aj.id.au>2018-04-04 00:31:48 +0930
commit5bfc9867a809e6444019b7f88457bf8a460bd9ec (patch)
treeccfa204ee5fb4e9998518343b33dc0b8d2c68487
parent2a4bee743ac7f71b4784ec190badc1764de57c7d (diff)
downloadphosphor-mboxd-5bfc9867a809e6444019b7f88457bf8a460bd9ec.zip
phosphor-mboxd-5bfc9867a809e6444019b7f88457bf8a460bd9ec.tar.gz
test: vpnor: Add read_patch
The patch file in question is smaller than the partition defined for it. This configuration exposes a bug where mboxd responds to a CREATE_READ_WINDOW for the blocks after the length of the patch file with a 0-sized window. Outside of the test environment this behaviour causes the host to enter an unterminated loop in firmware. Change-Id: I13aafb58a7876dc1589f695a9f5c80d082b4e15f Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
-rw-r--r--test/vpnor/Makefile.am.include18
-rw-r--r--test/vpnor/read_patch.cpp72
2 files changed, 89 insertions, 1 deletions
diff --git a/test/vpnor/Makefile.am.include b/test/vpnor/Makefile.am.include
index 5b3f830..ca3f055 100644
--- a/test/vpnor/Makefile.am.include
+++ b/test/vpnor/Makefile.am.include
@@ -219,6 +219,19 @@ test_vpnor_create_read_window_partition_invalid_SOURCES = \
test_vpnor_create_read_window_partition_invalid_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
test_vpnor_create_read_window_partition_invalid_LDADD = $(VPNOR_LDADD)
+test_vpnor_read_patch_SOURCES = \
+ $(TEST_MBOX_VPNOR_SRCS) $(TEST_MOCK_SRCS) \
+ mboxd_msg.c \
+ mboxd_windows.c \
+ mboxd_lpc.c \
+ mboxd_lpc_virtual.cpp \
+ mboxd_pnor_partition_table.cpp \
+ mboxd_flash_virtual.cpp \
+ pnor_partition.cpp \
+ %reldir%/read_patch.cpp
+test_vpnor_read_patch_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
+test_vpnor_read_patch_LDADD = $(VPNOR_LDADD)
+
if VIRTUAL_PNOR_ENABLED
check_PROGRAMS += \
%reldir%/create_pnor_partition_table \
@@ -240,5 +253,8 @@ check_PROGRAMS += \
%reldir%/create_read_window_oob \
%reldir%/create_read_window_toc \
%reldir%/create_read_window_straddle_partitions \
- %reldir%/create_read_window_partition_invalid
+ %reldir%/create_read_window_partition_invalid \
+ %reldir%/read_patch
+
+XFAIL_TESTS += %reldir%/read_patch
endif
diff --git a/test/vpnor/read_patch.cpp b/test/vpnor/read_patch.cpp
new file mode 100644
index 0000000..b06907c
--- /dev/null
+++ b/test/vpnor/read_patch.cpp
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
+
+#include "config.h"
+#include "common.h"
+#include "mboxd_pnor_partition_table.h"
+
+#include <assert.h>
+
+extern "C" {
+#include "test/mbox.h"
+#include "test/system.h"
+}
+
+#include "test/vpnor/tmpd.hpp"
+
+static constexpr auto BLOCK_SIZE = 0x1000;
+static constexpr auto ERASE_SIZE = BLOCK_SIZE;
+static constexpr auto PART_SIZE = BLOCK_SIZE * 4;
+static constexpr auto PATCH_SIZE = PART_SIZE / 2;
+static constexpr auto N_WINDOWS = 2;
+static constexpr auto WINDOW_SIZE = PART_SIZE * 8;
+static constexpr auto MEM_SIZE = WINDOW_SIZE * N_WINDOWS;
+static constexpr auto PNOR_SIZE = MEM_SIZE * 2;
+
+const std::string toc[] = {
+ "partition01=ONE,00001000,00005000,80,ECC,READONLY",
+};
+
+static const uint8_t get_info[] = {0x02, 0x00, 0x02, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00};
+
+static const uint8_t create_read_window[] = {0x04, 0x01, 0x01, 0x00, 0x04, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00};
+
+static const uint8_t response[] = {0x04, 0x01, 0xc0, 0xff, 0x04, 0x00, 0x01,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
+
+int main()
+{
+ namespace test = openpower::virtual_pnor::test;
+
+ struct mbox_context *ctx;
+
+ system_set_reserved_size(MEM_SIZE);
+ system_set_mtd_sizes(PNOR_SIZE, ERASE_SIZE);
+ ctx = mbox_create_test_context(N_WINDOWS, WINDOW_SIZE);
+ test::VpnorRoot root(ctx, toc, BLOCK_SIZE);
+
+ // PATCH_SIZE is smaller than the size of the partition we defined. This
+ // test ensures that mboxd will behave correctly when we request an offset
+ // that is beyond the size of the backing file, but is in the set of valid
+ // offsets for the partition as defined by the ToC.
+ std::vector<uint8_t> patch(PATCH_SIZE, 0xff);
+ root.patch("ONE", patch.data(), patch.size());
+
+ vpnor_create_partition_table_from_path(ctx, root.ro().c_str());
+
+ int rc = mbox_command_dispatch(ctx, get_info, sizeof(get_info));
+ assert(rc == 1);
+
+ rc = mbox_command_dispatch(ctx, create_read_window,
+ sizeof(create_read_window));
+ assert(rc == 1);
+
+ rc = mbox_cmp(ctx, response, sizeof(response));
+ assert(rc == 0);
+
+ return 0;
+}
OpenPOWER on IntegriCloud