Skip to contentSkip to conversation

PCI bridge support for MPC8272 and PQ2FADS

PATCH In review Vitaly Bordug 3 participants 3 messages Feb 18, 2005 – Mar 4, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI bridge support for MPC8272 and PQ2FADS

This patch adds PCI bridge support for MPC8272 and PQ2FADS to the current linuxppc-2.4 tree. Actually it has been tested with 8272, but PQ2 _should_ also work, though it will complain that host bridge ID is unrecognized.

--
Sincerely, Vitaly

# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2005/02/18 17:11:57+03:00 [email protected]
# Fixed compilation warnings for 8260-like boards when CONFIG_PCI=y
#

# include/asm-ppc/mpc8260.h
#   2005/02/18 17:11:54+03:00 [email protected] +2 -0
#   Fixed compilation warnings when CONFIG_PCI=y
# 
# ChangeSet
#   2005/02/18 16:17:49+03:00 [email protected] 
#   Added support for PCI bridge on MPC8272 and PQ2FADS boards
# 
# arch/ppc/platforms/pq2ads.h
#   2005/02/18 16:17:47+03:00 [email protected] +88 -5
#   Added support for PCI bridge on MPC8272 and PQ2FADS
# 
# arch/ppc/platforms/Makefile
#   2005/02/18 16:17:47+03:00 [email protected] +5 -0
#   Added support for PCI bridge on MPC8272 and PQ2FADS
# 
# arch/ppc/kernel/m8260_setup.c
#   2005/02/18 16:17:47+03:00 [email protected] +17 -0
#   Added support for PCI bridge on MPC8272 and PQ2FADS
# 
# arch/ppc/kernel/Makefile
#   2005/02/18 16:17:47+03:00 [email protected] +8 -0
#   Modules needed for PCI Bridge support on MPC8272 and PQ2FADS
# 
# arch/ppc/platforms/pq2ads_pci.c
#   2005/02/18 16:15:29+03:00 [email protected] +361 -0
#   PCI Bridge setup routines for MPC8272ADS and PQ2FADS (initial revision)
# 
# arch/ppc/platforms/pq2ads_pci.c
#   2005/02/18 16:15:29+03:00 [email protected] +0 -0
#   BitKeeper file /home/common/work/community/kernel/linuxppc-2.4/arch/ppc/platforms/pq2ads_pci.c
# 
diff -Nru a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
--- a/arch/ppc/kernel/Makefile	2005-02-18 17:14:12 +03:00
+++ b/arch/ppc/kernel/Makefile	2005-02-18 17:14:12 +03:00
@@ -108,6 +108,14 @@
 obj-$(CONFIG_PCI)		+= indirect_pci.o pci_auto.o
 endif

+ifeq ($(CONFIG_ADS8272),y)
+obj-$(CONFIG_PCI) += indirect_pci.o pci_auto.o
+endif
+
+ifeq ($(CONFIG_PQ2FADS),y)
+obj-$(CONFIG_PCI) += indirect_pci.o pci_auto.o
+endif
+
include $(TOPDIR)/Rules.make

entry.o: entry.S ppc_defs.h

arch/ppc/kernel/m8260_setup.c +17 -0
diff -Nru a/arch/ppc/kernel/m8260_setup.c b/arch/ppc/kernel/m8260_setup.c
@@ -54,6 +54,7 @@
 unsigned char __res[sizeof(bd_t)];
 
 extern void cpm2_reset(void);
+extern void pq2ads_init_irq(void);
 
 static void __init
 m8260_setup_arch(void)
@@ -61,6 +62,12 @@
 	/* Reset the Communication Processor Module.
 	*/
 	cpm2_reset();
+
+#ifdef CONFIG_PCI
+	/* Lookup PCI host bridges */
+	m8260_find_bridges();
+#endif
+
 }
 
 static void
@@ -184,6 +191,13 @@
 	cpm2_immr->im_intctl.ic_siprr = 0x05309770;
 	cpm2_immr->im_intctl.ic_scprrh = 0x05309770;
 	cpm2_immr->im_intctl.ic_scprrl = 0x05309770;
