From b59c5de056058899e5ea891d2fd65824a7df7887 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Sat, 18 Oct 2014 10:21:14 +0200 Subject: Drop GX1, CS5330 and related boards There is no Cache As Ram for these boards, let's get rid of them. Change-Id: Ib41f8cd64fc9a440838aea86076d6514aacb301c Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/7117 Reviewed-by: Marc Jones --- src/northbridge/amd/Kconfig | 1 - src/northbridge/amd/Makefile.inc | 1 - src/northbridge/amd/gx1/Kconfig | 22 --- src/northbridge/amd/gx1/Makefile.inc | 21 -- src/northbridge/amd/gx1/northbridge.c | 162 ---------------- src/northbridge/amd/gx1/raminit.c | 354 ---------------------------------- src/northbridge/amd/gx1/raminit.h | 11 -- 7 files changed, 572 deletions(-) delete mode 100644 src/northbridge/amd/gx1/Kconfig delete mode 100644 src/northbridge/amd/gx1/Makefile.inc delete mode 100644 src/northbridge/amd/gx1/northbridge.c delete mode 100644 src/northbridge/amd/gx1/raminit.c delete mode 100644 src/northbridge/amd/gx1/raminit.h (limited to 'src/northbridge') diff --git a/src/northbridge/amd/Kconfig b/src/northbridge/amd/Kconfig index c75e82cdb5..e9b3796398 100644 --- a/src/northbridge/amd/Kconfig +++ b/src/northbridge/amd/Kconfig @@ -1,5 +1,4 @@ source src/northbridge/amd/amdk8/Kconfig -source src/northbridge/amd/gx1/Kconfig source src/northbridge/amd/gx2/Kconfig source src/northbridge/amd/amdfam10/Kconfig source src/northbridge/amd/lx/Kconfig diff --git a/src/northbridge/amd/Makefile.inc b/src/northbridge/amd/Makefile.inc index edb4038261..80e9961f03 100644 --- a/src/northbridge/amd/Makefile.inc +++ b/src/northbridge/amd/Makefile.inc @@ -1,6 +1,5 @@ subdirs-$(CONFIG_NORTHBRIDGE_AMD_AMDFAM10) += amdfam10 subdirs-$(CONFIG_NORTHBRIDGE_AMD_AMDK8) += amdk8 -subdirs-$(CONFIG_NORTHBRIDGE_AMD_GX1) += gx1 subdirs-$(CONFIG_NORTHBRIDGE_AMD_GX2) += gx2 subdirs-$(CONFIG_NORTHBRIDGE_AMD_LX) += lx subdirs-$(CONFIG_NORTHBRIDGE_AMD_AGESA) += agesa diff --git a/src/northbridge/amd/gx1/Kconfig b/src/northbridge/amd/gx1/Kconfig deleted file mode 100644 index 4d576132f4..0000000000 --- a/src/northbridge/amd/gx1/Kconfig +++ /dev/null @@ -1,22 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2009 Uwe Hermann -## -## 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; version 2 of the License. -## -## 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -config NORTHBRIDGE_AMD_GX1 - bool - diff --git a/src/northbridge/amd/gx1/Makefile.inc b/src/northbridge/amd/gx1/Makefile.inc deleted file mode 100644 index a67331f75b..0000000000 --- a/src/northbridge/amd/gx1/Makefile.inc +++ /dev/null @@ -1,21 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2009 Uwe Hermann -## -## 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -ramstage-y += northbridge.c diff --git a/src/northbridge/amd/gx1/northbridge.c b/src/northbridge/amd/gx1/northbridge.c deleted file mode 100644 index bcb6e56198..0000000000 --- a/src/northbridge/amd/gx1/northbridge.c +++ /dev/null @@ -1,162 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define NORTHBRIDGE_FILE "northbridge.c" -/* -*/ - -static void optimize_xbus(device_t dev) -{ - /* Optimise X-Bus performance */ - pci_write_config8(dev, 0x40, 0x1e); - pci_write_config8(dev, 0x41, 0x52); - pci_write_config8(dev, 0x43, 0xc1); - pci_write_config8(dev, 0x44, 0x00); -} - -/** - * Enables memory from 0xC0000 up to 0xFFFFF. - * So this region is read/write and cache able - * - * FIXME: What about PCI master access into - * this region? - **/ - -static void enable_shadow(device_t dev) -{ - write32(GX_BASE+BC_XMAP_2, 0x77777777); - write32(GX_BASE+BC_XMAP_3, 0x77777777); -} - -static void northbridge_init(device_t dev) -{ - printk(BIOS_DEBUG, "northbridge: %s()\n", __func__); - - optimize_xbus(dev); - enable_shadow(dev); - printk(BIOS_SPEW, "Calling enable_cache()\n"); - enable_cache(); -} - - -static struct device_operations northbridge_operations = { - .read_resources = pci_dev_read_resources, - .set_resources = pci_dev_set_resources, - .enable_resources = pci_dev_enable_resources, - .init = northbridge_init, - .enable = 0, - .ops_pci = 0, -}; - -static const struct pci_driver northbridge_driver __pci_driver = { - .ops = &northbridge_operations, - .vendor = PCI_VENDOR_ID_CYRIX, - .device = PCI_DEVICE_ID_CYRIX_PCI_MASTER, -}; - -#include - -static void pci_domain_set_resources(device_t dev) -{ - device_t mc_dev; - uint32_t pci_tolm; - - pci_tolm = find_pci_tolm(dev->link_list); - mc_dev = dev->link_list->children; - if (mc_dev) { - unsigned int tomk, tolmk; - unsigned int ramreg = 0; - int i, idx; - unsigned int *bcdramtop = (unsigned int *)(GX_BASE + BC_DRAM_TOP); - unsigned int *mcgbaseadd = (unsigned int *)(GX_BASE + MC_GBASE_ADD); - - for(i=0; i<0x20; i+= 0x10) { - unsigned int *mcreg = (unsigned int *)(GX_BASE + MC_BANK_CFG); - unsigned int mem_config = *mcreg; - - if (((mem_config & (DIMM_PG_SZ << i)) >> (4 + i)) == 7) - continue; - ramreg += 1 << (((mem_config & (DIMM_SZ << i)) >> (i + 8)) + 2); - } - - tomk = ramreg << 10; - - /* Sort out the framebuffer size */ - tomk -= CONFIG_VIDEO_MB * 1024; - *bcdramtop = ((tomk << 10) - 1); - *mcgbaseadd = (tomk >> 9); - - printk(BIOS_DEBUG, "BC_DRAM_TOP = 0x%08x\n", *bcdramtop); - printk(BIOS_DEBUG, "MC_GBASE_ADD = 0x%08x\n", *mcgbaseadd); - - printk(BIOS_DEBUG, "I would set ram size to %d Mbytes\n", (tomk >> 10)); - - /* Compute the top of Low memory */ - tolmk = pci_tolm >> 10; - if (tolmk >= tomk) { - /* The PCI hole does does not overlap the memory. - */ - tolmk = tomk; - } - - set_top_of_ram(tolmk * 1024); - - /* Report the memory regions */ - idx = 10; - ram_resource(dev, idx++, 0, tolmk); - } - assign_resources(dev->link_list); -} - -static struct device_operations pci_domain_ops = { - .read_resources = pci_domain_read_resources, - .set_resources = pci_domain_set_resources, - .enable_resources = NULL, - .init = NULL, - .scan_bus = pci_domain_scan_bus, - .ops_pci_bus = pci_bus_default_ops, -}; - -static void cpu_bus_init(device_t dev) -{ - printk(BIOS_SPEW, "%s:%s()\n", NORTHBRIDGE_FILE, __func__); - initialize_cpus(dev->link_list); -} - -static struct device_operations cpu_bus_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, - .enable_resources = DEVICE_NOOP, - .init = cpu_bus_init, - .scan_bus = 0, -}; - -static void enable_dev(struct device *dev) -{ - printk(BIOS_SPEW, "%s:%s()\n", NORTHBRIDGE_FILE, __func__); - /* Set the operations if it is a special bus type */ - if (dev->path.type == DEVICE_PATH_DOMAIN) { - printk(BIOS_SPEW, "DEVICE_PATH_DOMAIN\n"); - dev->ops = &pci_domain_ops; - } - else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { - printk(BIOS_SPEW, "DEVICE_PATH_CPU_CLUSTER\n"); - dev->ops = &cpu_bus_ops; - } else { - printk(BIOS_SPEW, "device path type %d\n",dev->path.type); - } -} - -struct chip_operations northbridge_amd_gx1_ops = { - CHIP_NAME("AMD GX1 Northbridge") - .enable_dev = enable_dev, -}; diff --git a/src/northbridge/amd/gx1/raminit.c b/src/northbridge/amd/gx1/raminit.c deleted file mode 100644 index aa07f49e81..0000000000 --- a/src/northbridge/amd/gx1/raminit.c +++ /dev/null @@ -1,354 +0,0 @@ -#include - -/* -This software and ancillary information (herein called SOFTWARE ) -called LinuxBIOS is made available under the terms described -here. The SOFTWARE has been approved for release with associated -LA-CC Number 00-34 . Unless otherwise indicated, this SOFTWARE has -been authored by an employee or employees of the University of -California, operator of the Los Alamos National Laboratory under -Contract No. W-7405-ENG-36 with the U.S. Department of Energy. The -U.S. Government has rights to use, reproduce, and distribute this -SOFTWARE. The public may copy, distribute, prepare derivative works -and publicly display this SOFTWARE without charge, provided that this -Notice and any statement of authorship are reproduced on all copies. -Neither the Government nor the University makes any warranty, express -or implied, or assumes any liability or responsibility for the use of -this SOFTWARE. If SOFTWARE is modified to produce derivative works, -such modified SOFTWARE should be clearly marked, so as not to confuse -it with the version available from LANL. - */ -/* Copyright 2000, Ron Minnich, Advanced Computing Lab, LANL - * rminnich@lanl.gov - */ - -/* SDRAM initialization for GX1 - translated from Christer Weinigel's - assembler version into C. - - Hamish Guthrie 10/4/2005 hamish@prodigi.ch -*/ - -#define NUM_REFRESH 8 -#define TEST_DATA1 0x05A5A5A5A -#define TEST_DATA2 0x0DEADBEEF - -void setGX1Mem(unsigned int addr, unsigned int data) -{ - write32(addr, data); -} - -unsigned int getGX1Mem(unsigned int addr) -{ - return (unsigned int)read32(addr); -} - -void do_refresh(void) -{ -unsigned int tval, i; - - post_code(0x71); - tval = getGX1Mem(GX_BASE + MC_MEM_CNTRL1); - tval |= RFSHTST; - for(i=0; i>NUM_REFRESH; i++) - setGX1Mem(GX_BASE + MC_MEM_CNTRL1, tval); - post_code(0x72); -} - - -void enable_dimm(void) -{ -unsigned int tval, i; - - post_code(0x73); - - /* start SDCLCK's */ - tval = getGX1Mem(GX_BASE + MC_MEM_CNTRL1); - tval &= ~SDCLKSTRT; - setGX1Mem(GX_BASE + MC_MEM_CNTRL1, tval); - tval |= SDCLKSTRT; - setGX1Mem(GX_BASE + MC_MEM_CNTRL1, tval); - - /* Unmask SDCLK's */ - tval = getGX1Mem(GX_BASE + MC_MEM_CNTRL2); - tval &= ~(SDCLK_MASK | SDCLKOUT_MASK); - setGX1Mem(GX_BASE + MC_MEM_CNTRL2, tval); - tval = getGX1Mem(GX_BASE + MC_MEM_CNTRL2); - - /* Wait for clocks to unmask */ - for(i=0; i<5000; i++) - outb(0, 0xed); - - /* Refresh memory */ - tval = getGX1Mem(GX_BASE + MC_MEM_CNTRL1); - tval |= RFSHTST; - for(i=0; iNUM_REFRESH; i++) - setGX1Mem(GX_BASE + MC_MEM_CNTRL1, tval); - - for(i=0; i<2000; i++) - outb(0, 0xed); - post_code(0x74); -} - -static unsigned int size_dimm(int dimm_shift) -{ -int bank_cfg = 0x700; /* MC_BANK_CFG for 512M */ -unsigned int offset = 0x10000000; /* Offset 256M */ -int failed_flag = 1; - - do { - setGX1Mem(0, TEST_DATA1); - setGX1Mem(offset, TEST_DATA2); - setGX1Mem(0x100, 0); /* Clear the bus */ - if (getGX1Mem(0) != TEST_DATA1) { - setGX1Mem(GX_BASE + MC_BANK_CFG, - getGX1Mem(GX_BASE + MC_BANK_CFG) & ~(DIMM_SZ << dimm_shift)); - bank_cfg -= 0x100; - setGX1Mem(GX_BASE + MC_BANK_CFG, - getGX1Mem(GX_BASE + MC_BANK_CFG) | (bank_cfg << dimm_shift)); - do_refresh(); - offset >>= 1; - } else { - failed_flag = 0; - break; - } - } while (bank_cfg >= 0); - - if (failed_flag) - return (0x0070 << dimm_shift); - else - return(getGX1Mem(GX_BASE + MC_BANK_CFG) & (DIMM_SZ << dimm_shift)); - -} - -static unsigned int module_banks(int dimm_shift) -{ -int page_size = 0x800; /* Smallest page = 1K * 2 banks */ -int comp_banks; - -#if 0 - print_debug("MC_BANK_CFG = "); - print_debug_hex32(getGX1Mem(GX_BASE + MC_BANK_CFG)); - print_debug("\n"); -#endif - - /* retrieve the page size from the MC register */ - page_size <<= (((getGX1Mem(GX_BASE + MC_BANK_CFG) & (DIMM_PG_SZ << dimm_shift)) >> dimm_shift) >> 4); - -#if 0 - print_debug(" page_size = "); - print_debug_hex32(page_size); - print_debug("\n"); -#endif - - comp_banks = (((getGX1Mem(GX_BASE + MC_BANK_CFG) & (DIMM_COMP_BNK << dimm_shift)) >> dimm_shift) >> 12); - page_size <<= comp_banks; - - setGX1Mem(0, TEST_DATA1); - setGX1Mem(page_size, TEST_DATA2); - setGX1Mem(0x100, 0); /* Clear the bus */ - if (getGX1Mem(page_size) != TEST_DATA2) { - setGX1Mem(GX_BASE + MC_BANK_CFG, - getGX1Mem(GX_BASE + MC_BANK_CFG) & ~(DIMM_MOD_BNK << dimm_shift)); - do_refresh(); - } -#if 0 - print_debug("MC_BANK_CFG = "); - print_debug_hex32(getGX1Mem(GX_BASE + MC_BANK_CFG)); - print_debug("\n"); -#endif - return(getGX1Mem(GX_BASE + MC_BANK_CFG) & (DIMM_MOD_BNK << dimm_shift)); -} - -static unsigned int component_banks(int dimm_shift) -{ -int page_size = 0x800; /* Smallest page = 1K * 2 banks */ - -#if 0 - print_debug("MC_BANK_CFG = "); - print_debug_hex32(getGX1Mem(GX_BASE + MC_BANK_CFG)); - print_debug("\n"); -#endif - - page_size = page_size << (((getGX1Mem(GX_BASE + MC_BANK_CFG) & (DIMM_PG_SZ << dimm_shift)) >> dimm_shift) >> 4); - -#if 0 - print_debug(" page_size = "); - print_debug_hex32(page_size); - print_debug("\n"); -#endif - - setGX1Mem(0, TEST_DATA1); - setGX1Mem(page_size, TEST_DATA2); - setGX1Mem(0x100, 0); /* Clear the bus */ - if (getGX1Mem(0) != TEST_DATA1) { - setGX1Mem(GX_BASE + MC_BANK_CFG, - getGX1Mem(GX_BASE + MC_BANK_CFG) & ~(DIMM_COMP_BNK << dimm_shift)); - do_refresh(); - } -#if 0 - print_debug("MC_BANK_CFG = "); - print_debug_hex32(getGX1Mem(GX_BASE + MC_BANK_CFG)); - print_debug("\n"); -#endif - return(getGX1Mem(GX_BASE + MC_BANK_CFG) & (DIMM_COMP_BNK << dimm_shift)); -} - -static unsigned int page_size(int dimm_shift) -{ -unsigned int page_test_offset = 0x2000; -unsigned int temp; -int page_size_config = 0x40; -unsigned int probe_config; - - do { - setGX1Mem(0, TEST_DATA1); - setGX1Mem(page_test_offset, TEST_DATA2); - setGX1Mem(0x100, 0); - temp = getGX1Mem(0); - setGX1Mem(0, 0); - if(temp == TEST_DATA1) { -#if 0 - print_debug(" Page size Config = "); - print_debug_hex32(page_size_config << dimm_shift); - print_debug("\n"); -#endif - return(page_size_config << dimm_shift); - } - - temp = ~(DIMM_PG_SZ << dimm_shift); - - probe_config = getGX1Mem(GX_BASE + MC_BANK_CFG); - probe_config &= temp; - - page_size_config -= 0x10; - page_size_config <<= dimm_shift; - - probe_config |= page_size_config; - - page_size_config >>= dimm_shift; - - page_test_offset >>= 1; - - setGX1Mem(GX_BASE + MC_BANK_CFG, probe_config); - do_refresh(); - } while (page_size_config >= 0); - - return 0x70; -} - -static int dimm_detect(int dimm_shift) -{ -unsigned int test; - - print_debug("Probing for DIMM"); - print_debug_char((dimm_shift >> 4) + 0x30); - print_debug("\n"); - - setGX1Mem(0, TEST_DATA1); - setGX1Mem(0x100, 0); - test = getGX1Mem(0); - setGX1Mem(0, 0); - - if (test != TEST_DATA1) - return 0; - - print_debug(" Found DIMM"); - print_debug_char((dimm_shift >> 4) + 0x30); - print_debug("\n"); - - return 1; -} - -static int size_memory(int dimm_shift, unsigned int mem_config) -{ - - if (!dimm_detect(dimm_shift)) - return (mem_config); - - mem_config &= (~(DIMM_PG_SZ << dimm_shift)); - mem_config |= (page_size(dimm_shift)); - - print_debug(" Page Size: "); - print_debug_hex32(0x400 << ((mem_config & (DIMM_PG_SZ << dimm_shift)) >> (dimm_shift + 4))); - print_debug("\n"); - - /* Now do component banks detection */ - - mem_config &= (~(DIMM_COMP_BNK << dimm_shift)); - mem_config |= (component_banks(dimm_shift)); - - print_debug(" Component Banks: "); - print_debug_char((((mem_config & (DIMM_COMP_BNK << dimm_shift)) >> (dimm_shift + 12)) ? 4 : 2) + 0x30); - print_debug("\n"); - - /* Now do module banks */ - - mem_config &= (~(DIMM_MOD_BNK << dimm_shift)); - mem_config |= (module_banks(dimm_shift)); - - print_debug(" Module Banks: "); - print_debug_char((((mem_config & (DIMM_MOD_BNK << dimm_shift)) >> (dimm_shift + 14)) ? 2 : 1) + 0x30); - print_debug("\n"); - - mem_config &= (~(DIMM_SZ << dimm_shift)); - mem_config |= (size_dimm(dimm_shift)); - - print_debug(" DIMM size: "); - print_debug_hex32(1 << - ((mem_config & (DIMM_SZ << dimm_shift)) >> (dimm_shift + 8)) + 22); - print_debug("\n"); - - return (mem_config); -} - -static void sdram_init(void) -{ -unsigned int mem_config = 0x00700070; - - print_debug("Setting up default parameters for memory\n"); - post_code(0x70); - - setGX1Mem(GX_BASE + MC_MEM_CNTRL2, 0x000007d8); /* Disable all CLKS, Shift = 3 */ - setGX1Mem(GX_BASE + MC_MEM_CNTRL1, 0x92140000); /* MD_DS=2, MA_DS=2, CNTL_DS=2 SDCLKRATE=4 */ - setGX1Mem(GX_BASE + MC_BANK_CFG, 0x00700070); /* No DIMMS installed */ - setGX1Mem(GX_BASE + MC_SYNC_TIM1, 0x3a733225); /* LTMODE=3, RC=10, RAS=7, RP=3, RCD=3, RRD=2, DPL=2 */ - setGX1Mem(GX_BASE + MC_BANK_CFG, 0x57405740); /* Largest DIMM size - 0x4000 -- 2 module banks - 0x1000 -- 4 component banks - 0x0700 -- DIMM size 512MB - 0x0040 -- Page Size 16kB */ - - enable_dimm(); - - print_debug("Sizing memory\n"); - - setGX1Mem(GX_BASE + MC_BANK_CFG, 0x00705740); - do_refresh(); - mem_config = size_memory(0, mem_config); - setGX1Mem(GX_BASE + MC_BANK_CFG, 0x57400070); - do_refresh(); - mem_config = size_memory(16, mem_config); - - print_debug("MC_BANK_CFG = "); - print_debug_hex32(mem_config); - print_debug("\n"); - - setGX1Mem(GX_BASE + MC_BANK_CFG, mem_config); - enable_dimm(); - post_code(0x7e); -} diff --git a/src/northbridge/amd/gx1/raminit.h b/src/northbridge/amd/gx1/raminit.h deleted file mode 100644 index 6e40683066..0000000000 --- a/src/northbridge/amd/gx1/raminit.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef RAMINIT_H -#define RAMINIT_H - -#define DIMM_SOCKETS 4 -struct mem_controller { - device_t d0; - uint16_t channel0[DIMM_SOCKETS]; -}; - - -#endif /* RAMINIT_H */ -- cgit v1.2.3