Date: Mon, 14 Aug 2017 14:47:01 +0800 From: Sepherosa Ziehau <sepherosa@gmail.com> To: Jung-uk Kim <jkim@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r322323 - in head/sys: amd64/amd64 i386/include x86/include x86/x86 Message-ID: <CAMOc5cyVLtypumwmXwkKajAnwYK2%2Bh79EvOL6rMbtBHDFT_Vug@mail.gmail.com> In-Reply-To: <CAMOc5cw%2BQ0J0jBiPxFrfa1e_YK1wbt=hjGT%2BTT1eo4Pr8T3Pdg@mail.gmail.com> References: <201708091809.v79I9924028330@repo.freebsd.org> <CAMOc5cw%2BQ0J0jBiPxFrfa1e_YK1wbt=hjGT%2BTT1eo4Pr8T3Pdg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
I just MFCed it to stable/11. Please MFC it to stable/10. On Mon, Aug 14, 2017 at 2:28 PM, Sepherosa Ziehau <sepherosa@gmail.com> wrote: > Please MFC this to 10-stable/11-stable. > > Thanks, > sephe > > On Thu, Aug 10, 2017 at 2:09 AM, Jung-uk Kim <jkim@freebsd.org> 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 -- Tomorrow Will Never Die
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMOc5cyVLtypumwmXwkKajAnwYK2%2Bh79EvOL6rMbtBHDFT_Vug>