diff options
author | Lee Leahy <leroy.p.leahy@intel.com> | 2017-05-08 16:56:03 -0700 |
---|---|---|
committer | Lee Leahy <leroy.p.leahy@intel.com> | 2017-05-12 18:20:33 +0200 |
commit | 48dbc663d75e6b7e45e50cd099acb88b35e65a0a (patch) | |
tree | f60c19148b8be447c5350f939ac9d832e379579c /src/drivers/storage/bouncebuf.c | |
parent | f542aca0908ead68314a6d9603dde8849abcff19 (diff) |
commonlib: Move drivers/storage into commonlib/storage
Move drivers/storage into commonlib/storage to enable access by
libpayload and indirectly by payloads.
* Remove SD/MMC specific include files from include/device
* Remove files from drivers/storage
* Add SD/MMC specific include files to commonlib/include
* Add files to commonlib/storage
* Fix header file references
* Add subdir entry in commonlib/Makefile.inc to build the SD/MMC driver
* Add Kconfig source for commonlib/storage
* Rename *DEVICE* to *COMMONLIB*
* Rename *DRIVERS_STORAGE* to *COMMONLIB_STORAGE*
TEST=Build and run on Galileo Gen2
Change-Id: I4339e4378491db9a0da1f2dc34e1906a5ba31ad6
Signed-off-by: Lee Leahy <Leroy.P.Leahy@intel.com>
Reviewed-on: https://review.coreboot.org/19672
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/drivers/storage/bouncebuf.c')
-rw-r--r-- | src/drivers/storage/bouncebuf.c | 92 |
1 files changed, 0 insertions, 92 deletions
diff --git a/src/drivers/storage/bouncebuf.c b/src/drivers/storage/bouncebuf.c deleted file mode 100644 index c8125aaa42..0000000000 --- a/src/drivers/storage/bouncebuf.c +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Generic bounce buffer implementation - * - * Copyright (C) 2012 Marek Vasut <marex@denx.de> - * Copyright 2013 Google Inc. All rights reserved. - * - * 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. - */ - -#include <arch/cache.h> -#include <console/console.h> -#include "bouncebuf.h" -#include <halt.h> -#include "storage.h" -#include <string.h> -#include <commonlib/stdlib.h> - -static int addr_aligned(struct bounce_buffer *state) -{ - const uint32_t align_mask = ARCH_DMA_MINALIGN - 1; - - // Check if start is aligned - if ((uintptr_t)state->user_buffer & align_mask) { - sdhc_debug("Unaligned buffer address %p\n", state->user_buffer); - return 0; - } - - // Check if length is aligned - if (state->len != state->len_aligned) { - sdhc_debug("Unaligned buffer length %zd\n", state->len); - return 0; - } - - // Aligned - return 1; -} - -int bounce_buffer_start(struct bounce_buffer *state, void *data, - size_t len, unsigned int flags) -{ - state->user_buffer = data; - state->bounce_buffer = data; - state->len = len; - state->len_aligned = ROUND(len, ARCH_DMA_MINALIGN); - state->flags = flags; - - if (!addr_aligned(state)) { - state->bounce_buffer = memalign(ARCH_DMA_MINALIGN, - state->len_aligned); - if (!state->bounce_buffer) - return -1; - - if (state->flags & GEN_BB_READ) - memcpy(state->bounce_buffer, state->user_buffer, - state->len); - } - - /* - * Flush data to RAM so DMA reads can pick it up, - * and any CPU writebacks don't race with DMA writes - */ - dcache_clean_invalidate_by_mva(state->bounce_buffer, - state->len_aligned); - return 0; -} - -int bounce_buffer_stop(struct bounce_buffer *state) -{ - if (state->flags & GEN_BB_WRITE) { - // Invalidate cache so that CPU can see any newly DMA'd data - dcache_invalidate_by_mva(state->bounce_buffer, - state->len_aligned); - } - - if (state->bounce_buffer == state->user_buffer) - return 0; - - if (state->flags & GEN_BB_WRITE) - memcpy(state->user_buffer, state->bounce_buffer, state->len); - - free(state->bounce_buffer); - - return 0; -} |