Skip to content

Commit

Permalink
staging: hv: Convert camel cased struct fields in ring_buffer.h to lo…
Browse files Browse the repository at this point in the history 
…wer cases

staging: hv: Convert camel cased struct fields in ring_buffer.h to lower cases

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Haiyang Zhang authored and Greg Kroah-Hartman committed Nov 10, 2010
1 parent 203df82 commit 82f8bd4
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 58 deletions.
10 changes: 5 additions & 5 deletions drivers/staging/hv/channel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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 */
Expand Down
58 changes: 31 additions & 27 deletions drivers/staging/hv/ring_buffer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ GetRingBufferAvailBytes(struct hv_ring_buffer_info *rbi, u32 *read, u32 *write)
u32 read_loc, write_loc;

/* Capture the read/write indices before they changed */
read_loc = rbi->RingBuffer->ReadIndex;
write_loc = rbi->RingBuffer->WriteIndex;
read_loc = rbi->ring_buffer->read_index;
write_loc = rbi->ring_buffer->write_index;

*write = BYTES_AVAIL_TO_WRITE(read_loc, write_loc, rbi->RingDataSize);
*read = rbi->RingDataSize - *write;
*write = BYTES_AVAIL_TO_WRITE(read_loc, write_loc, rbi->ring_datasize);
*read = rbi->ring_datasize - *write;
}

/*++
Expand All @@ -70,7 +70,7 @@ GetRingBufferAvailBytes(struct hv_ring_buffer_info *rbi, u32 *read, u32 *write)
static inline u32
GetNextWriteLocation(struct hv_ring_buffer_info *RingInfo)
{
u32 next = RingInfo->RingBuffer->WriteIndex;
u32 next = RingInfo->ring_buffer->write_index;

/* ASSERT(next < RingInfo->RingDataSize); */

Expand All @@ -90,7 +90,7 @@ static inline void
SetNextWriteLocation(struct hv_ring_buffer_info *RingInfo,
u32 NextWriteLocation)
{
RingInfo->RingBuffer->WriteIndex = NextWriteLocation;
RingInfo->ring_buffer->write_index = NextWriteLocation;
}

/*++
Expand All @@ -105,7 +105,7 @@ SetNextWriteLocation(struct hv_ring_buffer_info *RingInfo,
static inline u32
GetNextReadLocation(struct hv_ring_buffer_info *RingInfo)
{
u32 next = RingInfo->RingBuffer->ReadIndex;
u32 next = RingInfo->ring_buffer->read_index;

/* ASSERT(next < RingInfo->RingDataSize); */

Expand All @@ -125,11 +125,11 @@ GetNextReadLocation(struct hv_ring_buffer_info *RingInfo)
static inline u32
GetNextReadLocationWithOffset(struct hv_ring_buffer_info *RingInfo, u32 Offset)
{
u32 next = RingInfo->RingBuffer->ReadIndex;
u32 next = RingInfo->ring_buffer->read_index;

/* ASSERT(next < RingInfo->RingDataSize); */
next += Offset;
next %= RingInfo->RingDataSize;
next %= RingInfo->ring_datasize;

return next;
}
Expand All @@ -146,7 +146,7 @@ GetNextReadLocationWithOffset(struct hv_ring_buffer_info *RingInfo, u32 Offset)
static inline void
SetNextReadLocation(struct hv_ring_buffer_info *RingInfo, u32 NextReadLocation)
{
RingInfo->RingBuffer->ReadIndex = NextReadLocation;
RingInfo->ring_buffer->read_index = NextReadLocation;
}


Expand All @@ -162,7 +162,7 @@ SetNextReadLocation(struct hv_ring_buffer_info *RingInfo, u32 NextReadLocation)
static inline void *
GetRingBuffer(struct hv_ring_buffer_info *RingInfo)
{
return (void *)RingInfo->RingBuffer->Buffer;
return (void *)RingInfo->ring_buffer->buffer;
}


