Commit 2c302e7e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc updates from David Miller:
 "Just a couple of fixes/cleanups:

   - Correct NUMA latency calculations on sparc64, from Nitin Gupta.

   - ASI_ST_BLKINIT_MRU_S value was wrong, from Rob Gardner.

   - Fix non-faulting load handling of non-quad values, also from Rob
     Gardner.

   - Cleanup VISsave assembler, from Sam Ravnborg.

   - Fix iommu-common code so it doesn't emit rediculous warnings on
     some architectures, particularly ARM"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Fix numa distance values
  sparc64: Don't restrict fp regs for no-fault loads
  iommu-common: Fix error code used in iommu_tbl_range_{alloc,free}().
  sparc64: use ENTRY/ENDPROC in VISsave
  sparc64: Fix incorrect ASI_ST_BLKINIT_MRU_S value
parents 933425fb 52708d69

arch/sparc/include/asm/topology_64.h

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ static inline int pcibus_to_node(struct pci_bus *pbus) 
	 cpu_all_mask : \

	 cpumask_of_node(pcibus_to_node(bus)))



int __node_distance(int, int);

#define node_distance(a, b) __node_distance(a, b)



#else /* CONFIG_NUMA */



#include <asm-generic/topology.h>

arch/sparc/include/uapi/asm/asi.h

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ 
				      * Most-Recently-Used, primary,

				      * implicit

				      */

#define ASI_ST_BLKINIT_MRU_S	0xf2 /* (NG4) init-store, twin load,

#define ASI_ST_BLKINIT_MRU_S	0xf3 /* (NG4) init-store, twin load,

				      * Most-Recently-Used, secondary,

				      * implicit

				      */

arch/sparc/kernel/iommu.c

