Commit 647df518 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] SN specific version of dma_get_required_mask()
  [IA64] generic_defconfig: Enable SATA_VITESSE
  [IA64] dump stack on kernel unaligned warnings
  [IA64] Turn on CONFIG_HAVE_UNSTABLE_CLOCK
  [IA64] Update to use account_{steal,idle}_ticks
parents cbbc4987 175add19

Documentation/DMA-API.txt

+4 −5
Original line number Diff line number Diff line
@@ -170,16 +170,15 @@ Returns: 0 if successful and a negative error if not. 
u64

dma_get_required_mask(struct device *dev)



After setting the mask with dma_set_mask(), this API returns the

actual mask (within that already set) that the platform actually

requires to operate efficiently.  Usually this means the returned mask

This API returns the mask that the platform requires to

operate efficiently.  Usually this means the returned mask

is the minimum required to cover all of memory.  Examining the

required mask gives drivers with variable descriptor sizes the

opportunity to use smaller descriptors as necessary.



Requesting the required mask does not alter the current mask.  If you

wish to take advantage of it, you should issue another dma_set_mask()

call to lower the mask again.

wish to take advantage of it, you should issue a dma_set_mask()

call to set the mask to the value returned.





Part Id - Streaming DMA mappings

arch/ia64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ config IA64 
	select ACPI if (!IA64_HP_SIM)

	select PM if (!IA64_HP_SIM)

	select ARCH_SUPPORTS_MSI

	select HAVE_UNSTABLE_SCHED_CLOCK

	select HAVE_IDE

	select HAVE_OPROFILE

	select HAVE_KPROBES

arch/ia64/configs/generic_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ CONFIG_ATA_PIIX=y 
# CONFIG_SATA_SIS is not set

# CONFIG_SATA_ULI is not set

# CONFIG_SATA_VIA is not set

# CONFIG_SATA_VITESSE is not set

CONFIG_SATA_VITESSE=y

# CONFIG_SATA_INIC162X is not set

# CONFIG_PATA_ACPI is not set

# CONFIG_PATA_ALI is not set

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

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#include <linux/scatterlist.h>

#include <asm/swiotlb.h>



#define ARCH_HAS_DMA_GET_REQUIRED_MASK



struct dma_mapping_ops {

	int             (*mapping_error)(struct device *dev,

					 dma_addr_t dma_addr);

arch/ia64/include/asm/machvec.h

+7 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ typedef dma_addr_t ia64_mv_dma_map_single_attrs (struct device *, void *, size_t 
typedef void ia64_mv_dma_unmap_single_attrs (struct device *, dma_addr_t, size_t, int, struct dma_attrs *);

typedef int ia64_mv_dma_map_sg_attrs (struct device *, struct scatterlist *, int, int, struct dma_attrs *);

typedef void ia64_mv_dma_unmap_sg_attrs (struct device *, struct scatterlist *, int, int, struct dma_attrs *);

typedef u64 ia64_mv_dma_get_required_mask (struct device *);



/*

 * WARNING: The legacy I/O space is _architected_.  Platforms are
@@ -159,6 +160,7 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *); 
#  define platform_dma_sync_sg_for_device ia64_mv.dma_sync_sg_for_device

#  define platform_dma_mapping_error		ia64_mv.dma_mapping_error

#  define platform_dma_supported	ia64_mv.dma_supported

#  define platform_dma_get_required_mask ia64_mv.dma_get_required_mask

#  define platform_irq_to_vector	ia64_mv.irq_to_vector

#  define platform_local_vector_to_irq	ia64_mv.local_vector_to_irq

#  define platform_pci_get_legacy_mem	ia64_mv.pci_get_legacy_mem
@@ -213,6 +215,7 @@ struct ia64_machine_vector { 
	ia64_mv_dma_sync_sg_for_device *dma_sync_sg_for_device;

	ia64_mv_dma_mapping_error *dma_mapping_error;

	ia64_mv_dma_supported *dma_supported;

	ia64_mv_dma_get_required_mask *dma_get_required_mask;

	ia64_mv_irq_to_vector *irq_to_vector;

	ia64_mv_local_vector_to_irq *local_vector_to_irq;

	ia64_mv_pci_get_legacy_mem_t *pci_get_legacy_mem;
@@ -263,6 +266,7 @@ struct ia64_machine_vector { 
	platform_dma_sync_sg_for_device,	\

	platform_dma_mapping_error,			\

	platform_dma_supported,			\

	platform_dma_get_required_mask,		\

	platform_irq_to_vector,			\

	platform_local_vector_to_irq,		\

	platform_pci_get_legacy_mem,		\
@@ -366,6 +370,9 @@ extern void machvec_init_from_cmdline(const char *cmdline); 
#ifndef platform_dma_supported

# define  platform_dma_supported	swiotlb_dma_supported

#endif

#ifndef platform_dma_get_required_mask

# define  platform_dma_get_required_mask	ia64_dma_get_required_mask

#endif

#ifndef platform_irq_to_vector

# define platform_irq_to_vector		__ia64_irq_to_vector

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE