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

xilisf: Modified the check in flash read APIs for parallel case.

Browse source 
This patch modifies the check for whether bank crossover
in flash read functions for parallel case. This will fix
the bug where wrap around occurs to the top of flash when
reading very bottom..

Signed-off-by: P L Sai Krishna <lakshmis@xilinx.com>
This commit is contained in:
P L Sai Krishna 2015-05-29 13:11:34 +05:30 • committed by Nava kishore Manne
parent dbff6b1fe4
commit 01c429ca1a
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/sw_services/xilisf/src/include/xilisf.h
View file

@ -494,6 +494,8 @@
* APIs were added to enter and exit from 4 byte mode. Changes were
* made in read, erase and write APIs to support 4 byte mode.
* These were done to fix CR#858950.
* 5.3 sk 06/01/15 Used Half of Actual byte count for calculating
* Real Byte count in parallel mode. CR# 859979.
*
* </pre>
*

17
lib/sw_services/xilisf/src/xilisf_read.c
View file

@ -55,6 +55,8 @@
*
* 5.2 asa 05/12/15 Added support for Micron (N25Q256A) flash part
* which supports 4 byte addressing.
* 5.3 sk 06/01/15 Used Half of Actual byte count for calculating
* Real Byte count in parallel mode. CR# 859979.
* </pre>
*
******************************************************************************/
@ -367,6 +369,7 @@ static int ReadData(XIsf *InstancePtr, u32 Address, u8 *ReadPtr, u32 ByteCount)
u32 TotalByteCnt = ByteCount;
u32 LocalByteCnt = ByteCount;
u32 LocalAddress = Address;
u32 TempByteCnt = LocalByteCnt;
u8 WriteBuffer[10] = {0};
if (LocalByteCnt <= 0 ) {
return (int)XST_FAILURE;
@ -408,12 +411,17 @@ static int ReadData(XIsf *InstancePtr, u32 Address, u8 *ReadPtr, u32 ByteCount)
XIsf_SetTransferMode(InstancePtr, Mode);
}
if(InstancePtr->SpiInstPtr->Config.ConnectionMode ==
XQSPIPS_CONNECTION_MODE_PARALLEL) {
TempByteCnt = LocalByteCnt/2;
}
/*
* If data to be read spans beyond the current bank, then
* calculate RealByteCnt in current bank. Else
* RealByteCnt is the same as ByteCount
*/
if((RealAddr & BANKMASK) != ((RealAddr+LocalByteCnt) & BANKMASK)) {
if((RealAddr & BANKMASK) != ((RealAddr+TempByteCnt) & BANKMASK)) {
RealByteCnt = ((RealAddr & BANKMASK) + SIXTEENMB) - RealAddr;
}
else {
@ -528,6 +536,7 @@ static int FastReadData(XIsf *InstancePtr, u8 Command, u32 Address,
u32 TotalByteCnt = ByteCount;
u32 LocalByteCnt = ByteCount;
u32 LocalAddress = Address;
u32 TempByteCnt = LocalByteCnt;
u8 WriteBuffer[5]= {0};
if (LocalByteCnt <= 0 ) {
@ -573,12 +582,16 @@ static int FastReadData(XIsf *InstancePtr, u8 Command, u32 Address,
XIsf_SetTransferMode(InstancePtr, Mode);
}
if(InstancePtr->SpiInstPtr->Config.ConnectionMode ==
XQSPIPS_CONNECTION_MODE_PARALLEL) {
TempByteCnt = LocalByteCnt/2;
}
/*
* If data to be read spans beyond the current bank, then
* calculate RealByteCnt in current bank. Else
* RealByteCnt is the same as ByteCount
*/
if((RealAddr & BANKMASK) != ((RealAddr+LocalByteCnt) & BANKMASK)) {
if((RealAddr & BANKMASK) != ((RealAddr+TempByteCnt) & BANKMASK)) {
RealByteCnt = ((RealAddr & BANKMASK) + SIXTEENMB) - RealAddr;
}
else {