Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (bf640be4) · Commits · e / devices / android_kernel_teracube_emerald

arch/sparc/kernel/setup.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -180,11 +180,9 @@ static void __init boot_flags_init(char *commands)

		/* This routine will in the future do all the nasty prom stuff
		* to probe for the mmu type and its parameters, etc. This will
		* also be where SMP things happen plus the Sparc specific memory
		* physical memory probe as on the alpha.
		* also be where SMP things happen.
		*/

		extern int prom_probe_memory(void);
		extern void sun4c_probe_vac(void);
		extern char cputypval;
		extern unsigned long start, end;
		@@ -268,7 +266,6 @@ void __init setup_arch(char **cmdline_p)
		if (ARCH_SUN4C_SUN4)
		sun4c_probe_vac();
		load_mmu();
		(void) prom_probe_memory();

		phys_base = 0xffffffffUL;
		highest_paddr = 0UL;

arch/sparc/mm/fault.c

+6 −55

Original line number	Diff line number	Diff line
		@@ -47,64 +47,15 @@ int vac_size, vac_linesize, vac_do_hw_vac_flushes;
		int vac_entries_per_context, vac_entries_per_segment;
		int vac_entries_per_page;

		/* Nice, simple, prom library does all the sweating for us. ;) */
		int prom_probe_memory (void)
		/* Return how much physical memory we have. */
		unsigned long probe_memory(void)
		{
		register struct linux_mlist_v0 *mlist;
		register unsigned long bytes, base_paddr, tally;
		register int i;

		i = 0;
		mlist= *prom_meminfo()->v0_available;
		bytes = tally = mlist->num_bytes;
		base_paddr = (unsigned long) mlist->start_adr;

		sp_banks[0].base_addr = base_paddr;
		sp_banks[0].num_bytes = bytes;

		while (mlist->theres_more != (void *) 0){
		i++;
		mlist = mlist->theres_more;
		bytes = mlist->num_bytes;
		tally += bytes;
		if (i > SPARC_PHYS_BANKS-1) {
		printk ("The machine has more banks than "
		"this kernel can support\n"
		"Increase the SPARC_PHYS_BANKS "
		"setting (currently %d)\n",
		SPARC_PHYS_BANKS);
		i = SPARC_PHYS_BANKS-1;
		break;
		}

		sp_banks[i].base_addr = (unsigned long) mlist->start_adr;
		sp_banks[i].num_bytes = mlist->num_bytes;
		}

		i++;
		sp_banks[i].base_addr = 0xdeadbeef;
		sp_banks[i].num_bytes = 0;

		/* Now mask all bank sizes on a page boundary, it is all we can
		* use anyways.
		*/
		for(i=0; sp_banks[i].num_bytes != 0; i++)
		sp_banks[i].num_bytes &= PAGE_MASK;

		return tally;
		}

		/* Traverse the memory lists in the prom to see how much physical we
		* have.
		*/
		unsigned long
		probe_memory(void)
		{
		int total;
		unsigned long total = 0;
		int i;

		total = prom_probe_memory();
		for (i = 0; sp_banks[i].num_bytes; i++)
		total += sp_banks[i].num_bytes;

		/* Oh man, much nicer, keep the dirt in promlib. */
		return total;
		}

arch/sparc/prom/init.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -21,8 +21,6 @@ linux_sun4_romvec *sun4_romvec;
		/* The root node of the prom device tree. */
		int prom_root_node;

		int prom_stdin, prom_stdout;

		/* Pointer to the device tree operations structure. */
		struct linux_nodeops *prom_nodeops;

		@@ -74,11 +72,6 @@ void __init prom_init(struct linux_romvec *rp)
		(((unsigned long) prom_nodeops) == -1))
		prom_halt();

		if(prom_vers == PROM_V2 \|\| prom_vers == PROM_V3) {
		prom_stdout = *romvec->pv_v2bootargs.fd_stdout;
		prom_stdin = *romvec->pv_v2bootargs.fd_stdin;
		}

		prom_meminit();

		prom_ranges_init();

arch/sparc/prom/memory.c

+60 −175

