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

Commit 9d914b3e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, gart: Make sure GART does not map physmem above 1TB
  x86, gart: Set DISTLBWALKPRB bit always
  x86, gart: Convert spaces to tabs in enable_gart_translation
parents 4ae0ff16 665d3e2a

arch/x86/include/asm/gart.h

+12 −12
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static inline void gart_set_size_and_enable(struct pci_dev *dev, u32 order) 
	 * Don't enable translation but enable GART IO and CPU accesses.

	 * Also, set DISTLBWALKPRB since GART tables memory is UC.

	 */

	ctl = DISTLBWALKPRB | order << 1;

	ctl = order << 1;



	pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, ctl);

}
@@ -83,7 +83,7 @@ static inline void enable_gart_translation(struct pci_dev *dev, u64 addr) 


	/* Enable GART translation for this hammer. */

	pci_read_config_dword(dev, AMD64_GARTAPERTURECTL, &ctl);

        ctl |= GARTEN;

	ctl |= GARTEN | DISTLBWALKPRB;

	ctl &= ~(DISGARTCPU | DISGARTIO);

	pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, ctl);

}

arch/x86/kernel/aperture_64.c

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ out: 
		 * Don't enable translation yet but enable GART IO and CPU

		 * accesses and set DISTLBWALKPRB since GART table memory is UC.

		 */

		u32 ctl = DISTLBWALKPRB | aper_order << 1;

		u32 ctl = aper_order << 1;



		bus = amd_nb_bus_dev_ranges[i].bus;

		dev_base = amd_nb_bus_dev_ranges[i].dev_base;

arch/x86/kernel/pci-gart_64.c

+8 −1
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ static u32 gart_unmapped_entry; 
#define AGPEXTERN

#endif



/* GART can only remap to physical addresses < 1TB */

#define GART_MAX_PHYS_ADDR	(1ULL << 40)



/* backdoor interface to AGP driver */

AGPEXTERN int agp_memory_reserved;

AGPEXTERN __u32 *agp_gatt_table;
@@ -212,9 +215,13 @@ static dma_addr_t dma_map_area(struct device *dev, dma_addr_t phys_mem, 
				size_t size, int dir, unsigned long align_mask)

{

	unsigned long npages = iommu_num_pages(phys_mem, size, PAGE_SIZE);

	unsigned long iommu_page = alloc_iommu(dev, npages, align_mask);

	unsigned long iommu_page;

	int i;



	if (unlikely(phys_mem + size > GART_MAX_PHYS_ADDR))

		return bad_dma_addr;



	iommu_page = alloc_iommu(dev, npages, align_mask);

	if (iommu_page == -1) {

		if (!nonforced_iommu(dev, phys_mem, size))

			return phys_mem;