See patch.
Uwe. -- http://hermann-uwe.de | http://sigrok.org http://randomprojects.org | http://unmaintained-free-software.org
Factor out fill_processor_name() and strcpy() functions. The fill_processor_name() function was duplicated in multiple model_*_init.c files, move it into a new src/cpu/x86/processor_name directory. The strcpy() function was also duplicated multiple times, move it to <string.h> where we already have similar functions. Signed-off-by: Uwe Hermann <[email protected]> Index: src/include/cpu/x86/processor_name.h =================================================================== --- src/include/cpu/x86/processor_name.h (Revision 0) +++ src/include/cpu/x86/processor_name.h (Revision 0) @@ -0,0 +1,26 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2010 Uwe Hermann <[email protected]> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef CPU_X86_PROCESSOR_NAME_H +#define CPU_X86_PROCESSOR_NAME_H + +void fill_processor_name(char *processor_name); + +#endif + Index: src/include/string.h =================================================================== --- src/include/string.h (Revision 5876) +++ src/include/string.h (Arbeitskopie) @@ -68,6 +68,12 @@ return ret; } +static inline void strcpy(char *dst, const char *src) +{ + while (*src) + *dst++ = *src++; +} + static inline int strcmp(const char *s1, const char *s2) { int r; Index: src/cpu/amd/model_fxx/processor_name.c =================================================================== --- src/cpu/amd/model_fxx/processor_name.c (Revision 5876) +++ src/cpu/amd/model_fxx/processor_name.c (Arbeitskopie) @@ -111,12 +111,6 @@ ); } -static inline void strcpy(char *dst, const char *src) -{ - while (*src) *dst++ = *src++; -} - - int init_processor_name(void) { #if CONFIG_K8_REV_F_SUPPORT == 0 Index: src/cpu/x86/processor_name/processor_name.c =================================================================== --- src/cpu/x86/processor_name/processor_name.c (Revision 0) +++ src/cpu/x86/processor_name/processor_name.c (Revision 0) @@ -0,0 +1,50 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2007-2009 coresystems GmbH + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <string.h> +#include <device/device.h> +#include <cpu/cpu.h> +#include <cpu/x86/processor_name.h> + +void fill_processor_name(char *processor_name) +{ + struct cpuid_result regs; + char temp_processor_name[49]; + char *processor_name_start; + unsigned int *name_as_ints = (unsigned int *)temp_processor_name; + int i; + + for (i = 0; i < 3; i++) { + regs = cpuid(0x80000002 + i); + name_as_ints[i * 4 + 0] = regs.eax; + name_as_ints[i * 4 + 1] = regs.ebx; + name_as_ints[i * 4 + 2] = regs.ecx; + name_as_ints[i * 4 + 3] = regs.edx; + } + + temp_processor_name[48] = 0; + + /* Skip leading spaces. */ + processor_name_start = temp_processor_name; + while (*processor_name_start == ' ') + processor_name_start++; + + memset(processor_name, 0, 49); + strcpy(processor_name, processor_name_start); +} Index: src/cpu/x86/processor_name/Makefile.inc =================================================================== --- src/cpu/x86/processor_name/Makefile.inc (Revision 0) +++ src/cpu/x86/processor_name/Makefile.inc (Revision 0) @@ -0,0 +1,21 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2010 Uwe Hermann <[email protected]> +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; version 2 of the License. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## + +obj-y += processor_name.o + Index: src/cpu/intel/model_6ex/Makefile.inc =================================================================== --- src/cpu/intel/model_6ex/Makefile.inc (Revision 5876) +++ src/cpu/intel/model_6ex/Makefile.inc (Arbeitskopie) @@ -1,3 +1,4 @@ driver-y += model_6ex_init.o +subdirs-y += ../../x86/processor_name cpu_incs += $(src)/cpu/intel/model_6ex/cache_as_ram.inc Index: src/cpu/intel/model_6ex/model_6ex_init.c =================================================================== --- src/cpu/intel/model_6ex/model_6ex_init.c (Revision 5876) +++ src/cpu/intel/model_6ex/model_6ex_init.c (Arbeitskopie) @@ -31,6 +31,7 @@ #include <cpu/intel/hyperthreading.h> #include <cpu/x86/cache.h> #include <cpu/x86/mtrr.h> +#include <cpu/x86/processor_name.h> #include <usbdebug.h> static const uint32_t microcode_updates[] = { @@ -44,38 +45,6 @@ 0x0, 0x0, 0x0, 0x0, }; -static inline void strcpy(char *dst, char *src) -{ - while (*src) *dst++ = *src++; -} - -static void fill_processor_name(char *processor_name) -{ - struct cpuid_result regs; - char temp_processor_name[49]; - char *processor_name_start; - unsigned int *name_as_ints = (unsigned int *)temp_processor_name; - int i; - - for (i=0; i<3; i++) { - regs = cpuid(0x80000002 + i); - name_as_ints[i*4 + 0] = regs.eax; - name_as_ints[i*4 + 1] = regs.ebx; - name_as_ints[i*4 + 2] = regs.ecx; - name_as_ints[i*4 + 3] = regs.edx; - } - - temp_processor_name[48] = 0; - - /* Skip leading spaces */ - processor_name_start = temp_processor_name; - while (*processor_name_start == ' ') - processor_name_start++; - - memset(processor_name, 0, 49); - strcpy(processor_name, processor_name_start); -} - #define IA32_FEATURE_CONTROL 0x003a #define CPUID_VMX (1 << 5) Index: src/cpu/intel/model_6bx/model_6bx_init.c =================================================================== --- src/cpu/intel/model_6bx/model_6bx_init.c (Revision 5876) +++ src/cpu/intel/model_6bx/model_6bx_init.c (Arbeitskopie) @@ -30,6 +30,7 @@ #include <cpu/x86/lapic.h> #include <cpu/intel/microcode.h> #include <cpu/x86/cache.h> +#include <cpu/x86/processor_name.h> #include <usbdebug.h> static const uint32_t microcode_updates[] = { @@ -44,38 +45,6 @@ 0x0, 0x0, 0x0, 0x0, }; -static inline void strcpy(char *dst, char *src) -{ - while (*src) *dst++ = *src++; -} - -static void fill_processor_name(char *processor_name) -{ - struct cpuid_result regs; - char temp_processor_name[49]; - char *processor_name_start; - unsigned int *name_as_ints = (unsigned int *)temp_processor_name; - int i; - - for (i=0; i<3; i++) { - regs = cpuid(0x80000002 + i); - name_as_ints[i*4 + 0] = regs.eax; - name_as_ints[i*4 + 1] = regs.ebx; - name_as_ints[i*4 + 2] = regs.ecx; - name_as_ints[i*4 + 3] = regs.edx; - } - - temp_processor_name[48] = 0; - - /* Skip leading spaces */ - processor_name_start = temp_processor_name; - while (*processor_name_start == ' ') - processor_name_start++; - - memset(processor_name, 0, 49); - strcpy(processor_name, processor_name_start); -} - #if CONFIG_USBDEBUG static unsigned ehci_debug_addr; #endif Index: src/cpu/intel/model_6bx/Makefile.inc =================================================================== --- src/cpu/intel/model_6bx/Makefile.inc (Revision 5876) +++ src/cpu/intel/model_6bx/Makefile.inc (Arbeitskopie) @@ -1 +1,2 @@ driver-y += model_6bx_init.o +subdirs-y += ../../x86/processor_name Index: src/cpu/intel/model_106cx/Makefile.inc =================================================================== --- src/cpu/intel/model_106cx/Makefile.inc (Revision 5876) +++ src/cpu/intel/model_106cx/Makefile.inc (Arbeitskopie) @@ -1,3 +1,4 @@ driver-y += model_106cx_init.o +subdirs-y += ../../x86/processor_name cpu_incs += $(src)/cpu/intel/model_106cx/cache_as_ram.inc Index: src/cpu/intel/model_106cx/model_106cx_init.c =================================================================== --- src/cpu/intel/model_106cx/model_106cx_init.c (Revision 5876) +++ src/cpu/intel/model_106cx/model_106cx_init.c (Arbeitskopie) @@ -29,6 +29,7 @@ #include <cpu/intel/hyperthreading.h> #include <cpu/x86/cache.h> #include <cpu/x86/mtrr.h> +#include <cpu/x86/processor_name.h> #include <usbdebug.h> static const uint32_t microcode_updates[] = { @@ -46,38 +47,6 @@ 0x0, 0x0, 0x0, 0x0, }; -static inline void strcpy(char *dst, char *src) -{ - while (*src) *dst++ = *src++; -} - -static void fill_processor_name(char *processor_name) -{ - struct cpuid_result regs; - char temp_processor_name[49]; - char *processor_name_start; - unsigned int *name_as_ints = (unsigned int *)temp_processor_name; - int i; - - for (i=0; i<3; i++) { - regs = cpuid(0x80000002 + i); - name_as_ints[i*4 + 0] = regs.eax; - name_as_ints[i*4 + 1] = regs.ebx; - name_as_ints[i*4 + 2] = regs.ecx; - name_as_ints[i*4 + 3] = regs.edx; - } - - temp_processor_name[48] = 0; - - /* Skip leading spaces */ - processor_name_start = temp_processor_name; - while (*processor_name_start == ' ') - processor_name_start++; - - memset(processor_name, 0, 49); - strcpy(processor_name, processor_name_start); -} - #define IA32_FEATURE_CONTROL 0x003a #define CPUID_VMX (1 << 5) Index: src/cpu/intel/model_6fx/Makefile.inc =================================================================== --- src/cpu/intel/model_6fx/Makefile.inc (Revision 5876) +++ src/cpu/intel/model_6fx/Makefile.inc (Arbeitskopie) @@ -1 +1,2 @@ driver-y += model_6fx_init.o +subdirs-y += ../../x86/processor_name Index: src/cpu/intel/model_6fx/model_6fx_init.c =================================================================== --- src/cpu/intel/model_6fx/model_6fx_init.c (Revision 5876) +++ src/cpu/intel/model_6fx/model_6fx_init.c (Arbeitskopie) @@ -31,6 +31,7 @@ #include <cpu/intel/hyperthreading.h> #include <cpu/x86/cache.h> #include <cpu/x86/mtrr.h> +#include <cpu/x86/processor_name.h> #include <usbdebug.h> static const uint32_t microcode_updates[] = { @@ -58,38 +59,6 @@ 0x0, 0x0, 0x0, 0x0, }; -static inline void strcpy(char *dst, char *src) -{ - while (*src) *dst++ = *src++; -} - -static void fill_processor_name(char *processor_name) -{ - struct cpuid_result regs; - char temp_processor_name[49]; - char *processor_name_start; - unsigned int *name_as_ints = (unsigned int *)temp_processor_name; - int i; - - for (i=0; i<3; i++) { - regs = cpuid(0x80000002 + i); - name_as_ints[i*4 + 0] = regs.eax; - name_as_ints[i*4 + 1] = regs.ebx; - name_as_ints[i*4 + 2] = regs.ecx; - name_as_ints[i*4 + 3] = regs.edx; - } - - temp_processor_name[48] = 0; - - /* Skip leading spaces */ - processor_name_start = temp_processor_name; - while (*processor_name_start == ' ') - processor_name_start++; - - memset(processor_name, 0, 49); - strcpy(processor_name, processor_name_start); -} - #define IA32_FEATURE_CONTROL 0x003a #define CPUID_VMX (1 << 5) Index: src/cpu/intel/model_68x/Makefile.inc =================================================================== --- src/cpu/intel/model_68x/Makefile.inc (Revision 5876) +++ src/cpu/intel/model_68x/Makefile.inc (Arbeitskopie) @@ -19,3 +19,5 @@ ## driver-y += model_68x_init.o +subdirs-y += ../../x86/processor_name + Index: src/cpu/intel/model_68x/model_68x_init.c =================================================================== --- src/cpu/intel/model_68x/model_68x_init.c (Revision 5876) +++ src/cpu/intel/model_68x/model_68x_init.c (Arbeitskopie) @@ -30,6 +30,7 @@ #include <cpu/x86/lapic.h> #include <cpu/intel/microcode.h> #include <cpu/x86/cache.h> +#include <cpu/x86/processor_name.h> #include <usbdebug.h> static const uint32_t microcode_updates[] = { @@ -58,38 +59,6 @@ 0x0, 0x0, 0x0, 0x0, }; -static inline void strcpy(char *dst, char *src) -{ - while (*src) *dst++ = *src++; -} - -static void fill_processor_name(char *processor_name) -{ - struct cpuid_result regs; - char temp_processor_name[49]; - char *processor_name_start; - unsigned int *name_as_ints = (unsigned int *)temp_processor_name; - int i; - - for (i=0; i<3; i++) { - regs = cpuid(0x80000002 + i); - name_as_ints[i*4 + 0] = regs.eax; - name_as_ints[i*4 + 1] = regs.ebx; - name_as_ints[i*4 + 2] = regs.ecx; - name_as_ints[i*4 + 3] = regs.edx; - } - - temp_processor_name[48] = 0; - - /* Skip leading spaces */ - processor_name_start = temp_processor_name; - while (*processor_name_start == ' ') - processor_name_start++; - - memset(processor_name, 0, 49); - strcpy(processor_name, processor_name_start); -} - #if CONFIG_USBDEBUG static unsigned ehci_debug_addr; #endif Index: src/cpu/intel/model_1067x/Makefile.inc =================================================================== --- src/cpu/intel/model_1067x/Makefile.inc (Revision 5876) +++ src/cpu/intel/model_1067x/Makefile.inc (Arbeitskopie) @@ -1 +1,3 @@ driver-y += model_1067x_init.o +subdirs-y += ../../x86/processor_name + Index: src/cpu/intel/model_1067x/model_1067x_init.c =================================================================== --- src/cpu/intel/model_1067x/model_1067x_init.c (Revision 5876) +++ src/cpu/intel/model_1067x/model_1067x_init.c (Arbeitskopie) @@ -31,6 +31,7 @@ #include <cpu/intel/hyperthreading.h> #include <cpu/x86/cache.h> #include <cpu/x86/mtrr.h> +#include <cpu/x86/processor_name.h> static const uint32_t microcode_updates[] = { /* Dummy terminator */ @@ -40,11 +41,6 @@ 0x0, 0x0, 0x0, 0x0, }; -static inline void strcpy(char *dst, char *src) -{ - while (*src) *dst++ = *src++; -} - static void init_timer(void) { /* Set the apic timer to no interrupts and periodic mode */ @@ -57,33 +53,6 @@ lapic_write(LAPIC_TMICT, 0xffffffff); } -static void fill_processor_name(char *processor_name) -{ - struct cpuid_result regs; - char temp_processor_name[49]; - char *processor_name_start; - unsigned int *name_as_ints = (unsigned int *)temp_processor_name; - int i; - - for (i=0; i<3; i++) { - regs = cpuid(0x80000002 + i); - name_as_ints[i*4 + 0] = regs.eax; - name_as_ints[i*4 + 1] = regs.ebx; - name_as_ints[i*4 + 2] = regs.ecx; - name_as_ints[i*4 + 3] = regs.edx; - } - - temp_processor_name[48] = 0; - - /* Skip leading spaces */ - processor_name_start = temp_processor_name; - while (*processor_name_start == ' ') - processor_name_start++; - - memset(processor_name, 0, 49); - strcpy(processor_name, processor_name_start); -} - #define IA32_FEATURE_CONTROL 0x003a #define CPUID_VMX (1 << 5)
-- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
