Message ID | 20160718105331.30310-1-sr@denx.de |
---|---|
State | Accepted |
Commit | bf4ea7ed210f27df35315b8089662e84ba7dfadb |
Delegated to: | Bin Meng |
Headers | show |
On Mon, Jul 18, 2016 at 6:53 PM, Stefan Roese <sr@denx.de> wrote: > Don't just define ARCH_DMA_MINALIGN but also CONFIG_SYS_CACHELINE_SIZE > if its undefined. This is needed for the xhci driver to compile. nits: it's I can fix this when applying. > > Signed-off-by: Stefan Roese <sr@denx.de> > Cc: Simon Glass <sjg@chromium.org> > Cc: Bin Meng <bmeng.cn@gmail.com> > --- > arch/x86/include/asm/cache.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
On Tue, Jul 19, 2016 at 11:47 AM, Bin Meng <bmeng.cn@gmail.com> wrote: > On Mon, Jul 18, 2016 at 6:53 PM, Stefan Roese <sr@denx.de> wrote: >> Don't just define ARCH_DMA_MINALIGN but also CONFIG_SYS_CACHELINE_SIZE >> if its undefined. This is needed for the xhci driver to compile. > > nits: it's > > I can fix this when applying. Fixed this, and > >> >> Signed-off-by: Stefan Roese <sr@denx.de> >> Cc: Simon Glass <sjg@chromium.org> >> Cc: Bin Meng <bmeng.cn@gmail.com> >> --- >> arch/x86/include/asm/cache.h | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> > > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> applied to u-boot-x86, thanks!
diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h index 508b63f..4ff63c3 100644 --- a/arch/x86/include/asm/cache.h +++ b/arch/x86/include/asm/cache.h @@ -11,12 +11,12 @@ * If CONFIG_SYS_CACHELINE_SIZE is defined use it for DMA alignment. Otherwise * use 64-bytes, a safe default for x86. */ -#ifdef CONFIG_SYS_CACHELINE_SIZE -#define ARCH_DMA_MINALIGN CONFIG_SYS_CACHELINE_SIZE -#else -#define ARCH_DMA_MINALIGN 64 +#ifndef CONFIG_SYS_CACHELINE_SIZE +#define CONFIG_SYS_CACHELINE_SIZE 64 #endif +#define ARCH_DMA_MINALIGN CONFIG_SYS_CACHELINE_SIZE + static inline void wbinvd(void) { asm volatile ("wbinvd" : : : "memory");
Don't just define ARCH_DMA_MINALIGN but also CONFIG_SYS_CACHELINE_SIZE if its undefined. This is needed for the xhci driver to compile. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Bin Meng <bmeng.cn@gmail.com> --- arch/x86/include/asm/cache.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)