diff options
Diffstat (limited to 'drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c')
| -rw-r--r-- | drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c index 3aeffcb..988ee61 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c @@ -37,12 +37,11 @@ #include <linux/interrupt.h> #include <linux/pagemap.h> #include <linux/dma-mapping.h> -#include <linux/version.h> #include <linux/io.h> #include <linux/platform_device.h> #include <linux/uaccess.h> +#include <linux/mm.h> #include <linux/of.h> -#include <asm/pgtable.h> #include <soc/bcm2835/raspberrypi-firmware.h> #define TOTAL_SLOTS (VCHIQ_SLOT_ZERO_SLOTS + 2 * 32) @@ -208,6 +207,7 @@ VCHIQ_STATUS_T vchiq_platform_init_state(VCHIQ_STATE_T *state) { VCHIQ_STATUS_T status = VCHIQ_SUCCESS; + state->platform_state = kzalloc(sizeof(VCHIQ_2835_ARM_STATE_T), GFP_KERNEL); ((VCHIQ_2835_ARM_STATE_T *)state->platform_state)->inited = 1; status = vchiq_arm_init_state(state, &((VCHIQ_2835_ARM_STATE_T *)state->platform_state)->arm_state); @@ -293,6 +293,7 @@ vchiq_dump_platform_state(void *dump_context) { char buf[80]; int len; + len = snprintf(buf, sizeof(buf), " Platform: 2835 (VC master)"); vchiq_dump(dump_context, buf, len + 1); @@ -406,7 +407,7 @@ create_pagelist(char __user *buf, size_t count, unsigned short type, dma_addr_t dma_addr; offset = ((unsigned int)(unsigned long)buf & (PAGE_SIZE - 1)); - num_pages = (count + offset + PAGE_SIZE - 1) / PAGE_SIZE; + num_pages = DIV_ROUND_UP(count + offset, PAGE_SIZE); pagelist_size = sizeof(PAGELIST_T) + (num_pages * sizeof(u32)) + @@ -591,6 +592,7 @@ free_pagelist(struct vchiq_pagelist_info *pagelistinfo, (pagelist->type - PAGELIST_READ_WITH_FRAGMENTS) * g_fragments_size; int head_bytes, tail_bytes; + head_bytes = (g_cache_line_size - pagelist->offset) & (g_cache_line_size - 1); tail_bytes = (pagelist->offset + actual) & |
