Changeset 540 for soft

Timestamp:

Mar 29, 2015, 2:22:06 PM (10 years ago)

Author:

alain

Message:

Simplify the Command Table C structure: only one physical buffer per command.

Location:

soft/giet_vm/giet_drivers

Files:

• hba_driver.c (modified) (2 diffs)
• hba_driver.h (modified) (6 diffs)

soft/giet_vm/giet_drivers/hba_driver.c

@@ -36 +36 @@
 // command list : up to 32 commands
 __attribute__((section(".kdata")))
-hba_cmd_desc_t  _hba_cmd_list[32] __attribute__((aligned(0x1000)));   
+hba_cmd_desc_t  _hba_cmd_list[32] __attribute__((aligned(0x10)));   
 
 // command tables array : one command table per entry in command list
@@ -124 +124 @@
 
     // set  buffer descriptor in command table 
-    cmd_table->entry[0].dba  = (unsigned int)(buf_paddr);
-    cmd_table->entry[0].dbau = (unsigned int)(buf_paddr >> 32);
-    cmd_table->entry[0].dbc  = count * 512;
+    cmd_table->buffer.dba  = (unsigned int)(buf_paddr);
+    cmd_table->buffer.dbau = (unsigned int)(buf_paddr >> 32);
+    cmd_table->buffer.dbc  = count * 512;
 
     // initialize command table header

soft/giet_vm/giet_drivers/hba_driver.h

@@ -12 +12 @@
 //    supports only channel 0, because the GIET-VM uses only one physical disk.
 //
-// 2. The "command list" can contain up to 32 independant commands, posted
+// 2. This HBA component support split memory buffers (several physical
+//    buffers for one single command), but this driver supports only
+//    single buffer commands.
+//
+// 3. The "command list" can contain up to 32 independant commands, posted
 //    by different user tasks. These independant transfers are handled 
 //    by the HBA device in the same order as they have been written by the
@@ -20 +24 @@
 //    and increment the write pointer.
 //
-// 3. This driver implements two operating mode: 
+// 4. This driver implements two operating mode: 
 //    - In synchronous mode, the calling task poll the HBA_PXCI register to
 //    detect the command completion (busy waiting). 
@@ -26 +30 @@
 //    restart when the command is completed.
 // 
-// 4. As several user tasks can concurrently register commands in the command
+// 5. As several user tasks can concurrently register commands in the command
 //    list, and there is only one HBA interrupt, this interrupt is not linked
 //    to a specific task. In descheduling mode, the HBA IRQ is a "global" IRQ
@@ -58 +62 @@
 
 ///////////////////////////////////////////////////////////////////////////////////
-// Data structures for command table array
+// Data structures for command table 
 ///////////////////////////////////////////////////////////////////////////////////
 
@@ -83 +87 @@
 } hba_cmd_header_t;
 
-typedef struct hba_cmd_entry_s  // size = 16 bytes
+typedef struct hba_cmd_buffer_s  // size = 16 bytes
 {
     unsigned int        dba;        // Buffer base address 32 LSB bits
@@ -90 +94 @@
     unsigned int        dbc;        // Buffer byte count
 
-} hba_cmd_entry_t;
+} hba_cmd_buffer_t;
 
-typedef struct hba_cmd_table_s  // size = 4096 bytes
+typedef struct hba_cmd_table_s  // size = 256 bytes
 {
 
-    hba_cmd_header_t   header;     // contains LBA
-    hba_cmd_entry_t    entry[248]; // 248 buffers max
+    hba_cmd_header_t   header;      // contains LBA
+    hba_cmd_buffer_t   buffer;      // only one physical buffer
+    char               res[112];    // for 256 bytes alignment
 
 } hba_cmd_table_t;