mirror of
https://github.com/torvalds/linux.git
synced 2024-11-13 23:51:39 +00:00
efa631c26d
In 'pci_swiotlb_detect' we used to do two different things:
a). If user provided 'iommu=soft' or 'swiotlb=force' we
would set swiotlb=1 and return 1 (and forcing pci-dma.c
to call pci_swiotlb_init() immediately).
b). If 4GB or more would be detected and if user did not specify
iommu=off, we would set 'swiotlb=1' and return whatever 'a)'
figured out.
We simplify this by splitting a) and b) in two different routines.
CC: Fujita Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
LKML-Reference: <1282845485-8991-5-git-send-email-konrad.wilk@oracle.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
33 lines
670 B
C
33 lines
670 B
C
#ifndef _ASM_X86_SWIOTLB_H
|
|
#define _ASM_X86_SWIOTLB_H
|
|
|
|
#include <linux/swiotlb.h>
|
|
|
|
#ifdef CONFIG_SWIOTLB
|
|
extern int swiotlb;
|
|
extern int __init pci_swiotlb_detect_override(void);
|
|
extern int __init pci_swiotlb_detect_4gb(void);
|
|
extern void __init pci_swiotlb_init(void);
|
|
extern void __init pci_swiotlb_late_init(void);
|
|
#else
|
|
#define swiotlb 0
|
|
static inline int pci_swiotlb_detect_override(void)
|
|
{
|
|
return 0;
|
|
}
|
|
static inline int pci_swiotlb_detect_4gb(void)
|
|
{
|
|
return 0;
|
|
}
|
|
static inline void pci_swiotlb_init(void)
|
|
{
|
|
}
|
|
static inline void pci_swiotlb_late_init(void)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
static inline void dma_mark_clean(void *addr, size_t size) {}
|
|
|
|
#endif /* _ASM_X86_SWIOTLB_H */
|