From owner-svn-src-all@FreeBSD.ORG Thu Oct 28 20:25:20 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80DA4106564A; Thu, 28 Oct 2010 20:25:20 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from mail-qw0-f54.google.com (mail-qw0-f54.google.com [209.85.216.54]) by mx1.freebsd.org (Postfix) with ESMTP id E2C208FC21; Thu, 28 Oct 2010 20:25:19 +0000 (UTC) Received: by qwg8 with SMTP id 8so299397qwg.13 for ; Thu, 28 Oct 2010 13:25:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=0hJxW8jomt850pShRSug/ive/uKNF4q68gkp3XV+xP0=; b=vOsA66hfybKgJeKtwpBBgVfj9rkxMj2W6VlR49+lC2RUzLwJuOm7blltyZ4Oz32H6M 0DXz/k64tuXZCYmWtt/L8LzESrqI0KRNb31keqmlunHGwkApJWZqKnL4Hrsr14sjXt/Y n2h3bD9ArmdEvZFpivjE8SvZbUttGIEnmcWtk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=vq/WK43/10FNSyAVu6nw9+PUuIy24X7TomBwYW1tXJz9HhlW/HPQuvpmprcsUR8/xN S6xpPwdwHnWQrSdJQab2NWVn9ovkgT4MLmPvfRs8zTNfi01FAzfmwpIkhuxwafyjPxvI pQHtyeNbajsIG0mcFrDDJicpuJ7UGQSP2kjAY= MIME-Version: 1.0 Received: by 10.224.180.84 with SMTP id bt20mr4236443qab.293.1288297518505; Thu, 28 Oct 2010 13:25:18 -0700 (PDT) Sender: asmrookie@gmail.com Received: by 10.229.237.9 with HTTP; Thu, 28 Oct 2010 13:25:18 -0700 (PDT) In-Reply-To: <201010281411.40423.jhb@freebsd.org> References: <201010281631.o9SGVdtZ014923@svn.freebsd.org> <201010281257.05481.jhb@freebsd.org> <201010281411.40423.jhb@freebsd.org> Date: Thu, 28 Oct 2010 22:25:18 +0200 X-Google-Sender-Auth: MxqZ-qECLbQuDhHnf3zQdtASOvA Message-ID: From: Attilio Rao To: John Baldwin Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Oct 2010 20:25:20 -0000 2010/10/28 John Baldwin : > On Thursday, October 28, 2010 1:21:34 pm Attilio Rao wrote: >> 2010/10/28 John Baldwin : >> > 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 p= asses the >> > smap to i386 kernels as well, so ram_attach() should probably be chang= ed 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 =C2=A0 =C2=A0 (revision 214457) >> +++ nexus.c =C2=A0 =C2=A0 (working copy) >> @@ -52,9 +52,7 @@ >> =C2=A0#include >> =C2=A0#include >> =C2=A0#include >> -#ifdef __amd64__ >> =C2=A0#include >> -#endif >> =C2=A0#include >> =C2=A0#include >> =C2=A0#include >> @@ -67,12 +65,10 @@ >> =C2=A0#include >> =C2=A0#include >> >> -#ifdef __amd64__ >> =C2=A0#include >> -#include >> -#endif >> =C2=A0#include >> =C2=A0#include >> +#include >> >> =C2=A0#ifdef DEV_APIC >> =C2=A0#include "pcib_if.h" >> @@ -89,11 +85,13 @@ >> =C2=A0#include >> >> =C2=A0#ifdef __amd64__ >> -#define =C2=A0 =C2=A0 =C2=A0 =C2=A0RMAN_BUS_SPACE_IO =C2=A0 =C2=A0 =C2= =A0 AMD64_BUS_SPACE_IO >> -#define =C2=A0 =C2=A0 =C2=A0 =C2=A0RMAN_BUS_SPACE_MEM =C2=A0 =C2=A0 =C2= =A0AMD64_BUS_SPACE_MEM >> +#define =C2=A0 =C2=A0 =C2=A0 =C2=A0X86_BUS_SPACE_IO =C2=A0 =C2=A0 =C2= =A0 =C2=A0AMD64_BUS_SPACE_IO >> +#define =C2=A0 =C2=A0 =C2=A0 =C2=A0X86_BUS_SPACE_MEM =C2=A0 =C2=A0 =C2= =A0 AMD64_BUS_SPACE_MEM >> +#define =C2=A0 =C2=A0 =C2=A0 =C2=A0ELF_KERN_STR =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0"elf64 kernel" >> =C2=A0#else >> -#define =C2=A0 =C2=A0 =C2=A0 =C2=A0RMAN_BUS_SPACE_IO =C2=A0 =C2=A0 =C2= =A0 I386_BUS_SPACE_IO >> -#define =C2=A0 =C2=A0 =C2=A0 =C2=A0RMAN_BUS_SPACE_MEM =C2=A0 =C2=A0 =C2= =A0I386_BUS_SPACE_MEM >> +#define =C2=A0 =C2=A0 =C2=A0 =C2=A0X86_BUS_SPACE_IO =C2=A0 =C2=A0 =C2= =A0 =C2=A0I386_BUS_SPACE_IO >> +#define =C2=A0 =C2=A0 =C2=A0 =C2=A0X86_BUS_SPACE_MEM =C2=A0 =C2=A0 =C2= =A0 I386_BUS_SPACE_MEM >> +#define =C2=A0 =C2=A0 =C2=A0 =C2=A0ELF_KERN_STR =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0"elf32 kernel" >> =C2=A0#endif > > I would not do this. =C2=A0What I meant is that amd64 and i386 should be > changed to both use X86_BUS_SPACE_* and {AMD64,I386}_BUS_SPACE_* should b= e > retired. =C2=A0This would involve changing the bus space code itself slig= htly, > but it could perhaps be shared as a result. =C2=A0Alternatively as bde@ n= otes > we could just drop the MD prefix entirely and have BUS_SPACE_* instead. > > However, I wouldn't make any changes to just nexus.c for the BUS_SPACE_* > stuff. Ok, as long as you and bde seem to prefer it, I'd just drop the X86_* prefix for the moment and working on the overhaul later, as time permits. Thanks, Attilio --=20 Peace can only be achieved by understanding - A. Einstein