diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-05-17 16:23:51 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-05-17 16:23:51 +0200 |
| commit | 1fb97c97120377c70a1096a9f8a355d29c11f0d4 (patch) | |
| tree | 81a227ccf825c5032e8c5057d380e63a487d05c9 /arch | |
| parent | dee7a15dfaa640130d0b9bc289e5d55b358a2dbc (diff) | |
| parent | 263d3c2105edec00e1e3e67770eb0a870567dbc4 (diff) | |
| download | barebox-1fb97c97120377c70a1096a9f8a355d29c11f0d4.tar.gz barebox-1fb97c97120377c70a1096a9f8a355d29c11f0d4.tar.xz | |
Merge branch 'for-next/x86'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/pci.h | 7 | ||||
| -rw-r--r-- | arch/mips/include/asm/pci.h | 7 | ||||
| -rw-r--r-- | arch/x86/Kconfig | 1 | ||||
| -rw-r--r-- | arch/x86/configs/efi_defconfig | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/dma.h | 36 | ||||
| -rw-r--r-- | arch/x86/include/asm/pci.h | 7 |
6 files changed, 59 insertions, 1 deletions
diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h new file mode 100644 index 0000000000..d7419cabe7 --- /dev/null +++ b/arch/arm/include/asm/pci.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_PCI_H +#define __ASM_PCI_H + +#define pcibios_assign_all_busses() 1 + +#endif diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h new file mode 100644 index 0000000000..d7419cabe7 --- /dev/null +++ b/arch/mips/include/asm/pci.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_PCI_H +#define __ASM_PCI_H + +#define pcibios_assign_all_busses() 1 + +#endif diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 311c3d1a8e..bcb44b23f0 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -4,6 +4,7 @@ config X86 bool select HAS_KALLSYMS + select HAS_DMA select GENERIC_FIND_NEXT_BIT default y diff --git a/arch/x86/configs/efi_defconfig b/arch/x86/configs/efi_defconfig index 761ffbe261..73614dd4b4 100644 --- a/arch/x86/configs/efi_defconfig +++ b/arch/x86/configs/efi_defconfig @@ -87,7 +87,9 @@ CONFIG_STATE_DRV=y CONFIG_WATCHDOG=y CONFIG_WATCHDOG_EFI=y CONFIG_F71808E_WDT=y +CONFIG_ITCO_WDT=y # CONFIG_PINCTRL is not set +CONFIG_PCI_EFI=y CONFIG_FS_EXT4=y CONFIG_FS_TFTP=y CONFIG_FS_NFS=y diff --git a/arch/x86/include/asm/dma.h b/arch/x86/include/asm/dma.h index 3dab2b688d..8a3b044f3a 100644 --- a/arch/x86/include/asm/dma.h +++ b/arch/x86/include/asm/dma.h @@ -4,6 +4,40 @@ #ifndef __ASM_DMA_H #define __ASM_DMA_H -/* empty */ +#include <linux/string.h> +#include <linux/compiler.h> +#include <xfuncs.h> +#include <malloc.h> + +/* + * x86 is cache coherent, so we need not do anything special here + */ + +static inline void *dma_alloc_coherent(size_t size, dma_addr_t *dma_handle) +{ + void *ret = xmemalign(4096, size); + if (dma_handle) + *dma_handle = (dma_addr_t)ret; + + memset(ret, 0, size); + + return ret; +} + +static inline void dma_free_coherent(void *mem, dma_addr_t dma_handle, + size_t size) +{ + free(mem); +} + +static inline void dma_sync_single_for_cpu(dma_addr_t address, size_t size, + enum dma_data_direction dir) +{ +} + +static inline void dma_sync_single_for_device(dma_addr_t address, size_t size, + enum dma_data_direction dir) +{ +} #endif /* __ASM_DMA_H */ diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h new file mode 100644 index 0000000000..ca1c0f912d --- /dev/null +++ b/arch/x86/include/asm/pci.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_PCI_H +#define __ASM_PCI_H + +#define pcibios_assign_all_busses() 0 + +#endif |