[PATCH v1 1/2] DM: Remove dead code wrapped by #if 0 #if


Kaige Fu
 

Signed-off-by: Kaige Fu <kaige.fu@intel.com>
---
devicemodel/hw/pci/virtio/virtio_rpmb.c | 94 ---------------------------------
1 file changed, 94 deletions(-)

diff --git a/devicemodel/hw/pci/virtio/virtio_rpmb.c b/devicemodel/hw/pci/virtio/virtio_rpmb.c
index 65ca48a..c92f19d 100644
--- a/devicemodel/hw/pci/virtio/virtio_rpmb.c
+++ b/devicemodel/hw/pci/virtio/virtio_rpmb.c
@@ -390,100 +390,6 @@ rpmb_get_counter(__u8 mode, __u8 *key, __u32 *counter, __u16 *result)
return rc;
}

-/* TODO: this function will be used for AttKB */
-#if 0
-static int
-rpmb_write_block(__u8 mode, __u8 *key, __u16 addr, void *buf, __u32 count)
-{
- int rc;
- int fd;
- __u32 i;
- __u32 write_counter;
- __u16 result;
- struct {
- struct rpmb_ioc_seq_cmd h;
- struct rpmb_ioc_cmd cmd[3];
- } iseq = {};
- struct rpmb_frame frame_write;
- struct rpmb_frame frame_rel[count];
- struct rpmb_frame frame_read;
-
- if (!buf || count == 0) {
- DPRINTF(("%s:buf or count is invalid!\n", __func__));
- return -1;
- }
-
- rc = rpmb_get_counter(mode, key, &write_counter, &result);
- if (rc) {
- DPRINTF(("%s: virtio_rpmb_get_counter failed\n", __func__));
- return -1;
- }
-
- /*fill write frame*/
- frame_write.addr = swap16(addr);
- frame_write.req_resp = swap16(RPMB_REQ_RESULT_READ);
- frame_write.write_counter = swap32(write_counter);
-
- /*fill rel write frame*/
- for (i = 0; i < count; i++) {
- memset(&frame_rel[i], 0, sizeof(frame_rel[i]));
- memcpy(frame_rel[i].data, buf + i * sizeof(frame_rel[i].data), sizeof(frame_rel[i].data));
- frame_rel[i].write_counter = swap32(write_counter);
- frame_rel[i].addr = swap16(addr);
- frame_rel[i].block_count = swap16(count);
- frame_rel[i].req_resp = swap16(RPMB_REQ_DATA_WRITE);
- }
-
- /*generate rel frame mac*/
- if (rpmb_mac(key, frame_rel, count, frame_rel[count - 1].key_mac)) {
- DPRINTF(("%s: rel frame rpmb mac failed\n", __func__));
- return -1;
- }
-
- /*fill io cmd*/
- iseq.cmd[0].flags = RPMB_F_WRITE | RPMB_F_REL_WRITE;
- iseq.cmd[0].nframes = count;
- iseq.cmd[0].frames_ptr = (__aligned_u64)(intptr_t)(frame_rel);
- iseq.cmd[1].flags = RPMB_F_WRITE;
- iseq.cmd[1].nframes = 1;
- iseq.cmd[1].frames_ptr = (__aligned_u64)(intptr_t)(&frame_write);
- iseq.cmd[2].flags = 0;
- iseq.cmd[2].nframes = 1;
- iseq.cmd[2].frames_ptr = (__aligned_u64)(intptr_t)(&frame_read);
- iseq.h.num_of_cmds = 3;
-
- if (mode == RPMB_PHY_MODE) {
- /* open rpmb device.*/
- fd = open(RPMB_PHY_PATH_NAME, O_RDWR | O_NONBLOCK);
- if (fd < 0) {
- DPRINTF(("failed to open %s for read blocks.\n", RPMB_PHY_PATH_NAME));
- return fd;
- }
-
- /* send ioctl cmd.*/
- rc = ioctl(fd, RPMB_IOC_SEQ_CMD, &iseq);
-
- /* close rpmb device.*/
- close(fd);
-
- if (rc) {
- DPRINTF(("read blocks for physical rpmb failed.\n"));
- return rc;
- }
- } else {
- rc = rpmb_sim_send(&iseq);
- if (rc) {
- DPRINTF(("read blocks for simulated rpmb failed.\n"));
- return rc;
- }
- }
-
- rc = rpmb_check_response("write blocks", RPMB_RESP_DATA_WRITE,
- &frame_read, 1, key, NULL, &addr);
- return rc;
-}
-#endif
-
static int
rpmb_read_block(__u8 mode, __u8 *key, __u16 addr, void *buf, __u32 count)
{
--
2.7.4


Eddie Dong
 

Can Yadong or Zhu Bing comment on this?
I am fine with the series in general...

-----Original Message-----
From: acrn-dev@lists.projectacrn.org
[mailto:acrn-dev@lists.projectacrn.org] On Behalf Of Kaige Fu
Sent: Tuesday, May 29, 2018 4:11 PM
To: acrn-dev@lists.projectacrn.org
Subject: [acrn-dev] [PATCH v1 1/2] DM: Remove dead code wrapped by #if 0

Signed-off-by: Kaige Fu <kaige.fu@intel.com>
---
devicemodel/hw/pci/virtio/virtio_rpmb.c | 94 ---------------------------------
1 file changed, 94 deletions(-)

diff --git a/devicemodel/hw/pci/virtio/virtio_rpmb.c
b/devicemodel/hw/pci/virtio/virtio_rpmb.c
index 65ca48a..c92f19d 100644
--- a/devicemodel/hw/pci/virtio/virtio_rpmb.c
+++ b/devicemodel/hw/pci/virtio/virtio_rpmb.c
@@ -390,100 +390,6 @@ rpmb_get_counter(__u8 mode, __u8 *key, __u32
*counter, __u16 *result)
return rc;
}

