]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - common/cmd_universe.c
projects / karo-tx-uboot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
lcd: fix typo CONFIG_BMP_24BMP -> CONFIG_BMP_24BPP
[karo-tx-uboot.git] / common / cmd_universe.c
diff --git a/common/cmd_universe.c b/common/cmd_universe.c
index 6388546041d17c2031c69285fdcfe173fd79af13..c9310363f10edb53ea1b81e910fd41dc7b0ba513 100644 (file)
--- a/common/cmd_universe.c
+++ b/common/cmd_universe.c
@@ -1,23 +1,7 @@
 /*
  * (C) Copyright 2003 Stefan Roese, stefan.roese@esd-electronics.com
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -28,20 +12,6 @@
 
 #include <universe.h>
 
-
-#if (CONFIG_COMMANDS & CFG_CMD_UNIVERSE)
-
-#undef DBG
-
-#ifdef DBG
-# define UNI_DBG(fmt)          printf fmt
-#else
-# define UNI_DBG(fmt)
-#endif
-
-#define UNI_PRINT(fmt)         printf fmt
-
-
 #define PCI_VENDOR PCI_VENDOR_ID_TUNDRA
 #define PCI_DEVICE PCI_DEVICE_ID_TUNDRA_CA91C042
 
@@ -60,7 +30,7 @@ static UNI_DEV   *dev;
 
 int universe_init(void)
 {
-       int j, result, lastError = 0;
+       int j, result;
        pci_dev_t busdevfn;
        unsigned int val;
 
@@ -84,21 +54,24 @@ int universe_init(void)
        dev->busdevfn = busdevfn;
 
        pci_read_config_dword(busdevfn, PCI_BASE_ADDRESS_1, &val);
+       if (val & 1) {
+               pci_read_config_dword(busdevfn, PCI_BASE_ADDRESS_0, &val);
+       }
        val &= ~0xf;
        dev->uregs = (UNIVERSE *)val;
 
-       UNI_DBG(("UNIVERSE-Base    : %p\n", dev->uregs));
+       debug ("UNIVERSE-Base    : %p\n", dev->uregs);
 
        /* check mapping  */
-       UNI_DBG((" Read via mapping, PCI_ID = %08X\n", readl(&dev->uregs->pci_id)));
+       debug (" Read via mapping, PCI_ID = %08X\n", readl(&dev->uregs->pci_id));
        if (((PCI_DEVICE <<16) | PCI_VENDOR) !=  readl(&dev->uregs->pci_id)) {
-               UNI_PRINT(("UNIVERSE: Cannot read PCI-ID via Mapping: %08x\n",
-                          readl(&dev->uregs->pci_id)));
+               printf ("UNIVERSE: Cannot read PCI-ID via Mapping: %08x\n",
+                       readl(&dev->uregs->pci_id));
                result = -1;
                goto break_30;
        }
 
-       UNI_DBG(("PCI_BS = %08X\n", readl(&dev->uregs->pci_bs)));
+       debug ("PCI_BS = %08X\n", readl(&dev->uregs->pci_bs));
 
        dev->pci_bs = readl(&dev->uregs->pci_bs);
 
@@ -114,7 +87,13 @@ int universe_init(void)
         *   Arbitration Mode
         *   DTACK Enable
         */
-       writel(0x15060000, &dev->uregs->misc_ctl);
+       writel(0x15040000 | (readl(&dev->uregs->misc_ctl) & 0x00020000), &dev->uregs->misc_ctl);
+
+       if (readl(&dev->uregs->misc_ctl) & 0x00020000) {
+               debug ("System Controller!\n"); /* test-only */
+       } else {
+               debug ("Not System Controller!\n"); /* test-only */
+       }
 
        /*
         * Lets turn off interrupts
@@ -126,12 +105,12 @@ int universe_init(void)
        writel(0x0000, &dev->uregs->lint_map1);  /* Map all ints to 0 */
        eieio();
 
+       return 0;
+
  break_30:
        free(dev);
  break_20:
-       lastError = result;
-
-       return 0;
+       return result;
 }
 
 
@@ -154,12 +133,12 @@ int universe_pci_slave_window(unsigned int pciAddr, unsigned int vmeAddr, int si
        }
 
        if (i == 4) {
-               UNI_PRINT(("universe: No Image available\n"));
+               printf ("universe: No Image available\n");
                result = -1;
                goto exit_10;
        }
 
-       UNI_DBG(("universe: Using image %d\n", i));
+       debug ("universe: Using image %d\n", i);
 
        writel(pciAddr , &dev->uregs->lsi[i].bs);
        writel((pciAddr + size), &dev->uregs->lsi[i].bd);