Expand All @@ -178,7 +178,7 @@ GetRingBuffer(struct hv_ring_buffer_info *RingInfo)
static inline u32
GetRingBufferSize(struct hv_ring_buffer_info *RingInfo)
{
return RingInfo->RingDataSize;
return RingInfo->ring_datasize;
}

/*++
Expand All @@ -193,7 +193,7 @@ GetRingBufferSize(struct hv_ring_buffer_info *RingInfo)
static inline u64
GetRingBufferIndices(struct hv_ring_buffer_info *RingInfo)
{
return (u64)RingInfo->RingBuffer->WriteIndex << 32;
return (u64)RingInfo->ring_buffer->write_index << 32;
}


Expand Down Expand Up @@ -221,11 +221,11 @@ void DumpRingInfo(struct hv_ring_buffer_info *RingInfo, char *Prefix)
"avail read %u read idx %u write idx %u>>",
Prefix,
RingInfo,
RingInfo->RingBuffer->Buffer,
RingInfo->ring_buffer->buffer,
bytesAvailToWrite,
bytesAvailToRead,
RingInfo->RingBuffer->ReadIndex,
RingInfo->RingBuffer->WriteIndex);
RingInfo->ring_buffer->read_index,
RingInfo->ring_buffer->write_index);
}


Expand Down Expand Up @@ -262,16 +262,19 @@ void RingBufferGetDebugInfo(struct hv_ring_buffer_info *RingInfo,
u32 bytesAvailToWrite;
u32 bytesAvailToRead;

if (RingInfo->RingBuffer) {
if (RingInfo->ring_buffer) {
GetRingBufferAvailBytes(RingInfo,
&bytesAvailToRead,
&bytesAvailToWrite);

debug_info->BytesAvailToRead = bytesAvailToRead;
debug_info->BytesAvailToWrite = bytesAvailToWrite;
debug_info->CurrentReadIndex = RingInfo->RingBuffer->ReadIndex;
debug_info->CurrentWriteIndex = RingInfo->RingBuffer->WriteIndex;
debug_info->CurrentInterruptMask = RingInfo->RingBuffer->InterruptMask;
debug_info->bytes_avail_toread = bytesAvailToRead;
debug_info->bytes_avail_towrite = bytesAvailToWrite;
debug_info->current_read_index =
RingInfo->ring_buffer->read_index;
debug_info->current_write_index =
RingInfo->ring_buffer->write_index;
debug_info->current_interrupt_mask =
RingInfo->ring_buffer->interrupt_mask;
}
}

Expand All @@ -287,7 +290,7 @@ void RingBufferGetDebugInfo(struct hv_ring_buffer_info *RingInfo,
--*/
u32 GetRingBufferInterruptMask(struct hv_ring_buffer_info *rbi)
{
return rbi->RingBuffer->InterruptMask;
return rbi->ring_buffer->interrupt_mask;
}

/*++
Expand All @@ -306,11 +309,12 @@ int RingBufferInit(struct hv_ring_buffer_info *RingInfo, void *Buffer, u32 Buffe

memset(RingInfo, 0, sizeof(struct hv_ring_buffer_info));

RingInfo->RingBuffer = (struct hv_ring_buffer *)Buffer;
RingInfo->RingBuffer->ReadIndex = RingInfo->RingBuffer->WriteIndex = 0;
RingInfo->ring_buffer = (struct hv_ring_buffer *)Buffer;
RingInfo->ring_buffer->read_index =
RingInfo->ring_buffer->write_index = 0;

RingInfo->RingSize = BufferLen;
RingInfo->RingDataSize = BufferLen - sizeof(struct hv_ring_buffer);
RingInfo->ring_size = BufferLen;
RingInfo->ring_datasize = BufferLen - sizeof(struct hv_ring_buffer);

spin_lock_init(&RingInfo->ring_lock);

Expand Down
30 changes: 15 additions & 15 deletions drivers/staging/hv/ring_buffer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@

struct hv_ring_buffer {
/* Offset in bytes from the start of ring data below */
volatile u32 WriteIndex;
volatile u32 write_index;

