Commit d597690e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge even more updates from Andrew Morton:

 - dma-mapping API cleanup

 - a few cleanups and misc things

 - use jump labels in dynamic-debug

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  dynamic_debug: add jump label support
  jump_label: remove bug.h, atomic.h dependencies for HAVE_JUMP_LABEL
  arm: jump label may reference text in __exit
  tile: support static_key usage in non-module __exit sections
  sparc: support static_key usage in non-module __exit sections
  powerpc: add explicit #include <asm/asm-compat.h> for jump label
  drivers/media/dvb-frontends/cxd2841er.c: avoid misleading gcc warning
  MAINTAINERS: update email and list of Samsung HW driver maintainers
  block: remove BLK_DEV_DAX config option
  samples/kretprobe: fix the wrong type
  samples/kretprobe: convert the printk to pr_info/pr_err
  samples/jprobe: convert the printk to pr_info/pr_err
  samples/kprobe: convert the printk to pr_info/pr_err
  dma-mapping: use unsigned long for dma_attrs
  media: mtk-vcodec: remove unused dma_attrs
  include/linux/bitmap.h: cleanup
  tree-wide: replace config_enabled() with IS_ENABLED()
  drivers/fpga/Kconfig: fix build failure
parents 96b58526 9049fc74

Documentation/DMA-API.txt

+14 −19
Original line number Diff line number Diff line
@@ -369,35 +369,32 @@ See also dma_map_single(). 
dma_addr_t

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

		     enum dma_data_direction dir,

		     struct dma_attrs *attrs)

		     unsigned long attrs)



void

dma_unmap_single_attrs(struct device *dev, dma_addr_t dma_addr,

		       size_t size, enum dma_data_direction dir,

		       struct dma_attrs *attrs)

		       unsigned long attrs)



int

dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl,

		 int nents, enum dma_data_direction dir,

		 struct dma_attrs *attrs)

		 unsigned long attrs)



void

dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sgl,

		   int nents, enum dma_data_direction dir,

		   struct dma_attrs *attrs)

		   unsigned long attrs)



The four functions above are just like the counterpart functions

without the _attrs suffixes, except that they pass an optional

struct dma_attrs*.



struct dma_attrs encapsulates a set of "DMA attributes". For the

definition of struct dma_attrs see linux/dma-attrs.h.

dma_attrs.



The interpretation of DMA attributes is architecture-specific, and

each attribute should be documented in Documentation/DMA-attributes.txt.



If struct dma_attrs* is NULL, the semantics of each of these

functions is identical to those of the corresponding function

If dma_attrs are 0, the semantics of each of these functions

is identical to those of the corresponding function

without the _attrs suffix. As a result dma_map_single_attrs()

can generally replace dma_map_single(), etc.
@@ -405,15 +402,15 @@ As an example of the use of the *_attrs functions, here's how 
you could pass an attribute DMA_ATTR_FOO when mapping memory

for DMA:



#include <linux/dma-attrs.h>

/* DMA_ATTR_FOO should be defined in linux/dma-attrs.h and

#include <linux/dma-mapping.h>

/* DMA_ATTR_FOO should be defined in linux/dma-mapping.h and

 * documented in Documentation/DMA-attributes.txt */

...



	DEFINE_DMA_ATTRS(attrs);

	dma_set_attr(DMA_ATTR_FOO, &attrs);

	unsigned long attr;

	attr |= DMA_ATTR_FOO;

	....

	n = dma_map_sg_attrs(dev, sg, nents, DMA_TO_DEVICE, &attr);

	n = dma_map_sg_attrs(dev, sg, nents, DMA_TO_DEVICE, attr);

	....



Architectures that care about DMA_ATTR_FOO would check for its
@@ -422,12 +419,10 @@ routines, e.g.: 


void whizco_dma_map_sg_attrs(struct device *dev, dma_addr_t dma_addr,

			     size_t size, enum dma_data_direction dir,

			     struct dma_attrs *attrs)

			     unsigned long attrs)

{

	....

	int foo =  dma_get_attr(DMA_ATTR_FOO, attrs);

	....

	if (foo)

	if (attrs & DMA_ATTR_FOO)

		/* twizzle the frobnozzle */

	....

Documentation/DMA-attributes.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
			==============



This document describes the semantics of the DMA attributes that are

defined in linux/dma-attrs.h.

defined in linux/dma-mapping.h.



DMA_ATTR_WRITE_BARRIER

----------------------

MAINTAINERS

+8 −4
Original line number Diff line number Diff line
@@ -1648,7 +1648,8 @@ F: arch/arm/mach-s5pv210/ 


ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT

M:	Kyungmin Park <kyungmin.park@samsung.com>

M:	Kamil Debski <k.debski@samsung.com>

M:	Kamil Debski <kamil@wypas.org>

M:	Andrzej Hajda <a.hajda@samsung.com>

L:	linux-arm-kernel@lists.infradead.org

L:	linux-media@vger.kernel.org

S:	Maintained
@@ -1656,8 +1657,9 @@ F: drivers/media/platform/s5p-g2d/ 


ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT

M:	Kyungmin Park <kyungmin.park@samsung.com>

M:	Kamil Debski <k.debski@samsung.com>

M:	Kamil Debski <kamil@wypas.org>

M:	Jeongtae Park <jtp.park@samsung.com>

M:	Andrzej Hajda <a.hajda@samsung.com>

L:	linux-arm-kernel@lists.infradead.org

L:	linux-media@vger.kernel.org

S:	Maintained
@@ -9470,7 +9472,8 @@ S: Odd Fixes 
F:	drivers/media/usb/pwc/*



PWM FAN DRIVER

M:	Kamil Debski <k.debski@samsung.com>

M:	Kamil Debski <kamil@wypas.org>

M:	Lukasz Majewski <l.majewski@samsung.com>

L:	linux-hwmon@vger.kernel.org

S:	Supported

F:	Documentation/devicetree/bindings/hwmon/pwm-fan.txt
@@ -10218,7 +10221,8 @@ T: git https://github.com/lmajewski/linux-samsung-thermal.git 
F:	drivers/thermal/samsung/



SAMSUNG USB2 PHY DRIVER

M:	Kamil Debski <k.debski@samsung.com>

M:	Kamil Debski <kamil@wypas.org>

M:	Sylwester Nawrocki <s.nawrocki@samsung.com>

L:	linux-kernel@vger.kernel.org

S:	Supported

F:	Documentation/devicetree/bindings/phy/samsung-phy.txt

arch/alpha/include/asm/dma-mapping.h

+0 −2
Original line number Diff line number Diff line 
#ifndef _ALPHA_DMA_MAPPING_H

#define _ALPHA_DMA_MAPPING_H



#include <linux/dma-attrs.h>



extern struct dma_map_ops *dma_ops;



static inline struct dma_map_ops *get_dma_ops(struct device *dev)

arch/alpha/kernel/pci-noop.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ sys_pciconfig_write(unsigned long bus, unsigned long dfn, 


static void *alpha_noop_alloc_coherent(struct device *dev, size_t size,

				       dma_addr_t *dma_handle, gfp_t gfp,

				       struct dma_attrs *attrs)

				       unsigned long attrs)

{

	void *ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE