stv0g/embeddedsw
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

qspipsu_v1_0: Enabled cache in examples.

Browse source 
This patch enables the cache in examples and modified the buffer
alignment to 64-byte.

Signed-off-by: P L Sai Krishna <lakshmis@xilinx.com>
This commit is contained in:
P L Sai Krishna 2015-04-20 16:15:52 +05:30 • committed by Nava kishore Manne
parent 1b91e1c61d
commit 5d9aa73bd2
2 changed files with 40 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
XilinxProcessorIPLib/drivers/qspipsu_v1_1/examples/xqspipsu_generic_flash_interrupt_example.c
View file

@ -312,8 +312,8 @@ static int QspiPsuSetupIntrSystem(XScuGic *IntcInstancePtr,
static void QspiPsuDisableIntrSystem(XScuGic *IntcInstancePtr, u16 QspiPsuIntrId);
void QspiPsuHandler(void *CallBackRef, u32 StatusEvent, unsigned int ByteCount);
/************************** Variable Definitions *****************************/
u8 TxBfrPtr __attribute__ ((aligned(32)));
u8 ReadBfrPtr[4] __attribute__ ((aligned(32)));
u8 TxBfrPtr __attribute__ ((aligned(64)));
u8 ReadBfrPtr[4] __attribute__ ((aligned(64)));
FlashInfo Flash_Config_Table[24] = {
/* Spansion */
{0x10000, 0x100, 256, 0x10000, 0x1000000,
@ -409,9 +409,9 @@ int Test = 1;
* for each bank separate read will be performed leading to that many
* (overhead+dummy) bytes
*/
u8 ReadBuffer[(PAGE_COUNT * MAX_PAGE_SIZE) + (DATA_OFFSET + DUMMY_SIZE)*8] __attribute__ ((aligned(32)));
u8 WriteBuffer[(PAGE_COUNT * MAX_PAGE_SIZE) + DATA_OFFSET] __attribute__ ((aligned(32)));
u8 CmdBfr[8] __attribute__ ((aligned(32)));
u8 ReadBuffer[(PAGE_COUNT * MAX_PAGE_SIZE) + (DATA_OFFSET + DUMMY_SIZE)*8] __attribute__ ((aligned(64)));
u8 WriteBuffer[(PAGE_COUNT * MAX_PAGE_SIZE) + DATA_OFFSET] __attribute__ ((aligned(64)));
u8 CmdBfr[8] __attribute__ ((aligned(64)));
/*
* The following constants specify the max amount of data and the size of the
@ -475,8 +475,6 @@ int QspiPsuInterruptFlashExample(XScuGic *IntcInstancePtr, XQspiPsu *QspiPsuInst
XQspiPsu_Config *QspiPsuConfig;
int ReadBfrSize;
Xil_DCacheDisable();
ReadBfrSize = (PAGE_COUNT * MAX_PAGE_SIZE) +
(DATA_OFFSET + DUMMY_SIZE)*8;
@ -819,10 +817,10 @@ int FlashReadID(XQspiPsu *QspiPsuPtr)
int FlashWrite(XQspiPsu *QspiPsuPtr, u32 Address, u32 ByteCount, u8 Command,
u8 *WriteBfrPtr)
{
u8 WriteEnableCmd __attribute__ ((aligned(32)));
u8 ReadStatusCmd __attribute__ ((aligned(32)));
u8 FlashStatus[4] __attribute__ ((aligned(32)));
u8 WriteCmd[5] __attribute__ ((aligned(32)));
u8 WriteEnableCmd __attribute__ ((aligned(64)));
u8 ReadStatusCmd __attribute__ ((aligned(64)));
u8 FlashStatus[4] __attribute__ ((aligned(64)));
u8 WriteCmd[5] __attribute__ ((aligned(64)));
u32 RealAddr;
u32 CmdByteCount;
int Status;
@ -967,9 +965,9 @@ int FlashWrite(XQspiPsu *QspiPsuPtr, u32 Address, u32 ByteCount, u8 Command,
******************************************************************************/
int FlashErase(XQspiPsu *QspiPsuPtr, u32 Address, u32 ByteCount, u8 *WriteBfrPtr)
{
u8 WriteEnableCmd __attribute__ ((aligned(32)));
u8 ReadStatusCmd __attribute__ ((aligned(32)));
u8 FlashStatus[4] __attribute__ ((aligned(32)));
u8 WriteEnableCmd __attribute__ ((aligned(64)));
u8 ReadStatusCmd __attribute__ ((aligned(64)));
u8 FlashStatus[4] __attribute__ ((aligned(64)));
int Sector;
u32 RealAddr;
u32 NumSect;
@ -1287,9 +1285,9 @@ int FlashRead(XQspiPsu *QspiPsuPtr, u32 Address, u32 ByteCount, u8 Command,
******************************************************************************/
int BulkErase(XQspiPsu *QspiPsuPtr, u8 *WriteBfrPtr)
{
u8 WriteEnableCmd __attribute__ ((aligned(32)));
u8 ReadStatusCmd __attribute__ ((aligned(32)));
u8 FlashStatus[4] __attribute__ ((aligned(32)));
u8 WriteEnableCmd __attribute__ ((aligned(64)));
u8 ReadStatusCmd __attribute__ ((aligned(64)));
u8 FlashStatus[4] __attribute__ ((aligned(64)));
int Status;
WriteEnableCmd = WRITE_ENABLE_CMD;
@ -1391,10 +1389,10 @@ int BulkErase(XQspiPsu *QspiPsuPtr, u8 *WriteBfrPtr)
******************************************************************************/
int DieErase(XQspiPsu *QspiPsuPtr, u8 *WriteBfrPtr)
{
u8 WriteEnableCmd __attribute__ ((aligned(32)));
u8 WriteEnableCmd __attribute__ ((aligned(64)));
u8 DieCnt;
u8 ReadStatusCmd __attribute__ ((aligned(32)));
u8 FlashStatus[4] __attribute__ ((aligned(32)));
u8 ReadStatusCmd __attribute__ ((aligned(64)));
u8 FlashStatus[4] __attribute__ ((aligned(64)));
int Status;
WriteEnableCmd = WRITE_ENABLE_CMD;

46
XilinxProcessorIPLib/drivers/qspipsu_v1_1/examples/xqspipsu_generic_flash_polled_example.c
View file

@ -308,8 +308,8 @@ int FlashRegisterRead(XQspiPsu *QspiPsuPtr, u32 ByteCount, u8 Command, u8 *ReadB
int FlashRegisterWrite(XQspiPsu *QspiPsuPtr, u32 ByteCount, u8 Command,
u8 *WriteBfrPtr, u8 WrEn);
/************************** Variable Definitions *****************************/
u8 TxBfrPtr __attribute__ ((aligned(32)));
u8 ReadBfrPtr[4] __attribute__ ((aligned(32)));
u8 TxBfrPtr __attribute__ ((aligned(64)));
u8 ReadBfrPtr[4] __attribute__ ((aligned(64)));
FlashInfo Flash_Config_Table[24] = {
/* Spansion */
{0x10000, 0x100, 256, 0x10000, 0x1000000,
@ -392,9 +392,9 @@ int Test = 1;
* for each bank separate read will be performed leading to that many
* (overhead+dummy) bytes
*/
u8 ReadBuffer[(PAGE_COUNT * MAX_PAGE_SIZE) + (DATA_OFFSET + DUMMY_SIZE)*8] __attribute__ ((aligned(32)));
u8 WriteBuffer[(PAGE_COUNT * MAX_PAGE_SIZE) + DATA_OFFSET] __attribute__ ((aligned(32)));
u8 CmdBfr[8] __attribute__ ((aligned(32)));
u8 ReadBuffer[(PAGE_COUNT * MAX_PAGE_SIZE) + (DATA_OFFSET + DUMMY_SIZE)*8] __attribute__ ((aligned(64)));
u8 WriteBuffer[(PAGE_COUNT * MAX_PAGE_SIZE) + DATA_OFFSET] __attribute__ ((aligned(64)));
u8 CmdBfr[8] __attribute__ ((aligned(64)));
/*
* The following constants specify the max amount of data and the size of the
@ -457,8 +457,6 @@ int QspiPsuPolledFlashExample(XQspiPsu *QspiPsuInstancePtr, u16 QspiPsuDeviceId)
XQspiPsu_Config *QspiPsuConfig;
int ReadBfrSize;
Xil_DCacheDisable();
ReadBfrSize = (PAGE_COUNT * MAX_PAGE_SIZE) +
(DATA_OFFSET + DUMMY_SIZE)*8;
@ -752,10 +750,10 @@ int FlashReadID(XQspiPsu *QspiPsuPtr)
int FlashWrite(XQspiPsu *QspiPsuPtr, u32 Address, u32 ByteCount, u8 Command,
u8 *WriteBfrPtr)
{
u8 WriteEnableCmd __attribute__ ((aligned(32)));
u8 ReadStatusCmd __attribute__ ((aligned(32)));
u8 FlashStatus[4] __attribute__ ((aligned(32)));
u8 WriteCmd[5] __attribute__ ((aligned(32)));
u8 WriteEnableCmd __attribute__ ((aligned(64)));
u8 ReadStatusCmd __attribute__ ((aligned(64)));
u8 FlashStatus[4] __attribute__ ((aligned(64)));
u8 WriteCmd[5] __attribute__ ((aligned(64)));
u32 RealAddr;
u32 CmdByteCount;
int Status;
@ -891,9 +889,9 @@ int FlashWrite(XQspiPsu *QspiPsuPtr, u32 Address, u32 ByteCount, u8 Command,
int FlashErase(XQspiPsu *QspiPsuPtr, u32 Address, u32 ByteCount,
u8 *WriteBfrPtr)
{
u8 WriteEnableCmd __attribute__ ((aligned(32)));
u8 ReadStatusCmd __attribute__ ((aligned(32)));
u8 FlashStatus[4] __attribute__ ((aligned(32)));
u8 WriteEnableCmd __attribute__ ((aligned(64)));
u8 ReadStatusCmd __attribute__ ((aligned(64)));
u8 FlashStatus[4] __attribute__ ((aligned(64)));
int Sector;
u32 RealAddr;
u32 NumSect;
@ -1206,9 +1204,9 @@ int FlashRead(XQspiPsu *QspiPsuPtr, u32 Address, u32 ByteCount, u8 Command,
int FlashRegisterWrite(XQspiPsu *QspiPsuPtr, u32 ByteCount, u8 Command,
u8 *WriteBfrPtr, u8 WrEn)
{
u8 WriteEnableCmd __attribute__ ((aligned(32)));
u8 ReadStatusCmd __attribute__ ((aligned(32)));
u8 FlashStatus[4] __attribute__ ((aligned(32)));
u8 WriteEnableCmd __attribute__ ((aligned(64)));
u8 ReadStatusCmd __attribute__ ((aligned(64)));
u8 FlashStatus[4] __attribute__ ((aligned(64)));
int Status;
if(WrEn) {
@ -1301,7 +1299,7 @@ int FlashRegisterWrite(XQspiPsu *QspiPsuPtr, u32 ByteCount, u8 Command,
******************************************************************************/
int FlashRegisterRead(XQspiPsu *QspiPsuPtr, u32 ByteCount, u8 Command, u8 *ReadBfrPtr)
{
u8 WriteCmd __attribute__ ((aligned(32)));
u8 WriteCmd __attribute__ ((aligned(64)));
int Status;
WriteCmd = Command;
@ -1342,9 +1340,9 @@ int FlashRegisterRead(XQspiPsu *QspiPsuPtr, u32 ByteCount, u8 Command, u8 *ReadB
******************************************************************************/
int BulkErase(XQspiPsu *QspiPsuPtr, u8 *WriteBfrPtr)
{
u8 WriteEnableCmd __attribute__ ((aligned(32)));
u8 ReadStatusCmd __attribute__ ((aligned(32)));
u8 FlashStatus[4] __attribute__ ((aligned(32)));
u8 WriteEnableCmd __attribute__ ((aligned(64)));
u8 ReadStatusCmd __attribute__ ((aligned(64)));
u8 FlashStatus[4] __attribute__ ((aligned(64)));
int Status;
WriteEnableCmd = WRITE_ENABLE_CMD;
@ -1440,10 +1438,10 @@ int BulkErase(XQspiPsu *QspiPsuPtr, u8 *WriteBfrPtr)
******************************************************************************/
int DieErase(XQspiPsu *QspiPsuPtr, u8 *WriteBfrPtr)
{
u8 WriteEnableCmd __attribute__ ((aligned(32)));
u8 WriteEnableCmd __attribute__ ((aligned(64)));
u8 DieCnt;
u8 ReadStatusCmd __attribute__ ((aligned(32)));
u8 FlashStatus[4] __attribute__ ((aligned(32)));
u8 ReadStatusCmd __attribute__ ((aligned(64)));
u8 FlashStatus[4] __attribute__ ((aligned(64)));
int Status;
WriteEnableCmd = WRITE_ENABLE_CMD;