Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42f14237 authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC64]: Respect gfp_t argument to dma_alloc_coherent(). 



Using asm-generic/dma-mapping.h does not work because pushing
the call down to pci_alloc_coherent() causes the gfp_t argument
of dma_alloc_coherent() to be ignored.

Fix this by implementing things directly, and adding a gfp_t
argument we can use in the internal call down to the PCI DMA
implementation of pci_alloc_coherent().

This fixes massive memory corruption when using the sound driver
layer, which passes things like __GFP_COMP down into these
routines and (correctly) expects that to work.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 353b28ba

arch/sparc64/kernel/pci_iommu.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -218,7 +218,7 @@ static inline void iommu_free_ctx(struct pci_iommu *iommu, int ctx) 
 * DMA for PCI device PDEV.  Return non-NULL cpu-side address if

 * DMA for PCI device PDEV.  Return non-NULL cpu-side address if

 * successful and set *DMA_ADDRP to the PCI side dma address.

 * successful and set *DMA_ADDRP to the PCI side dma address.

 */

 */

static void *pci_4u_alloc_consistent(struct pci_dev *pdev, size_t size, dma_addr_t *dma_addrp)

static void *pci_4u_alloc_consistent(struct pci_dev *pdev, size_t size, dma_addr_t *dma_addrp, gfp_t gfp)

{

{

	struct pcidev_cookie *pcp;

	struct pcidev_cookie *pcp;

	struct pci_iommu *iommu;

	struct pci_iommu *iommu;
@@ -232,7 +232,7 @@ static void *pci_4u_alloc_consistent(struct pci_dev *pdev, size_t size, dma_addr 
	if (order >= 10)

	if (order >= 10)

		return NULL;

		return NULL;





	first_page = __get_free_pages(GFP_ATOMIC, order);

	first_page = __get_free_pages(gfp, order);

	if (first_page == 0UL)

	if (first_page == 0UL)

		return NULL;

		return NULL;

	memset((char *)first_page, 0, PAGE_SIZE << order);

	memset((char *)first_page, 0, PAGE_SIZE << order);

arch/sparc64/kernel/pci_sun4v.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -154,7 +154,7 @@ static void pci_arena_free(struct pci_iommu_arena *arena, unsigned long base, un 
		__clear_bit(i, arena->map);

		__clear_bit(i, arena->map);

}

}





static void *pci_4v_alloc_consistent(struct pci_dev *pdev, size_t size, dma_addr_t *dma_addrp)

static void *pci_4v_alloc_consistent(struct pci_dev *pdev, size_t size, dma_addr_t *dma_addrp, gfp_t gfp)

{

{

	struct pcidev_cookie *pcp;

	struct pcidev_cookie *pcp;

	struct pci_iommu *iommu;

	struct pci_iommu *iommu;
@@ -169,7 +169,7 @@ static void *pci_4v_alloc_consistent(struct pci_dev *pdev, size_t size, dma_addr 




	npages = size >> IO_PAGE_SHIFT;

	npages = size >> IO_PAGE_SHIFT;





	first_page = __get_free_pages(GFP_ATOMIC, order);

	first_page = __get_free_pages(gfp, order);

	if (unlikely(first_page == 0UL))

	if (unlikely(first_page == 0UL))

		return NULL;

		return NULL;

include/asm-sparc64/dma-mapping.h

+140 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,146 @@ 
#include <linux/config.h>

#include <linux/config.h>





#ifdef CONFIG_PCI

#ifdef CONFIG_PCI

#include <asm-generic/dma-mapping.h>



/* we implement the API below in terms of the existing PCI one,

 * so include it */

#include <linux/pci.h>

/* need struct page definitions */

#include <linux/mm.h>



static inline int

dma_supported(struct device *dev, u64 mask)

{

	BUG_ON(dev->bus != &pci_bus_type);



	return pci_dma_supported(to_pci_dev(dev), mask);

}



static inline int

dma_set_mask(struct device *dev, u64 dma_mask)

{

	BUG_ON(dev->bus != &pci_bus_type);



	return pci_set_dma_mask(to_pci_dev(dev), dma_mask);

}



static inline void *

dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,

		   gfp_t flag)

{

	BUG_ON(dev->bus != &pci_bus_type);



	return pci_iommu_ops->alloc_consistent(to_pci_dev(dev), size, dma_handle, flag);

}



static inline void

dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,

		    dma_addr_t dma_handle)

{

	BUG_ON(dev->bus != &pci_bus_type);



	pci_free_consistent(to_pci_dev(dev), size, cpu_addr, dma_handle);

}



static inline dma_addr_t

dma_map_single(struct device *dev, void *cpu_addr, size_t size,

	       enum dma_data_direction direction)

{

	BUG_ON(dev->bus != &pci_bus_type);



	return pci_map_single(to_pci_dev(dev), cpu_addr, size, (int)direction);

}



static inline void

dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,

		 enum dma_data_direction direction)

{

	BUG_ON(dev->bus != &pci_bus_type);



	pci_unmap_single(to_pci_dev(dev), dma_addr, size, (int)direction);

}



static inline dma_addr_t

dma_map_page(struct device *dev, struct page *page,

	     unsigned long offset, size_t size,

	     enum dma_data_direction direction)

{

	BUG_ON(dev->bus != &pci_bus_type);



	return pci_map_page(to_pci_dev(dev), page, offset, size, (int)direction);

}



static inline void

dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,

	       enum dma_data_direction direction)

{

	BUG_ON(dev->bus != &pci_bus_type);



	pci_unmap_page(to_pci_dev(dev), dma_address, size, (int)direction);

}



static inline int

dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,

	   enum dma_data_direction direction)

