j3d1/open-ameba
1
0
Fork 0
mirror of https://github.com/drasko/open-ameba.git synced 2024-11-21 21:44:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

apdate

Browse source
This commit is contained in:
pvvx 2016-12-04 13:41:40 +03:00
parent 5e30f12891
commit ad9b495d7e
10 changed files with 120 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
RTL00_SDKV35a/component/common/drivers/sdio/realtek/sdio_host/inc/sd.h
View file

@ -9,17 +9,17 @@
typedef enum
{
SD_OK = 0,
SD_PROTECTED,
SD_NODISK,
SD_INITERR,
SD_PROTECTED,
SD_ERROR,
}SD_RESULT;
typedef enum{
SD_CLK_LOW,
SD_CLK_MID,
SD_CLK_HIGH,
SD_CLK_RSV,
SD_CLK_LOW, // 10.4MHz
SD_CLK_MID, // 20.8MHz
SD_CLK_HIGH, // 41.6MHz
SD_CLK_RSV, // 5.2MHz
}SD_CLK;
SD_RESULT SD_WaitReady(void);

13
RTL00_SDKV35a/component/common/drivers/sdio/realtek/sdio_host/inc/sdio_host.h
View file

@ -3,6 +3,8 @@
#include "basic_types.h"
#include "rtl8195a_sdio_host.h"
#define SDIO_HOST_BYTES_ALINGMENT 4
typedef enum{
SDIO_INIT_NONE = -1,
SDIO_INIT_FAIL = 0,
@ -11,6 +13,10 @@ typedef enum{
SDIO_SD_OK = 3,
}_sdio_init_s;
extern _sdio_init_s sdio_status;
typedef void (*sdio_sd_irq_handler)(void* param);
s8 sdio_init_host(void); // init sdio host interface
void sdio_deinit_host(void);
@ -20,7 +26,7 @@ void sdio_sd_deinit(void); //de-init sd card through sdio
s8 sdio_sd_status(void);
u32 sdio_sd_getCapacity(void);
s8 sdio_sd_getProtection(void);
s8 sdio_sd_setProtection(bool protected);
s8 sdio_sd_setProtection(bool protection);
s8 sdio_sd_getCSD(u8* CSD);
s8 sdio_sd_isReady();
s8 sdio_sd_setClock(SD_CLK_FREQUENCY SDCLK);
@ -29,4 +35,9 @@ s8 sdio_sd_setClock(SD_CLK_FREQUENCY SDCLK);
s8 sdio_read_blocks(u32 sector, u8 *buffer, u32 count);
s8 sdio_write_blocks(u32 sector, const u8 *buffer, u32 count);
s8 sdio_sd_hook_xfer_cmp_cb(IN sdio_sd_irq_handler CallbackFun,IN VOID *param);
s8 sdio_sd_hook_remove_cb(IN sdio_sd_irq_handler CallbackFun,IN VOID *param);
s8 sdio_sd_hook_insert_cb(IN sdio_sd_irq_handler CallbackFun,IN VOID *param);
s8 sdio_sd_hook_xfer_err_cb(IN sdio_sd_irq_handler CallbackFun,IN VOID *param);
#endif

22
RTL00_SDKV35a/component/soc/realtek/8195a/fwlib/hal_sdio_host.h
View file

@ -35,6 +35,18 @@ typedef struct _HAL_SDIO_HOST_OP_ {
HAL_Status (*HalSdioHostSetWriteProtect) (VOID *Data, u8 Setting);
}HAL_SDIO_HOST_OP, *PHAL_SDIO_HOST_OP;
// SDIO error type
typedef enum _SDIO_ERR_TYPE_ {
SDIO_ERR_DAT_CRC = 0x01,
SDIO_ERR_CMD_TIMEOUT = 0x02,
}SDIO_ERR_TYPE;
typedef enum _SDIO_XFER_TYPE_{
SDIO_XFER_NOR = 0x00, // normal
SDIO_XFER_R = 0x01, // read and write block
SDIO_XFER_W = 0x02, // read and write block
}SDIO_XFER_TYPE;
typedef struct _HAL_SDIO_HOST_ADAPTER_{
IRQ_HANDLE IrqHandle; // Irq Handler
ADMA2_DESC_FMT *AdmaDescTbl;
@ -46,15 +58,21 @@ typedef struct _HAL_SDIO_HOST_ADAPTER_{
u8 Csd[CSD_REG_LEN];
volatile u8 CmdCompleteFlg;
volatile u8 XferCompleteFlg;
volatile u8 ErrIntFlg;
volatile u8 ErrIntFlg;
volatile u8 CardCurState;
u8 IsSdhc;
u8 CurrSdClk;
u16 RCA;
u16 SdSpecVer;
SDIO_ERR_TYPE errType;
SDIO_XFER_TYPE XferType;
VOID (*XferCompCallback)(VOID *pAdapter);
VOID *XferCompCbPara;
VOID (*ErrorCallback)(VOID *pAdapter);
VOID *ErrorCbPara;
VOID (*CardInsertCallBack)(VOID *pAdapter);
VOID (*CardRemoveCallBack)(VOID *pAdapter);
VOID *CardInsertCbPara;
VOID (*CardRemoveCallBack)(VOID *pAdapter);
VOID *CardRemoveCbPara;
}HAL_SDIO_HOST_ADAPTER, *PHAL_SDIO_HOST_ADAPTER;

102
RTL00_SDKV35a/component/soc/realtek/8195a/fwlib/src/hal_sdr_controller.c
View file

@ -9,9 +9,13 @@
#include "rtl8195a.h"
#include "hal_sdr_controller.h"
#include "rtl8195a_sdr.h"
#include "flash_api.h"
#ifdef CONFIG_SDR_EN
#define SDRAM_INIT_USE_TCM_HEAP
#if 0
#define HAL_SDR_WRITE32(addr, value32) HAL_WRITE32(SDR_CTRL_BASE, addr, value32)
#define HAL_SDR_WRITE16(addr, value16) HAL_WRITE16(SDR_CTRL_BASE, addr, value16)
@ -28,6 +32,9 @@
#define HAL_SDRAM_READ8(addr) HAL_READ8(SDR_SDRAM_BASE, addr)
#endif
#define DEBUG_SDRAM 2
//#define CONFIG_SDR_VERIFY
extern SPIC_INIT_PARA SpicInitParaAllClk[3][CPU_CLK_TYPE_NO];
HAL_CUT_B_RAM_DATA_SECTION
@ -111,17 +118,24 @@ u32 SdrControllerInit(VOID);
VOID DramInit(DRAM_DEVICE_INFO *);
s32 MemTest(u32 loop_cnt);
u32 SdrCalibration(VOID);
u32 Sdr_Rand2(VOID);
//u32 Sdr_Rand2(VOID);
//#define Sdr_Rand2 Rand
#ifndef SDRAM_INIT_USE_TCM_HEAP
//3 Note: stack overfloat if the arrary is declared in the task
HAL_CUT_B_RAM_DATA_SECTION
u32 AvaWds[2][REC_NUM];
#else
typedef struct {
u32 m[2][REC_NUM];
} sAvaWds, * pAvaWds;
#endif
#endif // CONFIG_SDR_EN
/*
HAL_CUT_B_RAM_DATA_SECTION
unsigned int rand_x = 123456789;
*/
#ifdef CONFIG_SDR_EN
#ifdef CONFIG_SDR_VERIFY
@ -350,8 +364,9 @@ VOID
SdrCtrlInit(
VOID
){
HAL_WRITE32(0x40000000, 0x40,
((HAL_READ32(0x40000000, 0x40)&0xfffff)|0xe00000));
// ConfigDebugErr |= _DBG_MISC_;
// DBG_8195A("SDR Ctrl Init\n");
HAL_WRITE32(0x40000000, 0x40, ((HAL_READ32(0x40000000, 0x40)&0xfffff)|0xe00000));
LDO25M_CTRL(ON);
}
@ -361,6 +376,7 @@ SdrControllerInit(
VOID
)
{
// ConfigDebugErr |= _DBG_MISC_;
DBG_8195A("SDR Controller Init\n");
HAL_WRITE32(0x40000000, 0x40,
@ -424,7 +440,7 @@ DramInit (
// In PHY, write latency == 3
DramMaxWr= (DramInfo->Timing->WrMaxTck)/(DfiRate) +1;
DramWr = ((DramInfo->Timing->TwrPs) / DrmaPeriod)+1;
DramWr = ((DramInfo->Timing->TwrPs) / DrmaPeriod) +1;
CrTwr = ((DramInfo->Timing->TwrPs) / DrmaPeriod) + 3;
if (CrTwr < DramMaxWr) {
@ -727,20 +743,28 @@ SdrCalibration(
SPIC_INIT_PARA SpicInitPara;
u32 valid;
union { u8 b[4]; u32 l;} value;
////
flash_turnon();
if(fspic_isinit == 0) flash_init(&flashobj);
////
u32 CpuType = ((HAL_READ32(SYSTEM_CTRL_BASE, REG_SYS_CLK_CTRL1) & (0x70)) >> 4);
valid = RdPipe = TapCnt = 0xFFFFFFFF;
value.l = HAL_READ32(SPI_FLASH_BASE, FLASH_SDRC_PARA_BASE+8*CpuType);
if((value.b[0]^value.b[1])==0xFF)
valid = value.b[0];
//DiagPrintf("dump1 %x, %x %x %x %x \n\r", value.l, value.b[0], value.b[1], value.b[2], value.b[3]);
#if DEBUG_SDRAM > 1
DiagPrintf("dump1 %x, %x %x %x %x \n\r", value.l, value.b[0], value.b[1], value.b[2], value.b[3]);
#endif
value.l = HAL_READ32(SPI_FLASH_BASE, FLASH_SDRC_PARA_BASE+8*CpuType+4);
if((value.b[0]^value.b[1])==0xFF)
RdPipe = value.b[0];
if((value.b[2]^value.b[3])==0xFF)
TapCnt = value.b[2];
//DiagPrintf("dump2 %x, %x %x %x %x \n\r", value.l, value.b[0], value.b[1], value.b[2], value.b[3]);
#if DEBUG_SDRAM > 1
DiagPrintf("dump2 %x, %x %x %x %x \n\r", value.l, value.b[0], value.b[1], value.b[2], value.b[3]);
#endif
if((valid==1)&&(RdPipe!=0xFFFFFFFF)&&(TapCnt!=0xFFFFFFFF)){
// wait DRAM settle down
HalDelayUs(10);
@ -752,7 +776,11 @@ SdrCalibration(
}
#endif
#ifdef SDRAM_INIT_USE_TCM_HEAP
pAvaWds AvaWds = (pAvaWds) tcm_heap_calloc(sizeof(u32)*REC_NUM*2);
#else
_memset((u8*)AvaWds, 0, sizeof(u32)*REC_NUM*2);
#endif
volatile struct ms_rxi310_portmap *ms_ctrl_0_map;
ms_ctrl_0_map = (struct ms_rxi310_portmap*) SDR_CTRL_BASE;
@ -766,8 +794,10 @@ SdrCalibration(
// ms_ctrl_0_map->iocr = (ms_ctrl_0_map->iocr & 0xff) | (RdPipe << PCTL_IOCR_RD_PIPE_BFO);
HAL_SDR_WRITE32(REG_SDR_IOCR, ((HAL_SDR_READ32(REG_SDR_IOCR) & 0xff) | (RdPipe << PCTL_IOCR_RD_PIPE_BFO)));
DBG_SDR_INFO("IOCR: 0x%x; Write: 0x%x\n",HAL_SDR_READ32(REG_SDR_IOCR), (RdPipe << PCTL_IOCR_RD_PIPE_BFO));
// DBG_8195A("IOCR: 0x%x; Write: 0x%x\n",ms_ctrl_0_map->iocr, (RdPipe << PCTL_IOCR_RD_PIPE_BFO));
DBG_SDR_INFO("IOCR: 0x%x; Write: 0x%x\n", HAL_SDR_READ32(REG_SDR_IOCR), (RdPipe << PCTL_IOCR_RD_PIPE_BFO));
#if DEBUG_SDRAM > 1
DBG_8195A("IOCR: 0x%x; Write: 0x%x\n",ms_ctrl_0_map->iocr, (RdPipe << PCTL_IOCR_RD_PIPE_BFO));
#endif
RdPipeFlag = _FALSE;
PassFlag = _FALSE;
@ -785,7 +815,7 @@ SdrCalibration(
HAL_SDR_WRITE32(REG_SDR_DLY0, TapCnt);
// ms_ctrl_0_map->phy_dly0 = TapCnt;
#endif
DBG_SDR_INFO("DLY: 0x%x; Write: 0x%x\n",HAL_PERI_ON_READ32(REG_PESOC_MEM_CTRL), TapCnt);
DBG_SDR_INFO("DLY: 0x%x; Write: 0x%x\n", HAL_PERI_ON_READ32(REG_PESOC_MEM_CTRL), TapCnt);
#else
SDR_DDL_FCTRL(TapCnt);
// Value32 = (RD_DATA(SDR_CLK_DLY_CTRL) & 0xFF00FFFF);
@ -804,8 +834,11 @@ SdrCalibration(
RdPipeFlag = _TRUE;
RecRdPipe[RdPipeCounter - 1] = RdPipe;
}
#ifdef SDRAM_INIT_USE_TCM_HEAP
AvaWds->m[RdPipeCounter-1][AvaWdsCnt] = TapCnt;
#else
AvaWds[RdPipeCounter-1][AvaWdsCnt] = TapCnt;
#endif
AvaWdsCnt++;
RecNum[RdPipeCounter-1] = AvaWdsCnt;
@ -834,13 +867,13 @@ SdrCalibration(
}
// }
}
}
} // for TapCnt
if (RdPipeCounter > 2) {
u8 BestRangeIndex, BestIndex;
#ifdef CONFIG_SDR_VERIFY //to reduce log
#ifdef CONFIG_SDR_VERIFY //to reduce log
u32 i;
DBG_SDR_INFO("Avaliable RdPipe 0\n");
@ -851,7 +884,7 @@ SdrCalibration(
for (i=0;i<256;i++) {
DBG_SDR_INFO("%d\n", AvaWds[1][i]);
}
#endif
#endif
DBG_SDR_INFO("Rec 0 => total counter %d; RdPipe:%d;\n", RecNum[0], RecRdPipe[0]);
DBG_SDR_INFO("Rec 1 => total counter %d; RdPipe:%d;\n", RecNum[1], RecRdPipe[1]);
@ -859,16 +892,22 @@ SdrCalibration(
BestRangeIndex = (RecNum[0] > RecNum[1]) ? 0 : 1;
BestIndex = RecNum[BestRangeIndex]>>1;
#ifdef SDRAM_INIT_USE_TCM_HEAP
DBG_SDR_INFO("The Finial RdPipe: %d; TpCnt: 0x%x\n", RecRdPipe[BestRangeIndex], AvaWds->m[BestRangeIndex][BestIndex]);
#else
DBG_SDR_INFO("The Finial RdPipe: %d; TpCnt: 0x%x\n", RecRdPipe[BestRangeIndex], AvaWds[BestRangeIndex][BestIndex]);
#endif
// set RdPipe and tap_dly
// ms_ctrl_0_map->iocr = (ms_ctrl_0_map->iocr & 0xff) | (RecRdPipe[BestRangeIndex] << PCTL_IOCR_RD_PIPE_BFO);
HAL_SDR_WRITE32(REG_SDR_IOCR, ((HAL_SDR_READ32(REG_SDR_IOCR) & 0xff) | (RecRdPipe[BestRangeIndex] << PCTL_IOCR_RD_PIPE_BFO)));
#ifdef FPGA
#ifdef FPGA_TEMP
#ifdef SDRAM_INIT_USE_TCM_HEAP
SDR_DDL_FCTRL(AvaWds->m[BestRangeIndex][BestIndex]);
#else
SDR_DDL_FCTRL(AvaWds[BestRangeIndex][BestIndex]);
#endif
// Value32 = (RD_DATA(SDR_CLK_DLY_CTRL) & 0xFF00FFFF);
// Value32 = Value32 | (AvaWds[BestRangeIndex][BestIndex] << 16);
@ -885,13 +924,19 @@ SdrCalibration(
#endif
#if DRAM_CALIBRATION_IN_NVM
RdPipe = RecRdPipe[BestRangeIndex];
#ifdef SDRAM_INIT_USE_TCM_HEAP
TapCnt = AvaWds->m[BestRangeIndex][BestIndex];
#else
TapCnt = AvaWds[BestRangeIndex][BestIndex];
#endif
value.b[0] = (u8)RdPipe;
value.b[1] = ~value.b[0];
value.b[2] = (u8)TapCnt;
value.b[3] = ~value.b[2];
//DiagPrintf("dump1w %x, %x %x %x %x \n\r", value.l, value.b[0], value.b[1], value.b[2], value.b[3]);
#if DEBUG_SDRAM > 1
DiagPrintf("dump1w %x, %x %x %x %x \n\r", value.l, value.b[0], value.b[1], value.b[2], value.b[3]);
#endif
if( HAL_READ32(SPI_FLASH_BASE, FLASH_SDRC_PARA_BASE+8*CpuType+4) == 0xFFFFFFFF)
{
HAL_WRITE32(SPI_FLASH_BASE, FLASH_SDRC_PARA_BASE+8*CpuType+4, value.l);
@ -907,7 +952,9 @@ SdrCalibration(
value.b[1] = ~value.b[0];
value.b[2] = 0xFF;
value.b[3] = 0xFF;
//DiagPrintf("dump1w %x, %x %x %x %x \n\r", value.l, value.b[0], value.b[1], value.b[2], value.b[3]);
#if DEBUG_SDRAM > 1
DiagPrintf("dump1w %x, %x %x %x %x \n\r", value.l, value.b[0], value.b[1], value.b[2], value.b[3]);
#endif
if( HAL_READ32(SPI_FLASH_BASE, FLASH_SDRC_PARA_BASE+8*CpuType) == 0xFFFFFFFF )
{
HAL_WRITE32(SPI_FLASH_BASE, FLASH_SDRC_PARA_BASE+8*CpuType, value.l);
@ -928,11 +975,14 @@ SdrCalibration(
}
}
#ifdef SDRAM_INIT_USE_TCM_HEAP
tcm_heap_free(AvaWds);
#endif
return Result;
} // SdrCalibration
/*
HAL_SDRC_TEXT_SECTION
VOID
@ -963,7 +1013,9 @@ Sdr_Rand2(
return rand_x + y + z;
}
*/
HAL_SDRC_TEXT_SECTION
s32
MemTest(
@ -973,8 +1025,10 @@ MemTest(
u32 LoopIndex = 0;
u32 Value32, Addr;
for (LoopIndex = 0; LoopIndex<LoopCnt; LoopIndex++) {
Value32 = Sdr_Rand2();
Addr = Sdr_Rand2();
// Value32 = Sdr_Rand2();
// Addr = Sdr_Rand2();
Value32 = Rand();
Addr = Rand();
Addr &= 0x1FFFFF;
Addr &= (~0x3);

BIN
build/bin/ota.bin
View file

Binary file not shown.

BIN
build/bin/ram_2.bin
View file

Binary file not shown.

BIN
build/bin/ram_2.ns.bin
View file

Binary file not shown.

BIN
build/bin/ram_2.p.bin
View file

Binary file not shown.

BIN
build/bin/ram_all.bin
View file

Binary file not shown.

9
flasher.mk
View file

@ -145,7 +145,7 @@ $(FLASH_IMAGE): $(RAM1P_IMAGE) $(RAM2P_IMAGE) $(RAM3_IMAGE)
# @echo "==========================================================="
@mkdir -p $(BIN_DIR)
@rm -f $(FLASH_IMAGE)
@if [ -s $(RAM3_IMAGE) ]; then $(PICK) $(RAM3_START_ADDR) $(RAM3_END_ADDR) $(RAM3_IMAGE) $(RAM3P_IMAGE) body+reset_offset; fi
@if [ -s $(RAM3_IMAGE) ]; then $(PICK) 0x$(RAM3_START_ADDR) 0x$(RAM3_END_ADDR) $(RAM3_IMAGE) $(RAM3P_IMAGE) body+reset_offset; fi
@cat $(RAM1P_IMAGE) > $(FLASH_IMAGE)
# @chmod 777 $(FLASH_IMAGE)
ifdef PADDINGSIZE
@ -161,7 +161,7 @@ $(OTA_IMAGE): $(RAM2NS_IMAGE) $(RAM3_IMAGE)
@echo "==========================================================="
@echo "Make OTA image ($(OTA_IMAGE))"
@rm -f $(OTA_IMAGE)
@if [ -s $(RAM3_IMAGE) ]; then $(PICK) $(RAM3_START_ADDR) $(RAM3_END_ADDR) $(RAM3_IMAGE) $(RAM3P_IMAGE) body+reset_offset; fi
@if [ -s $(RAM3_IMAGE) ]; then $(PICK) 0x$(RAM3_START_ADDR) 0x$(RAM3_END_ADDR) $(RAM3_IMAGE) $(RAM3P_IMAGE) body+reset_offset; fi
@cat $(RAM2NS_IMAGE) > $(OTA_IMAGE)
@if [ -s $(RAM3_IMAGE) ]; then cat $(RAM3P_IMAGE) >> $(OTA_IMAGE); fi
# @chmod 777 $(OTA_IMAGE)
@ -232,11 +232,12 @@ $(RAM3_IMAGE): $(ELFFILE) $(NMAPFILE)
# @echo "==========================================================="
@mkdir -p $(BIN_DIR)
@rm -f $(RAM3_IMAGE) $(RAM3P_IMAGE)
@$(eval RAM3_START_ADDR = 0x$(shell grep __sdram_data_ $(NMAPFILE) | grep _start__ | awk '{print $$1}'))
@$(eval RAM3_END_ADDR = 0x$(shell grep __sdram_data_ $(NMAPFILE) | grep _end__ | awk '{print $$1}'))
@$(eval RAM3_START_ADDR = $(shell grep __sdram_data_ $(NMAPFILE) | grep _start__ | awk '{print $$1}'))
@$(eval RAM3_END_ADDR = $(shell grep __sdram_data_ $(NMAPFILE) | grep _end__ | awk '{print $$1}'))
$(if $(RAM3_START_ADDR),,$(error "Not found __sdram_data_start__!"))
$(if $(RAM3_END_ADDR),,$(error "Not found __sdram_data_end__!"))
ifneq ($(RAM3_START_ADDR),$(RAM3_END_ADDR))
@echo $(RAM3_START_ADDR) $(RAM3_END_ADDR)
@$(OBJCOPY) -j .image3 -j .sdr_text -j .sdr_rodata -j .sdr_data -Obinary $(ELFFILE) $(RAM3_IMAGE)
else
@rm -f $(RAM3_IMAGE) $(RAM3P_IMAGE)