Date: Thu, 28 Oct 2010 19:21:34 +0200 From: Attilio Rao <attilio@freebsd.org> To: John Baldwin <jhb@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r214457 - in head/sys: amd64/amd64 conf i386/i386 x86/x86 Message-ID: <AANLkTim_znVvoC0DVygFEu8GPOiwiuNs2fB_iMp61GpA@mail.gmail.com> In-Reply-To: <201010281257.05481.jhb@freebsd.org> References: <201010281631.o9SGVdtZ014923@svn.freebsd.org> <201010281257.05481.jhb@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
2010/10/28 John Baldwin <jhb@freebsd.org>: > On Thursday, October 28, 2010 12:31:39 pm Attilio Rao wrote: >> Author: attilio >> Date: Thu Oct 28 16:31:39 2010 >> New Revision: 214457 >> URL: http://svn.freebsd.org/changeset/base/214457 >> >> Log: >> =C2=A0 Merge nexus.c from amd64 and i386 to x86 subtree. >> >> =C2=A0 Sponsored by: =C2=A0 =C2=A0 =C2=A0 Sandvine Incorporated >> =C2=A0 Tested by: =C2=A0gianni >> > > It would be better to merge these two routines. =C2=A0The loader now pass= es the > smap to i386 kernels as well, so ram_attach() should probably be changed = to > try the amd64 approach first and if that fails fall back to using the > phys_avail[] array instead. What do you think about this patch?: Index: nexus.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- nexus.c (revision 214457) +++ nexus.c (working copy) @@ -52,9 +52,7 @@ #include <sys/systm.h> #include <sys/bus.h> #include <sys/kernel.h> -#ifdef __amd64__ #include <sys/linker.h> -#endif #include <sys/malloc.h> #include <sys/module.h> #include <machine/bus.h> @@ -67,12 +65,10 @@ #include <vm/pmap.h> #include <machine/pmap.h> -#ifdef __amd64__ #include <machine/metadata.h> -#include <machine/pc/bios.h> -#endif #include <machine/nexusvar.h> #include <machine/resource.h> +#include <machine/pc/bios.h> #ifdef DEV_APIC #include "pcib_if.h" @@ -89,11 +85,13 @@ #include <sys/rtprio.h> #ifdef __amd64__ -#define RMAN_BUS_SPACE_IO AMD64_BUS_SPACE_IO -#define RMAN_BUS_SPACE_MEM AMD64_BUS_SPACE_MEM +#define X86_BUS_SPACE_IO AMD64_BUS_SPACE_IO +#define X86_BUS_SPACE_MEM AMD64_BUS_SPACE_MEM +#define ELF_KERN_STR "elf64 kernel" #else -#define RMAN_BUS_SPACE_IO I386_BUS_SPACE_IO -#define RMAN_BUS_SPACE_MEM I386_BUS_SPACE_MEM +#define X86_BUS_SPACE_IO I386_BUS_SPACE_IO +#define X86_BUS_SPACE_MEM I386_BUS_SPACE_MEM +#define ELF_KERN_STR "elf32 kernel" #endif static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device"); @@ -435,7 +433,7 @@ #else rman_set_bushandle(r, rman_get_start(r)); #endif - rman_set_bustag(r, RMAN_BUS_SPACE_IO); + rman_set_bustag(r, X86_BUS_SPACE_IO); break; case SYS_RES_MEMORY: #ifdef PC98 @@ -446,7 +444,7 @@ #endif vaddr =3D pmap_mapdev(rman_get_start(r), rman_get_size(r)); rman_set_virtual(r, vaddr); - rman_set_bustag(r, RMAN_BUS_SPACE_MEM); + rman_set_bustag(r, X86_BUS_SPACE_MEM); #ifdef PC98 /* PC-98: the type of bus_space_handle_t is the structure. = */ bh->bsh_base =3D (bus_addr_t) vaddr; @@ -668,20 +666,20 @@ return (0); } -#ifdef __amd64__ static int ram_attach(device_t dev) { struct bios_smap *smapbase, *smap, *smapend; struct resource *res; + vm_paddr_t *p; caddr_t kmdp; uint32_t smapsize; - int error, rid; + int error, i, rid; /* Retrieve the system memory map from the loader. */ kmdp =3D preload_search_by_type("elf kernel"); if (kmdp =3D=3D NULL) - kmdp =3D preload_search_by_type("elf64 kernel"); + kmdp =3D preload_search_by_type(ELF_KERN_STR); smapbase =3D (struct bios_smap *)preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_SMAP); smapsize =3D *((u_int32_t *)smapbase - 1); @@ -701,16 +699,11 @@ panic("ram_attach: resource %d failed to attach", r= id); rid++; } - return (0); -} -#else -static int -ram_attach(device_t dev) -{ - struct resource *res; - vm_paddr_t *p; - int error, i, rid; + /* If at least one smap attached, return. */ + if (rid !=3D 0) + return (0); + /* * We use the dump_avail[] array rather than phys_avail[] for * the memory map as phys_avail[] contains holes for kernel @@ -724,7 +717,7 @@ */ for (i =3D 0, p =3D dump_avail; p[1] !=3D 0; i++, p +=3D 2) { rid =3D i; -#ifdef PAE +#if !defined(__amd64__) && defined(PAE) /* * Resources use long's to track resources, so we can't * include memory regions above 4GB. @@ -743,7 +736,6 @@ } return (0); } -#endif static device_method_t ram_methods[] =3D { /* Device interface */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTim_znVvoC0DVygFEu8GPOiwiuNs2fB_iMp61GpA>