Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev

* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev: m32r: Should index be positive? m32r: bzip2/lzma kernel compression support m32r: add NOTES to vmlinux.lds.S to remove .note.gnu.build-id section arch/m32r: Use DIV_ROUND_CLOSEST

Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev: m32r: Should index be positive? m32r: bzip2/lzma kernel compression support m32r: add NOTES to vmlinux.lds.S to remove .note.gnu.build-id section arch/m32r: Use DIV_ROUND_CLOSEST
Linus Torvalds
2 parents bd901751e7 45cdd47330
Showing 6 changed files Side-by-side Diff
arch/m32r/Kconfig
arch/m32r/boot/compressed/Makefile
arch/m32r/boot/compressed/misc.c
arch/m32r/kernel/smp.c
arch/m32r/kernel/time.c
arch/m32r/kernel/vmlinux.lds.S
@@ -11,6 +11,9 @@
 	select HAVE_IDE
 	select HAVE_OPROFILE
 	select INIT_ALL_POSSIBLE
+	select HAVE_KERNEL_GZIP
+	select HAVE_KERNEL_BZIP2
+	select HAVE_KERNEL_LZMA
  
 config SBUS
 	bool
@@ -4,8 +4,8 @@
 # create a compressed vmlinux image from the original vmlinux
 #
  
-targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o \
-		   piggy.o vmlinux.lds
+targets		:= vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 \
+		   vmlinux.bin.lzma head.o misc.o piggy.o vmlinux.lds
  
 OBJECTS = $(obj)/head.o $(obj)/misc.o
  
