sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EmbeddedPkg/DwEmmc: Adjust FIFO threshold

Browse Source 
Adjust FIFO threshold according to FIFO depth. Skip
the adjustment if we do not have FIFO depth info.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jun Nie <jun.nie@linaro.org>
Acked-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
This commit is contained in:
Jun Nie 2017-07-07 17:21:37 +08:00 committed by Leif Lindholm
parent d4102f68dc
commit a58bfb37f6
4 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmc.h
View File

@ -38,7 +38,10 @@
#define DWEMMC_RINTSTS ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x044) #define DWEMMC_RINTSTS ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x044)
#define DWEMMC_STATUS ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x048) #define DWEMMC_STATUS ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x048)
#define DWEMMC_FIFOTH ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x04c) #define DWEMMC_FIFOTH ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x04c)
#define DWEMMC_TCBCNT ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x05c)
#define DWEMMC_TBBCNT ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x060)
#define DWEMMC_DEBNCE ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x064) #define DWEMMC_DEBNCE ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x064)
#define DWEMMC_HCON ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x070)
#define DWEMMC_UHSREG ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x074) #define DWEMMC_UHSREG ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x074)
#define DWEMMC_BMOD ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x080) #define DWEMMC_BMOD ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x080)
#define DWEMMC_DBADDR ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x088) #define DWEMMC_DBADDR ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x088)
@ -47,6 +50,7 @@
#define DWEMMC_DSCADDR ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x094) #define DWEMMC_DSCADDR ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x094)
#define DWEMMC_BUFADDR ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x098) #define DWEMMC_BUFADDR ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x098)
#define DWEMMC_CARDTHRCTL ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0X100) #define DWEMMC_CARDTHRCTL ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0X100)
#define DWEMMC_DATA ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0X200)
#define CMD_UPDATE_CLK 0x80202000 #define CMD_UPDATE_CLK 0x80202000
#define CMD_START_BIT (1 << 31) #define CMD_START_BIT (1 << 31)
@ -124,4 +128,6 @@
#define DWEMMC_CARD_RD_THR(x) ((x & 0xfff) << 16) #define DWEMMC_CARD_RD_THR(x) ((x & 0xfff) << 16)
#define DWEMMC_CARD_RD_THR_EN (1 << 0) #define DWEMMC_CARD_RD_THR_EN (1 << 0)
#define DWEMMC_GET_HDATA_WIDTH(x) (((x) >> 7) & 0x7)
#endif // __DWEMMC_H__ #endif // __DWEMMC_H__

42
EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c
View File

@ -415,6 +415,47 @@ DwEmmcReceiveResponse (
return EFI_SUCCESS; return EFI_SUCCESS;
} }
VOID
DwEmmcAdjustFifoThreshold (
VOID
)
{
/* DMA multiple transaction size map to reg value as array index */
CONST UINT32 BurstSize[] = {1, 4, 8, 16, 32, 64, 128, 256};
UINT32 BlkDepthInFifo, FifoThreshold, FifoWidth, FifoDepth;
UINT32 BlkSize = DWEMMC_BLOCK_SIZE, Idx = 0, RxWatermark = 1, TxWatermark, TxWatermarkInvers;
/* Skip FIFO adjustment if we do not have platform FIFO depth info */
FifoDepth = PcdGet32 (PcdDwEmmcDxeFifoDepth);
if (!FifoDepth) {
return;
}
TxWatermark = FifoDepth / 2;
TxWatermarkInvers = FifoDepth - TxWatermark;
FifoWidth = DWEMMC_GET_HDATA_WIDTH (MmioRead32 (DWEMMC_HCON));
if (!FifoWidth) {
FifoWidth = 2;
} else if (FifoWidth == 2) {
FifoWidth = 8;
} else {
FifoWidth = 4;
}
BlkDepthInFifo = BlkSize / FifoWidth;
Idx = ARRAY_SIZE (BurstSize) - 1;
while (Idx && ((BlkDepthInFifo % BurstSize[Idx]) || (TxWatermarkInvers % BurstSize[Idx]))) {
Idx--;
}
RxWatermark = BurstSize[Idx] - 1;
FifoThreshold = DWEMMC_DMA_BURST_SIZE (Idx) | DWEMMC_FIFO_TWMARK (TxWatermark)
| DWEMMC_FIFO_RWMARK (RxWatermark);
MmioWrite32 (DWEMMC_FIFOTH, FifoThreshold);
}
EFI_STATUS EFI_STATUS
PrepareDmaData ( PrepareDmaData (
IN DWEMMC_IDMAC_DESCRIPTOR* IdmacDesc, IN DWEMMC_IDMAC_DESCRIPTOR* IdmacDesc,
@ -633,6 +674,7 @@ DwEmmcDxeInitialize (
Handle = NULL; Handle = NULL;
DwEmmcAdjustFifoThreshold ();
gpIdmacDesc = (DWEMMC_IDMAC_DESCRIPTOR *)AllocatePages (DWEMMC_MAX_DESC_PAGES); gpIdmacDesc = (DWEMMC_IDMAC_DESCRIPTOR *)AllocatePages (DWEMMC_MAX_DESC_PAGES);
if (gpIdmacDesc == NULL) { if (gpIdmacDesc == NULL) {
return EFI_BUFFER_TOO_SMALL; return EFI_BUFFER_TOO_SMALL;

1
EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf
View File

@ -49,6 +49,7 @@
gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeBaseAddress gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeBaseAddress
gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeClockFrequencyInHz gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeClockFrequencyInHz
gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeMaxClockFreqInHz gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeMaxClockFreqInHz
gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeFifoDepth
[Depex] [Depex]
TRUE TRUE

1
EmbeddedPkg/EmbeddedPkg.dec
View File

@ -168,6 +168,7 @@
gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeBaseAddress|0x0|UINT32|0x00000035 gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeBaseAddress|0x0|UINT32|0x00000035
gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeClockFrequencyInHz|0x0|UINT32|0x00000036 gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeClockFrequencyInHz|0x0|UINT32|0x00000036
gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeMaxClockFreqInHz|0x0|UINT32|0x00000037 gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeMaxClockFreqInHz|0x0|UINT32|0x00000037
gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeFifoDepth|0x0|UINT32|0x00000038
# #
# Android FastBoot # Android FastBoot