Merge android/o/mr1/master into merge_branch

git log --pretty=format:"%h %ad | %s%d [%an]" merge_branch..android/o/mr1/master:
  b586b9a Wed Jun 20 09:14:00 2018 +0800 | To correct IOC CBC setting (origin/cactus/o_mr1-r0/candidates/mergerequest, origin/android/o/mr1/master, android/o/mr1/master) [Haoyu Tang]
  06f5817 Fri Jun 29 10:41:45 2018 -0700 | drivers/abl: support recovery and dnx reboot target [Jeremy Compostella]
  c82fd9a Tue Jul 10 08:06:37 2018 +0800 | Add enumeration type for virtual devices [Yang, Kai]

git diff --stat merge_branch..android/o/mr1/master:
  Android.mk                            |  3 +++
  drivers/abl/abl_reboot_target.c       |  2 ++
  drivers/ioc_uart/ioc_uart.c           | 16 ++++++++++------
  drivers/sdhci_mmc/mmc.c               |  4 ++--
  drivers/sdhci_mmc/sdhci-internal.h    |  2 +-
  drivers/virtual_media/VirtioRpmb.c    |  2 +-
  drivers/virtual_media/virtual_media.c | 16 +++++++++++-----
  host/Android.mk                       |  3 ++-
  include/hardware/hw_broxton.h         |  3 ---
  libefiwrapper/Android.mk              |  1 +
  libefiwrapper/version.h               |  4 ++--
  11 files changed, 35 insertions(+), 21 deletions(-)

Change-Id: Id12492e8a264fe183d0839086023f88126cc9b6c
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-66686
Signed-off-by: Xihua Chen <[email protected]>
Reviewed-on: https://android.intel.com:443/638592

Author: xihua-chen

drivers/abl/abl_reboot_target.c

@@ -83,6 +83,8 @@ static const struct name2id NAME2ID[] = {
 	{ L"boot",		0x00 },
 	{ L"bootloader",	0x01 },
 	{ L"fastboot",		0x01 },
+	{ L"recovery",		0x03 },
+	{ L"dnx",		0x05 },
 };
 
 static size_t offset; /* memorize offset between each call */

drivers/ioc_uart/ioc_uart.c

@@ -64,8 +64,8 @@ static char CBC_NUMBER_SUS_STAT_TOGGLES_2_HALT[]	=	{0x05,0x00,0x0E,0x02,0x00,0x0
 static char CBC_NUMBER_SUS_STAT_TOGGLES_1_HALT[]	=	{0x05,0x00,0x0E,0x02,0x00,0x03,0x00,0xE8};
 static char CBC_NUMBER_SUS_STAT_TOGGLES_2_REBOOT[]	=	{0x05,0x00,0x0E,0x02,0x00,0x06,0x00,0xE5};
 static char CBC_NUMBER_SUS_STAT_TOGGLES_1_REBOOT[]	=	{0x05,0x00,0x0E,0x02,0x00,0x04,0x00,0xE7};
-//static char CBC_CONFIG_RESTART_SYSTEM[]	=	{0x05,0x00,0x0E,0x02,0x00,0x02,0x00,0xE9};
-//static char CBC_CONFIG_SHUTDOWN_SYSTEM[]	=	{0x05,0x00,0x0E,0x02,0x00,0x01,0x00,0xEA};
+static char CBC_CONFIG_RESTART_SYSTEM[]	=	{0x05,0x00,0x0E,0x02,0x00,0x02,0x00,0xE9};
+static char CBC_CONFIG_SHUTDOWN_SYSTEM[]	=	{0x05,0x00,0x0E,0x02,0x00,0x01,0x00,0xEA};
 static char CBC_ENTER_IOC_BOOTLOADER[]	=	{0x05,0x00,0x20,0x01,0x30,0x10,0x80,0x1a,
 						 0x05,0x00,0x20,0x01,0x30,0x10,0x80,0x11,
 						 0x05,0x00,0x20,0x01,0x30,0x10,0x80,0x1a,
@@ -452,17 +452,21 @@ set_ignore_sus_stat_toggles_shutdown_behaviour(EFI_IGNORE_SUS_STAT_TOGGLES num_i
 	init_uart_ioc(old_state);
 	switch (shutdown) {
 		case RESTART_SYSTEM:
-			if(IGNORE_SUS_STAT_2==num_ignore_sus_stat)
+			if(IGNORE_SUS_STAT_3 == num_ignore_sus_stat)
 				cbc_message_buf = CBC_NUMBER_SUS_STAT_TOGGLES_2_REBOOT;
-			else
+			else if(IGNORE_SUS_STAT_2 == num_ignore_sus_stat)
 				cbc_message_buf = CBC_NUMBER_SUS_STAT_TOGGLES_1_REBOOT;
+			else
+				cbc_message_buf = CBC_CONFIG_RESTART_SYSTEM;
 			break;
 		case SHUTDOWN_SYSTEM:
 		default:
-			if(IGNORE_SUS_STAT_2==num_ignore_sus_stat)
+			if(IGNORE_SUS_STAT_3 == num_ignore_sus_stat)
 				cbc_message_buf = CBC_NUMBER_SUS_STAT_TOGGLES_2_HALT;
-			else
+			else if(IGNORE_SUS_STAT_2 == num_ignore_sus_stat)
 				cbc_message_buf = CBC_NUMBER_SUS_STAT_TOGGLES_1_HALT;
+			else
+				cbc_message_buf = CBC_CONFIG_SHUTDOWN_SYSTEM;
 			break;
 	}
 

drivers/virtual_media/virtual_media.c

@@ -37,10 +37,16 @@ static struct supported_device {
 	{ .vid = 0x8086, .did = 0x8601},
 };
 
+enum VIRTUAL_DEVICE {
+	VirtualMedia,
+	VirtualRpmb,
+	VirtualDeviceMax
+};
+
 static EFI_STATUS _init(storage_t *s)
 {
 	EFI_STATUS ret;
-	pcidev_t pci_dev[2] = {0};
+	pcidev_t pci_dev[VirtualDeviceMax] = {0};
 	size_t i;
 	DEVICE_BLOCK_INFO     BlockInfo ={0};
 
@@ -49,15 +55,15 @@ static EFI_STATUS _init(storage_t *s)
 				SUPPORTED_DEVICES[i].did,
 				&pci_dev[i]);
 
-	if (!pci_dev[0])
+	if (!pci_dev[VirtualMedia])
 		return EFI_UNSUPPORTED;
 
-	ret = VirtioMediaInitialize((UINTN)pci_dev[0]);
+	ret = VirtioMediaInitialize((UINTN)pci_dev[VirtualMedia]);
 	if (ret)
 		return EFI_DEVICE_ERROR;
 
-	if (pci_dev[1])
-		ret = VirtioRpmbInitialize((UINTN)pci_dev[1]);
+	if (pci_dev[VirtualRpmb])
+		ret = VirtioRpmbInitialize((UINTN)pci_dev[VirtualRpmb]);
 
 	ret = VirtioGetMediaInfo(DEVICE_INDEX_DEFAULT, &BlockInfo);
 	if (EFI_ERROR(ret)) {