Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / hv / channel.c

diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c
index 9fa0fe1525dc6e2a4a3e54e1bc9df72a0e13788a..45a627d77b41786cc520974fd0cc7258657a2d85 100644 (file)
--- a/drivers/staging/hv/channel.c
+++ b/drivers/staging/hv/channel.c
@@ -43,24 +43,24 @@ static void DumpMonitorPage(struct hv_monitor_page *MonitorPage)
        int j = 0;
 
        DPRINT_DBG(VMBUS, "monitorPage - %p, trigger state - %d",
-                  MonitorPage, MonitorPage->TriggerState);
+                  MonitorPage, MonitorPage->trigger_state);
 
        for (i = 0; i < 4; i++)
                DPRINT_DBG(VMBUS, "trigger group (%d) - %llx", i,
-                          MonitorPage->TriggerGroup[i].AsUINT64);
+                          MonitorPage->trigger_group[i].as_uint64);
 
        for (i = 0; i < 4; i++) {
                for (j = 0; j < 32; j++) {
                        DPRINT_DBG(VMBUS, "latency (%d)(%d) - %llx", i, j,
-                                  MonitorPage->Latency[i][j]);
+                                  MonitorPage->latency[i][j]);
                }
        }
        for (i = 0; i < 4; i++) {
                for (j = 0; j < 32; j++) {
                        DPRINT_DBG(VMBUS, "param-conn id (%d)(%d) - %d", i, j,
-                              MonitorPage->Parameter[i][j].ConnectionId.Asu32);
+                              MonitorPage->parameter[i][j].connectionid.asu32);
                        DPRINT_DBG(VMBUS, "param-flag (%d)(%d) - %d", i, j,
-                               MonitorPage->Parameter[i][j].FlagNumber);
+                               MonitorPage->parameter[i][j].flag_number);
                }
        }
 }
@@ -84,8 +84,8 @@ static void vmbus_setevent(struct vmbus_channel *channel)
                monitorpage++; /* Get the child to parent monitor page */
 
                set_bit(channel->monitor_bit,
-                       (unsigned long *)&monitorpage->TriggerGroup
-                                       [channel->monitor_grp].Pending);
+                       (unsigned long *)&monitorpage->trigger_group
+                                       [channel->monitor_grp].pending);
 
        } else {
                VmbusSetEvent(channel->offermsg.child_relid);
@@ -108,7 +108,7 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel)
                monitorPage++; /* Get the child to parent monitor page */
 
                clear_bit(Channel->monitor_bit,
-                         (unsigned long *)&monitorPage->TriggerGroup
+                         (unsigned long *)&monitorPage->trigger_group
                                        [Channel->monitor_grp].Pending);
        }
 }
@@ -138,25 +138,25 @@ void vmbus_get_debug_info(struct vmbus_channel *channel,
        debuginfo->monitorid = channel->offermsg.monitorid;
 
        debuginfo->servermonitor_pending =
-                       monitorpage->TriggerGroup[monitor_group].Pending;
+                       monitorpage->trigger_group[monitor_group].pending;
        debuginfo->servermonitor_latency =
-                       monitorpage->Latency[monitor_group][monitor_offset];
+                       monitorpage->latency[monitor_group][monitor_offset];
        debuginfo->servermonitor_connectionid =
-                       monitorpage->Parameter[monitor_group]
-                                       [monitor_offset].ConnectionId.u.Id;
+                       monitorpage->parameter[monitor_group]
+                                       [monitor_offset].connectionid.u.id;
 
        monitorpage++;
 
        debuginfo->clientmonitor_pending =
-                       monitorpage->TriggerGroup[monitor_group].Pending;
+                       monitorpage->trigger_group[monitor_group].pending;
        debuginfo->clientmonitor_latency =
-                       monitorpage->Latency[monitor_group][monitor_offset];
+                       monitorpage->latency[monitor_group][monitor_offset];
        debuginfo->clientmonitor_connectionid =
-                       monitorpage->Parameter[monitor_group]
-                                       [monitor_offset].ConnectionId.u.Id;
+                       monitorpage->parameter[monitor_group]
+                                       [monitor_offset].connectionid.u.id;
 
-       RingBufferGetDebugInfo(&channel->inbound, &debuginfo->inbound);
-       RingBufferGetDebugInfo(&channel->outbound, &debuginfo->outbound);
+       ringbuffer_get_debuginfo(&channel->inbound, &debuginfo->inbound);
+       ringbuffer_get_debuginfo(&channel->outbound, &debuginfo->outbound);
 }
 
 /*
@@ -180,7 +180,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
        newchannel->channel_callback_context = context;
 
        /* Allocate the ring buffer */
