From patchwork Wed Nov 23 07:08:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 83545 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp2496063qge; Tue, 22 Nov 2016 23:09:13 -0800 (PST) X-Received: by 10.84.174.67 with SMTP id q61mr3613166plb.93.1479884953104; Tue, 22 Nov 2016 23:09:13 -0800 (PST) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id o4si3866881plb.28.2016.11.22.23.09.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Nov 2016 23:09:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 4001381EC4; Tue, 22 Nov 2016 23:09:09 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-pf0-x22a.google.com (mail-pf0-x22a.google.com [IPv6:2607:f8b0:400e:c00::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id ECEB981EA7 for ; Tue, 22 Nov 2016 23:09:07 -0800 (PST) Received: by mail-pf0-x22a.google.com with SMTP id c4so1792194pfb.1 for ; Tue, 22 Nov 2016 23:09:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MAaOHu8JOzZDghSDbHnInG44GRKkGFyWBqErwJf8QSE=; b=ivqH7StQRaMXsH+srxnplzkz6gdJbz+pjU6cekkFDA4m+YapMpHoWSOh7gtjOCFcBD PjthRnzAgtpaJkabi7kBlAD0v/TTMdIjD0VbuHPHNzjvBO069rFpa9YwokAWc6wk4I3e S+Q6mpLg9AsvfPRBe1sc962hISBTACKNO/rNg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MAaOHu8JOzZDghSDbHnInG44GRKkGFyWBqErwJf8QSE=; b=gOQ79FhvFVnB8Bex/0XsO9Q+wtoB6+OVmD589arJ7TWXSOLzf2y7h76NGYasZmTIbT 9fe8QZEZ9KXmXpUmnmOfrheNDC8bm/iYh2YPBUZI38v/8o4AU6WwTcXb1lsTw0PDILRL PyzxekaMbvVv6u9IkELoeZjw+D6BkZP1DDSB+YaM3RsucUYu473QSb4xXFFtdQdnGZHp KXcSH6F98O7eFKaISrQnS1wA06SgTprJZLrCpLiCY+f5YNuWlF/dzzpZJdXCGD+X7yPf atHgsHvpw9byGIx/6O4lIX6uqHC3NBBL4rvKgxfcu2RHUJaPgMHLqMmPwHczSLHqjLrb I/7w== X-Gm-Message-State: AKaTC01PJeCDzLoFS3lYHZ2w+peSnyVmewWkhiqytGz4tWbCtDY1Vvg7Xwtc4nMrXKofnhIH X-Received: by 10.84.171.228 with SMTP id l91mr3752914plb.4.1479884947574; Tue, 22 Nov 2016 23:09:07 -0800 (PST) Received: from localhost.localdomain ([45.56.159.99]) by smtp.gmail.com with ESMTPSA id 65sm49873730pfn.12.2016.11.22.23.09.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Nov 2016 23:09:06 -0800 (PST) From: Haojian Zhuang To: ryan.harkin@linaro.org, edk2-devel@lists.01.org, leif.lindholm@linaro.org, ard.biesheuvel@linaro.org Date: Wed, 23 Nov 2016 15:08:41 +0800 Message-Id: <1479884921-25398-5-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479884921-25398-1-git-send-email-haojian.zhuang@linaro.org> References: <1479884921-25398-1-git-send-email-haojian.zhuang@linaro.org> Subject: [edk2] [PATCH v7 4/4] MmcDxe: expand to support multiple blocks 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: , Cc: Haojian Zhuang MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Make use of DMA to transfer multiple blocks at one time. It could improve the performance on MMC/SD driver. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Haojian Zhuang Tested-by: Ryan Harkin --- EmbeddedPkg/Include/Protocol/MmcHost.h | 10 +- EmbeddedPkg/Universal/MmcDxe/Mmc.h | 4 + EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c | 176 ++++++++++++++++++++---------- 3 files changed, 130 insertions(+), 60 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/EmbeddedPkg/Include/Protocol/MmcHost.h b/EmbeddedPkg/Include/Protocol/MmcHost.h index 445e53f..8c8c8a7 100644 --- a/EmbeddedPkg/Include/Protocol/MmcHost.h +++ b/EmbeddedPkg/Include/Protocol/MmcHost.h @@ -62,6 +62,7 @@ typedef UINT32 MMC_CMD; #define MMC_CMD20 (MMC_INDX(20) | MMC_CMD_WAIT_RESPONSE) #define MMC_CMD23 (MMC_INDX(23) | MMC_CMD_WAIT_RESPONSE) #define MMC_CMD24 (MMC_INDX(24) | MMC_CMD_WAIT_RESPONSE) +#define MMC_CMD25 (MMC_INDX(25) | MMC_CMD_WAIT_RESPONSE) #define MMC_CMD55 (MMC_INDX(55) | MMC_CMD_WAIT_RESPONSE) #define MMC_ACMD41 (MMC_INDX(41) | MMC_CMD_WAIT_RESPONSE | MMC_CMD_NO_CRC_RESPONSE) #define MMC_ACMD51 (MMC_INDX(51) | MMC_CMD_WAIT_RESPONSE) @@ -152,6 +153,10 @@ typedef EFI_STATUS (EFIAPI *MMC_SETIOS) ( IN UINT32 TimingMode ); +typedef BOOLEAN (EFIAPI *MMC_ISMULTIBLOCK) ( + IN EFI_MMC_HOST_PROTOCOL *This + ); + struct _EFI_MMC_HOST_PROTOCOL { @@ -169,13 +174,16 @@ struct _EFI_MMC_HOST_PROTOCOL { MMC_WRITEBLOCKDATA WriteBlockData; MMC_SETIOS SetIos; + MMC_ISMULTIBLOCK IsMultiBlock; }; -#define MMC_HOST_PROTOCOL_REVISION 0x00010002 // 1.2 +#define MMC_HOST_PROTOCOL_REVISION 0x00010003 // 1.3 #define MMC_HOST_HAS_SETIOS(Host) (Host->Revision >= MMC_HOST_PROTOCOL_REVISION && \ Host->SetIos != NULL) +#define MMC_HOST_HAS_ISMULTIBLOCK(Host) (Host->Revision >= MMC_HOST_PROTOCOL_REVISION && \ + Host->IsMultiBlock != NULL) extern EFI_GUID gEfiMmcHostProtocolGuid; diff --git a/EmbeddedPkg/Universal/MmcDxe/Mmc.h b/EmbeddedPkg/Universal/MmcDxe/Mmc.h index 6bc85e0..8e7a80a 100644 --- a/EmbeddedPkg/Universal/MmcDxe/Mmc.h +++ b/EmbeddedPkg/Universal/MmcDxe/Mmc.h @@ -34,6 +34,10 @@ #define MMC_OCR_POWERUP 0x80000000 +#define MMC_OCR_ACCESS_MASK 0x3 /* bit[30-29] */ +#define MMC_OCR_ACCESS_BYTE 0x1 /* bit[29] */ +#define MMC_OCR_ACCESS_SECTOR 0x2 /* bit[30] */ + #define MMC_CSD_GET_CCC(Response) (Response[2] >> 20) #define MMC_CSD_GET_TRANSPEED(Response) (Response[3] & 0xFF) #define MMC_CSD_GET_READBLLEN(Response) ((Response[2] >> 16) & 0xF) diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c b/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c index 0e1ef57..35570fd 100644 --- a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c +++ b/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c @@ -126,6 +126,96 @@ MmcStopTransmission ( #define MMCI0_BLOCKLEN 512 #define MMCI0_TIMEOUT 10000 +STATIC +EFI_STATUS +MmcTransferBlock ( + IN EFI_BLOCK_IO_PROTOCOL *This, + IN UINTN Cmd, + IN UINTN Transfer, + IN UINT32 MediaId, + IN EFI_LBA Lba, + IN UINTN BufferSize, + OUT VOID *Buffer + ) +{ + EFI_STATUS Status; + UINTN CmdArg; + INTN Timeout; + UINT32 Response[4]; + MMC_HOST_INSTANCE *MmcHostInstance; + EFI_MMC_HOST_PROTOCOL *MmcHost; + + MmcHostInstance = MMC_HOST_INSTANCE_FROM_BLOCK_IO_THIS (This); + MmcHost = MmcHostInstance->MmcHost; + + //Set command argument based on the card access mode (Byte mode or Block mode) + if ((MmcHostInstance->CardInfo.OCRData.AccessMode & MMC_OCR_ACCESS_MASK) == + MMC_OCR_ACCESS_SECTOR) { + CmdArg = Lba; + } else { + CmdArg = Lba * This->Media->BlockSize; + } + + Status = MmcHost->SendCommand (MmcHost, Cmd, CmdArg); + if (EFI_ERROR (Status)) { + DEBUG ((EFI_D_ERROR, "%a(MMC_CMD%d): Error %r\n", __func__, Cmd, Status)); + return Status; + } + + if (Transfer == MMC_IOBLOCKS_READ) { + // Read Data + Status = MmcHost->ReadBlockData (MmcHost, Lba, BufferSize, Buffer); + if (EFI_ERROR (Status)) { + DEBUG ((EFI_D_BLKIO, "%a(): Error Read Block Data and Status = %r\n", __func__, Status)); + MmcStopTransmission (MmcHost); + return Status; + } + Status = MmcNotifyState (MmcHostInstance, MmcProgrammingState); + if (EFI_ERROR (Status)) { + DEBUG ((EFI_D_ERROR, "%a() : Error MmcProgrammingState\n", __func__)); + return Status; + } + } else { + // Write Data + Status = MmcHost->WriteBlockData (MmcHost, Lba, BufferSize, Buffer); + if (EFI_ERROR (Status)) { + DEBUG ((EFI_D_BLKIO, "%a(): Error Write Block Data and Status = %r\n", __func__, Status)); + MmcStopTransmission (MmcHost); + return Status; + } + } + + // Command 13 - Read status and wait for programming to complete (return to tran) + Timeout = MMCI0_TIMEOUT; + CmdArg = MmcHostInstance->CardInfo.RCA << 16; + Response[0] = 0; + while(!(Response[0] & MMC_R0_READY_FOR_DATA) + && (MMC_R0_CURRENTSTATE (Response) != MMC_R0_STATE_TRAN) + && Timeout--) { + Status = MmcHost->SendCommand (MmcHost, MMC_CMD13, CmdArg); + if (!EFI_ERROR (Status)) { + MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1, Response); + if (Response[0] & MMC_R0_READY_FOR_DATA) { + break; // Prevents delay once finished + } + } + } + + if (BufferSize > This->Media->BlockSize) { + Status = MmcHost->SendCommand (MmcHost, MMC_CMD12, 0); + if (EFI_ERROR (Status)) { + DEBUG ((EFI_D_BLKIO, "%a(): Error and Status:%r\n", __func__, Status)); + } + } + + Status = MmcNotifyState (MmcHostInstance, MmcTransferState); + if (EFI_ERROR (Status)) { + DEBUG ((EFI_D_ERROR, "MmcIoBlocks() : Error MmcTransferState\n")); + return Status; + } + return Status; +} + EFI_STATUS MmcIoBlocks ( IN EFI_BLOCK_IO_PROTOCOL *This, @@ -145,6 +235,7 @@ MmcIoBlocks ( EFI_MMC_HOST_PROTOCOL *MmcHost; UINTN BytesRemainingToBeTransfered; UINTN BlockCount; + UINTN ConsumeSize; BlockCount = 1; MmcHostInstance = MMC_HOST_INSTANCE_FROM_BLOCK_IO_THIS (This); @@ -165,6 +256,10 @@ MmcIoBlocks ( return EFI_NO_MEDIA; } + if (MmcHost->IsMultiBlock && MmcHost->IsMultiBlock(MmcHost)) { + BlockCount = (BufferSize + This->Media->BlockSize - 1) / This->Media->BlockSize; + } + // All blocks must be within the device if ((Lba + (BufferSize / This->Media->BlockSize)) > (This->Media->LastBlock + 1)) { return EFI_INVALID_PARAMETER; @@ -210,75 +305,38 @@ MmcIoBlocks ( return EFI_NOT_READY; } - //Set command argument based on the card access mode (Byte mode or Block mode) - if (MmcHostInstance->CardInfo.OCRData.AccessMode & BIT1) { - CmdArg = Lba; - } else { - CmdArg = Lba * This->Media->BlockSize; - } - if (Transfer == MMC_IOBLOCKS_READ) { - // Read a single block - Cmd = MMC_CMD17; - } else { - // Write a single block - Cmd = MMC_CMD24; - } - Status = MmcHost->SendCommand (MmcHost, Cmd, CmdArg); - if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "MmcIoBlocks(MMC_CMD%d): Error %r\n", Cmd, Status)); - return Status; - } - - if (Transfer == MMC_IOBLOCKS_READ) { - // Read one block of Data - Status = MmcHost->ReadBlockData (MmcHost, Lba, This->Media->BlockSize, Buffer); - if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_BLKIO, "MmcIoBlocks(): Error Read Block Data and Status = %r\n", Status)); - MmcStopTransmission (MmcHost); - return Status; - } - Status = MmcNotifyState (MmcHostInstance, MmcProgrammingState); - if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "MmcIoBlocks() : Error MmcProgrammingState\n")); - return Status; + if (BlockCount == 1) { + // Read a single block + Cmd = MMC_CMD17; + } else { + // Read multiple blocks + Cmd = MMC_CMD18; } } else { - // Write one block of Data - Status = MmcHost->WriteBlockData (MmcHost, Lba, This->Media->BlockSize, Buffer); - if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_BLKIO, "MmcIoBlocks(): Error Write Block Data and Status = %r\n", Status)); - MmcStopTransmission (MmcHost); - return Status; + if (BlockCount == 1) { + // Write a single block + Cmd = MMC_CMD24; + } else { + // Write multiple blocks + Cmd = MMC_CMD25; } } - // Command 13 - Read status and wait for programming to complete (return to tran) - Timeout = MMCI0_TIMEOUT; - CmdArg = MmcHostInstance->CardInfo.RCA << 16; - Response[0] = 0; - while( (!(Response[0] & MMC_R0_READY_FOR_DATA)) - && (MMC_R0_CURRENTSTATE (Response) != MMC_R0_STATE_TRAN) - && Timeout--) { - Status = MmcHost->SendCommand (MmcHost, MMC_CMD13, CmdArg); - if (!EFI_ERROR (Status)) { - MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1, Response); - if ((Response[0] & MMC_R0_READY_FOR_DATA)) { - break; // Prevents delay once finished - } - } - gBS->Stall (1); + ConsumeSize = BlockCount * This->Media->BlockSize; + if (BytesRemainingToBeTransfered < ConsumeSize) { + ConsumeSize = BytesRemainingToBeTransfered; } - - Status = MmcNotifyState (MmcHostInstance, MmcTransferState); + Status = MmcTransferBlock (This, Cmd, Transfer, MediaId, Lba, ConsumeSize, Buffer); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "MmcIoBlocks() : Error MmcTransferState\n")); - return Status; + DEBUG ((EFI_D_ERROR, "%a(): Failed to transfer block and Status:%r\n", __func__, Status)); } - BytesRemainingToBeTransfered -= This->Media->BlockSize; - Lba += BlockCount; - Buffer = (UINT8 *)Buffer + This->Media->BlockSize; + BytesRemainingToBeTransfered -= ConsumeSize; + if (BytesRemainingToBeTransfered > 0) { + Lba += BlockCount; + Buffer = (UINT8 *)Buffer + ConsumeSize; + } } return EFI_SUCCESS;