@@ -27,6 +27,12 @@
 $(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
 	$(call if_changed,gzip)
  
+$(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE
+	$(call if_changed,bzip2)
+
+$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
+	$(call if_changed,lzma)
+
 CFLAGS_misc.o += -fpic
  
 ifdef CONFIG_MMU
@@ -37,6 +43,10 @@
  
 OBJCOPYFLAGS += -R .empty_zero_page
  
-$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
+suffix_$(CONFIG_KERNEL_GZIP)	= gz
+suffix_$(CONFIG_KERNEL_BZIP2)	= bz2
+suffix_$(CONFIG_KERNEL_LZMA)	= lzma
+
+$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix_y) FORCE
 	$(call if_changed,ld)
@@ -9,141 +9,50 @@
  * Adapted for SH by Stuart Menefy, Aug 1999
  *
  * 2003-02-12:	Support M32R by Takeo Takahashi
- * 		This is based on arch/sh/boot/compressed/misc.c.
  */
  
-#include <linux/string.h>
-
 /*
  * gzip declarations
  */
-
-#define OF(args)  args
 #define STATIC static
  
 #undef memset
 #undef memcpy
 #define memzero(s, n)     memset ((s), 0, (n))
  
-typedef unsigned char  uch;
-typedef unsigned short ush;
-typedef unsigned long  ulg;
-
-#define WSIZE 0x8000		/* Window size must be at least 32k, */
-				/* and a power of two */
-
-static uch *inbuf;	     /* input buffer */
-static uch window[WSIZE];    /* Sliding window buffer */
-
-static unsigned insize = 0;  /* valid bytes in inbuf */
-static unsigned inptr = 0;   /* index of next byte to be processed in inbuf */
-static unsigned outcnt = 0;  /* bytes in output buffer */
-
-/* gzip flag byte */
-#define ASCII_FLAG   0x01 /* bit 0 set: file probably ASCII text */
-#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */
-#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
-#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
-#define COMMENT      0x10 /* bit 4 set: file comment present */
-#define ENCRYPTED    0x20 /* bit 5 set: file is encrypted */
-#define RESERVED     0xC0 /* bit 6,7:   reserved */
-
-#define get_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf())
-
-/* Diagnostic functions */
-#ifdef DEBUG
-#  define Assert(cond,msg) {if(!(cond)) error(msg);}
-#  define Trace(x) fprintf x
-#  define Tracev(x) {if (verbose) fprintf x ;}
-#  define Tracevv(x) {if (verbose>1) fprintf x ;}
-#  define Tracec(c,x) {if (verbose && (c)) fprintf x ;}
-#  define Tracecv(c,x) {if (verbose>1 && (c)) fprintf x ;}
-#else
-#  define Assert(cond,msg)
-#  define Trace(x)
-#  define Tracev(x)
-#  define Tracevv(x)
-#  define Tracec(c,x)
-#  define Tracecv(c,x)
-#endif
-
-static int  fill_inbuf(void);
-static void flush_window(void);
 static void error(char *m);
  
-static unsigned char *input_data;
-static int input_len;
-
-static long bytes_out = 0;
-static uch *output_data;
-static unsigned long output_ptr = 0;
-
 #include "m32r_sio.c"
  
 static unsigned long free_mem_ptr;
 static unsigned long free_mem_end_ptr;
  
-#define HEAP_SIZE             0x10000
-
-#include "../../../../lib/inflate.c"
-
-void* memset(void* s, int c, size_t n)
+#ifdef CONFIG_KERNEL_BZIP2
+static void *memset(void *s, int c, size_t n)
 {
-	int i;
-	char *ss = (char*)s;
+	char *ss = s;
  
-	for (i=0;i<n;i++) ss[i] = c;
+	while (n--)
+	       	*ss++ = c;
 	return s;
 }
+#endif
  
-void* memcpy(void* __dest, __const void* __src,
-			    size_t __n)
-{
-	int i;
-	char *d = (char *)__dest, *s = (char *)__src;
+#ifdef CONFIG_KERNEL_GZIP
+#define BOOT_HEAP_SIZE             0x10000
+#include "../../../../lib/decompress_inflate.c"
+#endif
  
-	for (i=0;i<__n;i++) d[i] = s[i];
-	return __dest;
-}
+#ifdef CONFIG_KERNEL_BZIP2
+#define BOOT_HEAP_SIZE             0x400000
+#include "../../../../lib/decompress_bunzip2.c"
+#endif
  
-/* ===========================================================================
- * Fill the input buffer. This is called only when the buffer is empty
- * and at least one byte is really needed.
- */
-static int fill_inbuf(void)
-{
-	if (insize != 0) {
-		error("ran out of input data");
-	}
+#ifdef CONFIG_KERNEL_LZMA
+#define BOOT_HEAP_SIZE             0x10000
+#include "../../../../lib/decompress_unlzma.c"
+#endif
  
-	inbuf = input_data;
-	insize = input_len;
-	inptr = 1;
-	return inbuf[0];
-}
-
-/* ===========================================================================
- * Write the output window window[0..outcnt-1] and update crc and bytes_out.
- * (Used for the decompressed data only.)
- */
-static void flush_window(void)
-{
-    ulg c = crc;         /* temporary variable */
-    unsigned n;
-    uch *in, *out, ch;
-
-    in = window;
-    out = &output_data[output_ptr];
-    for (n = 0; n < outcnt; n++) {
-	    ch = *out++ = *in++;
-	    c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8);
-    }
-    crc = c;
-    bytes_out += (ulg)outcnt;
-    output_ptr += (ulg)outcnt;
-    outcnt = 0;
-}
-
 static void error(char *x)
 {
 	puts("\n\n");
  
  
  
@@ -153,21 +62,21 @@
 	while(1);	/* Halt */
 }
  
-/* return decompressed size */
 void
 decompress_kernel(int mmu_on, unsigned char *zimage_data,
 		  unsigned int zimage_len, unsigned long heap)
 {
+	unsigned char *input_data = zimage_data;
+	int input_len = zimage_len;
+	unsigned char *output_data;
+
 	output_data = (unsigned char *)CONFIG_MEMORY_START + 0x2000
 		+ (mmu_on ? 0x80000000 : 0);
 	free_mem_ptr = heap;
-	free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;
-	input_data = zimage_data;
-	input_len = zimage_len;
+	free_mem_end_ptr = free_mem_ptr + BOOT_HEAP_SIZE;
  
-	makecrc();
-	puts("Uncompressing Linux... ");
-	gunzip();
-	puts("Ok, booting the kernel.\n");
+	puts("\nDecompressing Linux... ");
+	decompress(input_data, input_len, NULL, NULL, output_data, NULL, error);
+	puts("done.\nBooting the kernel.\n");
 }
