Drivers: hv: vmbus: Remove use of slow_virt_to_phys()
PATCH 1/1 Drivers: hv: vmbus: Remove use of slow_virt_to_phys()
From: Michael Kelley <[email protected]>
slow_virt_to_phys() is only implemented for arch/x86. Remove its use in arch independent Hyper-V drivers, and replace with test for vmalloc() address followed by appropriate v-to-p function. This follows the typical pattern of other drivers and avoids the need to implement slow_virt_to_phys() for Hyper-V on ARM64.
Signed-off-by Michael Kelley <[email protected]>
--- drivers/hv/channel.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
drivers/hv/channel.c +20 -7
@@ -29,12 +29,26 @@#include <linux/hyperv.h> #include <linux/uio.h> #include <linux/interrupt.h> +#include <asm/page.h> #include "hyperv_vmbus.h" #define NUM_PAGES_SPANNED (addr, len) \ ((PAGE_ALIGN(addr + len) >> PAGE_SHIFT) - (addr >> PAGE_SHIFT)) +static unsigned long virt_to_hvpfn (void *addr) +{ +unsigned long paddr; + +if (is_vmalloc_addr (addr)) + paddr =page_to_phys (vmalloc_to_page (addr)) + +offset_in_page (addr); +else + paddr =__pa (addr); + +return paddr >>PAGE_SHIFT ; +} +/* * vmbus_setevent- Trigger an event notification on the specified * channel.
@@ -298,8 +312,8 @@ static int create_gpadl_header(void *kbuffer, u32 size, gpadl_header->range[0 ].byte_offset =0 ; gpadl_header->range[0 ].byte_count = size;for (i =0 ; i < pfncount; i++) - gpadl_header->range[0 ].pfn_array[i] =slow_virt_to_phys ( - kbuffer +PAGE_SIZE * i) >>PAGE_SHIFT ; + gpadl_header->range[0 ].pfn_array[i] =virt_to_hvpfn ( + kbuffer +PAGE_SIZE * i); *msginfo = msgheader; pfnsum = pfncount;
@@ -350,9 +364,8 @@ static int create_gpadl_header(void *kbuffer, u32 size,* so the hypervisor guarantees that this is ok. */ for (i =0 ; i < pfncurr; i++) - gpadl_body->pfn[i] =slow_virt_to_phys ( - kbuffer +PAGE_SIZE * (pfnsum + i)) >> -PAGE_SHIFT ; + gpadl_body->pfn[i] =virt_to_hvpfn ( + kbuffer +PAGE_SIZE * (pfnsum + i));/* add to msg header */ list_add_tail(&msgbody->msglistentry,
@@ -380,8 +393,8 @@ static int create_gpadl_header(void *kbuffer, u32 size, gpadl_header->range[0 ].byte_offset =0 ; gpadl_header->range[0 ].byte_count = size;for (i =0 ; i < pagecount; i++) - gpadl_header->range[0 ].pfn_array[i] =slow_virt_to_phys ( - kbuffer +PAGE_SIZE * i) >>PAGE_SHIFT ; + gpadl_header->range[0 ].pfn_array[i] =virt_to_hvpfn ( + kbuffer +PAGE_SIZE * i); *msginfo = msgheader; }
Signature · 1 line
1.8.3.1