mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: airlied@linux.ie, tglx@linutronix.de, hpa@zytor.com,
	airlied@redhat.com, linux-kernel@vger.kernel.org,
	konrad@kernel.org
Cc: Jeremy Fitzhardinge <jeremy@goop.org>,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: [PATCH 01/23] agp: Add bridge argument to [free|alloc]_gatt_pages macro.
Date: Mon,  6 Dec 2010 18:24:13 -0500	[thread overview]
Message-ID: <1291677875-30493-2-git-send-email-konrad.wilk@oracle.com> (raw)
In-Reply-To: <1291677875-30493-1-git-send-email-konrad.wilk@oracle.com>

We add to the macro an extra parameter: bridge. We will use
this new bridge parameter for the PCI API. Specifically
we will extract the 'struct pcidev' from it for the PCI API calls.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
 arch/alpha/include/asm/agp.h   |    6 +++---
 arch/ia64/include/asm/agp.h    |    6 +++---
 arch/parisc/include/asm/agp.h  |    6 +++---
 arch/powerpc/include/asm/agp.h |    6 +++---
 arch/sparc/include/asm/agp.h   |    6 +++---
 arch/x86/include/asm/agp.h     |    6 +++---
 drivers/char/agp/generic.c     |    8 ++++----
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/arch/alpha/include/asm/agp.h b/arch/alpha/include/asm/agp.h
index a94d48b..0ee274c 100644
--- a/arch/alpha/include/asm/agp.h
+++ b/arch/alpha/include/asm/agp.h
@@ -10,9 +10,9 @@
 #define flush_agp_cache() mb()
 
 /* GATT allocation. Returns/accepts GATT kernel virtual address. */
-#define alloc_gatt_pages(order)		\
+#define alloc_gatt_pages(bridge, order)		\
 	((char *)__get_free_pages(GFP_KERNEL, (order)))
-#define free_gatt_pages(table, order)	\
-	free_pages((unsigned long)(table), (order))
+#define free_gatt_pages(bridge, order)	\
+	free_pages((unsigned long)(bridge->gatt_table_real), (order))
 
 #endif
diff --git a/arch/ia64/include/asm/agp.h b/arch/ia64/include/asm/agp.h
index 01d09c4..4e12b72 100644
--- a/arch/ia64/include/asm/agp.h
+++ b/arch/ia64/include/asm/agp.h
@@ -18,9 +18,9 @@
 #define flush_agp_cache()		mb()
 
 /* GATT allocation. Returns/accepts GATT kernel virtual address. */
-#define alloc_gatt_pages(order)		\
+#define alloc_gatt_pages(bridge, order)		\
 	((char *)__get_free_pages(GFP_KERNEL, (order)))
-#define free_gatt_pages(table, order)	\
-	free_pages((unsigned long)(table), (order))
+#define free_gatt_pages(bridge, order)	\
+	free_pages((unsigned long)(bridge->gatt_table_real), (order))
 
 #endif /* _ASM_IA64_AGP_H */
diff --git a/arch/parisc/include/asm/agp.h b/arch/parisc/include/asm/agp.h
index d226ffa..6e8fd98 100644
--- a/arch/parisc/include/asm/agp.h
+++ b/arch/parisc/include/asm/agp.h
@@ -12,9 +12,9 @@
 #define flush_agp_cache()		mb()
 
 /* GATT allocation. Returns/accepts GATT kernel virtual address. */
-#define alloc_gatt_pages(order)		\
+#define alloc_gatt_pages(bridge, order)		\
 	((char *)__get_free_pages(GFP_KERNEL, (order)))
-#define free_gatt_pages(table, order)	\
-	free_pages((unsigned long)(table), (order))
+#define free_gatt_pages(bridge, order)	\
+	free_pages((unsigned long)(bridge->gatt_table_real), (order))
 
 #endif /* _ASM_PARISC_AGP_H */
diff --git a/arch/powerpc/include/asm/agp.h b/arch/powerpc/include/asm/agp.h
index 416e12c..0996a43 100644
--- a/arch/powerpc/include/asm/agp.h
+++ b/arch/powerpc/include/asm/agp.h
@@ -9,10 +9,10 @@
 #define flush_agp_cache() mb()
 
 /* GATT allocation. Returns/accepts GATT kernel virtual address. */
-#define alloc_gatt_pages(order)		\
+#define alloc_gatt_pages(bridge, order)		\
 	((char *)__get_free_pages(GFP_KERNEL, (order)))
-#define free_gatt_pages(table, order)	\
-	free_pages((unsigned long)(table), (order))
+#define free_gatt_pages(bridge, order)	\
+	free_pages((unsigned long)(bridge->gatt_table_real), (order))
 
 #endif /* __KERNEL__ */
 #endif	/* _ASM_POWERPC_AGP_H */
diff --git a/arch/sparc/include/asm/agp.h b/arch/sparc/include/asm/agp.h
index 70f52c1..2a83241 100644
--- a/arch/sparc/include/asm/agp.h
+++ b/arch/sparc/include/asm/agp.h
@@ -8,9 +8,9 @@
 #define flush_agp_cache() mb()
 
 /* GATT allocation. Returns/accepts GATT kernel virtual address. */
-#define alloc_gatt_pages(order)		\
+#define alloc_gatt_pages(bridge, order)		\
 	((char *)__get_free_pages(GFP_KERNEL, (order)))
-#define free_gatt_pages(table, order)	\
-	free_pages((unsigned long)(table), (order))
+#define free_gatt_pages(bridge, order)	\
+	free_pages((unsigned long)(bridge->gatt_table_real), (order))
 
 #endif
diff --git a/arch/x86/include/asm/agp.h b/arch/x86/include/asm/agp.h
index eec2a70..cbc996d 100644
--- a/arch/x86/include/asm/agp.h
+++ b/arch/x86/include/asm/agp.h
@@ -23,9 +23,9 @@
 #define flush_agp_cache() wbinvd()
 
 /* GATT allocation. Returns/accepts GATT kernel virtual address. */
-#define alloc_gatt_pages(order)		\
+#define alloc_gatt_pages(bridge, order)		\
 	((char *)__get_free_pages(GFP_KERNEL, (order)))
-#define free_gatt_pages(table, order)	\
-	free_pages((unsigned long)(table), (order))
+#define free_gatt_pages(bridge, order)	\
+	free_pages((unsigned long)(bridge->gatt_table_real), (order))
 
 #endif /* _ASM_X86_AGP_H */
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 4956f1c..09332ba 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -931,7 +931,7 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
 				break;
 			}
 
-			table = alloc_gatt_pages(page_order);
+			table = alloc_gatt_pages(bridge, page_order);
 
 			if (table == NULL) {
 				i++;
@@ -960,7 +960,7 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
 		size = ((struct aper_size_info_fixed *) temp)->size;
 		page_order = ((struct aper_size_info_fixed *) temp)->page_order;
 		num_entries = ((struct aper_size_info_fixed *) temp)->num_entries;
-		table = alloc_gatt_pages(page_order);
+		table = alloc_gatt_pages(bridge, page_order);
 	}
 
 	if (table == NULL)
@@ -990,7 +990,7 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
 		for (page = virt_to_page(table); page <= virt_to_page(table_end); page++)
 			ClearPageReserved(page);
 
-		free_gatt_pages(table, page_order);
+		free_gatt_pages(bridge, page_order);
 
 		return -ENOMEM;
 	}
@@ -1052,7 +1052,7 @@ int agp_generic_free_gatt_table(struct agp_bridge_data *bridge)
 	for (page = virt_to_page(table); page <= virt_to_page(table_end); page++)
 		ClearPageReserved(page);
 
-	free_gatt_pages(bridge->gatt_table_real, page_order);
+	free_gatt_pages(bridge, page_order);
 
 	agp_gatt_table = NULL;
 	bridge->gatt_table = NULL;
-- 
1.7.1


  reply	other threads:[~2010-12-06 23:25 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-06 23:24 [RFC PATCH] Utilize the PCI API in the AGP framework Konrad Rzeszutek Wilk
2010-12-06 23:24 ` Konrad Rzeszutek Wilk [this message]
2010-12-06 23:24 ` [PATCH 02/23] agp: Add dma_addr array in struct agp_memory Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 03/23] agp: Introduce two new macros: _agp_[alloc|free]_page Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 04/23] agp: Make agp_generic_[alloc|destroy]_pages use the _agp_[alloc|free]_page macro Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 05/23] agp: Make agp_generic_[alloc|destroy]_page use " Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 06/23] agp/ali: Use the dma_addr instead of page_to_phys for m1541_[alloc|destroy]_page Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 07/23] agp/nvidia: Use the dma_addr[] instead of page_to_phys when inserting Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 08/23] agp/amd64: Use the dma_addr[] and gatt_bus_addr instead of [page|virt]_to_phys respectivly Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 09/23] agp/amd-k7: Utilize the PCI API for creating/inserting pages Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 10/23] ati/agp: " Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 11/23] agp/serverworks: Utilize the PCI API for allocating/inserting pages Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 12/23] agp/intel-gtt: Utilize the PCI DMA for i8xxx, Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 13/23] ia64/agp/zx1: Use PCI API for inserting pages in HP's ZX1 AGP device Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 14/23] ia64/agp/i460: Use PCI API for inserting pages in DIG (non-VT-d) platforms Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 15/23] agp: Make agp_generic_insert_memory use the mem->dma_addr[i] Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 16/23] agp: save the size of GATT table Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 17/23] agp: Make agp_generic_[create|free]_gatt_table be aware of PCI API Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 18/23] agp/x86: Make agp_generic_* use " Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 19/23] ia64/sgi: fix compile error Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 20/23] ia64: Add DMA_ERROR_CODE define Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 21/23] agp/sgi: Use PCI API for inserting/creating pages on SGI Altix Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 22/23] ia64/agp: Make agp_generic_* use PCI API Konrad Rzeszutek Wilk
2010-12-06 23:24 ` [PATCH 23/23] agp/generic: Set the dma_addr[i] to DMA_ERROR_CODE Konrad Rzeszutek Wilk
2010-12-07  0:02 ` [RFC PATCH] Utilize the PCI API in the AGP framework Dave Airlie
2010-12-07  0:48   ` Konrad Rzeszutek Wilk
2010-12-07  1:16     ` Dave Airlie
2010-12-07  2:12       ` Konrad Rzeszutek Wilk
2010-12-08 16:45         ` Konrad Rzeszutek Wilk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1291677875-30493-2-git-send-email-konrad.wilk@oracle.com \
    --to=konrad.wilk@oracle.com \
    --cc=airlied@linux.ie \
    --cc=airlied@redhat.com \
    --cc=hpa@zytor.com \
    --cc=jeremy@goop.org \
    --cc=konrad@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®