Original line number	Diff line number	Diff line
		/* $Id: memory.c,v 1.15 2000/01/29 01:09:12 anton Exp $
		* memory.c: Prom routine for acquiring various bits of information
		/* memory.c: Prom routine for acquiring various bits of information
		* about RAM on the machine, both virtual and physical.
		*
		* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
		* Copyright (C) 1995, 2008 David S. Miller (davem@davemloft.net)
		* Copyright (C) 1997 Michael A. Griffith (grif@acm.org)
		*/

		#include <linux/kernel.h>
		#include <linux/sort.h>
		#include <linux/init.h>

		#include <asm/openprom.h>
		#include <asm/sun4prom.h>
		#include <asm/oplib.h>
		#include <asm/page.h>

		/* This routine, for consistency, returns the ram parameters in the
		* V0 prom memory descriptor format. I choose this format because I
		* think it was the easiest to work with. I feel the religious
		* arguments now... ;) Also, I return the linked lists sorted to
		* prevent paging_init() upset stomach as I have not yet written
		* the pepto-bismol kernel module yet.
		*/
		static int __init prom_meminit_v0(void)
		{
		struct linux_mlist_v0 *p;
		int index;

		index = 0;
		for (p = *(romvec->pv_v0mem.v0_available); p; p = p->theres_more) {
		sp_banks[index].base_addr = (unsigned long) p->start_adr;
		sp_banks[index].num_bytes = p->num_bytes;
		index++;
		}

		struct linux_prom_registers prom_reg_memlist[64];
		struct linux_prom_registers prom_reg_tmp[64];
		return index;
		}

		struct linux_mlist_v0 prom_phys_total[64];
		struct linux_mlist_v0 prom_prom_taken[64];
		struct linux_mlist_v0 prom_phys_avail[64];
		static int __init prom_meminit_v2(void)
		{
		struct linux_prom_registers reg[64];
		int node, size, num_ents, i;

		struct linux_mlist_v0 *prom_ptot_ptr = prom_phys_total;
		struct linux_mlist_v0 *prom_ptak_ptr = prom_prom_taken;
		struct linux_mlist_v0 *prom_pavl_ptr = prom_phys_avail;
		node = prom_searchsiblings(prom_getchild(prom_root_node), "memory");
		size = prom_getproperty(node, "available", (char *) reg, sizeof(reg));
		num_ents = size / sizeof(struct linux_prom_registers);

		struct linux_mem_v0 prom_memlist;
		for (i = 0; i < num_ents; i++) {
		sp_banks[i].base_addr = reg[i].phys_addr;
		sp_banks[i].num_bytes = reg[i].reg_size;
		}

		return num_ents;
		}

		/* Internal Prom library routine to sort a linux_mlist_v0 memory
		* list. Used below in initialization.
		*/
		static void __init
		prom_sortmemlist(struct linux_mlist_v0 *thislist)
		static int __init prom_meminit_sun4(void)
		{
		int swapi = 0;
		int i, mitr, tmpsize;
		char *tmpaddr;
		char *lowest;

		for(i=0; thislist[i].theres_more; i++) {
		lowest = thislist[i].start_adr;
		for(mitr = i+1; thislist[mitr-1].theres_more; mitr++)
		if(thislist[mitr].start_adr < lowest) {
		lowest = thislist[mitr].start_adr;
		swapi = mitr;
		}
		if(lowest == thislist[i].start_adr) continue;
		tmpaddr = thislist[swapi].start_adr;
		tmpsize = thislist[swapi].num_bytes;
		for(mitr = swapi; mitr > i; mitr--) {
		thislist[mitr].start_adr = thislist[mitr-1].start_adr;
		thislist[mitr].num_bytes = thislist[mitr-1].num_bytes;
		}
		thislist[i].start_adr = tmpaddr;
		thislist[i].num_bytes = tmpsize;
		#ifdef CONFIG_SUN4
		sp_banks[0].base_addr = 0;
		sp_banks[0].num_bytes = *(sun4_romvec->memoryavail);
		#endif
		return 1;
		}

		return;
		static int sp_banks_cmp(const void a, const void b)
		{
		const struct sparc_phys_banks x = a, y = b;

		if (x->base_addr > y->base_addr)
		return 1;
		if (x->base_addr < y->base_addr)
		return -1;
		return 0;
		}

		/* Initialize the memory lists based upon the prom version. */
		void __init prom_meminit(void)
		{
		int node = 0;
		unsigned int iter, num_regs;
		struct linux_mlist_v0 mptr; / ptr for traversal */
		int i, num_ents = 0;

		switch (prom_vers) {
		case PROM_V0:
		/* Nice, kind of easier to do in this case. */
		/* First, the total physical descriptors. */
		for(mptr = (*(romvec->pv_v0mem.v0_totphys)), iter=0;
		mptr; mptr=mptr->theres_more, iter++) {
		prom_phys_total[iter].start_adr = mptr->start_adr;
		prom_phys_total[iter].num_bytes = mptr->num_bytes;
		prom_phys_total[iter].theres_more = &prom_phys_total[iter+1];
		}
		prom_phys_total[iter-1].theres_more = NULL;
		/* Second, the total prom taken descriptors. */
		for(mptr = (*(romvec->pv_v0mem.v0_prommap)), iter=0;
		mptr; mptr=mptr->theres_more, iter++) {
		prom_prom_taken[iter].start_adr = mptr->start_adr;
		prom_prom_taken[iter].num_bytes = mptr->num_bytes;
		prom_prom_taken[iter].theres_more = &prom_prom_taken[iter+1];
		}
		prom_prom_taken[iter-1].theres_more = NULL;
		/* Last, the available physical descriptors. */
		for(mptr = (*(romvec->pv_v0mem.v0_available)), iter=0;
		mptr; mptr=mptr->theres_more, iter++) {
		prom_phys_avail[iter].start_adr = mptr->start_adr;
		prom_phys_avail[iter].num_bytes = mptr->num_bytes;
		prom_phys_avail[iter].theres_more = &prom_phys_avail[iter+1];
		}
		prom_phys_avail[iter-1].theres_more = NULL;
		/* Sort all the lists. */
		prom_sortmemlist(prom_phys_total);
		prom_sortmemlist(prom_prom_taken);
		prom_sortmemlist(prom_phys_avail);
		num_ents = prom_meminit_v0();
		break;

		case PROM_V2:
		case PROM_V3:
		/* Grrr, have to traverse the prom device tree ;( */
		node = prom_getchild(prom_root_node);
		node = prom_searchsiblings(node, "memory");
		num_regs = prom_getproperty(node, "available",
		(char *) prom_reg_memlist,
		sizeof(prom_reg_memlist));
		num_regs = (num_regs/sizeof(struct linux_prom_registers));
		for(iter=0; iter<num_regs; iter++) {
		prom_phys_avail[iter].start_adr =
		(char *) prom_reg_memlist[iter].phys_addr;
		prom_phys_avail[iter].num_bytes =
		(unsigned long) prom_reg_memlist[iter].reg_size;
		prom_phys_avail[iter].theres_more =
		&prom_phys_avail[iter+1];
		}
		prom_phys_avail[iter-1].theres_more = NULL;

		num_regs = prom_getproperty(node, "reg",
		(char *) prom_reg_memlist,
		sizeof(prom_reg_memlist));
		num_regs = (num_regs/sizeof(struct linux_prom_registers));
		for(iter=0; iter<num_regs; iter++) {
		prom_phys_total[iter].start_adr =
		(char *) prom_reg_memlist[iter].phys_addr;
		prom_phys_total[iter].num_bytes =
		(unsigned long) prom_reg_memlist[iter].reg_size;
		prom_phys_total[iter].theres_more =
		&prom_phys_total[iter+1];
		}
		prom_phys_total[iter-1].theres_more = NULL;

		node = prom_getchild(prom_root_node);
		node = prom_searchsiblings(node, "virtual-memory");
		num_regs = prom_getproperty(node, "available",
		(char *) prom_reg_memlist,
		sizeof(prom_reg_memlist));
		num_regs = (num_regs/sizeof(struct linux_prom_registers));

		/* Convert available virtual areas to taken virtual
		* areas. First sort, then convert.
		*/
		for(iter=0; iter<num_regs; iter++) {
		prom_prom_taken[iter].start_adr =
		(char *) prom_reg_memlist[iter].phys_addr;
		prom_prom_taken[iter].num_bytes =
		(unsigned long) prom_reg_memlist[iter].reg_size;
		prom_prom_taken[iter].theres_more =
		&prom_prom_taken[iter+1];
		}
		prom_prom_taken[iter-1].theres_more = NULL;

		prom_sortmemlist(prom_prom_taken);

		/* Finally, convert. */
		for(iter=0; iter<num_regs; iter++) {
		prom_prom_taken[iter].start_adr =
		prom_prom_taken[iter].start_adr +
		prom_prom_taken[iter].num_bytes;
		prom_prom_taken[iter].num_bytes =
		prom_prom_taken[iter+1].start_adr -
		prom_prom_taken[iter].start_adr;
		}
		prom_prom_taken[iter-1].num_bytes =
		0xffffffff - (unsigned long) prom_prom_taken[iter-1].start_adr;

		/* Sort the other two lists. */
		prom_sortmemlist(prom_phys_total);
		prom_sortmemlist(prom_phys_avail);
		num_ents = prom_meminit_v2();
		break;

		case PROM_SUN4:
		#ifdef CONFIG_SUN4
		/* how simple :) */
		prom_phys_total[0].start_adr = NULL;
		prom_phys_total[0].num_bytes = *(sun4_romvec->memorysize);
		prom_phys_total[0].theres_more = NULL;
		prom_prom_taken[0].start_adr = NULL;
		prom_prom_taken[0].num_bytes = 0x0;
		prom_prom_taken[0].theres_more = NULL;
		prom_phys_avail[0].start_adr = NULL;
		prom_phys_avail[0].num_bytes = *(sun4_romvec->memoryavail);
		prom_phys_avail[0].theres_more = NULL;
		#endif
		num_ents = prom_meminit_sun4();
		break;

		default:
		break;
		};

		/* Link all the lists into the top-level descriptor. */
		prom_memlist.v0_totphys=&prom_ptot_ptr;
		prom_memlist.v0_prommap=&prom_ptak_ptr;
		prom_memlist.v0_available=&prom_pavl_ptr;

		return;
		}
		sort(sp_banks, num_ents, sizeof(struct sparc_phys_banks),
		sp_banks_cmp, NULL);

		/* This returns a pointer to our libraries internal v0 format
		* memory descriptor.
		*/
		struct linux_mem_v0 *
		prom_meminfo(void)
		{
		return &prom_memlist;
		/* Sentinel. */
		sp_banks[num_ents].base_addr = 0xdeadbeef;
		sp_banks[num_ents].num_bytes = 0;

		for (i = 0; i < num_ents; i++)
		sp_banks[i].num_bytes &= PAGE_MASK;
		}

arch/sparc64/kernel/pci.c

+33 −97

Original line number	Diff line number	Diff line
		@@ -350,8 +350,7 @@ static void pci_parse_of_addrs(struct of_device *op,

		struct pci_dev of_create_pci_dev(struct pci_pbm_info pbm,
		struct device_node *node,
		struct pci_bus *bus, int devfn,
		int host_controller)
		struct pci_bus *bus, int devfn)
		{
		struct dev_archdata *sd;
		struct pci_dev *dev;
		@@ -390,21 +389,6 @@ struct pci_dev of_create_pci_dev(struct pci_pbm_info pbm,
		dev->devfn = devfn;
		dev->multifunction = 0; /* maybe a lie? */

		if (host_controller) {
		if (tlb_type != hypervisor) {
		pci_read_config_word(dev, PCI_VENDOR_ID,
		&dev->vendor);
		pci_read_config_word(dev, PCI_DEVICE_ID,
		&dev->device);
		} else {
		dev->vendor = PCI_VENDOR_ID_SUN;
		dev->device = 0x80f0;
		}
		dev->cfg_size = 256;
		dev->class = PCI_CLASS_BRIDGE_HOST << 8;
		sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),
		0x00, PCI_SLOT(devfn), PCI_FUNC(devfn));
		} else {
		dev->vendor = of_getintprop_default(node, "vendor-id", 0xffff);
		dev->device = of_getintprop_default(node, "device-id", 0xffff);
		dev->subsystem_vendor =
		@@ -426,7 +410,7 @@ struct pci_dev of_create_pci_dev(struct pci_pbm_info pbm,

		sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),
		dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));
		}

		if (ofpci_verbose)
		printk(" class: 0x%x device name: %s\n",
		dev->class, pci_name(dev));
		@@ -441,11 +425,6 @@ struct pci_dev of_create_pci_dev(struct pci_pbm_info pbm,
		dev->current_state = 4; /* unknown power state */
		dev->error_state = pci_channel_io_normal;

		if (host_controller) {
		dev->hdr_type = PCI_HEADER_TYPE_BRIDGE;
		dev->rom_base_reg = PCI_ROM_ADDRESS1;
		dev->irq = PCI_IRQ_NONE;
		} else {
		if (!strcmp(type, "pci") \|\| !strcmp(type, "pciex")) {
		/* a PCI-PCI bridge */
		dev->hdr_type = PCI_HEADER_TYPE_BRIDGE;
		@@ -460,7 +439,7 @@ struct pci_dev of_create_pci_dev(struct pci_pbm_info pbm,
		if (dev->irq == 0xffffffff)
		dev->irq = PCI_IRQ_NONE;
		}
		}

		pci_parse_of_addrs(sd->op, node, dev);

		if (ofpci_verbose)
		@@ -749,7 +728,7 @@ static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm,
		prev_devfn = devfn;

		/* create a new pci_dev for this device */
		dev = of_create_pci_dev(pbm, child, bus, devfn, 0);
		dev = of_create_pci_dev(pbm, child, bus, devfn);
		if (!dev)
		continue;
		if (ofpci_verbose)
		@@ -796,48 +775,9 @@ static void __devinit pci_bus_register_of_sysfs(struct pci_bus *bus)
		pci_bus_register_of_sysfs(child_bus);
		}

		int pci_host_bridge_read_pci_cfg(struct pci_bus *bus_dev,
		unsigned int devfn,
		int where, int size,
		u32 *value)
		{
		static u8 fake_pci_config[] = {
		0x8e, 0x10, /* Vendor: 0x108e (Sun) */
		0xf0, 0x80, /* Device: 0x80f0 (Fire) */
		0x46, 0x01, /* Command: 0x0146 (SERR, PARITY, MASTER, MEM) */
		0xa0, 0x22, /* Status: 0x02a0 (DEVSEL_MED, FB2B, 66MHZ) */
		0x00, 0x00, 0x00, 0x06, /* Class: 0x06000000 host bridge */
		0x00, /* Cacheline: 0x00 */
		0x40, /* Latency: 0x40 */
		0x00, /* Header-Type: 0x00 normal */
		};

		*value = 0;
		if (where >= 0 && where < sizeof(fake_pci_config) &&
		(where + size) >= 0 &&
		(where + size) < sizeof(fake_pci_config) &&
		size <= sizeof(u32)) {
		while (size--) {
		*value <<= 8;
		*value \|= fake_pci_config[where + size];
		}
		}

		return PCIBIOS_SUCCESSFUL;
		}

		int pci_host_bridge_write_pci_cfg(struct pci_bus *bus_dev,
		unsigned int devfn,
		int where, int size,
		u32 value)
		{
		return PCIBIOS_SUCCESSFUL;
		}

		struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm)
		{
		struct device_node *node = pbm->prom_node;
		struct pci_dev *host_pdev;
		struct pci_bus *bus;

		printk("PCI: Scanning PBM %s\n", node->full_name);
		@@ -855,10 +795,6 @@ struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm)
		bus->resource[0] = &pbm->io_space;
		bus->resource[1] = &pbm->mem_space;

		/* Create the dummy host bridge and link it in. */
		host_pdev = of_create_pci_dev(pbm, node, bus, 0x00, 1);
		bus->self = host_pdev;

		pci_of_scan_bus(pbm, node, bus);
		pci_bus_add_devices(bus);
		pci_bus_register_of_sysfs(bus);