Commit 4927cb98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:

 - Fix broken soft dirty tracking when using the Radix MMU (>= P9)

 - Fix ISA mapping when "ranges" property is not present, for PASemi
   Nemo boards

 - Fix a possible WARN_ON_ONCE hitting in BPF extable handling

 - Fix incorrect DMA address handling when using 2MB TCEs

 - Fix a bug in IOMMU table handling for SR-IOV devices

 - Fix the recent rework of IOMMU handling which left arch code calling
   clean up routines that are handled by the IOMMU core

 - A few assorted build fixes

Thanks to Christian Zigotzky, Dan Horák, Gaurav Batra, Hari Bathini,
Jason Gunthorpe, Nathan Chancellor, Naveen N. Rao, Nicholas Piggin, Pali
Rohár, Randy Dunlap, and Rob Herring.

* tag 'powerpc-6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/iommu: Incorrect DDW Table is referenced for SR-IOV device
  powerpc/iommu: DMA address offset is incorrectly calculated with 2MB TCEs
  powerpc/iommu: Remove iommu_del_device()
  powerpc/crypto: Fix aes-gcm-p10 build when VSX=n
  powerpc/bpf: populate extable entries only during the last pass
  powerpc/boot: Disable power10 features after BOOTAFLAGS assignment
  powerpc/64s/radix: Fix soft dirty tracking
  powerpc/fsl_uli1575: fix kconfig warnings and build errors
  powerpc/isa-bridge: Fix ISA mapping when "ranges" is not present
parents 90af47ed 1f7aacc5

arch/powerpc/boot/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ endif 


BOOTCFLAGS    := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \

		 -fno-strict-aliasing -O2 -msoft-float -mno-altivec -mno-vsx \

		 $(call cc-option,-mno-prefixed) $(call cc-option,-mno-pcrel) \

		 $(call cc-option,-mno-mma) \

		 $(call cc-option,-mno-spe) $(call cc-option,-mspe=no) \

		 -pipe -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \

		 $(LINUXINCLUDE)
@@ -71,6 +69,10 @@ BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -nostdinc 


BOOTARFLAGS	:= -crD



BOOTCFLAGS	+= $(call cc-option,-mno-prefixed) \

		   $(call cc-option,-mno-pcrel) \

		   $(call cc-option,-mno-mma)



ifdef CONFIG_CC_IS_CLANG

BOOTCFLAGS += $(CLANG_FLAGS)

BOOTAFLAGS += $(CLANG_FLAGS)

arch/powerpc/crypto/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ config CRYPTO_AES_PPC_SPE 


config CRYPTO_AES_GCM_P10

	tristate "Stitched AES/GCM acceleration support on P10 or later CPU (PPC)"

	depends on PPC64 && CPU_LITTLE_ENDIAN

	depends on PPC64 && CPU_LITTLE_ENDIAN && VSX

	select CRYPTO_LIB_AES

	select CRYPTO_ALGAPI

	select CRYPTO_AEAD

arch/powerpc/include/asm/iommu.h

+0 −5
Original line number Diff line number Diff line
@@ -205,7 +205,6 @@ extern void iommu_register_group(struct iommu_table_group *table_group, 
				 int pci_domain_number, unsigned long pe_num);

extern int iommu_add_device(struct iommu_table_group *table_group,

		struct device *dev);

extern void iommu_del_device(struct device *dev);

extern long iommu_tce_xchg(struct mm_struct *mm, struct iommu_table *tbl,

		unsigned long entry, unsigned long *hpa,

		enum dma_data_direction *direction);
