Commit 5e268309 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-v4.19-rc1' of git://git.monstr.eu/linux-2.6-microblaze 

Pull arch/microblaze updates from Michal Simek:

 - use generic noncoherent direct mapping

 - use LDFLAGS instead of LD

 - pci error path fix

 - remove incorrect comments

* tag 'microblaze-v4.19-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze/PCI: Remove stale pcibios_align_resource() comment
  microblaze: delete wrong comment about machine_early_init
  microblaze: add endianness options to LDFLAGS instead of LD
  microblaze: remove consistent_sync and consistent_sync_page
  microblaze: use generic dma_noncoherent_ops
  microblaze: warn if of_iomap() failed
parents 778a3395 c4347b05

arch/microblaze/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ config MICROBLAZE 
	def_bool y

	select ARCH_NO_SWAP

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_SYNC_DMA_FOR_CPU

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_NO_COHERENT_DMA_MMAP if !MMU

	select ARCH_WANT_IPC_PARSE_VERSION
@@ -9,6 +11,8 @@ config MICROBLAZE 
	select TIMER_OF

	select CLONE_BACKWARDS3

	select COMMON_CLK

	select DMA_NONCOHERENT_OPS

	select DMA_NONCOHERENT_MMAP

	select GENERIC_ATOMIC64

	select GENERIC_CLOCKEVENTS

	select GENERIC_CPU_DEVICES

arch/microblaze/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -40,11 +40,11 @@ CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR) += -mxl-pattern-compare 
ifdef CONFIG_CPU_BIG_ENDIAN

KBUILD_CFLAGS += -mbig-endian

KBUILD_AFLAGS += -mbig-endian

LD += -EB

LDFLAGS += -EB

else

KBUILD_CFLAGS += -mlittle-endian

KBUILD_AFLAGS += -mlittle-endian

LD += -EL

LDFLAGS += -EL

endif



CPUFLAGS-1 += $(call cc-option,-mcpu=v$(CPU_VER))

arch/microblaze/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ generic-y += bugs.h 
generic-y += compat.h

generic-y += device.h

generic-y += div64.h

generic-y += dma-mapping.h

generic-y += emergency-restart.h

generic-y += exec.h

generic-y += extable.h

arch/microblaze/include/asm/dma-mapping.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
/*

 * Implements the generic device dma API for microblaze and the pci

 *

 * Copyright (C) 2009-2010 Michal Simek <monstr@monstr.eu>

 * Copyright (C) 2009-2010 PetaLogix

 *

 * This file is subject to the terms and conditions of the GNU General

 * Public License. See the file COPYING in the main directory of this

 * archive for more details.

 *

 * This file is base on powerpc and x86 dma-mapping.h versions

 * Copyright (C) 2004 IBM

 */



#ifndef _ASM_MICROBLAZE_DMA_MAPPING_H

#define _ASM_MICROBLAZE_DMA_MAPPING_H



/*

 * Available generic sets of operations

 */

extern const struct dma_map_ops dma_nommu_ops;



static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)

{

	return &dma_nommu_ops;

}



#endif	/* _ASM_MICROBLAZE_DMA_MAPPING_H */

arch/microblaze/include/asm/pgtable.h

+0 −5
Original line number Diff line number Diff line
@@ -553,11 +553,6 @@ void __init *early_get_page(void); 


extern unsigned long ioremap_bot, ioremap_base;



void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle);

void consistent_free(size_t size, void *vaddr);

void consistent_sync(void *vaddr, size_t size, int direction);

void consistent_sync_page(struct page *page, unsigned long offset,

	size_t size, int direction);

unsigned long consistent_virt_to_pfn(void *vaddr);



void setup_memory(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE