From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 D287080388 for ; Sun, 12 Mar 2017 20:24:07 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP; 12 Mar 2017 20:24:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,156,1486454400"; d="scan'208";a="75826315" Received: from shwdeftian.ccr.corp.intel.com ([10.239.158.36]) by fmsmga006.fm.intel.com with ESMTP; 12 Mar 2017 20:24:06 -0700 From: Feng Tian To: edk2-devel@lists.01.org Cc: Hao Wu Date: Mon, 13 Mar 2017 11:23:57 +0800 Message-Id: X-Mailer: git-send-email 2.7.1.windows.2 Subject: [patch] MdeModulePkg/SdMmc: Add break to avoid dead loop when polling OCR Reg 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: Mon, 13 Mar 2017 03:24:08 -0000 At worst case, OCR register may always not set BIT31. It will cause original code enter to dead loop. Adding a break for such case. Cc: Hao Wu Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Feng Tian --- MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 9 ++++++++- MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 8 ++++++++ MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c | 9 ++++++++- MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c | 9 ++++++++- 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c index 9dbec10..6653a87 100755 --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c @@ -1109,6 +1109,7 @@ EmmcIdentification ( EFI_SD_MMC_PASS_THRU_PROTOCOL *PassThru; UINT32 Ocr; UINT16 Rca; + UINTN Retry; PciIo = Private->PciIo; PassThru = &Private->PassThru; @@ -1119,7 +1120,8 @@ EmmcIdentification ( return Status; } - Ocr = 0; + Ocr = 0; + Retry = 0; do { Status = EmmcGetOcr (PassThru, Slot, &Ocr); if (EFI_ERROR (Status)) { @@ -1127,6 +1129,11 @@ EmmcIdentification ( return Status; } Ocr |= BIT30; + + if (Retry++ == 100) { + return EFI_DEVICE_ERROR; + } + gBS->Stall(10 * 1000); } while ((Ocr & BIT31) == 0); Status = EmmcGetAllCid (PassThru, Slot); diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c index 9122848..1da0849 100644 --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c @@ -1017,6 +1017,7 @@ SdCardIdentification ( UINT8 PowerCtrl; UINT32 PresentState; UINT8 HostCtrl2; + UINTN Retry; PciIo = Private->PciIo; PassThru = &Private->PassThru; @@ -1097,12 +1098,19 @@ SdCardIdentification ( // Note here we only support the cards complied with SD physical // layer simplified spec version 2.0 and version 3.0 and above. // + Ocr = 0; + Retry = 0; do { Status = SdCardSendOpCond (PassThru, Slot, 0, Ocr, S18r, Xpc, TRUE, &Ocr); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "SdCardIdentification: SdCardSendOpCond fails with %r Ocr %x, S18r %x, Xpc %x\n", Status, Ocr, S18r, Xpc)); return EFI_DEVICE_ERROR; } + + if (Retry++ == 100) { + return EFI_DEVICE_ERROR; + } + gBS->Stall(10 * 1000); } while ((Ocr & BIT31) == 0); // diff --git a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c b/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c index 2c0baca..5cb20a3 100644 --- a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c +++ b/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c @@ -2827,6 +2827,7 @@ EmmcPeimIdentification ( EFI_STATUS Status; UINT32 Ocr; UINT32 Rca; + UINTN Retry; Status = EmmcPeimReset (Slot); if (EFI_ERROR (Status)) { @@ -2834,13 +2835,19 @@ EmmcPeimIdentification ( return Status; } - Ocr = 0; + Ocr = 0; + Retry = 0; do { Status = EmmcPeimGetOcr (Slot, &Ocr); if (EFI_ERROR (Status)) { DEBUG ((EFI_D_ERROR, "EmmcPeimIdentification: EmmcPeimGetOcr fails with %r\n", Status)); return Status; } + + if (Retry++ == 100) { + return EFI_DEVICE_ERROR; + } + MicroSecondDelay (10 * 1000); } while ((Ocr & BIT31) == 0); Status = EmmcPeimGetAllCid (Slot); diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c b/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c index 23e6563..81076ba 100644 --- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c +++ b/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c @@ -2754,7 +2754,7 @@ SdPeimIdentification ( UINT32 PresentState; UINT8 HostCtrl2; SD_HC_SLOT_CAP Capability; - + UINTN Retry; // // 1. Send Cmd0 to the device // @@ -2842,12 +2842,19 @@ SdPeimIdentification ( // Note here we only support the cards complied with SD physical // layer simplified spec version 2.0 and version 3.0 and above. // + Ocr = 0; + Retry = 0; do { Status = SdPeimSendOpCond (Slot, 0, Ocr, S18r, Xpc, TRUE, &Ocr); if (EFI_ERROR (Status)) { DEBUG ((EFI_D_ERROR, "SdPeimIdentification: SdPeimSendOpCond fails with %r Ocr %x, S18r %x, Xpc %x\n", Status, Ocr, S18r, Xpc)); return EFI_DEVICE_ERROR; } + + if (Retry++ == 100) { + return EFI_DEVICE_ERROR; + } + MicroSecondDelay (10 * 1000); } while ((Ocr & BIT31) == 0); // -- 2.7.1.windows.2