From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E991E81FC3 for ; Mon, 13 Feb 2017 18:13:31 -0800 (PST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Feb 2017 18:13:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,158,1484035200"; d="scan'208";a="820568682" Received: from shwdeopenpsi011.ccr.corp.intel.com (HELO SHWDEOPENPSI011.local) ([10.239.9.8]) by FMSMGA003.fm.intel.com with SMTP; 13 Feb 2017 18:13:30 -0800 Date: Tue, 14 Feb 2017 10:13:31 +0800 From: lushifex CC: david.wei@intel.com; Sender: lushifex To: edk2-devel@lists.01.org Message-ID: X-Mailer: TortoiseGit MIME-Version: 1.0 Subject: [Patch][edk2-platforms/devel-MinnowBoard3] Fixed Map-r issue. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Feb 2017 02:13:32 -0000 Content-Type: text/plain; Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex --- .../SouthCluster/Include/MediaDeviceDriver.h | 22 ++- .../Sdio/Dxe/MMC/MmcMediaDeviceDxe/MMCSDTransfer.c | 4 +- .../Dxe/MMC/MmcMediaDeviceDxe/MediaDeviceDriver.c | 219 ++++++++++++++------- 3 files changed, 169 insertions(+), 76 deletions(-) diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Include/MediaDeviceDriver.h b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Include/MediaDeviceDriver.h index 243ee9a..1c9ad1c 100644 --- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Include/MediaDeviceDriver.h +++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Include/MediaDeviceDriver.h @@ -1,7 +1,7 @@ /** @file Media Device Driver header. - Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -172,6 +172,7 @@ MediaDeviceDriverEntryPoint ( /** MediaDeviceDriverInstallBlockIo + @param[in] This @param[in] CardData @retval EFI_STATUS @@ -179,23 +180,38 @@ MediaDeviceDriverEntryPoint ( **/ EFI_STATUS MediaDeviceDriverInstallBlockIo ( - IN CARD_DATA *CardData + IN EFI_DRIVER_BINDING_PROTOCOL *This, + IN CARD_DATA *CardData ); /** MediaDeviceDriverUninstallBlockIo + @param[in] This @param[in] CardData + @param[in] Handle @retval EFI_STATUS **/ EFI_STATUS MediaDeviceDriverUninstallBlockIo ( - IN CARD_DATA *CardData + IN EFI_DRIVER_BINDING_PROTOCOL *This, + IN CARD_DATA *CardData, + IN EFI_HANDLE Handle ); /** + MediaDeviceDriverAllPartitionNotPresent + + @param[in] CardData + +**/ +BOOLEAN +MediaDeviceDriverAllPartitionNotPresent ( + IN CARD_DATA *CardData + ); +/** MediaDeviceComponentNameGetDriverName @param[in] This diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Sdio/Dxe/MMC/MmcMediaDeviceDxe/MMCSDTransfer.c b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Sdio/Dxe/MMC/MmcMediaDeviceDxe/MMCSDTransfer.c index a6280a5..d367326 100644 --- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Sdio/Dxe/MMC/MmcMediaDeviceDxe/MMCSDTransfer.c +++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Sdio/Dxe/MMC/MmcMediaDeviceDxe/MMCSDTransfer.c @@ -1,7 +1,7 @@ /** @file SMMC transfer specific functions. - Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -2268,7 +2268,7 @@ SetEmmcWpOnEvent( // // Enable the eMMC protection // - if (TRUE) { + if (FALSE) { if (!WriteProtectDone) { Status = MmcReadExtCsd (CardData); if (EFI_ERROR (Status)) { diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Sdio/Dxe/MMC/MmcMediaDeviceDxe/MediaDeviceDriver.c b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Sdio/Dxe/MMC/MmcMediaDeviceDxe/MediaDeviceDriver.c index 36c6e13..7f5bd11 100644 --- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Sdio/Dxe/MMC/MmcMediaDeviceDxe/MediaDeviceDriver.c +++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Sdio/Dxe/MMC/MmcMediaDeviceDxe/MediaDeviceDriver.c @@ -1,7 +1,7 @@ /** @file UEFI Driver Entry and Binding support. - Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -28,6 +28,7 @@ EFI_DRIVER_BINDING_PROTOCOL gMediaDeviceDriverBinding = { NULL }; +EFI_EMMC_CARD_INFO_PROTOCOL *gEfiEmmcCardInfo = NULL; /** Entry point for EFI drivers. @@ -229,7 +230,7 @@ MediaDeviceDriverBindingStart ( } - Status = MediaDeviceDriverInstallBlockIo (CardData); + Status = MediaDeviceDriverInstallBlockIo (This, CardData); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "MediaDeviceDriverBindingStart: Fail to install gEfiBlockIoProtocolGuid \n")); goto Exit; @@ -246,7 +247,20 @@ MediaDeviceDriverBindingStart ( ); if (EFI_ERROR (Status)) { Status = EFI_OUT_OF_RESOURCES; - MediaDeviceDriverUninstallBlockIo (CardData); + for (Loop = 0; Loop < MAX_NUMBER_OF_PARTITIONS; Loop++) { + if (!CardData->Partitions[Loop].Present) { + continue; + } + gBS->UninstallMultipleProtocolInterfaces ( + CardData->Partitions[Loop].Handle, + &gEfiBlockIoProtocolGuid, + &CardData->Partitions[Loop].BlockIo, + &gEfiDevicePathProtocolGuid, + CardData->Partitions[Loop].DevPath, + NULL + ); + } + goto Exit; } if (EfiEmmcCardInfoRegister != NULL) { @@ -263,9 +277,24 @@ MediaDeviceDriverBindingStart ( ); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "MediaDeviceDriverBindingStart: Install eMMC Card info protocol failed\n")); - MediaDeviceDriverUninstallBlockIo (CardData); + for (Loop = 0; Loop < MAX_NUMBER_OF_PARTITIONS; Loop++) { + if (!CardData->Partitions[Loop].Present) { + continue; + } + gBS->UninstallMultipleProtocolInterfaces ( + CardData->Partitions[Loop].Handle, + &gEfiBlockIoProtocolGuid, + &CardData->Partitions[Loop].BlockIo, + &gEfiDevicePathProtocolGuid, + CardData->Partitions[Loop].DevPath, + NULL + ); + } + goto Exit; } + + gEfiEmmcCardInfo = EfiEmmcCardInfoRegister; } DEBUG ((DEBUG_INFO, "MediaDeviceDriverBindingStart: Started\n")); @@ -275,7 +304,7 @@ Exit: DEBUG ((EFI_D_ERROR, "MediaDeviceDriverBindingStart: End with failure\n")); if (CardData != NULL && MmcHostIo != NULL) { if (CardData->RawBufferPointer != NULL) { - gBS->FreePages ((EFI_PHYSICAL_ADDRESS) CardData->RawBufferPointer, EFI_SIZE_TO_PAGES (MmcHostIo->HostCapability.BoundarySize * 2)); + gBS->FreePages ((EFI_PHYSICAL_ADDRESS) (UINTN) CardData->RawBufferPointer, EFI_SIZE_TO_PAGES (MmcHostIo->HostCapability.BoundarySize * 2)); } FreePool (CardData); } @@ -314,70 +343,102 @@ MediaDeviceDriverBindingStop ( { EFI_STATUS Status; CARD_DATA *CardData; - EFI_BLOCK_IO_PROTOCOL *BlockIo; + BOOLEAN AllChildrenStopped; + UINTN Index; + UINTN Pages = 0; - // - // First find BlockIo Protocol - // - Status = gBS->OpenProtocol ( - Controller, - &gEfiBlockIoProtocolGuid, - (VOID**) &BlockIo, - This->DriverBindingHandle, - Controller, - EFI_OPEN_PROTOCOL_GET_PROTOCOL - ); + Status = EFI_SUCCESS; + CardData = gEfiEmmcCardInfo->CardData; - if (EFI_ERROR (Status)) { - return Status; - } + if (NumberOfChildren == 0) { + Status = gBS->UninstallMultipleProtocolInterfaces ( + Controller, + &gEfiEmmcCardInfoProtocolGuid, + gEfiEmmcCardInfo, + NULL + ); + if (EFI_ERROR (Status)) { + DEBUG ((EFI_D_ERROR, "MediaDeviceDriverBindingStop: UNINSTALL gEfiEmmcCardInfoProtocolGuid FAILURE\n")); + return Status; + } - gBS->CloseProtocol ( + FreeUnicodeStringTable (CardData->ControllerNameTable); + + Pages = (2 * (CardData->MmcHostIo->HostCapability.BoundarySize)); + if (CardData->RawBufferPointer != NULL) { + FreePages (CardData->RawBufferPointer, EFI_SIZE_TO_PAGES(Pages)); + } + + Status = gBS->CloseProtocol ( Controller, &gEfiMmcHostIoProtocolGuid, This->DriverBindingHandle, Controller ); - CardData = CARD_DATA_FROM_THIS (BlockIo); + if (MediaDeviceDriverAllPartitionNotPresent(CardData)) { + FreePool (CardData); + FreePool (gEfiEmmcCardInfo); + gEfiEmmcCardInfo = NULL; + } - // - // Uninstall Block I/O protocol from the device handle - // - Status = MediaDeviceDriverUninstallBlockIo (CardData); - if (EFI_ERROR (Status)) { return Status; } - if (CardData != NULL) { - FreeUnicodeStringTable (CardData->ControllerNameTable); - if (CardData->RawBufferPointer != NULL) { - FreePool (CardData->RawBufferPointer); + AllChildrenStopped = TRUE; + for (Index = 0; Index < NumberOfChildren; Index++) { + Status = MediaDeviceDriverUninstallBlockIo(This, CardData, ChildHandleBuffer[Index]); + if (EFI_ERROR (Status)) { + DEBUG ((EFI_D_ERROR, "MediaDeviceDriverBindingStop: UNINSTALL block io FAILURE\n")); + AllChildrenStopped = FALSE; + break; } - FreePool (CardData); } return Status; } +BOOLEAN +MediaDeviceDriverAllPartitionNotPresent ( + IN CARD_DATA *CardData + ) +{ + BOOLEAN AllPartitionNotPresent; + UINTN Loop; + MMC_PARTITION_DATA *Partition; + + Partition = CardData->Partitions; + + AllPartitionNotPresent = TRUE; + + for (Loop = 0; Loop < MAX_NUMBER_OF_PARTITIONS; Partition++, Loop++) { + if (Partition->Present) { + AllPartitionNotPresent = FALSE; + break; + } + } + + return AllPartitionNotPresent; +} + + STATIC struct { - CONTROLLER_DEVICE_PATH Controller; + DEVICE_LOGICAL_UNIT_DEVICE_PATH LogicalUnit; EFI_DEVICE_PATH_PROTOCOL End; -} ControllerDevPathTemplate = { +} EmmcDevPathTemplate = { { { - HARDWARE_DEVICE_PATH, - HW_CONTROLLER_DP, + MESSAGING_DEVICE_PATH, + MSG_DEVICE_LOGICAL_UNIT_DP, { - sizeof (CONTROLLER_DEVICE_PATH), + sizeof (DEVICE_LOGICAL_UNIT_DEVICE_PATH), 0 }, }, 0 }, - { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, @@ -392,6 +453,7 @@ struct { /** MediaDeviceDriverInstallBlockIo + @param[in] This Pointer to the EFI_DRIVER_BINDING_PROTOCOL. @param[in] CardData Pointer to CARD_DATA @retval EFI_INVALID_PARAMETER @@ -401,13 +463,15 @@ struct { **/ EFI_STATUS MediaDeviceDriverInstallBlockIo ( - IN CARD_DATA *CardData + IN EFI_DRIVER_BINDING_PROTOCOL *This, + IN CARD_DATA *CardData ) { EFI_STATUS Status; - UINTN Loop; + UINT8 Loop; MMC_PARTITION_DATA *Partition; EFI_DEVICE_PATH_PROTOCOL *MainPath; + EFI_MMC_HOST_IO_PROTOCOL *MmcHostIo = NULL; Partition = CardData->Partitions; @@ -430,13 +494,12 @@ MediaDeviceDriverInstallBlockIo ( Partition->Handle = NULL; Partition->CardData = CardData; - ControllerDevPathTemplate.Controller.ControllerNumber = (UINT32) Loop; + EmmcDevPathTemplate.LogicalUnit.Lun = Loop; Partition->DevPath = AppendDevicePath ( MainPath, - (EFI_DEVICE_PATH_PROTOCOL *) &ControllerDevPathTemplate + (EFI_DEVICE_PATH_PROTOCOL *) &EmmcDevPathTemplate ); - if (Partition->DevPath == NULL) { Status = EFI_OUT_OF_RESOURCES; break; @@ -460,29 +523,16 @@ MediaDeviceDriverInstallBlockIo ( ); // - // Handle Boot partitions + // Open parent controller by child // - if (CardData->CardType == MMCCard) { - // - // skip unbootable partitions display on boot manager - // - // Loop [0] OS boot partition - // Loop [1] BIOS LBP1 - // Loop [2] BIOS LBP2 - // Loop [3] GPP1 - // Loop [4] GPP2 - // Loop [5] GPP3 - // Loop [6] GPP4 - // - if (Loop != 0) { - Status = gBS->InstallProtocolInterface ( - &(Partition->Handle), - &gEfiUnbootablePartitionGuid, - EFI_NATIVE_INTERFACE, - NULL - ); - } - } + Status = gBS->OpenProtocol ( + CardData->Handle, + &gEfiMmcHostIoProtocolGuid, + (VOID **) &MmcHostIo, + This->DriverBindingHandle, + Partition->Handle, + EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER + ); } return Status; @@ -492,7 +542,9 @@ MediaDeviceDriverInstallBlockIo ( /** MediaDeviceDriverUninstallBlockIo + @param[in] This Pointer to the EFI_DRIVER_BINDING_PROTOCOL. @param[in] CardData Pointer to CARD_DATA + @param[in] Handle Handle of Partition @retval EFI_INVALID_PARAMETER @retval EFI_UNSUPPORTED @@ -501,7 +553,9 @@ MediaDeviceDriverInstallBlockIo ( **/ EFI_STATUS MediaDeviceDriverUninstallBlockIo ( - IN CARD_DATA *CardData + IN EFI_DRIVER_BINDING_PROTOCOL *This, + IN CARD_DATA *CardData, + IN EFI_HANDLE Handle ) { EFI_STATUS Status; @@ -512,17 +566,40 @@ MediaDeviceDriverUninstallBlockIo ( Status = EFI_SUCCESS; for (Loop = 0; Loop < MAX_NUMBER_OF_PARTITIONS; Partition++, Loop++) { - if (!Partition->Present) { - continue; + if (!Partition->Present || Partition->Handle != Handle) { + continue; } - Status = gBS->UninstallProtocolInterface ( + // + // Close MmcHostIoProtocol by child + // + Status = gBS->CloseProtocol ( + CardData->Handle, + &gEfiMmcHostIoProtocolGuid, + This->DriverBindingHandle, + Partition->Handle + ); + if (EFI_ERROR (Status)) { + DEBUG ((EFI_D_ERROR, "CloseProtocol gEfiMmcHostIoProtocolGuid FAILURE \n")); + return Status; + } + + Status = gBS->UninstallMultipleProtocolInterfaces ( Partition->Handle, &gEfiBlockIoProtocolGuid, - &Partition->BlockIo + &Partition->BlockIo, + &gEfiDevicePathProtocolGuid, + Partition->DevPath, + NULL ); + Partition->Present = FALSE; + DEBUG ((EFI_D_ERROR, "MediaDeviceDriverBindingStop gEfiBlockIoProtocolGuid removed. %x\n", Status)); + if (EFI_ERROR (Status)) { + DEBUG ((EFI_D_ERROR, "MediaDeviceDriverUninstallBlockIo UNISTALL FAILURE \n")); + } + return Status; } - return Status; + return EFI_INVALID_PARAMETER; } -- 2.7.0.windows.1