@@ -806,7 +806,7 @@
  
 	if (mask & ~physids_coerce(phys_cpu_present_map))
 		BUG();
-	if (ipi_num >= NR_IPIS)
+	if (ipi_num >= NR_IPIS || ipi_num < 0)
 		BUG();
  
 	mask <<= IPI_SHIFT;
@@ -75,7 +75,7 @@
 		count = 0;
  
 	count = (latch - count) * TICK_SIZE;
-	elapsed_time = (count + latch / 2) / latch;
+	elapsed_time = DIV_ROUND_CLOSEST(count, latch);
 	/* NOTE: LATCH is equal to the "interval" value (= reload count). */
  
 #else /* CONFIG_SMP */
@@ -93,7 +93,7 @@
 	p_count = count;
  
 	count = (latch - count) * TICK_SIZE;
-	elapsed_time = (count + latch / 2) / latch;
+	elapsed_time = DIV_ROUND_CLOSEST(count, latch);
 	/* NOTE: LATCH is equal to the "interval" value (= reload count). */
 #endif /* CONFIG_SMP */
 #elif defined(CONFIG_CHIP_M32310)
@@ -211,7 +211,7 @@
  
 		bus_clock = boot_cpu_data.bus_clock;
 		divide = boot_cpu_data.timer_divide;
-		latch = (bus_clock/divide + HZ / 2) / HZ;
+		latch = DIV_ROUND_CLOSEST(bus_clock/divide, HZ);
  
 		printk("Timer start : latch = %ld\n", latch);
  
@@ -42,6 +42,8 @@
   _etext = .;			/* End of text section */
  
   EXCEPTION_TABLE(16)
+  NOTES
+
   RODATA
   RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE)
   _edata = .;			/* End of data section */
...	...	@@ -11,6 +11,9 @@
11	11	select HAVE_IDE
12	12	select HAVE_OPROFILE
13	13	select INIT_ALL_POSSIBLE
	14	+ select HAVE_KERNEL_GZIP
	15	+ select HAVE_KERNEL_BZIP2
	16	+ select HAVE_KERNEL_LZMA
14	17
15	18	config SBUS
16	19	bool
...	...	@@ -4,8 +4,8 @@
4	4	# create a compressed vmlinux image from the original vmlinux
5	5	#
6	6
7		-targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o \
8		- piggy.o vmlinux.lds
	7	+targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 \
	8	+ vmlinux.bin.lzma head.o misc.o piggy.o vmlinux.lds
9	9
10	10	OBJECTS = $(obj)/head.o $(obj)/misc.o
11	11
...	...	@@ -27,6 +27,12 @@
27	27	$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
28	28	$(call if_changed,gzip)
29	29
	30	+$(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE
	31	+ $(call if_changed,bzip2)
	32	+
	33	+$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
	34	+ $(call if_changed,lzma)
	35	+
30	36	CFLAGS_misc.o += -fpic
31	37
32	38	ifdef CONFIG_MMU
...	...	@@ -37,6 +43,10 @@
37	43
38	44	OBJCOPYFLAGS += -R .empty_zero_page
39	45
40		-$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
	46	+suffix_$(CONFIG_KERNEL_GZIP) = gz
	47	+suffix_$(CONFIG_KERNEL_BZIP2) = bz2
	48	+suffix_$(CONFIG_KERNEL_LZMA) = lzma
	49	+
	50	+$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix_y) FORCE