@@ -205,13 +184,13 @@ int universe_pci_slave_window(unsigned int pciAddr, unsigned int vmeAddr, int si
 
        switch (pms & PCI_MS_Mxx) {
        case PCI_MS_MEM:
-               ctl = 0x00000000;
+               ctl |= 0x00000000;
                break;
        case PCI_MS_IO:
-               ctl = 0x00000001;
+               ctl |= 0x00000001;
                break;
        case PCI_MS_CONFIG:
-               ctl = 0x00000002;
+               ctl |= 0x00000002;
                break;
        }
 
@@ -219,11 +198,11 @@ int universe_pci_slave_window(unsigned int pciAddr, unsigned int vmeAddr, int si
 
        writel(ctl, &dev->uregs->lsi[i].ctl);
 
-       UNI_DBG(("universe: window-addr=%p\n", &dev->uregs->lsi[i].ctl));
-       UNI_DBG(("universe: pci slave window[%d] ctl=%08x\n", i, readl(&dev->uregs->lsi[i].ctl)));
-       UNI_DBG(("universe: pci slave window[%d] bs=%08x\n", i, readl(&dev->uregs->lsi[i].bs)));
-       UNI_DBG(("universe: pci slave window[%d] bd=%08x\n", i, readl(&dev->uregs->lsi[i].bd)));
-       UNI_DBG(("universe: pci slave window[%d] to=%08x\n", i, readl(&dev->uregs->lsi[i].to)));
+       debug ("universe: window-addr=%p\n", &dev->uregs->lsi[i].ctl);
+       debug ("universe: pci slave window[%d] ctl=%08x\n", i, readl(&dev->uregs->lsi[i].ctl));
+       debug ("universe: pci slave window[%d] bs=%08x\n", i, readl(&dev->uregs->lsi[i].bs));
+       debug ("universe: pci slave window[%d] bd=%08x\n", i, readl(&dev->uregs->lsi[i].bd));
+       debug ("universe: pci slave window[%d] to=%08x\n", i, readl(&dev->uregs->lsi[i].to));
 
        return 0;
 
@@ -251,12 +230,12 @@ int universe_vme_slave_window(unsigned int vmeAddr, unsigned int pciAddr, int si
        }
 
        if (i == 4) {
-               UNI_PRINT(("universe: No Image available\n"));
+               printf ("universe: No Image available\n");
                result = -1;
                goto exit_10;
        }
 
-       UNI_DBG(("universe: Using image %d\n", i));
+       debug ("universe: Using image %d\n", i);
 
        writel(vmeAddr , &dev->uregs->vsi[i].bs);
        writel((vmeAddr + size), &dev->uregs->vsi[i].bd);
@@ -290,13 +269,13 @@ int universe_vme_slave_window(unsigned int vmeAddr, unsigned int pciAddr, int si
 
        switch (pms & PCI_MS_Mxx) {
        case PCI_MS_MEM:
-               ctl = 0x00000000;
+               ctl |= 0x00000000;
                break;
        case PCI_MS_IO:
-               ctl = 0x00000001;
+               ctl |= 0x00000001;
                break;
        case PCI_MS_CONFIG:
-               ctl = 0x00000002;
+               ctl |= 0x00000002;
                break;
        }
 
@@ -304,11 +283,11 @@ int universe_vme_slave_window(unsigned int vmeAddr, unsigned int pciAddr, int si
 
        writel(ctl, &dev->uregs->vsi[i].ctl);
 
-       UNI_DBG(("universe: window-addr=%p\n", &dev->uregs->vsi[i].ctl));
-       UNI_DBG(("universe: vme slave window[%d] ctl=%08x\n", i, readl(&dev->uregs->vsi[i].ctl)));
-       UNI_DBG(("universe: vme slave window[%d] bs=%08x\n", i, readl(&dev->uregs->vsi[i].bs)));
-       UNI_DBG(("universe: vme slave window[%d] bd=%08x\n", i, readl(&dev->uregs->vsi[i].bd)));
-       UNI_DBG(("universe: vme slave window[%d] to=%08x\n", i, readl(&dev->uregs->vsi[i].to)));
+       debug ("universe: window-addr=%p\n", &dev->uregs->vsi[i].ctl);
+       debug ("universe: vme slave window[%d] ctl=%08x\n", i, readl(&dev->uregs->vsi[i].ctl));
+       debug ("universe: vme slave window[%d] bs=%08x\n", i, readl(&dev->uregs->vsi[i].bs));
+       debug ("universe: vme slave window[%d] bd=%08x\n", i, readl(&dev->uregs->vsi[i].bd));
+       debug ("universe: vme slave window[%d] to=%08x\n", i, readl(&dev->uregs->vsi[i].to));
 
        return 0;
 
@@ -320,7 +299,7 @@ int universe_vme_slave_window(unsigned int vmeAddr, unsigned int pciAddr, int si
 /*
  * Tundra Universe configuration
  */
-int do_universe(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_universe(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        ulong addr1 = 0, addr2 = 0, size = 0, vam = 0, pms = 0, vdw = 0;
        char cmd = 'x';
@@ -367,7 +346,7 @@ int do_universe(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        universe,       8,      1,      do_universe,
-       "universe- initialize and configure Turndra Universe\n",
+       "initialize and configure Turndra Universe",
        "init\n"
        "    - initialize universe\n"
        "universe vme [vme_addr] [pci_addr] [size] [vam] [pms]\n"
@@ -385,7 +364,5 @@ U_BOOT_CMD(
        "                                      03 -> Configuration Space\n"
        "    [vdw] = VMEbus Maximum Datawidth: 01 -> D8 Data Width\n"
        "                                      02 -> D16 Data Width\n"
-       "                                      03 -> D32 Data Width\n"
+       "                                      03 -> D32 Data Width"
 );
-
-#endif /* (CONFIG_COMMANDS & CFG_CMD_UNIVERSE) */
UBoot for KaRo TX COM modules