-       out = osd_PageAlloc((send_ringbuffer_size + recv_ringbuffer_size)
+       out = osd_page_alloc((send_ringbuffer_size + recv_ringbuffer_size)
                             >> PAGE_SHIFT);
        if (!out)
                return -ENOMEM;
@@ -193,13 +193,13 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
        newchannel->ringbuffer_pagecount = (send_ringbuffer_size +
                                           recv_ringbuffer_size) >> PAGE_SHIFT;
 
-       ret = RingBufferInit(&newchannel->outbound, out, send_ringbuffer_size);
+       ret = ringbuffer_init(&newchannel->outbound, out, send_ringbuffer_size);
        if (ret != 0) {
                err = ret;
                goto errorout;
        }
 
-       ret = RingBufferInit(&newchannel->inbound, in, recv_ringbuffer_size);
+       ret = ringbuffer_init(&newchannel->inbound, in, recv_ringbuffer_size);
        if (ret != 0) {
                err = ret;
                goto errorout;
@@ -213,7 +213,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
        newchannel->ringbuffer_gpadlhandle = 0;
 
        ret = vmbus_establish_gpadl(newchannel,
-                                        newchannel->outbound.RingBuffer,
+                                        newchannel->outbound.ring_buffer,
                                         send_ringbuffer_size +
                                         recv_ringbuffer_size,
                                         &newchannel->ringbuffer_gpadlhandle);
@@ -227,10 +227,10 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
                   "size %d recv ring %p size %d, downstreamoffset %d>",
                   newchannel, newchannel->offermsg.child_relid,
                   newchannel->ringbuffer_gpadlhandle,
-                  newchannel->outbound.RingBuffer,
-                  newchannel->outbound.RingSize,
-                  newchannel->inbound.RingBuffer,
-                  newchannel->inbound.RingSize,
+                  newchannel->outbound.ring_buffer,
+                  newchannel->outbound.ring_size,
+                  newchannel->inbound.ring_buffer,
+                  newchannel->inbound.ring_size,
                   send_ringbuffer_size);
 
        /* Create and init the channel open message */
@@ -242,7 +242,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
                goto errorout;
        }
 
-       openInfo->waitevent = osd_WaitEventCreate();
+       openInfo->waitevent = osd_waitevent_create();
        if (!openInfo->waitevent) {
                err = -ENOMEM;
                goto errorout;
@@ -280,7 +280,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
        }
 
        /* FIXME: Need to time-out here */
-       osd_WaitEventWait(openInfo->waitevent);
+       osd_waitevent_wait(openInfo->waitevent);
 
        if (openInfo->response.open_result.status == 0)
                DPRINT_INFO(VMBUS, "channel <%p> open success!!", newchannel);
@@ -298,9 +298,9 @@ Cleanup:
        return 0;
 
 errorout:
-       RingBufferCleanup(&newchannel->outbound);
-       RingBufferCleanup(&newchannel->inbound);
-       osd_PageFree(out, (send_ringbuffer_size + recv_ringbuffer_size)
+       ringbuffer_cleanup(&newchannel->outbound);
+       ringbuffer_cleanup(&newchannel->inbound);
+       osd_page_free(out, (send_ringbuffer_size + recv_ringbuffer_size)
                     >> PAGE_SHIFT);
        kfree(openInfo);
        return err;
@@ -508,7 +508,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
        if (ret)
                return ret;
 
-       msginfo->waitevent = osd_WaitEventCreate();
+       msginfo->waitevent = osd_waitevent_create();
        if (!msginfo->waitevent) {
                ret = -ENOMEM;
                goto Cleanup;
@@ -565,7 +565,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
 
                }
        }
-       osd_WaitEventWait(msginfo->waitevent);
+       osd_waitevent_wait(msginfo->waitevent);
 
        /* At this point, we received the gpadl created msg */
        DPRINT_DBG(VMBUS, "Received GPADL created "
@@ -604,7 +604,7 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle)
        if (!info)
                return -ENOMEM;
 
-       info->waitevent = osd_WaitEventCreate();
+       info->waitevent = osd_waitevent_create();
        if (!info->waitevent) {
                kfree(info);
                return -ENOMEM;
@@ -628,7 +628,7 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle)
                /* something... */
        }
 
-       osd_WaitEventWait(info->waitevent);
+       osd_waitevent_wait(info->waitevent);
 
        /* Received a torndown response */
        spin_lock_irqsave(&gVmbusConnection.channelmsg_lock, flags);
@@ -663,7 +663,7 @@ void vmbus_close(struct vmbus_channel *channel)
        if (!info)
                return;
 
-       /* info->waitEvent = osd_WaitEventCreate(); */
+       /* info->waitEvent = osd_waitevent_create(); */
 
        msg = (struct vmbus_channel_close_channel *)info->msg;
        msg->header.msgtype = CHANNELMSG_CLOSECHANNEL;
@@ -683,10 +683,10 @@ void vmbus_close(struct vmbus_channel *channel)
        /* TODO: Send a msg to release the childRelId */
 
        /* Cleanup the ring buffers for this channel */
