Changeset dd8b6a8 in mainline for uspace/lib

Timestamp:

2014-08-27T23:56:16Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

95fe55ca

Parents:

f27f3fd

Message:

Add synchronize cache operation to block layer and usbmast.

Location:

uspace/lib

Files:

• block/block.c (modified) (1 diff)
• c/generic/bd.c (modified) (1 diff)
• c/generic/bd_srv.c (modified) (2 diffs)
• c/include/bd.h (modified) (1 diff)
• c/include/bd_srv.h (modified) (1 diff)
• c/include/ipc/bd.h (modified) (1 diff)
• scsi/include/scsi/sbc.h (modified) (2 diffs)

uspace/lib/block/block.c

@@ -194 +194 @@
         if (devcon->cache)
                 (void) block_cache_fini(service_id);
+        
+        (void)bd_sync_cache(devcon->bd, 0, 0);
         
         devcon_remove(devcon);

uspace/lib/c/generic/bd.c

@@ -150 +150 @@
 }
 
+int bd_sync_cache(bd_t *bd, aoff64_t ba, size_t cnt)
+{
+        async_exch_t *exch = async_exchange_begin(bd->sess);
+
+        int rc = async_req_3_0(exch, BD_SYNC_CACHE, LOWER32(ba),
+            UPPER32(ba), cnt);
+        async_exchange_end(exch);
+
+        return rc;
+}
+
 int bd_get_block_size(bd_t *bd, size_t *rbsize)
 {

uspace/lib/c/generic/bd_srv.c

@@ -128 +128 @@
 }
 
+static void bd_sync_cache_srv(bd_srv_t *srv, ipc_callid_t callid,
+    ipc_call_t *call)
+{
+        aoff64_t ba;
+        size_t cnt;
+        int rc;
+
+        ba = MERGE_LOUP32(IPC_GET_ARG1(*call), IPC_GET_ARG2(*call));
+        cnt = IPC_GET_ARG3(*call);
+
+        if (srv->srvs->ops->sync_cache == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        rc = srv->srvs->ops->sync_cache(srv, ba, cnt);
+        async_answer_0(callid, rc);
+}
+
 static void bd_write_blocks_srv(bd_srv_t *srv, ipc_callid_t callid,
     ipc_call_t *call)
@@ -244 +263 @@
                         bd_read_toc_srv(srv, callid, &call);
                         break;
+                case BD_SYNC_CACHE:
+                        bd_sync_cache_srv(srv, callid, &call);
+                        break;
                 case BD_WRITE_BLOCKS:
                         bd_write_blocks_srv(srv, callid, &call);

uspace/lib/c/include/bd.h

@@ -48 +48 @@
 extern int bd_read_toc(bd_t *, uint8_t, void *, size_t);
 extern int bd_write_blocks(bd_t *, aoff64_t, size_t, const void *, size_t);
+extern int bd_sync_cache(bd_t *, aoff64_t, size_t);
 extern int bd_get_block_size(bd_t *, size_t *);
 extern int bd_get_num_blocks(bd_t *, aoff64_t *);

uspace/lib/c/include/bd_srv.h

@@ -62 +62 @@
         int (*read_blocks)(bd_srv_t *, aoff64_t, size_t, void *, size_t);
         int (*read_toc)(bd_srv_t *, uint8_t, void *, size_t);
+        int (*sync_cache)(bd_srv_t *, aoff64_t, size_t);
         int (*write_blocks)(bd_srv_t *, aoff64_t, size_t, const void *, size_t);
         int (*get_block_size)(bd_srv_t *, size_t *);

uspace/lib/c/include/ipc/bd.h

@@ -42 +42 @@
         BD_GET_NUM_BLOCKS,
         BD_READ_BLOCKS,
+        BD_SYNC_CACHE,
         BD_WRITE_BLOCKS,
         BD_READ_TOC

uspace/lib/scsi/include/scsi/sbc.h

@@ -50 +50 @@
         SCSI_CMD_READ_CAPACITY_16       = 0x9e,
 
+        SCSI_CMD_SYNC_CACHE_10          = 0x35,
+        SCSI_CMD_SYNC_CACHE_16          = 0x91,
+
         SCSI_CMD_WRITE_6                = 0x0a,
         SCSI_CMD_WRITE_10               = 0x2a,
@@ -131 +134 @@
 } scsi_read_capacity_10_data_t;
 
+/** SCSI Synchronize Cache (10) command */
+typedef struct {
+        /** Operation code (SCSI_CMD_SYNC_CACHE_10) */
+        uint8_t op_code;
+        /** Reserved, Sync_NV, Immed, Reserved */
+        uint8_t flags;
+        /** Logical block address */
+        uint32_t lba;
+        /** Reserved, Group Number */
+        uint8_t group_no;
+        /** Number of Logical Blocks */
+        uint16_t numlb;
+        /** Control */
+        uint8_t control;
+} __attribute__((packed)) scsi_cdb_sync_cache_10_t;
+
+/** SCSI Synchronize Cache (16) command */
+typedef struct {
+        /** Operation code (SCSI_CMD_SYNC_CACHE_16) */
+        uint8_t op_code;
+        /** Reserved, Sync_NV, Immed, Reserved */
+        uint8_t flags;
+        /** Logical block address */
+        uint64_t lba;
+        /** Number of Logical Blocks */
+        uint32_t numlb;
+        /** Reserved, Group Number */
+        uint8_t group_no;
+        /** Control */
+        uint8_t control;
+} __attribute__((packed)) scsi_cdb_sync_cache_16_t;
+
 /** SCSI Write (10) command */
 typedef struct {