@@ -229,10 +228,6 @@ static inline int iommu_add_device(struct iommu_table_group *table_group, 
{

	return 0;

}



static inline void iommu_del_device(struct device *dev)

{

}

#endif /* !CONFIG_IOMMU_API */



u64 dma_iommu_get_required_mask(struct device *dev);

arch/powerpc/kernel/dma-iommu.c

+3 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static bool dma_iommu_bypass_supported(struct device *dev, u64 mask) 
/* We support DMA to/from any memory page via the iommu */

int dma_iommu_dma_supported(struct device *dev, u64 mask)

{

	struct iommu_table *tbl = get_iommu_table_base(dev);

	struct iommu_table *tbl;



	if (dev_is_pci(dev) && dma_iommu_bypass_supported(dev, mask)) {

		/*
@@ -162,6 +162,8 @@ int dma_iommu_dma_supported(struct device *dev, u64 mask) 
		return 1;

	}



	tbl = get_iommu_table_base(dev);



	if (!tbl) {

		dev_err(dev, "Warning: IOMMU dma not supported: mask 0x%08llx, table unavailable\n", mask);

		return 0;

arch/powerpc/kernel/iommu.c

+7 −21
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ int ppc_iommu_map_sg(struct device *dev, struct iommu_table *tbl, 
		/* Convert entry to a dma_addr_t */

		entry += tbl->it_offset;

		dma_addr = entry << tbl->it_page_shift;

		dma_addr |= (s->offset & ~IOMMU_PAGE_MASK(tbl));

		dma_addr |= (vaddr & ~IOMMU_PAGE_MASK(tbl));



		DBG("  - %lu pages, entry: %lx, dma_addr: %lx\n",

			    npages, entry, dma_addr);
@@ -905,6 +905,7 @@ void *iommu_alloc_coherent(struct device *dev, struct iommu_table *tbl, 
	unsigned int order;

	unsigned int nio_pages, io_order;

	struct page *page;

	int tcesize = (1 << tbl->it_page_shift);



	size = PAGE_ALIGN(size);

	order = get_order(size);
@@ -931,7 +932,8 @@ void *iommu_alloc_coherent(struct device *dev, struct iommu_table *tbl, 
	memset(ret, 0, size);



	/* Set up tces to cover the allocated range */

	nio_pages = size >> tbl->it_page_shift;

	nio_pages = IOMMU_PAGE_ALIGN(size, tbl) >> tbl->it_page_shift;



	io_order = get_iommu_order(size, tbl);

	mapping = iommu_alloc(dev, tbl, ret, nio_pages, DMA_BIDIRECTIONAL,

			      mask >> tbl->it_page_shift, io_order, 0);
@@ -939,7 +941,8 @@ void *iommu_alloc_coherent(struct device *dev, struct iommu_table *tbl, 
		free_pages((unsigned long)ret, order);

		return NULL;

	}

	*dma_handle = mapping;



	*dma_handle = mapping | ((u64)ret & (tcesize - 1));

	return ret;

}
@@ -950,7 +953,7 @@ void iommu_free_coherent(struct iommu_table *tbl, size_t size, 
		unsigned int nio_pages;



		size = PAGE_ALIGN(size);

		nio_pages = size >> tbl->it_page_shift;

		nio_pages = IOMMU_PAGE_ALIGN(size, tbl) >> tbl->it_page_shift;

		iommu_free(tbl, dma_handle, nio_pages);

		size = PAGE_ALIGN(size);

		free_pages((unsigned long)vaddr, get_order(size));
@@ -1168,23 +1171,6 @@ int iommu_add_device(struct iommu_table_group *table_group, struct device *dev) 
}

EXPORT_SYMBOL_GPL(iommu_add_device);



void iommu_del_device(struct device *dev)

{

	/*

	 * Some devices might not have IOMMU table and group

	 * and we needn't detach them from the associated

	 * IOMMU groups

	 */

	if (!device_iommu_mapped(dev)) {

		pr_debug("iommu_tce: skipping device %s with no tbl\n",

			 dev_name(dev));

		return;

	}



	iommu_group_remove_device(dev);

}

EXPORT_SYMBOL_GPL(iommu_del_device);



/*

 * A simple iommu_table_group_ops which only allows reusing the existing

 * iommu_table. This handles VFIO for POWER7 or the nested KVM.