Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / common / bouncebuf.c

diff --git a/common/bouncebuf.c b/common/bouncebuf.c
index 1df12cdda07d04f80632190c09b841e85a774b45..0ace152b98e0b5e6729796ad18625cc3804ac29a 100644 (file)
--- a/common/bouncebuf.c
+++ b/common/bouncebuf.c
@@ -1,28 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Generic bounce buffer implementation
  *
  * Copyright (C) 2012 Marek Vasut <marex@denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
  */
 
 #include <common.h>
+#include <cpu_func.h>
 #include <malloc.h>
 #include <errno.h>
 #include <bouncebuf.h>
@@ -39,7 +23,7 @@ static int addr_aligned(struct bounce_buffer *state)
 
        /* 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;
        }
 
@@ -47,17 +31,19 @@ static int addr_aligned(struct bounce_buffer *state)
        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->len_aligned = roundup(len, ARCH_DMA_MINALIGN);
+       state->len_aligned = roundup(len, alignment);
        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;
@@ -78,6 +64,14 @@ int bounce_buffer_start(struct bounce_buffer *state, void *data,
        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) {