Changeset 09fd5dd3 in rtems

Timestamp:

05/24/23 19:53:58 (4 months ago)

Author:

Kinsey Moore <kinsey.moore@…>

Branches:

master

Children:

ea27ada

Parents:

7a14c3df

git-author:

Kinsey Moore <kinsey.moore@…> (05/24/23 19:53:58)

git-committer:

Joel Sherrill <joel@…> (06/08/23 14:48:44)

Message:

bsps/xqspipsu: Use device information from the FCT

Instead of statically defining the device parameters, use the device
information available via the NOR device layer's Flash Configuration
Table.

Location:

bsps

Files:

• aarch64/xilinx-zynqmp/jffs2_xqspipsu.c (modified) (4 diffs)
• include/dev/spi/xqspipsu-flash-helper.h (modified) (1 diff)
• shared/dev/spi/xqspipsu-flash-helper.c (modified) (1 diff)

bsps/aarch64/xilinx-zynqmp/jffs2_xqspipsu.c

@@ -39 +39 @@
 } flash_control;
 
-/* From the N25Q512A datasheet */
-#define BLOCK_SIZE (64UL * 1024UL)
-#define FLASH_SIZE (1024UL * BLOCK_SIZE)
 #define FLASH_DEVICE_ID 0xbb20 /* Type: 0xbb, Capacity: 0x20 */
 
@@ -118 +115 @@
     QspiPsuPtr,
     offset,
-    BLOCK_SIZE
+    super->block_size
   );
   if ( Status != XST_SUCCESS ) {
@@ -140 +137 @@
 static flash_control flash_instance = {
   .super = {
-    .block_size        = BLOCK_SIZE,
-    .flash_size        = FLASH_SIZE,
     .read              = do_read,
     .write             = do_write,
@@ -172 +167 @@
   }
 
+  uint32_t sect_size = QspiPsu_NOR_Get_Sector_Size(qspipsu_ptr);
+  uint32_t flash_size = QspiPsu_NOR_Get_Device_Size(qspipsu_ptr);
+  flash_instance.super.flash_size = flash_size;
+  flash_instance.super.block_size = sect_size;
+
   rv = mount(
     NULL,

bsps/include/dev/spi/xqspipsu-flash-helper.h

@@ -132 +132 @@
   u8 *ReadBfrPtr
 );
+
+/*****************************************************************************/
+/**
+ *
+ * This function returns the size of attached flash parts.
+ *
+ * @param       QspiPsuPtr is a pointer to the QSPIPSU driver component to use.
+ *
+ * @return      The size of attached flash in bytes.
+ *
+ ******************************************************************************/
+u32 QspiPsu_NOR_Get_Device_Size(XQspiPsu *QspiPsuPtr);
+
+/*****************************************************************************/
+/**
+ *
+ * This function returns the sector size of attached flash parts.
+ *
+ * @param       QspiPsuPtr is a pointer to the QSPIPSU driver component to use.
+ *
+ * @return      The sector size of attached flash in bytes.
+ *
+ ******************************************************************************/
+u32 QspiPsu_NOR_Get_Sector_Size(XQspiPsu *QspiPsuPtr);

bsps/shared/dev/spi/xqspipsu-flash-helper.c

@@ -2259 +2259 @@
   return 0;
 }
+
+u32 QspiPsu_NOR_Get_Sector_Size(XQspiPsu *QspiPsuPtr)
+{
+  if(QspiPsuPtr->Config.ConnectionMode == XQSPIPSU_CONNECTION_MODE_PARALLEL) {
+    return Flash_Config_Table[FCTIndex].SectSize * 2;
+  }
+  return Flash_Config_Table[FCTIndex].SectSize;
+}
+
+u32 QspiPsu_NOR_Get_Device_Size(XQspiPsu *QspiPsuPtr)
+{
+  if(QspiPsuPtr->Config.ConnectionMode == XQSPIPSU_CONNECTION_MODE_STACKED) {
+    return Flash_Config_Table[FCTIndex].FlashDeviceSize * 2;
+  }
+  return Flash_Config_Table[FCTIndex].FlashDeviceSize;
+}