{

	BUG_ON(dev->bus != &pci_bus_type);



	return pci_map_sg(to_pci_dev(dev), sg, nents, (int)direction);

}



static inline void

dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,

	     enum dma_data_direction direction)

{

	BUG_ON(dev->bus != &pci_bus_type);



	pci_unmap_sg(to_pci_dev(dev), sg, nhwentries, (int)direction);

}



static inline void

dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,

			enum dma_data_direction direction)

{

	BUG_ON(dev->bus != &pci_bus_type);



	pci_dma_sync_single_for_cpu(to_pci_dev(dev), dma_handle,

				    size, (int)direction);

}



static inline void

dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,

			   enum dma_data_direction direction)

{

	BUG_ON(dev->bus != &pci_bus_type);



	pci_dma_sync_single_for_device(to_pci_dev(dev), dma_handle,

				       size, (int)direction);

}



static inline void

dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,

		    enum dma_data_direction direction)

{

	BUG_ON(dev->bus != &pci_bus_type);



	pci_dma_sync_sg_for_cpu(to_pci_dev(dev), sg, nelems, (int)direction);

}



static inline void

dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,

		       enum dma_data_direction direction)

{

	BUG_ON(dev->bus != &pci_bus_type);



	pci_dma_sync_sg_for_device(to_pci_dev(dev), sg, nelems, (int)direction);

}



static inline int

dma_mapping_error(dma_addr_t dma_addr)

{

	return pci_dma_mapping_error(dma_addr);

}



#else

#else





struct device;

struct device;

include/asm-sparc64/pci.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) 
struct pci_dev;

struct pci_dev;





struct pci_iommu_ops {

struct pci_iommu_ops {

	void *(*alloc_consistent)(struct pci_dev *, size_t, dma_addr_t *);

	void *(*alloc_consistent)(struct pci_dev *, size_t, dma_addr_t *, gfp_t);

	void (*free_consistent)(struct pci_dev *, size_t, void *, dma_addr_t);

	void (*free_consistent)(struct pci_dev *, size_t, void *, dma_addr_t);

	dma_addr_t (*map_single)(struct pci_dev *, void *, size_t, int);

	dma_addr_t (*map_single)(struct pci_dev *, void *, size_t, int);

	void (*unmap_single)(struct pci_dev *, dma_addr_t, size_t, int);

	void (*unmap_single)(struct pci_dev *, dma_addr_t, size_t, int);
@@ -59,7 +59,7 @@ extern struct pci_iommu_ops *pci_iommu_ops; 
 */

 */

static inline void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size, dma_addr_t *dma_handle)

static inline void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size, dma_addr_t *dma_handle)

{

{

	return pci_iommu_ops->alloc_consistent(hwdev, size, dma_handle);

	return pci_iommu_ops->alloc_consistent(hwdev, size, dma_handle, GFP_ATOMIC);

}

}





/* Free and unmap a consistent DMA buffer.

/* Free and unmap a consistent DMA buffer.