-/* TODO: this function will be used for AttKB */ -#if 0 -static int
-rpmb_write_block(__u8 mode, __u8 *key, __u16 addr, void *buf, __u32
count) -{
- int rc;
- int fd;
- __u32 i;
- __u32 write_counter;
- __u16 result;
- struct {
- struct rpmb_ioc_seq_cmd h;
- struct rpmb_ioc_cmd cmd[3];
- } iseq = {};
- struct rpmb_frame frame_write;
- struct rpmb_frame frame_rel[count];
- struct rpmb_frame frame_read;
-
- if (!buf || count == 0) {
- DPRINTF(("%s:buf or count is invalid!\n", __func__));
- return -1;
- }
-
- rc = rpmb_get_counter(mode, key, &write_counter, &result);
- if (rc) {
- DPRINTF(("%s: virtio_rpmb_get_counter failed\n", __func__));
- return -1;
- }
-
- /*fill write frame*/
- frame_write.addr = swap16(addr);
- frame_write.req_resp = swap16(RPMB_REQ_RESULT_READ);
- frame_write.write_counter = swap32(write_counter);
-
- /*fill rel write frame*/
- for (i = 0; i < count; i++) {
- memset(&frame_rel[i], 0, sizeof(frame_rel[i]));
- memcpy(frame_rel[i].data, buf + i * sizeof(frame_rel[i].data),
sizeof(frame_rel[i].data));
- frame_rel[i].write_counter = swap32(write_counter);
- frame_rel[i].addr = swap16(addr);
- frame_rel[i].block_count = swap16(count);
- frame_rel[i].req_resp = swap16(RPMB_REQ_DATA_WRITE);
- }
-
- /*generate rel frame mac*/
- if (rpmb_mac(key, frame_rel, count, frame_rel[count - 1].key_mac)) {
- DPRINTF(("%s: rel frame rpmb mac failed\n", __func__));
- return -1;
- }
-
- /*fill io cmd*/
- iseq.cmd[0].flags = RPMB_F_WRITE | RPMB_F_REL_WRITE;
- iseq.cmd[0].nframes = count;
- iseq.cmd[0].frames_ptr = (__aligned_u64)(intptr_t)(frame_rel);
- iseq.cmd[1].flags = RPMB_F_WRITE;
- iseq.cmd[1].nframes = 1;
- iseq.cmd[1].frames_ptr = (__aligned_u64)(intptr_t)(&frame_write);
- iseq.cmd[2].flags = 0;
- iseq.cmd[2].nframes = 1;
- iseq.cmd[2].frames_ptr = (__aligned_u64)(intptr_t)(&frame_read);
- iseq.h.num_of_cmds = 3;
-
- if (mode == RPMB_PHY_MODE) {
- /* open rpmb device.*/
- fd = open(RPMB_PHY_PATH_NAME, O_RDWR | O_NONBLOCK);
- if (fd < 0) {
- DPRINTF(("failed to open %s for read blocks.\n",
RPMB_PHY_PATH_NAME));
- return fd;
- }
-
- /* send ioctl cmd.*/
- rc = ioctl(fd, RPMB_IOC_SEQ_CMD, &iseq);
-
- /* close rpmb device.*/
- close(fd);
-
- if (rc) {
- DPRINTF(("read blocks for physical rpmb failed.\n"));
- return rc;
- }
- } else {
- rc = rpmb_sim_send(&iseq);
- if (rc) {
- DPRINTF(("read blocks for simulated rpmb failed.\n"));
- return rc;
- }
- }
-
- rc = rpmb_check_response("write blocks", RPMB_RESP_DATA_WRITE,
- &frame_read, 1, key, NULL, &addr);
- return rc;
-}
-#endif
-
static int
rpmb_read_block(__u8 mode, __u8 *key, __u16 addr, void *buf, __u32
count) {
--
2.7.4