Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b6dac42 authored by Wenhao Wang's avatar Wenhao Wang Committed by Gerrit Code Review
Browse files

Merge changes Ib90f8b28,I391ecff9 

* changes:
  trusty:storageproxyd: Add wakelock to the UFS commands
  trusty:storageproxyd: Fix return paths on errors
parents 1a257af8 6e0a7622

trusty/storage/proxy/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -29,7 +29,10 @@ cc_binary { 
        "proxy.c",

    ],



    shared_libs: ["liblog"],

    shared_libs: [

        "liblog",

        "libhardware_legacy",

    ],

    header_libs: ["libcutils_headers"],



    static_libs: [

trusty/storage/proxy/rpmb.c

+20 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
#include <linux/major.h>

#include <linux/mmc/ioctl.h>



#include <hardware_legacy/power.h>



#include "ipc.h"

#include "log.h"

#include "rpmb.h"
@@ -100,6 +102,8 @@ static int rpmb_fd = -1; 
static uint8_t read_buf[4096];

static enum dev_type dev_type = UNKNOWN_RPMB;



static const char* UFS_WAKE_LOCK_NAME = "ufs_seq_wakelock";



#ifdef RPMB_DEBUG



static void print_buf(const char* prefix, const uint8_t* buf, size_t size) {
@@ -194,6 +198,7 @@ static int send_mmc_rpmb_req(int mmc_fd, const struct storage_rpmb_send_req* req 


static int send_ufs_rpmb_req(int sg_fd, const struct storage_rpmb_send_req* req) {

    int rc;

    int wl_rc;

    const uint8_t* write_buf = req->payload;

    /*

     * Meaning of member values are stated on the definition of struct sec_proto_cdb.
@@ -202,6 +207,12 @@ static int send_ufs_rpmb_req(int sg_fd, const struct storage_rpmb_send_req* req) 
    struct sec_proto_cdb out_cdb = {0xB5, 0xEC, 0x00, 0x01, 0x00, 0x00, 0, 0x00, 0x00};

    unsigned char sense_buffer[32];



    wl_rc = acquire_wake_lock(PARTIAL_WAKE_LOCK, UFS_WAKE_LOCK_NAME);

    if (wl_rc < 0) {

        ALOGE("%s: failed to acquire wakelock: %d, %s\n", __func__, wl_rc, strerror(errno));

        return wl_rc;

    }



    if (req->reliable_write_size) {

        /* Prepare SECURITY PROTOCOL OUT command. */

        out_cdb.length = __builtin_bswap32(req->reliable_write_size);
@@ -212,6 +223,7 @@ static int send_ufs_rpmb_req(int sg_fd, const struct storage_rpmb_send_req* req) 
        rc = ioctl(sg_fd, SG_IO, &io_hdr);

        if (rc < 0) {

            ALOGE("%s: ufs ioctl failed: %d, %s\n", __func__, rc, strerror(errno));

            goto err_op;

        }

        write_buf += req->reliable_write_size;

    }
@@ -225,6 +237,7 @@ static int send_ufs_rpmb_req(int sg_fd, const struct storage_rpmb_send_req* req) 
        rc = ioctl(sg_fd, SG_IO, &io_hdr);

        if (rc < 0) {

            ALOGE("%s: ufs ioctl failed: %d, %s\n", __func__, rc, strerror(errno));

            goto err_op;

        }

        write_buf += req->write_size;

    }
@@ -240,6 +253,13 @@ static int send_ufs_rpmb_req(int sg_fd, const struct storage_rpmb_send_req* req) 
            ALOGE("%s: ufs ioctl failed: %d, %s\n", __func__, rc, strerror(errno));

        }

    }



err_op:

    wl_rc = release_wake_lock(UFS_WAKE_LOCK_NAME);

    if (wl_rc < 0) {

        ALOGE("%s: failed to release wakelock: %d, %s\n", __func__, wl_rc, strerror(errno));

    }



    return rc;

}