[RFC][Patch] pci_0 pci_1 mixup in ppc/platforms/chestnut.c

2 messages, 2 authors, 2006-01-19 · open the first message on its own page

[RFC][Patch] pci_0 pci_1 mixup in ppc/platforms/chestnut.c

From: Eric Sesterhenn / snakebyte <hidden>
Date: 2006-01-19 13:59:23

hi,

i am currently toying around with cp-miner 
( http://opera.cs.uiuc.edu/Projects/ARTS/CP-Miner.htm )
and came across chesnut.c

        /* setup only PCI bus 0 (bus 1 not used) */
        si.pci_0.enable_bus = 1;
        si.pci_0.pci_io.cpu_base = CHESTNUT_PCI0_IO_PROC_ADDR;
        si.pci_0.pci_io.pci_base_hi = 0;
        si.pci_0.pci_io.pci_base_lo = CHESTNUT_PCI0_IO_PCI_ADDR;
        si.pci_0.pci_io.size = CHESTNUT_PCI0_IO_SIZE;

[...SNIP ... ]

                si.pci_1.acc_cntl_options[i] =
                    MV64360_PCI_ACC_CNTL_SNOOP_NONE |
                    MV64360_PCI_ACC_CNTL_SWAP_NONE |
[...]

since the commentary clearly states that only pci_0 is
used i assume this is a bug and the si.pci_0.acc_cntl_options
should be set?
Please cc me on replies since i am not subscribed.


Signed-off-by: Eric Sesterhenn <redacted>
--- linux-2.6.15-git11/arch/ppc/platforms/chestnut.c.orig	2006-01-19 14:54:59.000000000 +0100
+++ linux-2.6.15-git11/arch/ppc/platforms/chestnut.c	2006-01-19 14:55:25.000000000 +0100
@@ -199,7 +199,7 @@ chestnut_setup_bridge(void)
 		si.mpsc_options[i] = MV64360_MPSC2MEM_SNOOP_NONE;
 		si.idma_options[i] = MV64360_IDMA2MEM_SNOOP_NONE;
 
-		si.pci_1.acc_cntl_options[i] =
+		si.pci_0.acc_cntl_options[i] =
 		    MV64360_PCI_ACC_CNTL_SNOOP_NONE |
 		    MV64360_PCI_ACC_CNTL_SWAP_NONE |
 		    MV64360_PCI_ACC_CNTL_MBURST_128_BYTES |

Re: [RFC][Patch] pci_0 pci_1 mixup in ppc/platforms/chestnut.c

From: Mark A. Greer <hidden>
Date: 2006-01-19 18:58:00

On Thu, Jan 19, 2006 at 02:59:19PM +0100, Eric Sesterhenn / snakebyte wrote:

<snip>
quoted hunk
--- linux-2.6.15-git11/arch/ppc/platforms/chestnut.c.orig	2006-01-19 14:54:59.000000000 +0100
+++ linux-2.6.15-git11/arch/ppc/platforms/chestnut.c	2006-01-19 14:55:25.000000000 +0100
@@ -199,7 +199,7 @@ chestnut_setup_bridge(void)
 		si.mpsc_options[i] = MV64360_MPSC2MEM_SNOOP_NONE;
 		si.idma_options[i] = MV64360_IDMA2MEM_SNOOP_NONE;
 
-		si.pci_1.acc_cntl_options[i] =
+		si.pci_0.acc_cntl_options[i] =
 		    MV64360_PCI_ACC_CNTL_SNOOP_NONE |
 		    MV64360_PCI_ACC_CNTL_SWAP_NONE |
 		    MV64360_PCI_ACC_CNTL_MBURST_128_BYTES |
Good catch.  Note that the tree you should be submitting patches against
is the powerpc.git tree.  In this case, though, I expect the patch to apply
cleanly to that tree.

Also, there are 2 place where that occurs.  Mind fixing both?

Mark
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help