Patchwork Factor out fill_processor_name() and strcpy() functions.

login
register
about
Submitter Uwe Hermann
Date 2010-09-28 20:10:27
Message ID <20100928201027.GR3256@greenwood>
Download mbox | patch
Permalink /patch/2003/
State Accepted
Headers show

Comments

Uwe Hermann - 2010-09-28 20:10:27
See patch.


Uwe.
Myles Watson - 2010-09-28 20:28:12
> From: coreboot-bounces@coreboot.org [mailto:coreboot-bounces@coreboot.org]
> On Behalf Of Uwe Hermann
> Subject: [coreboot] [PATCH] Factor out fill_processor_name() and
> strcpy()functions.

Thanks for factoring it out.  Why not put it in src/cpu/x86?  Does it need
its own directory?

Maybe there should be a src/cpu/x86/generic directory.

Thanks,
Myles
Uwe Hermann - 2010-09-28 21:17:39
On Tue, Sep 28, 2010 at 02:28:12PM -0600, Myles Watson wrote:
> > From: coreboot-bounces@coreboot.org [mailto:coreboot-bounces@coreboot.org]
> > On Behalf Of Uwe Hermann
> > Subject: [coreboot] [PATCH] Factor out fill_processor_name() and
> > strcpy()functions.
> 
> Thanks for factoring it out.  Why not put it in src/cpu/x86?  Does it need
> its own directory?
> 
> Maybe there should be a src/cpu/x86/generic directory.

Maybe, I did think about it shortly. I did not want to put it into the
top-level src/cpu/x86 directory as there were no other C files there
and also because the "subdirs-y +=" approach probably wouldn't work that way?

Also, what happens if there are multiple C files in src/cpu/x86/generic which
do not belong together, i.e., they solve different problems?

Wouldn't
  subdirs-y += ../../x86/generic
then include all of them? What if we only want/need to add one of the files
to the list of objects?

Or we'd need to use a different mechanism? Not sure.

Either way, I'm happy to move the file elsewhere, we just need to find
and agree upon the best location.


Uwe.
Stefan Reinauer - 2010-09-28 21:23:18
Yes, processor_name as a directory is somewhat ugly ;-)

We talked about merging arch/i386 and src/cpu/x86 a number of times.. Maybe it's time to do this now?

Stefan

On 28.09.2010, at 22:28, "Myles Watson" <mylesgw@gmail.com> wrote:

>> From: coreboot-bounces@coreboot.org [mailto:coreboot-bounces@coreboot.org]
>> On Behalf Of Uwe Hermann
>> Subject: [coreboot] [PATCH] Factor out fill_processor_name() and
>> strcpy()functions.
> 
> Thanks for factoring it out.  Why not put it in src/cpu/x86?  Does it need
> its own directory?
> 
> Maybe there should be a src/cpu/x86/generic directory.
> 
> Thanks,
> Myles
> 
> 
> -- 
> coreboot mailing list: coreboot@coreboot.org
> http://www.coreboot.org/mailman/listinfo/coreboot
>
Myles Watson - 2010-09-28 21:25:30
> -----Original Message-----
> From: Uwe Hermann [mailto:uwe@hermann-uwe.de]
> Sent: Tuesday, September 28, 2010 3:18 PM
> To: Myles Watson
> Cc: coreboot@coreboot.org
> Subject: Re: [coreboot] [PATCH] Factor out fill_processor_name() and
> strcpy()functions.
> 
> On Tue, Sep 28, 2010 at 02:28:12PM -0600, Myles Watson wrote:
> > > From: coreboot-bounces@coreboot.org [mailto:coreboot-
> bounces@coreboot.org]
> > > On Behalf Of Uwe Hermann
> > > Subject: [coreboot] [PATCH] Factor out fill_processor_name() and
> > > strcpy()functions.
> >
> > Thanks for factoring it out.  Why not put it in src/cpu/x86?  Does it
> need
> > its own directory?
> >
> > Maybe there should be a src/cpu/x86/generic directory.
> 
> Maybe, I did think about it shortly. I did not want to put it into the
> top-level src/cpu/x86 directory as there were no other C files there
> and also because the "subdirs-y +=" approach probably wouldn't work that
> way?
> 
> Also, what happens if there are multiple C files in src/cpu/x86/generic
> which
> do not belong together, i.e., they solve different problems?
> 
> Wouldn't
>   subdirs-y += ../../x86/generic
> then include all of them? What if we only want/need to add one of the
> files
> to the list of objects?
I'm not sure how much space it saves us to include/remove those functions.
It would be simpler to always include them.

> Or we'd need to use a different mechanism? Not sure.
> 
> Either way, I'm happy to move the file elsewhere, we just need to find
> and agree upon the best location.

Sounds good.  Until then, I think your patch is an improvement.

Acked-by: Myles Watson <mylesgw@gmail.com>

Thanks,
Myles
Peter Stuge - 2010-09-28 21:38:28
Uwe Hermann wrote:
> +++ src/include/cpu/x86/processor_name.h	(Revision 0)

Please make that cpu/x86/name.h.

"processor" under cpu/ is redundant and kinda ugly. :)


> +++ src/cpu/x86/processor_name/processor_name.c	(Revision 0)

Maybe something like src/cpu/x86/name/name.c here?


//Peter

Patch

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 <uwe@hermann-uwe.de>

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 <uwe@hermann-uwe.de>
+ *
+ * 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 <uwe@hermann-uwe.de>
+##
+## 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)