Prechádzať zdrojové kódy

[POWERPC] Make direct DMA use node local allocations

This patch makes dma_alloc_coherent() use node local allocation when
using the direct DMA ops. The node is obtained from the new device
extension. If no such extension is present, the current node is used.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Benjamin Herrenschmidt 18 rokov pred
rodič
commit
c80d9133e9
1 zmenil súbory, kde vykonal 9 pridanie a 5 odobranie
  1. 9 5
      arch/powerpc/kernel/dma_64.c

+ 9 - 5
arch/powerpc/kernel/dma_64.c

@@ -120,14 +120,18 @@ unsigned long dma_direct_offset;
 static void *dma_direct_alloc_coherent(struct device *dev, size_t size,
 static void *dma_direct_alloc_coherent(struct device *dev, size_t size,
 				       dma_addr_t *dma_handle, gfp_t flag)
 				       dma_addr_t *dma_handle, gfp_t flag)
 {
 {
+	struct page *page;
 	void *ret;
 	void *ret;
+	int node = dev->archdata.numa_node;
 
 
 	/* TODO: Maybe use the numa node here too ? */
 	/* TODO: Maybe use the numa node here too ? */
-	ret = (void *)__get_free_pages(flag, get_order(size));
-	if (ret != NULL) {
-		memset(ret, 0, size);
-		*dma_handle = virt_to_abs(ret) | dma_direct_offset;
-	}
+	page = alloc_pages_node(node, flag, get_order(size));
+	if (page == NULL)
+		return NULL;
+	ret = page_address(page);
+	memset(ret, 0, size);
+	*dma_handle = virt_to_abs(ret) | dma_direct_offset;
+
 	return ret;
 	return ret;
 }
 }