41	51	$(call if_changed,ld)
...	...	@@ -9,141 +9,50 @@
9	9	* Adapted for SH by Stuart Menefy, Aug 1999
10	10	*
11	11	* 2003-02-12: Support M32R by Takeo Takahashi
12		- * This is based on arch/sh/boot/compressed/misc.c.
13	12	*/
14	13
15		-#include <linux/string.h>
16		-
17	14	/*
18	15	* gzip declarations
19	16	*/
20		-
21		-#define OF(args) args
22	17	#define STATIC static
23	18
24	19	#undef memset
25	20	#undef memcpy
26	21	#define memzero(s, n) memset ((s), 0, (n))
27	22
28		-typedef unsigned char uch;
29		-typedef unsigned short ush;
30		-typedef unsigned long ulg;
31		-
32		-#define WSIZE 0x8000 /* Window size must be at least 32k, */
33		- /* and a power of two */
34		-
35		-static uch inbuf; / input buffer */
36		-static uch window[WSIZE]; /* Sliding window buffer */
37		-
38		-static unsigned insize = 0; /* valid bytes in inbuf */
39		-static unsigned inptr = 0; /* index of next byte to be processed in inbuf */
40		-static unsigned outcnt = 0; /* bytes in output buffer */
41		-
42		-/* gzip flag byte */
43		-#define ASCII_FLAG 0x01 /* bit 0 set: file probably ASCII text */
44		-#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */
45		-#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */
46		-#define ORIG_NAME 0x08 /* bit 3 set: original file name present */
47		-#define COMMENT 0x10 /* bit 4 set: file comment present */
48		-#define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */
49		-#define RESERVED 0xC0 /* bit 6,7: reserved */
50		-
51		-#define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf())
52		-
53		-/* Diagnostic functions */
54		-#ifdef DEBUG
55		-# define Assert(cond,msg) {if(!(cond)) error(msg);}
56		-# define Trace(x) fprintf x
57		-# define Tracev(x) {if (verbose) fprintf x ;}
58		-# define Tracevv(x) {if (verbose>1) fprintf x ;}
59		-# define Tracec(c,x) {if (verbose && (c)) fprintf x ;}
60		-# define Tracecv(c,x) {if (verbose>1 && (c)) fprintf x ;}
61		-#else
62		-# define Assert(cond,msg)
63		-# define Trace(x)
64		-# define Tracev(x)
65		-# define Tracevv(x)
66		-# define Tracec(c,x)
67		-# define Tracecv(c,x)
68		-#endif
69		-
70		-static int fill_inbuf(void);
71		-static void flush_window(void);
72	23	static void error(char *m);
73	24
74		-static unsigned char *input_data;
75		-static int input_len;
76		-
77		-static long bytes_out = 0;
78		-static uch *output_data;
79		-static unsigned long output_ptr = 0;
80		-
81	25	#include "m32r_sio.c"
82	26
83	27	static unsigned long free_mem_ptr;
84	28	static unsigned long free_mem_end_ptr;
85	29
86		-#define HEAP_SIZE 0x10000
87		-
88		-#include "../../../../lib/inflate.c"
89		-
90		-void* memset(void* s, int c, size_t n)
	30	+#ifdef CONFIG_KERNEL_BZIP2
	31	+static void memset(void s, int c, size_t n)
91	32	{
92		- int i;
93		- char ss = (char)s;
	33	+ char *ss = s;
94	34
95		- for (i=0;i<n;i++) ss[i] = c;
	35	+ while (n--)
	36	+ *ss++ = c;
96	37	return s;
97	38	}
	39	+#endif
98	40
99		-void* memcpy(void* __dest, __const void* __src,
100		- size_t __n)
101		-{
102		- int i;
103		- char d = (char )__dest, s = (char )__src;
	41	+#ifdef CONFIG_KERNEL_GZIP
	42	+#define BOOT_HEAP_SIZE 0x10000
	43	+#include "../../../../lib/decompress_inflate.c"
	44	+#endif
104	45
105		- for (i=0;i<__n;i++) d[i] = s[i];
106		- return __dest;
107		-}
	46	+#ifdef CONFIG_KERNEL_BZIP2
	47	+#define BOOT_HEAP_SIZE 0x400000
	48	+#include "../../../../lib/decompress_bunzip2.c"
	49	+#endif