+#if defined (CONFIG_PCI) && ( defined (CONFIG_ADS8272) || defined (CONFIG_PQ2FADS) )
+	/* Install the handlers for the external interrupt controller on the
+	 * MPC8272ADS and PQ2FADS boards.
+	 */
+	pq2ads_init_irq();
+#endif
+
 
 }
 
@@ -209,6 +223,9 @@
 static void __init
 m8260_map_io(void)
 {
+#if defined (CONFIG_PCI) && ( defined (CONFIG_ADS8272) || defined (CONFIG_PQ2FADS) )
+	io_block_mapping(0x80000000, 0x80000000, 0x10000000, _PAGE_IO);
+#endif
 	io_block_mapping(0xf0000000, 0xf0000000, 0x10000000, _PAGE_IO);
 	io_block_mapping(0xe0000000, 0xe0000000, 0x10000000, _PAGE_IO);
 }
arch/ppc/platforms/Makefile +5 -0
diff -Nru a/arch/ppc/platforms/Makefile b/arch/ppc/platforms/Makefile
@@ -98,6 +98,11 @@
 obj-$(CONFIG_MPC85xx_CDS)	+= mpc85xx_cds_common.o
 endif
 
+ifeq ($(CONFIG_PCI),y)
+obj-$(CONFIG_ADS8272)		+= pq2ads_pci.o 
+obj-$(CONFIG_PQ2FADS)		+= pq2ads_pci.o 
+endif
+
 ifeq ($(CONFIG_SMP),y)
 obj-$(CONFIG_ALL_PPC)		+= pmac_smp.o chrp_smp.o
 endif
arch/ppc/platforms/pq2ads.h +88 -5

132 lines not on this page · raw message

arch/ppc/platforms/pq2ads_pci.c new file +361 -0

361 lines not on this page · raw message

include/asm-ppc/mpc8260.h +2 -0
diff -Nru a/include/asm-ppc/mpc8260.h b/include/asm-ppc/mpc8260.h
@@ -24,12 +24,14 @@
 #include <platforms/pq2ads.h>
 #endif
 
+#ifndef CONFIG_PCI
 /* I don't yet have the ISA or PCI stuff done....no 8260 with
  * such thing.....
  */
 #define _IO_BASE        0
 #define _ISA_MEM_BASE   0
 #define PCI_DRAM_OFFSET 0
+#endif
 
 #ifndef __ASSEMBLY__
 /* The "residual" data board information structure the boot loader
#1 lore raw
Quoted 4 lines · Vitaly Bordug

This patch adds PCI bridge support for MPC8272 and PQ2FADS to the current linuxppc-2.4 tree. Actually it has been tested with 8272, but PQ2 _should_ also work, though it will complain that host bridge ID is unrecognized.

This patch is against the linuxppc-2.4 tree, but it seems there is also no support for the MPC8272ADS / PQ2FADS PCI bridge in the linuxppc-2.5 kernel tree.

Before I go and "forward" port it myself, are there any other patches out there that add support for PCI for the 8272ADS under the 2.6 kernel?

Thanks,
Adam Kent

#2 lore raw

Adam,

I'm not aware of any such patches (unless Vitaly has some). If you do this, please port it against linux-2.5 instead of linuxppc-2.5. Also, if you send me the patches and I will ensure they get pushed upstream into the stock kernel.

thanks

- kumar

Quoted 21 lines · Adam Kent
Quoted 2 lines · Vitaly Bordug

This patch adds PCI bridge support for MPC8272 and PQ2FADS to the current linuxppc-2.4 tree. Actually it has been tested with 8272,

but

Quoted 1 line

PQ2 _should_ also work, though it will complain that host bridge ID

is

Quoted 1 line

unrecognized.

This patch is against the linuxppc-2.4 tree, but it seems there is
also no support for the MPC8272ADS / PQ2FADS PCI bridge in the
linuxppc-2.5 kernel tree.

Before I go and "forward" port it myself, are there any other patches out there that add support for PCI for the 8272ADS under the 2.6 kernel?

Thanks,
Adam Kent
_______________________________________________
Linuxppc-embedded mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-embedded