staging: hv: Convert camel cased struct fields in hv.h to lower cases
Subsystems (2)
PATCH 3/10 staging: hv: Convert camel cased struct fields in hv.h to lower cases
From: Haiyang Zhang <[email protected]>
Convert camel cased struct fields in hv.h to lower cases
--- drivers/staging/hv/hv.c | 95 +++++++++++++++++++++++--------------------- drivers/staging/hv/hv.h | 20 +++++----- drivers/staging/hv/vmbus.c | 6 +- 3 files changed, 63 insertions(+), 58 deletions(-)
drivers/staging/hv/hv.c +50 -45
@@ -28,11 +28,11 @@#include "vmbus_private.h" /* The one and only */ -struct hv_context gHvContext = { - .SynICInitialized = false, - .HypercallPage =NULL , - .SignalEventParam =NULL , - .SignalEventBuffer =NULL , +struct hv_context g_hv_context = { + .synic_initialized = false, + .hypercall_page =NULL , + .signal_event_param =NULL , + .signal_event_buffer =NULL , };/*
@@ -134,7 +134,7 @@ static u64 HvDoHypercall(u64 Control, void *Input, void *Output)u64 hvStatus =0 ;u64 inputAddress = (Input) ?virt_to_phys (Input) :0 ;u64 outputAddress = (Output) ?virt_to_phys (Output) :0 ; -volatile void *hypercallPage = gHvContext.HypercallPage; +volatile void *hypercallPage = g_hv_context.hypercall_page; DPRINT_DBG(VMBUS, "Hypercall <control %llx input phys %llx virt %p " "output phys %llx virt %p hypercall %p>",
@@ -162,7 +162,7 @@ static u64 HvDoHypercall(u64 Control, void *Input, void *Output)u64 outputAddress = (Output) ?virt_to_phys (Output) :0 ;u32 outputAddressHi = outputAddress >>32 ;u32 outputAddressLo = outputAddress &0xFFFFFFFF ; -volatile void *hypercallPage = gHvContext.HypercallPage; +volatile void *hypercallPage = g_hv_context.hypercall_page;DPRINT_DBG (VMBUS ,"Hypercall <control %llx input %p output %p>" , Control, Input, Output);
@@ -192,8 +192,9 @@ int HvInit(void)union hv_x64_msr_hypercall_contents hypercallMsr;void *virtAddr =NULL ; -memset (gHvContext.synICEventPage,0 ,sizeof (void *) *MAX_NUM_CPUS ); -memset (gHvContext.synICMessagePage,0 ,sizeof (void *) *MAX_NUM_CPUS ); +memset (g_hv_context.synic_event_page,0 ,sizeof (void *) *MAX_NUM_CPUS ); +memset (g_hv_context.synic_message_page,0 , +sizeof (void *) *MAX_NUM_CPUS );if (!HvQueryHypervisorPresence ()) {DPRINT_ERR (VMBUS ,"No Windows hypervisor detected!!" );
@@ -209,17 +210,17 @@ int HvInit(void)/* * We only support running on top of Hyper-V */ -rdmsrl (HV_X64_MSR_GUEST_OS_ID , gHvContext.GuestId); +rdmsrl (HV_X64_MSR_GUEST_OS_ID , g_hv_context.guestid); -if (gHvContext.GuestId !=0 ) { +if (g_hv_context.guestid !=0 ) {DPRINT_ERR (VMBUS ,"Unknown guest id (0x%llx)!!" , - gHvContext.GuestId); + g_hv_context.guestid); goto Cleanup; }/* Write our OS info */ wrmsrl (HV_X64_MSR_GUEST_OS_ID ,HV_LINUX_GUEST_ID ); - gHvContext.GuestId =HV_LINUX_GUEST_ID ; + g_hv_context.guestid =HV_LINUX_GUEST_ID ;/* See if the hypercall page is already set */ rdmsrl (HV_X64_MSR_HYPERCALL , hypercallMsr.as_uint64);
@@ -250,28 +251,29 @@ int HvInit(void) goto Cleanup; } - gHvContext.HypercallPage = virtAddr; + g_hv_context.hypercall_page = virtAddr;DPRINT_INFO (VMBUS ,"Hypercall page VA=%p, PA=0x%0llx" , - gHvContext.HypercallPage, + g_hv_context.hypercall_page, (u64 )hypercallMsr.guest_physical_address <<PAGE_SHIFT );/* Setup the global signal event param for the signal event hypercall */ - gHvContext.SignalEventBuffer = + g_hv_context.signal_event_buffer =kmalloc (sizeof (struct hv_input_signal_event_buffer ),GFP_KERNEL ); -if (!gHvContext.SignalEventBuffer) +if (!g_hv_context.signal_event_buffer) goto Cleanup; - gHvContext.SignalEventParam = + g_hv_context.signal_event_param = (struct hv_input_signal_event *) - (ALIGN_UP ((unsigned long )gHvContext.SignalEventBuffer, + (ALIGN_UP ((unsigned long ) + g_hv_context.signal_event_buffer,HV_HYPERCALL_PARAM_ALIGN )); - gHvContext.SignalEventParam->connectionid.asu32 =0 ; - gHvContext.SignalEventParam->connectionid.u.id = + g_hv_context.signal_event_param->connectionid.asu32 =0 ; + g_hv_context.signal_event_param->connectionid.u.id =VMBUS_EVENT_CONNECTION_ID ; - gHvContext.SignalEventParam->flag_number =0 ; - gHvContext.SignalEventParam->rsvdz =0 ; + g_hv_context.signal_event_param->flag_number =0 ; + g_hv_context.signal_event_param->rsvdz =0 ;return ret;
@@ -297,15 +299,15 @@ void HvCleanup(void) {union hv_x64_msr_hypercall_contents hypercallMsr; -kfree (gHvContext.SignalEventBuffer); - gHvContext.SignalEventBuffer =NULL ; - gHvContext.SignalEventParam =NULL ; +kfree (g_hv_context.signal_event_buffer); + g_hv_context.signal_event_buffer =NULL ; + g_hv_context.signal_event_param =NULL ; -if (gHvContext.HypercallPage) { +if (g_hv_context.hypercall_page) { hypercallMsr.as_uint64 =0 ;wrmsrl (HV_X64_MSR_HYPERCALL , hypercallMsr.as_uint64); -vfree (gHvContext.HypercallPage); - gHvContext.HypercallPage =NULL ; +vfree (g_hv_context.hypercall_page); + g_hv_context.hypercall_page =NULL ; } }
@@ -359,7 +361,8 @@ u16 HvSignalEvent(void) {u16 status; - status =HvDoHypercall (HVCALL_SIGNAL_EVENT , gHvContext.SignalEventParam, + status =HvDoHypercall (HVCALL_SIGNAL_EVENT , + g_hv_context.signal_event_param,NULL ) &0xFFFF ;return status; }
@@ -382,7 +385,7 @@ void HvSynicInit(void *irqarg)u32 irqVector = *((u32 *)(irqarg));int cpu =smp_processor_id (); -if (!gHvContext.HypercallPage) +if (!g_hv_context.hypercall_page)return ;/* Check the version */
@@ -390,17 +393,19 @@ void HvSynicInit(void *irqarg)DPRINT_INFO (VMBUS ,"SynIC version: %llx" , version); - gHvContext.synICMessagePage[cpu] = (void *)get_zeroed_page (GFP_ATOMIC ); + g_hv_context.synic_message_page[cpu] = + (void *)get_zeroed_page (GFP_ATOMIC ); -if (gHvContext.synICMessagePage[cpu] ==NULL ) { +if (g_hv_context.synic_message_page[cpu] ==NULL ) {DPRINT_ERR (VMBUS ,"unable to allocate SYNIC message page!!" ); goto Cleanup; } - gHvContext.synICEventPage[cpu] = (void *)get_zeroed_page (GFP_ATOMIC ); + g_hv_context.synic_event_page[cpu] = + (void *)get_zeroed_page (GFP_ATOMIC ); -if (gHvContext.synICEventPage[cpu] ==NULL ) { +if (g_hv_context.synic_event_page[cpu] ==NULL ) {DPRINT_ERR (VMBUS ,"unable to allocate SYNIC event page!!" ); goto Cleanup;
@@ -409,7 +414,7 @@ void HvSynicInit(void *irqarg)/* Setup the Synic's message page */ rdmsrl (HV_X64_MSR_SIMP , simp.as_uint64); simp.simp_enabled =1 ; - simp.base_simp_gpa =virt_to_phys (gHvContext.synICMessagePage[cpu]) + simp.base_simp_gpa =virt_to_phys (g_hv_context.synic_message_page[cpu]) >>PAGE_SHIFT ;DPRINT_DBG (VMBUS ,"HV_X64_MSR_SIMP msr set to: %llx" , simp.as_uint64);
@@ -419,7 +424,7 @@ void HvSynicInit(void *irqarg)/* Setup the Synic's event page */ rdmsrl (HV_X64_MSR_SIEFP , siefp.as_uint64); siefp.siefp_enabled =1 ; - siefp.base_siefp_gpa =virt_to_phys (gHvContext.synICEventPage[cpu]) + siefp.base_siefp_gpa =virt_to_phys (g_hv_context.synic_event_page[cpu]) >>PAGE_SHIFT ;DPRINT_DBG (VMBUS ,"HV_X64_MSR_SIEFP msr set to: %llx" , siefp.as_uint64);
@@ -449,15 +454,15 @@ void HvSynicInit(void *irqarg)wrmsrl (HV_X64_MSR_SCONTROL , sctrl.as_uint64); - gHvContext.SynICInitialized = true; + g_hv_context.synic_initialized = true;return ; Cleanup: -if (gHvContext.synICEventPage[cpu]) -osd_PageFree (gHvContext.synICEventPage[cpu],1 ); +if (g_hv_context.synic_event_page[cpu]) +osd_PageFree (g_hv_context.synic_event_page[cpu],1 ); -if (gHvContext.synICMessagePage[cpu]) -osd_PageFree (gHvContext.synICMessagePage[cpu],1 ); +if (g_hv_context.synic_message_page[cpu]) +osd_PageFree (g_hv_context.synic_message_page[cpu],1 );return ; }
@@ -471,7 +476,7 @@ void HvSynicCleanup(void *arg)union hv_synic_siefp siefp;int cpu =smp_processor_id (); -if (!gHvContext.SynICInitialized) +if (!g_hv_context.synic_initialized)return ;rdmsrl (HV_X64_MSR_SINT0 +VMBUS_MESSAGE_SINT , sharedSint.as_uint64);
@@ -494,6 +499,6 @@ void HvSynicCleanup(void *arg)wrmsrl (HV_X64_MSR_SIEFP , siefp.as_uint64); -osd_PageFree (gHvContext.synICMessagePage[cpu],1 ); -osd_PageFree (gHvContext.synICEventPage[cpu],1 ); +osd_PageFree (g_hv_context.synic_message_page[cpu],1 ); +osd_PageFree (g_hv_context.synic_event_page[cpu],1 ); }
drivers/staging/hv/hv.h +10 -10
@@ -92,33 +92,33 @@ static const struct hv_guid VMBUS_SERVICE_ID = {struct hv_input_signal_event_buffer { -u64 Align8; -struct hv_input_signal_event Event; +u64 align8; +struct hv_input_signal_event event; };struct hv_context {/* We only support running on top of Hyper-V * So at this point this really can only contain the Hyper-V ID */ -u64 GuestId; +u64 guestid; -void *HypercallPage; +void *hypercall_page; -bool SynICInitialized; +bool synic_initialized;/* * This is used as an input param to HvCallSignalEvent hypercall. The * input param is immutable in our usage and must be dynamic mem (vs * stack or global). */ -struct hv_input_signal_event_buffer *SignalEventBuffer; +struct hv_input_signal_event_buffer *signal_event_buffer;/* 8-bytes aligned of the buffer above */ -struct hv_input_signal_event *SignalEventParam; +struct hv_input_signal_event *signal_event_param; -void *synICMessagePage[MAX_NUM_CPUS ]; -void *synICEventPage[MAX_NUM_CPUS ]; +void *synic_message_page[MAX_NUM_CPUS ]; +void *synic_event_page[MAX_NUM_CPUS ]; }; -extern struct hv_context gHvContext; +extern struct hv_context g_hv_context;/* Hv Interface */
drivers/staging/hv/vmbus.c +3 -3
@@ -147,7 +147,7 @@ static void VmbusOnCleanup(struct hv_driver *drv)static void VmbusOnMsgDPC (struct hv_driver *drv) {int cpu =smp_processor_id (); -void *page_addr = gHvContext.synICMessagePage[cpu]; +void *page_addr = g_hv_context.synic_message_page[cpu];struct hv_message *msg = (struct hv_message *)page_addr +VMBUS_MESSAGE_SINT ;struct hv_message *copied;
@@ -208,7 +208,7 @@ static int VmbusOnISR(struct hv_driver *drv)struct hv_message *msg;union hv_synic_event_flags *event; - page_addr = gHvContext.synICMessagePage[cpu]; + page_addr = g_hv_context.synic_message_page[cpu]; msg = (struct hv_message *)page_addr +VMBUS_MESSAGE_SINT ;/* Check if there are actual msgs to be process */
@@ -220,7 +220,7 @@ static int VmbusOnISR(struct hv_driver *drv) }/* TODO: Check if there are events to be process */ - page_addr = gHvContext.synICEventPage[cpu]; + page_addr = g_hv_context.synic_event_page[cpu]; event = (union hv_synic_event_flags *)page_addr +VMBUS_MESSAGE_SINT ;/* Since we are a child, we only need to check bit 0 */
Signature · 1 line
1.6.3.2
PATCH 4/10 staging: hv: Convert camel cased local variables in hv.c to lower cases
From: Haiyang Zhang <[email protected]>
Convert camel cased local variables in hv.c to lower cases
--- drivers/staging/hv/hv.c | 170 +++++++++++++++++++++++----------------------- 1 files changed, 85 insertions(+), 85 deletions(-)
drivers/staging/hv/hv.c +85 -85
@@ -65,7 +65,7 @@ static int HvQueryHypervisorInfo(void)unsigned int ebx;unsigned int ecx;unsigned int edx; -unsigned int maxLeaf; +unsigned int max_leaf;unsigned int op;/*
@@ -93,7 +93,7 @@ static int HvQueryHypervisorInfo(void) ((edx >>16 ) &0xFF ), ((edx >> 24) & 0xFF)); - maxLeaf = eax; + max_leaf = eax; eax =0 ; ebx =0 ; ecx =0 ;
@@ -107,7 +107,7 @@ static int HvQueryHypervisorInfo(void) ((eax >>16 ) &0xFF ), ((eax >> 24) & 0xFF)); -if (maxLeaf >=HVCPUID_VERSION ) { +if (max_leaf >=HVCPUID_VERSION ) { eax =0 ; ebx =0 ; ecx =0 ;
@@ -122,61 +122,61 @@ static int HvQueryHypervisorInfo(void) edx >>24 , edx & 0xFFFFFF); } -return maxLeaf; +return max_leaf; }/* * HvDoHypercall - Invoke the specified hypercall */ -static u64 HvDoHypercall (u64 Control,void *Input,void *Output) +static u64 HvDoHypercall (u64 control,void *input,void *output) {#ifdef CONFIG_X86_64 -u64 hvStatus =0 ; -u64 inputAddress = (Input) ?virt_to_phys (Input) :0 ; -u64 outputAddress = (Output) ?virt_to_phys (Output) :0 ; -volatile void *hypercallPage = g_hv_context.hypercall_page; +u64 hv_status =0 ; +u64 input_address = (input) ?virt_to_phys (input) :0 ; +u64 output_address = (output) ?virt_to_phys (output) :0 ; +volatile void *hypercall_page = g_hv_context.hypercall_page;DPRINT_DBG (VMBUS ,"Hypercall <control %llx input phys %llx virt %p " "output phys %llx virt %p hypercall %p>" , - Control, inputAddress, Input, - outputAddress, Output, hypercallPage); + control, input_address, input, + output_address, output, hypercall_page); - __asm__ __volatile__("mov %0, %%r8" : :"r" (outputAddress) :"r8" ); - __asm__ __volatile__("call *%3" :"=a" (hvStatus) : -"c" (Control),"d" (inputAddress), -"m" (hypercallPage)); + __asm__ __volatile__("mov %0, %%r8" : :"r" (output_address) :"r8" ); + __asm__ __volatile__("call *%3" :"=a" (hv_status) : +"c" (control),"d" (input_address), +"m" (hypercall_page)); -DPRINT_DBG (VMBUS ,"Hypercall <return %llx>" , hvStatus); +DPRINT_DBG (VMBUS ,"Hypercall <return %llx>" , hv_status); -return hvStatus; +return hv_status;#else -u32 controlHi = Control >>32 ; -u32 controlLo = Control &0xFFFFFFFF ; -u32 hvStatusHi =1 ; -u32 hvStatusLo =1 ; -u64 inputAddress = (Input) ?virt_to_phys (Input) :0 ; -u32 inputAddressHi = inputAddress >>32 ; -u32 inputAddressLo = inputAddress &0xFFFFFFFF ; -u64 outputAddress = (Output) ?virt_to_phys (Output) :0 ; -u32 outputAddressHi = outputAddress >>32 ; -u32 outputAddressLo = outputAddress &0xFFFFFFFF ; -volatile void *hypercallPage = g_hv_context.hypercall_page; +u32 control_hi = control >>32 ; +u32 control_lo = control &0xFFFFFFFF ; +u32 hv_status_hi =1 ; +u32 hv_status_lo =1 ; +u64 input_address = (input) ?virt_to_phys (input) :0 ; +u32 input_address_hi = input_address >>32 ; +u32 input_address_lo = input_address &0xFFFFFFFF ; +u64 output_address = (output) ?virt_to_phys (output) :0 ; +u32 output_address_hi = output_address >>32 ; +u32 output_address_lo = output_address &0xFFFFFFFF ; +volatile void *hypercall_page = g_hv_context.hypercall_page;DPRINT_DBG (VMBUS ,"Hypercall <control %llx input %p output %p>" , - Control, Input, Output); + control, input, output); - __asm__ __volatile__ ("call *%8" :"=d" (hvStatusHi), -"=a" (hvStatusLo) :"d" (controlHi), -"a" (controlLo),"b" (inputAddressHi), -"c" (inputAddressLo),"D" (outputAddressHi), -"S" (outputAddressLo),"m" (hypercallPage)); + __asm__ __volatile__ ("call *%8" :"=d" (hv_status_hi), +"=a" (hv_status_lo) :"d" (control_hi), +"a" (control_lo),"b" (input_address_hi), +"c" (input_address_lo),"D" (output_address_hi), +"S" (output_address_lo),"m" (hypercall_page));DPRINT_DBG (VMBUS ,"Hypercall <return %llx>" , - hvStatusLo | ((u64 )hvStatusHi <<32 )); + hv_status_lo | ((u64 )hv_status_hi <<32 )); -return hvStatusLo | ((u64 )hvStatusHi <<32 ); +return hv_status_lo | ((u64 )hv_status_hi <<32 );#endif /* !x86_64 */ }
@@ -188,9 +188,9 @@ static u64 HvDoHypercall(u64 Control, void *Input, void *Output)int HvInit (void ) {int ret =0 ; -int maxLeaf; -union hv_x64_msr_hypercall_contents hypercallMsr; -void *virtAddr =NULL ; +int max_leaf; +union hv_x64_msr_hypercall_contents hypercall_msr; +void *virtaddr =NULL ;memset (g_hv_context.synic_event_page,0 ,sizeof (void *) *MAX_NUM_CPUS ); memset(g_hv_context.synic_message_page, 0,
@@ -204,7 +204,7 @@ int HvInit(void)DPRINT_INFO (VMBUS ,"Windows hypervisor detected! Retrieving more info..." ); - maxLeaf =HvQueryHypervisorInfo (); + max_leaf =HvQueryHypervisorInfo ();/* HvQueryHypervisorFeatures(maxLeaf); */ /*
@@ -223,39 +223,39 @@ int HvInit(void) g_hv_context.guestid =HV_LINUX_GUEST_ID ;/* See if the hypercall page is already set */ -rdmsrl (HV_X64_MSR_HYPERCALL , hypercallMsr.as_uint64); +rdmsrl (HV_X64_MSR_HYPERCALL , hypercall_msr.as_uint64);/* * Allocate the hypercall page memory * virtAddr = osd_PageAlloc(1); */ - virtAddr =osd_VirtualAllocExec (PAGE_SIZE ); + virtaddr =osd_VirtualAllocExec (PAGE_SIZE ); -if (!virtAddr) { +if (!virtaddr) {DPRINT_ERR (VMBUS ,"unable to allocate hypercall page!!" ); goto Cleanup; } - hypercallMsr.enable =1 ; + hypercall_msr.enable =1 ; - hypercallMsr.guest_physical_address =vmalloc_to_pfn (virtAddr); -wrmsrl (HV_X64_MSR_HYPERCALL , hypercallMsr.as_uint64); + hypercall_msr.guest_physical_address =vmalloc_to_pfn (virtaddr); +wrmsrl (HV_X64_MSR_HYPERCALL , hypercall_msr.as_uint64);/* Confirm that hypercall page did get setup. */ - hypercallMsr.as_uint64 =0 ; -rdmsrl (HV_X64_MSR_HYPERCALL , hypercallMsr.as_uint64); + hypercall_msr.as_uint64 =0 ; +rdmsrl (HV_X64_MSR_HYPERCALL , hypercall_msr.as_uint64); -if (!hypercallMsr.enable) { +if (!hypercall_msr.enable) {DPRINT_ERR (VMBUS ,"unable to set hypercall page!!" ); goto Cleanup; } - g_hv_context.hypercall_page = virtAddr; + g_hv_context.hypercall_page = virtaddr;DPRINT_INFO (VMBUS ,"Hypercall page VA=%p, PA=0x%0llx" , g_hv_context.hypercall_page, - (u64 )hypercallMsr.guest_physical_address <<PAGE_SHIFT ); + (u64 )hypercall_msr.guest_physical_address <<PAGE_SHIFT );/* Setup the global signal event param for the signal event hypercall */ g_hv_context.signal_event_buffer =
@@ -278,13 +278,13 @@ int HvInit(void)return ret; Cleanup: -if (virtAddr) { -if (hypercallMsr.enable) { - hypercallMsr.as_uint64 =0 ; -wrmsrl (HV_X64_MSR_HYPERCALL , hypercallMsr.as_uint64); +if (virtaddr) { +if (hypercall_msr.enable) { + hypercall_msr.as_uint64 =0 ; +wrmsrl (HV_X64_MSR_HYPERCALL , hypercall_msr.as_uint64); } -vfree (virtAddr); +vfree (virtaddr); } ret =-1 ;return ret;
@@ -297,15 +297,15 @@ Cleanup:*/ void HvCleanup (void ) { -union hv_x64_msr_hypercall_contents hypercallMsr; +union hv_x64_msr_hypercall_contents hypercall_msr;kfree (g_hv_context.signal_event_buffer); g_hv_context.signal_event_buffer =NULL ; g_hv_context.signal_event_param =NULL ;if (g_hv_context.hypercall_page) { - hypercallMsr.as_uint64 =0 ; -wrmsrl (HV_X64_MSR_HYPERCALL , hypercallMsr.as_uint64); + hypercall_msr.as_uint64 =0 ; +wrmsrl (HV_X64_MSR_HYPERCALL , hypercall_msr.as_uint64);vfree (g_hv_context.hypercall_page); g_hv_context.hypercall_page =NULL ; }
@@ -316,35 +316,35 @@ void HvCleanup(void)* * This involves a hypercall. */ -u16 HvPostMessage (union hv_connection_id connectionId, -enum hv_message_type messageType, -void *payload,size_t payloadSize) +u16 HvPostMessage (union hv_connection_id connection_id, +enum hv_message_type message_type, +void *payload,size_t payload_size) { -struct alignedInput { +struct aligned_input {u64 alignment8;struct hv_input_post_message msg; }; -struct hv_input_post_message *alignedMsg; +struct hv_input_post_message *aligned_msg;u16 status;unsigned long addr; -if (payloadSize >HV_MESSAGE_PAYLOAD_BYTE_COUNT ) +if (payload_size >HV_MESSAGE_PAYLOAD_BYTE_COUNT )return -1 ; - addr = (unsigned long )kmalloc (sizeof (struct alignedInput ),GFP_ATOMIC ); + addr = (unsigned long )kmalloc (sizeof (struct aligned_input ),GFP_ATOMIC );if (!addr)return -1 ; - alignedMsg = (struct hv_input_post_message *) + aligned_msg = (struct hv_input_post_message *) (ALIGN_UP (addr,HV_HYPERCALL_PARAM_ALIGN )); - alignedMsg->connectionid = connectionId; - alignedMsg->message_type = messageType; - alignedMsg->payload_size = payloadSize; -memcpy ((void *)alignedMsg->payload, payload, payloadSize); + aligned_msg->connectionid = connection_id; + aligned_msg->message_type = message_type; + aligned_msg->payload_size = payload_size; +memcpy ((void *)aligned_msg->payload, payload, payload_size); - status =HvDoHypercall (HVCALL_POST_MESSAGE , alignedMsg,NULL ) &0xFFFF ; + status =HvDoHypercall (HVCALL_POST_MESSAGE , aligned_msg,NULL ) &0xFFFF ;kfree ((void *)addr);
@@ -379,10 +379,10 @@ void HvSynicInit(void *irqarg)u64 version;union hv_synic_simp simp;union hv_synic_siefp siefp; -union hv_synic_sint sharedSint; +union hv_synic_sint shared_sint;union hv_synic_scontrol sctrl; -u32 irqVector = *((u32 *)(irqarg)); +u32 irq_vector = *((u32 *)(irqarg));int cpu =smp_processor_id ();if (!g_hv_context.hypercall_page)
@@ -436,17 +436,17 @@ void HvSynicInit(void *irqarg)/* interceptionSint.as_uint64); */ /* Setup the shared SINT. */ -rdmsrl (HV_X64_MSR_SINT0 +VMBUS_MESSAGE_SINT , sharedSint.as_uint64); +rdmsrl (HV_X64_MSR_SINT0 +VMBUS_MESSAGE_SINT , shared_sint.as_uint64); - sharedSint.as_uint64 =0 ; - sharedSint.vector = irqVector;/* HV_SHARED_SINT_IDT_VECTOR + 0x20; */ - sharedSint.masked = false; - sharedSint.auto_eoi = true; + shared_sint.as_uint64 =0 ; + shared_sint.vector = irq_vector;/* HV_SHARED_SINT_IDT_VECTOR + 0x20; */ + shared_sint.masked = false; + shared_sint.auto_eoi = true;DPRINT_DBG (VMBUS ,"HV_X64_MSR_SINT1 msr set to: %llx" , - sharedSint.as_uint64); + shared_sint.as_uint64); -wrmsrl (HV_X64_MSR_SINT0 +VMBUS_MESSAGE_SINT , sharedSint.as_uint64); +wrmsrl (HV_X64_MSR_SINT0 +VMBUS_MESSAGE_SINT , shared_sint.as_uint64);/* Enable the global synic bit */ rdmsrl (HV_X64_MSR_SCONTROL , sctrl.as_uint64);
@@ -471,7 +471,7 @@ Cleanup:*/ void HvSynicCleanup (void *arg) { -union hv_synic_sint sharedSint; +union hv_synic_sint shared_sint;union hv_synic_simp simp;union hv_synic_siefp siefp;int cpu =smp_processor_id ();
@@ -479,13 +479,13 @@ void HvSynicCleanup(void *arg)if (!g_hv_context.synic_initialized)return ; -rdmsrl (HV_X64_MSR_SINT0 +VMBUS_MESSAGE_SINT , sharedSint.as_uint64); +rdmsrl (HV_X64_MSR_SINT0 +VMBUS_MESSAGE_SINT , shared_sint.as_uint64); - sharedSint.masked =1 ; + shared_sint.masked =1 ;/* Need to correctly cleanup in the case of SMP!!! */ /* Disable the interrupt */ -wrmsrl (HV_X64_MSR_SINT0 +VMBUS_MESSAGE_SINT , sharedSint.as_uint64); +wrmsrl (HV_X64_MSR_SINT0 +VMBUS_MESSAGE_SINT , shared_sint.as_uint64);rdmsrl (HV_X64_MSR_SIMP , simp.as_uint64); simp.simp_enabled =0 ;
Signature · 1 line
1.6.3.2
PATCH 6/10 staging: hv: Convert camel cased local variables in osd.c to lower cases
From: Haiyang Zhang <[email protected]>
Convert camel cased local variables in osd.c to lower cases
--- drivers/staging/hv/osd.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-)
drivers/staging/hv/osd.c +20 -20
@@ -130,9 +130,9 @@ EXPORT_SYMBOL_GPL(osd_WaitEventCreate);/** * osd_WaitEventSet() - Wake up the process -* @waitEvent: Structure to event to be woken up +* @wait_event: Structure to event to be woken up * -* @waitevent is of type &struct osd_waitevent +* @wait_event is of type &struct osd_waitevent * * Wake up the sleeping process so it can do some work. * And set condition indicator in &struct osd_waitevent to indicate
@@ -140,18 +140,18 @@ EXPORT_SYMBOL_GPL(osd_WaitEventCreate);* * Only used by Network and Storage Hyper-V drivers. */ -void osd_WaitEventSet (struct osd_waitevent *waitEvent) +void osd_WaitEventSet (struct osd_waitevent *wait_event) { - waitEvent->condition =1 ; -wake_up_interruptible (&waitEvent->event); + wait_event->condition =1 ; +wake_up_interruptible (&wait_event->event); }EXPORT_SYMBOL_GPL (osd_WaitEventSet);/** * osd_WaitEventWait() - Wait for event till condition is true -* @waitEvent: Structure to event to be put to sleep +* @wait_event: Structure to event to be put to sleep * -* @waitevent is of type &struct osd_waitevent +* @wait_event is of type &struct osd_waitevent * * Set up the process to sleep until waitEvent->condition get true. * And set condition indicator in &struct osd_waitevent to indicate
@@ -161,25 +161,25 @@ EXPORT_SYMBOL_GPL(osd_WaitEventSet);* * Mainly used by Hyper-V drivers. */ -int osd_WaitEventWait (struct osd_waitevent *waitEvent) +int osd_WaitEventWait (struct osd_waitevent *wait_event) {int ret =0 ; - ret =wait_event_interruptible (waitEvent->event, - waitEvent->condition); - waitEvent->condition =0 ; + ret =wait_event_interruptible (wait_event->event, + wait_event->condition); + wait_event->condition =0 ;return ret; }EXPORT_SYMBOL_GPL (osd_WaitEventWait);/** * osd_WaitEventWaitEx() - Wait for event or timeout for process wakeup -* @waitEvent: Structure to event to be put to sleep -* @TimeoutInMs: Total number of Milliseconds to wait before waking up +* @wait_event: Structure to event to be put to sleep +* @timeout_in_ms: Total number of Milliseconds to wait before waking up * -* @waitevent is of type &struct osd_waitevent +* @wait_event is of type &struct osd_waitevent * Set up the process to sleep until @waitEvent->condition get true or -* @TimeoutInMs (Time out in Milliseconds) has been reached. +* @timeout_in_ms (Time out in Milliseconds) has been reached. * And set condition indicator in &struct osd_waitevent to indicate * the process is in a sleeping state. *
@@ -187,14 +187,14 @@ EXPORT_SYMBOL_GPL(osd_WaitEventWait);* * Mainly used by Hyper-V drivers. */ -int osd_WaitEventWaitEx (struct osd_waitevent *waitEvent,u32 TimeoutInMs) +int osd_WaitEventWaitEx (struct osd_waitevent *wait_event,u32 timeout_in_ms) {int ret =0 ; - ret =wait_event_interruptible_timeout (waitEvent->event, - waitEvent->condition, -msecs_to_jiffies (TimeoutInMs)); - waitEvent->condition =0 ; + ret =wait_event_interruptible_timeout (wait_event->event, + wait_event->condition, +msecs_to_jiffies (timeout_in_ms)); + wait_event->condition =0 ;return ret; }EXPORT_SYMBOL_GPL (osd_WaitEventWaitEx);
Signature · 1 line
1.6.3.2
PATCH 7/10 staging: hv: Convert camel cased functions in osd.c to lower cases
From: Haiyang Zhang <[email protected]>
Convert camel cased functions in osd.c to lower cases
--- drivers/staging/hv/channel.c | 20 +++++++++--------- drivers/staging/hv/channel_mgmt.c | 12 +++++----- drivers/staging/hv/connection.c | 14 ++++++------ drivers/staging/hv/hv.c | 12 +++++----- drivers/staging/hv/netvsc.c | 24 +++++++++++----------- drivers/staging/hv/osd.c | 40 ++++++++++++++++++------------------ drivers/staging/hv/osd.h | 18 ++++++++-------- drivers/staging/hv/rndis_filter.c | 10 ++++---- drivers/staging/hv/storvsc.c | 16 +++++++------- 9 files changed, 83 insertions(+), 83 deletions(-)
drivers/staging/hv/channel.c +10 -10
@@ -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 ;
@@ -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);
@@ -300,7 +300,7 @@ Cleanup: errorout:RingBufferCleanup (&newchannel->outbound);RingBufferCleanup (&newchannel->inbound); -osd_PageFree (out, (send_ringbuffer_size + recv_ringbuffer_size) +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 ;
@@ -686,7 +686,7 @@ void vmbus_close(struct vmbus_channel *channel)RingBufferCleanup (&channel->outbound);RingBufferCleanup (&channel->inbound); -osd_PageFree (channel->ringbuffer_pages, channel->ringbuffer_pagecount); +osd_page_free (channel->ringbuffer_pages, channel->ringbuffer_pagecount);kfree (info);
drivers/staging/hv/channel_mgmt.c +6 -6
@@ -566,7 +566,7 @@ static void vmbus_onopen_result(struct vmbus_channel_message_header *hdr)memcpy (&msginfo->response.open_result, result,sizeof (struct vmbus_channel_open_result )); -osd_WaitEventSet (msginfo->waitevent); +osd_waitevent_set (msginfo->waitevent);break ; } }
@@ -616,7 +616,7 @@ static void vmbus_ongpadl_created(struct vmbus_channel_message_header *hdr)memcpy (&msginfo->response.gpadl_created, gpadlcreated,sizeof (struct vmbus_channel_gpadl_created )); -osd_WaitEventSet (msginfo->waitevent); +osd_waitevent_set (msginfo->waitevent);break ; } }
@@ -662,7 +662,7 @@ static void vmbus_ongpadl_torndown(memcpy (&msginfo->response.gpadl_torndown, gpadl_torndown,sizeof (struct vmbus_channel_gpadl_torndown )); -osd_WaitEventSet (msginfo->waitevent); +osd_waitevent_set (msginfo->waitevent);break ; } }
@@ -703,7 +703,7 @@ static void vmbus_onversion_response(memcpy (&msginfo->response.version_response, version_response,sizeof (struct vmbus_channel_version_response )); -osd_WaitEventSet (msginfo->waitevent); +osd_waitevent_set (msginfo->waitevent); } }spin_unlock_irqrestore (&gVmbusConnection.channelmsg_lock, flags);
@@ -782,7 +782,7 @@ int vmbus_request_offers(void)if (!msginfo)return -ENOMEM ; - msginfo->waitevent =osd_WaitEventCreate (); + msginfo->waitevent =osd_waitevent_create ();if (!msginfo->waitevent) {kfree (msginfo);return -ENOMEM ;
@@ -808,7 +808,7 @@ int vmbus_request_offers(void) goto Cleanup; } -/* osd_WaitEventWait(msgInfo->waitEvent); */ +/* osd_waitevent_wait(msgInfo->waitEvent); */ /*SpinlockAcquire(gVmbusConnection.channelMsgLock); REMOVE_ENTRY_LIST(&msgInfo->msgListEntry);
drivers/staging/hv/connection.c +7 -7
@@ -66,7 +66,7 @@ int VmbusConnect(void)* Setup the vmbus event connection for channel interrupt * abstraction stuff */ - gVmbusConnection.InterruptPage =osd_PageAlloc (1 ); + gVmbusConnection.InterruptPage =osd_page_alloc (1 );if (gVmbusConnection.InterruptPage ==NULL ) { ret =-1 ; goto Cleanup;
@@ -81,7 +81,7 @@ int VmbusConnect(void)* Setup the monitor notification facility. The 1st page for * parent->child and the 2nd page for child->parent */ - gVmbusConnection.MonitorPages =osd_PageAlloc (2 ); + gVmbusConnection.MonitorPages =osd_page_alloc (2 );if (gVmbusConnection.MonitorPages ==NULL ) { ret =-1 ; goto Cleanup;
@@ -95,7 +95,7 @@ int VmbusConnect(void) goto Cleanup; } - msgInfo->waitevent =osd_WaitEventCreate (); + msgInfo->waitevent =osd_waitevent_create ();if (!msgInfo->waitevent) { ret = -ENOMEM ; goto Cleanup;
@@ -134,7 +134,7 @@ int VmbusConnect(void) }/* Wait for the connection response */ -osd_WaitEventWait (msgInfo->waitevent); +osd_waitevent_wait (msgInfo->waitevent);list_del (&msgInfo->msglistentry);
@@ -162,12 +162,12 @@ Cleanup:destroy_workqueue (gVmbusConnection.WorkQueue);if (gVmbusConnection.InterruptPage) { -osd_PageFree (gVmbusConnection.InterruptPage,1 ); +osd_page_free (gVmbusConnection.InterruptPage,1 ); gVmbusConnection.InterruptPage =NULL ; }if (gVmbusConnection.MonitorPages) { -osd_PageFree (gVmbusConnection.MonitorPages,2 ); +osd_page_free (gVmbusConnection.MonitorPages,2 ); gVmbusConnection.MonitorPages =NULL ; }
@@ -202,7 +202,7 @@ int VmbusDisconnect(void)if (ret !=0 ) goto Cleanup; -osd_PageFree (gVmbusConnection.InterruptPage,1 ); +osd_page_free (gVmbusConnection.InterruptPage,1 );/* TODO: iterate thru the msg list and free up */ destroy_workqueue (gVmbusConnection.WorkQueue);
drivers/staging/hv/hv.c +6 -6
@@ -227,9 +227,9 @@ int hv_init(void)/* * Allocate the hypercall page memory -* virtAddr = osd_PageAlloc(1); +* virtAddr = osd_page_alloc(1); */ - virtaddr =osd_VirtualAllocExec (PAGE_SIZE ); + virtaddr =osd_virtual_alloc_exec (PAGE_SIZE );if (!virtaddr) { DPRINT_ERR(VMBUS,
@@ -461,10 +461,10 @@ void hv_synic_init(void *irqarg) Cleanup:if (g_hv_context.synic_event_page[cpu]) -osd_PageFree (g_hv_context.synic_event_page[cpu],1 ); +osd_page_free (g_hv_context.synic_event_page[cpu],1 );if (g_hv_context.synic_message_page[cpu]) -osd_PageFree (g_hv_context.synic_message_page[cpu],1 ); +osd_page_free (g_hv_context.synic_message_page[cpu],1 );return ; }
@@ -501,6 +501,6 @@ void hv_synic_cleanup(void *arg)wrmsrl (HV_X64_MSR_SIEFP , siefp.as_uint64); -osd_PageFree (g_hv_context.synic_message_page[cpu],1 ); -osd_PageFree (g_hv_context.synic_event_page[cpu],1 ); +osd_page_free (g_hv_context.synic_message_page[cpu],1 ); +osd_page_free (g_hv_context.synic_event_page[cpu],1 ); }
drivers/staging/hv/netvsc.c +12 -12
@@ -221,7 +221,7 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)/* ASSERT((netDevice->ReceiveBufferSize & (PAGE_SIZE - 1)) == 0); */ netDevice->ReceiveBuffer = -osd_PageAlloc (netDevice->ReceiveBufferSize >>PAGE_SHIFT ); +osd_page_alloc (netDevice->ReceiveBufferSize >>PAGE_SHIFT );if (!netDevice->ReceiveBuffer) { DPRINT_ERR(NETVSC, "unable to allocate receive buffer of size %d",
@@ -249,7 +249,7 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device) goto Cleanup; } -/* osd_WaitEventWait(ext->ChannelInitEvent); */ +/* osd_waitevent_wait(ext->ChannelInitEvent); */ /* Notify the NetVsp of the gpadl handle */ DPRINT_INFO (NETVSC ,"Sending NvspMessage1TypeSendReceiveBuffer..." );
@@ -274,7 +274,7 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device) goto Cleanup; } -osd_WaitEventWait (netDevice->ChannelInitEvent); +osd_waitevent_wait (netDevice->ChannelInitEvent);/* Check the response */ if (initPacket->Messages.Version1Messages.SendReceiveBufferComplete.Status != NvspStatusSuccess) {
@@ -350,7 +350,7 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device)/* ASSERT((netDevice->SendBufferSize & (PAGE_SIZE - 1)) == 0); */ netDevice->SendBuffer = -osd_PageAlloc (netDevice->SendBufferSize >>PAGE_SHIFT ); +osd_page_alloc (netDevice->SendBufferSize >>PAGE_SHIFT );if (!netDevice->SendBuffer) {DPRINT_ERR (NETVSC ,"unable to allocate send buffer of size %d" , netDevice->SendBufferSize);
@@ -375,7 +375,7 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device) goto Cleanup; } -/* osd_WaitEventWait(ext->ChannelInitEvent); */ +/* osd_waitevent_wait(ext->ChannelInitEvent); */ /* Notify the NetVsp of the gpadl handle */ DPRINT_INFO (NETVSC ,"Sending NvspMessage1TypeSendSendBuffer..." );
@@ -400,7 +400,7 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device) goto Cleanup; } -osd_WaitEventWait (netDevice->ChannelInitEvent); +osd_waitevent_wait (netDevice->ChannelInitEvent);/* Check the response */ if (initPacket->Messages.Version1Messages.SendSendBufferComplete.Status != NvspStatusSuccess) {
@@ -480,7 +480,7 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice)DPRINT_INFO (NETVSC ,"Freeing up receive buffer..." );/* Free up the receive buffer */ -osd_PageFree (NetDevice->ReceiveBuffer, +osd_page_free (NetDevice->ReceiveBuffer, NetDevice->ReceiveBufferSize >>PAGE_SHIFT ); NetDevice->ReceiveBuffer =NULL ; }
@@ -553,7 +553,7 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice)DPRINT_INFO (NETVSC ,"Freeing up send buffer..." );/* Free up the receive buffer */ -osd_PageFree (NetDevice->SendBuffer, +osd_page_free (NetDevice->SendBuffer, NetDevice->SendBufferSize >>PAGE_SHIFT ); NetDevice->SendBuffer =NULL ; }
@@ -597,7 +597,7 @@ static int NetVscConnectToVsp(struct hv_device *Device) goto Cleanup; } -osd_WaitEventWait (netDevice->ChannelInitEvent); +osd_waitevent_wait (netDevice->ChannelInitEvent);/* Now, check the response */ /* ASSERT(initPacket->Messages.InitMessages.InitComplete.MaximumMdlChainLength <= MAX_MULTIPAGE_BUFFER_COUNT); */
@@ -651,7 +651,7 @@ static int NetVscConnectToVsp(struct hv_device *Device)* packet) since our Vmbus always set the * VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED flag */ -/* osd_WaitEventWait(NetVscChannel->ChannelInitEvent); */ +/* osd_waitevent_wait(NetVscChannel->ChannelInitEvent); */ /* Post the big receive buffer to NetVSP */ ret =NetVscInitializeReceiveBufferWithNetVsp (Device);
@@ -710,7 +710,7 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)list_add_tail (&packet->ListEntry, &netDevice->ReceivePacketList); } - netDevice->ChannelInitEvent =osd_WaitEventCreate (); + netDevice->ChannelInitEvent =osd_waitevent_create ();if (!netDevice->ChannelInitEvent) { ret = -ENOMEM ; goto Cleanup;
@@ -855,7 +855,7 @@ static void NetVscOnSendCompletion(struct hv_device *Device,/* Copy the response back */ memcpy (&netDevice->ChannelInitPacket, nvspPacket,sizeof (struct nvsp_message )); -osd_WaitEventSet (netDevice->ChannelInitEvent); +osd_waitevent_set (netDevice->ChannelInitEvent); }else if (nvspPacket->Header.MessageType == NvspMessage1TypeSendRNDISPacketComplete) {/* Get the send context */
drivers/staging/hv/osd.c +20 -20
@@ -49,7 +49,7 @@ struct osd_callback_struct {void *data; }; -void *osd_VirtualAllocExec (unsigned int size) +void *osd_virtual_alloc_exec (unsigned int size) {#ifdef __x86_64__return __vmalloc (size,GFP_KERNEL ,PAGE_KERNEL_EXEC );
@@ -60,7 +60,7 @@ void *osd_VirtualAllocExec(unsigned int size) }/** -* osd_PageAlloc() - Allocate pages +* osd_page_alloc() - Allocate pages * @count: Total number of Kernel pages you want to allocate * * Tries to allocate @count number of consecutive free kernel pages.
@@ -68,7 +68,7 @@ void *osd_VirtualAllocExec(unsigned int size)* If successfull it will return pointer to the @count pages. * Mainly used by Hyper-V drivers. */ -void *osd_PageAlloc (unsigned int count) +void *osd_page_alloc (unsigned int count) {void *p;
@@ -85,26 +85,26 @@ void *osd_PageAlloc(unsigned int count)/* if (p) memset(p, 0, PAGE_SIZE); */ /* return p; */ } -EXPORT_SYMBOL_GPL (osd_PageAlloc); +EXPORT_SYMBOL_GPL (osd_page_alloc);/** -* osd_PageFree() - Free pages +* osd_page_free() - Free pages * @page: Pointer to the first page to be freed * @count: Total number of Kernel pages you free * -* Frees the pages allocated by osd_PageAlloc() +* Frees the pages allocated by osd_page_alloc() * Mainly used by Hyper-V drivers. */ -void osd_PageFree (void *page,unsigned int count) +void osd_page_free (void *page,unsigned int count) {free_pages ((unsigned long )page,get_order (count *PAGE_SIZE ));/*struct page* p = virt_to_page(page); __free_page(p);*/ } -EXPORT_SYMBOL_GPL (osd_PageFree); +EXPORT_SYMBOL_GPL (osd_page_free);/** -* osd_WaitEventCreate() - Create the event queue +* osd_waitevent_create() - Create the event queue * * Allocates memory for a &struct osd_waitevent. And then calls * init_waitqueue_head to set up the wait queue for the event.
@@ -114,7 +114,7 @@ EXPORT_SYMBOL_GPL(osd_PageFree);* Returns pointer to &struct osd_waitevent * Mainly used by Hyper-V drivers. */ -struct osd_waitevent *osd_WaitEventCreate (void ) +struct osd_waitevent *osd_waitevent_create (void ) {struct osd_waitevent *wait =kmalloc (sizeof (struct osd_waitevent ),GFP_KERNEL );
@@ -125,11 +125,11 @@ struct osd_waitevent *osd_WaitEventCreate(void)init_waitqueue_head (&wait->event);return wait; } -EXPORT_SYMBOL_GPL (osd_WaitEventCreate); +EXPORT_SYMBOL_GPL (osd_waitevent_create);/** -* osd_WaitEventSet() - Wake up the process +* osd_waitevent_set() - Wake up the process * @wait_event: Structure to event to be woken up * * @wait_event is of type &struct osd_waitevent
@@ -140,15 +140,15 @@ EXPORT_SYMBOL_GPL(osd_WaitEventCreate);* * Only used by Network and Storage Hyper-V drivers. */ -void osd_WaitEventSet (struct osd_waitevent *wait_event) +void osd_waitevent_set (struct osd_waitevent *wait_event) { wait_event->condition =1 ;wake_up_interruptible (&wait_event->event); } -EXPORT_SYMBOL_GPL (osd_WaitEventSet); +EXPORT_SYMBOL_GPL (osd_waitevent_set);/** -* osd_WaitEventWait() - Wait for event till condition is true +* osd_waitevent_wait() - Wait for event till condition is true * @wait_event: Structure to event to be put to sleep * * @wait_event is of type &struct osd_waitevent
@@ -161,7 +161,7 @@ EXPORT_SYMBOL_GPL(osd_WaitEventSet);* * Mainly used by Hyper-V drivers. */ -int osd_WaitEventWait (struct osd_waitevent *wait_event) +int osd_waitevent_wait (struct osd_waitevent *wait_event) {int ret =0 ;
@@ -170,10 +170,10 @@ int osd_WaitEventWait(struct osd_waitevent *wait_event) wait_event->condition =0 ;return ret; } -EXPORT_SYMBOL_GPL (osd_WaitEventWait); +EXPORT_SYMBOL_GPL (osd_waitevent_wait);/** -* osd_WaitEventWaitEx() - Wait for event or timeout for process wakeup +* osd_waitevent_waitex() - Wait for event or timeout for process wakeup * @wait_event: Structure to event to be put to sleep * @timeout_in_ms: Total number of Milliseconds to wait before waking up *
@@ -187,7 +187,7 @@ EXPORT_SYMBOL_GPL(osd_WaitEventWait);* * Mainly used by Hyper-V drivers. */ -int osd_WaitEventWaitEx (struct osd_waitevent *wait_event,u32 timeout_in_ms) +int osd_waitevent_waitex (struct osd_waitevent *wait_event,u32 timeout_in_ms) {int ret =0 ;
@@ -197,7 +197,7 @@ int osd_WaitEventWaitEx(struct osd_waitevent *wait_event, u32 timeout_in_ms) wait_event->condition =0 ;return ret; } -EXPORT_SYMBOL_GPL (osd_WaitEventWaitEx); +EXPORT_SYMBOL_GPL (osd_waitevent_waitex);static void osd_callback_work (struct work_struct *work) {
drivers/staging/hv/osd.h +9 -9
@@ -50,18 +50,18 @@ struct osd_waitevent {/* Osd routines */ -extern void *osd_VirtualAllocExec (unsigned int size); +extern void *osd_virtual_alloc_exec (unsigned int size); -extern void *osd_PageAlloc (unsigned int count); -extern void osd_PageFree (void *page,unsigned int count); +extern void *osd_page_alloc (unsigned int count); +extern void osd_page_free (void *page,unsigned int count); -extern struct osd_waitevent *osd_WaitEventCreate (void ); -extern void osd_WaitEventSet (struct osd_waitevent *waitEvent); -extern int osd_WaitEventWait (struct osd_waitevent *waitEvent); +extern struct osd_waitevent *osd_waitevent_create (void ); +extern void osd_waitevent_set (struct osd_waitevent *wait_event); +extern int osd_waitevent_wait (struct osd_waitevent *wait_event); -/* If >0, waitEvent got signaled. If ==0, timeout. If < 0, error */ -extern int osd_WaitEventWaitEx (struct osd_waitevent *waitEvent, -u32 TimeoutInMs); +/* If >0, wait_event got signaled. If ==0, timeout. If < 0, error */ +extern int osd_waitevent_waitex (struct osd_waitevent *wait_event, +u32 timeout_in_ms); int osd_schedule_callback(struct workqueue_struct *wq, void (*func)(void *),
drivers/staging/hv/rndis_filter.c +5 -5
@@ -129,7 +129,7 @@ static struct rndis_request *GetRndisRequest(struct rndis_device *Device,if (!request)return NULL ; - request->WaitEvent =osd_WaitEventCreate (); + request->WaitEvent =osd_waitevent_create ();if (!request->WaitEvent) {kfree (request);return NULL ;
@@ -313,7 +313,7 @@ static void RndisFilterReceiveResponse(struct rndis_device *Device, } } -osd_WaitEventSet (request->WaitEvent); +osd_waitevent_set (request->WaitEvent); }else { DPRINT_ERR(NETVSC, "no rndis request found for this response " "(id 0x%x res type 0x%x)",
@@ -497,7 +497,7 @@ static int RndisFilterQueryDevice(struct rndis_device *Device, u32 Oid,if (ret !=0 ) goto Cleanup; -osd_WaitEventWait (request->WaitEvent); +osd_waitevent_wait (request->WaitEvent);/* Copy the response back */ queryComplete = &request->ResponseMessage.Message.QueryComplete;
@@ -572,7 +572,7 @@ static int RndisFilterSetPacketFilter(struct rndis_device *Device,if (ret !=0 ) goto Cleanup; - ret =osd_WaitEventWaitEx (request->WaitEvent,2000 /*2sec*/ ); + ret =osd_waitevent_waitex (request->WaitEvent,2000 /*2sec*/ );if (!ret) { ret =-1 ;DPRINT_ERR (NETVSC ,"timeout before we got a set response..." );
@@ -665,7 +665,7 @@ static int RndisFilterInitDevice(struct rndis_device *Device) goto Cleanup; } -osd_WaitEventWait (request->WaitEvent); +osd_waitevent_wait (request->WaitEvent); initComplete = &request->ResponseMessage.Message.InitializeComplete; status = initComplete->Status;
drivers/staging/hv/storvsc.c +8 -8
@@ -198,7 +198,7 @@ static int StorVscChannelInit(struct hv_device *Device)* channel */ memset (request,0 ,sizeof (struct storvsc_request_extension )); - request->WaitEvent =osd_WaitEventCreate (); + request->WaitEvent =osd_waitevent_create ();if (!request->WaitEvent) { ret = -ENOMEM ; goto nomem;
@@ -224,7 +224,7 @@ static int StorVscChannelInit(struct hv_device *Device) goto Cleanup; } -osd_WaitEventWait (request->WaitEvent); +osd_waitevent_wait (request->WaitEvent);if (vstorPacket->Operation != VStorOperationCompleteIo || vstorPacket->Status !=0 ) {
@@ -255,7 +255,7 @@ static int StorVscChannelInit(struct hv_device *Device) goto Cleanup; } -osd_WaitEventWait (request->WaitEvent); +osd_waitevent_wait (request->WaitEvent);/* TODO: Check returned version */ if (vstorPacket->Operation != VStorOperationCompleteIo ||
@@ -287,7 +287,7 @@ static int StorVscChannelInit(struct hv_device *Device) goto Cleanup; } -osd_WaitEventWait (request->WaitEvent); +osd_waitevent_wait (request->WaitEvent);/* TODO: Check returned version */ if (vstorPacket->Operation != VStorOperationCompleteIo ||
@@ -323,7 +323,7 @@ static int StorVscChannelInit(struct hv_device *Device) goto Cleanup; } -osd_WaitEventWait (request->WaitEvent); +osd_waitevent_wait (request->WaitEvent);if (vstorPacket->Operation != VStorOperationCompleteIo || vstorPacket->Status !=0 ) {
@@ -473,7 +473,7 @@ static void StorVscOnChannelCallback(void *context)memcpy (&request->VStorPacket, packet,sizeof (struct vstor_packet )); -osd_WaitEventSet (request->WaitEvent); +osd_waitevent_set (request->WaitEvent); }else { StorVscOnReceive(device, (struct vstor_packet *)packet,
@@ -622,7 +622,7 @@ int StorVscOnHostReset(struct hv_device *Device) request = &storDevice->ResetRequest; vstorPacket = &request->VStorPacket; - request->WaitEvent =osd_WaitEventCreate (); + request->WaitEvent =osd_waitevent_create ();if (!request->WaitEvent) { ret = -ENOMEM ; goto Cleanup;
@@ -644,7 +644,7 @@ int StorVscOnHostReset(struct hv_device *Device) }/* FIXME: Add a timeout */ -osd_WaitEventWait (request->WaitEvent); +osd_waitevent_wait (request->WaitEvent);kfree (request->WaitEvent);DPRINT_INFO (STORVSC ,"host adapter reset completed" );
Signature · 1 line
1.6.3.2
PATCH 9/10 staging: hv: Convert camel cased local variables in ring_buffer.c to lower cases
From: Haiyang Zhang <[email protected]>
Convert camel cased local variables in ring_buffer.c to lower cases
--- drivers/staging/hv/channel.c | 4 +- drivers/staging/hv/ring_buffer.c | 337 +++++++++++++++++++------------------- drivers/staging/hv/ring_buffer.h | 26 ++-- 3 files changed, 185 insertions(+), 182 deletions(-)
drivers/staging/hv/channel.c +2 -2
@@ -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 " ); +Dumpring_info (&channel->outbound,"Outbound " ); +Dumpring_info (&channel->inbound,"Inbound " ); }
drivers/staging/hv/ring_buffer.c +170 -167
597 lines not on this page · raw message
drivers/staging/hv/ring_buffer.h +13 -13
@@ -75,28 +75,28 @@ struct hv_ring_buffer_debug_info {/* Interface */ -int RingBufferInit (struct hv_ring_buffer_info *RingInfo,void *Buffer, -u32 BufferLen); +int RingBufferInit (struct hv_ring_buffer_info *ring_info,void *buffer, +u32 buflen); -void RingBufferCleanup (struct hv_ring_buffer_info *RingInfo); +void RingBufferCleanup (struct hv_ring_buffer_info *ring_info); -int RingBufferWrite (struct hv_ring_buffer_info *RingInfo, +int RingBufferWrite (struct hv_ring_buffer_info *ring_info,struct scatterlist *sglist,u32 sgcount); -int RingBufferPeek (struct hv_ring_buffer_info *RingInfo,void *Buffer, -u32 BufferLen); +int RingBufferPeek (struct hv_ring_buffer_info *ring_info,void *buffer, +u32 buflen); -int RingBufferRead (struct hv_ring_buffer_info *RingInfo, -void *Buffer, -u32 BufferLen, -u32 Offset); +int RingBufferRead (struct hv_ring_buffer_info *ring_info, +void *buffer, +u32 buflen, +u32 offset); -u32 GetRingBufferInterruptMask (struct hv_ring_buffer_info *RingInfo); +u32 GetRingBufferInterruptMask (struct hv_ring_buffer_info *ring_info); -void DumpRingInfo (struct hv_ring_buffer_info *RingInfo,char *Prefix); +void Dumpring_info (struct hv_ring_buffer_info *ring_info,char *prefix); -void RingBufferGetDebugInfo (struct hv_ring_buffer_info *RingInfo, +void RingBufferGetDebugInfo (struct hv_ring_buffer_info *ring_info,struct hv_ring_buffer_debug_info *debug_info);#endif /* _RING_BUFFER_H_ */
Signature · 1 line
1.6.3.2
Quoted 6 lines · Haiyang Zhang
From: Haiyang Zhang <[email protected]>
Convert camel cased struct fields in
hv.hto lower casesSigned-off-by Haiyang Zhang <[email protected]>Signed-off-by Hank Janssen <[email protected]>
Why did I get two different copies of some of these patches? Are they different?
drivers/staging/hv/hv.c line 31
Quoted 7 lines
/* The one and only */
drivers/staging/hv/hv.c +1
-5-struct hv_context gHvContext = { - .SynICInitialized = false, - .HypercallPage =NULL , - .SignalEventParam =NULL , - .SignalEventBuffer =NULL , +struct hv_context g_hv_context = {
What is the "g_" for? Why are you keeping the unneeded, and unwanted hungarian notation around? Please don't do that.
thanks,
greg k-h
Quoted 4 lines
From: Greg KH [mailto:[email protected]]
Sent: Monday, November 01, 2010 1:43 PM
Why did I get two different copies of some of these patches? Are they different?
They are the same.
Initially, I sent all 10 patches out at the same time, but I only saw 5 of them in my mail box. So I re-sent the 5 missing ones. Half hour later, I found the 5 previous missing emails were not lost, and received again at a later time.
Quoted 10 lines
drivers/staging/hv/hv.c line 31
Quoted 7 lines
/* The one and only */
drivers/staging/hv/hv.c +1
-5-struct hv_context gHvContext = { - .SynICInitialized = false, - .HypercallPage =NULL , - .SignalEventParam =NULL , - .SignalEventBuffer =NULL , +struct hv_context g_hv_context = {What is the "g_" for? Why are you keeping the unneeded, and unwanted hungarian notation around? Please don't do that.
The "g_" was used for global variables. I also saw some other global variables with the hungarian notation. Since this notation is not related to camel case conversion, how about we remove the hungarian notations in a separate patch?
Thanks,
- Haiyang
Quoted 7 lines · Haiyang Zhang
Quoted 4 lines
From: Greg KH [mailto:[email protected]]
Sent: Monday, November 01, 2010 1:43 PM
Why did I get two different copies of some of these patches? Are they different?They are the same.
Initially, I sent all 10 patches out at the same time, but I only saw 5 of them in my mail box. So I re-sent the 5 missing ones. Half hour later, I found the 5 previous missing emails were not lost, and received again at a later time.
Ah, ok.
Oh, please wrap your emails properly :)
Quoted 11 lines
Quoted 10 lines
drivers/staging/hv/hv.c line 31
Quoted 7 lines
/* The one and only */
drivers/staging/hv/hv.c +1
-5-struct hv_context gHvContext = { - .SynICInitialized = false, - .HypercallPage =NULL , - .SignalEventParam =NULL , - .SignalEventBuffer =NULL , +struct hv_context g_hv_context = {What is the "g_" for? Why are you keeping the unneeded, and unwanted hungarian notation around? Please don't do that.
Quoted 4 lines
The "g_" was used for global variables. I also saw some other global variables with the hungarian notation. Since this notation is not related to camel case conversion, how about we remove the hungarian notations in a separate patch?
How about you fix this patch in the series and resend them?
And if you look at the kernel, there is no "g_" for global variable names, so I don't want to see that as part of the history at all.
I'll drop these series and wait for an updated one.
thanks,
greg k-h
Quoted 8 lines
From: Greg KH [mailto:[email protected]]
Sent: Monday, November 01, 2010 2:39 PM
How about you fix this patch in the series and resend them?And if you look at the kernel, there is no "g_" for global variable names, so I don't want to see that as part of the history at all.
I'll drop these series and wait for an updated one.
I have fixed the "g_" variable, and re-sent the patch set.
Thanks,
- Haiyang