108	50
109		-/* ===========================================================================
110		- * Fill the input buffer. This is called only when the buffer is empty
111		- * and at least one byte is really needed.
112		- */
113		-static int fill_inbuf(void)
114		-{
115		- if (insize != 0) {
116		- error("ran out of input data");
117		- }
	51	+#ifdef CONFIG_KERNEL_LZMA
	52	+#define BOOT_HEAP_SIZE 0x10000
	53	+#include "../../../../lib/decompress_unlzma.c"
	54	+#endif
118	55
119		- inbuf = input_data;
120		- insize = input_len;
121		- inptr = 1;
122		- return inbuf[0];
123		-}
124		-
125		-/* ===========================================================================
126		- * Write the output window window[0..outcnt-1] and update crc and bytes_out.
127		- * (Used for the decompressed data only.)
128		- */
129		-static void flush_window(void)
130		-{
131		- ulg c = crc; /* temporary variable */
132		- unsigned n;
133		- uch in, out, ch;
134		-
135		- in = window;
136		- out = &output_data[output_ptr];
137		- for (n = 0; n < outcnt; n++) {
138		- ch = out++ = in++;
139		- c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8);
140		- }
141		- crc = c;
142		- bytes_out += (ulg)outcnt;
143		- output_ptr += (ulg)outcnt;
144		- outcnt = 0;
145		-}
146		-
147	56	static void error(char *x)
148	57	{
149	58	puts("\n\n");
150	59
151	60
152	61
...	...	@@ -153,21 +62,21 @@
153	62	while(1); /* Halt */
154	63	}
155	64
156		-/* return decompressed size */
157	65	void
158	66	decompress_kernel(int mmu_on, unsigned char *zimage_data,
159	67	unsigned int zimage_len, unsigned long heap)
160	68	{
	69	+ unsigned char *input_data = zimage_data;
	70	+ int input_len = zimage_len;
	71	+ unsigned char *output_data;
	72	+
161	73	output_data = (unsigned char *)CONFIG_MEMORY_START + 0x2000
162	74	+ (mmu_on ? 0x80000000 : 0);
163	75	free_mem_ptr = heap;
164		- free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;
165		- input_data = zimage_data;
166		- input_len = zimage_len;
	76	+ free_mem_end_ptr = free_mem_ptr + BOOT_HEAP_SIZE;
167	77
168		- makecrc();
169		- puts("Uncompressing Linux... ");
170		- gunzip();
171		- puts("Ok, booting the kernel.\n");
	78	+ puts("\nDecompressing Linux... ");
	79	+ decompress(input_data, input_len, NULL, NULL, output_data, NULL, error);
	80	+ puts("done.\nBooting the kernel.\n");
172	81	}
...	...	@@ -806,7 +806,7 @@
806	806
807	807	if (mask & ~physids_coerce(phys_cpu_present_map))
808	808	BUG();
809		- if (ipi_num >= NR_IPIS)
	809	+ if (ipi_num >= NR_IPIS \|\| ipi_num < 0)
810	810	BUG();
811	811
812	812	mask <<= IPI_SHIFT;
...	...	@@ -75,7 +75,7 @@
75	75	count = 0;
76	76
77	77	count = (latch - count) * TICK_SIZE;
78		- elapsed_time = (count + latch / 2) / latch;
	78	+ elapsed_time = DIV_ROUND_CLOSEST(count, latch);
79	79	/* NOTE: LATCH is equal to the "interval" value (= reload count). */
80	80
81	81	#else /* CONFIG_SMP */
...	...	@@ -93,7 +93,7 @@
93	93	p_count = count;
94	94
95	95	count = (latch - count) * TICK_SIZE;
96		- elapsed_time = (count + latch / 2) / latch;
	96	+ elapsed_time = DIV_ROUND_CLOSEST(count, latch);
97	97	/* NOTE: LATCH is equal to the "interval" value (= reload count). */
98	98	#endif /* CONFIG_SMP */
99	99	#elif defined(CONFIG_CHIP_M32310)
...	...	@@ -211,7 +211,7 @@
211	211
212	212	bus_clock = boot_cpu_data.bus_clock;
213	213	divide = boot_cpu_data.timer_divide;
214		- latch = (bus_clock/divide + HZ / 2) / HZ;
	214	+ latch = DIV_ROUND_CLOSEST(bus_clock/divide, HZ);
215	215
216	216	printk("Timer start : latch = %ld\n", latch);
217	217
...	...	@@ -42,6 +42,8 @@
42	42	_etext = .; /* End of text section */
43	43
44	44	EXCEPTION_TABLE(16)
	45	+ NOTES
	46	+
45	47	RODATA
46	48	RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE)
47	49	_edata = .; /* End of data section */