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

Commit eef015c8 authored by Chris Metcalf's avatar Chris Metcalf
Browse files

arch/tile: enable ZONE_DMA for tilegx 



This is required for PCI root complex legacy support and USB OHCI root
complex support.  With this change tilegx now supports allocating memory
whose PA fits in 32 bits.

Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
parent bbaa22c3

arch/tile/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -212,6 +212,9 @@ config HIGHMEM 




	  If unsure, say "true".

	  If unsure, say "true".





config ZONE_DMA

	def_bool y



# We do not currently support disabling NUMA.

# We do not currently support disabling NUMA.

config NUMA

config NUMA

	bool # "NUMA Memory Allocation and Scheduler Support"

	bool # "NUMA Memory Allocation and Scheduler Support"

arch/tile/kernel/pci-dma.c

+9 −6
Original line number Original line Diff line number Diff line
@@ -45,14 +45,17 @@ void *dma_alloc_coherent(struct device *dev, 
	gfp |= __GFP_ZERO;

	gfp |= __GFP_ZERO;





	/*

	/*

	 * By forcing NUMA node 0 for 32-bit masks we ensure that the

	 * If the mask specifies that the memory be in the first 4 GB, then

	 * high 32 bits of the resulting PA will be zero.  If the mask

	 * we force the allocation to come from the DMA zone.  We also

	 * size is, e.g., 24, we may still not be able to guarantee a

	 * force the node to 0 since that's the only node where the DMA

	 * suitable memory address, in which case we will return NULL.

	 * zone isn't empty.  If the mask size is smaller than 32 bits, we

	 * But such devices are uncommon.

	 * may still not be able to guarantee a suitable memory address, in

	 * which case we will return NULL.  But such devices are uncommon.

	 */

	 */

	if (dma_mask <= DMA_BIT_MASK(32))

	if (dma_mask <= DMA_BIT_MASK(32)) {

		gfp |= GFP_DMA;

		node = 0;

		node = 0;

	}





	pg = homecache_alloc_pages_node(node, gfp, order, PAGE_HOME_DMA);

	pg = homecache_alloc_pages_node(node, gfp, order, PAGE_HOME_DMA);

	if (pg == NULL)

	if (pg == NULL)

arch/tile/kernel/setup.c

+11 −1
Original line number Original line Diff line number Diff line
@@ -658,6 +658,8 @@ static void __init zone_sizes_init(void) 
	unsigned long zones_size[MAX_NR_ZONES] = { 0 };

	unsigned long zones_size[MAX_NR_ZONES] = { 0 };

	int size = percpu_size();

	int size = percpu_size();

	int num_cpus = smp_height * smp_width;

	int num_cpus = smp_height * smp_width;

	const unsigned long dma_end = (1UL << (32 - PAGE_SHIFT));



	int i;

	int i;





	for (i = 0; i < num_cpus; ++i)

	for (i = 0; i < num_cpus; ++i)
@@ -729,6 +731,14 @@ static void __init zone_sizes_init(void) 
		zones_size[ZONE_NORMAL] = end - start;

		zones_size[ZONE_NORMAL] = end - start;

#endif

#endif





		if (start < dma_end) {

			zones_size[ZONE_DMA] = min(zones_size[ZONE_NORMAL],

						   dma_end - start);

			zones_size[ZONE_NORMAL] -= zones_size[ZONE_DMA];

		} else {

			zones_size[ZONE_DMA] = 0;

		}



		/* Take zone metadata from controller 0 if we're isolnode. */

		/* Take zone metadata from controller 0 if we're isolnode. */

		if (node_isset(i, isolnodes))

		if (node_isset(i, isolnodes))

			NODE_DATA(i)->bdata = &bootmem_node_data[0];

			NODE_DATA(i)->bdata = &bootmem_node_data[0];
@@ -738,7 +748,7 @@ static void __init zone_sizes_init(void) 
		       PFN_UP(node_percpu[i]));

		       PFN_UP(node_percpu[i]));





		/* Track the type of memory on each node */

		/* Track the type of memory on each node */

		if (zones_size[ZONE_NORMAL])

		if (zones_size[ZONE_NORMAL] || zones_size[ZONE_DMA])

			node_set_state(i, N_NORMAL_MEMORY);

			node_set_state(i, N_NORMAL_MEMORY);

#ifdef CONFIG_HIGHMEM

#ifdef CONFIG_HIGHMEM

		if (end != start)

		if (end != start)

arch/tile/mm/init.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -733,16 +733,15 @@ static void __init set_non_bootmem_pages_init(void) 
	for_each_zone(z) {

	for_each_zone(z) {

		unsigned long start, end;

		unsigned long start, end;

		int nid = z->zone_pgdat->node_id;

		int nid = z->zone_pgdat->node_id;

#ifdef CONFIG_HIGHMEM

		int idx = zone_idx(z);

		int idx = zone_idx(z);

#endif





		start = z->zone_start_pfn;

		start = z->zone_start_pfn;

		if (start == 0)

			continue;  /* bootmem */

		end = start + z->spanned_pages;

		end = start + z->spanned_pages;

		if (idx == ZONE_NORMAL) {

		start = max(start, node_free_pfn[nid]);

			BUG_ON(start != node_start_pfn[nid]);

		start = max(start, max_low_pfn);

			start = node_free_pfn[nid];



		}

#ifdef CONFIG_HIGHMEM

#ifdef CONFIG_HIGHMEM

		if (idx == ZONE_HIGHMEM)

		if (idx == ZONE_HIGHMEM)

			totalhigh_pages += z->spanned_pages;

			totalhigh_pages += z->spanned_pages;