/* Offset in bytes from the start of ring data below */
volatile u32 ReadIndex;
volatile u32 read_index;

volatile u32 InterruptMask;
volatile u32 interrupt_mask;

/* Pad it to PAGE_SIZE so that data starts on page boundary */
u8 Reserved[4084];
u8 reserved[4084];

/* NOTE:
* The InterruptMask field is used only for channels but since our
* The interrupt_mask field is used only for channels but since our
* vmbus connection also uses this data structure and its data starts
* here, we commented out this field.
*/
Expand All @@ -50,24 +50,24 @@ struct hv_ring_buffer {
* Ring data starts here + RingDataStartOffset
* !!! DO NOT place any fields below this !!!
*/
u8 Buffer[0];
u8 buffer[0];
} __attribute__((packed));

struct hv_ring_buffer_info {
struct hv_ring_buffer *RingBuffer;
u32 RingSize; /* Include the shared header */
struct hv_ring_buffer *ring_buffer;
u32 ring_size; /* Include the shared header */
spinlock_t ring_lock;

u32 RingDataSize; /* < ringSize */
u32 RingDataStartOffset;
u32 ring_datasize; /* < ring_size */
u32 ring_data_startoffset;
};

struct hv_ring_buffer_debug_info {
u32 CurrentInterruptMask;
u32 CurrentReadIndex;
u32 CurrentWriteIndex;
u32 BytesAvailToRead;
u32 BytesAvailToWrite;
u32 current_interrupt_mask;
u32 current_read_index;
u32 current_write_index;
u32 bytes_avail_toread;
u32 bytes_avail_towrite;
};


Expand Down
25 changes: 14 additions & 11 deletions drivers/staging/hv/vmbus_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,18 +156,21 @@ static void get_channel_info(struct hv_device *device,
info->ClientMonitorLatency = debug_info.clientmonitor_latency;
info->ClientMonitorConnectionId = debug_info.clientmonitor_connectionid;

info->Inbound.InterruptMask = debug_info.inbound.CurrentInterruptMask;
info->Inbound.ReadIndex = debug_info.inbound.CurrentReadIndex;
info->Inbound.WriteIndex = debug_info.inbound.CurrentWriteIndex;
info->Inbound.BytesAvailToRead = debug_info.inbound.BytesAvailToRead;
info->Inbound.BytesAvailToWrite = debug_info.inbound.BytesAvailToWrite;

info->Outbound.InterruptMask = debug_info.outbound.CurrentInterruptMask;
info->Outbound.ReadIndex = debug_info.outbound.CurrentReadIndex;
info->Outbound.WriteIndex = debug_info.outbound.CurrentWriteIndex;
info->Outbound.BytesAvailToRead = debug_info.outbound.BytesAvailToRead;
info->Inbound.InterruptMask = debug_info.inbound.current_interrupt_mask;
info->Inbound.ReadIndex = debug_info.inbound.current_read_index;
info->Inbound.WriteIndex = debug_info.inbound.current_write_index;
info->Inbound.BytesAvailToRead = debug_info.inbound.bytes_avail_toread;
info->Inbound.BytesAvailToWrite =
debug_info.inbound.bytes_avail_towrite;

info->Outbound.InterruptMask =
debug_info.outbound.current_interrupt_mask;
info->Outbound.ReadIndex = debug_info.outbound.current_read_index;
info->Outbound.WriteIndex = debug_info.outbound.current_write_index;
info->Outbound.BytesAvailToRead =
debug_info.outbound.bytes_avail_toread;
info->Outbound.BytesAvailToWrite =
debug_info.outbound.BytesAvailToWrite;
debug_info.outbound.bytes_avail_towrite;
}

/*
Expand Down

0 comments on commit 82f8bd4

Please sign in to comment.