-       RingBufferCleanup(&channel->outbound);
-       RingBufferCleanup(&channel->inbound);
+       ringbuffer_cleanup(&channel->outbound);
+       ringbuffer_cleanup(&channel->inbound);
 
-       osd_PageFree(channel->ringbuffer_pages, channel->ringbuffer_pagecount);
+       osd_page_free(channel->ringbuffer_pages, channel->ringbuffer_pagecount);
 
        kfree(info);
 
@@ -752,10 +752,10 @@ int vmbus_sendpacket(struct vmbus_channel *channel, const void *buffer,
        sg_set_buf(&bufferlist[2], &aligned_data,
                   packetlen_aligned - packetlen);
 
-       ret = RingBufferWrite(&channel->outbound, bufferlist, 3);
+       ret = ringbuffer_write(&channel->outbound, bufferlist, 3);
 
        /* TODO: We should determine if this is optional */
-       if (ret == 0 && !GetRingBufferInterruptMask(&channel->outbound))
+       if (ret == 0 && !get_ringbuffer_interrupt_mask(&channel->outbound))
                vmbus_setevent(channel);
 
        return ret;
@@ -817,10 +817,10 @@ int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,
        sg_set_buf(&bufferlist[2], &aligned_data,
                packetlen_aligned - packetlen);
 
-       ret = RingBufferWrite(&channel->outbound, bufferlist, 3);
+       ret = ringbuffer_write(&channel->outbound, bufferlist, 3);
 
        /* TODO: We should determine if this is optional */
-       if (ret == 0 && !GetRingBufferInterruptMask(&channel->outbound))
+       if (ret == 0 && !get_ringbuffer_interrupt_mask(&channel->outbound))
                vmbus_setevent(channel);
 
        return ret;
@@ -886,10 +886,10 @@ int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel,
        sg_set_buf(&bufferlist[2], &aligned_data,
                packetlen_aligned - packetlen);
 
-       ret = RingBufferWrite(&channel->outbound, bufferlist, 3);
+       ret = ringbuffer_write(&channel->outbound, bufferlist, 3);
 
        /* TODO: We should determine if this is optional */
-       if (ret == 0 && !GetRingBufferInterruptMask(&channel->outbound))
+       if (ret == 0 && !get_ringbuffer_interrupt_mask(&channel->outbound))
                vmbus_setevent(channel);
 
        return ret;
@@ -923,7 +923,7 @@ int vmbus_recvpacket(struct vmbus_channel *channel, void *buffer,
 
        spin_lock_irqsave(&channel->inbound_lock, flags);
 
-       ret = RingBufferPeek(&channel->inbound, &desc,
+       ret = ringbuffer_peek(&channel->inbound, &desc,
                             sizeof(struct vmpacket_descriptor));
        if (ret != 0) {
                spin_unlock_irqrestore(&channel->inbound_lock, flags);
@@ -956,7 +956,7 @@ int vmbus_recvpacket(struct vmbus_channel *channel, void *buffer,
        *requestid = desc.TransactionId;
 
        /* Copy over the packet to the user buffer */
-       ret = RingBufferRead(&channel->inbound, buffer, userlen,
+       ret = ringbuffer_read(&channel->inbound, buffer, userlen,
                             (desc.DataOffset8 << 3));
 
        spin_unlock_irqrestore(&channel->inbound_lock, flags);
@@ -983,7 +983,7 @@ int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer,
 
        spin_lock_irqsave(&channel->inbound_lock, flags);
 
-       ret = RingBufferPeek(&channel->inbound, &desc,
+       ret = ringbuffer_peek(&channel->inbound, &desc,
                             sizeof(struct vmpacket_descriptor));
        if (ret != 0) {
                spin_unlock_irqrestore(&channel->inbound_lock, flags);
@@ -1015,7 +1015,7 @@ int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer,
        *requestid = desc.TransactionId;
 
        /* Copy over the entire packet to the user buffer */
-       ret = RingBufferRead(&channel->inbound, buffer, packetlen, 0);
+       ret = ringbuffer_read(&channel->inbound, buffer, packetlen, 0);
 
        spin_unlock_irqrestore(&channel->inbound_lock, flags);
        return 0;
@@ -1052,6 +1052,6 @@ void vmbus_ontimer(unsigned long data)
 static void dump_vmbus_channel(struct vmbus_channel *channel)
 {
        DPRINT_DBG(VMBUS, "Channel (%d)", channel->offermsg.child_relid);
-       DumpRingInfo(&channel->outbound, "Outbound ");
-       DumpRingInfo(&channel->inbound, "Inbound ");
+       dump_ring_info(&channel->outbound, "Outbound ");
+       dump_ring_info(&channel->inbound, "Inbound ");
 }