]> err.no Git - linux-2.6/commitdiff
[POWERPC] FSL: Add support for PCI-X controllers
authorKumar Gala <galak@kernel.crashing.org>
Fri, 20 Jul 2007 21:29:09 +0000 (16:29 -0500)
committerKumar Gala <galak@kernel.crashing.org>
Tue, 24 Jul 2007 03:30:14 +0000 (22:30 -0500)
Some set of 85xx platforms have PCI-X controllers.  The old arch/ppc
code setup these controllers and we haven't moved it over to arch/powerpc.

We use the PCI-X Capabilties to know if we are in PCI-X mode instead
of the Global Utilities PORDEVSR.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
arch/powerpc/sysdev/fsl_pci.c

index f88a9aecdf169d2d858d6de09445fd5bd1354814..13aaefc1af5b2a5522dc8cb4db468ab37ba4fd8c 100644 (file)
@@ -89,11 +89,22 @@ void __init setup_pci_atmu(struct pci_controller *hose, struct resource *rsrc)
 void __init setup_pci_cmd(struct pci_controller *hose)
 {
        u16 cmd;
+       int cap_x;
+
        early_read_config_word(hose, 0, 0, PCI_COMMAND, &cmd);
        cmd |= PCI_COMMAND_SERR | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY
                | PCI_COMMAND_IO;
        early_write_config_word(hose, 0, 0, PCI_COMMAND, cmd);
-       early_write_config_byte(hose, 0, 0, PCI_LATENCY_TIMER, 0x80);
+
+       cap_x = early_find_capability(hose, 0, 0, PCI_CAP_ID_PCIX);
+       if (cap_x) {
+               int pci_x_cmd = cap_x + PCI_X_CMD;
+               cmd = PCI_X_CMD_MAX_SPLIT | PCI_X_CMD_MAX_READ
+                       | PCI_X_CMD_ERO | PCI_X_CMD_DPERR_E;
+               early_write_config_word(hose, 0, 0, pci_x_cmd, cmd);
+       } else {
+               early_write_config_byte(hose, 0, 0, PCI_LATENCY_TIMER, 0x80);
+       }
 }
 
 static void __devinit quirk_fsl_pcie_transparent(struct pci_dev *dev)