projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2020-05-15-kconfig-migrations'
[oweals/u-boot.git]
/
common
/
bouncebuf.c
diff --git
a/common/bouncebuf.c
b/common/bouncebuf.c
index 9eece6d758bb6eede91da046a2db5774808c1dec..0ace152b98e0b5e6729796ad18625cc3804ac29a 100644
(file)
--- a/
common/bouncebuf.c
+++ b/
common/bouncebuf.c
@@
-1,12
+1,12
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Generic bounce buffer implementation
*
* Copyright (C) 2012 Marek Vasut <marex@denx.de>
/*
* Generic bounce buffer implementation
*
* Copyright (C) 2012 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
+#include <cpu_func.h>
#include <malloc.h>
#include <errno.h>
#include <bouncebuf.h>
#include <malloc.h>
#include <errno.h>
#include <bouncebuf.h>
@@
-23,7
+23,7
@@
static int addr_aligned(struct bounce_buffer *state)
/* Check if length is aligned */
if (state->len != state->len_aligned) {
/* Check if length is aligned */
if (state->len != state->len_aligned) {
- debug("Unaligned buffer length %
d
\n", state->len);
+ debug("Unaligned buffer length %
zu
\n", state->len);
return 0;
}
return 0;
}
@@
-31,17
+31,19
@@
static int addr_aligned(struct bounce_buffer *state)
return 1;
}
return 1;
}
-int bounce_buffer_start(struct bounce_buffer *state, void *data,
- size_t len, unsigned int flags)
+int bounce_buffer_start_extalign(struct bounce_buffer *state, void *data,
+ size_t len, unsigned int flags,
+ size_t alignment,
+ int (*addr_is_aligned)(struct bounce_buffer *state))
{
state->user_buffer = data;
state->bounce_buffer = data;
state->len = len;
{
state->user_buffer = data;
state->bounce_buffer = data;
state->len = len;
- state->len_aligned = roundup(len,
ARCH_DMA_MINALIGN
);
+ state->len_aligned = roundup(len,
alignment
);
state->flags = flags;
state->flags = flags;
- if (!addr_aligned(state)) {
- state->bounce_buffer = memalign(
ARCH_DMA_MINALIGN
,
+ if (!addr_
is_
aligned(state)) {
+ state->bounce_buffer = memalign(
alignment
,
state->len_aligned);
if (!state->bounce_buffer)
return -ENOMEM;
state->len_aligned);
if (!state->bounce_buffer)
return -ENOMEM;
@@
-62,6
+64,14
@@
int bounce_buffer_start(struct bounce_buffer *state, void *data,
return 0;
}
return 0;
}
+int bounce_buffer_start(struct bounce_buffer *state, void *data,
+ size_t len, unsigned int flags)
+{
+ return bounce_buffer_start_extalign(state, data, len, flags,
+ ARCH_DMA_MINALIGN,
+ addr_aligned);
+}
+
int bounce_buffer_stop(struct bounce_buffer *state)
{
if (state->flags & GEN_BB_WRITE) {
int bounce_buffer_stop(struct bounce_buffer *state)
{
if (state->flags & GEN_BB_WRITE) {