fsl_pci_init cleanup.

Do not enable normal errors created during probe (master abort, perr,
and pcie Invalid Configuration access).

Add CONFIG_PCI_NOSCAN board option to prevent bus scan.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>

diff --git a/drivers/fsl_pci_init.c b/drivers/fsl_pci_init.c
index 1d1f6df997ac7f51a7abdcb81a9b09cf170d38d5..1084dc6b7872b7246f6a6169a136624817de7c43 100644 (file)
--- a/drivers/fsl_pci_init.c
+++ b/drivers/fsl_pci_init.c
@@ -15,7 +15,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
  */
-#define DEBUG
+
 #include <common.h>
 
 #ifdef CONFIG_FSL_PCI_INIT
@@ -93,7 +93,11 @@ fsl_pci_init(struct pci_controller *hose)
        hose->current_busno = hose->first_busno;
 
        pci->pedr = 0xffffffff;         /* Clear any errors */
-       pci->peer = 0xffffffff;         /* Enable Error Interupts */
+       pci->peer = ~0x20140;           /* Enable All Error Interupts except
+                                        * - Master abort (pci)
+                                        * - Master PERR (pci)
+                                        * - ICCA (PCIe)
+                                        */
        pci_hose_read_config_dword (hose, dev, PCI_DCR, &temp32);
        temp32 |= 0xf000e;              /* set URR, FER, NFER (but not CER) */
        pci_hose_write_config_dword(hose, dev, PCI_DCR, temp32);
@@ -108,7 +112,7 @@ fsl_pci_init(struct pci_controller *hose)
 
                if (!enabled) {
                        debug("....PCIE link error.  Skipping scan."
-                             "LTSSM=0x%02x\n", temp16);
+                             "LTSSM=0x%02x\n", ltssm);
                        hose->last_busno = hose->first_busno;
                        return;
                }
@@ -118,61 +122,41 @@ fsl_pci_init(struct pci_controller *hose)
 #ifdef DEBUG
                pci_hose_read_config_word(hose, dev, PCI_LSR, &temp16);
                neg_link_w = (temp16 & 0x3f0 ) >> 4;
-               debug("...PCIE LTSSM=0x%x, Negotiated link width=%d\n",
+               printf("...PCIE LTSSM=0x%x, Negotiated link width=%d\n",
                      ltssm, neg_link_w);
 #endif
                hose->current_busno++; /* Start scan with secondary */
                pciauto_prescan_setup_bridge(hose, dev, hose->current_busno);
 
-       } else {
-#if 0
-/* done in pci_hose_config_device() */
-               pci_hose_read_config_word(hose, dev, PCI_COMMAND, &temp16);
-               temp16 |= PCI_COMMAND_SERR | PCI_COMMAND_MASTER |
-                       PCI_COMMAND_MEMORY | PCI_COMMAND_IO;
-               pci_hose_write_config_word(hose, dev, PCI_COMMAND, temp16);
-               pci_hose_write_config_word(hose, dev, PCI_STATUS, 0xffff);
-               pci_hose_write_config_byte(hose, dev, PCI_LATENCY_TIMER, 0x80);
-#endif
        }
 
        /* Call setup to allocate PCSRBAR window */
        pciauto_setup_device(hose, dev, 1, hose->pci_mem,
                             hose->pci_prefetch, hose->pci_io);
-
+#ifndef CONFIG_PCI_NOSCAN
        printf ("               Scanning PCI bus %02x\n", hose->current_busno);
        hose->last_busno = pci_hose_scan_bus(hose,hose->current_busno);
 
        if ( bridge ) { /* update limit regs and subordinate busno */
                pciauto_postscan_setup_bridge(hose, dev, hose->last_busno);
        }
+#else
+       hose->last_busno = hose->current_busno;
+#endif
 
        /* Clear all error indications */
 
-       if (pci->pme_msg_det && pci->pme_msg_det != 0xffffffff) {
-               debug("pci_fsl_init: pme_msg_det@%x=%x.  Clearing\n",
-                       &pci->pme_msg_det, pci->pme_msg_det);
-               pci->pme_msg_det = 0xffffffff;
-       }
-
-       if (pci->pedr) {
-               debug("pci_fsl_init: pedr@%x=%x.  Clearing\n",
-                       &pci->pedr, pci->pedr);
-               pci->pedr = 0xffffffff;
-       }
+       pci->pme_msg_det = 0xffffffff;
+       pci->pedr = 0xffffffff;
 
        pci_hose_read_config_word (hose, dev, PCI_DSR, &temp16);
        if (temp16) {
-               debug("pci_fsl_init: PCI_DSR@%x=%x.  Clearing\n",
-                       PCI_DSR, temp16);
                pci_hose_write_config_word(hose, dev,
-                                          PCI_DSR, 0xffff);
+                                       PCI_DSR, 0xffff);
        }
 
        pci_hose_read_config_word (hose, dev, PCI_SEC_STATUS, &temp16);
        if (temp16) {
-               debug("pci_fsl_init: PCI_SEC_STATUS@%x=%x.  Clearing\n",
-                       PCI_SEC_STATUS, temp16);
                pci_hose_write_config_word(hose, dev, PCI_SEC_STATUS, 0xffff);
        }
 }

diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h
index b806cc09f1f34a81e7a7bb921d227c75d01ca8f3..9be5a279e266b87d85c94622a357cd86f8b7c0d7 100644 (file)
--- a/include/asm-ppc/processor.h
+++ b/include/asm-ppc/processor.h
@@ -532,7 +532,7 @@
 #define LR     SPRN_LR
 #define MBAR    SPRN_MBAR       /* System memory base address */
 #if defined(CONFIG_MPC86xx)
-#define MSSCR0 SPRN_MSSCRO
+#define MSSCR0 SPRN_MSSCR0
 #endif
 #if defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
 #define PIR    SPRN_PIR