From owner-svn-src-head@freebsd.org Mon Aug 14 06:28:07 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7B7F1DD8167; Mon, 14 Aug 2017 06:28:07 +0000 (UTC) (envelope-from sepherosa@gmail.com) Received: from mail-pg0-x232.google.com (mail-pg0-x232.google.com [IPv6:2607:f8b0:400e:c05::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9896FA5B; Mon, 14 Aug 2017 06:28:07 +0000 (UTC) (envelope-from sepherosa@gmail.com) Received: by mail-pg0-x232.google.com with SMTP id l64so40729769pge.5; Sun, 13 Aug 2017 23:28:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=9lutK7ck7xntPh2SBXshWA04cPqN7lD0zySaw7Ru2AM=; b=ZMhUkW/MkkJiLXY9DfAUMkHB7siXHCdmzzqi7e+Wles13j1+WLiExYcJvgBcKKETkf 8W/wCXeRM+n/5fZV3AwkBqZBbT70POoYo3n6HC1x503J/1sSZf8h5AdNP2t4PBm6jswT zbo006QuDiEfnniXqRheO1b5Ca4jSegdCZpgA1I5roiCPX2+0hgbFROifNcRnzEQ4Kec uJA5ObpN+tEji6kdN9SctJ/Ebu03sY5Bv/RyfV9MT8m4wUClEUqq7EnkgONJN+S+Rlhy 83ygaJ72F9o+fnfVMA62sExA0fdSMw/+N1ouHFPG3/U8FIouL+zodkFGmDSxVmsqqMzu edrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=9lutK7ck7xntPh2SBXshWA04cPqN7lD0zySaw7Ru2AM=; b=kJvzuU07y/bwcLeE7GivFMUwTubRjzAaHhKEEHCSldCDjG4yyCbS15e1Z3VN4RqE9c QsGcHuY1HFLEwd83xxyUWUVaGv3Z7VbZwCl+JB2kcX63TEpa/a23PHEYNqtLomczWfpX dZdSNHcVchicwyevDJEo10sE6xIeIqcLIDqW8zfyqYG+iGkUazg9OpwIaHdI0jLLIKjx EgPDOA1H3s0ZOtFrsjTuG7r/zKx8cGsC07LqEKjqw4qS83OD/j59LiE7b+bkhXnW1OPX DiDWnHNMvcx/t16hK6MjaWPrAIGTJAUmnPrbWOILeQdqJMs55rV2WIkt716ed6q5rrA+ sm6Q== X-Gm-Message-State: AHYfb5iS4pWdU8zgzHfrCelA8h8gNHAvKObazXWBVl1xhQt2N72dWUKj 0446fnBQppS7hD0+VSQ3kFd0ytpWuQ== X-Received: by 10.101.77.6 with SMTP id i6mr22971297pgt.181.1502692086249; Sun, 13 Aug 2017 23:28:06 -0700 (PDT) MIME-Version: 1.0 Received: by 10.100.128.28 with HTTP; Sun, 13 Aug 2017 23:28:05 -0700 (PDT) In-Reply-To: <201708091809.v79I9924028330@repo.freebsd.org> References: <201708091809.v79I9924028330@repo.freebsd.org> From: Sepherosa Ziehau Date: Mon, 14 Aug 2017 14:28:05 +0800 Message-ID: Subject: Re: svn commit: r322323 - in head/sys: amd64/amd64 i386/include x86/include x86/x86 To: Jung-uk Kim Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2017 06:28:07 -0000 Please MFC this to 10-stable/11-stable. Thanks, sephe On Thu, Aug 10, 2017 at 2:09 AM, Jung-uk Kim wrote: > Author: jkim > Date: Wed Aug 9 18:09:09 2017 > New Revision: 322323 > URL: https://svnweb.freebsd.org/changeset/base/322323 > > Log: > Split identify_cpu() into two functions for amd64 as we do for i386. This > reduces diff between amd64 and i386. Also, it fixes a regression introduced > in r322076, i.e., identify_hypervisor() failed to identify some hypervisors. > This function assumes cpu_feature2 is already initialized. > > Reported by: dexuan > Tested by: dexuan > > Modified: > head/sys/amd64/amd64/machdep.c > head/sys/i386/include/md_var.h > head/sys/x86/include/x86_var.h > head/sys/x86/x86/identcpu.c > > Modified: head/sys/amd64/amd64/machdep.c > ============================================================================== > --- head/sys/amd64/amd64/machdep.c Wed Aug 9 18:06:27 2017 (r322322) > +++ head/sys/amd64/amd64/machdep.c Wed Aug 9 18:09:09 2017 (r322323) > @@ -1537,6 +1537,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) > > kmdp = init_ops.parse_preload_data(modulep); > > + identify_cpu(); > identify_hypervisor(); > > /* Init basic tunables, hz etc */ > @@ -1643,7 +1644,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) > != NULL) > vty_set_preferred(VTY_VT); > > - identify_cpu(); /* Final stage of CPU initialization */ > + finishidentcpu(); /* Final stage of CPU initialization */ > initializecpu(); /* Initialize CPU registers */ > initializecpucache(); > > > Modified: head/sys/i386/include/md_var.h > ============================================================================== > --- head/sys/i386/include/md_var.h Wed Aug 9 18:06:27 2017 (r322322) > +++ head/sys/i386/include/md_var.h Wed Aug 9 18:09:09 2017 (r322323) > @@ -59,7 +59,6 @@ void doreti_popl_es(void) __asm(__STRING(doreti_popl_e > void doreti_popl_es_fault(void) __asm(__STRING(doreti_popl_es_fault)); > void doreti_popl_fs(void) __asm(__STRING(doreti_popl_fs)); > void doreti_popl_fs_fault(void) __asm(__STRING(doreti_popl_fs_fault)); > -void finishidentcpu(void); > void fill_based_sd(struct segment_descriptor *sdp, uint32_t base); > void i686_pagezero(void *addr); > void sse2_pagezero(void *addr); > > Modified: head/sys/x86/include/x86_var.h > ============================================================================== > --- head/sys/x86/include/x86_var.h Wed Aug 9 18:06:27 2017 (r322322) > +++ head/sys/x86/include/x86_var.h Wed Aug 9 18:09:09 2017 (r322323) > @@ -115,6 +115,7 @@ void cpu_probe_amdc1e(void); > void cpu_setregs(void); > void dump_add_page(vm_paddr_t); > void dump_drop_page(vm_paddr_t); > +void finishidentcpu(void); > void identify_cpu(void); > void identify_hypervisor(void); > void initializecpu(void); > > Modified: head/sys/x86/x86/identcpu.c > ============================================================================== > --- head/sys/x86/x86/identcpu.c Wed Aug 9 18:06:27 2017 (r322322) > +++ head/sys/x86/x86/identcpu.c Wed Aug 9 18:09:09 2017 (r322323) > @@ -1372,23 +1372,12 @@ fix_cpuid(void) > return (false); > } > > -/* > - * Final stage of CPU identification. > - */ > -#ifdef __i386__ > +#ifdef __amd64__ > void > -finishidentcpu(void) > -#else > -void > identify_cpu(void) > -#endif > { > - u_int regs[4], cpu_stdext_disable; > -#ifdef __i386__ > - u_char ccr3; > -#endif > + u_int regs[4]; > > -#ifdef __amd64__ > do_cpuid(0, regs); > cpu_high = regs[0]; > ((u_int *)&cpu_vendor)[0] = regs[1]; > @@ -1401,6 +1390,18 @@ identify_cpu(void) > cpu_procinfo = regs[1]; > cpu_feature = regs[3]; > cpu_feature2 = regs[2]; > +} > +#endif > + > +/* > + * Final stage of CPU identification. > + */ > +void > +finishidentcpu(void) > +{ > + u_int regs[4], cpu_stdext_disable; > +#ifdef __i386__ > + u_char ccr3; > #endif > > cpu_vendor_id = find_cpu_vendor_id(); > _______________________________________________ > svn-src-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" -- Tomorrow Will Never Die