+6 −6
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static inline iopte_t *alloc_npages(struct device *dev, 


	entry = iommu_tbl_range_alloc(dev, &iommu->tbl, npages, NULL,

				      (unsigned long)(-1), 0);

	if (unlikely(entry == DMA_ERROR_CODE))

	if (unlikely(entry == IOMMU_ERROR_CODE))

		return NULL;



	return iommu->page_table + entry;
@@ -253,7 +253,7 @@ static void dma_4u_free_coherent(struct device *dev, size_t size, 
	npages = IO_PAGE_ALIGN(size) >> IO_PAGE_SHIFT;

	iommu = dev->archdata.iommu;



	iommu_tbl_range_free(&iommu->tbl, dvma, npages, DMA_ERROR_CODE);

	iommu_tbl_range_free(&iommu->tbl, dvma, npages, IOMMU_ERROR_CODE);



	order = get_order(size);

	if (order < 10)
@@ -426,7 +426,7 @@ static void dma_4u_unmap_page(struct device *dev, dma_addr_t bus_addr, 
	iommu_free_ctx(iommu, ctx);

	spin_unlock_irqrestore(&iommu->lock, flags);



	iommu_tbl_range_free(&iommu->tbl, bus_addr, npages, DMA_ERROR_CODE);

	iommu_tbl_range_free(&iommu->tbl, bus_addr, npages, IOMMU_ERROR_CODE);

}



static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,
@@ -492,7 +492,7 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist, 
					      &handle, (unsigned long)(-1), 0);



		/* Handle failure */

		if (unlikely(entry == DMA_ERROR_CODE)) {

		if (unlikely(entry == IOMMU_ERROR_CODE)) {

			if (printk_ratelimit())

				printk(KERN_INFO "iommu_alloc failed, iommu %p paddr %lx"

				       " npages %lx\n", iommu, paddr, npages);
@@ -571,7 +571,7 @@ iommu_map_failed: 
				iopte_make_dummy(iommu, base + j);



			iommu_tbl_range_free(&iommu->tbl, vaddr, npages,

					     DMA_ERROR_CODE);

					     IOMMU_ERROR_CODE);



			s->dma_address = DMA_ERROR_CODE;

			s->dma_length = 0;
@@ -648,7 +648,7 @@ static void dma_4u_unmap_sg(struct device *dev, struct scatterlist *sglist, 
			iopte_make_dummy(iommu, base + i);



		iommu_tbl_range_free(&iommu->tbl, dma_handle, npages,

				     DMA_ERROR_CODE);

				     IOMMU_ERROR_CODE);

		sg = sg_next(sg);

	}

arch/sparc/kernel/ldc.c

+1 −1
Original line number Diff line number Diff line
@@ -1953,7 +1953,7 @@ static struct ldc_mtable_entry *alloc_npages(struct ldc_iommu *iommu, 


	entry = iommu_tbl_range_alloc(NULL, &iommu->iommu_map_table,

				      npages, NULL, (unsigned long)-1, 0);

	if (unlikely(entry < 0))

	if (unlikely(entry == IOMMU_ERROR_CODE))

		return NULL;



	return iommu->page_table + entry;

arch/sparc/kernel/pci_sun4v.c

+9 −9
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size, 
	entry = iommu_tbl_range_alloc(dev, &iommu->tbl, npages, NULL,

				      (unsigned long)(-1), 0);



	if (unlikely(entry == DMA_ERROR_CODE))

	if (unlikely(entry == IOMMU_ERROR_CODE))

		goto range_alloc_fail;



	*dma_addrp = (iommu->tbl.table_map_base + (entry << IO_PAGE_SHIFT));
@@ -187,7 +187,7 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size, 
	return ret;



iommu_map_fail:

	iommu_tbl_range_free(&iommu->tbl, *dma_addrp, npages, DMA_ERROR_CODE);

	iommu_tbl_range_free(&iommu->tbl, *dma_addrp, npages, IOMMU_ERROR_CODE);



range_alloc_fail:

	free_pages(first_page, order);
@@ -226,7 +226,7 @@ static void dma_4v_free_coherent(struct device *dev, size_t size, void *cpu, 
	devhandle = pbm->devhandle;

	entry = ((dvma - iommu->tbl.table_map_base) >> IO_PAGE_SHIFT);

	dma_4v_iommu_demap(&devhandle, entry, npages);

	iommu_tbl_range_free(&iommu->tbl, dvma, npages, DMA_ERROR_CODE);

	iommu_tbl_range_free(&iommu->tbl, dvma, npages, IOMMU_ERROR_CODE);

	order = get_order(size);

	if (order < 10)

		free_pages((unsigned long)cpu, order);
@@ -256,7 +256,7 @@ static dma_addr_t dma_4v_map_page(struct device *dev, struct page *page, 
	entry = iommu_tbl_range_alloc(dev, &iommu->tbl, npages, NULL,

				      (unsigned long)(-1), 0);



	if (unlikely(entry == DMA_ERROR_CODE))

	if (unlikely(entry == IOMMU_ERROR_CODE))

		goto bad;



	bus_addr = (iommu->tbl.table_map_base + (entry << IO_PAGE_SHIFT));
@@ -288,7 +288,7 @@ bad: 
	return DMA_ERROR_CODE;



iommu_map_fail:

	iommu_tbl_range_free(&iommu->tbl, bus_addr, npages, DMA_ERROR_CODE);

	iommu_tbl_range_free(&iommu->tbl, bus_addr, npages, IOMMU_ERROR_CODE);

	return DMA_ERROR_CODE;

}
@@ -317,7 +317,7 @@ static void dma_4v_unmap_page(struct device *dev, dma_addr_t bus_addr, 
	bus_addr &= IO_PAGE_MASK;

	entry = (bus_addr - iommu->tbl.table_map_base) >> IO_PAGE_SHIFT;

	dma_4v_iommu_demap(&devhandle, entry, npages);

	iommu_tbl_range_free(&iommu->tbl, bus_addr, npages, DMA_ERROR_CODE);

	iommu_tbl_range_free(&iommu->tbl, bus_addr, npages, IOMMU_ERROR_CODE);

}



static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
@@ -376,7 +376,7 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist, 
					      &handle, (unsigned long)(-1), 0);



		/* Handle failure */

		if (unlikely(entry == DMA_ERROR_CODE)) {

		if (unlikely(entry == IOMMU_ERROR_CODE)) {

			if (printk_ratelimit())

				printk(KERN_INFO "iommu_alloc failed, iommu %p paddr %lx"

				       " npages %lx\n", iommu, paddr, npages);
@@ -451,7 +451,7 @@ iommu_map_failed: 
			npages = iommu_num_pages(s->dma_address, s->dma_length,

						 IO_PAGE_SIZE);

			iommu_tbl_range_free(&iommu->tbl, vaddr, npages,

					     DMA_ERROR_CODE);

					     IOMMU_ERROR_CODE);

			/* XXX demap? XXX */

			s->dma_address = DMA_ERROR_CODE;

			s->dma_length = 0;
@@ -496,7 +496,7 @@ static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist, 
		entry = ((dma_handle - tbl->table_map_base) >> shift);

		dma_4v_iommu_demap(&devhandle, entry, npages);

		iommu_tbl_range_free(&iommu->tbl, dma_handle, npages,

				     DMA_ERROR_CODE);

				     IOMMU_ERROR_CODE);

		sg = sg_next(sg);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE