Commit 8ba2ed1b authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

swiotlb: add a SWIOTLB_ANY flag to lift the low memory restriction 



Power SVM wants to allocate a swiotlb buffer that is not restricted to
low memory for the trusted hypervisor scheme.  Consolidate the support
for this into the swiotlb_init interface by adding a new flag.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tested-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
parent c6af2aa9

arch/powerpc/include/asm/svm.h

+0 −4
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ static inline bool is_secure_guest(void) 
	return mfmsr() & MSR_S;

}



void __init svm_swiotlb_init(void);



void dtl_cache_ctor(void *addr);

#define get_dtl_cache_ctor()	(is_secure_guest() ? dtl_cache_ctor : NULL)
@@ -27,8 +25,6 @@ static inline bool is_secure_guest(void) 
	return false;

}



static inline void svm_swiotlb_init(void) {}



#define get_dtl_cache_ctor() NULL



#endif /* CONFIG_PPC_SVM */

arch/powerpc/include/asm/swiotlb.h

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/swiotlb.h>



extern unsigned int ppc_swiotlb_enable;

extern unsigned int ppc_swiotlb_flags;



#ifdef CONFIG_SWIOTLB

void swiotlb_detect_4g(void);

arch/powerpc/kernel/dma-swiotlb.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <asm/swiotlb.h>



unsigned int ppc_swiotlb_enable;

unsigned int ppc_swiotlb_flags;



void __init swiotlb_detect_4g(void)

{

arch/powerpc/mm/mem.c

+1 −4
Original line number Diff line number Diff line
@@ -249,10 +249,7 @@ void __init mem_init(void) 
	 * back to to-down.

	 */

	memblock_set_bottom_up(true);

	if (is_secure_guest())

		svm_swiotlb_init();

	else

		swiotlb_init(ppc_swiotlb_enable, 0);

	swiotlb_init(ppc_swiotlb_enable, ppc_swiotlb_flags);

#endif



	high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);

arch/powerpc/platforms/pseries/svm.c

+1 −25
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static int __init init_svm(void) 
	 * need to use the SWIOTLB buffer for DMA even if dma_capable() says

	 * otherwise.

	 */

	swiotlb_force = SWIOTLB_FORCE;

	ppc_swiotlb_flags |= SWIOTLB_ANY | SWIOTLB_FORCE;



	/* Share the SWIOTLB buffer with the host. */

	swiotlb_update_mem_attributes();
@@ -37,30 +37,6 @@ static int __init init_svm(void) 
}

machine_early_initcall(pseries, init_svm);



/*

 * Initialize SWIOTLB. Essentially the same as swiotlb_init(), except that it

 * can allocate the buffer anywhere in memory. Since the hypervisor doesn't have

 * any addressing limitation, we don't need to allocate it in low addresses.

 */

void __init svm_swiotlb_init(void)

{

	unsigned char *vstart;

	unsigned long bytes, io_tlb_nslabs;



	io_tlb_nslabs = (swiotlb_size_or_default() >> IO_TLB_SHIFT);

	io_tlb_nslabs = ALIGN(io_tlb_nslabs, IO_TLB_SEGSIZE);



	bytes = io_tlb_nslabs << IO_TLB_SHIFT;



	vstart = memblock_alloc(PAGE_ALIGN(bytes), PAGE_SIZE);

	if (vstart && !swiotlb_init_with_tbl(vstart, io_tlb_nslabs, false))

		return;





	memblock_free(vstart, PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT));

	panic("SVM: Cannot allocate SWIOTLB buffer");

}



int set_memory_encrypted(unsigned long addr, int numpages)

{

	if (!cc_platform_has(CC_ATTR_MEM_ENCRYPT))