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

Commit 55871bdd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  x86/PCI: Adjust GFP mask handling for coherent allocations
  PCI ASPM: fix oops on root port removal
parents e5d45abe eb647138

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

+7 −3
Original line number Diff line number Diff line
@@ -14,6 +14,12 @@ 
#include <asm/swiotlb.h>

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



#ifdef CONFIG_ISA

# define ISA_DMA_BIT_MASK DMA_BIT_MASK(24)

#else

# define ISA_DMA_BIT_MASK DMA_BIT_MASK(32)

#endif



extern dma_addr_t bad_dma_address;

extern int iommu_merge;

extern struct device x86_dma_fallback_dev;
@@ -124,10 +130,8 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, 
	if (dma_alloc_from_coherent(dev, size, dma_handle, &memory))

		return memory;



	if (!dev) {

	if (!dev)

		dev = &x86_dma_fallback_dev;

		gfp |= GFP_DMA;

	}



	if (!is_device_dma_capable(dev))

		return NULL;

arch/x86/kernel/pci-dma.c

+2 −4
Original line number Diff line number Diff line
@@ -45,12 +45,10 @@ int iommu_pass_through __read_mostly; 
dma_addr_t bad_dma_address __read_mostly = 0;

EXPORT_SYMBOL(bad_dma_address);



/* Dummy device used for NULL arguments (normally ISA). Better would

   be probably a smaller DMA mask, but this is bug-to-bug compatible

   to older i386. */

/* Dummy device used for NULL arguments (normally ISA). */

struct device x86_dma_fallback_dev = {

	.init_name = "fallback device",

	.coherent_dma_mask = DMA_BIT_MASK(32),

	.coherent_dma_mask = ISA_DMA_BIT_MASK,

	.dma_mask = &x86_dma_fallback_dev.coherent_dma_mask,

};

EXPORT_SYMBOL(x86_dma_fallback_dev);

drivers/pci/pcie/aspm.c

+4 −2
Original line number Diff line number Diff line
@@ -656,8 +656,10 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev) 
	free_link_state(link);



	/* Recheck latencies and configure upstream links */

	if (parent_link) {

		pcie_update_aspm_capable(root);

		pcie_config_aspm_path(parent_link);

	}

out:

	mutex_unlock(&aspm_lock);

	up_read(&pci_bus_sem);