[PATCH 4/6] staging: vc04_services: Remove dmac_map_area
Michael Zoran
mzoran at crowfest.net
Wed Oct 19 01:37:30 PDT 2016
>From 8084d0832baf89990adef43a62801fccde20d0d8 Mon Sep 17 00:00:00 2001
F
rom: Michael Zoran <mzoran at crowfest.net>
Date: Wed, 19 Oct 2016 00:54:11
-0700
Subject: [PATCH 4/6] staging: vc04_services: Remove dmac_map_area
T
he arm specific code of VCHIQ uses dmac_map_area which is
not currently
supported on arm64. This change adds
an architecture neutral
replacement based on
dma_map_page that does not use this feature.
Signed-
off-by: Michael Zoran <mzoran at crowfest.net>
---
.../interface/vchiq_arm/vchiq_2835_arm.c | 118 ++++++++++--
---------
1 file changed, 55 insertions(+), 63 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
ind
ex 32d12e6..35dd0c0 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
@@
-45,13 +45,8 @@
#include <asm/pgtable.h>
#include
<soc/bcm2835/raspberrypi-firmware.h>
-#define dmac_map_area
__glue(_CACHE,_dma_map_area)
-#define dmac_unmap_area
__glue(_CACHE,_dma_unmap_area)
-
#define TOTAL_SLOTS
(VCHIQ_SLOT_ZERO_SLOTS + 2 * 32)
-#define VCHIQ_ARM_ADDRESS(x) ((void
*)((char *)x + g_virt_to_bus_offset))
-
#include "vchiq_arm.h"
#include
"vchiq_2835.h"
#include "vchiq_connected.h"
@@ -73,7 +68,7 @@ static
unsigned int g_fragments_size;
static char *g_fragments_base;
static
char *g_free_fragments;
static struct semaphore g_free_fragments_sema;
-
static unsigned long g_virt_to_bus_offset;
+static struct device *g_dev;
extern int vchiq_arm_log_level;
@@ -84,10 +79,11 @@
vchiq_doorbell_irq(int irq, void *dev_id);
static int
create_pagelist(char __user *buf, size_t count, unsigned short type,
-
struct task_struct *task, PAGELIST_T ** ppagelist);
+
struct task_struct *task, PAGELIST_T **ppagelist,
+ dma_addr_t
*dma_addr);
static void
-free_pagelist(PAGELIST_T *pagelist, int
actual);
+free_pagelist(dma_addr_t dma_addr, PAGELIST_T *pagelist, int
actual);
int vchiq_platform_init(struct platform_device *pdev,
VCHIQ_STATE_T *state)
{
@@ -101,8 +97,6 @@ int
vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state)
int slot_mem_size, frag_mem_size;
int err, irq, i;
-
g_virt_to_bus_offset = virt_to_dma(dev, (void *)0);
-
(void)of_property_read_u32(dev->of_node, "cache-line-size",
&g_cache_line_size);
g_fragments_size = 2 * g_cache_line_size;
@@
-118,7 +112,7 @@ int vchiq_platform_init(struct platform_device *pdev,
VCHIQ_STATE_T *state)
return -ENOMEM;
}
- WARN_ON(((int)slot_mem &
(PAGE_SIZE - 1)) != 0);
+ WARN_ON(((unsigned long)slot_mem & (PAGE_SIZE
- 1)) != 0);
vchiq_slot_zero = vchiq_init_slots(slot_mem,
slot_mem_size);
if (!vchiq_slot_zero)
@@ -170,6 +164,8 @@ int
vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state)
return err ? : -ENXIO;
}
+ g_dev = dev;
+
vchiq_log_info(vchiq_arm_log_level,
"vchiq_init - done (slots %pK,
phys %pad)",
vchiq_slot_zero, &slot_phys);
@@ -219,7 +215,7 @@
remote_event_signal(REMOTE_EVENT_T *event)
int
vchiq_copy_from_user(void *dst, const void *src, int size)
{
- if
((uint32_t)src < TASK_SIZE) {
+ if ((unsigned long)src < TASK_SIZE) {
return copy_from_user(dst, src, size);
} else {
memcpy(dst, src,
size);
@@ -233,6 +229,7 @@ vchiq_prepare_bulk_data(VCHIQ_BULK_T *bulk,
VCHI_MEM_HANDLE_T memhandle,
{
PAGELIST_T *pagelist;
int ret;
+
dma_addr_t dma_addr;
WARN_ON(memhandle != VCHI_MEM_HANDLE_INVALID);
@@ -241,12 +238,14 @@ vchiq_prepare_bulk_data(VCHIQ_BULK_T *bulk,
VCHI_MEM_HANDLE_T memhandle,
? PAGELIST_READ
: PAGELIST_WRITE,
current,
- &pagelist);
+ &pagelist,
+ &dma_addr);
+
if (ret != 0)
return VCHIQ_ERROR;
bulk->handle = memhandle;
- bulk->data =
VCHIQ_ARM_ADDRESS(pagelist);
+ bulk->data = (void *)(unsigned
long)dma_addr;
/* Store the pagelist address in remote_data, which
isn't used by the
slave. */
@@ -259,7 +258,8 @@ void
vchiq_complete_bulk(VCHIQ_BULK_T *bulk)
{
if (bulk && bulk-
>remote_data && bulk->actual)
- free_pagelist((PAGELIST_T *)bulk-
>remote_data, bulk->actual);
+ free_pagelist((dma_addr_t)(unsigned
long)bulk->data,
+ (PAGELIST_T *)bulk->remote_data, bulk-
>actual);
}
void
@@ -353,38 +353,38 @@ vchiq_doorbell_irq(int irq, void
*dev_id)
** obscuring the new data underneath. We can solve this by
transferring the
** partial cache lines separately, and allowing the
ARM to copy into the
** cached area.
-
-** N.B. This implementation plays
slightly fast and loose with the Linux
-** driver programming rules,
e.g. its use of dmac_map_area instead of
-** dma_map_single, but it
isn't a multi-platform driver and it benefits
-** from increased speed
as a result.
*/
static int
create_pagelist(char __user *buf, size_t
count, unsigned short type,
- struct task_struct *task, PAGELIST_T **
ppagelist)
+ struct task_struct *task, PAGELIST_T **ppagelist,
+
dma_addr_t *dma_addr)
{
PAGELIST_T *pagelist;
struct page **pages;
-
unsigned long *addrs;
+ u32 *addrs;
unsigned int num_pages, offset, i;
- char *addr, *base_addr, *next_addr;
- int run, addridx, actual_pages;
+
int actual_pages;
unsigned long *need_release;
+ size_t
pagelist_size;
- offset = (unsigned int)buf & (PAGE_SIZE - 1);
+ offset
= ((unsigned int)(unsigned long)buf & (PAGE_SIZE - 1));
num_pages =
(count + offset + PAGE_SIZE - 1) / PAGE_SIZE;
+ pagelist_size =
sizeof(PAGELIST_T) +
+ (num_pages * sizeof(unsigned long)) +
+
sizeof(unsigned long) +
+ (num_pages * sizeof(pages[0]));
+
*ppagelist = NULL;
/* Allocate enough storage to hold the page
pointers and the page
** list
*/
- pagelist =
kmalloc(sizeof(PAGELIST_T) +
- (num_pages *
sizeof(unsigned long)) +
- sizeof(unsigned
long) +
- (num_pages * sizeof(pages[0])),
-
GFP_KERNEL);
+ pagelist =
dma_zalloc_coherent(g_dev,
+ pagelist_size,
+
dma_addr,
+ GFP_KERNEL);
vchiq_log_trace(vchiq_arm_log_level, "create_pagelist - %pK",
pagelist);
@@ -396,8 +396,6 @@ create_pagelist(char __user *buf, size_t
count, unsigned short type,
pages = (struct page **)(addrs + num_pages
+ 1);
if (is_vmalloc_addr(buf)) {
- int dir = (type ==
PAGELIST_WRITE) ?
- DMA_TO_DEVICE : DMA_FROM_DEVICE;
unsigned long
length = count;
unsigned int off = offset;
@@ -410,7 +408,6 @@
create_pagelist(char __user *buf, size_t count, unsigned short type,
if (bytes > length)
bytes = length;
pages[actual_pages] = pg;
-
dmac_map_area(page_address(pg) + off, bytes, dir);
length -=
bytes;
off = 0;
}
@@ -438,7 +435,8 @@ create_pagelist(char __user
*buf, size_t count, unsigned short type,
actual_pages--;
put_page(pages[actual_pages]);
}
- kfree(pagelist);
+
dma_free_coherent(g_dev, pagelist_size,
+ pagelist, *dma_addr);
if (actual_pages == 0)
actual_pages = -ENOMEM;
return
actual_pages;
@@ -450,30 +448,13 @@ create_pagelist(char __user *buf,
size_t count, unsigned short type,
pagelist->type = type;
pagelist-
>offset = offset;
- /* Group the pages into runs of contiguous pages */
-
- base_addr = VCHIQ_ARM_ADDRESS(page_address(pages[0]));
- next_addr =
base_addr + PAGE_SIZE;
- addridx = 0;
- run = 0;
-
- for (i = 1; i <
num_pages; i++) {
- addr = VCHIQ_ARM_ADDRESS(page_address(pages[i]));
-
if ((addr == next_addr) && (run < (PAGE_SIZE - 1))) {
- next_addr +=
PAGE_SIZE;
- run++;
- } else {
- addrs[addridx] = (unsigned
long)base_addr + run;
- addridx++;
- base_addr = addr;
- next_addr =
addr + PAGE_SIZE;
- run = 0;
- }
+ for (i = 0; i < num_pages; i++) {
+
addrs[i] =
+ (u32)dma_map_page(g_dev, pages[i],
+ 0, PAGE_SIZE,
+
DMA_BIDIRECTIONAL);
}
- addrs[addridx] = (unsigned
long)base_addr + run;
- addridx++;
-
/* Partial cache lines (fragments)
require special measures */
if ((type == PAGELIST_READ) &&
((pagelist->offset & (g_cache_line_size - 1)) ||
@@ -482,7 +463,8 @@
create_pagelist(char __user *buf, size_t count, unsigned short type,
char *fragments;
if (down_interruptible(&g_free_fragments_sema) !=
0) {
- kfree(pagelist);
+ dma_free_coherent(g_dev, pagelist_size,
+
pagelist, *dma_addr);
return -EINTR;
}
@@ -497,19 +479,18 @@
create_pagelist(char __user *buf, size_t count, unsigned short type,
(fragments - g_fragments_base) / g_fragments_size;
}
-
dmac_flush_range(pagelist, addrs + num_pages);
-
*ppagelist =
pagelist;
return 0;
}
static void
-free_pagelist(PAGELIST_T
*pagelist, int actual)
+free_pagelist(dma_addr_t dma_addr, PAGELIST_T
*pagelist, int actual)
{
unsigned long *need_release;
struct
page **pages;
unsigned int num_pages, i;
+ size_t pagelist_size;
vchiq_log_trace(vchiq_arm_log_level, "free_pagelist - %pK, %d",
pagelist, actual);
@@ -518,9 +499,20 @@ free_pagelist(PAGELIST_T
*pagelist, int actual)
(pagelist->length + pagelist->offset +
PAGE_SIZE - 1) /
PAGE_SIZE;
+ pagelist_size = sizeof(PAGELIST_T) +
+
(num_pages * sizeof(unsigned long)) +
+ sizeof(unsigned long) +
+
(num_pages * sizeof(pages[0]));
+
need_release = (unsigned long
*)(pagelist->addrs + num_pages);
pages = (struct page **)(pagelist-
>addrs + num_pages + 1);
+ for (i = 0; i < num_pages; i++) {
+
dma_unmap_page(g_dev, (dma_addr_t)pagelist->addrs[i],
+
PAGE_SIZE, DMA_BIDIRECTIONAL);
+ set_page_dirty(pages[i]);
+ }
+
/* Deal
with any partial cache lines (fragments) */
if (pagelist->type >=
PAGELIST_READ_WITH_FRAGMENTS) {
char *fragments = g_fragments_base +
@
@ -569,8 +561,7 @@ free_pagelist(PAGELIST_T *pagelist, int actual)
if (bytes > length)
bytes = length;
-
dmac_unmap_area(page_address(pg) + offset,
- bytes,
DMA_FROM_DEVICE);
+
length -= bytes;
offset = 0;
set_page_dirty(pg);
@@ -579,5 +570,6 @@ free_pagelist(PAGELIST_T
*pagelist, int actual)
}
}
- kfree(pagelist);
+
dma_free_coherent(g_dev, pagelist_size,
+ pagelist, dma_addr);
}
--
2.9.3
More information about the linux-rpi-kernel
mailing list