From redhatter@gentoo.org Sat Apr 1 03:20:55 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 01 Apr 2006 03:21:04 +0100 (BST) Received: from 202-47-55-78.adsl.gil.com.au ([202.47.55.78]:31978 "EHLO longlandclan.hopto.org") by ftp.linux-mips.org with ESMTP id S8133459AbWDACUz (ORCPT ); Sat, 1 Apr 2006 03:20:55 +0100 Received: (qmail 21382 invoked from network); 1 Apr 2006 12:31:33 +1000 Received: from beast.redhatters.home (HELO ?10.0.0.251?) (10.0.0.251) by 192.168.5.1 with SMTP; 1 Apr 2006 12:31:33 +1000 Message-ID: <442DE602.6070404@gentoo.org> Date: Sat, 01 Apr 2006 12:31:30 +1000 From: Stuart Longland Organization: Gentoo Foundation User-Agent: Mozilla Thunderbird 1.0.7 (X11/20051029) X-Accept-Language: en-us, en MIME-Version: 1.0 To: gowri@bitel.co.kr CC: linux-mips@linux-mips.org Subject: Re: socket error References: <20060303140428.T96056@invalid.ed.ntnu.no> <20060325175042.GH6100@flint.arm.linux.org.uk> <1143426101.3028.9.camel@localhost.localdomain> In-Reply-To: <1143426101.3028.9.camel@localhost.localdomain> X-Enigmail-Version: 0.93.0.0 OpenPGP: id=63264AB9; url=http://dev.gentoo.org/~redhatter/gpgkey.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig05270D06126F070CD449F13F" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11000 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: redhatter@gentoo.org Precedence: bulk X-list: linux-mips This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig05270D06126F070CD449F13F Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Gowri Satish Adimulam wrote: > Hi all , > Below iam trying to run ftp server daemon , > it gave below message , > > # ./ftpd > 421 Cannot getsockname( STDIN ), errno=95 > May 6 05:55:54 in.ftpd[48]: Cannot getsockname( STDIN ): Socket > operation on nt# > > any idea about this error . Yes... two suggestions: (1) You'll get _much_ better support if you ask the right people -- try reading the documentation for that FTP daemon -- it should mention who to contact regarding bugs there. (2) It looks like it's expecting to be run from inetd/xinetd -- perhaps that's worth a try? This list has nothing to do with FTP daemons -- unless you're having problems getting to ftp.linux-mips.org -- then we might have something to do with it. But otherwise, it's really not our issue. -- Stuart Longland (aka Redhatter) .'''. Gentoo Linux/MIPS Cobalt and Docs Developer '.'` : . . . . . . . . . . . . . . . . . . . . . . .'.' http://dev.gentoo.org/~redhatter :.' International Asperger's Year (1906 ~ 2006) http://dev.gentoo.org/~redhatter/iay --------------enig05270D06126F070CD449F13F Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFELeYFuarJ1mMmSrkRAmBMAJ4oaoAlLXRiiMlKhzGitq4x1Se8sgCeNqDv h5Q/8UsFHo/wYcLmBBz0Oxw= =BuNo -----END PGP SIGNATURE----- --------------enig05270D06126F070CD449F13F-- From scott.ashcroft@talk21.com Sat Apr 1 19:39:11 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 01 Apr 2006 19:39:21 +0100 (BST) Received: from web86301.mail.ukl.yahoo.com ([217.12.12.60]:34126 "HELO web86301.mail.ukl.yahoo.com") by ftp.linux-mips.org with SMTP id S8133541AbWDASjL (ORCPT ); Sat, 1 Apr 2006 19:39:11 +0100 Received: (qmail 35185 invoked by uid 60001); 1 Apr 2006 18:50:03 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=talk21.com; h=Message-ID:Received:Date:From:Subject:To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=FL4eC7FqU1pJ2jIBYHA74o8xmcP9qlefmz4QorGy012f95tTPgmnPKmmKYYz2puiSmH++5lrE2CNcfF5XiW1i9/bX+5pyWtqwAc+RUbkmvgv5Pto6VU4E0euJT7hJFKY2/9NweSTr///Q662f6OQ/1nUUY2pSlRpqI26Wjm2t0M= ; Message-ID: <20060401185003.35183.qmail@web86301.mail.ukl.yahoo.com> Received: from [62.190.246.49] by web86301.mail.ukl.yahoo.com via HTTP; Sat, 01 Apr 2006 19:50:03 BST Date: Sat, 1 Apr 2006 19:50:03 +0100 (BST) From: Scott Ashcroft Subject: [PATCH] Typo in arch/mips/Makefile breaks build on Cobalt To: linux-mips@linux-mips.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="0-6929233-1143917403=:33506" Content-Transfer-Encoding: 8bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11001 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: scott.ashcroft@talk21.com Precedence: bulk X-list: linux-mips --0-6929233-1143917403=:33506 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Content-Id: Content-Disposition: inline There appears to be a couple of typos in the clean up of the Makefile. The cflags lines for NEVADA and R5432 have 'cc-options' rather than 'cc-option'. Attached patch fixes it up. Signed-Off-by: scott.ashcroft@talk21.com --0-6929233-1143917403=:33506 Content-Type: text/plain; name="Makefile.diff" Content-Description: 3766969591-Makefile.diff Content-Disposition: inline; filename="Makefile.diff" diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 7bb0296..c254f4f 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -114,9 +114,9 @@ cflags-$(CONFIG_CPU_MIPS64_R1) += $(call cflags-$(CONFIG_CPU_MIPS64_R2) += $(call cc-option,-march=mips64r2,-mips2 -mtune=r4600 ) \ -Wa,-mips64r2 -Wa,--trap cflags-$(CONFIG_CPU_R5000) += -march=r5000 -Wa,--trap -cflags-$(CONFIG_CPU_R5432) += $(call cc-options,-march=r5400,-march=r5000) \ +cflags-$(CONFIG_CPU_R5432) += $(call cc-option,-march=r5400,-march=r5000) \ -Wa,--trap -cflags-$(CONFIG_CPU_NEVADA) += $(call cc-options,-march=rm5200,-march=r5000) \ +cflags-$(CONFIG_CPU_NEVADA) += $(call cc-option,-march=rm5200,-march=r5000) \ -Wa,--trap cflags-$(CONFIG_CPU_RM7000) += $(call cc-option,-march=rm7000,-march=r5000) \ -Wa,--trap --0-6929233-1143917403=:33506-- From niklaus@gmail.com Sat Apr 1 20:57:52 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 01 Apr 2006 20:58:03 +0100 (BST) Received: from wproxy.gmail.com ([64.233.184.239]:34991 "EHLO wproxy.gmail.com") by ftp.linux-mips.org with ESMTP id S8133554AbWDAT5w convert rfc822-to-8bit (ORCPT ); Sat, 1 Apr 2006 20:57:52 +0100 Received: by wproxy.gmail.com with SMTP id 36so1049793wra for ; Sat, 01 Apr 2006 12:08:44 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition; b=Q5Vq70zZGkc5cNMKh027fPOI3Vqe2KZ4Uk48VM75Y0ia1XLYZypDAiU8gdzEK+Vda2vRCefEGlcrs/j1t1gHwN7BtBvtDnH4gacliNG/Fo6dQrKgfbX90A7QiXLdveoEoN1upLFQRgG+NsN0IvAVZKAN4p8lp054mqlWfV+e7MQ= Received: by 10.65.205.15 with SMTP id h15mr96510qbq; Sat, 01 Apr 2006 12:08:44 -0800 (PST) Received: by 10.64.131.15 with HTTP; Sat, 1 Apr 2006 12:08:44 -0800 (PST) Message-ID: <85e0e3140604011208o20155cfblcadae4b19e8360dc@mail.gmail.com> Date: Sun, 2 Apr 2006 01:38:44 +0530 From: Niklaus To: linux-mips@linux-mips.org Subject: elocation truncated relocation truncated to fit: R_MIPS_GOT16 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Content-Disposition: inline Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11002 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: niklaus@gmail.com Precedence: bulk X-list: linux-mips Hi, I setup cross compilation environment for mips and did a make . Why do i get the last following error relocation truncated to fit errors. http://www.toppers.jp/download.cgi/jsp-1.4.1.tar.gz is the place where i got the file. The first steps are tar xvzf jsp-1.4.1.tar.gz cd jsp ./configure -C mips3 -S vr4131 cd cfg make cd .. make depend make pro@deb:~/jsp$ make mips-deb-linux-gcc -c -msoft-float -mgp32 -g -O2 -mips3 -G 0 -DGDB_STUB -I. -I./include -I./config/mips3/vr4131 -I./config/mips3 -I./kernel ./config/mips3/exception_vector.S mips-deb-linux-gcc -c -msoft-float -mgp32 -g -O2 -mips3 -G 0 -DGDB_STUB -I. -I./include -I./config/mips3/vr4131 -I./config/mips3 sample1.c sample1.c: In function `task': sample1.c:160: warning: division by zero sample1.c:165: warning: division by zero mips-deb-linux-gcc -c -msoft-float -mgp32 -g -O2 -mips3 -G 0 -DGDB_STUB -I. -I./include -I./config/mips3/vr4131 -I./config/mips3 -I./systask ./systask/timer.c mips-deb-linux-gcc -c -msoft-float -mgp32 -g -O2 -mips3 -G 0 -DGDB_STUB -I. -I./include -I./config/mips3/vr4131 -I./config/mips3 -I./systask ./systask/serial.c In file included from ./systask/serial.c:45: ./config/mips3/vr4131/hw_serial.h: In function `sio_cls_por': ./config/mips3/vr4131/hw_serial.h:115: warning: the address of `vr4131_dsiu_openflag', will always evaluate as `true' mips-deb-linux-gcc -c -msoft-float -mgp32 -g -O2 -mips3 -G 0 -DGDB_STUB -I. -I./include -I./config/mips3/vr4131 -I./config/mips3 -I./systask ./systask/logtask.c mips-deb-linux-gcc -c -msoft-float -mgp32 -g -O2 -mips3 -G 0 -DGDB_STUB -I. -I./include -I./config/mips3/vr4131 -I./config/mips3 -I./systask ./library/log_output.c mips-deb-linux-gcc -c -msoft-float -mgp32 -g -O2 -mips3 -G 0 -DGDB_STUB -I. -I./include -I./config/mips3/vr4131 -I./config/mips3 -I./systask ./library/vasyslog.c mips-deb-linux-gcc -c -msoft-float -mgp32 -g -O2 -mips3 -G 0 -DGDB_STUB -I. -I./include -I./config/mips3/vr4131 -I./config/mips3 -I./systask ./library/t_perror.c mips-deb-linux-gcc -c -msoft-float -mgp32 -g -O2 -mips3 -G 0 -DGDB_STUB -I. -I./include -I./config/mips3/vr4131 -I./config/mips3 -I./systask ./library/strerror.c mips-deb-linux-gcc -c -msoft-float -mgp32 -g -O2 -mips3 -G 0 -DGDB_STUB -I. -I./include -I./config/mips3/vr4131 -I./config/mips3 kernel_cfg.c In file included from kernel_cfg.c:27: ./config/mips3/vr4131/hw_serial.h: In function `sio_cls_por': ./config/mips3/vr4131/hw_serial.h:115: warning: the address of `vr4131_dsiu_openflag', will always evaluate as `true' mips-deb-linux-gcc -S -msoft-float -mgp32 -g -O2 -mips3 -G 0 -DGDB_STUB -I. -I./include -I./config/mips3/vr4131 -I./config/mips3 -I./kernel ./config/mips3/makeoffset.c ./utils/genoffset makeoffset.s > tmpfile3 mv tmpfile3 offset.h mips-deb-linux-gcc -c -msoft-float -mgp32 -g -O2 -mips3 -G 0 -DGDB_STUB -I. -I./include -I./config/mips3/vr4131 -I./config/mips3 -I./kernel ./config/mips3/vr4131/sys_support.S mips-deb-linux-gcc -c -msoft-float -mgp32 -g -O2 -mips3 -G 0 -DGDB_STUB -I. -I./include -I./config/mips3/vr4131 -I./config/mips3 -I./kernel ./config/mips3/cpu_support.S ./config/mips3/cpu_support.S: Assembler messages: ./config/mips3/cpu_support.S:133: Warning: No .cprestore pseudo-op used in PIC code ./config/mips3/cpu_support.S:148: Warning: No .cprestore pseudo-op used in PIC code ./config/mips3/cpu_support.S:378: Warning: No .cprestore pseudo-op used in PIC code ./config/mips3/cpu_support.S:238: Warning: Pretending global symbol used as branch target is local. ./config/mips3/cpu_support.S:267: Warning: Pretending global symbol used as branch target is local. ./config/mips3/cpu_support.S:561: Error: Cannot branch to undefined symbol. make: *** [cpu_support.o] Error 1 the file cpu_support.S :561 i have the instruction j call_texrtn I commented it. I was not sure what i was doing. Then i got some error saying "elf32-littlemips" , i changed it to elf32-tradlittlemips because that was what ld supported as a target. I got the following error . Can anyone help me why this occurs and how to resolve this . mips-deb-linux-gcc -msoft-float -mgp32 -g -O2 -mips3 -G 0 -DGDB_STUB -I. -I./include -I./config/mips3/vr4131 -I./config/mips3 -nostdlib -T ./config/mips3/vr4131/vr4131_elf_gdb.ld -o jsp \ exception_vector.o sample1.o timer.o serial.o logtask.o log_output.o vasyslog.o t_perror.o strerror.o kernel_cfg.o libkernel.a -lgcc /home/pro/crossenv/bin/../lib/gcc/mips-deb-linux/3.4.6/../../../../mips-deb-linux/bin/ld: region ROM0 is full (jsp section .rodata.str1.4) /home/pro/crossenv/bin/../lib/gcc/mips-deb-linux/3.4.6/../../../../mips-deb-linux/bin/ld: section .rodata.str1.4 [00000000a00004dc -> 00000000a0001046] overlaps section .text [00000000a0000700 -> 00000000a0007faf] /home/pro/crossenv/bin/../lib/gcc/mips-deb-linux/3.4.6/../../../../mips-deb-linux/bin/ld: jsp: section .text lma 0xa0000700 overlaps previous sections /home/pro/crossenv/bin/../lib/gcc/mips-deb-linux/3.4.6/../../../../mips-deb-linux/bin/ld: jsp: section .rodata lma 0xa0007fb0 overlaps previous sections exception_vector.o:./config/mips3/exception_vector.S:74: relocation truncated to fit: R_MIPS_GOT16 against `reset' exception_vector.o:./config/mips3/exception_vector.S:80: relocation truncated to fit: R_MIPS_GOT16 against `reset' exception_vector.o:./config/mips3/exception_vector.S:96: relocation truncated to fit: R_MIPS_GOT16 against `_kernel_cpu_experr' exception_vector.o:./config/mips3/exception_vector.S:112: relocation truncated to fit: R_MIPS_GOT16 against `_kernel_cpu_experr' exception_vector.o:./config/mips3/exception_vector.S:128: relocation truncated to fit: R_MIPS_GOT16 against `_kernel_cpu_experr' exception_vector.o:./config/mips3/exception_vector.S:144: relocation truncated to fit: R_MIPS_GOT16 against `_kernel_general_exception' libkernel.a(start.o):./config/mips3/start.S:69: relocation truncated to fit: R_MIPS_GOT16 against `_stack_top' libkernel.a(start.o):./config/mips3/start.S:73: relocation truncated to fit: R_MIPS_GOT16 against `_gp' libkernel.a(start.o):./config/mips3/start.S:114: relocation truncated to fit: R_MIPS_GOT16 against `hardware_init_hook' libkernel.a(start.o):./config/mips3/start.S:124: relocation truncated to fit: R_MIPS_GOT16 against `__bss_start' libkernel.a(start.o):./config/mips3/start.S:125: additional relocation overflows omitted from the output collect2: ld returned 1 exit status make: *** [jsp] Error 1 Please note i used the -Wa,-xgot options to compile still it failed. Can someone suggest me a work around. Is there anyway i can increase the size. If yes where in gcc . Any help would be greatly appreciated. Regards Nik From ralf@linux-mips.org Sat Apr 1 22:14:05 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 01 Apr 2006 22:14:13 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:8347 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133560AbWDAVOF (ORCPT ); Sat, 1 Apr 2006 22:14:05 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k31LJhgQ028706; Sat, 1 Apr 2006 22:19:43 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k31LJeI1028704; Sat, 1 Apr 2006 22:19:40 +0100 Date: Sat, 1 Apr 2006 22:19:40 +0100 From: Ralf Baechle To: Scott Ashcroft Cc: linux-mips@linux-mips.org Subject: Re: [PATCH] Typo in arch/mips/Makefile breaks build on Cobalt Message-ID: <20060401211940.GA28654@linux-mips.org> References: <20060401185003.35183.qmail@web86301.mail.ukl.yahoo.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060401185003.35183.qmail@web86301.mail.ukl.yahoo.com> User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11003 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Sat, Apr 01, 2006 at 07:50:03PM +0100, Scott Ashcroft wrote: > There appears to be a couple of typos in the clean up > of the Makefile. > > The cflags lines for NEVADA and R5432 have > 'cc-options' rather than 'cc-option'. > Attached patch fixes it up. I ran into this an hour ago during builds across all platforms, so there already is a fix in the tree. Thanks anyway, Ralf From fxzhang@ict.ac.cn Sun Apr 2 15:27:35 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 02 Apr 2006 15:27:45 +0100 (BST) Received: from webmail.ict.ac.cn ([159.226.39.7]:5325 "HELO ict.ac.cn") by ftp.linux-mips.org with SMTP id S8133564AbWDBO1f (ORCPT ); Sun, 2 Apr 2006 15:27:35 +0100 Received: (qmail 10676 invoked by uid 507); 2 Apr 2006 13:50:06 -0000 Received: from unknown (HELO ?192.168.2.202?) (fxzhang@222.92.8.142) by ict.ac.cn with SMTP; 2 Apr 2006 13:50:06 -0000 Message-ID: <442FE1CA.4030905@ict.ac.cn> Date: Sun, 02 Apr 2006 22:38:02 +0800 From: Fuxin Zhang User-Agent: Thunderbird 1.5 (Windows/20051201) MIME-Version: 1.0 To: Linux/MIPS Development Subject: stack backtrace X-Enigmail-Version: 0.93.0.0 Content-Type: text/plain; charset=GB18030 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11004 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: fxzhang@ict.ac.cn Precedence: bulk X-list: linux-mips hi Ralf, The dwarf unwinding code is too complex and I have no time to port it. And I doubt it will be important enough to deserve the space costs, the -gdwarf-2 kernel is more than 20MB. Instead for my need I just hack up a simple version of way 1, with frame pointer kept on: CONFIG_FRAME_POINTER. BTW:It seems nobody use this option for MIPS? Is it dangerous? The size and performance overhead should be barable at most time for debugging? here is the code patch(just for reference), it depends on CONFIG_KALLSYMS too. --- traps.c.orig 2006-04-02 21:39:01.000000000 +0800 +++ traps.c 2006-04-02 22:38:03.000000000 +0800 @@ -116,8 +116,129 @@ printk("\n"); } -void show_trace(struct task_struct *task, unsigned long *stack) +#include + +static struct mips_frame_info { + void *func; + int omit_fp; /* compiled without fno-omit-frame-pointer */ + int frame_offset; + int pc_offset; +} tmp_frame; + +static int get_frame_info(void *func,struct mips_frame_info *info) +{ + int i; + union mips_instruction *ip = (union mips_instruction *)func; + info->pc_offset = -1; + info->frame_offset = -1; + for (i = 0; i < 128; i++, ip++) { + /* if jal, jalr, jr, stop. */ + if (ip->j_format.opcode == jal_op || + (ip->r_format.opcode == spec_op && + (ip->r_format.func == jalr_op || + ip->r_format.func == jr_op))) + break; + + if ( +#ifdef CONFIG_32BIT + ip->i_format.opcode == sw_op && +#endif +#ifdef CONFIG_64BIT + ip->i_format.opcode == sd_op && +#endif + ip->i_format.rs == 29) + { + /* sw / sd $ra, offset($sp) */ + if (ip->i_format.rt == 31) { + if (info->pc_offset != -1) + continue; + info->pc_offset = + ip->i_format.simmediate / sizeof(long); + } + /* sw / sd $s8, offset($sp) */ + if (ip->i_format.rt == 30) { +//#if 0 /* gcc 3.4 does aggressive optimization... */ + if (info->frame_offset != -1) + continue; +//#endif + info->frame_offset = + ip->i_format.simmediate / sizeof(long); + } + } + } + if (info->pc_offset == -1 || info->frame_offset == -1) { + printk("Can't analyze prologue code at %p\n", func); + info->pc_offset = -1; + info->frame_offset = -1; + return -1; + } + + return 0; +} + +static void show_trace(struct task_struct *task, void *regs_in) { + unsigned long prev_sp,stack_top; + unsigned long count = 0; + unsigned long frame, pc; + char namebuf[KSYM_NAME_LEN+1]; + const char *name; + char *modname; + unsigned long size,offset; + struct pt_regs *regs; + int in_exception = 0; + + if (regs_in) /* called from show_registers */ + regs = (struct pt_regs*) regs_in; + else + regs = (struct pt_regs *) ((unsigned long) task->thread_info + + THREAD_SIZE - 32 - sizeof(struct pt_regs)); + + printk("Call Trace:\n"); + + prev_sp = (unsigned long) (task->thread_info + 1); + stack_top = (unsigned long) task->thread_info + THREAD_SIZE; + + pc = (unsigned long)show_trace; + + if (get_frame_info((void*)pc,&tmp_frame)) + return; + + __asm__ volatile ("addu %0,$0,$30" : "=r" (frame)); + + do { + pc = ((unsigned long *)frame)[tmp_frame.pc_offset]; + frame = ((unsigned long *)frame)[tmp_frame.frame_offset]; + if (frame < prev_sp || frame > stack_top) { + printk("out of range sp %08lx,give up!\n",frame); + break; + } + + retry_pc: + if (!__kernel_text_address(pc)) { + printk("out of text addr %08lx,give up!\n",pc); + break; + } + + name = kallsyms_lookup(pc, &size, &offset, &modname, namebuf); + if (!name) { + printk("no function found at %08lx\n",pc); + return; + } + printk("%s at %08lx,frame=%08lx",name,pc,frame); + + pc = pc - offset; + if (get_frame_info((void*)pc,&tmp_frame) && !in_exception) { + printk("get frame information failed, assume exceptions\n"); + in_exception = 1; + pc = regs->cp0_epc; + frame = regs->regs[30]; + printk("epc = %08lx,frame=%08lx\n",pc,frame); + goto retry_pc; + } + } while (count++ < 16); + +#if 0 const int field = 2 * sizeof(unsigned long); unsigned long addr; @@ -140,6 +261,7 @@ } } printk("\n"); +#endif } /* @@ -147,9 +269,10 @@ */ void dump_stack(void) { - unsigned long stack; + //unsigned long stack; - show_trace(current, &stack); + //show_trace(current, &stack); + show_trace(current, NULL); } EXPORT_SYMBOL(dump_stack); @@ -269,7 +392,8 @@ printk("Process %s (pid: %d, threadinfo=%p, task=%p)\n", current->comm, current->pid, current_thread_info(), current); show_stack(current, (long *) regs->regs[29]); - show_trace(current, (long *) regs->regs[29]); + //show_trace(current, (long *) regs->regs[29]); + show_trace(current,(void*) regs); show_code((unsigned int *) regs->cp0_epc); printk("\n"); } --- process.c.orig 2006-04-02 21:38:51.000000000 +0800 +++ process.c 2006-03-23 22:56:46.000000000 +0800 @@ -314,6 +314,9 @@ int i; void *func = info->func; union mips_instruction *ip = (union mips_instruction *)func; +#ifdef CONFIG_FRAME_POINTER + info->omit_fp = 0; +#endif info->pc_offset = -1; info->frame_offset = info->omit_fp ? 0 : -1; for (i = 0; i < 128; i++, ip++) { From fxzhang@ict.ac.cn Sun Apr 2 15:47:06 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 02 Apr 2006 15:47:15 +0100 (BST) Received: from webmail.ict.ac.cn ([159.226.39.7]:36301 "HELO ict.ac.cn") by ftp.linux-mips.org with SMTP id S8133535AbWDBOrG (ORCPT ); Sun, 2 Apr 2006 15:47:06 +0100 Received: (qmail 12123 invoked by uid 507); 2 Apr 2006 14:09:45 -0000 Received: from unknown (HELO ?192.168.2.202?) (fxzhang@222.92.8.142) by ict.ac.cn with SMTP; 2 Apr 2006 14:09:45 -0000 Message-ID: <442FE669.8060606@ict.ac.cn> Date: Sun, 02 Apr 2006 22:57:45 +0800 From: Fuxin Zhang User-Agent: Thunderbird 1.5 (Windows/20051201) MIME-Version: 1.0 To: Linux/MIPS Development Subject: Anyone using marvell 64420 system controller X-Enigmail-Version: 0.93.0.0 Content-Type: text/plain; charset=GB18030 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11005 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: fxzhang@ict.ac.cn Precedence: bulk X-list: linux-mips hi, We have been puzzled by the strange problems with our new board with marvell 64420 for nearly one month. The board is unstable in linux. Using a 2.6.14 kernel it dies very easily with file system operations;with a 2.4.22 kernel it can survive a "cp -a /usr /usr1", but diffing two identical files with sizes > 50M often mistakely reports difference.The diff result is often 32 bytes,but the first byte is not cache line aligned(in fact,almost always %cachelinesize == 1). The results remain true even with ramdisk only and any other pci device removed from the board. The same mips CPU works well on other boards, the same kernel with different platform chosen is very stable too. So I tend to doubt the bridge or its DDR controller.( Is there any possiblity of platform related code that lead to such problem? ) If anyone has experiences on this chip, could you point us some way out? It seems we cannot easily reach the marvell's core developers. Thanks a lot. From fxzhang@ict.ac.cn Sun Apr 2 15:52:33 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 02 Apr 2006 15:52:41 +0100 (BST) Received: from webmail.ict.ac.cn ([159.226.39.7]:46541 "HELO ict.ac.cn") by ftp.linux-mips.org with SMTP id S8133535AbWDBOwd (ORCPT ); Sun, 2 Apr 2006 15:52:33 +0100 Received: (qmail 12695 invoked by uid 507); 2 Apr 2006 14:15:11 -0000 Received: from unknown (HELO ?192.168.2.202?) (fxzhang@222.92.8.142) by ict.ac.cn with SMTP; 2 Apr 2006 14:15:11 -0000 Message-ID: <442FE7B0.1070209@ict.ac.cn> Date: Sun, 02 Apr 2006 23:03:12 +0800 From: Fuxin Zhang User-Agent: Thunderbird 1.5 (Windows/20051201) MIME-Version: 1.0 To: Fuxin Zhang CC: Linux/MIPS Development Subject: Re: Anyone using marvell 64420 system controller References: <442FE669.8060606@ict.ac.cn> In-Reply-To: <442FE669.8060606@ict.ac.cn> X-Enigmail-Version: 0.93.0.0 Content-Type: text/plain; charset=gb18030 Content-Transfer-Encoding: 8bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11006 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: fxzhang@ict.ac.cn Precedence: bulk X-list: linux-mips I forget to mention that in boot loader things look like quite stable: memory test is ok(we ported memtest86), loading big files over the network is ok, gzip/unzip/diff a 40MB file is ok too. And if we turn on memory debug for slab allocator on 2.6, we often meet random slab corruptions. It looks like some memory area will be mysteriously changed. Fuxin Zhang дµÀ: > hi, > > We have been puzzled by the strange problems with our new board with > marvell 64420 for nearly one month. > > The board is unstable in linux. Using a 2.6.14 kernel it dies very > easily with file system operations;with a 2.4.22 kernel it can survive > a "cp -a /usr /usr1", but diffing two identical files with sizes > 50M > often mistakely reports difference.The diff result is often 32 bytes,but > the first byte is not cache line aligned(in fact,almost always > %cachelinesize == 1). > > The results remain true even with ramdisk only and any other pci device > removed from the board. The same mips CPU works well on other boards, > the same kernel with different platform chosen is very stable too. So I > tend to doubt the bridge or its DDR controller.( Is there any possiblity > of platform related code that lead to such problem? ) > > > If anyone has experiences on this chip, could you point us some way out? > It seems we cannot easily reach the marvell's core developers. > > Thanks a lot. > > > > > From anemo@mba.ocn.ne.jp Sun Apr 2 17:06:08 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 02 Apr 2006 17:06:16 +0100 (BST) Received: from mba.ocn.ne.jp ([210.190.142.172]:3070 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S8133594AbWDBQGD (ORCPT ); Sun, 2 Apr 2006 17:06:03 +0100 Received: from localhost (p6135-ipad211funabasi.chiba.ocn.ne.jp [58.91.162.135]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 77F469EDF; Mon, 3 Apr 2006 01:16:55 +0900 (JST) Date: Mon, 03 Apr 2006 01:17:11 +0900 (JST) Message-Id: <20060403.011711.74751665.anemo@mba.ocn.ne.jp> To: fxzhang@ict.ac.cn Cc: linux-mips@linux-mips.org Subject: Re: stack backtrace From: Atsushi Nemoto In-Reply-To: <442FE1CA.4030905@ict.ac.cn> References: <442FE1CA.4030905@ict.ac.cn> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11007 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips >>>>> On Sun, 02 Apr 2006 22:38:02 +0800, Fuxin Zhang said: > Instead for my need I just hack up a simple version of way 1, with > frame pointer kept on: CONFIG_FRAME_POINTER. > BTW:It seems nobody use this option for MIPS? Is it dangerous? The size > and performance overhead should be barable at most time for debugging? > here is the code patch(just for reference), it depends on > CONFIG_KALLSYMS too. The get_frame_info() in process.c in kernel 2.6.16 no longer depends on a frame pointer. It would fit your needs better. I think you can use it with slight modifications. BTW, Is there any point using -fno-omit-frame-pointer on MIPS now? CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y is better for MIPS, isn't it? --- Atsushi Nemoto From sshtylyov@ru.mvista.com Sun Apr 2 17:16:22 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 02 Apr 2006 17:16:31 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:4260 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133593AbWDBQQW (ORCPT ); Sun, 2 Apr 2006 17:16:22 +0100 Received: (qmail 31622 invoked from network); 2 Apr 2006 20:28:02 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 2 Apr 2006 20:28:02 -0000 Message-ID: <442FFB08.7060002@ru.mvista.com> Date: Sun, 02 Apr 2006 20:25:44 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: Linux-MIPS CC: Jordan Crouse Subject: [PATCH] Au1550: make OSS drivers look pretty on loading Content-Type: multipart/mixed; boundary="------------000109080604040901020208" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11008 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips This is a multi-part message in MIME format. --------------000109080604040901020208 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Hello. Calls to pr_info() without newlines caused the OSS drivers' load time messages to be printed w/o any spacing... WBR, Sergei PS: Forgot the signoff line again when posting the patch on Friday: Signed-off-by: Sergei Shtylyov --------------000109080604040901020208 Content-Type: text/plain; name="Au1550-OSS-print-newlines.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="Au1550-OSS-print-newlines.patch" diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c index f38e082..0ca90a0 100644 --- a/sound/oss/au1550_ac97.c +++ b/sound/oss/au1550_ac97.c @@ -1950,7 +1950,7 @@ au1550_probe(void) goto err_dma2; } - pr_info("DAC: DMA%d, ADC: DMA%d", DBDMA_AC97_TX_CHAN, DBDMA_AC97_RX_CHAN); + pr_info("DAC: DMA%d, ADC: DMA%d\n", DBDMA_AC97_TX_CHAN, DBDMA_AC97_RX_CHAN); /* register devices */ @@ -2031,7 +2031,7 @@ au1550_probe(void) s->codec_base_caps = rdcodec(s->codec, AC97_RESET); s->codec_ext_caps = rdcodec(s->codec, AC97_EXTENDED_ID); - pr_info("AC'97 Base/Extended ID = %04x/%04x", + pr_info("AC'97 Base/Extended ID = %04x/%04x\n", s->codec_base_caps, s->codec_ext_caps); if (!(s->codec_ext_caps & AC97_EXTID_VRA)) { @@ -2047,7 +2047,7 @@ au1550_probe(void) s->no_vra = 1; } if (s->no_vra) - pr_info("no VRA, interpolating and decimating"); + pr_info("no VRA, interpolating and decimating\n"); /* set mic to be the recording source */ val = SOUND_MASK_MIC; diff --git a/sound/oss/au1550_i2s.c b/sound/oss/au1550_i2s.c index 529b625..9907ac0 100644 --- a/sound/oss/au1550_i2s.c +++ b/sound/oss/au1550_i2s.c @@ -1897,7 +1897,7 @@ au1550_probe(void) goto err_dma2; } - pr_info("DAC: DMA%d, ADC: DMA%d", DBDMA_I2S_TX_CHAN, DBDMA_I2S_RX_CHAN); + pr_info("DAC: DMA%d, ADC: DMA%d\n", DBDMA_I2S_TX_CHAN, DBDMA_I2S_RX_CHAN); /* register devices */ --------------000109080604040901020208-- From ralf@linux-mips.org Sun Apr 2 20:37:35 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 02 Apr 2006 20:37:43 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:35296 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133594AbWDBThf (ORCPT ); Sun, 2 Apr 2006 20:37:35 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k32JmOKX029475 for ; Sun, 2 Apr 2006 20:48:24 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k32JmMIP029474 for linux-mips@linux-mips.org; Sun, 2 Apr 2006 20:48:22 +0100 Date: Sun, 2 Apr 2006 20:48:22 +0100 From: Ralf Baechle To: linux-mips@linux-mips.org Subject: Removing support for old boards Message-ID: <20060402194822.GA26358@linux-mips.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11009 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips o DDB5074 and DDB5476 eval boards don't compile anymore since around 2.6.0, I've mentioned that before, and two people mentioned their interest in continued support for the board but no pathches yet. o EV96100 doesn't build anymore since at least November 15, 2003. No bug reports. o Jaguar ATX didn't build. High on my lists of things to be removed because of it's awkard architecture that requires old features in the generic memory managment code to be left around. o None of the other MV-64340 based boards, that is Ocelot C and Ocelot 3 does build since over a year yet again indicating there is nobody left that has any interest in these boards. o Altas and SEAD don't build and nobody has complained; MIPS Technologies does no longer sell these boards since years. o The serial driver for the two IT8172-based boards does not build for quite some time yet again (at least since 2.6.0, that's over two year) indicating nobody has enough interest to fix the thing. Same applies for the Globespan IVR (CONFIG_MIPS_IVR) board. A while ago I already mentioned the IT8172 board as a candidate for removal; somebody (Fuxin?) objected but no fixes ... So that's my current list of candidates for removal and there are probably a few more good candidates. Objections? Or even better *PATCHES* [1] to fix things? Ralf [1] Sorry for mentioning the p-word ;-) From fxzhang@ict.ac.cn Mon Apr 3 01:42:55 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 03 Apr 2006 01:43:03 +0100 (BST) Received: from webmail.ict.ac.cn ([159.226.39.7]:48600 "HELO ict.ac.cn") by ftp.linux-mips.org with SMTP id S8133618AbWDCAmz (ORCPT ); Mon, 3 Apr 2006 01:42:55 +0100 Received: (qmail 23937 invoked by uid 507); 3 Apr 2006 00:05:29 -0000 Received: from unknown (HELO ?192.168.2.202?) (fxzhang@222.92.8.142) by ict.ac.cn with SMTP; 3 Apr 2006 00:05:29 -0000 Message-ID: <4430720F.2000708@ict.ac.cn> Date: Mon, 03 Apr 2006 08:53:35 +0800 From: Fuxin Zhang User-Agent: Thunderbird 1.5 (Windows/20051201) MIME-Version: 1.0 To: Atsushi Nemoto CC: linux-mips@linux-mips.org Subject: Re: stack backtrace References: <442FE1CA.4030905@ict.ac.cn> <20060403.011711.74751665.anemo@mba.ocn.ne.jp> In-Reply-To: <20060403.011711.74751665.anemo@mba.ocn.ne.jp> X-Enigmail-Version: 0.93.0.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11010 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: fxzhang@ict.ac.cn Precedence: bulk X-list: linux-mips > The get_frame_info() in process.c in kernel 2.6.16 no longer depends > on a frame pointer. It would fit your needs better. I think you can > use it with slight modifications. good news > > BTW, Is there any point using -fno-omit-frame-pointer on MIPS now? > CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y is better for MIPS, isn't it? > > --- > Atsushi Nemoto > > > From chuckmeade@mindspring.com Mon Apr 3 05:00:28 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 03 Apr 2006 05:00:42 +0100 (BST) Received: from njbrsmtp1.vzwmail.net ([66.174.76.155]:15559 "EHLO njbrsmtp1.vzwmail.net") by ftp.linux-mips.org with ESMTP id S8126481AbWDCEA2 (ORCPT ); Mon, 3 Apr 2006 05:00:28 +0100 Received: from squidward (smtp.vzwmail.net [66.174.76.25]) (authenticated bits=0) by njbrsmtp1.vzwmail.net (8.12.9/8.12.9) with ESMTP id k334B8Lv010512; Mon, 3 Apr 2006 04:11:14 GMT From: "Chuck Meade" To: Cc: "Chuck Meade \(mindspring\)" Subject: corruption of load instruction offset Date: Mon, 3 Apr 2006 00:12:46 -0400 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook IMO, Build 9.0.2416 (9.0.2910.0) x-mimeole: Produced By Microsoft MimeOLE V6.00.2800.1106 Importance: Normal Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11011 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: chuckmeade@mindspring.com Precedence: bulk X-list: linux-mips Hello, I am seeing a very interesting/worrisome bug on an RM7965 cpu, which has an E9000 core. I am running 2.6.14-rc1. Please take a look at the behavior I describe and send me your thoughts. Thanks. The error message is immediately below. Notice that the epc is 8021e28c, and the BadVA is 87e39681, and register 4 (a0) is 87e38660. Now scan down below the error message, to the disassembly of move_32bytes. If you look at the instruction at 8021e28c, it appears harmless enough. Nothing to cause an unaligned access or invalid instruction. But look about 6 lines above that, and we are loading at offsets from a0. The offsets from a0 in those 4 load instructions are 16, 20, 24, and 28. If you look at the opcodes in the column to the left, those offsets appear in the least significant 16 bits of the opcode. Now look again at the value of a0 in the register dump: 87e38660. And at the BadVA value: 87e39681. The BadVA is offset exactly 0x1021 from a0. This indicates that we somehow tried to access memory at offset 0x1021 from a0. However, we never should have done that according to the disassembly. *But* there are many instructions in the vicinity which have a least significant 16 bits of 0x1021. None of them are loads from a0, but I believe that this is the root of the problem. Something is happening here, possibly an interrupt, or a cpu bug(?) that is causing the load from a0 to use an offset of 0x1021 (the least significant 16-bits of many of the nearby instructions) rather than the correct offset for the load instruction, which is found in the least significant 16-bits of the actual load instructions. This is not "quickly" reproducible. I run a TCP blaster/blastee test between this machine and Linux PC, and at some point during the run (sometimes much later) this error appears. Thanks for your ideas, Chuck Error message: Unhandled kernel unaligned access or invalid instruction in arch/mips/kernel/unaligned.c::emulate_load_store_insn, line 487[#1]: Cpu 0 $ 0 : 00000000 10004ce8 00000000 00000000 $ 4 : 87e38660 000005a8 00000000 00000000 $ 8 : 00000000 00000000 00000020 00000000 $12 : 00000000 80402000 00000001 00000000 $16 : 00000000 87e171a0 000005a8 87c1f060 $20 : 87e380e0 004009e0 10004740 00002ad8 $24 : 00000008 803171c0 $28 : 8120a000 8120bd48 00000000 802deb30 Hi : 0000000c Lo : 000d4bf8 epc : 8021e28c move_32bytes+0x64/0x88 Not tainted ra : 802deb30 tcp_sendmsg+0x460/0xd80 Status: 90018403 KERNEL EXL IE Cause : 00000010 BadVA : 87e39681 PrId : 00003422 Modules linked in: Process blaster (pid: 162, threadinfo=8120a000, task=8050b3f8) Stack : 8120bdd0 00000000 812fd4a0 8120bdf0 8120bd70 87e18520 00000001 00000000 8120be40 7fffffff 00000000 8120bf18 8120be14 00000000 000005a8 000005a8 000032e8 00000001 00000000 90018400 8120be40 00005dc0 10001458 8120bf18 00000005 004009e0 10011044 10010000 10010fd4 8028e7a8 00000020 ffffffff 00000001 00000000 00005dc0 10001458 87e18520 00005dc0 812fd4a0 004009e0 ... Call Trace: [<8028e7a8>] sock_aio_write+0x10c/0x12c [<8016bef8>] do_sync_write+0xd0/0x128 [<801037d4>] do_IRQ+0x24/0x34 [<804203cc>] init+0xd8/0xe4 [<8013cf78>] autoremove_wake_function+0x0/0x44 [<8016c020>] vfs_write+0xd0/0x144 [<8016c020>] vfs_write+0xd0/0x144 [<8016c074>] vfs_write+0x124/0x144 [<8016c150>] sys_write+0x24/0x98 [<8016c180>] sys_write+0x54/0x98 [<8016c154>] sys_write+0x28/0x98 [<801037d4>] do_IRQ+0x24/0x34 [<8010b260>] stack_done+0x20/0x3c Disassembly of relevant portion of move_32bytes: 8021e228 : 8021e228: 8c880000 lw t0,0(a0) 8021e22c: 8c890004 lw t1,4(a0) 8021e230: 8c8b0008 lw t3,8(a0) 8021e234: 8c8c000c lw t4,12(a0) 8021e238: 00481021 addu v0,v0,t0 8021e23c: 0048182b sltu v1,v0,t0 8021e240: 00431021 addu v0,v0,v1 8021e244: 00491021 addu v0,v0,t1 8021e248: 0049182b sltu v1,v0,t1 8021e24c: 00431021 addu v0,v0,v1 8021e250: 004b1021 addu v0,v0,t3 8021e254: 004b182b sltu v1,v0,t3 8021e258: 00431021 addu v0,v0,v1 8021e25c: 004c1021 addu v0,v0,t4 8021e260: 004c182b sltu v1,v0,t4 8021e264: 00431021 addu v0,v0,v1 8021e268: 8c880010 lw t0,16(a0) 8021e26c: 8c890014 lw t1,20(a0) 8021e270: 8c8b0018 lw t3,24(a0) 8021e274: 8c8c001c lw t4,28(a0) 8021e278: 00481021 addu v0,v0,t0 8021e27c: 0048182b sltu v1,v0,t0 8021e280: 00431021 addu v0,v0,v1 8021e284: 00491021 addu v0,v0,t1 8021e288: 0049182b sltu v1,v0,t1 8021e28c: 00431021 addu v0,v0,v1 8021e290: 004b1021 addu v0,v0,t3 8021e294: 004b182b sltu v1,v0,t3 8021e298: 00431021 addu v0,v0,v1 8021e29c: 004c1021 addu v0,v0,t4 8021e2a0: 004c182b sltu v1,v0,t4 8021e2a4: 00431021 addu v0,v0,v1 8021e2a8: 30b8001c andi t8,a1,0x1c 8021e2ac: 24840020 addiu a0,a0,32 From kevink@mips.com Mon Apr 3 08:11:44 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 03 Apr 2006 08:11:54 +0100 (BST) Received: from 209-232-97-206.ded.pacbell.net ([209.232.97.206]:62204 "EHLO dns0.mips.com") by ftp.linux-mips.org with ESMTP id S8126483AbWDCHLo (ORCPT ); Mon, 3 Apr 2006 08:11:44 +0100 Received: from mercury.mips.com (sbcns-dmz [209.232.97.193]) by dns0.mips.com (8.12.11/8.12.11) with ESMTP id k337MZqS020228; Mon, 3 Apr 2006 00:22:38 -0700 (PDT) Received: from grendel (grendel [192.168.236.16]) by mercury.mips.com (8.13.5/8.13.5) with SMTP id k337MWbg014538; Mon, 3 Apr 2006 00:22:33 -0700 (PDT) Message-ID: <000f01c656ef$d2963670$10eca8c0@grendel> From: "Kevin D. Kissell" To: "Chuck Meade" , Cc: "Chuck Meade \(mindspring\)" References: Subject: Re: corruption of load instruction offset Date: Mon, 3 Apr 2006 09:25:42 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2800.1506 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1506 X-Scanned-By: MIMEDefang 2.39 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11012 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: kevink@mips.com Precedence: bulk X-list: linux-mips That's pretty twisted - one could almost believe that the fetch from 0x8021e28c got corrupted to pick up the most significant 16 bits of the instruction at 0x8021e22c or 0x8021e26c - but given that instructions are fetched and issued word-by-word, it's hard to see where that could happen, in either CPU hardware or software. What is the I-cache line size? If it were me, I'd check my clocks, voltages, and above all my RAM timing, and I'd re-seat my CPU and RAM in their sockets... Regards, Kevin K. ----- Original Message ----- From: "Chuck Meade" To: Cc: "Chuck Meade (mindspring)" Sent: Monday, April 03, 2006 6:12 AM Subject: corruption of load instruction offset > Hello, > > I am seeing a very interesting/worrisome bug on an RM7965 cpu, which has > an E9000 core. I am running 2.6.14-rc1. Please take a look at the > behavior I describe and send me your thoughts. Thanks. > > The error message is immediately below. Notice that the epc is 8021e28c, > and the BadVA is 87e39681, and register 4 (a0) is 87e38660. > > Now scan down below the error message, to the disassembly of move_32bytes. > If you look at the instruction at 8021e28c, it appears harmless enough. > Nothing to cause an unaligned access or invalid instruction. But look > about 6 lines above that, and we are loading at offsets from a0. The > offsets from a0 in those 4 load instructions are 16, 20, 24, and 28. If > you look at the opcodes in the column to the left, those offsets appear in > the least significant 16 bits of the opcode. > > Now look again at the value of a0 in the register dump: 87e38660. And > at the BadVA value: 87e39681. The BadVA is offset exactly 0x1021 from > a0. This indicates that we somehow tried to access memory at offset > 0x1021 from a0. However, we never should have done that according to > the disassembly. *But* there are many instructions in the vicinity which > have a least significant 16 bits of 0x1021. None of them are loads from a0, > but I believe that this is the root of the problem. Something is happening > here, possibly an interrupt, or a cpu bug(?) that is causing the load from > a0 to use an offset of 0x1021 (the least significant 16-bits of many of > the nearby instructions) rather than the correct offset for the load > instruction, which is found in the least significant 16-bits of the actual > load instructions. > > This is not "quickly" reproducible. I run a TCP blaster/blastee test between > this machine and Linux PC, and at some point during the run (sometimes much > later) this error appears. > > Thanks for your ideas, > Chuck > > Error message: > > Unhandled kernel unaligned access or invalid instruction in arch/mips/kernel/unaligned.c::emulate_load_store_insn, line 487[#1]: > Cpu 0 > $ 0 : 00000000 10004ce8 00000000 00000000 > $ 4 : 87e38660 000005a8 00000000 00000000 > $ 8 : 00000000 00000000 00000020 00000000 > $12 : 00000000 80402000 00000001 00000000 > $16 : 00000000 87e171a0 000005a8 87c1f060 > $20 : 87e380e0 004009e0 10004740 00002ad8 > $24 : 00000008 803171c0 > $28 : 8120a000 8120bd48 00000000 802deb30 > Hi : 0000000c > Lo : 000d4bf8 > epc : 8021e28c move_32bytes+0x64/0x88 Not tainted > ra : 802deb30 tcp_sendmsg+0x460/0xd80 > Status: 90018403 KERNEL EXL IE > Cause : 00000010 > BadVA : 87e39681 > PrId : 00003422 > Modules linked in: > Process blaster (pid: 162, threadinfo=8120a000, task=8050b3f8) > Stack : 8120bdd0 00000000 812fd4a0 8120bdf0 8120bd70 87e18520 00000001 00000000 > 8120be40 7fffffff 00000000 8120bf18 8120be14 00000000 000005a8 000005a8 > 000032e8 00000001 00000000 90018400 8120be40 00005dc0 10001458 8120bf18 > 00000005 004009e0 10011044 10010000 10010fd4 8028e7a8 00000020 ffffffff > 00000001 00000000 00005dc0 10001458 87e18520 00005dc0 812fd4a0 004009e0 > ... > Call Trace: > [<8028e7a8>] sock_aio_write+0x10c/0x12c > [<8016bef8>] do_sync_write+0xd0/0x128 > [<801037d4>] do_IRQ+0x24/0x34 > [<804203cc>] init+0xd8/0xe4 > [<8013cf78>] autoremove_wake_function+0x0/0x44 > [<8016c020>] vfs_write+0xd0/0x144 > [<8016c020>] vfs_write+0xd0/0x144 > [<8016c074>] vfs_write+0x124/0x144 > [<8016c150>] sys_write+0x24/0x98 > [<8016c180>] sys_write+0x54/0x98 > [<8016c154>] sys_write+0x28/0x98 > [<801037d4>] do_IRQ+0x24/0x34 > [<8010b260>] stack_done+0x20/0x3c > > > > Disassembly of relevant portion of move_32bytes: > > 8021e228 : > 8021e228: 8c880000 lw t0,0(a0) > 8021e22c: 8c890004 lw t1,4(a0) > 8021e230: 8c8b0008 lw t3,8(a0) > 8021e234: 8c8c000c lw t4,12(a0) > 8021e238: 00481021 addu v0,v0,t0 > 8021e23c: 0048182b sltu v1,v0,t0 > 8021e240: 00431021 addu v0,v0,v1 > 8021e244: 00491021 addu v0,v0,t1 > 8021e248: 0049182b sltu v1,v0,t1 > 8021e24c: 00431021 addu v0,v0,v1 > 8021e250: 004b1021 addu v0,v0,t3 > 8021e254: 004b182b sltu v1,v0,t3 > 8021e258: 00431021 addu v0,v0,v1 > 8021e25c: 004c1021 addu v0,v0,t4 > 8021e260: 004c182b sltu v1,v0,t4 > 8021e264: 00431021 addu v0,v0,v1 > 8021e268: 8c880010 lw t0,16(a0) > 8021e26c: 8c890014 lw t1,20(a0) > 8021e270: 8c8b0018 lw t3,24(a0) > 8021e274: 8c8c001c lw t4,28(a0) > 8021e278: 00481021 addu v0,v0,t0 > 8021e27c: 0048182b sltu v1,v0,t0 > 8021e280: 00431021 addu v0,v0,v1 > 8021e284: 00491021 addu v0,v0,t1 > 8021e288: 0049182b sltu v1,v0,t1 > 8021e28c: 00431021 addu v0,v0,v1 > 8021e290: 004b1021 addu v0,v0,t3 > 8021e294: 004b182b sltu v1,v0,t3 > 8021e298: 00431021 addu v0,v0,v1 > 8021e29c: 004c1021 addu v0,v0,t4 > 8021e2a0: 004c182b sltu v1,v0,t4 > 8021e2a4: 00431021 addu v0,v0,v1 > 8021e2a8: 30b8001c andi t8,a1,0x1c > 8021e2ac: 24840020 addiu a0,a0,32 > > > > > From ralf@linux-mips.org Mon Apr 3 11:31:16 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 03 Apr 2006 11:31:25 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:17803 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133644AbWDCKbQ (ORCPT ); Mon, 3 Apr 2006 11:31:16 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k33AgI7L006132; Mon, 3 Apr 2006 11:42:18 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k33AgF1p006131; Mon, 3 Apr 2006 11:42:15 +0100 Date: Mon, 3 Apr 2006 11:42:15 +0100 From: Ralf Baechle To: Chuck Meade Cc: linux-mips@linux-mips.org Subject: Re: corruption of load instruction offset Message-ID: <20060403104215.GA3150@linux-mips.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11013 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Mon, Apr 03, 2006 at 12:12:46AM -0400, Chuck Meade wrote: > I am seeing a very interesting/worrisome bug on an RM7965 cpu, which has > an E9000 core. I am running 2.6.14-rc1. Please take a look at the > behavior I describe and send me your thoughts. Thanks. Well, 2.6.14-rc1. The -rc1 part says it already. While the rc may stand for release candidate, they -rc1 kernels are definatly far from ready for a release. All the new features for the 2.6.14 but hardly any of the fixes. I really suggest you go either for 2.6.13 or upgrade to 2.6.14. Talking about upgrading, 2.6.16.1 is a good vintage for MIPS so far. Aside of this more general warning about -rc but especially -rc1 kernels I think the remainder of your analysis is correct ... Ralf From giometti@enneenne.com Mon Apr 3 14:43:39 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 03 Apr 2006 14:43:50 +0100 (BST) Received: from 81-174-11-161.f5.ngi.it ([81.174.11.161]:49359 "EHLO goldrake.enneenne.com") by ftp.linux-mips.org with ESMTP id S8133659AbWDCNnj (ORCPT ); Mon, 3 Apr 2006 14:43:39 +0100 Received: from zaigor.enneenne.com ([192.168.32.1]) by goldrake.enneenne.com with esmtp (Exim 4.50) id 1FQPTe-0006bX-W7 for linux-mips@linux-mips.org; Mon, 03 Apr 2006 15:52:19 +0200 Received: from giometti by zaigor.enneenne.com with local (Exim 4.60) (envelope-from ) id 1FQPW5-0000d5-Fd for linux-mips@linux-mips.org; Mon, 03 Apr 2006 15:54:49 +0200 Date: Mon, 3 Apr 2006 15:54:49 +0200 From: Rodolfo Giometti To: Linux MIPS Message-ID: <20060403135449.GQ7029@enneenne.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="bJ3jXuwtxrXxD2iT" Content-Disposition: inline Organization: GNU/Linux Device Drivers, Embedded Systems and Courses X-PGP-Key: gpg --keyserver keyserver.linux.it --recv-keys D25A5633 User-Agent: Mutt/1.5.11+cvs20060126 X-SA-Exim-Connect-IP: 192.168.32.1 X-SA-Exim-Mail-From: giometti@enneenne.com Subject: [PATCH] Au1xxx Sleeping functions for 2.6 X-SA-Exim-Version: 4.2 (built Thu, 03 Mar 2005 10:44:12 +0100) X-SA-Exim-Scanned: Yes (on goldrake.enneenne.com) Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11014 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: giometti@linux.it Precedence: bulk X-list: linux-mips --bJ3jXuwtxrXxD2iT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello, here a patch against Linuxmips-2.6.15 to fix the sleeping functions for CPUs au1xxx. Currently the sleep mode works but a lot of internal peripherals' drivers miss the power management functions so is possibile that the kernel hangs at wake up if some internal peripherals other than the first serial line is enabled (expecially for the ethernet)! However I'm working for a full support of sleep mode and I hope to be able to send a patch to fix this in the near future... Ciao, Rodolfo -- GNU/Linux Solutions e-mail: giometti@enneenne.com Linux Device Driver giometti@gnudd.com Embedded Systems giometti@linux.it UNIX programming phone: +39 349 2432127 --bJ3jXuwtxrXxD2iT Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-sleeper.S" --- /home/develop/embedded/mips/linux/linux-mips.git/arch/mips/au1000/common/sleeper.S 2006-03-31 16:57:26.000000000 +0200 +++ arch/mips/au1000/common/sleeper.S 2006-03-31 16:26:35.000000000 +0200 @@ -9,22 +9,54 @@ * Free Software Foundation; either version 2 of the License, or (at your * option) any later version. */ +#include #include #include #include #include #include +#include + +/* + * Note: This file is *not* conditional on CONFIG_PM since Alchemy sleep + * need not be tied to any particular power management scheme. + */ + + .extern __flush_cache_all .text - .set macro - .set noat .align 5 -/* Save all of the processor general registers and go to sleep. - * A wakeup condition will get us back here to restore the registers. +/* + * Save the processor general registers and go to sleep. A wakeup + * condition will get us back here to restore the registers. */ -LEAF(save_and_sleep) +/* still need to fix alignment issues here */ +save_and_sleep_frmsz = 48 +NESTED(save_and_sleep, save_and_sleep_frmsz, ra) + .set noreorder + .set nomacro + .set noat + subu sp, save_and_sleep_frmsz + sw ra, save_and_sleep_frmsz-4(sp) + sw s0, save_and_sleep_frmsz-8(sp) + sw s1, save_and_sleep_frmsz-12(sp) + sw s2, save_and_sleep_frmsz-16(sp) + sw s3, save_and_sleep_frmsz-20(sp) + sw s4, save_and_sleep_frmsz-24(sp) + sw s5, save_and_sleep_frmsz-28(sp) + sw s6, save_and_sleep_frmsz-32(sp) + sw s7, save_and_sleep_frmsz-36(sp) + sw s8, save_and_sleep_frmsz-40(sp) + sw gp, save_and_sleep_frmsz-44(sp) + + /* We only need to save the registers that the calling function + * hasn't saved for us. 0 is always zero. 8 - 15, 24 and 25 are + * temporaries and can be used without saving. 26 and 27 are reserved + * for interrupt/trap handling and expected to change. 29 is the + * stack pointer which is handled as a special case here. + */ subu sp, PT_SIZE sw $1, PT_R1(sp) sw $2, PT_R2(sp) @@ -33,14 +65,6 @@ sw $5, PT_R5(sp) sw $6, PT_R6(sp) sw $7, PT_R7(sp) - sw $8, PT_R8(sp) - sw $9, PT_R9(sp) - sw $10, PT_R10(sp) - sw $11, PT_R11(sp) - sw $12, PT_R12(sp) - sw $13, PT_R13(sp) - sw $14, PT_R14(sp) - sw $15, PT_R15(sp) sw $16, PT_R16(sp) sw $17, PT_R17(sp) sw $18, PT_R18(sp) @@ -49,32 +73,54 @@ sw $21, PT_R21(sp) sw $22, PT_R22(sp) sw $23, PT_R23(sp) - sw $24, PT_R24(sp) - sw $25, PT_R25(sp) - sw $26, PT_R26(sp) - sw $27, PT_R27(sp) sw $28, PT_R28(sp) - sw $29, PT_R29(sp) sw $30, PT_R30(sp) sw $31, PT_R31(sp) +#define PT_C0STATUS PT_LO +#define PT_CONTEXT PT_HI +#define PT_PAGEMASK PT_EPC +#define PT_CONFIG PT_BVADDR mfc0 k0, CP0_STATUS - sw k0, 0x20(sp) + sw k0, PT_C0STATUS(sp) // 0x20 mfc0 k0, CP0_CONTEXT - sw k0, 0x1c(sp) + sw k0, PT_CONTEXT(sp) // 0x1c mfc0 k0, CP0_PAGEMASK - sw k0, 0x18(sp) + sw k0, PT_PAGEMASK(sp) // 0x18 mfc0 k0, CP0_CONFIG - sw k0, 0x14(sp) + sw k0, PT_CONFIG(sp) // 0x14 + +#if 0 + /* Infinite loop to allow JTAG attach before sleep mode (debug only) + */ +2: li t1, 0 + beq t1, zero, 2b + nop +#endif + + .set macro + .set at + + li t0, SYS_SLPPWR + sw zero, 0(t0) /* Get the processor ready to sleep */ + sync /* Now set up the scratch registers so the boot rom will * return to this point upon wakeup. + * sys_scratch0 : SP + * sys_scratch1 : RA */ - la k0, 1f - lui k1, 0xb190 - ori k1, 0x18 - sw sp, 0(k1) - ori k1, 0x1c - sw k0, 0(k1) + li t0, SYS_SCRATCH0 + li t1, SYS_SCRATCH1 + sw sp, 0(t0) + la k0, resume_from_sleep + sw k0, 0(t1) + +/* Flush DCACHE to make sure context is in memory +*/ + la t1, __flush_cache_all /* _flush_cache_all is a function ptr */ + lw t0,0(t1) + jal t0 + nop /* Put SDRAM into self refresh. Preload instructions into cache, * issue a precharge, then auto refresh, then sleep commands to it. @@ -87,30 +133,74 @@ cache 0x14, 96(t0) .set mips0 + /* Put SDRAM to sleep */ sdsleep: - lui k0, 0xb400 - sw zero, 0x001c(k0) /* Precharge */ - sw zero, 0x0020(k0) /* Auto refresh */ - sw zero, 0x0030(k0) /* SDRAM sleep */ + li a0, MEM_PHYS_ADDR + or a0, a0, 0xA0000000 +#if defined(CONFIG_SOC_AU1000) || defined(CONFIG_SOC_AU1100) || defined(CONFIG_SOC_AU1500) + lw k0, MEM_SDMODE0(a0) + sw zero, MEM_SDPRECMD(a0) /* Precharge */ + sw zero, MEM_SDAUTOREF(a0) /* Auto Refresh */ + sw zero, MEM_SDSLEEP(a0) /* Sleep */ sync - - lui k1, 0xb190 - sw zero, 0x0078(k1) /* get ready to sleep */ +#endif +#if defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) + sw zero, MEM_SDPRECMD(a0) /* Precharge */ + sw zero, MEM_SDSREF(a0) + + #lw t0, MEM_SDSTAT(a0) + #and t0, t0, 0x01000000 + li t0, 0x01000000 +refresh_not_set: + lw t1, MEM_SDSTAT(a0) + and t2, t1, t0 + beq zero, t2, refresh_not_set + nop + + li t0, ~0x30000000 + lw t1, MEM_SDCONFIGA(a0) + and t1, t0, t1 + sw t1, MEM_SDCONFIGA(a0) sync - sw zero, 0x007c(k1) /* Put processor to sleep */ +#endif + + li t0, SYS_SLEEP + sw zero, 0(t0) /* Put processor to sleep */ sync + nop + nop + nop + nop + nop + nop + nop + nop /* This is where we return upon wakeup. * Reload all of the registers and return. */ -1: nop - lw k0, 0x20(sp) +resume_from_sleep: + nop + .set nomacro + .set noat + +#if 0 + /* Infinite loop to allow JTAG attach before sleep mode (debug only) + */ +2: li t1, 0 + beq t1, zero, 2b + nop +#endif + + /* Restore CPU registers + */ + lw k0, PT_C0STATUS(sp) // 0x20 mtc0 k0, CP0_STATUS - lw k0, 0x1c(sp) + lw k0, PT_CONTEXT(sp) // 0x1c mtc0 k0, CP0_CONTEXT - lw k0, 0x18(sp) + lw k0, PT_PAGEMASK(sp) // 0x18 mtc0 k0, CP0_PAGEMASK - lw k0, 0x14(sp) + lw k0, PT_CONFIG(sp) // 0x14 mtc0 k0, CP0_CONFIG lw $1, PT_R1(sp) lw $2, PT_R2(sp) @@ -119,14 +209,6 @@ lw $5, PT_R5(sp) lw $6, PT_R6(sp) lw $7, PT_R7(sp) - lw $8, PT_R8(sp) - lw $9, PT_R9(sp) - lw $10, PT_R10(sp) - lw $11, PT_R11(sp) - lw $12, PT_R12(sp) - lw $13, PT_R13(sp) - lw $14, PT_R14(sp) - lw $15, PT_R15(sp) lw $16, PT_R16(sp) lw $17, PT_R17(sp) lw $18, PT_R18(sp) @@ -135,15 +217,37 @@ lw $21, PT_R21(sp) lw $22, PT_R22(sp) lw $23, PT_R23(sp) - lw $24, PT_R24(sp) - lw $25, PT_R25(sp) - lw $26, PT_R26(sp) - lw $27, PT_R27(sp) lw $28, PT_R28(sp) - lw $29, PT_R29(sp) lw $30, PT_R30(sp) lw $31, PT_R31(sp) + + .set macro + .set at + + /* Clear the wake source, but save it as the return value of the + function */ + li t0, SYS_WAKESRC + lw v0, 0(t0) + sw v0, PT_R2(sp) + sw zero, 0(t0) + addiu sp, PT_SIZE + lw gp, save_and_sleep_frmsz-44(sp) + lw s8, save_and_sleep_frmsz-40(sp) + lw s7, save_and_sleep_frmsz-36(sp) + lw s6, save_and_sleep_frmsz-32(sp) + lw s5, save_and_sleep_frmsz-28(sp) + lw s4, save_and_sleep_frmsz-24(sp) + lw s3, save_and_sleep_frmsz-20(sp) + lw s2, save_and_sleep_frmsz-16(sp) + lw s1, save_and_sleep_frmsz-12(sp) + lw s0, save_and_sleep_frmsz-8(sp) + lw ra, save_and_sleep_frmsz-4(sp) + + addu sp, save_and_sleep_frmsz jr ra + nop + .set reorder END(save_and_sleep) + --bJ3jXuwtxrXxD2iT-- From chuckmeade@mindspring.com Mon Apr 3 15:25:09 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 03 Apr 2006 15:25:19 +0100 (BST) Received: from njbrsmtp1.vzwmail.net ([66.174.76.155]:61169 "EHLO njbrsmtp1.vzwmail.net") by ftp.linux-mips.org with ESMTP id S8133659AbWDCOZJ (ORCPT ); Mon, 3 Apr 2006 15:25:09 +0100 Received: from squidward (smtp.vzwmail.net [66.174.76.25]) (authenticated bits=0) by njbrsmtp1.vzwmail.net (8.12.9/8.12.9) with ESMTP id k33Ea2Lv019502; Mon, 3 Apr 2006 14:36:04 GMT From: "Chuck Meade" To: Cc: "Chuck Meade \(mindspring\)" Subject: RE: corruption of load instruction offset Date: Mon, 3 Apr 2006 10:37:40 -0400 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook IMO, Build 9.0.2416 (9.0.2910.0) x-mimeole: Produced By Microsoft MimeOLE V6.00.2800.1106 In-Reply-To: <000f01c656ef$d2963670$10eca8c0@grendel> Importance: Normal Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11015 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: chuckmeade@mindspring.com Precedence: bulk X-list: linux-mips Hi, > That's pretty twisted - one could almost believe that the fetch from > 0x8021e28c got corrupted to pick up the most significant 16 bits > of the instruction at 0x8021e22c or 0x8021e26c - but given that > instructions are fetched and issued word-by-word, it's hard to see > where that could happen, in either CPU hardware or software. > What is the I-cache line size? If it were me, I'd check my clocks, > voltages, and above all my RAM timing, and I'd re-seat my CPU > and RAM in their sockets... I agree that it is twisted. The I-cache line size is 32 bytes by the way. I left it running overnight and got a different error. Slightly harder to pinpoint the exact instruction that caused the actual bad load, because the failing instruction is loading indirect thru a register that is set to 0000fac4. So the bad load was done previously, and resulted in this register (a1) being set to 0000fac4. The common theme here seems to be that I am getting a bad 16-bits of RAM when loading... First error that I mentioned last night was an instruction load, and this new error looks more to me like a data load, since a1 was previously loaded with a bogus value 0000fac4. Another bad 16-bit load in the most significant 16-bits. So if my analysis is correct, the most significant 16 bits is loading flaky, both for instructions and for data loads. This points to some of the lower level issues you mention -- physical RAM interface, clocking, voltages, and RAM timing setup. If anyone can think of something else I should check, let me know. Thanks again for the feedback. Also Ralf, I got your message about the 2.6.14-rc1 version loud and clear. Thanks to you too for the feedback. Chuck From yoichi_yuasa@tripeaks.co.jp Tue Apr 4 02:11:21 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 04 Apr 2006 02:11:35 +0100 (BST) Received: from mo00.po.2iij.net ([210.130.202.204]:32507 "EHLO mo00.po.2iij.net") by ftp.linux-mips.org with ESMTP id S8133791AbWDDBLV (ORCPT ); Tue, 4 Apr 2006 02:11:21 +0100 Received: NPO MO00 id k341MNau027255; Tue, 4 Apr 2006 10:22:23 +0900 (JST) Received: from localhost.localdomain (65.126.232.202.bf.2iij.net [202.232.126.65]) by mbox.po.2iij.net (NPO-MR/mbox01) id k341MLbC014680 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NOT) for ; Tue, 4 Apr 2006 10:22:22 +0900 (JST) Date: Tue, 4 Apr 2006 10:22:21 +0900 From: Yoichi Yuasa To: linux-mips@linux-mips.org Subject: build error about current git Message-Id: <20060404102221.5280f199.yoichi_yuasa@tripeaks.co.jp> Organization: TriPeaks Corporation X-Mailer: Sylpheed version 1.0.4 (GTK+ 1.2.10; i386-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-Envid: tripeaks.co.jp Envelope-Id: tripeaks.co.jp X-archive-position: 11016 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: yoichi_yuasa@tripeaks.co.jp Precedence: bulk X-list: linux-mips Hi, I got the following error, when I built the kernel using current git. Yoichi $ make tb0287_defconfig . . . gcc: 0: No such file or directory gcc: unrecognized option `-G' gcc: unrecognized option `-EL' cc1: error: invalid option `no-abicalls' $ make gcc: 0: No such file or directory gcc: unrecognized option `-G' gcc: unrecognized option `-EL' cc1: error: invalid option `no-abicalls' CHK include/linux/version.h HOSTCC scripts/basic/fixdep HOSTCC scripts/basic/split-include HOSTCC scripts/basic/docproc HOSTCC scripts/kconfig/conf.o HOSTCC scripts/kconfig/kxgettext.o HOSTCC scripts/kconfig/mconf.o HOSTCC scripts/kconfig/zconf.tab.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf -s arch/mips/Kconfig # # using defaults found in .config # gcc: 0: No such file or directory gcc: unrecognized option `-G' gcc: unrecognized option `-EL' cc1: error: invalid option `no-abicalls' SPLIT include/linux/autoconf.h -> include/config/* CC arch/mips/kernel/asm-offsets.s gcc: cannot specify -o with -c or -S and multiple compilations make[1]: *** [arch/mips/kernel/asm-offsets.s] Error 1 make: *** [prepare0] Error 2 $ gcc -v Reading specs from /usr/lib/gcc-lib/i486-linux/3.3.5/specs Configured with: ../src/configure -v --enable-languages=c,c++,java,f77,pascal,objc,ada,treelang --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-gxx-include-dir=/usr/include/c++/3.3 --enable-shared --enable-__cxa_atexit --with-system-zlib --enable-nls --without-included-gettext --enable-clocale=gnu --enable-debug --enable-java-gc=boehm --enable-java-awt=xlib --enable-objc-gc i486-linux Thread model: posix gcc version 3.3.5 (Debian 1:3.3.5-13) From geoman@gentoo.org Tue Apr 4 02:53:09 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 04 Apr 2006 02:53:18 +0100 (BST) Received: from lennier.cc.vt.edu ([198.82.162.213]:2272 "EHLO lennier.cc.vt.edu") by ftp.linux-mips.org with ESMTP id S8133791AbWDDBxJ (ORCPT ); Tue, 4 Apr 2006 02:53:09 +0100 Received: from dagger.cc.vt.edu (IDENT:mirapoint@evil-dagger.cc.vt.edu [10.1.1.11]) by lennier.cc.vt.edu (8.12.11/8.12.11) with ESMTP id k34246MH006150; Mon, 3 Apr 2006 22:04:06 -0400 Received: from [192.168.1.2] (blacksburg-bsr1-69-170-32-128.chvlva.adelphia.net [69.170.32.128]) by dagger.cc.vt.edu (MOS 3.7.3a-GA) with ESMTP id FKT75696 (AUTH spbecker); Mon, 3 Apr 2006 22:04:05 -0400 (EDT) Message-ID: <4431D413.5050403@gentoo.org> Date: Mon, 03 Apr 2006 22:04:03 -0400 From: "Stephen P. Becker" User-Agent: Mail/News 1.5 (X11/20060324) MIME-Version: 1.0 To: Yoichi Yuasa CC: linux-mips@linux-mips.org Subject: Re: build error about current git References: <20060404102221.5280f199.yoichi_yuasa@tripeaks.co.jp> In-Reply-To: <20060404102221.5280f199.yoichi_yuasa@tripeaks.co.jp> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11017 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: geoman@gentoo.org Precedence: bulk X-list: linux-mips Yoichi Yuasa wrote: > Hi, > > I got the following error, when I built the kernel using current git. > > Yoichi Why don't you take a closer look at the output of "gcc -v" which you pasted below, and then you tell us why your x86 toolchain can't build a mips kernel. -Steve > $ gcc -v > Reading specs from /usr/lib/gcc-lib/i486-linux/3.3.5/specs > Configured with: ../src/configure -v --enable-languages=c,c++,java,f77,pascal,objc,ada,treelang --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-gxx-include-dir=/usr/include/c++/3.3 --enable-shared --enable-__cxa_atexit --with-system-zlib --enable-nls --without-included-gettext --enable-clocale=gnu --enable-debug --enable-java-gc=boehm --enable-java-awt=xlib --enable-objc-gc i486-linux > Thread model: posix > gcc version 3.3.5 (Debian 1:3.3.5-13) > > > From yoichi_yuasa@tripeaks.co.jp Tue Apr 4 04:41:42 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 04 Apr 2006 04:41:53 +0100 (BST) Received: from mo00.po.2iij.net ([210.130.202.204]:52702 "EHLO mo00.po.2iij.net") by ftp.linux-mips.org with ESMTP id S8126537AbWDDDlm (ORCPT ); Tue, 4 Apr 2006 04:41:42 +0100 Received: NPO MO00 id k343qiiv011817; Tue, 4 Apr 2006 12:52:44 +0900 (JST) Received: from localhost.localdomain (65.126.232.202.bf.2iij.net [202.232.126.65]) by mbox.po.2iij.net (NPO-MR/mbox01) id k343qgRw005816 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NOT); Tue, 4 Apr 2006 12:52:43 +0900 (JST) Date: Tue, 4 Apr 2006 12:52:42 +0900 From: Yoichi Yuasa To: "Stephen P. Becker" Cc: yoichi_yuasa@tripeaks.co.jp, linux-mips@linux-mips.org Subject: Re: build error about current git Message-Id: <20060404125242.4c5b1f1c.yoichi_yuasa@tripeaks.co.jp> In-Reply-To: <4431D413.5050403@gentoo.org> References: <20060404102221.5280f199.yoichi_yuasa@tripeaks.co.jp> <4431D413.5050403@gentoo.org> Organization: TriPeaks Corporation X-Mailer: Sylpheed version 1.0.4 (GTK+ 1.2.10; i386-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-Envid: tripeaks.co.jp Envelope-Id: tripeaks.co.jp X-archive-position: 11018 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: yoichi_yuasa@tripeaks.co.jp Precedence: bulk X-list: linux-mips Hi, On Mon, 03 Apr 2006 22:04:03 -0400 "Stephen P. Becker" wrote: > Yoichi Yuasa wrote: > > Hi, > > > > I got the following error, when I built the kernel using current git. > > > > Yoichi > > Why don't you take a closer look at the output of "gcc -v" which you > pasted below, and then you tell us why your x86 toolchain can't build a > mips kernel. Because, the first error occurs in using HOSTCC. mips toolchain is $ mipsel-linux-gcc -v Reading specs from /usr/local/cross/lib/gcc-lib/mipsel-linux/3.3.2/specs Configured with: ../gcc-3.3.2/configure --target=mipsel-linux --prefix=/usr/local/cross --enable-languages=c --without-headers --disable-shared --disable-threads : (reconfigured) ../gcc-3.3.2/configure --target=mipsel-linux --prefix=/usr/local/cross --enable-languages=c --without-headers --disable-shared --disable-threads : (reconfigured) ../gcc-3.3.2/configure --target=mipsel-linux --prefix=/usr/local/cross --enable-languages=c --without-headers --disable-shared --disable-threads : (reconfigured) ../gcc-3.3.2/configure --target=mipsel-linux --prefix=/usr/local/cross --enable-languages=c --disable-shared Thread model: posix gcc version 3.3.2 Yoichi From anemo@mba.ocn.ne.jp Tue Apr 4 05:00:44 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 04 Apr 2006 05:01:03 +0100 (BST) Received: from topsns2.toshiba-tops.co.jp ([202.230.225.126]:25572 "EHLO topsns2.toshiba-tops.co.jp") by ftp.linux-mips.org with ESMTP id S8126537AbWDDEAo (ORCPT ); Tue, 4 Apr 2006 05:00:44 +0100 Received: from topsms.toshiba-tops.co.jp by topsns2.toshiba-tops.co.jp via smtpd (for ftp.linux-mips.org [194.74.144.162]) with ESMTP; Tue, 4 Apr 2006 13:11:48 +0900 Received: from topsms.toshiba-tops.co.jp (localhost.localdomain [127.0.0.1]) by localhost.toshiba-tops.co.jp (Postfix) with ESMTP id 7D1E720552; Tue, 4 Apr 2006 13:11:46 +0900 (JST) Received: from srd2sd.toshiba-tops.co.jp (srd2sd.toshiba-tops.co.jp [172.17.28.2]) by topsms.toshiba-tops.co.jp (Postfix) with ESMTP id 711FF713A; Tue, 4 Apr 2006 13:11:46 +0900 (JST) Received: from localhost (fragile [172.17.28.65]) by srd2sd.toshiba-tops.co.jp (8.12.10/8.12.10) with ESMTP id k344Bj4D019812; Tue, 4 Apr 2006 13:11:46 +0900 (JST) (envelope-from anemo@mba.ocn.ne.jp) Date: Tue, 04 Apr 2006 13:11:45 +0900 (JST) Message-Id: <20060404.131145.130849545.nemoto@toshiba-tops.co.jp> To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org Subject: [PATCH] Enable SCHED_NO_NO_OMIT_FRAME_POINTER for MIPS. From: Atsushi Nemoto X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11019 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips MIPS get_wchan() no longer requires -fno-omit-frame-pointer. Signed-off-by: Atsushi Nemoto Kconfig | 4 ++++ configs/atlas_defconfig | 1 + configs/bigsur_defconfig | 1 + configs/capcella_defconfig | 1 + configs/cobalt_defconfig | 1 + configs/db1000_defconfig | 1 + configs/db1100_defconfig | 1 + configs/db1200_defconfig | 1 + configs/db1500_defconfig | 1 + configs/db1550_defconfig | 1 + configs/ddb5476_defconfig | 1 + configs/ddb5477_defconfig | 1 + configs/decstation_defconfig | 1 + configs/e55_defconfig | 1 + configs/ev64120_defconfig | 1 + configs/ev96100_defconfig | 1 + configs/ip22_defconfig | 1 + configs/ip27_defconfig | 1 + configs/ip32_defconfig | 1 + configs/it8172_defconfig | 1 + configs/ivr_defconfig | 1 + configs/jaguar-atx_defconfig | 1 + configs/jmr3927_defconfig | 1 + configs/lasat200_defconfig | 1 + configs/malta_defconfig | 1 + configs/mipssim_defconfig | 1 + configs/mpc30x_defconfig | 1 + configs/ocelot_3_defconfig | 1 + configs/ocelot_c_defconfig | 1 + configs/ocelot_defconfig | 1 + configs/ocelot_g_defconfig | 1 + configs/pb1100_defconfig | 1 + configs/pb1500_defconfig | 1 + configs/pb1550_defconfig | 1 + configs/pnx8550-jbs_defconfig | 1 + configs/pnx8550-v2pci_defconfig | 1 + configs/qemu_defconfig | 1 + configs/rbhma4500_defconfig | 1 + configs/rm200_defconfig | 1 + configs/sb1250-swarm_defconfig | 1 + configs/sead_defconfig | 1 + configs/tb0226_defconfig | 1 + configs/tb0229_defconfig | 1 + configs/tb0287_defconfig | 1 + configs/workpad_defconfig | 1 + configs/yosemite_defconfig | 1 + defconfig | 1 + 47 files changed, 50 insertions(+) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index ed52af7..c4d66ba 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -813,6 +813,10 @@ config GENERIC_CALIBRATE_DELAY bool default y +config SCHED_NO_NO_OMIT_FRAME_POINTER + bool + default y + # # Select some configuration options automatically based on user selections. # diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig index 9e1ae95..80da9c8 100644 --- a/arch/mips/configs/atlas_defconfig +++ b/arch/mips/configs/atlas_defconfig @@ -65,6 +65,7 @@ CONFIG_MIPS_ATLAS=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_MIPS_BONITO64=y diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index 3298410..05566a2 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig @@ -81,6 +81,7 @@ CONFIG_SIBYTE_CFE=y # CONFIG_SIBYTE_TBPROF is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_COHERENT=y CONFIG_CPU_BIG_ENDIAN=y # CONFIG_CPU_LITTLE_ENDIAN is not set diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig index 6c2961a..a69dafb 100644 --- a/arch/mips/configs/capcella_defconfig +++ b/arch/mips/configs/capcella_defconfig @@ -73,6 +73,7 @@ CONFIG_PCI_VR41XX=y # CONFIG_VRC4173 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig index 8336b21..6a4940b 100644 --- a/arch/mips/configs/cobalt_defconfig +++ b/arch/mips/configs/cobalt_defconfig @@ -65,6 +65,7 @@ CONFIG_MIPS_COBALT=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_I8259=y diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig index 7f07140..6d7bcc0 100644 --- a/arch/mips/configs/db1000_defconfig +++ b/arch/mips/configs/db1000_defconfig @@ -65,6 +65,7 @@ CONFIG_MIPS_DB1000=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig index 98590ca..acd2ffe 100644 --- a/arch/mips/configs/db1100_defconfig +++ b/arch/mips/configs/db1100_defconfig @@ -65,6 +65,7 @@ CONFIG_MIPS_DB1100=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig index 9288847..d918754 100644 --- a/arch/mips/configs/db1200_defconfig +++ b/arch/mips/configs/db1200_defconfig @@ -65,6 +65,7 @@ CONFIG_MIPS_DB1200=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_COHERENT=y CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig index 5a415b1..5491a51 100644 --- a/arch/mips/configs/db1500_defconfig +++ b/arch/mips/configs/db1500_defconfig @@ -65,6 +65,7 @@ CONFIG_MIPS_DB1500=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig index 8dc1f18..425d939 100644 --- a/arch/mips/configs/db1550_defconfig +++ b/arch/mips/configs/db1550_defconfig @@ -65,6 +65,7 @@ CONFIG_MIPS_DB1550=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig index 8fae63e..4837b3c 100644 --- a/arch/mips/configs/ddb5476_defconfig +++ b/arch/mips/configs/ddb5476_defconfig @@ -65,6 +65,7 @@ CONFIG_DDB5476=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_I8259=y diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig index a0fcd44..e3a3786 100644 --- a/arch/mips/configs/ddb5477_defconfig +++ b/arch/mips/configs/ddb5477_defconfig @@ -66,6 +66,7 @@ CONFIG_DDB5477=y CONFIG_DDB5477_BUS_FREQUENCY=0 CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_I8259=y diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig index 5a181ea..b5b44a8 100644 --- a/arch/mips/configs/decstation_defconfig +++ b/arch/mips/configs/decstation_defconfig @@ -65,6 +65,7 @@ CONFIG_MACH_DECSTATION=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_EARLY_PRINTK=y diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig index 8fbfc06..263cc38 100644 --- a/arch/mips/configs/e55_defconfig +++ b/arch/mips/configs/e55_defconfig @@ -71,6 +71,7 @@ CONFIG_CASIO_E55=y # CONFIG_ZAO_CAPCELLA is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig index f2d43be..e0d7e07 100644 --- a/arch/mips/configs/ev64120_defconfig +++ b/arch/mips/configs/ev64120_defconfig @@ -66,6 +66,7 @@ CONFIG_MIPS_EV64120=y # CONFIG_EVB_PCI1 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_CPU_BIG_ENDIAN=y diff --git a/arch/mips/configs/ev96100_defconfig b/arch/mips/configs/ev96100_defconfig index ac5841c..095bfe3 100644 --- a/arch/mips/configs/ev96100_defconfig +++ b/arch/mips/configs/ev96100_defconfig @@ -65,6 +65,7 @@ CONFIG_MIPS_EV96100=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_CPU_BIG_ENDIAN=y diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index 42d5cd7..f66ba91 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig @@ -65,6 +65,7 @@ CONFIG_SGI_IP22=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_ARC=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 8c40590..33f18c6 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig @@ -71,6 +71,7 @@ CONFIG_NUMA=y # CONFIG_REPLICATE_EXHANDLERS is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_ARC=y CONFIG_DMA_IP27=y CONFIG_CPU_BIG_ENDIAN=y diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index 7fdcaf5..2b8f223 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig @@ -65,6 +65,7 @@ CONFIG_SGI_IP32=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_ARC=y CONFIG_DMA_IP32=y CONFIG_DMA_NONCOHERENT=y diff --git a/arch/mips/configs/it8172_defconfig b/arch/mips/configs/it8172_defconfig index c716996..a5ac713 100644 --- a/arch/mips/configs/it8172_defconfig +++ b/arch/mips/configs/it8172_defconfig @@ -66,6 +66,7 @@ CONFIG_MIPS_ITE8172=y # CONFIG_IT8172_REVC is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/ivr_defconfig b/arch/mips/configs/ivr_defconfig index a8376d1..3cf9750 100644 --- a/arch/mips/configs/ivr_defconfig +++ b/arch/mips/configs/ivr_defconfig @@ -65,6 +65,7 @@ CONFIG_MIPS_IVR=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig index 3160153..9f6303d 100644 --- a/arch/mips/configs/jaguar-atx_defconfig +++ b/arch/mips/configs/jaguar-atx_defconfig @@ -66,6 +66,7 @@ CONFIG_MOMENCO_JAGUAR_ATX=y CONFIG_JAGUAR_DMALOW=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_LIMITED_DMA=y diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig index 53fbef1..a2ce2e1 100644 --- a/arch/mips/configs/jmr3927_defconfig +++ b/arch/mips/configs/jmr3927_defconfig @@ -65,6 +65,7 @@ CONFIG_TOSHIBA_JMR3927=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_CPU_BIG_ENDIAN=y diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig index ef0fa9f..d742529 100644 --- a/arch/mips/configs/lasat200_defconfig +++ b/arch/mips/configs/lasat200_defconfig @@ -69,6 +69,7 @@ CONFIG_DS1603=y CONFIG_LASAT_SYSCTL=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_MIPS_NILE4=y diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 367d279..50c8679 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig @@ -65,6 +65,7 @@ CONFIG_MIPS_MALTA=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig index fe78961..4b3342c 100644 --- a/arch/mips/configs/mipssim_defconfig +++ b/arch/mips/configs/mipssim_defconfig @@ -65,6 +65,7 @@ CONFIG_MIPS_SIM=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig index e4620e7..3e75368 100644 --- a/arch/mips/configs/mpc30x_defconfig +++ b/arch/mips/configs/mpc30x_defconfig @@ -73,6 +73,7 @@ CONFIG_PCI_VR41XX=y CONFIG_VRC4173=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig index 925d8ad..4197ac3 100644 --- a/arch/mips/configs/ocelot_3_defconfig +++ b/arch/mips/configs/ocelot_3_defconfig @@ -65,6 +65,7 @@ CONFIG_MOMENCO_OCELOT_3=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_CPU_BIG_ENDIAN=y diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig index ee1cf9b..da777cb 100644 --- a/arch/mips/configs/ocelot_c_defconfig +++ b/arch/mips/configs/ocelot_c_defconfig @@ -65,6 +65,7 @@ CONFIG_MOMENCO_OCELOT_C=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_CPU_BIG_ENDIAN=y diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig index d80ff27..9ff6ab5 100644 --- a/arch/mips/configs/ocelot_defconfig +++ b/arch/mips/configs/ocelot_defconfig @@ -65,6 +65,7 @@ CONFIG_MOMENCO_OCELOT=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_CPU_BIG_ENDIAN=y diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig index c0f508d..7df9ce9 100644 --- a/arch/mips/configs/ocelot_g_defconfig +++ b/arch/mips/configs/ocelot_g_defconfig @@ -65,6 +65,7 @@ CONFIG_MOMENCO_OCELOT_G=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_CPU_BIG_ENDIAN=y diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig index 194b3c7..fc28746 100644 --- a/arch/mips/configs/pb1100_defconfig +++ b/arch/mips/configs/pb1100_defconfig @@ -65,6 +65,7 @@ CONFIG_MIPS_PB1100=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig index 8985725..a09be54 100644 --- a/arch/mips/configs/pb1500_defconfig +++ b/arch/mips/configs/pb1500_defconfig @@ -65,6 +65,7 @@ CONFIG_MIPS_PB1500=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig index adbf997..b8bcbc2 100644 --- a/arch/mips/configs/pb1550_defconfig +++ b/arch/mips/configs/pb1550_defconfig @@ -65,6 +65,7 @@ CONFIG_MIPS_PB1550=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig index b5db700..91ff3ba 100644 --- a/arch/mips/configs/pnx8550-jbs_defconfig +++ b/arch/mips/configs/pnx8550-jbs_defconfig @@ -65,6 +65,7 @@ CONFIG_PNX8550_JBS=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig index 4187287..932c803 100644 --- a/arch/mips/configs/pnx8550-v2pci_defconfig +++ b/arch/mips/configs/pnx8550-v2pci_defconfig @@ -65,6 +65,7 @@ CONFIG_PNX8550_V2PCI=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig index 31f5afa..0d3ce64 100644 --- a/arch/mips/configs/qemu_defconfig +++ b/arch/mips/configs/qemu_defconfig @@ -65,6 +65,7 @@ CONFIG_QEMU=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_COHERENT=y CONFIG_GENERIC_ISA_DMA=y CONFIG_I8259=y diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig index b126f76..0ad74a5 100644 --- a/arch/mips/configs/rbhma4500_defconfig +++ b/arch/mips/configs/rbhma4500_defconfig @@ -72,6 +72,7 @@ CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61=y # CONFIG_TOSHIBA_RBTX4938_MPLEX_ATA is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_GENERIC_ISA_DMA=y diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig index 463ed3d..fab27fe 100644 --- a/arch/mips/configs/rm200_defconfig +++ b/arch/mips/configs/rm200_defconfig @@ -65,6 +65,7 @@ CONFIG_SNI_RM200_PCI=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_ARC=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_DMA_NONCOHERENT=y diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index da68c3f..9060622 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig @@ -82,6 +82,7 @@ CONFIG_SIBYTE_CFE=y # CONFIG_SIBYTE_TBPROF is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_COHERENT=y CONFIG_CPU_BIG_ENDIAN=y # CONFIG_CPU_LITTLE_ENDIAN is not set diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig index 9a936d7..de02881 100644 --- a/arch/mips/configs/sead_defconfig +++ b/arch/mips/configs/sead_defconfig @@ -65,6 +65,7 @@ CONFIG_MIPS_SEAD=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index c2dee0d..8f4f06c 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_defconfig @@ -75,6 +75,7 @@ CONFIG_PCI_VR41XX=y # CONFIG_VRC4173 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig index be99261..5f54e27 100644 --- a/arch/mips/configs/tb0229_defconfig +++ b/arch/mips/configs/tb0229_defconfig @@ -75,6 +75,7 @@ CONFIG_PCI_VR41XX=y # CONFIG_VRC4173 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig index 8a1e3ac..fe3ba4f 100644 --- a/arch/mips/configs/tb0287_defconfig +++ b/arch/mips/configs/tb0287_defconfig @@ -75,6 +75,7 @@ CONFIG_PCI_VR41XX=y # CONFIG_VRC4173 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig index 7132e29..bd5bd46 100644 --- a/arch/mips/configs/workpad_defconfig +++ b/arch/mips/configs/workpad_defconfig @@ -71,6 +71,7 @@ CONFIG_IBM_WORKPAD=y # CONFIG_ZAO_CAPCELLA is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y # CONFIG_CPU_BIG_ENDIAN is not set diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig index 6745785..2c0c25e 100644 --- a/arch/mips/configs/yosemite_defconfig +++ b/arch/mips/configs/yosemite_defconfig @@ -66,6 +66,7 @@ CONFIG_PMC_YOSEMITE=y # CONFIG_HYPERTRANSPORT is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_COHERENT=y CONFIG_CPU_BIG_ENDIAN=y # CONFIG_CPU_LITTLE_ENDIAN is not set diff --git a/arch/mips/defconfig b/arch/mips/defconfig index 42d5cd7..f66ba91 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig @@ -65,6 +65,7 @@ CONFIG_SGI_IP22=y # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_ARC=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y From anemo@mba.ocn.ne.jp Tue Apr 4 09:23:12 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 04 Apr 2006 09:23:26 +0100 (BST) Received: from topsns2.toshiba-tops.co.jp ([202.230.225.126]:47026 "EHLO topsns2.toshiba-tops.co.jp") by ftp.linux-mips.org with ESMTP id S8133418AbWDDIXM (ORCPT ); Tue, 4 Apr 2006 09:23:12 +0100 Received: from topsms.toshiba-tops.co.jp by topsns2.toshiba-tops.co.jp via smtpd (for ftp.linux-mips.org [194.74.144.162]) with ESMTP; Tue, 4 Apr 2006 17:34:17 +0900 Received: from topsms.toshiba-tops.co.jp (localhost.localdomain [127.0.0.1]) by localhost.toshiba-tops.co.jp (Postfix) with ESMTP id BA77F20552; Tue, 4 Apr 2006 17:34:15 +0900 (JST) Received: from srd2sd.toshiba-tops.co.jp (srd2sd.toshiba-tops.co.jp [172.17.28.2]) by topsms.toshiba-tops.co.jp (Postfix) with ESMTP id AEAE720445; Tue, 4 Apr 2006 17:34:15 +0900 (JST) Received: from localhost (fragile [172.17.28.65]) by srd2sd.toshiba-tops.co.jp (8.12.10/8.12.10) with ESMTP id k348YE4D021114; Tue, 4 Apr 2006 17:34:15 +0900 (JST) (envelope-from anemo@mba.ocn.ne.jp) Date: Tue, 04 Apr 2006 17:34:14 +0900 (JST) Message-Id: <20060404.173414.108982133.nemoto@toshiba-tops.co.jp> To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org Subject: [PATCH] tx49_blast_icache32_page_indexed fix From: Atsushi Nemoto X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11020 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips Fix an index value in tx49_blast_icache32_page_indexed(). This is a damage by 13acfa3fdef15edaa4f5444c68e28e05978afa08 commit. Signed-off-by: Atsushi Nemoto diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 32b7f6a..c4c2084 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c @@ -154,7 +154,8 @@ static inline void blast_icache32_r4600_ static inline void tx49_blast_icache32_page_indexed(unsigned long page) { - unsigned long start = page; + unsigned long indexmask = current_cpu_data.icache.waysize - 1; + unsigned long start = INDEX_BASE + (page & indexmask); unsigned long end = start + PAGE_SIZE; unsigned long ws_inc = 1UL << current_cpu_data.icache.waybit; unsigned long ws_end = current_cpu_data.icache.ways << From ydgoo9@gmail.com Tue Apr 4 09:40:31 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 04 Apr 2006 09:40:39 +0100 (BST) Received: from nproxy.gmail.com ([64.233.182.185]:48112 "EHLO nproxy.gmail.com") by ftp.linux-mips.org with ESMTP id S8133433AbWDDIkb convert rfc822-to-8bit (ORCPT ); Tue, 4 Apr 2006 09:40:31 +0100 Received: by nproxy.gmail.com with SMTP id p77so1106470nfc for ; Tue, 04 Apr 2006 01:51:38 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition; b=oAXOEcUcdDRyTnV5roUTSEd3fpqp4c3CpurMKKpX9wU+VbCPTZCLI21rW4UA+KZReTYbiLyHs5h0y+v5ahr4+2L5pDDv62dpKasrDkhrPyZxYLgD261pzei+AvzgYVfY8l7sNi/kXt4qB4KBgVMHgwEDJhKs7oTZDTWR0GznBH0= Received: by 10.49.32.7 with SMTP id k7mr232378nfj; Tue, 04 Apr 2006 01:51:38 -0700 (PDT) Received: by 10.48.241.10 with HTTP; Tue, 4 Apr 2006 01:51:38 -0700 (PDT) Message-ID: <38dc7fce0604040151l4bbe5c1tb511cc0ca96e598d@mail.gmail.com> Date: Tue, 4 Apr 2006 17:51:38 +0900 From: "Youngduk Goo" To: linux-mips@linux-mips.org Subject: JFFS2 error.(SMP8634) MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Content-Disposition: inline Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11021 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ydgoo9@gmail.com Precedence: bulk X-list: linux-mips Hello, all I am porting the linux 2.6.15 to the SMP8634(SOC based on the MIPS 4 Kec , Sigma Design). The booting and mount the rootfilesystem is fine with JFFS2. But When I try to write the file more than 4KB,It makes error like "Data CRC a81daeb5 != calculated CRC 349cadd9 for node at 0093bc64" But the file smaller tha 4KB, it is OK. My Flash is S29GL512N or S29GL256N from spansion. If you have a experience about the SMP8634, please share the information with me. or any other advice about the Flash, JFFS2 are welcome. Thanks, youngduk From ralf@linux-mips.org Tue Apr 4 11:32:32 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 04 Apr 2006 11:32:41 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:4774 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133433AbWDDKcc (ORCPT ); Tue, 4 Apr 2006 11:32:32 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k34AhdpI010039; Tue, 4 Apr 2006 11:43:39 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k34Ahafe010038; Tue, 4 Apr 2006 11:43:36 +0100 Date: Tue, 4 Apr 2006 11:43:36 +0100 From: Ralf Baechle To: Yoichi Yuasa Cc: linux-mips@linux-mips.org Subject: Re: build error about current git Message-ID: <20060404104336.GA3142@linux-mips.org> References: <20060404102221.5280f199.yoichi_yuasa@tripeaks.co.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060404102221.5280f199.yoichi_yuasa@tripeaks.co.jp> User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11022 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Tue, Apr 04, 2006 at 10:22:21AM +0900, Yoichi Yuasa wrote: > I got the following error, when I built the kernel using current git. > > Yoichi > > $ make tb0287_defconfig > . > . > . > gcc: 0: No such file or directory > gcc: unrecognized option `-G' > gcc: unrecognized option `-EL' > cc1: error: invalid option `no-abicalls' It seems to happen because no SYS_HAS_CPU_xxx is set for this config, so no CONFIG_CPU_VR41XX option will be choosen either, similar for a bunch of other settings. Below patch fixes make tb0287_defconfig but you may want to add some further settings such select SYS_SUPPORTS_32BIT_KERNEL if EXPERIMENTAL Just let me know, Ralf Signed-off-by: Ralf Baechle diff --git a/arch/mips/vr41xx/Kconfig b/arch/mips/vr41xx/Kconfig index a7add16..ea21094 100644 --- a/arch/mips/vr41xx/Kconfig +++ b/arch/mips/vr41xx/Kconfig @@ -4,6 +4,8 @@ config CASIO_E55 select DMA_NONCOHERENT select IRQ_CPU select ISA + select SYS_HAS_CPU_VR41XX + select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN config IBM_WORKPAD @@ -12,6 +14,8 @@ config IBM_WORKPAD select DMA_NONCOHERENT select IRQ_CPU select ISA + select SYS_HAS_CPU_VR41XX + select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN config NEC_CMBVR4133 @@ -21,12 +25,18 @@ config NEC_CMBVR4133 select DMA_NONCOHERENT select IRQ_CPU select HW_HAS_PCI + select SYS_HAS_CPU_VR41XX + select SYS_SUPPORTS_32BIT_KERNEL + select SYS_SUPPORTS_LITTLE_ENDIAN config ROCKHOPPER bool "Support for Rockhopper baseboard" depends on NEC_CMBVR4133 select I8259 select HAVE_STD_PC_SERIAL_PORT + select SYS_HAS_CPU_VR41XX + select SYS_SUPPORTS_32BIT_KERNEL + select SYS_SUPPORTS_LITTLE_ENDIAN config TANBAC_TB022X bool "Support for TANBAC VR4131 multichip module and TANBAC VR4131DIMM" @@ -34,6 +44,8 @@ config TANBAC_TB022X select DMA_NONCOHERENT select HW_HAS_PCI select IRQ_CPU + select SYS_HAS_CPU_VR41XX + select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN help The TANBAC VR4131 multichip module(TB0225) and @@ -46,6 +58,9 @@ config TANBAC_TB0226 bool "Support for TANBAC Mbase(TB0226)" depends on TANBAC_TB022X select GPIO_VR41XX + select SYS_HAS_CPU_VR41XX + select SYS_SUPPORTS_32BIT_KERNEL + select SYS_SUPPORTS_LITTLE_ENDIAN help The TANBAC Mbase(TB0226) is a MIPS-based platform manufactured by TANBAC. @@ -54,6 +69,9 @@ config TANBAC_TB0226 config TANBAC_TB0287 bool "Support for TANBAC Mini-ITX DIMM base(TB0287)" depends on TANBAC_TB022X + select SYS_HAS_CPU_VR41XX + select SYS_SUPPORTS_32BIT_KERNEL + select SYS_SUPPORTS_LITTLE_ENDIAN help The TANBAC Mini-ITX DIMM base(TB0287) is a MIPS-based platform manufactured by TANBAC. @@ -65,6 +83,8 @@ config VICTOR_MPC30X select DMA_NONCOHERENT select HW_HAS_PCI select IRQ_CPU + select SYS_HAS_CPU_VR41XX + select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN config ZAO_CAPCELLA @@ -73,6 +93,8 @@ config ZAO_CAPCELLA select DMA_NONCOHERENT select HW_HAS_PCI select IRQ_CPU + select SYS_HAS_CPU_VR41XX + select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN config PCI_VR41XX From ralf@linux-mips.org Tue Apr 4 11:46:53 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 04 Apr 2006 11:47:03 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:11235 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133489AbWDDKqx (ORCPT ); Tue, 4 Apr 2006 11:46:53 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k34Aw0r9011227; Tue, 4 Apr 2006 11:58:00 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k34AvvVa011223; Tue, 4 Apr 2006 11:57:57 +0100 Date: Tue, 4 Apr 2006 11:57:57 +0100 From: Ralf Baechle To: Atsushi Nemoto Cc: linux-mips@linux-mips.org Subject: Re: [PATCH] Enable SCHED_NO_NO_OMIT_FRAME_POINTER for MIPS. Message-ID: <20060404105757.GB3142@linux-mips.org> References: <20060404.131145.130849545.nemoto@toshiba-tops.co.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060404.131145.130849545.nemoto@toshiba-tops.co.jp> User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11023 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Tue, Apr 04, 2006 at 01:11:45PM +0900, Atsushi Nemoto wrote: > MIPS get_wchan() no longer requires -fno-omit-frame-pointer. I don't think we have have relied on the existence of a frame pointer. Patch applied, Ralf From yoichi_yuasa@tripeaks.co.jp Tue Apr 4 12:37:43 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 04 Apr 2006 12:37:55 +0100 (BST) Received: from mo00.po.2iij.Net ([210.130.202.204]:46794 "EHLO mo00.po.2iij.net") by ftp.linux-mips.org with ESMTP id S8133385AbWDDLhn (ORCPT ); Tue, 4 Apr 2006 12:37:43 +0100 Received: NPO MO00 id k34Bmmw1002074; Tue, 4 Apr 2006 20:48:48 +0900 (JST) Received: from localhost.localdomain (65.126.232.202.bf.2iij.net [202.232.126.65]) by mbox.po.2iij.net (NPO-MR/mbox00) id k34BmlqH014596 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NOT); Tue, 4 Apr 2006 20:48:47 +0900 (JST) Date: Tue, 4 Apr 2006 20:48:47 +0900 From: Yoichi Yuasa To: Ralf Baechle Cc: yoichi_yuasa@tripeaks.co.jp, linux-mips@linux-mips.org Subject: Re: build error about current git Message-Id: <20060404204847.6244de31.yoichi_yuasa@tripeaks.co.jp> In-Reply-To: <20060404104336.GA3142@linux-mips.org> References: <20060404102221.5280f199.yoichi_yuasa@tripeaks.co.jp> <20060404104336.GA3142@linux-mips.org> Organization: TriPeaks Corporation X-Mailer: Sylpheed version 1.0.4 (GTK+ 1.2.10; i386-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-Envid: tripeaks.co.jp Envelope-Id: tripeaks.co.jp X-archive-position: 11024 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: yoichi_yuasa@tripeaks.co.jp Precedence: bulk X-list: linux-mips Hello Ralf, On Tue, 4 Apr 2006 11:43:36 +0100 Ralf Baechle wrote: > On Tue, Apr 04, 2006 at 10:22:21AM +0900, Yoichi Yuasa wrote: > > > I got the following error, when I built the kernel using current git. > > > > Yoichi > > > > $ make tb0287_defconfig > > . > > . > > . > > gcc: 0: No such file or directory > > gcc: unrecognized option `-G' > > gcc: unrecognized option `-EL' > > cc1: error: invalid option `no-abicalls' > > It seems to happen because no SYS_HAS_CPU_xxx is set for this config, > so no CONFIG_CPU_VR41XX option will be choosen either, similar for a > bunch of other settings. Below patch fixes make tb0287_defconfig but > you may want to add some further settings such > > select SYS_SUPPORTS_32BIT_KERNEL if EXPERIMENTAL > > Just let me know, ROCKHOPPER, TB0226 and TB0287 are only base board(CPU is not included in these boards). These configs don't need "select SYS_HAS_CPU_VR41XX" and "select SYS_SUPPORTS_32BIT_KERNEL". Thanks, Yoichi Signed-off-by: Ralf Baechle Signed-off-by: Yoichi Yuasa diff -pruN -X dontdiff mips-orig/arch/mips/vr41xx/Kconfig mips/arch/mips/vr41xx/Kconfig --- mips-orig/arch/mips/vr41xx/Kconfig 2006-04-04 20:27:53.335428500 +0900 +++ mips/arch/mips/vr41xx/Kconfig 2006-04-04 20:37:51.396805000 +0900 @@ -4,6 +4,8 @@ config CASIO_E55 select DMA_NONCOHERENT select IRQ_CPU select ISA + select SYS_HAS_CPU_VR41XX + select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN config IBM_WORKPAD @@ -12,6 +14,8 @@ config IBM_WORKPAD select DMA_NONCOHERENT select IRQ_CPU select ISA + select SYS_HAS_CPU_VR41XX + select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN config NEC_CMBVR4133 @@ -21,6 +25,9 @@ config NEC_CMBVR4133 select DMA_NONCOHERENT select IRQ_CPU select HW_HAS_PCI + select SYS_HAS_CPU_VR41XX + select SYS_SUPPORTS_32BIT_KERNEL + select SYS_SUPPORTS_LITTLE_ENDIAN config ROCKHOPPER bool "Support for Rockhopper baseboard" @@ -34,6 +41,8 @@ config TANBAC_TB022X select DMA_NONCOHERENT select HW_HAS_PCI select IRQ_CPU + select SYS_HAS_CPU_VR41XX + select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN help The TANBAC VR4131 multichip module(TB0225) and @@ -65,6 +74,8 @@ config VICTOR_MPC30X select DMA_NONCOHERENT select HW_HAS_PCI select IRQ_CPU + select SYS_HAS_CPU_VR41XX + select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN config ZAO_CAPCELLA @@ -73,6 +84,8 @@ config ZAO_CAPCELLA select DMA_NONCOHERENT select HW_HAS_PCI select IRQ_CPU + select SYS_HAS_CPU_VR41XX + select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN config PCI_VR41XX From ralf@linux-mips.org Tue Apr 4 13:11:01 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 04 Apr 2006 13:11:13 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:53642 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133513AbWDDMLA (ORCPT ); Tue, 4 Apr 2006 13:11:00 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k34CM92E016101; Tue, 4 Apr 2006 13:22:09 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k34CM8xP016100; Tue, 4 Apr 2006 13:22:08 +0100 Date: Tue, 4 Apr 2006 13:22:08 +0100 From: Ralf Baechle To: Yoichi Yuasa Cc: linux-mips@linux-mips.org Subject: Re: build error about current git Message-ID: <20060404122208.GC13203@linux-mips.org> References: <20060404102221.5280f199.yoichi_yuasa@tripeaks.co.jp> <20060404104336.GA3142@linux-mips.org> <20060404204847.6244de31.yoichi_yuasa@tripeaks.co.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060404204847.6244de31.yoichi_yuasa@tripeaks.co.jp> User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11025 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Tue, Apr 04, 2006 at 08:48:47PM +0900, Yoichi Yuasa wrote: > ROCKHOPPER, TB0226 and TB0287 are only base board(CPU is not included in these boards). > These configs don't need "select SYS_HAS_CPU_VR41XX" and "select SYS_SUPPORTS_32BIT_KERNEL". All right, applied. Ralf From ralf@linux-mips.org Tue Apr 4 13:11:46 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 04 Apr 2006 13:12:07 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:28299 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133534AbWDDMLo (ORCPT ); Tue, 4 Apr 2006 13:11:44 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k34CMqx9016156; Tue, 4 Apr 2006 13:22:52 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k34CMqph016155; Tue, 4 Apr 2006 13:22:52 +0100 Date: Tue, 4 Apr 2006 13:22:52 +0100 From: Ralf Baechle To: Atsushi Nemoto Cc: linux-mips@linux-mips.org Subject: Re: [PATCH] tx49_blast_icache32_page_indexed fix Message-ID: <20060404122252.GD13203@linux-mips.org> References: <20060404.173414.108982133.nemoto@toshiba-tops.co.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060404.173414.108982133.nemoto@toshiba-tops.co.jp> User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11026 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Tue, Apr 04, 2006 at 05:34:14PM +0900, Atsushi Nemoto wrote: > Fix an index value in tx49_blast_icache32_page_indexed(). > This is a damage by 13acfa3fdef15edaa4f5444c68e28e05978afa08 commit. Applied on master and linux-2.6.16-stable. Ralf From ralf.roesch@rw-gmbh.de Tue Apr 4 16:04:16 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 04 Apr 2006 16:04:37 +0100 (BST) Received: from fw01.bwg.de ([213.144.14.242]:64933 "EHLO fw01.bwg.de") by ftp.linux-mips.org with ESMTP id S8133791AbWDDPEP (ORCPT ); Tue, 4 Apr 2006 16:04:15 +0100 Received: from fw01.bwg.de (localhost [127.0.0.1]) by fw01.bwg.de (8.13.3/8.13.3) with ESMTP id k34FFNxk017609 for ; Tue, 4 Apr 2006 17:15:24 +0200 (CEST) Received: from kundenmail (193.47.152.5) by fw01-4.bwg.de (smtprelay) with ESMTP Tue Apr 4 17:15:17 2006. Received: from ximap.arbeitsgruppe (217.81.168.137) by kundenmail with MERCUR Mailserver (v4.03.15 MTI1LTI0MzctNDg3Nw==) for ; Tue, 4 Apr 2006 17:16:43 +0200 Received: from [192.168.178.44] (rr-2600 [192.168.178.44]) by ximap.arbeitsgruppe (Postfix) with ESMTP id DA1FC174B2E; Tue, 4 Apr 2006 17:15:49 +0200 (CEST) Message-ID: <44328D82.1040907@rw-gmbh.de> Date: Tue, 04 Apr 2006 17:15:14 +0200 From: =?ISO-8859-1?Q?Ralf_R=F6sch?= User-Agent: Thunderbird 1.5 (Windows/20051201) MIME-Version: 1.0 To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org Subject: [PATCH] rtc.h fix Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11027 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf.roesch@rw-gmbh.de Precedence: bulk X-list: linux-mips patch below makes genrtc.c compilable again Signed-off-by: Ralf Roesch diff -Nur -X diff-exclude-files-2.6 linux-2.6/include/asm-mips/rtc.h work-2.6/include/asm-mips/rtc.h --- linux-2.6/include/asm-mips/rtc.h 2006-03-08 14:43:43.000000000 +0100 +++ work-2.6/include/asm-mips/rtc.h 2006-04-04 15:56:38.000000000 +0200 @@ -32,7 +32,7 @@ { unsigned long nowtime; - nowtime = rtc_get_time(); + nowtime = rtc_mips_get_time(); to_tm(nowtime, time); time->tm_year -= 1900; @@ -47,7 +47,7 @@ nowtime = mktime(time->tm_year+1900, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec); - ret = rtc_set_time(nowtime); + ret = rtc_mips_set_time(nowtime); return ret; } From ralf@linux-mips.org Tue Apr 4 16:49:09 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 04 Apr 2006 16:49:19 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:30144 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133815AbWDDPtJ (ORCPT ); Tue, 4 Apr 2006 16:49:09 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k34G0F5C018183; Tue, 4 Apr 2006 17:00:16 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k34G0FV9018181; Tue, 4 Apr 2006 17:00:15 +0100 Date: Tue, 4 Apr 2006 17:00:15 +0100 From: Ralf Baechle To: Ralf =?iso-8859-1?Q?R=F6sch?= Cc: linux-mips@linux-mips.org Subject: Re: [PATCH] rtc.h fix Message-ID: <20060404160015.GA11797@linux-mips.org> References: <44328D82.1040907@rw-gmbh.de> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <44328D82.1040907@rw-gmbh.de> User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11028 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Tue, Apr 04, 2006 at 05:15:14PM +0200, Ralf Rösch wrote: > patch below makes genrtc.c compilable again > > Signed-off-by: Ralf Roesch Hand-applied, your mailer did something bad to this patch ... Ralf From sshtylyov@ru.mvista.com Tue Apr 4 19:38:07 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 04 Apr 2006 19:38:16 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:48853 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133819AbWDDSiH (ORCPT ); Tue, 4 Apr 2006 19:38:07 +0100 Received: (qmail 2243 invoked from network); 4 Apr 2006 22:50:11 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 4 Apr 2006 22:50:11 -0000 Message-ID: <4432BF48.8030403@ru.mvista.com> Date: Tue, 04 Apr 2006 22:47:36 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: rmk+serial@arm.linux.org.uk CC: linux-mips@linux-mips.org, jordan.crouse@amd.com Subject: [PATCH] AMD Alchemy: claim UART memory range Content-Type: multipart/mixed; boundary="------------090909080908000800020401" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11029 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips This is a multi-part message in MIME format. --------------090909080908000800020401 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Hello. I've noticed that the 8250/Au1x00 driver (drivers/serial/8250_au1x00.c) doesn't claim UART memory ranges and uses wrong (KSEG1-based) UART addresses instead of the physical ones. WBR, Sergei Sighed-off-by: Sergei Shtylyov --------------090909080908000800020401 Content-Type: text/plain; name="Au1xx0-claim-UART-range.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="Au1xx0-claim-UART-range.patch" diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 674b15c..d641ac4 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c @@ -1906,6 +1906,9 @@ static int serial8250_request_std_resour int ret = 0; switch (up->port.iotype) { + case UPIO_AU: + size = 0x100000; + /* fall thru */ case UPIO_MEM: if (!up->port.mapbase) break; @@ -1938,6 +1941,9 @@ static void serial8250_release_std_resou unsigned int size = 8 << up->port.regshift; switch (up->port.iotype) { + case UPIO_AU: + size = 0x100000; + /* fall thru */ case UPIO_MEM: if (!up->port.mapbase) break; diff --git a/drivers/serial/8250_au1x00.c b/drivers/serial/8250_au1x00.c index 3d1bfd0..58015fd 100644 --- a/drivers/serial/8250_au1x00.c +++ b/drivers/serial/8250_au1x00.c @@ -30,13 +30,12 @@ { \ .iobase = _base, \ .membase = (void __iomem *)_base,\ - .mapbase = _base, \ + .mapbase = CPHYSADDR(_base), \ .irq = _irq, \ .uartclk = 0, /* filled */ \ .regshift = 2, \ .iotype = UPIO_AU, \ - .flags = UPF_SKIP_TEST | \ - UPF_IOREMAP, \ + .flags = UPF_SKIP_TEST \ } static struct plat_serial8250_port au1x00_data[] = { --------------090909080908000800020401-- From geoffrey.levand@am.sony.com Wed Apr 5 01:30:05 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 05 Apr 2006 01:30:15 +0100 (BST) Received: from mail8.fw-bc.sony.com ([160.33.98.75]:64229 "EHLO mail8.fw-bc.sony.com") by ftp.linux-mips.org with ESMTP id S8133824AbWDEAaF (ORCPT ); Wed, 5 Apr 2006 01:30:05 +0100 Received: from mail3.sjc.in.sel.sony.com (mail3.sjc.in.sel.sony.com [43.134.1.211]) by mail8.fw-bc.sony.com (8.12.11/8.12.11) with ESMTP id k350f8cb023751; Wed, 5 Apr 2006 00:41:08 GMT Received: from [192.168.1.10] ([43.134.85.105]) by mail3.sjc.in.sel.sony.com (8.12.11/8.12.11) with ESMTP id k350f7UE008807; Wed, 5 Apr 2006 00:41:07 GMT Message-ID: <44331223.3060603@am.sony.com> Date: Tue, 04 Apr 2006 17:41:07 -0700 From: Geoff Levand User-Agent: Mozilla Thunderbird 1.0.7-1.1.fc4 (X11/20050929) X-Accept-Language: en-us, en MIME-Version: 1.0 To: ralf@linux-mips.org CC: linux-mips@linux-mips.org Subject: [PATCH 0/4] tx49 patches Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11030 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: geoffrey.levand@am.sony.com Precedence: bulk X-list: linux-mips Here are a handful of patches for tx49[23]7 boards. Tested on an rbtx4937 with 2.6.15.6, 2.6.16.1. -Geoff From geoffrey.levand@am.sony.com Wed Apr 5 01:30:45 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 05 Apr 2006 01:31:06 +0100 (BST) Received: from mail8.fw-bc.sony.com ([160.33.98.75]:65253 "EHLO mail8.fw-bc.sony.com") by ftp.linux-mips.org with ESMTP id S8133826AbWDEAaF (ORCPT ); Wed, 5 Apr 2006 01:30:05 +0100 Received: from mail3.sjc.in.sel.sony.com (mail3.sjc.in.sel.sony.com [43.134.1.211]) by mail8.fw-bc.sony.com (8.12.11/8.12.11) with ESMTP id k350f9jt023758; Wed, 5 Apr 2006 00:41:09 GMT Received: from [192.168.1.10] ([43.134.85.105]) by mail3.sjc.in.sel.sony.com (8.12.11/8.12.11) with ESMTP id k350f9RN008817; Wed, 5 Apr 2006 00:41:09 GMT Message-ID: <44331225.4040507@am.sony.com> Date: Tue, 04 Apr 2006 17:41:09 -0700 From: Geoff Levand User-Agent: Mozilla Thunderbird 1.0.7-1.1.fc4 (X11/20050929) X-Accept-Language: en-us, en MIME-Version: 1.0 To: ralf@linux-mips.org, anemo@mba.ocn.ne.jp CC: linux-mips@linux-mips.org Subject: [PATCH 1/4] rebase tx49 serial fixes Content-Type: multipart/mixed; boundary="------------080503070606040209060902" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11031 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: geoffrey.levand@am.sony.com Precedence: bulk X-list: linux-mips This is a multi-part message in MIME format. --------------080503070606040209060902 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit --------------080503070606040209060902 Content-Type: text/x-patch; name="serial-serial_txx9-driver-update.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="serial-serial_txx9-driver-update.patch" This is a rebase to 2.6.16.1 of the 2.6.16-rc1-mm5 patch serial-serial_txx9-driver-update.patch. http://kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc1/2.6.16-rc1-mm5/broken-out/serial-serial_txx9-driver-update.patch From: Atsushi Nemoto Update the serial_txx9 driver. * More strict check in verify_port. Cleanup. * Do not insert a char caused previous overrun. * Fix some spin_locks. * Do not call uart_add_one_port for absent ports. Also, this patch removes a BROKEN tag from Kconfig. This driver has been marked as BROKEN by removal of uart_register_port, but it has been solved already on Sep 2005. Signed-off-by: Atsushi Nemoto Signed-off-by: Geoff Levand Index: linux-2.6.16.1/drivers/serial/Kconfig =================================================================== --- linux-2.6.16.1.orig/drivers/serial/Kconfig 2006-03-19 21:53:29.000000000 -0800 +++ linux-2.6.16.1/drivers/serial/Kconfig 2006-03-30 15:23:20.000000000 -0800 @@ -859,7 +859,7 @@ config SERIAL_TXX9 bool "TMPTX39XX/49XX SIO support" - depends HAS_TXX9_SERIAL && BROKEN + depends HAS_TXX9_SERIAL select SERIAL_CORE default y Index: linux-2.6.16.1/drivers/serial/serial_txx9.c =================================================================== --- linux-2.6.16.1.orig/drivers/serial/serial_txx9.c 2006-03-19 21:53:29.000000000 -0800 +++ linux-2.6.16.1/drivers/serial/serial_txx9.c 2006-03-30 15:26:54.000000000 -0800 @@ -33,6 +33,10 @@ * 1.02 Cleanup. (import 8250.c changes) * 1.03 Fix low-latency mode. (import 8250.c changes) * 1.04 Remove usage of deprecated functions, cleanup. + * 1.05 More strict check in verify_port. Cleanup. + * 1.06 Do not insert a char caused previous overrun. + * Fix some spin_locks. + * Do not call uart_add_one_port for absent ports. */ #include @@ -57,7 +61,7 @@ #include #include -static char *serial_version = "1.04"; +static char *serial_version = "1.06"; static char *serial_name = "TX39/49 Serial driver"; #define PASS_LIMIT 256 @@ -94,6 +98,8 @@ #define UART_NR 4 #endif +#define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8) + struct uart_txx9_port { struct uart_port port; @@ -210,7 +216,7 @@ { switch (up->port.iotype) { default: - return *(volatile u32 *)(up->port.membase + offset); + return __raw_readl(up->port.membase + offset); case UPIO_PORT: return inl(up->port.iobase + offset); } @@ -221,7 +227,7 @@ { switch (up->port.iotype) { default: - *(volatile u32 *)(up->port.membase + offset) = value; + __raw_writel(value, up->port.membase + offset); break; case UPIO_PORT: outl(value, up->port.iobase + offset); @@ -259,34 +265,19 @@ static void serial_txx9_stop_tx(struct uart_port *port) { struct uart_txx9_port *up = (struct uart_txx9_port *)port; - unsigned long flags; - - spin_lock_irqsave(&up->port.lock, flags); sio_mask(up, TXX9_SIDICR, TXX9_SIDICR_TIE); - spin_unlock_irqrestore(&up->port.lock, flags); } static void serial_txx9_start_tx(struct uart_port *port) { struct uart_txx9_port *up = (struct uart_txx9_port *)port; - unsigned long flags; - - spin_lock_irqsave(&up->port.lock, flags); sio_set(up, TXX9_SIDICR, TXX9_SIDICR_TIE); - spin_unlock_irqrestore(&up->port.lock, flags); } static void serial_txx9_stop_rx(struct uart_port *port) { struct uart_txx9_port *up = (struct uart_txx9_port *)port; - unsigned long flags; - - spin_lock_irqsave(&up->port.lock, flags); up->port.read_status_mask &= ~TXX9_SIDISR_RDIS; -#if 0 - sio_mask(up, TXX9_SIDICR, TXX9_SIDICR_RIE); -#endif - spin_unlock_irqrestore(&up->port.lock, flags); } static void serial_txx9_enable_ms(struct uart_port *port) @@ -302,12 +293,16 @@ unsigned int disr = *status; int max_count = 256; char flag; + unsigned int next_ignore_status_mask; do { ch = sio_in(up, TXX9_SIRFIFO); flag = TTY_NORMAL; up->port.icount.rx++; + /* mask out RFDN_MASK bit added by previous overrun */ + next_ignore_status_mask = + up->port.ignore_status_mask & ~TXX9_SIDISR_RFDN_MASK; if (unlikely(disr & (TXX9_SIDISR_UBRK | TXX9_SIDISR_UPER | TXX9_SIDISR_UFER | TXX9_SIDISR_UOER))) { /* @@ -328,8 +323,17 @@ up->port.icount.parity++; else if (disr & TXX9_SIDISR_UFER) up->port.icount.frame++; - if (disr & TXX9_SIDISR_UOER) + if (disr & TXX9_SIDISR_UOER) { up->port.icount.overrun++; + /* + * The receiver read buffer still hold + * a char which caused overrun. + * Ignore next char by adding RFDN_MASK + * to ignore_status_mask temporarily. + */ + next_ignore_status_mask |= + TXX9_SIDISR_RFDN_MASK; + } /* * Mask off conditions which should be ingored. @@ -349,6 +353,7 @@ uart_insert_char(&up->port, disr, TXX9_SIDISR_UOER, ch, flag); ignore_char: + up->port.ignore_status_mask = next_ignore_status_mask; disr = sio_in(up, TXX9_SIDISR); } while (!(disr & TXX9_SIDISR_UVALID) && (max_count-- > 0)); spin_unlock(&up->port.lock); @@ -450,14 +455,11 @@ static void serial_txx9_set_mctrl(struct uart_port *port, unsigned int mctrl) { struct uart_txx9_port *up = (struct uart_txx9_port *)port; - unsigned long flags; - spin_lock_irqsave(&up->port.lock, flags); if (mctrl & TIOCM_RTS) sio_mask(up, TXX9_SIFLCR, TXX9_SIFLCR_RTSSC); else sio_set(up, TXX9_SIFLCR, TXX9_SIFLCR_RTSSC); - spin_unlock_irqrestore(&up->port.lock, flags); } static void serial_txx9_break_ctl(struct uart_port *port, int break_state) @@ -784,8 +786,14 @@ static int serial_txx9_verify_port(struct uart_port *port, struct serial_struct *ser) { - if (ser->irq < 0 || - ser->baud_base < 9600 || ser->type != PORT_TXX9) + unsigned long new_port = ser->port; + if (HIGH_BITS_OFFSET) + new_port += (unsigned long)ser->port_high << HIGH_BITS_OFFSET; + if (ser->type != port->type || + ser->irq != port->irq || + ser->io_type != port->iotype || + new_port != port->iobase || + (unsigned long)ser->iomem_base != port->mapbase) return -EINVAL; return 0; } @@ -827,7 +835,8 @@ up->port.line = i; up->port.ops = &serial_txx9_pops; - uart_add_one_port(drv, &up->port); + if (up->port.iobase || up->port.mapbase) + uart_add_one_port(drv, &up->port); } } @@ -927,11 +936,6 @@ return -ENODEV; /* - * Temporary fix. - */ - spin_lock_init(&port->lock); - - /* * Disable UART interrupts, set DTR and RTS high * and set speed. */ @@ -1041,11 +1045,10 @@ mutex_lock(&serial_txx9_mutex); for (i = 0; i < UART_NR; i++) { uart = &serial_txx9_ports[i]; - if (uart->port.type == PORT_UNKNOWN) + if (!(uart->port.iobase || uart->port.mapbase)) break; } if (i < UART_NR) { - uart_remove_one_port(&serial_txx9_reg, &uart->port); uart->port.iobase = port->iobase; uart->port.membase = port->membase; uart->port.irq = port->irq; @@ -1080,9 +1083,8 @@ uart->port.type = PORT_UNKNOWN; uart->port.iobase = 0; uart->port.mapbase = 0; - uart->port.membase = 0; + uart->port.membase = NULL; uart->port.dev = NULL; - uart_add_one_port(&serial_txx9_reg, &uart->port); mutex_unlock(&serial_txx9_mutex); } @@ -1198,8 +1200,11 @@ #ifdef ENABLE_SERIAL_TXX9_PCI pci_unregister_driver(&serial_txx9_pci_driver); #endif - for (i = 0; i < UART_NR; i++) - uart_remove_one_port(&serial_txx9_reg, &serial_txx9_ports[i].port); + for (i = 0; i < UART_NR; i++) { + struct uart_txx9_port *up = &serial_txx9_ports[i]; + if (up->port.iobase || up->port.mapbase) + uart_remove_one_port(&serial_txx9_reg, &up->port); + } uart_unregister_driver(&serial_txx9_reg); } --------------080503070606040209060902-- From geoffrey.levand@am.sony.com Wed Apr 5 01:31:33 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 05 Apr 2006 01:31:57 +0100 (BST) Received: from mail8.fw-bc.sony.com ([160.33.98.75]:486 "EHLO mail8.fw-bc.sony.com") by ftp.linux-mips.org with ESMTP id S8133827AbWDEAaH (ORCPT ); Wed, 5 Apr 2006 01:30:07 +0100 Received: from mail3.sjc.in.sel.sony.com (mail3.sjc.in.sel.sony.com [43.134.1.211]) by mail8.fw-bc.sony.com (8.12.11/8.12.11) with ESMTP id k350fB7s023767; Wed, 5 Apr 2006 00:41:11 GMT Received: from [192.168.1.10] ([43.134.85.105]) by mail3.sjc.in.sel.sony.com (8.12.11/8.12.11) with ESMTP id k350fBtp008827; Wed, 5 Apr 2006 00:41:11 GMT Message-ID: <44331227.8020903@am.sony.com> Date: Tue, 04 Apr 2006 17:41:11 -0700 From: Geoff Levand User-Agent: Mozilla Thunderbird 1.0.7-1.1.fc4 (X11/20050929) X-Accept-Language: en-us, en MIME-Version: 1.0 To: ralf@linux-mips.org, anemo@mba.ocn.ne.jp CC: linux-mips@linux-mips.org Subject: [PATCH 2/4] fix rbtx4927 ne2000 Content-Type: multipart/mixed; boundary="------------050703020500010808000305" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11032 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: geoffrey.levand@am.sony.com Precedence: bulk X-list: linux-mips This is a multi-part message in MIME format. --------------050703020500010808000305 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit --------------050703020500010808000305 Content-Type: text/x-patch; name="fix-rbtx4927-ne2000.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="fix-rbtx4927-ne2000.patch" fix-rbtx4927-ne2000.patch: This patch fixes the ne2000 driver to work on rbtx4927 and rbtx4937 boards. Signed-off-by: Geoff Levand Index: linux-2.6.16.1/drivers/net/ne.c =================================================================== --- linux-2.6.16.1.orig/drivers/net/ne.c 2006-03-23 10:55:43.000000000 -0800 +++ linux-2.6.16.1/drivers/net/ne.c 2006-03-23 14:04:59.000000000 -0800 @@ -53,9 +53,17 @@ #include #include - -#if defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938) -#include +#if defined(CONFIG_TOSHIBA_RBTX4938) +# include +# define RBTX49_BASE 0x07f20280 +# define RBTX49_IRQ RBTX4938_RTL_8019_IRQ +#elif defined(CONFIG_TOSHIBA_RBTX4927) +# include +# define RBTX49_BASE RBTX4927_RTL_8019_BASE +# define RBTX49_IRQ RBTX4927_RTL_8019_IRQ +#else +# define RBTX49_BASE 0 +# define RBTX49_IRQ 0 #endif #include "8390.h" @@ -115,9 +123,7 @@ {"E-LAN100", "E-LAN200", {0x00, 0x00, 0x5d}}, /* Broken ne1000 clones */ {"PCM-4823", "PCM-4823", {0x00, 0xc0, 0x6c}}, /* Broken Advantech MoBo */ {"REALTEK", "RTL8019", {0x00, 0x00, 0xe8}}, /* no-name with Realtek chip */ -#if defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938) {"RBHMA4X00-RTL8019", "RBHMA4X00/RTL8019", {0x00, 0x60, 0x0a}}, /* Toshiba built-in */ -#endif {"LCS-8834", "LCS-8836", {0x04, 0x04, 0x37}}, /* ShinyNet (SET) */ {NULL,} }; @@ -233,10 +239,11 @@ sprintf(dev->name, "eth%d", unit); netdev_boot_setup_check(dev); -#ifdef CONFIG_TOSHIBA_RBTX4938 - dev->base_addr = 0x07f20280; - dev->irq = RBTX4938_RTL_8019_IRQ; -#endif + if (RBTX49_BASE) { + dev->base_addr = RBTX49_BASE; + dev->irq = RBTX49_IRQ; + } + err = do_ne_probe(dev); if (err) goto out; --------------050703020500010808000305-- From geoffrey.levand@am.sony.com Wed Apr 5 01:32:25 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 05 Apr 2006 01:32:43 +0100 (BST) Received: from mail8.fw-bc.sony.com ([160.33.98.75]:1766 "EHLO mail8.fw-bc.sony.com") by ftp.linux-mips.org with ESMTP id S8133828AbWDEAaK (ORCPT ); Wed, 5 Apr 2006 01:30:10 +0100 Received: from mail3.sjc.in.sel.sony.com (mail3.sjc.in.sel.sony.com [43.134.1.211]) by mail8.fw-bc.sony.com (8.12.11/8.12.11) with ESMTP id k350fE24023775; Wed, 5 Apr 2006 00:41:15 GMT Received: from [192.168.1.10] ([43.134.85.105]) by mail3.sjc.in.sel.sony.com (8.12.11/8.12.11) with ESMTP id k350fEGe008848; Wed, 5 Apr 2006 00:41:14 GMT Message-ID: <4433122A.1090104@am.sony.com> Date: Tue, 04 Apr 2006 17:41:14 -0700 From: Geoff Levand User-Agent: Mozilla Thunderbird 1.0.7-1.1.fc4 (X11/20050929) X-Accept-Language: en-us, en MIME-Version: 1.0 To: ralf@linux-mips.org CC: linux-mips@linux-mips.org Subject: [PATCH 4/4] fix tx4938 undefined reference Content-Type: multipart/mixed; boundary="------------080506050707030507070005" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11033 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: geoffrey.levand@am.sony.com Precedence: bulk X-list: linux-mips This is a multi-part message in MIME format. --------------080506050707030507070005 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit --------------080506050707030507070005 Content-Type: text/x-patch; name="fix-mips-undefined-sio.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="fix-mips-undefined-sio.patch" Fix undefined reference to `txx9_sio_kdbg_rd' when CONFIG_KGDB_8250=y, CONFIG_KGDB_8250=n. Signed-off-by: Geoff Levand Index: linux-2.6.16.1/arch/mips/tx4938/common/Makefile =================================================================== --- linux-2.6.16.1.orig/arch/mips/tx4938/common/Makefile 2006-01-02 19:21:10.000000000 -0800 +++ linux-2.6.16.1/arch/mips/tx4938/common/Makefile 2006-03-07 11:05:05.000000000 -0800 @@ -7,5 +7,5 @@ # obj-y += prom.o setup.o irq.o irq_handler.o rtc_rx5c348.o -obj-$(CONFIG_KGDB) += dbgio.o +obj-$(CONFIG_KGDB_8250) += dbgio.o --------------080506050707030507070005-- From geoffrey.levand@am.sony.com Wed Apr 5 01:33:12 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 05 Apr 2006 01:33:32 +0100 (BST) Received: from mail8.fw-sd.sony.com ([160.33.66.75]:3249 "EHLO mail8.fw-sd.sony.com") by ftp.linux-mips.org with ESMTP id S8133829AbWDEAaL (ORCPT ); Wed, 5 Apr 2006 01:30:11 +0100 Received: from mail3.sjc.in.sel.sony.com (mail3.sjc.in.sel.sony.com [43.134.1.211]) by mail8.fw-sd.sony.com (8.12.11/8.12.11) with ESMTP id k350fD6i019530; Wed, 5 Apr 2006 00:41:13 GMT Received: from [192.168.1.10] ([43.134.85.105]) by mail3.sjc.in.sel.sony.com (8.12.11/8.12.11) with ESMTP id k350fC89008838; Wed, 5 Apr 2006 00:41:12 GMT Message-ID: <44331228.5020707@am.sony.com> Date: Tue, 04 Apr 2006 17:41:12 -0700 From: Geoff Levand User-Agent: Mozilla Thunderbird 1.0.7-1.1.fc4 (X11/20050929) X-Accept-Language: en-us, en MIME-Version: 1.0 To: ralf@linux-mips.org CC: linux-mips@linux-mips.org Subject: [PATCH 3/4] fix tx4927 header dep Content-Type: multipart/mixed; boundary="------------050703010509030407050801" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11034 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: geoffrey.levand@am.sony.com Precedence: bulk X-list: linux-mips This is a multi-part message in MIME format. --------------050703010509030407050801 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit --------------050703010509030407050801 Content-Type: text/x-patch; name="fix-tx4927-header-dep.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="fix-tx4927-header-dep.patch" fix-tx4927-header-dep.patch: This patch fixes a header dependency problem in tx4927_mips.h. tx4927_mips.h:58: error: parse error before "s08" tx4927_mips.h:58: warning: type defaults to `int' in declaration of `s08' Signed-off-by: Geoff Levand Index: linux-2.6.16.1/include/asm-mips/tx4927/tx4927_mips.h =================================================================== --- linux-2.6.16.1.orig/include/asm-mips/tx4927/tx4927_mips.h 2006-01-02 19:21:10.000000000 -0800 +++ linux-2.6.16.1/include/asm-mips/tx4927/tx4927_mips.h 2006-03-23 10:49:24.000000000 -0800 @@ -28,6 +28,7 @@ #define __ASM_TX4927_TX4927_MIPS_H #ifndef __ASSEMBLY__ +#include static inline void asm_wait(void) { --------------050703010509030407050801-- From sam@ravnborg.org Wed Apr 5 14:19:30 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 05 Apr 2006 14:19:40 +0100 (BST) Received: from pqueuea.post.tele.dk ([193.162.153.9]:5913 "HELO pqueuea.post.tele.dk") by ftp.linux-mips.org with SMTP id S8133357AbWDENTa (ORCPT ); Wed, 5 Apr 2006 14:19:30 +0100 Received: from pasmtp.tele.dk (pasmtp.tele.dk [193.162.159.95]) by pqueuea.post.tele.dk (Postfix) with ESMTP id 993583758F9; Wed, 5 Apr 2006 13:00:10 +0200 (CEST) Received: from mars.ravnborg.org (0x50a0757d.hrnxx9.adsl-dhcp.tele.dk [80.160.117.125]) by pasmtp.tele.dk (Postfix) with ESMTP id A2D351EC342; Wed, 5 Apr 2006 13:00:04 +0200 (CEST) Received: by mars.ravnborg.org (Postfix, from userid 1000) id E913243C21C; Wed, 5 Apr 2006 13:00:02 +0200 (CEST) Date: Wed, 5 Apr 2006 13:00:02 +0200 From: Sam Ravnborg To: Atsushi Nemoto Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, ralf@linux-mips.org, akpm@osdl.org Subject: Re: [PATCH] Fix sed regexp to generate asm-offset.h Message-ID: <20060405110002.GA22508@mars.ravnborg.org> References: <20060328.001854.93020330.anemo@mba.ocn.ne.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060328.001854.93020330.anemo@mba.ocn.ne.jp> User-Agent: Mutt/1.5.11 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11035 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sam@ravnborg.org Precedence: bulk X-list: linux-mips On Tue, Mar 28, 2006 at 12:18:54AM +0900, Atsushi Nemoto wrote: > Changes to Makefile.kbuild ("kbuild: add -fverbose-asm to i386 > Makefile") breaks asm-offset.h file on MIPS. Other archs possibly > suffer this change too but I'm not sure. > > Here is a fix just for MIPS. Thanks, applied to the kbuild bugfix tree. Sam From sshtylyov@ru.mvista.com Wed Apr 5 14:35:36 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 05 Apr 2006 14:35:46 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:2196 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133357AbWDENfg (ORCPT ); Wed, 5 Apr 2006 14:35:36 +0100 Received: (qmail 14294 invoked from network); 5 Apr 2006 17:47:58 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 5 Apr 2006 17:47:58 -0000 Message-ID: <4433C9EE.8030402@ru.mvista.com> Date: Wed, 05 Apr 2006 17:45:18 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: linux-mips@linux-mips.org CC: Bob Breuer , Manish Lachwani , Jordan Crouse Subject: [PATCH] Fix swap entry for MIPS32 36-bit physical address References: In-Reply-To: Content-Type: multipart/mixed; boundary="------------010001090406010900080603" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11036 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips This is a multi-part message in MIME format. --------------010001090406010900080603 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Hello. With 64-bit physical address enabled, 'swapon' was causing kernel oops on Alchemy CPUs (MIPS32R1) because of the swap entry type field corrupting the _PAGE_FILE bit in pte_low. So, change layout of the swap entry to use all bits except _PAGE_PRESENT and _PAGE_FILE (the harware protection bits are loaded from pte_high which should be cleared by __swp_entry_to_pte() macro) -- which gives 25 bits for the swap entry offset. Additionally, PTEs in MIPS32R2 should have the same layout for the 36-bit physical address case as in MIPS32R1, according to the architecture manuals -- so, fix the #ifdef's. WBR, Sergei Signed-off-by: Konstantin Baydarov Signed-off-by: Sergei Shtylyov --------------010001090406010900080603 Content-Type: text/plain; name="MIPS32-36bit-phys-addr-swap-entry-fix.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="MIPS32-36bit-phys-addr-swap-entry-fix.patch" diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h index 0cff64c..89c269f 100644 --- a/include/asm-mips/pgtable-32.h +++ b/include/asm-mips/pgtable-32.h @@ -116,7 +116,7 @@ static inline void pmd_clear(pmd_t *pmdp pmd_val(*pmdp) = ((unsigned long) invalid_pte_table); } -#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) +#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) #define pte_page(x) pfn_to_page(pte_pfn(x)) #define pte_pfn(x) ((unsigned long)((x).pte_high >> 6)) static inline pte_t @@ -139,7 +139,7 @@ pfn_pte(unsigned long pfn, pgprot_t prot #define pte_pfn(x) ((unsigned long)((x).pte >> PAGE_SHIFT)) #define pfn_pte(pfn, prot) __pte(((unsigned long long)(pfn) << PAGE_SHIFT) | pgprot_val(prot)) #endif -#endif /* defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) */ +#endif /* defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) */ #define __pgd_offset(address) pgd_index(address) #define __pud_offset(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) @@ -190,11 +190,27 @@ pfn_pte(unsigned long pfn, pgprot_t prot #else +#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) +/* + * For 36-bit physical address we store swap entry in pte_low and 0 in pte_high, + * which gives up 25 bits available for swap offset. + */ +#define __swp_type(x) ((x).val & 0x1f) +#define __swp_offset(x) ((((x).val >> 5) & 0x1) | \ + (((x).val >> 6) & 0xe) | \ + (((x).val >> 11) << 4)) +#define __swp_entry(type,offset) \ + ((swp_entry_t) {((type) & 0x1f ) | \ + (((offset) & 0x1) << 5) | \ + (((offset) & 0xe) << 6) | \ + (((offset) >> 4 ) << 11)}) +#else /* Swap entries must have VALID and GLOBAL bits cleared. */ #define __swp_type(x) (((x).val >> 8) & 0x1f) #define __swp_offset(x) ((x).val >> 13) #define __swp_entry(type,offset) \ ((swp_entry_t) { ((type) << 8) | ((offset) << 13) }) +#endif /* defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) */ /* * Bits 0, 1, 2, 7 and 8 are taken, split up the 27 bits of offset @@ -202,7 +218,7 @@ pfn_pte(unsigned long pfn, pgprot_t prot */ #define PTE_FILE_MAX_BITS 27 -#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) +#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) /* fixme */ #define pte_to_pgoff(_pte) (((_pte).pte_high >> 6) + ((_pte).pte_high & 0x3f)) #define pgoff_to_pte(off) \ diff --git a/include/asm-mips/pgtable-bits.h b/include/asm-mips/pgtable-bits.h index 01e76e9..8cbc493 100644 --- a/include/asm-mips/pgtable-bits.h +++ b/include/asm-mips/pgtable-bits.h @@ -33,7 +33,7 @@ * unpredictable things. The code (when it is written) to deal with * this problem will be in the update_mmu_cache() code for the r4k. */ -#if defined(CONFIG_CPU_MIPS32_R1) && defined(CONFIG_64BIT_PHYS_ADDR) +#if defined(CONFIG_CPU_MIPS32) && defined(CONFIG_64BIT_PHYS_ADDR) #define _PAGE_PRESENT (1<<6) /* implemented in software */ #define _PAGE_READ (1<<7) /* implemented in software */ --------------010001090406010900080603-- From sshtylyov@ru.mvista.com Wed Apr 5 14:37:59 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 05 Apr 2006 14:38:09 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:8341 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133432AbWDENh7 (ORCPT ); Wed, 5 Apr 2006 14:37:59 +0100 Received: (qmail 14343 invoked from network); 5 Apr 2006 17:50:22 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 5 Apr 2006 17:50:22 -0000 Message-ID: <4433CA7E.1010504@ru.mvista.com> Date: Wed, 05 Apr 2006 17:47:42 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: Geoff Levand CC: ralf@linux-mips.org, linux-mips@linux-mips.org Subject: Re: [PATCH 4/4] fix tx4938 undefined reference References: <4433122A.1090104@am.sony.com> In-Reply-To: <4433122A.1090104@am.sony.com> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11037 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips Hello. Geoff Levand wrote: > ------------------------------------------------------------------------ > > Fix undefined reference to `txx9_sio_kdbg_rd' when > CONFIG_KGDB_8250=y, CONFIG_KGDB_8250=n. I'm sorry, where do you see this option? It belongs to cross-arch KGDB which AFAIK is not in the Linus' kernel yet. So, NAK. > Signed-off-by: Geoff Levand > > > Index: linux-2.6.16.1/arch/mips/tx4938/common/Makefile > =================================================================== > --- linux-2.6.16.1.orig/arch/mips/tx4938/common/Makefile 2006-01-02 19:21:10.000000000 -0800 > +++ linux-2.6.16.1/arch/mips/tx4938/common/Makefile 2006-03-07 11:05:05.000000000 -0800 > @@ -7,5 +7,5 @@ > # > > obj-y += prom.o setup.o irq.o irq_handler.o rtc_rx5c348.o > -obj-$(CONFIG_KGDB) += dbgio.o > +obj-$(CONFIG_KGDB_8250) += dbgio.o WBR, Sergei From giometti@enneenne.com Wed Apr 5 16:35:44 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 05 Apr 2006 16:35:53 +0100 (BST) Received: from 81-174-11-161.f5.ngi.it ([81.174.11.161]:10626 "EHLO goldrake.enneenne.com") by ftp.linux-mips.org with ESMTP id S8133363AbWDEPfo (ORCPT ); Wed, 5 Apr 2006 16:35:44 +0100 Received: from zaigor.enneenne.com ([192.168.32.1]) by goldrake.enneenne.com with esmtp (Exim 4.50) id 1FRABM-0002VX-7z; Wed, 05 Apr 2006 17:44:32 +0200 Received: from giometti by zaigor.enneenne.com with local (Exim 4.60) (envelope-from ) id 1FRADv-0000cv-LM; Wed, 05 Apr 2006 17:47:11 +0200 Date: Wed, 5 Apr 2006 17:47:11 +0200 From: Rodolfo Giometti To: Linux MIPS Cc: ppopov@mvista.com Message-ID: <20060405154711.GL7029@enneenne.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Organization: GNU/Linux Device Drivers, Embedded Systems and Courses X-PGP-Key: gpg --keyserver keyserver.linux.it --recv-keys D25A5633 User-Agent: Mutt/1.5.11+cvs20060126 X-SA-Exim-Connect-IP: 192.168.32.1 X-SA-Exim-Mail-From: giometti@enneenne.com Subject: Power management for au1000_eth.c X-SA-Exim-Version: 4.2 (built Thu, 03 Mar 2005 10:44:12 +0100) X-SA-Exim-Scanned: Yes (on goldrake.enneenne.com) Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11038 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: giometti@linux.it Precedence: bulk X-list: linux-mips Hello, I'm trying to add power management support to au1000_eth.c driver. In order to to it I 've added these two functions: static int au1000_eth_suspend(struct device *dev, pm_message_t state, u32 level) { struct net_device *ndev = dev_get_drvdata(dev); struct au1000_private *aup = (struct au1000_private *) ndev->priv; if (!ndev) return 0; switch (level) { case SUSPEND_DISABLE : if (netif_running(ndev)) netif_device_detach(ndev); break; case SUSPEND_SAVE_STATE : /* bring the device out of reset, otherwise accessing to mii * will hang */ *aup->enable = MAC_EN_CLOCK_ENABLE; au_sync_delay(2); *aup->enable = MAC_EN_RESET0 | MAC_EN_RESET1 | MAC_EN_RESET2 | MAC_EN_CLOCK_ENABLE; au_sync_delay(2); if (aup->phy_ops->phy_suspend) aup->phy_ops->phy_suspend(ndev, aup->phy_addr, level); del_timer_sync(&aup->timer); /* FIXME: REMOVED??? */ reset_mac(ndev); netif_stop_queue(ndev); free_irq(ndev->irq, dev); break; case SUSPEND_POWER_DOWN : break; } return 0; } static int au1000_eth_resume(struct device *dev, u32 level) { struct net_device *ndev = dev_get_drvdata(dev); struct au1000_private *aup = (struct au1000_private *) ndev->priv; u32 flags; int ret; if (!ndev) return 0; switch (level) { case RESUME_RESTORE_STATE : /* bring the device out of reset, otherwise accessing to mii * will hang */ *aup->enable = MAC_EN_CLOCK_ENABLE; au_sync_delay(2); *aup->enable = MAC_EN_RESET0 | MAC_EN_RESET1 | MAC_EN_RESET2 | MAC_EN_CLOCK_ENABLE; au_sync_delay(2); if (aup->phy_ops->phy_resume) aup->phy_ops->phy_resume(ndev, aup->phy_addr, level); aup->phy_ops->phy_init(ndev, aup->phy_addr); /* au1000_init() expects that the device is in reset state. */ reset_mac(ndev); /* au1000_init() expects the device in reset */ au1000_init(ndev); ret = request_irq(ndev->irq, &au1000_interrupt, 0, ndev->name, ndev); if (ret) { printk(KERN_ERR "%s: unable to get IRQ %d\n", ndev->name, ndev->irq); return ret; //FIXME } init_timer(&aup->timer); /* used in ioctl() */ aup->timer.expires = RUN_AT((3*HZ)); aup->timer.data = (unsigned long) ndev; aup->timer.function = &au1000_timer; /* timer handler */ add_timer(&aup->timer); break; case RESUME_ENABLE : if (netif_running(ndev)) netif_device_attach(ndev); break; } return 0; } The problem is that after wakeup the system hangs or returns lots of errors like: Reserved instruction in kernel code in arch/mips/kernel/traps.c::do_ri, line 706[#169]: Note that if I compile the driver as a module and removing it before sleeping and reinstalling it after wake up the system (and the ethernet) works correctly... Suggestions? :) Thanks in advance, Rodolfo -- GNU/Linux Solutions e-mail: giometti@enneenne.com Linux Device Driver giometti@gnudd.com Embedded Systems giometti@linux.it UNIX programming phone: +39 349 2432127 From geoffrey.levand@am.sony.com Wed Apr 5 16:58:34 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 05 Apr 2006 16:58:49 +0100 (BST) Received: from mail8.fw-sd.sony.com ([160.33.66.75]:24015 "EHLO mail8.fw-sd.sony.com") by ftp.linux-mips.org with ESMTP id S8133392AbWDEP6e (ORCPT ); Wed, 5 Apr 2006 16:58:34 +0100 Received: from mail3.sjc.in.sel.sony.com (mail3.sjc.in.sel.sony.com [43.134.1.211]) by mail8.fw-sd.sony.com (8.12.11/8.12.11) with ESMTP id k35G9blu002304; Wed, 5 Apr 2006 16:09:38 GMT Received: from [192.168.1.10] ([43.134.85.105]) by mail3.sjc.in.sel.sony.com (8.12.11/8.12.11) with ESMTP id k35G9bSM004591; Wed, 5 Apr 2006 16:09:37 GMT Message-ID: <4433EBC1.5060609@am.sony.com> Date: Wed, 05 Apr 2006 09:09:37 -0700 From: Geoff Levand User-Agent: Mozilla Thunderbird 1.0.7-1.1.fc4 (X11/20050929) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Sergei Shtylyov CC: ralf@linux-mips.org, linux-mips@linux-mips.org Subject: Re: [PATCH 4/4] fix tx4938 undefined reference References: <4433122A.1090104@am.sony.com> <4433CA7E.1010504@ru.mvista.com> In-Reply-To: <4433CA7E.1010504@ru.mvista.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11039 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: geoffrey.levand@am.sony.com Precedence: bulk X-list: linux-mips Sergei Shtylyov wrote: > I'm sorry, where do you see this option? It belongs to cross-arch KGDB > which AFAIK is not in the Linus' kernel yet. So, NAK. Yes, sorry about that. I'll send it off to the kgdb ML. -Geoff >> Signed-off-by: Geoff Levand >> >> >> Index: linux-2.6.16.1/arch/mips/tx4938/common/Makefile >> =================================================================== >> --- linux-2.6.16.1.orig/arch/mips/tx4938/common/Makefile 2006-01-02 19:21:10.000000000 -0800 >> +++ linux-2.6.16.1/arch/mips/tx4938/common/Makefile 2006-03-07 11:05:05.000000000 -0800 >> @@ -7,5 +7,5 @@ >> # >> >> obj-y += prom.o setup.o irq.o irq_handler.o rtc_rx5c348.o >> -obj-$(CONFIG_KGDB) += dbgio.o >> +obj-$(CONFIG_KGDB_8250) += dbgio.o > > WBR, Sergei > From giometti@enneenne.com Wed Apr 5 23:08:03 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 05 Apr 2006 23:08:15 +0100 (BST) Received: from 81-174-11-161.f5.ngi.it ([81.174.11.161]:31880 "EHLO goldrake.enneenne.com") by ftp.linux-mips.org with ESMTP id S8133463AbWDEWID (ORCPT ); Wed, 5 Apr 2006 23:08:03 +0100 Received: from zaigor.enneenne.com ([192.168.32.1]) by goldrake.enneenne.com with esmtp (Exim 4.50) id 1FRGJ3-0004Ik-BR for linux-mips@linux-mips.org; Thu, 06 Apr 2006 00:16:54 +0200 Received: from giometti by zaigor.enneenne.com with local (Exim 4.60) (envelope-from ) id 1FRGLd-00051T-OX for linux-mips@linux-mips.org; Thu, 06 Apr 2006 00:19:33 +0200 Date: Thu, 6 Apr 2006 00:19:33 +0200 From: Rodolfo Giometti To: Linux MIPS Message-ID: <20060405221933.GN7029@enneenne.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="q7oacCJraRPxsh4K" Content-Disposition: inline Organization: GNU/Linux Device Drivers, Embedded Systems and Courses X-PGP-Key: gpg --keyserver keyserver.linux.it --recv-keys D25A5633 User-Agent: Mutt/1.5.11+cvs20060126 X-SA-Exim-Connect-IP: 192.168.32.1 X-SA-Exim-Mail-From: giometti@enneenne.com Subject: [PATCH] sysfs interface for Au1xxx power management X-SA-Exim-Version: 4.2 (built Thu, 03 Mar 2005 10:44:12 +0100) X-SA-Exim-Scanned: Yes (on goldrake.enneenne.com) Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11040 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: giometti@linux.it Precedence: bulk X-list: linux-mips --q7oacCJraRPxsh4K Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello, here a patch to support new sysfs interface for Au1xxx's power management. Now we can put the system into sleeping mode by using: hostname:~# echo mem > /sys/power/state The patch keeps also the file "/proc/sys/pm/freq" from the old interface. Ciao, Rodolfo -- GNU/Linux Solutions e-mail: giometti@enneenne.com Linux Device Driver giometti@gnudd.com Embedded Systems giometti@linux.it UNIX programming phone: +39 349 2432127 --q7oacCJraRPxsh4K Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-pm-sysfs --- /home/develop/embedded/mipsel/linux/linux-mips.git/arch/mips/au1000/common/power.c 2006-03-31 16:57:26.000000000 +0200 +++ arch/mips/au1000/common/power.c 2006-04-06 00:08:59.000000000 +0200 @@ -1,6 +1,11 @@ /* * BRIEF MODULE DESCRIPTION - * Au1000 Power Management routines. + * Au1xxx Power Management routines (sysfs and procfs interfaces). + * + * Copyright 2006 Rodolfo Giometti + * + * Based on some previous version's functions, so I report below the previous + * copyright message: * * Copyright 2001 MontaVista Software Inc. * Author: MontaVista Software, Inc. @@ -32,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -43,18 +47,17 @@ #include #include #include +#include -#ifdef CONFIG_PM +static unsigned long cpu_freq; -#define DEBUG 1 +//#define DEBUG 1 #ifdef DEBUG # define DPRINTK(fmt, args...) printk("%s: " fmt, __FUNCTION__ , ## args) #else # define DPRINTK(fmt, args...) #endif -static void au1000_calibrate_delay(void); - extern void set_au1x00_speed(unsigned int new_freq); extern unsigned int get_au1x00_speed(void); extern unsigned long get_au1x00_uart_baud_base(void); @@ -64,9 +67,9 @@ extern void local_enable_irq(unsigned int irq_nr); /* Quick acpi hack. This will have to change! */ -#define CTL_ACPI 9999 -#define ACPI_S1_SLP_TYP 19 -#define ACPI_SLEEP 21 +#define CTL_ACPI 9999 +#define ACPI_S1_SLP_TYP 19 +#define ACPI_SLEEP 21 static DEFINE_SPINLOCK(pm_lock); @@ -83,6 +86,7 @@ static uint sleep_aux_pll_cntrl; static uint sleep_cpu_pll_cntrl; static uint sleep_pin_function; +static uint sleep_gpio2_enable; static uint sleep_uart0_inten; static uint sleep_uart0_fifoctl; static uint sleep_uart0_linectl; @@ -92,16 +96,45 @@ static uint sleep_usbdev_enable; static uint sleep_static_memctlr[4][3]; -/* Define this to cause the value you write to /proc/sys/pm/sleep to - * set the TOY timer for the amount of time you want to sleep. - * This is done mainly for testing, but may be useful in other cases. - * The value is number of 32KHz ticks to sleep. - */ -#define SLEEP_TEST_TIMEOUT 1 -#ifdef SLEEP_TEST_TIMEOUT -static int sleep_ticks; -void wakeup_counter0_set(int ticks); -#endif +/* This is the number of bits of precision for the loops_per_jiffy. Each + bit takes on average 1.5/HZ seconds. This (like the original) is a little + better than 1% */ +#define LPS_PREC 8 + +static void au1000_calibrate_delay(void) +{ + unsigned long ticks, loopbit; + int lps_precision = LPS_PREC; + + loops_per_jiffy = (1 << 12); + + while (loops_per_jiffy <<= 1) { + /* wait for "start of" clock tick */ + ticks = jiffies; + while (ticks == jiffies) + /* nothing */ ; + /* Go .. */ + ticks = jiffies; + __delay(loops_per_jiffy); + ticks = jiffies - ticks; + if (ticks) + break; + } + +/* Do a binary approximation to get loops_per_jiffy set to equal one clock + (up to lps_precision bits) */ + loops_per_jiffy >>= 1; + loopbit = loops_per_jiffy; + while (lps_precision-- && (loopbit >>= 1)) { + loops_per_jiffy |= loopbit; + ticks = jiffies; + while (ticks == jiffies); + ticks = jiffies; + __delay(loops_per_jiffy); + if (jiffies != ticks) /* longer than 1 tick */ + loops_per_jiffy &= ~loopbit; + } +} static void save_core_regs(void) @@ -147,6 +180,7 @@ sleep_cpu_pll_cntrl = au_readl(SYS_CPUPLL); sleep_pin_function = au_readl(SYS_PINFUNC); + sleep_gpio2_enable = au_readl(GPIO2_ENABLE); /* Save the static memory controller configuration. */ @@ -173,6 +207,7 @@ au_writel(sleep_aux_pll_cntrl, SYS_AUXPLL); au_sync(); au_writel(sleep_cpu_pll_cntrl, SYS_CPUPLL); au_sync(); au_writel(sleep_pin_function, SYS_PINFUNC); au_sync(); + au_writel(sleep_gpio2_enable, GPIO2_ENABLE); au_sync(); /* Restore the static memory controller configuration. */ @@ -206,47 +241,48 @@ wakeup_counter0_adjust(); } -unsigned long suspend_mode; - -void wakeup_from_suspend(void) -{ - suspend_mode = 0; -} +void wakeup_counter0_set(int ticks); +int (*board_before_sleep)(void); +void (*board_after_sleep)(int reason); -int au_sleep(void) +int au_sleep(int reason, int force) { + int ticks = 0; unsigned long wakeup, flags; - extern void save_and_sleep(void); + int board_reason = 0; - spin_lock_irqsave(&pm_lock,flags); + /* We need to configure the GPIO or timer interrupts that will bring + * us out of sleep, so we use the specific board wake up source + * (if present) */ + if (board_before_sleep) + board_reason = board_before_sleep(); + if (!force) + reason = board_reason; + + spin_lock_irqsave(&pm_lock, flags); save_core_regs(); flush_cache_all(); - /** The code below is all system dependent and we should probably - ** have a function call out of here to set this up. You need - ** to configure the GPIO or timer interrupts that will bring - ** you out of sleep. - ** For testing, the TOY counter wakeup is useful. - **/ - -#if 0 - au_writel(au_readl(SYS_PINSTATERD) & ~(1 << 11), SYS_PINSTATERD); - - /* gpio 6 can cause a wake up event */ - wakeup = au_readl(SYS_WAKEMSK); - wakeup &= ~(1 << 8); /* turn off match20 wakeup */ - wakeup |= 1 << 6; /* turn on gpio 6 wakeup */ -#else - /* For testing, allow match20 to wake us up. - */ -#ifdef SLEEP_TEST_TIMEOUT - wakeup_counter0_set(sleep_ticks); -#endif - wakeup = 1 << 8; /* turn on match20 wakeup */ - wakeup = 0; -#endif + if (reason == 0) /* machine_halt() */ + wakeup = 0; + else if (reason < 0) { /* TOY wake up */ + ticks = -reason*HZ; + wakeup_counter0_set(ticks); + wakeup = 1<<8; /* turn on match20 as wake up */ + } + else { /* GPIO[0-7] wake up */ + /* FIXME: this setting for GPIO[6] should be into specific + * boards setup... */ + /* We force pin GPIO[6]/SMROMCKE as gpio6 */ + au_writel(au_readl(SYS_PINSTATERD)&~(1<<11), SYS_PINSTATERD); + + wakeup = reason&0x0ff; /* turn on selected gpio as wake up */ + } + printk(KERN_DEBUG "%s - reason %x force %x wakeup %lx ticks %x\n", + __FUNCTION__, reason, force, wakeup, ticks); + au_writel(1, SYS_WAKESRC); /* clear cause */ au_sync(); au_writel(wakeup, SYS_WAKEMSK); @@ -254,102 +290,52 @@ save_and_sleep(); - /* after a wakeup, the cpu vectors back to 0x1fc00000 so + /* after a wake up, the cpu vectors back to 0x1fc00000 so * it's up to the boot code to get us back here. */ restore_core_regs(); - spin_unlock_irqrestore(&pm_lock, flags); - return 0; -} - -static int pm_do_sleep(ctl_table * ctl, int write, struct file *file, - void __user *buffer, size_t * len, loff_t *ppos) -{ - int retval = 0; -#ifdef SLEEP_TEST_TIMEOUT -#define TMPBUFLEN2 16 - char buf[TMPBUFLEN2], *p; -#endif - - if (!write) { - *len = 0; - } else { -#ifdef SLEEP_TEST_TIMEOUT - if (*len > TMPBUFLEN2 - 1) { - return -EFAULT; - } - if (copy_from_user(buf, buffer, *len)) { - return -EFAULT; - } - buf[*len] = 0; - p = buf; - sleep_ticks = simple_strtoul(p, &p, 0); -#endif - retval = pm_send_all(PM_SUSPEND, (void *) 2); - - if (retval) - return retval; - - au_sleep(); - retval = pm_send_all(PM_RESUME, (void *) 0); - } - return retval; -} -static int pm_do_suspend(ctl_table * ctl, int write, struct file *file, - void __user *buffer, size_t * len, loff_t *ppos) -{ - int retval = 0; + spin_unlock_irqrestore(&pm_lock, flags); - if (!write) { - *len = 0; - } else { - retval = pm_send_all(PM_SUSPEND, (void *) 2); - if (retval) - return retval; - suspend_mode = 1; + /* Get wake up source */ + reason = au_readl(SYS_WAKESRC)>>18; + if (reason&(1<<8)) /* Wake up thanks to TOY */ + reason = -ticks*HZ; + + /* Call specific board routine */ + if (board_after_sleep) + board_after_sleep(reason); - retval = pm_send_all(PM_RESUME, (void *) 0); - } - return retval; + return 0; } - -static int pm_do_freq(ctl_table * ctl, int write, struct file *file, +static int au1xxx_pm_do_freq(ctl_table * ctl, int write, struct file *file, void __user *buffer, size_t * len, loff_t *ppos) { int retval = 0, i; - unsigned long val, pll; -#define TMPBUFLEN 64 -#define MAX_CPU_FREQ 396 - char buf[TMPBUFLEN], *p; + unsigned long *valp = (unsigned long *) ctl->data; + unsigned long pll; unsigned long flags, intc0_mask, intc1_mask; unsigned long old_baud_base, old_cpu_freq, baud_rate, old_clk, old_refresh; unsigned long new_baud_base, new_cpu_freq, new_clk, new_refresh; spin_lock_irqsave(&pm_lock, flags); - if (!write) { + + if (!write) *len = 0; - } else { - /* Parse the new frequency */ - if (*len > TMPBUFLEN - 1) { - spin_unlock_irqrestore(&pm_lock, flags); - return -EFAULT; - } - if (copy_from_user(buf, buffer, *len)) { - spin_unlock_irqrestore(&pm_lock, flags); - return -EFAULT; - } - buf[*len] = 0; - p = buf; - val = simple_strtoul(p, &p, 0); - if (val > MAX_CPU_FREQ) { + + retval = proc_dointvec(ctl, write, file, buffer, len, ppos); + +#define MAX_CPU_FREQ 396 + if (write) { + /* Check the new frequency */ + if (*valp > MAX_CPU_FREQ) { spin_unlock_irqrestore(&pm_lock, flags); return -EFAULT; } - pll = val / 12; + pll = *valp / 12; if ((pll > 33) || (pll < 7)) { /* 396 MHz max, 84 MHz min */ /* revisit this for higher speed cpus */ spin_unlock_irqrestore(&pm_lock, flags); @@ -424,72 +410,66 @@ return retval; } +/* + * Called after processes are frozen, but before we shut down devices. + */ +int au1xxx_pm_prepare(suspend_state_t state) +{ + DPRINTK("state = %d\n", state); + return 0; +} -static struct ctl_table pm_table[] = { - {ACPI_S1_SLP_TYP, "suspend", NULL, 0, 0600, NULL, &pm_do_suspend}, - {ACPI_SLEEP, "sleep", NULL, 0, 0600, NULL, &pm_do_sleep}, - {CTL_ACPI, "freq", NULL, 0, 0600, NULL, &pm_do_freq}, - {0} -}; - -static struct ctl_table pm_dir_table[] = { - {CTL_ACPI, "pm", NULL, 0, 0555, pm_table}, - {0} -}; +/* + * Called after down devices. + */ +int au1xxx_pm_enter(suspend_state_t state) +{ + DPRINTK("state = %d\n", state); + return au_sleep(1<<6 /* GPIO 6 */, 1); + /* return au_sleep(-3, 1); */ /* wake up after 3 seconds */ +} /* - * Initialize power interface + * Called after devices are re-setup, but before processes are thawed. */ -static int __init pm_init(void) +int au1xxx_pm_finish(suspend_state_t state) { - register_sysctl_table(pm_dir_table, 1); + DPRINTK("state = %d\n", state); return 0; } -__initcall(pm_init); - +/* + * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk. + */ +static struct pm_ops au1xxx_pm_ops = { + .pm_disk_mode = PM_DISK_FIRMWARE, + .prepare = au1xxx_pm_prepare, + .enter = au1xxx_pm_enter, + .finish = au1xxx_pm_finish, +}; /* - * This is right out of init/main.c + * Set up the old "/proc/sys/pm" interface. */ +static struct ctl_table au1xxx_pm_table[] = { + { CTL_ACPI, "freq", &cpu_freq, sizeof(int), 0600, NULL, &au1xxx_pm_do_freq }, + { 0 }, +}; -/* This is the number of bits of precision for the loops_per_jiffy. Each - bit takes on average 1.5/HZ seconds. This (like the original) is a little - better than 1% */ -#define LPS_PREC 8 +static struct ctl_table pm_dir_table[] = { + { CTL_ACPI, "pm", NULL, 0, 0555, au1xxx_pm_table }, + { 0 }, +}; -static void au1000_calibrate_delay(void) +static int __init au1xxx_pm_init(void) { - unsigned long ticks, loopbit; - int lps_precision = LPS_PREC; - - loops_per_jiffy = (1 << 12); + /* The new interface */ + pm_set_ops(&au1xxx_pm_ops); - while (loops_per_jiffy <<= 1) { - /* wait for "start of" clock tick */ - ticks = jiffies; - while (ticks == jiffies) - /* nothing */ ; - /* Go .. */ - ticks = jiffies; - __delay(loops_per_jiffy); - ticks = jiffies - ticks; - if (ticks) - break; - } + /* The old interface */ + register_sysctl_table(pm_dir_table, 1); -/* Do a binary approximation to get loops_per_jiffy set to equal one clock - (up to lps_precision bits) */ - loops_per_jiffy >>= 1; - loopbit = loops_per_jiffy; - while (lps_precision-- && (loopbit >>= 1)) { - loops_per_jiffy |= loopbit; - ticks = jiffies; - while (ticks == jiffies); - ticks = jiffies; - __delay(loops_per_jiffy); - if (jiffies != ticks) /* longer than 1 tick */ - loops_per_jiffy &= ~loopbit; - } + return 0; } -#endif /* CONFIG_PM */ + +device_initcall(au1xxx_pm_init); --q7oacCJraRPxsh4K-- From giometti@enneenne.com Wed Apr 5 23:12:00 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 05 Apr 2006 23:12:08 +0100 (BST) Received: from 81-174-11-161.f5.ngi.it ([81.174.11.161]:37000 "EHLO goldrake.enneenne.com") by ftp.linux-mips.org with ESMTP id S8133463AbWDEWMA (ORCPT ); Wed, 5 Apr 2006 23:12:00 +0100 Received: from zaigor.enneenne.com ([192.168.32.1]) by goldrake.enneenne.com with esmtp (Exim 4.50) id 1FRGMt-0004LU-G4; Thu, 06 Apr 2006 00:20:51 +0200 Received: from giometti by zaigor.enneenne.com with local (Exim 4.60) (envelope-from ) id 1FRGPU-00052t-Fo; Thu, 06 Apr 2006 00:23:32 +0200 Date: Thu, 6 Apr 2006 00:23:32 +0200 From: Rodolfo Giometti To: Linux MIPS Cc: ppopov@mvista.com Message-ID: <20060405222332.GO7029@enneenne.com> References: <20060405154711.GL7029@enneenne.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060405154711.GL7029@enneenne.com> Organization: GNU/Linux Device Drivers, Embedded Systems and Courses X-PGP-Key: gpg --keyserver keyserver.linux.it --recv-keys D25A5633 User-Agent: Mutt/1.5.11+cvs20060126 X-SA-Exim-Connect-IP: 192.168.32.1 X-SA-Exim-Mail-From: giometti@enneenne.com Subject: Re: Power management for au1000_eth.c X-SA-Exim-Version: 4.2 (built Thu, 03 Mar 2005 10:44:12 +0100) X-SA-Exim-Scanned: Yes (on goldrake.enneenne.com) Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11041 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: giometti@linux.it Precedence: bulk X-list: linux-mips On Wed, Apr 05, 2006 at 05:47:11PM +0200, Rodolfo Giometti wrote: > Hello, > > I'm trying to add power management support to au1000_eth.c driver. Solved! :) Here a patch to implement power management functions for au1000_eth. Note that this patch needs my previous one who implements new power management's sysfs interface. Ciao, Rodolfo -- GNU/Linux Solutions e-mail: giometti@enneenne.com Linux Device Driver giometti@gnudd.com Embedded Systems giometti@linux.it UNIX programming phone: +39 349 2432127 From giometti@enneenne.com Wed Apr 5 23:14:51 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 05 Apr 2006 23:15:02 +0100 (BST) Received: from 81-174-11-161.f5.ngi.it ([81.174.11.161]:52104 "EHLO goldrake.enneenne.com") by ftp.linux-mips.org with ESMTP id S8133463AbWDEWOv (ORCPT ); Wed, 5 Apr 2006 23:14:51 +0100 Received: from zaigor.enneenne.com ([192.168.32.1]) by goldrake.enneenne.com with esmtp (Exim 4.50) id 1FRGPc-0004NR-0A; Thu, 06 Apr 2006 00:23:41 +0200 Received: from giometti by zaigor.enneenne.com with local (Exim 4.60) (envelope-from ) id 1FRGSC-00053M-VC; Thu, 06 Apr 2006 00:26:21 +0200 Date: Thu, 6 Apr 2006 00:26:20 +0200 From: Rodolfo Giometti To: Linux MIPS Cc: ppopov@mvista.com Message-ID: <20060405222620.GP7029@enneenne.com> References: <20060405154711.GL7029@enneenne.com> <20060405222332.GO7029@enneenne.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="hbBJ5WP8dkNDDowN" Content-Disposition: inline In-Reply-To: <20060405222332.GO7029@enneenne.com> Organization: GNU/Linux Device Drivers, Embedded Systems and Courses X-PGP-Key: gpg --keyserver keyserver.linux.it --recv-keys D25A5633 User-Agent: Mutt/1.5.11+cvs20060126 X-SA-Exim-Connect-IP: 192.168.32.1 X-SA-Exim-Mail-From: giometti@enneenne.com Subject: [PATCH] Oops! - Re: Power management for au1000_eth.c X-SA-Exim-Version: 4.2 (built Thu, 03 Mar 2005 10:44:12 +0100) X-SA-Exim-Scanned: Yes (on goldrake.enneenne.com) Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11042 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: giometti@linux.it Precedence: bulk X-list: linux-mips --hbBJ5WP8dkNDDowN Content-Type: multipart/mixed; boundary="gKYyLFtP+LgnHcbx" Content-Disposition: inline --gKYyLFtP+LgnHcbx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Apr 06, 2006 at 12:23:32AM +0200, Rodolfo Giometti wrote: > On Wed, Apr 05, 2006 at 05:47:11PM +0200, Rodolfo Giometti wrote: > > Hello, > >=20 > > I'm trying to add power management support to au1000_eth.c driver. >=20 > Solved! :) >=20 > Here a patch to implement power management functions for au1000_eth. >=20 > Note that this patch needs my previous one who implements new power > management's sysfs interface. The forgotten attachment. :) Ciao, Rodolfo --=20 GNU/Linux Solutions e-mail: giometti@enneenne.com Linux Device Driver giometti@gnudd.com Embedded Systems giometti@linux.it UNIX programming phone: +39 349 2432127 --gKYyLFtP+LgnHcbx Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-au1000_eth-pm Content-Transfer-Encoding: quoted-printable --- /home/develop/embedded/mipsel/linux/linux-mips.git/arch/mips/au1000/com= mon/au1xxx_irqmap.c 2006-03-31 16:57:26.000000000 +0200 +++ arch/mips/au1000/common/au1xxx_irqmap.c 2006-04-03 17:50:49.000000000 += 0200 @@ -118,7 +118,7 @@ { AU1000_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 }, { AU1000_USB_HOST_INT, INTC_INT_LOW_LEVEL, 0 }, { AU1000_ACSYNC_INT, INTC_INT_RISE_EDGE, 0 }, - { AU1500_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0}, + { AU1000_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0}, { AU1500_MAC1_DMA_INT, INTC_INT_HIGH_LEVEL, 0}, { AU1000_AC97C_INT, INTC_INT_RISE_EDGE, 0 }, =20 @@ -152,7 +152,7 @@ { AU1000_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 }, { AU1000_USB_HOST_INT, INTC_INT_LOW_LEVEL, 0 }, { AU1000_ACSYNC_INT, INTC_INT_RISE_EDGE, 0 }, - { AU1100_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0}, + { AU1000_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0}, /*{ AU1000_GPIO215_208_INT, INTC_INT_HIGH_LEVEL, 0},*/ { AU1100_LCD_INT, INTC_INT_HIGH_LEVEL, 0}, { AU1000_AC97C_INT, INTC_INT_RISE_EDGE, 0 }, --- /home/develop/embedded/mipsel/linux/linux-mips.git/arch/mips/au1000/com= mon/platform.c 2006-04-03 18:22:05.000000000 +0200 +++ arch/mips/au1000/common/platform.c 2006-04-05 23:08:55.000000000 +0200 @@ -16,6 +16,78 @@ =20 #include =20 +#if defined(CONFIG_MIPS_AU1X00_ENET) || defined(CONFIG_MIPS_AU1X00_ENET_MO= DULE) +/* Ethernet controllers */ +static struct resource au1xxx_eth0_resources[] =3D { + [0] =3D { + .name =3D "eth-base", + .start =3D ETH0_BASE, + .end =3D ETH0_BASE + 0x0ffff, + .flags =3D IORESOURCE_MEM, + }, + [1] =3D { + .name =3D "eth-mac", + .start =3D MAC0_ENABLE, + .end =3D MAC0_ENABLE + 0x0ffff, + .flags =3D IORESOURCE_MEM, + }, + [2] =3D { + .name =3D "eth-irq", +#if defined(CONFIG_SOC_AU1550) + .start =3D AU1550_MAC0_DMA_INT, + .end =3D AU1550_MAC0_DMA_INT, +#else + .start =3D AU1000_MAC0_DMA_INT, + .end =3D AU1000_MAC0_DMA_INT, +#endif + .flags =3D IORESOURCE_IRQ, + }, +}; + +static struct platform_device au1xxx_eth0_device =3D { + .name =3D "au1xxx-eth", + .id =3D 0, + .num_resources =3D ARRAY_SIZE(au1xxx_eth0_resources), + .resource =3D au1xxx_eth0_resources, +}; + +#if defined(CONFIG_SOC_AU1000) || \ + defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550) +static struct resource au1xxx_eth1_resources[] =3D { + [0] =3D { + .name =3D "eth-base", + .start =3D ETH1_BASE, + .end =3D ETH1_BASE + 0x0ffff, + .flags =3D IORESOURCE_MEM, + }, + [1] =3D { + .name =3D "eth-mac", + .start =3D MAC1_ENABLE, + .end =3D MAC1_ENABLE + 0x0ffff, + .flags =3D IORESOURCE_MEM, + }, + [2] =3D { + .name =3D "eth-irq", +#if defined(CONFIG_SOC_AU1550) + .start =3D AU1550_MAC1_DMA_INT, + .end =3D AU1550_MAC1_DMA_INT, +#else + .start =3D AU1000_MAC1_DMA_INT, + .end =3D AU1000_MAC1_DMA_INT, +#endif + .flags =3D IORESOURCE_IRQ, + }, +}; + +static struct platform_device au1xxx_eth1_device =3D { + .name =3D "au1xxx-eth", + .id =3D 1, + .num_resources =3D ARRAY_SIZE(au1xxx_eth1_resources), + .resource =3D au1xxx_eth1_resources, +}; +#endif +#endif + /* OHCI (USB full speed host controller) */ static struct resource au1xxx_usb_ohci_resources[] =3D { [0] =3D { @@ -272,6 +344,13 @@ #endif =20 static struct platform_device *au1xxx_platform_devices[] __initdata =3D { +#if defined(CONFIG_MIPS_AU1X00_ENET) || defined(CONFIG_MIPS_AU1X00_ENET_MO= DULE) + &au1xxx_eth0_device, +#if defined(CONFIG_SOC_AU1000) || \ + defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550) + &au1xxx_eth1_device, +#endif +#endif &au1xxx_usb_ohci_device, &au1x00_pcmcia_device, #ifdef CONFIG_FB_AU1100 --- a/drivers/net/Kconfig 2 Jul 2005 06:46:30 -0000 1.1.1.1 +++ b/drivers/net/Kconfig 5 Apr 2006 21:20:30 -0000 @@ -440,12 +440,12 @@ Say Y here to support the Ethernet subsystem on your GT96100 card. =20 config MIPS_AU1X00_ENET - bool "MIPS AU1000 Ethernet support" + tristate "MIPS AU1000 Ethernet support" depends on NET_ETHERNET && SOC_AU1X00 select CRC32 help If you have an Alchemy Semi AU1X00 based system - say Y. Otherwise, say N. + say Y or M. Otherwise, say N. =20 config SGI_IOC3_ETH bool "SGI IOC3 Ethernet" --- /home/develop/embedded/mipsel/linux/linux-mips.git/drivers/net/au1000_e= th.c 2006-04-03 18:23:17.000000000 +0200 +++ drivers/net/au1000_eth.c 2006-04-05 23:43:18.000000000 +0200 @@ -9,6 +9,9 @@ * Update: 2004 Bjoern Riemer, riemer@fokus.fraunhofer.de=20 * or riemer@riemer-nt.de: fixed the link beat detection with=20 * ioctls (SIOCGMIIPHY) + * Update: 2006 Rodolfo Giometti: PM support, module support. + * Copyright 2006 Rodolfo Giometti + * * Author: MontaVista Software, Inc. * ppopov@mvista.com or source@mvista.com * @@ -57,6 +60,7 @@ #include #include =20 +#include #include #include #include "au1000_eth.h" @@ -67,8 +71,8 @@ static int au1000_debug =3D 3; #endif =20 -#define DRV_NAME "au1000eth" -#define DRV_VERSION "1.5" +#define DRV_NAME "au1xxx-eth" +#define DRV_VERSION "1.6" #define DRV_AUTHOR "Pete Popov " #define DRV_DESC "Au1xxx on-chip Ethernet driver" =20 @@ -79,7 +83,8 @@ // prototypes static void hard_stop(struct net_device *); static void enable_rx_tx(struct net_device *dev); -static struct net_device * au1000_probe(u32 ioaddr, int irq, int port_num); +static int au1000_lowlevel_probe(struct net_device *ndev, u32 ioaddr, u32 = macen_addr, int port_num); +static void au1000_lowlevel_remove(struct net_device *ndev); static int au1000_init(struct net_device *); static int au1000_open(struct net_device *); static int au1000_close(struct net_device *); @@ -432,6 +437,34 @@ return 0; } =20 +#ifdef CONFIG_PM +int am79c874_suspend(struct net_device *dev, int phy_addr, int level) +{ + s16 mii_control; +=09 + if (au1000_debug > 4) + printk("am79c874_suspend\n"); + + mii_control =3D mdio_read(dev, phy_addr, MII_CONTROL); + mdio_write(dev, phy_addr, MII_CONTROL, mii_control | MII_CNTL_PWRDWN); + mdelay(1); + return 0; +} + +int am79c874_resume(struct net_device *dev, int phy_addr, int level) +{ + s16 mii_control; +=09 + if (au1000_debug > 4) + printk("am79c874_resume\n"); + + mii_control =3D mdio_read(dev, phy_addr, MII_CONTROL); + mdio_write(dev, phy_addr, MII_CONTROL, mii_control & ~MII_CNTL_PWRDWN); + mdelay(1); + return 0; +} +#endif + int lxt971a_init(struct net_device *dev, int phy_addr) { if (au1000_debug > 4) @@ -727,6 +760,10 @@ am79c874_init, am79c874_reset, am79c874_status, +#ifdef CONFIG_PM + am79c874_suspend, + am79c874_resume, +#endif }; =20 struct phy_ops am79c901_ops =3D { @@ -1108,9 +1145,6 @@ dev->name, (unsigned)aup); =20 spin_lock_irqsave(&aup->lock, flags); - if (aup->timer.function =3D=3D &au1000_timer) {/* check if timer initted = */ - del_timer(&aup->timer); - } =20 hard_stop(dev); #ifdef CONFIG_BCM5222_DUAL_PHY @@ -1158,84 +1192,6 @@ } } =20 -static struct { - int port; - u32 base_addr; - u32 macen_addr; - int irq; - struct net_device *dev; -} iflist[2]; - -static int num_ifs; - -/* - * Setup the base address and interupt of the Au1xxx ethernet macs - * based on cpu type and whether the interface is enabled in sys_pinfunc - * register. The last interface is enabled if SYS_PF_NI2 (bit 4) is 0. - */ -static int __init au1000_init_module(void) -{ - struct cpuinfo_mips *c =3D ¤t_cpu_data; - int ni =3D (int)((au_readl(SYS_PINFUNC) & (u32)(SYS_PF_NI2)) >> 4); - struct net_device *dev; - int i, found_one =3D 0; - - switch (c->cputype) { -#ifdef CONFIG_SOC_AU1000 - case CPU_AU1000: - num_ifs =3D 2 - ni; - iflist[0].base_addr =3D AU1000_ETH0_BASE; - iflist[1].base_addr =3D AU1000_ETH1_BASE; - iflist[0].macen_addr =3D AU1000_MAC0_ENABLE; - iflist[1].macen_addr =3D AU1000_MAC1_ENABLE; - iflist[0].irq =3D AU1000_MAC0_DMA_INT; - iflist[1].irq =3D AU1000_MAC1_DMA_INT; - break; -#endif -#ifdef CONFIG_SOC_AU1100 - case CPU_AU1100: - num_ifs =3D 1 - ni; - iflist[0].base_addr =3D AU1100_ETH0_BASE; - iflist[0].macen_addr =3D AU1100_MAC0_ENABLE; - iflist[0].irq =3D AU1100_MAC0_DMA_INT; - break; -#endif -#ifdef CONFIG_SOC_AU1500 - case CPU_AU1500: - num_ifs =3D 2 - ni; - iflist[0].base_addr =3D AU1500_ETH0_BASE; - iflist[1].base_addr =3D AU1500_ETH1_BASE; - iflist[0].macen_addr =3D AU1500_MAC0_ENABLE; - iflist[1].macen_addr =3D AU1500_MAC1_ENABLE; - iflist[0].irq =3D AU1500_MAC0_DMA_INT; - iflist[1].irq =3D AU1500_MAC1_DMA_INT; - break; -#endif -#ifdef CONFIG_SOC_AU1550 - case CPU_AU1550: - num_ifs =3D 2 - ni; - iflist[0].base_addr =3D AU1550_ETH0_BASE; - iflist[1].base_addr =3D AU1550_ETH1_BASE; - iflist[0].macen_addr =3D AU1550_MAC0_ENABLE; - iflist[1].macen_addr =3D AU1550_MAC1_ENABLE; - iflist[0].irq =3D AU1550_MAC0_DMA_INT; - iflist[1].irq =3D AU1550_MAC1_DMA_INT; - break; -#endif - default: - num_ifs =3D 0; - } - for(i =3D 0; i < num_ifs; i++) { - dev =3D au1000_probe(iflist[i].base_addr, iflist[i].irq, i); - iflist[i].dev =3D dev; - if (dev) - found_one++; - } - if (!found_one) - return -ENODEV; - return 0; -} - static int au1000_setup_aneg(struct net_device *dev, u32 advertise) { struct au1000_private *aup =3D (struct au1000_private *)dev->priv; @@ -1435,40 +1391,14 @@ .get_link =3D au1000_get_link }; =20 -static struct net_device * -au1000_probe(u32 ioaddr, int irq, int port_num) +static int=20 +au1000_lowlevel_probe(struct net_device *ndev, u32 ioaddr, u32 macen_addr,= int port_num) { - static unsigned version_printed =3D 0; - struct au1000_private *aup =3D NULL; - struct net_device *dev =3D NULL; + struct au1000_private *aup =3D ndev->priv; db_dest_t *pDB, *pDBfree; char *pmac, *argptr; char ethaddr[6]; - int i, err; - - if (!request_mem_region(CPHYSADDR(ioaddr), MAC_IOSIZE, "Au1x00 ENET")) - return NULL; - - if (version_printed++ =3D=3D 0)=20 - printk("%s version %s %s\n", DRV_NAME, DRV_VERSION, DRV_AUTHOR); - - dev =3D alloc_etherdev(sizeof(struct au1000_private)); - if (!dev) { - printk (KERN_ERR "au1000 eth: alloc_etherdev failed\n"); =20 - return NULL; - } - - if ((err =3D register_netdev(dev))) { - printk(KERN_ERR "Au1x_eth Cannot register net device err %d\n", - err); - free_netdev(dev); - return NULL; - } - - printk("%s: Au1x Ethernet found at 0x%x, irq %d\n",=20 - dev->name, ioaddr, irq); - - aup =3D dev->priv; + int i, ret; =20 /* Allocate the data buffers */ /* Snooping works fine with eth on all au1xxx */ @@ -1477,15 +1407,16 @@ &aup->dma_addr, 0); if (!aup->vaddr) { - free_netdev(dev); - release_mem_region(CPHYSADDR(ioaddr), MAC_IOSIZE); - return NULL; + printk(KERN_ERR "%s: cannot dma_alloc_noncoherent\n", + ndev->name); + ret =3D -ENOMEM; + goto out; } =20 /* aup->mac is the base address of the MAC's registers */ aup->mac =3D (volatile mac_reg_t *)((unsigned long)ioaddr); /* Setup some variables for quick register address access */ - if (ioaddr =3D=3D iflist[0].base_addr) + if (port_num =3D=3D 0) { /* check env variables first */ if (!get_ethernet_addr(ethaddr)) {=20 @@ -1495,7 +1426,7 @@ argptr =3D prom_getcmdline(); if ((pmac =3D strstr(argptr, "ethaddr=3D")) =3D=3D NULL) { printk(KERN_INFO "%s: No mac address found\n",=20 - dev->name); + ndev->name); /* use the hard coded mac addresses */ } else { str2eaddr(ethaddr, pmac + strlen("ethaddr=3D")); @@ -1504,26 +1435,26 @@ } } aup->enable =3D (volatile u32 *)=20 - ((unsigned long)iflist[0].macen_addr); - memcpy(dev->dev_addr, au1000_mac_addr, sizeof(au1000_mac_addr)); + ((unsigned long) macen_addr); + memcpy(ndev->dev_addr, au1000_mac_addr, sizeof(au1000_mac_addr)); setup_hw_rings(aup, MAC0_RX_DMA_ADDR, MAC0_TX_DMA_ADDR); aup->mac_id =3D 0; au_macs[0] =3D aup; } else - if (ioaddr =3D=3D iflist[1].base_addr) + if (port_num =3D=3D 1) { aup->enable =3D (volatile u32 *)=20 - ((unsigned long)iflist[1].macen_addr); - memcpy(dev->dev_addr, au1000_mac_addr, sizeof(au1000_mac_addr)); - dev->dev_addr[4] +=3D 0x10; + ((unsigned long) macen_addr); + memcpy(ndev->dev_addr, au1000_mac_addr, sizeof(au1000_mac_addr)); + ndev->dev_addr[4] +=3D 0x10; setup_hw_rings(aup, MAC1_RX_DMA_ADDR, MAC1_TX_DMA_ADDR); aup->mac_id =3D 1; au_macs[1] =3D aup; } else { - printk(KERN_ERR "%s: bad ioaddr\n", dev->name); + printk(KERN_ERR "%s: bad ioaddr\n", ndev->name); } =20 /* bring the device out of reset, otherwise probing the mii @@ -1536,7 +1467,8 @@ =20 aup->mii =3D kmalloc(sizeof(struct mii_phy), GFP_KERNEL); if (!aup->mii) { - printk(KERN_ERR "%s: out of memory\n", dev->name); + printk(KERN_ERR "%s: out of memory\n", ndev->name); + ret =3D -ENOMEM; goto err_out; } aup->mii->next =3D NULL; @@ -1545,7 +1477,8 @@ aup->mii->mii_control_reg =3D 0; aup->mii->mii_data_reg =3D 0; =20 - if (mii_probe(dev) !=3D 0) { + if (mii_probe(ndev) !=3D 0) { + ret =3D -EBUSY; goto err_out; } =20 @@ -1564,6 +1497,7 @@ for (i =3D 0; i < NUM_RX_DMA; i++) { pDB =3D GetFreeDB(aup); if (!pDB) { + ret =3D -ENOMEM; goto err_out; } aup->rx_dma_ring[i]->buff_stat =3D (unsigned)pDB->dma_addr; @@ -1572,6 +1506,7 @@ for (i =3D 0; i < NUM_TX_DMA; i++) { pDB =3D GetFreeDB(aup); if (!pDB) { + ret =3D -ENOMEM; goto err_out; } aup->tx_dma_ring[i]->buff_stat =3D (unsigned)pDB->dma_addr; @@ -1579,32 +1514,24 @@ aup->tx_db_inuse[i] =3D pDB; } =20 - spin_lock_init(&aup->lock); - dev->base_addr =3D ioaddr; - dev->irq =3D irq; - dev->open =3D au1000_open; - dev->hard_start_xmit =3D au1000_tx; - dev->stop =3D au1000_close; - dev->get_stats =3D au1000_get_stats; - dev->set_multicast_list =3D &set_rx_mode; - dev->do_ioctl =3D &au1000_ioctl; - SET_ETHTOOL_OPS(dev, &au1000_ethtool_ops); - dev->set_config =3D &au1000_set_config; - dev->tx_timeout =3D au1000_tx_timeout; - dev->watchdog_timeo =3D ETH_TX_TIMEOUT; =20 - /*=20 - * The boot code uses the ethernet controller, so reset it to start=20 - * fresh. au1000_init() expects that the device is in reset state. - */ - reset_mac(dev); + return 0; =20 - return dev; +err_out : + au1000_lowlevel_remove(ndev); +out : + return ret; +} + +static void +au1000_lowlevel_remove(struct net_device *ndev) +{ + struct au1000_private *aup =3D ndev->priv; + int i; =20 -err_out: /* here we should have a valid dev plus aup-> register addresses * so we can reset the mac properly.*/ - reset_mac(dev); + reset_mac(ndev); kfree(aup->mii); for (i =3D 0; i < NUM_RX_DMA; i++) { if (aup->rx_db_inuse[i]) @@ -1618,10 +1545,6 @@ MAX_BUF_SIZE * (NUM_TX_BUFFS+NUM_RX_BUFFS), (void *)aup->vaddr, aup->dma_addr); - unregister_netdev(dev); - free_netdev(dev); - release_mem_region(CPHYSADDR(ioaddr), MAC_IOSIZE); - return NULL; } =20 /*=20 @@ -1779,6 +1712,7 @@ if (au1000_debug > 4) printk("%s: close: dev=3D%p\n", dev->name, dev); =20 + del_timer_sync(&aup->timer); reset_mac(dev); =20 spin_lock_irqsave(&aup->lock, flags); @@ -1793,36 +1727,6 @@ return 0; } =20 -static void __exit au1000_cleanup_module(void) -{ - int i, j; - struct net_device *dev; - struct au1000_private *aup; - - for (i =3D 0; i < num_ifs; i++) { - dev =3D iflist[i].dev; - if (dev) { - aup =3D (struct au1000_private *) dev->priv; - unregister_netdev(dev); - kfree(aup->mii); - for (j =3D 0; j < NUM_RX_DMA; j++) { - if (aup->rx_db_inuse[j]) - ReleaseDB(aup, aup->rx_db_inuse[j]); - } - for (j =3D 0; j < NUM_TX_DMA; j++) { - if (aup->tx_db_inuse[j]) - ReleaseDB(aup, aup->tx_db_inuse[j]); - } - dma_free_noncoherent(NULL, - MAX_BUF_SIZE * (NUM_TX_BUFFS+NUM_RX_BUFFS), - (void *)aup->vaddr, - aup->dma_addr); - free_netdev(dev); - release_mem_region(CPHYSADDR(iflist[i].base_addr), MAC_IOSIZE); - } - } -} - static void update_tx_stats(struct net_device *dev, u32 status) { struct au1000_private *aup =3D (struct au1000_private *) dev->priv; @@ -2255,5 +2162,232 @@ return 0; } =20 -module_init(au1000_init_module); -module_exit(au1000_cleanup_module); +/* + * Setup the base address and interupt of the Au1xxx ethernet macs + * based on cpu type and whether the interface is enabled in sys_pinfunc + * register. The last interface is enabled if SYS_PF_NI2 (bit 4) is 0. + */ +static int au1000_drv_probe(struct device *dev) +{ + struct platform_device *pdev =3D to_platform_device(dev); + struct net_device *ndev; + struct au1000_private *aup; + struct resource *res; + static unsigned version_printed =3D 0; + u32 base_addr, macen_addr; + int irq, ret; + + res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "eth-base"); + if (!res) { + ret =3D -ENODEV; + goto out; + } + base_addr =3D res->start; + res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "eth-mac"); + if (!res) { + ret =3D -ENODEV; + goto out; + } + macen_addr =3D res->start; + res =3D platform_get_resource_byname(pdev, IORESOURCE_IRQ, "eth-irq"); + if (!res) { + ret =3D -ENODEV; + goto out; + } + irq =3D res->start; + + if (!request_mem_region(CPHYSADDR(base_addr), MAC_IOSIZE, "Au1x00 ENET"))= { + ret =3D -EBUSY; + goto out; + } + + if (version_printed++ =3D=3D 0)=20 + printk("%s version %s %s\n", DRV_NAME, DRV_VERSION, DRV_AUTHOR); + + ndev =3D alloc_etherdev(sizeof(struct au1000_private)); + if (!ndev) { + printk (KERN_ERR "%s: alloc etherdev failed\n", DRV_NAME); =20 + ret =3D -ENOMEM; + goto out_release_io; + } + SET_MODULE_OWNER(ndev); + SET_NETDEV_DEV(ndev, dev); + + ret =3D au1000_lowlevel_probe(ndev, base_addr, macen_addr, pdev->id); + if (ret < 0) { + printk (KERN_ERR "%s: low level probe failed\n", DRV_NAME); =20 + goto out_free_netdev; + } + + aup =3D ndev->priv; + + spin_lock_init(&aup->lock); + ndev->base_addr =3D base_addr; + ndev->irq =3D irq; + ndev->open =3D au1000_open; + ndev->hard_start_xmit =3D au1000_tx; + ndev->stop =3D au1000_close; + ndev->get_stats =3D au1000_get_stats; + ndev->set_multicast_list =3D &set_rx_mode; + ndev->do_ioctl =3D &au1000_ioctl; + SET_ETHTOOL_OPS(ndev, &au1000_ethtool_ops); + ndev->set_config =3D &au1000_set_config; + ndev->tx_timeout =3D au1000_tx_timeout; + ndev->watchdog_timeo =3D ETH_TX_TIMEOUT; + + /*=20 + * The boot code uses the ethernet controller, so reset it to start=20 + * fresh. au1000_init() expects that the device is in reset state. + */ + reset_mac(ndev); + + ret =3D register_netdev(ndev); + if (ret) { + printk(KERN_ERR "%s: cannot register net device err %d\n", + DRV_NAME, ret); + goto out_lowlevel_remove; + } + + printk("%s: Au1x Ethernet found at 0x%x, irq %d\n",=20 + ndev->name, base_addr, irq); + + dev_set_drvdata(dev, ndev); + + return 0; + +out_lowlevel_remove : + au1000_lowlevel_remove(ndev); +out_free_netdev : + free_netdev(ndev); +out_release_io : + release_mem_region(CPHYSADDR(base_addr), MAC_IOSIZE); +out : + printk("%s: not found (%d).\n", DRV_NAME, ret); + + return ret; +} + +static int au1000_drv_remove(struct device *dev) +{ + struct platform_device *pdev =3D to_platform_device(dev); + struct net_device *ndev =3D dev_get_drvdata(dev); + struct resource *res; + + dev_set_drvdata(dev, NULL); + + unregister_netdev(ndev); + au1000_lowlevel_remove(ndev); + free_netdev(ndev); + + res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "eth-base"); + if (!res) { + printk(DRV_NAME ": warning! Invalid data!"); + return -EINVAL; + } + release_mem_region(CPHYSADDR(res->start), MAC_IOSIZE); + + return 0; +} + +#ifdef CONFIG_PM +static int au1000_drv_suspend(struct device *dev, pm_message_t state, u32 = level) +{ + struct net_device *ndev =3D dev_get_drvdata(dev); + struct au1000_private *aup =3D (struct au1000_private *) ndev->priv; + + if (!ndev) + return 0; + + switch (level) { + case SUSPEND_DISABLE : + if (netif_running(ndev)) + netif_device_detach(ndev); + + break; +=09 + case SUSPEND_SAVE_STATE : + /* bring the device out of reset, otherwise accessing to mii + * will hang */ + *aup->enable =3D MAC_EN_CLOCK_ENABLE; + au_sync_delay(2); + *aup->enable =3D MAC_EN_RESET0 | MAC_EN_RESET1 |=20 + MAC_EN_RESET2 | MAC_EN_CLOCK_ENABLE; + au_sync_delay(2); + + if (aup->phy_ops->phy_suspend) + aup->phy_ops->phy_suspend(ndev, aup->phy_addr, level); + + au1000_lowlevel_remove(ndev); + + break; + + case SUSPEND_POWER_DOWN : + + break; + } + + return 0; +} + +static int au1000_drv_resume(struct device *dev, u32 level) +{ + struct net_device *ndev =3D dev_get_drvdata(dev); + struct au1000_private *aup =3D (struct au1000_private *) ndev->priv; + int ret; + + if (!ndev) + return 0; + + switch (level) { + case RESUME_RESTORE_STATE : + ret =3D au1000_lowlevel_probe(ndev, aup->mac, aup->enable, aup->mac_id); + if (ret < 0) { + printk (KERN_ERR "%s: low level probe failed\n", DRV_NAME); =20 + return ret; + } + + if (aup->phy_ops->phy_resume) + aup->phy_ops->phy_resume(ndev, aup->phy_addr, level); + aup->phy_ops->phy_init(ndev, aup->phy_addr); + + /* au1000_init() expects that the device is in reset state. + */ + reset_mac(ndev); /* au1000_init() expects the device in reset */ + au1000_init(ndev); + + break; + + case RESUME_ENABLE : + if (netif_running(ndev)) + netif_device_attach(ndev); + + break; + } + + return 0; +} +#endif + +static struct device_driver au1000_driver =3D { + .name =3D DRV_NAME, + .bus =3D &platform_bus_type, + .probe =3D au1000_drv_probe, + .remove =3D au1000_drv_remove, +#ifdef CONFIG_PM + .suspend =3D au1000_drv_suspend, + .resume =3D au1000_drv_resume, +#endif +}; + +static int __init au1000_eth_init(void) +{ + return driver_register(&au1000_driver); +} + +static void __exit au1000_eth_cleanup(void) +{ + driver_unregister(&au1000_driver); +} + +module_init(au1000_eth_init); +module_exit(au1000_eth_cleanup); --- /home/develop/embedded/mipsel/linux/linux-mips.git/drivers/net/au1000_e= th.h 2006-03-31 16:58:55.000000000 +0200 +++ drivers/net/au1000_eth.h 2006-04-05 12:55:56.000000000 +0200 @@ -152,6 +152,8 @@ int (*phy_init) (struct net_device *, int); int (*phy_reset) (struct net_device *, int); int (*phy_status) (struct net_device *, int, u16 *, u16 *); + int (*phy_suspend) (struct net_device *, int, int); + int (*phy_resume) (struct net_device *, int, int); }; =20 /*=20 --gKYyLFtP+LgnHcbx-- --hbBJ5WP8dkNDDowN Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) iD8DBQFENEQMQaTCYNJaVjMRAni3AJ476k6BnYMSfYPpAVq1yBpSA2ATpQCgyt++ tAiUqb75CVIW4cNUrdfD9k8= =EDFg -----END PGP SIGNATURE----- --hbBJ5WP8dkNDDowN-- From yoichi_yuasa@tripeaks.co.jp Thu Apr 6 03:56:24 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 06 Apr 2006 03:56:33 +0100 (BST) Received: from mo00.po.2iij.net ([210.130.202.204]:13775 "EHLO mo00.po.2iij.net") by ftp.linux-mips.org with ESMTP id S8133514AbWDFC4Y (ORCPT ); Thu, 6 Apr 2006 03:56:24 +0100 Received: NPO MO00 id k3637dRZ004392; Thu, 6 Apr 2006 12:07:39 +0900 (JST) Received: from localhost.localdomain (65.126.232.202.bf.2iij.net [202.232.126.65]) by mbox.po.2iij.net (NPO-MR/mbox02) id k3637bv7025230 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NOT); Thu, 6 Apr 2006 12:07:38 +0900 (JST) Date: Thu, 6 Apr 2006 12:07:37 +0900 From: Yoichi Yuasa To: Ralf Baechle Cc: yoichi_yuasa@tripeaks.co.jp, linux-mips@linux-mips.org Subject: [PATCH] vr41xx: fix plat_irq_dispatch() Message-Id: <20060406120737.689accd3.yoichi_yuasa@tripeaks.co.jp> Organization: TriPeaks Corporation X-Mailer: Sylpheed version 1.0.4 (GTK+ 1.2.10; i386-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-Envid: tripeaks.co.jp Envelope-Id: tripeaks.co.jp X-archive-position: 11043 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: yoichi_yuasa@tripeaks.co.jp Precedence: bulk X-list: linux-mips Hi Ralf, This patch has fixed the wrong conversion of plat_irq_dispatch() for vr41xx. Please apply. Yoichi Signed-off-by: Yoichi Yuasa diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/vr41xx/common/irq.c mips/arch/mips/vr41xx/common/irq.c --- mips-orig/arch/mips/vr41xx/common/irq.c 2006-04-06 11:26:29.216597750 +0900 +++ mips/arch/mips/vr41xx/common/irq.c 2006-04-06 11:57:42.581675750 +0900 @@ -91,23 +91,16 @@ asmlinkage void plat_irq_dispatch(struct if (pending & CAUSEF_IP7) do_IRQ(7, regs); else if (pending & 0x7800) { - if (pending & CAUSEF_IP3) { + if (pending & CAUSEF_IP3) irq_dispatch(3, regs); - return; - } else if (pending & CAUSEF_IP4) { + else if (pending & CAUSEF_IP4) irq_dispatch(4, regs); - return; - } else if (pending & CAUSEF_IP5) { + else if (pending & CAUSEF_IP5) irq_dispatch(5, regs); - return; - } else if (pending & CAUSEF_IP6) { + else if (pending & CAUSEF_IP6) irq_dispatch(6, regs); - return; - } - } - - if (pending & CAUSEF_IP2) - do_IRQ(2, regs); + } else if (pending & CAUSEF_IP2) + irq_dispatch(2, regs); else if (pending & CAUSEF_IP0) do_IRQ(0, regs); else if (pending & CAUSEF_IP1) From yoichi_yuasa@tripeaks.co.jp Thu Apr 6 08:44:11 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 06 Apr 2006 08:44:21 +0100 (BST) Received: from mo01.po.2iij.net ([210.130.202.205]:58336 "EHLO mo01.po.2iij.net") by ftp.linux-mips.org with ESMTP id S8133462AbWDFHoL (ORCPT ); Thu, 6 Apr 2006 08:44:11 +0100 Received: NPO MO01 id k367tRhN004609; Thu, 6 Apr 2006 16:55:27 +0900 (JST) Received: from localhost.localdomain (65.126.232.202.bf.2iij.net [202.232.126.65]) by mbox.po.2iij.net (NPO-MR/mbox02) id k367tQOw024524 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NOT); Thu, 6 Apr 2006 16:55:26 +0900 (JST) Message-Id: <200604060755.k367tQOw024524@mbox02.po.2iij.net> Date: Thu, 6 Apr 2006 16:55:26 +0900 From: Yoichi Yuasa To: Ralf Baechle Cc: yoichi_yuasa@tripeaks.co.jp, linux-mips@linux-mips.org Subject: Re: [MIPS] MT: Improved multithreading support. In-Reply-To: <4955666b0604060047x42cdc3e3kefb1d95737cc08e7@mail.gmail.com> References: <4955666b0604060047x42cdc3e3kefb1d95737cc08e7@mail.gmail.com> Organization: TriPeaks Corporation X-Mailer: Sylpheed version 1.0.4 (GTK+ 1.2.10; i386-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-Envid: tripeaks.co.jp Envelope-Id: tripeaks.co.jp X-archive-position: 11044 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: yoichi_yuasa@tripeaks.co.jp Precedence: bulk X-list: linux-mips Hi Ralf, > Subject: [MIPS] MT: Improved multithreading support. > To: git-commits@linux-mips.org > > > Author: Ralf Baechle Wed Apr 5 09:45:47 2006 +0100 > Commit: 79cc8007b93838a670b164b8a55ab3e735a12a8b > Gitweb: http://www.linux-mips.org/g/linux/79cc8007 > Branch: master > > Signed-off-by: Ralf Baechle I think it's maybe typo. Yoichi Signed-off-by: Yoichi Yuasa diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/Kconfig mips/arch/mips/Kconfig --- mips-orig/arch/mips/Kconfig 2006-04-06 11:26:26.460425500 +0900 +++ mips/arch/mips/Kconfig 2006-04-06 16:44:56.935829750 +0900 @@ -1617,7 +1617,7 @@ source "mm/Kconfig" config SMP bool "Multi-Processing support" - depends on CPU_RM9000 || ((SIBYTE_BCM1x80 || SIBYTE_BCM1x55 || SIBYTE_SB1250 || QEMU) && !SIBYTE_STANDALONE) || SGI_IP27 || MIPS_MT_SMP || MIPS_MT_SMP + depends on CPU_RM9000 || ((SIBYTE_BCM1x80 || SIBYTE_BCM1x55 || SIBYTE_SB1250 || QEMU) && !SIBYTE_STANDALONE) || SGI_IP27 || MIPS_MT_SMP || MIPS_MT_SMTC ---help--- This enables support for systems with more than one CPU. If you have a system with only one CPU, like most personal computers, say N. If From ralf@linux-mips.org Thu Apr 6 14:04:49 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 06 Apr 2006 14:04:59 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:22173 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133515AbWDFNEt (ORCPT ); Thu, 6 Apr 2006 14:04:49 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k36DG7W4001520; Thu, 6 Apr 2006 14:16:07 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k36DG6xb001519; Thu, 6 Apr 2006 14:16:06 +0100 Date: Thu, 6 Apr 2006 14:16:06 +0100 From: Ralf Baechle To: Yoichi Yuasa Cc: linux-mips@linux-mips.org Subject: Re: [MIPS] MT: Improved multithreading support. Message-ID: <20060406131606.GA31552@linux-mips.org> References: <4955666b0604060047x42cdc3e3kefb1d95737cc08e7@mail.gmail.com> <200604060755.k367tQOw024524@mbox02.po.2iij.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200604060755.k367tQOw024524@mbox02.po.2iij.net> User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11045 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Thu, Apr 06, 2006 at 04:55:26PM +0900, Yoichi Yuasa wrote: > I think it's maybe typo. Yes, a mistake when fixing up the rejects in forward porting the 34k-merge branch. Ralf From ralf@linux-mips.org Thu Apr 6 14:14:34 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 06 Apr 2006 14:14:51 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:14279 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133515AbWDFNOe (ORCPT ); Thu, 6 Apr 2006 14:14:34 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k366s8oi028333 for ; Thu, 6 Apr 2006 07:54:08 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k366r3FF028324; Thu, 6 Apr 2006 07:53:03 +0100 Date: Thu, 6 Apr 2006 07:53:03 +0100 From: Ralf Baechle To: Yoichi Yuasa Cc: linux-mips@linux-mips.org Subject: Re: [PATCH] vr41xx: fix plat_irq_dispatch() Message-ID: <20060406065303.GA28314@linux-mips.org> References: <20060406120737.689accd3.yoichi_yuasa@tripeaks.co.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060406120737.689accd3.yoichi_yuasa@tripeaks.co.jp> User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11046 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Thu, Apr 06, 2006 at 12:07:37PM +0900, Yoichi Yuasa wrote: > This patch has fixed the wrong conversion of plat_irq_dispatch() for vr41xx. > Please apply. Thanks, applied. Let's hope this is all that broke in the rewrite ... Ralf From anemo@mba.ocn.ne.jp Thu Apr 6 15:01:52 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 06 Apr 2006 15:02:00 +0100 (BST) Received: from mba.ocn.ne.jp ([210.190.142.172]:55537 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S8133467AbWDFOBw (ORCPT ); Thu, 6 Apr 2006 15:01:52 +0100 Received: from localhost (p7200-ipad30funabasi.chiba.ocn.ne.jp [221.184.82.200]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id CA894AE62 for ; Thu, 6 Apr 2006 23:13:05 +0900 (JST) Date: Thu, 06 Apr 2006 23:13:23 +0900 (JST) Message-Id: <20060406.231323.108307238.anemo@mba.ocn.ne.jp> To: linux-mips@linux-mips.org Subject: Re: [MIPS] Handle IDE PIO cache aliases on SMP. From: Atsushi Nemoto In-Reply-To: References: X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11047 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips On Wed, 05 Apr 2006 20:31:05 +0100, linux-mips@linux-mips.org wrote: > Author: Ralf Baechle Wed Apr 5 20:42:04 2006 +0100 > Commit: 7310307e37090796c2d343e46dc34b452f0a5d1c > Gitweb: http://www.linux-mips.org/g/linux/7310307e > Branch: master It seems overkill for UP. How about adding ifdef like this? static inline void __ide_flush_prologue(void) { #ifdef CONFIG_SMP if (cpu_has_dc_aliases) preempt_disable(); #endif } --- Atsushi Nemoto From sshtylyov@ru.mvista.com Thu Apr 6 15:33:39 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 06 Apr 2006 15:33:48 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:56761 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133467AbWDFOdj (ORCPT ); Thu, 6 Apr 2006 15:33:39 +0100 Received: (qmail 30386 invoked from network); 6 Apr 2006 18:46:15 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 6 Apr 2006 18:46:15 -0000 Message-ID: <4435290C.50607@ru.mvista.com> Date: Thu, 06 Apr 2006 18:43:24 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: Linux MIPS CC: Rodolfo Giometti , Jordan Crouse , Pete Popov Subject: Re: [PATCH] Oops! - Re: Power management for au1000_eth.c References: <20060405154711.GL7029@enneenne.com> <20060405222332.GO7029@enneenne.com> <20060405222620.GP7029@enneenne.com> In-Reply-To: <20060405222620.GP7029@enneenne.com> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11048 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips Hello. Rodolfo Giometti wrote: >>>I'm trying to add power management support to au1000_eth.c driver. >>Solved! :) >>Here a patch to implement power management functions for au1000_eth. Actually, the network driver patches should be sent to Jeff Garzik and Andrew Morton. >>Note that this patch needs my previous one who implements new power >>management's sysfs interface. > The forgotten attachment. :) Funny, I've also been cooking a patch to straighten Alchemy Ethernet probing code a bit... > ------------------------------------------------------------------------ > > --- /home/develop/embedded/mipsel/linux/linux-mips.git/arch/mips/au1000/common/au1xxx_irqmap.c 2006-03-31 16:57:26.000000000 +0200 > +++ arch/mips/au1000/common/au1xxx_irqmap.c 2006-04-03 17:50:49.000000000 +0200 > @@ -118,7 +118,7 @@ > { AU1000_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 }, > { AU1000_USB_HOST_INT, INTC_INT_LOW_LEVEL, 0 }, > { AU1000_ACSYNC_INT, INTC_INT_RISE_EDGE, 0 }, > - { AU1500_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0}, > + { AU1000_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0}, > { AU1500_MAC1_DMA_INT, INTC_INT_HIGH_LEVEL, 0}, > { AU1000_AC97C_INT, INTC_INT_RISE_EDGE, 0 }, > > @@ -152,7 +152,7 @@ > { AU1000_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 }, > { AU1000_USB_HOST_INT, INTC_INT_LOW_LEVEL, 0 }, > { AU1000_ACSYNC_INT, INTC_INT_RISE_EDGE, 0 }, > - { AU1100_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0}, > + { AU1000_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0}, > /*{ AU1000_GPIO215_208_INT, INTC_INT_HIGH_LEVEL, 0},*/ > { AU1100_LCD_INT, INTC_INT_HIGH_LEVEL, 0}, > { AU1000_AC97C_INT, INTC_INT_RISE_EDGE, 0 }, Don't think these changes are necessary. > --- /home/develop/embedded/mipsel/linux/linux-mips.git/arch/mips/au1000/common/platform.c 2006-04-03 18:22:05.000000000 +0200 > +++ arch/mips/au1000/common/platform.c 2006-04-05 23:08:55.000000000 +0200 > @@ -16,6 +16,78 @@ > > #include > > +#if defined(CONFIG_MIPS_AU1X00_ENET) || defined(CONFIG_MIPS_AU1X00_ENET_MODULE) > +/* Ethernet controllers */ > +static struct resource au1xxx_eth0_resources[] = { > + [0] = { > + .name = "eth-base", > + .start = ETH0_BASE, > + .end = ETH0_BASE + 0x0ffff, > + .flags = IORESOURCE_MEM, > + }, NAK, ETH0_BASE not defined anywhere, and that address differs between SOCs. Note that this must be a *physical* address, not KSEG1-base. > + [1] = { > + .name = "eth-mac", > + .start = MAC0_ENABLE, > + .end = MAC0_ENABLE + 0x0ffff, > + .flags = IORESOURCE_MEM, > + }, NAK, because: 1) MAC0_ENABLE not defined anywhere, and that address differs between SOCs; 2) MAC enable register occupies 4 bytes, not 65536. [...] > +#if defined(CONFIG_SOC_AU1000) || \ > + defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550) > +static struct resource au1xxx_eth1_resources[] = { > + [0] = { > + .name = "eth-base", > + .start = ETH1_BASE, > + .end = ETH1_BASE + 0x0ffff, > + .flags = IORESOURCE_MEM, > + }, > + [1] = { > + .name = "eth-mac", > + .start = MAC1_ENABLE, > + .end = MAC1_ENABLE + 0x0ffff, > + .flags = IORESOURCE_MEM, > + }, Same here. > --- /home/develop/embedded/mipsel/linux/linux-mips.git/drivers/net/au1000_eth.c 2006-04-03 18:23:17.000000000 +0200 > +++ drivers/net/au1000_eth.c 2006-04-05 23:43:18.000000000 +0200 [...] > @@ -67,8 +71,8 @@ > static int au1000_debug = 3; > #endif > > -#define DRV_NAME "au1000eth" > -#define DRV_VERSION "1.5" > +#define DRV_NAME "au1xxx-eth" au1000_eth, according to the driver name. > +#define DRV_VERSION "1.6" Heh, nobody keeps track of the versions. :-) > @@ -1435,40 +1391,14 @@ > .get_link = au1000_get_link > }; > > -static struct net_device * > -au1000_probe(u32 ioaddr, int irq, int port_num) > +static int > +au1000_lowlevel_probe(struct net_device *ndev, u32 ioaddr, u32 macen_addr, int port_num) [...] > @@ -1477,15 +1407,16 @@ > &aup->dma_addr, > 0); > if (!aup->vaddr) { > - free_netdev(dev); > - release_mem_region(CPHYSADDR(ioaddr), MAC_IOSIZE); > - return NULL; > + printk(KERN_ERR "%s: cannot dma_alloc_noncoherent\n", > + ndev->name); > + ret = -ENOMEM; > + goto out; > } > > /* aup->mac is the base address of the MAC's registers */ > aup->mac = (volatile mac_reg_t *)((unsigned long)ioaddr); NAK, ioaddr should be physical address. > /* Setup some variables for quick register address access */ > - if (ioaddr == iflist[0].base_addr) > + if (port_num == 0) Yep, I disliked this code too. :-) > { > /* check env variables first */ > if (!get_ethernet_addr(ethaddr)) { > @@ -1495,7 +1426,7 @@ > argptr = prom_getcmdline(); > if ((pmac = strstr(argptr, "ethaddr=")) == NULL) { > printk(KERN_INFO "%s: No mac address found\n", > - dev->name); > + ndev->name); > /* use the hard coded mac addresses */ > } else { > str2eaddr(ethaddr, pmac + strlen("ethaddr=")); > @@ -1504,26 +1435,26 @@ > } > } > aup->enable = (volatile u32 *) > - ((unsigned long)iflist[0].macen_addr); > - memcpy(dev->dev_addr, au1000_mac_addr, sizeof(au1000_mac_addr)); > + ((unsigned long) macen_addr); NAK, macen_addr should have been a physical address at that point too (if the plarform definitions were correct :-). Also, this could have been done outside of "if". > + memcpy(ndev->dev_addr, au1000_mac_addr, sizeof(au1000_mac_addr)); That too. > setup_hw_rings(aup, MAC0_RX_DMA_ADDR, MAC0_TX_DMA_ADDR); > aup->mac_id = 0; > au_macs[0] = aup; > } > else > - if (ioaddr == iflist[1].base_addr) > + if (port_num == 1) > { > aup->enable = (volatile u32 *) > - ((unsigned long)iflist[1].macen_addr); > - memcpy(dev->dev_addr, au1000_mac_addr, sizeof(au1000_mac_addr)); > - dev->dev_addr[4] += 0x10; > + ((unsigned long) macen_addr); > + memcpy(ndev->dev_addr, au1000_mac_addr, sizeof(au1000_mac_addr)); > + ndev->dev_addr[4] += 0x10; Actually, the DBAu15x0 boards have their Ethernet addresess differ by 1 in the last byte, not by 0x10 in the next to last one. This code assigns to the port an address different to what's printed on a port's sticker. This should be fixed I guess... > setup_hw_rings(aup, MAC1_RX_DMA_ADDR, MAC1_TX_DMA_ADDR); > aup->mac_id = 1; > au_macs[1] = aup; > } > else > { > - printk(KERN_ERR "%s: bad ioaddr\n", dev->name); > + printk(KERN_ERR "%s: bad ioaddr\n", ndev->name); > } Doubt we need this "else" at all... > @@ -2255,5 +2162,232 @@ > return 0; > } > > -module_init(au1000_init_module); > -module_exit(au1000_cleanup_module); > +/* > + * Setup the base address and interupt of the Au1xxx ethernet macs > + * based on cpu type and whether the interface is enabled in sys_pinfunc > + * register. The last interface is enabled if SYS_PF_NI2 (bit 4) is 0. > + */ > +static int au1000_drv_probe(struct device *dev) > +{ > + struct platform_device *pdev = to_platform_device(dev); > + struct net_device *ndev; > + struct au1000_private *aup; > + struct resource *res; > + static unsigned version_printed = 0; > + u32 base_addr, macen_addr; > + int irq, ret; > + > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "eth-base"); > + if (!res) { > + ret = -ENODEV; > + goto out; > + } > + base_addr = res->start; > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "eth-mac"); > + if (!res) { > + ret = -ENODEV; > + goto out; > + } > + macen_addr = res->start; > + res = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "eth-irq"); > + if (!res) { > + ret = -ENODEV; > + goto out; > + } > + irq = res->start; > + > + if (!request_mem_region(CPHYSADDR(base_addr), MAC_IOSIZE, "Au1x00 ENET")) { NAK, base_addr should adready be a physical address. Also, why no request_mem_region() for the MAC enable register? > + ret = au1000_lowlevel_probe(ndev, base_addr, macen_addr, pdev->id); Remember, The passed addresses are physical at that point. [...] WBR, Sergei From giometti@enneenne.com Thu Apr 6 16:38:38 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 06 Apr 2006 16:38:49 +0100 (BST) Received: from 81-174-11-161.f5.ngi.it ([81.174.11.161]:65429 "EHLO goldrake.enneenne.com") by ftp.linux-mips.org with ESMTP id S8133522AbWDFPii (ORCPT ); Thu, 6 Apr 2006 16:38:38 +0100 Received: from zaigor.enneenne.com ([192.168.32.1]) by goldrake.enneenne.com with esmtp (Exim 4.50) id 1FRWhj-0000aJ-RX; Thu, 06 Apr 2006 17:47:28 +0200 Received: from giometti by zaigor.enneenne.com with local (Exim 4.60) (envelope-from ) id 1FRWkN-0007k4-Q3; Thu, 06 Apr 2006 17:50:11 +0200 Date: Thu, 6 Apr 2006 17:50:11 +0200 From: Rodolfo Giometti To: Linux MIPS Cc: Sergei Shtylyov , Jordan Crouse , Pete Popov Message-ID: <20060406155011.GC23424@enneenne.com> References: <20060405154711.GL7029@enneenne.com> <20060405222332.GO7029@enneenne.com> <20060405222620.GP7029@enneenne.com> <4435290C.50607@ru.mvista.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="oFbHfjnMgUMsrGjO" Content-Disposition: inline In-Reply-To: <4435290C.50607@ru.mvista.com> Organization: GNU/Linux Device Drivers, Embedded Systems and Courses X-PGP-Key: gpg --keyserver keyserver.linux.it --recv-keys D25A5633 User-Agent: Mutt/1.5.11+cvs20060126 X-SA-Exim-Connect-IP: 192.168.32.1 X-SA-Exim-Mail-From: giometti@enneenne.com Subject: Re: [PATCH] Oops! - Re: Power management for au1000_eth.c X-SA-Exim-Version: 4.2 (built Thu, 03 Mar 2005 10:44:12 +0100) X-SA-Exim-Scanned: Yes (on goldrake.enneenne.com) Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11049 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: giometti@linux.it Precedence: bulk X-list: linux-mips --oFbHfjnMgUMsrGjO Content-Type: multipart/mixed; boundary="lteA1dqeVaWQ9QQl" Content-Disposition: inline --lteA1dqeVaWQ9QQl Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Apr 06, 2006 at 06:43:24PM +0400, Sergei Shtylyov wrote: >=20 > Actually, the network driver patches should be sent to Jeff Garzik and= =20 > Andrew Morton. Ok. Sorry. Hope they can get the patch from this list. > Funny, I've also been cooking a patch to straighten Alchemy Ethernet= =20 > probing code a bit... :) > >------------------------------------------------------------------------ > > > >---=20 > >/home/develop/embedded/mipsel/linux/linux-mips.git/arch/mips/au1000/comm= on/au1xxx_irqmap.c 2006-03-31 16:57:26.000000000 +0200 > >+++ arch/mips/au1000/common/au1xxx_irqmap.c 2006-04-03=20 > >17:50:49.000000000 +0200 > >@@ -118,7 +118,7 @@ > > { AU1000_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 }, > > { AU1000_USB_HOST_INT, INTC_INT_LOW_LEVEL, 0 }, > > { AU1000_ACSYNC_INT, INTC_INT_RISE_EDGE, 0 }, > >- { AU1500_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0}, > >+ { AU1000_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0}, > > { AU1500_MAC1_DMA_INT, INTC_INT_HIGH_LEVEL, 0}, > > { AU1000_AC97C_INT, INTC_INT_RISE_EDGE, 0 }, > >=20 > >@@ -152,7 +152,7 @@ > > { AU1000_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 }, > > { AU1000_USB_HOST_INT, INTC_INT_LOW_LEVEL, 0 }, > > { AU1000_ACSYNC_INT, INTC_INT_RISE_EDGE, 0 }, > >- { AU1100_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0}, > >+ { AU1000_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0}, > > /*{ AU1000_GPIO215_208_INT, INTC_INT_HIGH_LEVEL, 0},*/ > > { AU1100_LCD_INT, INTC_INT_HIGH_LEVEL, 0}, > > { AU1000_AC97C_INT, INTC_INT_RISE_EDGE, 0 }, >=20 > Don't think these changes are necessary. These are necessary to group togheter CPUs that have the same parameters. > >---=20 > >/home/develop/embedded/mipsel/linux/linux-mips.git/arch/mips/au1000/comm= on/platform.c 2006-04-03 18:22:05.000000000 +0200 > >+++ arch/mips/au1000/common/platform.c 2006-04-05=20 > >23:08:55.000000000 +0200 > >@@ -16,6 +16,78 @@ > >=20 > > #include > >=20 > >+#if defined(CONFIG_MIPS_AU1X00_ENET) ||=20 > >defined(CONFIG_MIPS_AU1X00_ENET_MODULE) > >+/* Ethernet controllers */ > >+static struct resource au1xxx_eth0_resources[] =3D { > >+ [0] =3D { > >+ .name =3D "eth-base", > >+ .start =3D ETH0_BASE, > >+ .end =3D ETH0_BASE + 0x0ffff, > > + .flags =3D IORESOURCE_MEM, > > + }, >=20 > NAK, ETH0_BASE not defined anywhere, and that address differs between= =20 > SOCs. > Note that this must be a *physical* address, not KSEG1-base. You are right! I forgot to add the attached file... I'm very sorry but I must work on an older Linux version which still use CVS. I can't switch to GIT right now and I have to build my patches by hands. In the attached file you can see that I grouped togheter CPUs that have the same configuration parameters. > > /* Setup some variables for quick register address access */ > >- if (ioaddr =3D=3D iflist[0].base_addr) > >+ if (port_num =3D=3D 0) >=20 > Yep, I disliked this code too. :-) I just use the "id" filed instaed of using the base address. It seems to me more readable... > > { > > /* check env variables first */ > > if (!get_ethernet_addr(ethaddr)) {=20 > >@@ -1495,7 +1426,7 @@ > > argptr =3D prom_getcmdline(); > > if ((pmac =3D strstr(argptr, "ethaddr=3D")) =3D=3D NULL) { > > printk(KERN_INFO "%s: No mac address=20 > > found\n", - dev->name); > >+ ndev->name); > > /* use the hard coded mac addresses */ > > } else { > > str2eaddr(ethaddr, pmac +=20 > > strlen("ethaddr=3D")); > >@@ -1504,26 +1435,26 @@ > > } > > } > > aup->enable =3D (volatile u32 *)=20 > >- ((unsigned long)iflist[0].macen_addr); > >- memcpy(dev->dev_addr, au1000_mac_addr,=20 > >sizeof(au1000_mac_addr)); > >+ ((unsigned long) macen_addr); >=20 > NAK, macen_addr should have been a physical address at that point too > (if the plarform definitions were correct :-). Also, this could have bee= n=20 > done > outside of "if". I just keeped the original structure... > > setup_hw_rings(aup, MAC0_RX_DMA_ADDR, MAC0_TX_DMA_ADDR); > > aup->mac_id =3D 0; > > au_macs[0] =3D aup; > > } > > else > >- if (ioaddr =3D=3D iflist[1].base_addr) > >+ if (port_num =3D=3D 1) > > { > > aup->enable =3D (volatile u32 *)=20 > >- ((unsigned long)iflist[1].macen_addr); > >- memcpy(dev->dev_addr, au1000_mac_addr,=20 > >sizeof(au1000_mac_addr)); > >- dev->dev_addr[4] +=3D 0x10; > >+ ((unsigned long) macen_addr); > >+ memcpy(ndev->dev_addr, au1000_mac_addr,=20 > >sizeof(au1000_mac_addr)); > >+ ndev->dev_addr[4] +=3D 0x10; >=20 > Actually, the DBAu15x0 boards have their Ethernet addresess differ by = 1=20 > in the last byte, not by 0x10 in the next to last one. This code assig= ns to=20 > the port an address different to what's printed on a port's sticker. This= =20 > should be fixed I guess... Yes. However this comes from the previous driver version and I'm working on an Au1100 based board. :) > >@@ -2255,5 +2162,232 @@ > > return 0; > > } > >=20 > >-module_init(au1000_init_module); > >-module_exit(au1000_cleanup_module); > >+/* > >+ * Setup the base address and interupt of the Au1xxx ethernet macs > >+ * based on cpu type and whether the interface is enabled in sys_pinfunc > >+ * register. The last interface is enabled if SYS_PF_NI2 (bit 4) is 0. > >+ */ > >+static int au1000_drv_probe(struct device *dev) > >+{ > >+ struct platform_device *pdev =3D to_platform_device(dev); > >+ struct net_device *ndev; > >+ struct au1000_private *aup; > >+ struct resource *res; > >+ static unsigned version_printed =3D 0; > >+ u32 base_addr, macen_addr; > >+ int irq, ret; > >+ > >+ res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "eth-base"); > >+ if (!res) { > >+ ret =3D -ENODEV; > >+ goto out; > >+ } > >+ base_addr =3D res->start; > >+ res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "eth-mac"); > >+ if (!res) { > >+ ret =3D -ENODEV; > >+ goto out; > >+ } > >+ macen_addr =3D res->start; > >+ res =3D platform_get_resource_byname(pdev, IORESOURCE_IRQ, "eth-irq"); > >+ if (!res) { > >+ ret =3D -ENODEV; > >+ goto out; > >+ } > >+ irq =3D res->start; > >+ > >+ if (!request_mem_region(CPHYSADDR(base_addr), MAC_IOSIZE, "Au1x00=20 > >ENET")) { >=20 > NAK, base_addr should adready be a physical address. Also, why no=20 > request_mem_region() > for the MAC enable register? Yes. I forgot to add it. Thanks for your suggestions! But I'd like to know if I have to change something and resubmit the patch or these suggestions can be resolved during the merging of the code... Ciao, Rodolfo --=20 GNU/Linux Solutions e-mail: giometti@enneenne.com Linux Device Driver giometti@gnudd.com Embedded Systems giometti@linux.it UNIX programming phone: +39 349 2432127 --lteA1dqeVaWQ9QQl Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-au1000_eth-pm-2 Content-Transfer-Encoding: quoted-printable --- /home/develop/embedded/mipsel/linux/linux-mips.git/include/asm-mips/mac= h-au1x00/au1000.h 2006-04-03 18:24:38.000000000 +0200 +++ include/asm-mips/mach-au1x00/au1000.h 2006-04-06 17:31:04.000000000 +02= 00 @@ -606,11 +690,10 @@ #define USB_OHCI_BASE 0x10100000 // phys addr for ioremap #define USB_HOST_CONFIG 0xB017fffc =20 -#define AU1000_ETH0_BASE 0xB0500000 -#define AU1000_ETH1_BASE 0xB0510000 -#define AU1000_MAC0_ENABLE 0xB0520000 -#define AU1000_MAC1_ENABLE 0xB0520004 -#define NUM_ETH_INTERFACES 2 +#define ETH0_BASE 0xB0500000 +#define ETH1_BASE 0xB0510000 +#define MAC0_ENABLE 0xB0520000 +#define MAC1_ENABLE 0xB0520004 #endif /* CONFIG_SOC_AU1000 */ =20 /* Au1500 */ @@ -635,8 +718,8 @@ #define AU1000_USB_DEV_SUS_INT 25 #define AU1000_USB_HOST_INT 26 #define AU1000_ACSYNC_INT 27 -#define AU1500_MAC0_DMA_INT 28 -#define AU1500_MAC1_DMA_INT 29 +#define AU1000_MAC0_DMA_INT 28 +#define AU1000_MAC1_DMA_INT 29 #define AU1000_AC97C_INT 31 #define AU1000_GPIO_0 32 #define AU1000_GPIO_1 33 @@ -683,11 +766,10 @@ #define USB_OHCI_BASE 0x10100000 // phys addr for ioremap #define USB_HOST_CONFIG 0xB017fffc =20 -#define AU1500_ETH0_BASE 0xB1500000 -#define AU1500_ETH1_BASE 0xB1510000 -#define AU1500_MAC0_ENABLE 0xB1520000 -#define AU1500_MAC1_ENABLE 0xB1520004 -#define NUM_ETH_INTERFACES 2 +#define ETH0_BASE 0xB1500000 +#define ETH1_BASE 0xB1510000 +#define MAC0_ENABLE 0xB1520000 +#define MAC1_ENABLE 0xB1520004 #endif /* CONFIG_SOC_AU1500 */ =20 /* Au1100 */ @@ -713,8 +795,8 @@ #define AU1000_USB_DEV_SUS_INT 25 #define AU1000_USB_HOST_INT 26 #define AU1000_ACSYNC_INT 27 -#define AU1100_MAC0_DMA_INT 28 -#define AU1100_GPIO_208_215 29 +#define AU1000_MAC0_DMA_INT 28 +#define AU1100_GPIO_208_215 29 #define AU1100_LCD_INT 30 #define AU1000_AC97C_INT 31 #define AU1000_GPIO_0 32 @@ -757,8 +839,8 @@ #define USB_OHCI_BASE 0x10100000 // phys addr for ioremap #define USB_HOST_CONFIG 0xB017fffc =20 -#define AU1100_ETH0_BASE 0xB0500000 -#define AU1100_MAC0_ENABLE 0xB0520000 +#define ETH0_BASE 0xB0500000 +#define MAC0_ENABLE 0xB0520000 #define NUM_ETH_INTERFACES 1 #endif /* CONFIG_SOC_AU1100 */ =20 @@ -841,11 +923,10 @@ #define USB_OHCI_LEN 0x00060000 #define USB_HOST_CONFIG 0xB4027ffc =20 -#define AU1550_ETH0_BASE 0xB0500000 -#define AU1550_ETH1_BASE 0xB0510000 -#define AU1550_MAC0_ENABLE 0xB0520000 -#define AU1550_MAC1_ENABLE 0xB0520004 -#define NUM_ETH_INTERFACES 2 +#define ETH0_BASE 0xB0500000 +#define ETH1_BASE 0xB0510000 +#define MAC0_ENABLE 0xB0520000 +#define MAC1_ENABLE 0xB0520004 #endif /* CONFIG_SOC_AU1550 */ =20 #ifdef CONFIG_SOC_AU1200 --lteA1dqeVaWQ9QQl-- --oFbHfjnMgUMsrGjO Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) iD8DBQFENTizQaTCYNJaVjMRAqniAJ9Kr93sG5XQVi9foA/S4H1ts33J+wCgh7mh YFvvcmOOa1dVrmX2DfK/8I0= =s3LV -----END PGP SIGNATURE----- --oFbHfjnMgUMsrGjO-- From anemo@mba.ocn.ne.jp Thu Apr 6 16:56:14 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 06 Apr 2006 16:56:24 +0100 (BST) Received: from mba.ocn.ne.jp ([210.190.142.172]:56562 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S8133522AbWDFP4O (ORCPT ); Thu, 6 Apr 2006 16:56:14 +0100 Received: from localhost (p7200-ipad30funabasi.chiba.ocn.ne.jp [221.184.82.200]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 16E57AF42 for ; Fri, 7 Apr 2006 01:07:29 +0900 (JST) Date: Fri, 07 Apr 2006 01:07:47 +0900 (JST) Message-Id: <20060407.010747.54918087.anemo@mba.ocn.ne.jp> To: linux-mips@linux-mips.org Subject: Re: [MIPS] MIPS boards: Set HZ to 100. From: Atsushi Nemoto In-Reply-To: References: X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11050 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips On Wed, 05 Apr 2006 16:56:10 +0100, linux-mips@linux-mips.org wrote: > Author: Ralf Baechle Wed Apr 5 09:45:48 2006 +0100 > Commit: 6cd1d4d23e7c16ba914ae458d205c3298f3183a7 > Gitweb: http://www.linux-mips.org/g/linux/6cd1d4d2 > Branch: master > > 1000Hz will bring an FPGA CPU down on it's knees and it's even worse on > multithreaded cores. How about using Kconfig.hz to make HZ configurable? I'll send a patch. --- Atsushi Nemoto From anemo@mba.ocn.ne.jp Thu Apr 6 16:58:26 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 06 Apr 2006 16:58:39 +0100 (BST) Received: from mba.ocn.ne.jp ([210.190.142.172]:57557 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S8133522AbWDFP60 (ORCPT ); Thu, 6 Apr 2006 16:58:26 +0100 Received: from localhost (p7200-ipad30funabasi.chiba.ocn.ne.jp [221.184.82.200]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id BD6DDAAC7; Fri, 7 Apr 2006 01:09:41 +0900 (JST) Date: Fri, 07 Apr 2006 01:10:00 +0900 (JST) Message-Id: <20060407.011000.77652835.anemo@mba.ocn.ne.jp> To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org Subject: [PATCH] use CONFIG_HZ From: Atsushi Nemoto X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11051 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips Make HZ configurable (except for DECSTATION which is using special HZ value which is out of choice). Also remove some param.h files and update all defconfigs according to current HZ value (except for JAZZ which does not have defconfig). Signed-off-by: Atsushi Nemoto b/arch/mips/Kconfig | 3 +++ b/arch/mips/configs/atlas_defconfig | 4 ++++ b/arch/mips/configs/bigsur_defconfig | 4 ++++ b/arch/mips/configs/capcella_defconfig | 4 ++++ b/arch/mips/configs/cobalt_defconfig | 4 ++++ b/arch/mips/configs/db1000_defconfig | 4 ++++ b/arch/mips/configs/db1100_defconfig | 4 ++++ b/arch/mips/configs/db1200_defconfig | 4 ++++ b/arch/mips/configs/db1500_defconfig | 4 ++++ b/arch/mips/configs/db1550_defconfig | 4 ++++ b/arch/mips/configs/ddb5476_defconfig | 4 ++++ b/arch/mips/configs/ddb5477_defconfig | 4 ++++ b/arch/mips/configs/e55_defconfig | 4 ++++ b/arch/mips/configs/ev64120_defconfig | 4 ++++ b/arch/mips/configs/ev96100_defconfig | 4 ++++ b/arch/mips/configs/ip22_defconfig | 4 ++++ b/arch/mips/configs/ip27_defconfig | 4 ++++ b/arch/mips/configs/ip32_defconfig | 4 ++++ b/arch/mips/configs/it8172_defconfig | 4 ++++ b/arch/mips/configs/ivr_defconfig | 4 ++++ b/arch/mips/configs/jaguar-atx_defconfig | 4 ++++ b/arch/mips/configs/jmr3927_defconfig | 4 ++++ b/arch/mips/configs/lasat200_defconfig | 4 ++++ b/arch/mips/configs/malta_defconfig | 4 ++++ b/arch/mips/configs/mipssim_defconfig | 4 ++++ b/arch/mips/configs/mpc30x_defconfig | 4 ++++ b/arch/mips/configs/ocelot_3_defconfig | 4 ++++ b/arch/mips/configs/ocelot_c_defconfig | 4 ++++ b/arch/mips/configs/ocelot_defconfig | 4 ++++ b/arch/mips/configs/ocelot_g_defconfig | 4 ++++ b/arch/mips/configs/pb1100_defconfig | 4 ++++ b/arch/mips/configs/pb1500_defconfig | 4 ++++ b/arch/mips/configs/pb1550_defconfig | 4 ++++ b/arch/mips/configs/pnx8550-jbs_defconfig | 4 ++++ b/arch/mips/configs/pnx8550-v2pci_defconfig | 4 ++++ b/arch/mips/configs/qemu_defconfig | 4 ++++ b/arch/mips/configs/rbhma4500_defconfig | 4 ++++ b/arch/mips/configs/rm200_defconfig | 4 ++++ b/arch/mips/configs/sb1250-swarm_defconfig | 4 ++++ b/arch/mips/configs/sead_defconfig | 4 ++++ b/arch/mips/configs/tb0226_defconfig | 4 ++++ b/arch/mips/configs/tb0229_defconfig | 4 ++++ b/arch/mips/configs/tb0287_defconfig | 4 ++++ b/arch/mips/configs/workpad_defconfig | 4 ++++ b/arch/mips/configs/yosemite_defconfig | 4 ++++ b/arch/mips/defconfig | 4 ++++ b/include/asm-mips/mach-generic/param.h | 2 +- include/asm-mips/mach-jazz/param.h | 16 ---------------- include/asm-mips/mach-mips/param.h | 13 ------------- include/asm-mips/mach-qemu/param.h | 13 ------------- 50 files changed, 184 insertions(+), 43 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 71d9a4b..dfc6764 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1652,6 +1652,9 @@ config NR_CPUS This is purely to save memory - each supported CPU adds approximately eight kilobytes to the kernel image. +if !MACH_DECSTATION +source "kernel/Kconfig.hz" +endif source "kernel/Kconfig.preempt" config RTC_DS1742 diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig index 80da9c8..ffbecbf 100644 --- a/arch/mips/configs/atlas_defconfig +++ b/arch/mips/configs/atlas_defconfig @@ -142,6 +142,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_HZ_100=y +# CONFIG_HZ_250 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=100 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index 05566a2..139b259 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig @@ -144,6 +144,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_SMP=y CONFIG_NR_CPUS=4 CONFIG_PREEMPT_NONE=y diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig index a69dafb..bb987ed 100644 --- a/arch/mips/configs/capcella_defconfig +++ b/arch/mips/configs/capcella_defconfig @@ -128,6 +128,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig index 6a4940b..6e4d516 100644 --- a/arch/mips/configs/cobalt_defconfig +++ b/arch/mips/configs/cobalt_defconfig @@ -128,6 +128,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig index 6d7bcc0..06edc5a 100644 --- a/arch/mips/configs/db1000_defconfig +++ b/arch/mips/configs/db1000_defconfig @@ -129,6 +129,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig index acd2ffe..1ee44b1 100644 --- a/arch/mips/configs/db1100_defconfig +++ b/arch/mips/configs/db1100_defconfig @@ -129,6 +129,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig index d918754..60b46e8 100644 --- a/arch/mips/configs/db1200_defconfig +++ b/arch/mips/configs/db1200_defconfig @@ -129,6 +129,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig index 5491a51..6d37ec3 100644 --- a/arch/mips/configs/db1500_defconfig +++ b/arch/mips/configs/db1500_defconfig @@ -131,6 +131,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig index 425d939..497e1c6 100644 --- a/arch/mips/configs/db1550_defconfig +++ b/arch/mips/configs/db1550_defconfig @@ -130,6 +130,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig index 4837b3c..340d3ad 100644 --- a/arch/mips/configs/ddb5476_defconfig +++ b/arch/mips/configs/ddb5476_defconfig @@ -129,6 +129,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig index e3a3786..7be250d 100644 --- a/arch/mips/configs/ddb5477_defconfig +++ b/arch/mips/configs/ddb5477_defconfig @@ -129,6 +129,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig index 263cc38..3919ae8 100644 --- a/arch/mips/configs/e55_defconfig +++ b/arch/mips/configs/e55_defconfig @@ -126,6 +126,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig index e0d7e07..a0777ff 100644 --- a/arch/mips/configs/ev64120_defconfig +++ b/arch/mips/configs/ev64120_defconfig @@ -131,6 +131,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ev96100_defconfig b/arch/mips/configs/ev96100_defconfig index 095bfe3..717dc9b 100644 --- a/arch/mips/configs/ev96100_defconfig +++ b/arch/mips/configs/ev96100_defconfig @@ -135,6 +135,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index f66ba91..cd82a4a 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig @@ -136,6 +136,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 33f18c6..1c3e692 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig @@ -133,6 +133,10 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_NEED_MULTIPLE_NODES=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_MIGRATION=y CONFIG_SMP=y CONFIG_NR_CPUS=64 diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index 2b8f223..9eeb18e 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig @@ -135,6 +135,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/it8172_defconfig b/arch/mips/configs/it8172_defconfig index a5ac713..9009bae 100644 --- a/arch/mips/configs/it8172_defconfig +++ b/arch/mips/configs/it8172_defconfig @@ -130,6 +130,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ivr_defconfig b/arch/mips/configs/ivr_defconfig index 3cf9750..5602579 100644 --- a/arch/mips/configs/ivr_defconfig +++ b/arch/mips/configs/ivr_defconfig @@ -127,6 +127,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig index 9f6303d..6a2009f 100644 --- a/arch/mips/configs/jaguar-atx_defconfig +++ b/arch/mips/configs/jaguar-atx_defconfig @@ -136,6 +136,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 # CONFIG_SMP is not set CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig index a2ce2e1..a9eb001 100644 --- a/arch/mips/configs/jmr3927_defconfig +++ b/arch/mips/configs/jmr3927_defconfig @@ -125,6 +125,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig index d742529..bc755a3 100644 --- a/arch/mips/configs/lasat200_defconfig +++ b/arch/mips/configs/lasat200_defconfig @@ -134,6 +134,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 50c8679..1ad6480 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig @@ -148,6 +148,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_HZ_100=y +# CONFIG_HZ_250 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=100 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig index 4b3342c..63cac5b 100644 --- a/arch/mips/configs/mipssim_defconfig +++ b/arch/mips/configs/mipssim_defconfig @@ -134,6 +134,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig index 3e75368..68c3200 100644 --- a/arch/mips/configs/mpc30x_defconfig +++ b/arch/mips/configs/mpc30x_defconfig @@ -128,6 +128,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig index 4197ac3..703e826 100644 --- a/arch/mips/configs/ocelot_3_defconfig +++ b/arch/mips/configs/ocelot_3_defconfig @@ -136,6 +136,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 # CONFIG_SMP is not set CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig index da777cb..12b1167 100644 --- a/arch/mips/configs/ocelot_c_defconfig +++ b/arch/mips/configs/ocelot_c_defconfig @@ -132,6 +132,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig index 9ff6ab5..1904393 100644 --- a/arch/mips/configs/ocelot_defconfig +++ b/arch/mips/configs/ocelot_defconfig @@ -137,6 +137,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig index 7df9ce9..2822b32 100644 --- a/arch/mips/configs/ocelot_g_defconfig +++ b/arch/mips/configs/ocelot_g_defconfig @@ -135,6 +135,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig index fc28746..a304a44 100644 --- a/arch/mips/configs/pb1100_defconfig +++ b/arch/mips/configs/pb1100_defconfig @@ -131,6 +131,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig index a09be54..da00155 100644 --- a/arch/mips/configs/pb1500_defconfig +++ b/arch/mips/configs/pb1500_defconfig @@ -130,6 +130,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig index b8bcbc2..3a6e717 100644 --- a/arch/mips/configs/pb1550_defconfig +++ b/arch/mips/configs/pb1550_defconfig @@ -130,6 +130,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig index 91ff3ba..6570804 100644 --- a/arch/mips/configs/pnx8550-jbs_defconfig +++ b/arch/mips/configs/pnx8550-jbs_defconfig @@ -129,6 +129,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig index 932c803..fb1c190 100644 --- a/arch/mips/configs/pnx8550-v2pci_defconfig +++ b/arch/mips/configs/pnx8550-v2pci_defconfig @@ -130,6 +130,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig index 0d3ce64..d922bcb 100644 --- a/arch/mips/configs/qemu_defconfig +++ b/arch/mips/configs/qemu_defconfig @@ -126,6 +126,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_HZ_100=y +# CONFIG_HZ_250 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=100 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig index 0ad74a5..ffc9470 100644 --- a/arch/mips/configs/rbhma4500_defconfig +++ b/arch/mips/configs/rbhma4500_defconfig @@ -138,6 +138,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig index fab27fe..82d9ea5 100644 --- a/arch/mips/configs/rm200_defconfig +++ b/arch/mips/configs/rm200_defconfig @@ -138,6 +138,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index 9060622..2fb8391 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig @@ -148,6 +148,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_PREEMPT_NONE=y diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig index de02881..64095ec 100644 --- a/arch/mips/configs/sead_defconfig +++ b/arch/mips/configs/sead_defconfig @@ -133,6 +133,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index 8f4f06c..dd90743 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_defconfig @@ -130,6 +130,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig index 5f54e27..5886b0b 100644 --- a/arch/mips/configs/tb0229_defconfig +++ b/arch/mips/configs/tb0229_defconfig @@ -130,6 +130,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig index fe3ba4f..c5c0ee8 100644 --- a/arch/mips/configs/tb0287_defconfig +++ b/arch/mips/configs/tb0287_defconfig @@ -135,6 +135,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig index bd5bd46..569ecbe 100644 --- a/arch/mips/configs/workpad_defconfig +++ b/arch/mips/configs/workpad_defconfig @@ -126,6 +126,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig index 2c0c25e..423e840 100644 --- a/arch/mips/configs/yosemite_defconfig +++ b/arch/mips/configs/yosemite_defconfig @@ -130,6 +130,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_PREEMPT_NONE=y diff --git a/arch/mips/defconfig b/arch/mips/defconfig index f66ba91..cd82a4a 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig @@ -136,6 +136,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set diff --git a/include/asm-mips/mach-generic/param.h b/include/asm-mips/mach-generic/param.h index a0d12f9..3ba0ed7 100644 --- a/include/asm-mips/mach-generic/param.h +++ b/include/asm-mips/mach-generic/param.h @@ -8,6 +8,6 @@ #ifndef __ASM_MACH_GENERIC_PARAM_H #define __ASM_MACH_GENERIC_PARAM_H -#define HZ 1000 /* Internal kernel timer frequency */ +#define HZ CONFIG_HZ /* internal kernel timer frequency */ #endif /* __ASM_MACH_GENERIC_PARAM_H */ diff --git a/include/asm-mips/mach-jazz/param.h b/include/asm-mips/mach-jazz/param.h deleted file mode 100644 index 639763a..0000000 --- a/include/asm-mips/mach-jazz/param.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2003 by Ralf Baechle - */ -#ifndef __ASM_MACH_JAZZ_PARAM_H -#define __ASM_MACH_JAZZ_PARAM_H - -/* - * Jazz is currently using the internal 100Hz timer of the R4030 - */ -#define HZ 100 /* Internal kernel timer frequency */ - -#endif /* __ASM_MACH_JAZZ_PARAM_H */ diff --git a/include/asm-mips/mach-mips/param.h b/include/asm-mips/mach-mips/param.h deleted file mode 100644 index 805ef6d..0000000 --- a/include/asm-mips/mach-mips/param.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2003 by Ralf Baechle - */ -#ifndef __ASM_MACH_MIPS_PARAM_H -#define __ASM_MACH_MIPS_PARAM_H - -#define HZ 100 /* Internal kernel timer frequency */ - -#endif /* __ASM_MACH_MIPS_PARAM_H */ diff --git a/include/asm-mips/mach-qemu/param.h b/include/asm-mips/mach-qemu/param.h deleted file mode 100644 index cb30ee4..0000000 --- a/include/asm-mips/mach-qemu/param.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2005 by Ralf Baechle - */ -#ifndef __ASM_MACH_QEMU_PARAM_H -#define __ASM_MACH_QEMU_PARAM_H - -#define HZ 100 /* Internal kernel timer frequency */ - -#endif /* __ASM_MACH_QEMU_PARAM_H */ From jcrouse@cosmic.amd.com Thu Apr 6 17:23:29 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 06 Apr 2006 17:23:41 +0100 (BST) Received: from amdext4.amd.com ([163.181.251.6]:56015 "EHLO amdext4.amd.com") by ftp.linux-mips.org with ESMTP id S8133525AbWDFQX3 (ORCPT ); Thu, 6 Apr 2006 17:23:29 +0100 Received: from SAUSGW02.amd.com (sausgw02.amd.com [163.181.250.22]) by amdext4.amd.com (8.12.11/8.12.11/AMD) with ESMTP id k36GXjLN003251; Thu, 6 Apr 2006 11:34:40 -0500 Received: from 163.181.22.101 by SAUSGW02.amd.com with ESMTP (AMD SMTP Relay (Email Firewall v6.1.0)); Thu, 06 Apr 2006 11:34:24 -0500 X-Server-Uuid: 5FC0E2DF-CD44-48CD-883A-0ED95B391E89 Received: from ldcmail.amd.com ([147.5.200.40]) by sausexbh1.amd.com with Microsoft SMTPSVC(6.0.3790.0); Thu, 6 Apr 2006 09:34:23 -0700 Received: from cosmic.amd.com (cosmic.amd.com [147.5.201.206]) by ldcmail.amd.com (Postfix) with ESMTP id 952CC2028; Thu, 6 Apr 2006 10:34:22 -0600 (MDT) Received: from cosmic.amd.com (localhost [127.0.0.1]) by cosmic.amd.com (8.13.4/8.13.4) with ESMTP id k36HAMxf002053; Thu, 6 Apr 2006 11:10:22 -0600 Received: (from jcrouse@localhost) by cosmic.amd.com ( 8.13.4/8.13.4/Submit) id k36HAMsY002052; Thu, 6 Apr 2006 11:10:22 -0600 Date: Thu, 6 Apr 2006 11:10:21 -0600 From: "Jordan Crouse" To: "Sergei Shtylyov" cc: "Linux MIPS" , "Rodolfo Giometti" , "Pete Popov" Subject: Re: Oops! - Re: Power management for au1000_eth.c Message-ID: <20060406171021.GK22446@cosmic.amd.com> References: <20060405154711.GL7029@enneenne.com> <20060405222332.GO7029@enneenne.com> <20060405222620.GP7029@enneenne.com> <4435290C.50607@ru.mvista.com> MIME-Version: 1.0 In-Reply-To: <4435290C.50607@ru.mvista.com> User-Agent: Mutt/1.5.11 X-OriginalArrivalTime: 06 Apr 2006 16:34:24.0152 (UTC) FILETIME=[F6C29980:01C65997] X-WSS-ID: 682B9C9A3H42809518-01-01 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11052 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: jordan.crouse@amd.com Precedence: bulk X-list: linux-mips On 06/04/06 18:43 +0400, Sergei Shtylyov wrote: > Hello. > > Rodolfo Giometti wrote: > > >>>I'm trying to add power management support to au1000_eth.c driver. > > >>Solved! :) > > >>Here a patch to implement power management functions for au1000_eth. > > Actually, the network driver patches should be sent to Jeff Garzik and > Andrew Morton. And the description is wrong - this isn't exactly just power management, there are lots of changes here. You should separate them out into multiple patches. > >>Note that this patch needs my previous one who implements new power > >>management's sysfs interface. Thats OK, as long as this patch can be applied on its own, without requiring the previous patch. It is one thing to write a new PM interface for the whole system, but the driver suspend and resume functions should never be system specific. That makes life easier for future developers. > Funny, I've also been cooking a patch to straighten Alchemy Ethernet > probing code a bit... I think we can all get along here. The PM stuff looks decent to me, and Sergei had some good comments about the rest of the patch. I don't see any reason why the two of you can't get together and bang out a few patches to fix all of our ills. Jordan -- Jordan Crouse Senior Linux Engineer AMD - Personal Connectivity Solutions Group From jcrouse@cosmic.amd.com Thu Apr 6 17:29:42 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 06 Apr 2006 17:29:51 +0100 (BST) Received: from amdext4.amd.com ([163.181.251.6]:22737 "EHLO amdext4.amd.com") by ftp.linux-mips.org with ESMTP id S8133525AbWDFQ3m (ORCPT ); Thu, 6 Apr 2006 17:29:42 +0100 Received: from SAUSGW01.amd.com (sausgw01.amd.com [163.181.250.21]) by amdext4.amd.com (8.12.11/8.12.11/AMD) with ESMTP id k36Gew1b006061; Thu, 6 Apr 2006 11:40:59 -0500 Received: from 139.95.53.182 by SAUSGW02.amd.com with ESMTP (AMD SMTP Relay (Email Firewall v6.1.0)); Thu, 06 Apr 2006 11:40:47 -0500 X-Server-Uuid: 5FC0E2DF-CD44-48CD-883A-0ED95B391E89 Received: from ldcmail.amd.com ([147.5.200.40]) by SSVLEXBH1.amd.com with Microsoft SMTPSVC(6.0.3790.0); Thu, 6 Apr 2006 09:40:45 -0700 Received: from cosmic.amd.com (cosmic.amd.com [147.5.201.206]) by ldcmail.amd.com (Postfix) with ESMTP id BF22C2028; Thu, 6 Apr 2006 10:40:44 -0600 (MDT) Received: from cosmic.amd.com (localhost [127.0.0.1]) by cosmic.amd.com (8.13.4/8.13.4) with ESMTP id k36HGjXD002073; Thu, 6 Apr 2006 11:16:45 -0600 Received: (from jcrouse@localhost) by cosmic.amd.com ( 8.13.4/8.13.4/Submit) id k36HGjsJ002072; Thu, 6 Apr 2006 11:16:45 -0600 Date: Thu, 6 Apr 2006 11:16:45 -0600 From: "Jordan Crouse" To: "Rodolfo Giometti" cc: "Linux MIPS" Subject: Re: sysfs interface for Au1xxx power management Message-ID: <20060406171645.GL22446@cosmic.amd.com> References: <20060405221933.GN7029@enneenne.com> MIME-Version: 1.0 In-Reply-To: <20060405221933.GN7029@enneenne.com> User-Agent: Mutt/1.5.11 X-OriginalArrivalTime: 06 Apr 2006 16:40:45.0530 (UTC) FILETIME=[DA1443A0:01C65998] X-WSS-ID: 682B9B053H42812326-01-01 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11053 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: jordan.crouse@amd.com Precedence: bulk X-list: linux-mips On 06/04/06 00:19 +0200, Rodolfo Giometti wrote: > Hello, > > here a patch to support new sysfs interface for Au1xxx's power > management. Now we can put the system into sleeping mode by using: > > hostname:~# echo mem > /sys/power/state > > The patch keeps also the file "/proc/sys/pm/freq" from the old > interface. Generally looks good, thought I just glanced it over and I didn't take it for a test run. > /* Quick acpi hack. This will have to change! */ > -#define CTL_ACPI 9999 > -#define ACPI_S1_SLP_TYP 19 > -#define ACPI_SLEEP 21 > +#define CTL_ACPI 9999 > +#define ACPI_S1_SLP_TYP 19 > +#define ACPI_SLEEP 21 Code review comment - you have lots of minor typo fixes and whitespace changes. You should Keep whitespace changes to a minimum, or better yet put then in a separate patch. They detract from the actual meat of your effort, and makes it tough to code review. Jordan -- Jordan Crouse Senior Linux Engineer AMD - Personal Connectivity Solutions Group From ralf@linux-mips.org Thu Apr 6 18:51:28 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 06 Apr 2006 18:51:36 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:22953 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133539AbWDFRv2 (ORCPT ); Thu, 6 Apr 2006 18:51:28 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k36I2mKQ021296; Thu, 6 Apr 2006 19:02:49 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k36I2l5p021295; Thu, 6 Apr 2006 19:02:47 +0100 Date: Thu, 6 Apr 2006 19:02:47 +0100 From: Ralf Baechle To: Atsushi Nemoto Cc: linux-mips@linux-mips.org Subject: Re: [PATCH] use CONFIG_HZ Message-ID: <20060406180247.GA20449@linux-mips.org> References: <20060407.011000.77652835.anemo@mba.ocn.ne.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060407.011000.77652835.anemo@mba.ocn.ne.jp> User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11054 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Fri, Apr 07, 2006 at 01:10:00AM +0900, Atsushi Nemoto wrote: > Make HZ configurable (except for DECSTATION which is using special HZ > value which is out of choice). Also remove some param.h files and > update all defconfigs according to current HZ value (except for JAZZ > which does not have defconfig). Looking good except for Jazz which because it currently isn't using the count/compare timer is limited to 100Hz only. Ralf From macro@linux-mips.org Fri Apr 7 12:06:46 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 12:06:57 +0100 (BST) Received: from pollux.ds.pg.gda.pl ([153.19.208.7]:58636 "HELO pollux.ds.pg.gda.pl") by ftp.linux-mips.org with SMTP id S8133529AbWDGLGq (ORCPT ); Fri, 7 Apr 2006 12:06:46 +0100 Received: from localhost (localhost [127.0.0.1]) by pollux.ds.pg.gda.pl (Postfix) with ESMTP id 79FE9F7DA1; Fri, 7 Apr 2006 13:18:03 +0200 (CEST) Received: from pollux.ds.pg.gda.pl ([127.0.0.1]) by localhost (pollux.ds.pg.gda.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 09966-09; Fri, 7 Apr 2006 13:18:03 +0200 (CEST) Received: from piorun.ds.pg.gda.pl (piorun.ds.pg.gda.pl [153.19.208.8]) by pollux.ds.pg.gda.pl (Postfix) with ESMTP id AD4E6F7D9D; Fri, 7 Apr 2006 13:18:01 +0200 (CEST) Received: from blysk.ds.pg.gda.pl (macro@blysk.ds.pg.gda.pl [153.19.208.6]) by piorun.ds.pg.gda.pl (8.13.6/8.13.1) with ESMTP id k37BI6GY018227; Fri, 7 Apr 2006 13:18:07 +0200 Date: Fri, 7 Apr 2006 12:18:03 +0100 (BST) From: "Maciej W. Rozycki" To: Atsushi Nemoto cc: linux-mips@linux-mips.org, ralf@linux-mips.org Subject: Re: [PATCH] use CONFIG_HZ In-Reply-To: <20060407.011000.77652835.anemo@mba.ocn.ne.jp> Message-ID: References: <20060407.011000.77652835.anemo@mba.ocn.ne.jp> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Virus-Scanned: ClamAV 0.88/1380/Fri Apr 7 08:46:22 2006 on piorun.ds.pg.gda.pl X-Virus-Status: Clean X-Virus-Scanned: by amavisd-new at pollux.ds.pg.gda.pl Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11055 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: macro@linux-mips.org Precedence: bulk X-list: linux-mips On Fri, 7 Apr 2006, Atsushi Nemoto wrote: > Make HZ configurable (except for DECSTATION which is using special HZ > value which is out of choice). Also remove some param.h files and The DECstation could actually use a choice of 128Hz, 256Hz and 1024Hz if anybody cared. Maciej From ralf@linux-mips.org Fri Apr 7 14:14:29 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 14:14:39 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:36052 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133572AbWDGNO3 (ORCPT ); Fri, 7 Apr 2006 14:14:29 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k37BrO80006993; Fri, 7 Apr 2006 12:53:24 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k37BrO0B006992; Fri, 7 Apr 2006 12:53:24 +0100 Date: Fri, 7 Apr 2006 12:53:24 +0100 From: Ralf Baechle To: "Maciej W. Rozycki" Cc: Atsushi Nemoto , linux-mips@linux-mips.org Subject: Re: [PATCH] use CONFIG_HZ Message-ID: <20060407115323.GB5909@linux-mips.org> References: <20060407.011000.77652835.anemo@mba.ocn.ne.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11056 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Fri, Apr 07, 2006 at 12:18:03PM +0100, Maciej W. Rozycki wrote: > > Make HZ configurable (except for DECSTATION which is using special HZ > > value which is out of choice). Also remove some param.h files and > > The DECstation could actually use a choice of 128Hz, 256Hz and 1024Hz if > anybody cared. Well, instead of the stock Kconfig.hz we maybe should use our own like this: config MACH_DECSTATION bool select SYS_SUPPORT_128HZ select SYS_SUPPORT_256HZ select SYS_SUPPORT_1024HZ config MACH_JAZZ bool "Support for the Jazz family of machines" select SYS_SUPPORT_100HZ ... config MACH_CUCUBER ... ... choice config HZ_48 bool "48Hz" if SYS_SUPPORT_48HZ help Useful for debugging of Linux on extremly slow hardware simulators. ... config HZ_100 bool "100Hz" if SYS_SUPPORT_100HZ help blah ... config HZ_128 bool "128Hz" if SYS_SUPPORT_128HZ ... config HZ_250 bool "250Hz" if SYS_SUPPORT_250HZ ... config HZ_256 bool "256Hz" if SYS_SUPPORT_256HZ ... config HZ_1000 bool "1000Hz" if SYS_SUPPORT_1000HZ ... config HZ_1024 bool "1024Hz" if SYS_SUPPORT_1024HZ ... endchoice config HZ int default 48 if HZ_48 default 100 if HZ_100 default 128 if HZ_128 default 250 if HZ_250 default 256 if HZ_256 default 1000 if HZ_1000 default 1024 if HZ_1024 What do you think? Ralf From anemo@mba.ocn.ne.jp Fri Apr 7 16:52:12 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 16:52:29 +0100 (BST) Received: from mba.ocn.ne.jp ([210.190.142.172]:10978 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S8133574AbWDGPwL (ORCPT ); Fri, 7 Apr 2006 16:52:11 +0100 Received: from localhost (p8176-ipad03funabasi.chiba.ocn.ne.jp [219.160.88.176]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id DF1FDAB90; Sat, 8 Apr 2006 01:03:29 +0900 (JST) Date: Sat, 08 Apr 2006 01:03:48 +0900 (JST) Message-Id: <20060408.010348.41197502.anemo@mba.ocn.ne.jp> To: ralf@linux-mips.org Cc: macro@linux-mips.org, linux-mips@linux-mips.org Subject: Re: [PATCH] use CONFIG_HZ From: Atsushi Nemoto In-Reply-To: <20060407115323.GB5909@linux-mips.org> References: <20060407.011000.77652835.anemo@mba.ocn.ne.jp> <20060407115323.GB5909@linux-mips.org> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11057 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips Take 2. Make HZ configurable (DECSTATION can select 128/256/1024 HZ, JAZZ can only select 100 HZ, others can select 48/100/128/250/256/1000/1024 HZ). Also remove all mach-xxx/param.h files and update all defconfigs according to current HZ value. Signed-off-by: Atsushi Nemoto b/arch/mips/Kconfig | 75 ++++++++++++++++++++++++++++ b/arch/mips/configs/atlas_defconfig | 9 +++ b/arch/mips/configs/bigsur_defconfig | 9 +++ b/arch/mips/configs/capcella_defconfig | 9 +++ b/arch/mips/configs/cobalt_defconfig | 9 +++ b/arch/mips/configs/db1000_defconfig | 9 +++ b/arch/mips/configs/db1100_defconfig | 9 +++ b/arch/mips/configs/db1200_defconfig | 9 +++ b/arch/mips/configs/db1500_defconfig | 9 +++ b/arch/mips/configs/db1550_defconfig | 9 +++ b/arch/mips/configs/ddb5476_defconfig | 9 +++ b/arch/mips/configs/ddb5477_defconfig | 9 +++ b/arch/mips/configs/decstation_defconfig | 11 ++++ b/arch/mips/configs/e55_defconfig | 9 +++ b/arch/mips/configs/ev64120_defconfig | 9 +++ b/arch/mips/configs/ev96100_defconfig | 9 +++ b/arch/mips/configs/ip22_defconfig | 9 +++ b/arch/mips/configs/ip27_defconfig | 9 +++ b/arch/mips/configs/ip32_defconfig | 9 +++ b/arch/mips/configs/it8172_defconfig | 9 +++ b/arch/mips/configs/ivr_defconfig | 9 +++ b/arch/mips/configs/jaguar-atx_defconfig | 9 +++ b/arch/mips/configs/jmr3927_defconfig | 9 +++ b/arch/mips/configs/lasat200_defconfig | 9 +++ b/arch/mips/configs/malta_defconfig | 9 +++ b/arch/mips/configs/mipssim_defconfig | 9 +++ b/arch/mips/configs/mpc30x_defconfig | 9 +++ b/arch/mips/configs/ocelot_3_defconfig | 9 +++ b/arch/mips/configs/ocelot_c_defconfig | 9 +++ b/arch/mips/configs/ocelot_defconfig | 9 +++ b/arch/mips/configs/ocelot_g_defconfig | 9 +++ b/arch/mips/configs/pb1100_defconfig | 9 +++ b/arch/mips/configs/pb1500_defconfig | 9 +++ b/arch/mips/configs/pb1550_defconfig | 9 +++ b/arch/mips/configs/pnx8550-jbs_defconfig | 9 +++ b/arch/mips/configs/pnx8550-v2pci_defconfig | 9 +++ b/arch/mips/configs/qemu_defconfig | 9 +++ b/arch/mips/configs/rbhma4500_defconfig | 9 +++ b/arch/mips/configs/rm200_defconfig | 9 +++ b/arch/mips/configs/sb1250-swarm_defconfig | 9 +++ b/arch/mips/configs/sead_defconfig | 9 +++ b/arch/mips/configs/tb0226_defconfig | 9 +++ b/arch/mips/configs/tb0229_defconfig | 9 +++ b/arch/mips/configs/tb0287_defconfig | 9 +++ b/arch/mips/configs/workpad_defconfig | 9 +++ b/arch/mips/configs/yosemite_defconfig | 9 +++ b/arch/mips/dec/time.c | 2 b/arch/mips/defconfig | 9 +++ b/include/asm-mips/param.h | 2 include/asm-mips/mach-dec/param.h | 18 ------ include/asm-mips/mach-generic/param.h | 13 ---- include/asm-mips/mach-jazz/param.h | 16 ----- include/asm-mips/mach-mips/param.h | 13 ---- include/asm-mips/mach-qemu/param.h | 13 ---- 54 files changed, 493 insertions(+), 75 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 71d9a4b..bebc4dc 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -142,6 +142,9 @@ config MACH_DECSTATION select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_SUPPORT_128HZ + select SYS_SUPPORT_256HZ + select SYS_SUPPORT_1024HZ help This enables support for DEC's MIPS based workstations. For details see the Linux/MIPS FAQ on and the @@ -239,6 +242,7 @@ config MACH_JAZZ select SYS_HAS_CPU_R4X00 select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL + select SYS_SUPPORT_100HZ help This a family of machines based on the MIPS R4030 chipset which was used by several vendors to build RISC/os and Windows NT workstations. @@ -1652,6 +1656,77 @@ config NR_CPUS This is purely to save memory - each supported CPU adds approximately eight kilobytes to the kernel image. +# +# Timer Interrupt Frequency Configuration +# + +choice + prompt "Timer frequency" + default HZ_250 + help + Allows the configuration of the timer frequency. + + config HZ_48 + bool "48 HZ" if SYS_SUPPORT_48HZ || SYS_SUPPORT_ARBIT_HZ + + config HZ_100 + bool "100 HZ" if SYS_SUPPORT_100HZ || SYS_SUPPORT_ARBIT_HZ + + config HZ_128 + bool "128 HZ" if SYS_SUPPORT_128HZ || SYS_SUPPORT_ARBIT_HZ + + config HZ_250 + bool "250 HZ" if SYS_SUPPORT_250HZ || SYS_SUPPORT_ARBIT_HZ + + config HZ_256 + bool "256 HZ" if SYS_SUPPORT_256HZ || SYS_SUPPORT_ARBIT_HZ + + config HZ_1000 + bool "1000 HZ" if SYS_SUPPORT_1000HZ || SYS_SUPPORT_ARBIT_HZ + + config HZ_1024 + bool "1024 HZ" if SYS_SUPPORT_1024HZ || SYS_SUPPORT_ARBIT_HZ + +endchoice + +config SYS_SUPPORT_48HZ + bool + +config SYS_SUPPORT_100HZ + bool + +config SYS_SUPPORT_128HZ + bool + +config SYS_SUPPORT_250HZ + bool + +config SYS_SUPPORT_256HZ + bool + +config SYS_SUPPORT_1000HZ + bool + +config SYS_SUPPORT_1024HZ + bool + +config SYS_SUPPORT_ARBIT_HZ + bool + default y if !SYS_SUPPORT_48HZ && !SYS_SUPPORT_100HZ && \ + !SYS_SUPPORT_128HZ && !SYS_SUPPORT_250HZ && \ + !SYS_SUPPORT_256HZ && !SYS_SUPPORT_1000HZ && \ + !SYS_SUPPORT_1024HZ + +config HZ + int + default 48 if HZ_48 + default 100 if HZ_100 + default 128 if HZ_128 + default 250 if HZ_250 + default 256 if HZ_256 + default 1000 if HZ_1000 + default 1024 if HZ_1024 + source "kernel/Kconfig.preempt" config RTC_DS1742 diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig index 80da9c8..4fb85d6 100644 --- a/arch/mips/configs/atlas_defconfig +++ b/arch/mips/configs/atlas_defconfig @@ -142,6 +142,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +CONFIG_HZ_100=y +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +# CONFIG_HZ_1000 is not set +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=100 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index 05566a2..c689c46 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig @@ -144,6 +144,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_SMP=y CONFIG_NR_CPUS=4 CONFIG_PREEMPT_NONE=y diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig index a69dafb..94f22a5 100644 --- a/arch/mips/configs/capcella_defconfig +++ b/arch/mips/configs/capcella_defconfig @@ -128,6 +128,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig index 6a4940b..7c5e630 100644 --- a/arch/mips/configs/cobalt_defconfig +++ b/arch/mips/configs/cobalt_defconfig @@ -128,6 +128,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig index 6d7bcc0..b0cd1cf 100644 --- a/arch/mips/configs/db1000_defconfig +++ b/arch/mips/configs/db1000_defconfig @@ -129,6 +129,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig index acd2ffe..b86b1d0 100644 --- a/arch/mips/configs/db1100_defconfig +++ b/arch/mips/configs/db1100_defconfig @@ -129,6 +129,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig index d918754..ede48fe 100644 --- a/arch/mips/configs/db1200_defconfig +++ b/arch/mips/configs/db1200_defconfig @@ -129,6 +129,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig index 5491a51..cd4ad89 100644 --- a/arch/mips/configs/db1500_defconfig +++ b/arch/mips/configs/db1500_defconfig @@ -131,6 +131,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig index 425d939..4547ae4 100644 --- a/arch/mips/configs/db1550_defconfig +++ b/arch/mips/configs/db1550_defconfig @@ -130,6 +130,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig index 4837b3c..688432c 100644 --- a/arch/mips/configs/ddb5476_defconfig +++ b/arch/mips/configs/ddb5476_defconfig @@ -129,6 +129,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig index e3a3786..2fe236b 100644 --- a/arch/mips/configs/ddb5477_defconfig +++ b/arch/mips/configs/ddb5477_defconfig @@ -129,6 +129,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig index b5b44a8..279383a 100644 --- a/arch/mips/configs/decstation_defconfig +++ b/arch/mips/configs/decstation_defconfig @@ -128,6 +128,17 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +CONFIG_HZ_128=y +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +# CONFIG_HZ_1000 is not set +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_128HZ=y +CONFIG_SYS_SUPPORT_256HZ=y +CONFIG_SYS_SUPPORT_1024HZ=y +CONFIG_HZ=128 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig index 263cc38..2bf2571 100644 --- a/arch/mips/configs/e55_defconfig +++ b/arch/mips/configs/e55_defconfig @@ -126,6 +126,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig index e0d7e07..206c95a 100644 --- a/arch/mips/configs/ev64120_defconfig +++ b/arch/mips/configs/ev64120_defconfig @@ -131,6 +131,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ev96100_defconfig b/arch/mips/configs/ev96100_defconfig index 095bfe3..3acb5c1 100644 --- a/arch/mips/configs/ev96100_defconfig +++ b/arch/mips/configs/ev96100_defconfig @@ -135,6 +135,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index f66ba91..e6dd62d 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig @@ -136,6 +136,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 33f18c6..78aa710 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig @@ -133,6 +133,15 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_NEED_MULTIPLE_NODES=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_MIGRATION=y CONFIG_SMP=y CONFIG_NR_CPUS=64 diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index 2b8f223..3257acc 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig @@ -135,6 +135,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/it8172_defconfig b/arch/mips/configs/it8172_defconfig index a5ac713..fe2a125 100644 --- a/arch/mips/configs/it8172_defconfig +++ b/arch/mips/configs/it8172_defconfig @@ -130,6 +130,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ivr_defconfig b/arch/mips/configs/ivr_defconfig index 3cf9750..cafb3fd 100644 --- a/arch/mips/configs/ivr_defconfig +++ b/arch/mips/configs/ivr_defconfig @@ -127,6 +127,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig index 9f6303d..76e4ece 100644 --- a/arch/mips/configs/jaguar-atx_defconfig +++ b/arch/mips/configs/jaguar-atx_defconfig @@ -136,6 +136,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 # CONFIG_SMP is not set CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig index a2ce2e1..6258974 100644 --- a/arch/mips/configs/jmr3927_defconfig +++ b/arch/mips/configs/jmr3927_defconfig @@ -125,6 +125,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig index d742529..2e48af8 100644 --- a/arch/mips/configs/lasat200_defconfig +++ b/arch/mips/configs/lasat200_defconfig @@ -134,6 +134,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 50c8679..b1bb99a 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig @@ -148,6 +148,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +CONFIG_HZ_100=y +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +# CONFIG_HZ_1000 is not set +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=100 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig index 4b3342c..ca543ee 100644 --- a/arch/mips/configs/mipssim_defconfig +++ b/arch/mips/configs/mipssim_defconfig @@ -134,6 +134,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig index 3e75368..536f23a 100644 --- a/arch/mips/configs/mpc30x_defconfig +++ b/arch/mips/configs/mpc30x_defconfig @@ -128,6 +128,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig index 4197ac3..b01f072 100644 --- a/arch/mips/configs/ocelot_3_defconfig +++ b/arch/mips/configs/ocelot_3_defconfig @@ -136,6 +136,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 # CONFIG_SMP is not set CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig index da777cb..1e3ca9c 100644 --- a/arch/mips/configs/ocelot_c_defconfig +++ b/arch/mips/configs/ocelot_c_defconfig @@ -132,6 +132,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig index 9ff6ab5..806dcca 100644 --- a/arch/mips/configs/ocelot_defconfig +++ b/arch/mips/configs/ocelot_defconfig @@ -137,6 +137,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig index 7df9ce9..3d2a7d2 100644 --- a/arch/mips/configs/ocelot_g_defconfig +++ b/arch/mips/configs/ocelot_g_defconfig @@ -135,6 +135,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig index fc28746..74a08fe 100644 --- a/arch/mips/configs/pb1100_defconfig +++ b/arch/mips/configs/pb1100_defconfig @@ -131,6 +131,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig index a09be54..a5f5a0a 100644 --- a/arch/mips/configs/pb1500_defconfig +++ b/arch/mips/configs/pb1500_defconfig @@ -130,6 +130,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig index b8bcbc2..6b84d91 100644 --- a/arch/mips/configs/pb1550_defconfig +++ b/arch/mips/configs/pb1550_defconfig @@ -130,6 +130,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig index 91ff3ba..59c37d8 100644 --- a/arch/mips/configs/pnx8550-jbs_defconfig +++ b/arch/mips/configs/pnx8550-jbs_defconfig @@ -129,6 +129,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig index 932c803..4364d53 100644 --- a/arch/mips/configs/pnx8550-v2pci_defconfig +++ b/arch/mips/configs/pnx8550-v2pci_defconfig @@ -130,6 +130,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig index 0d3ce64..65fadff 100644 --- a/arch/mips/configs/qemu_defconfig +++ b/arch/mips/configs/qemu_defconfig @@ -126,6 +126,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +CONFIG_HZ_100=y +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +# CONFIG_HZ_1000 is not set +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=100 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig index 0ad74a5..b8693dd 100644 --- a/arch/mips/configs/rbhma4500_defconfig +++ b/arch/mips/configs/rbhma4500_defconfig @@ -138,6 +138,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig index fab27fe..a18a42b 100644 --- a/arch/mips/configs/rm200_defconfig +++ b/arch/mips/configs/rm200_defconfig @@ -138,6 +138,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index 9060622..04948bc 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig @@ -148,6 +148,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_PREEMPT_NONE=y diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig index de02881..d164819 100644 --- a/arch/mips/configs/sead_defconfig +++ b/arch/mips/configs/sead_defconfig @@ -133,6 +133,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index 8f4f06c..a171722 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_defconfig @@ -130,6 +130,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig index 5f54e27..04b5ec2 100644 --- a/arch/mips/configs/tb0229_defconfig +++ b/arch/mips/configs/tb0229_defconfig @@ -130,6 +130,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig index fe3ba4f..90091d1 100644 --- a/arch/mips/configs/tb0287_defconfig +++ b/arch/mips/configs/tb0287_defconfig @@ -135,6 +135,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig index bd5bd46..5791c60 100644 --- a/arch/mips/configs/workpad_defconfig +++ b/arch/mips/configs/workpad_defconfig @@ -126,6 +126,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig index 2c0c25e..33fb507 100644 --- a/arch/mips/configs/yosemite_defconfig +++ b/arch/mips/configs/yosemite_defconfig @@ -130,6 +130,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_PREEMPT_NONE=y diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c index 74cb055..76e4d09 100644 --- a/arch/mips/dec/time.c +++ b/arch/mips/dec/time.c @@ -181,7 +181,7 @@ void __init dec_time_init(void) } /* Set up the rate of periodic DS1287 interrupts. */ - CMOS_WRITE(RTC_REF_CLCK_32KHZ | (16 - LOG_2_HZ), RTC_REG_A); + CMOS_WRITE(RTC_REF_CLCK_32KHZ | (16 - __ffs(HZ)), RTC_REG_A); } EXPORT_SYMBOL(do_settimeofday); diff --git a/arch/mips/defconfig b/arch/mips/defconfig index f66ba91..e6dd62d 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig @@ -136,6 +136,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORT_ARBIT_HZ=y +CONFIG_HZ=1000 # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set diff --git a/include/asm-mips/mach-dec/param.h b/include/asm-mips/mach-dec/param.h deleted file mode 100644 index 3e4f0e3..0000000 --- a/include/asm-mips/mach-dec/param.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2003 by Ralf Baechle - */ -#ifndef __ASM_MACH_DEC_PARAM_H -#define __ASM_MACH_DEC_PARAM_H - -/* - * log2(HZ), change this here if you want another HZ value. This is also - * used in dec_time_init. Minimum is 1, Maximum is 15. - */ -#define LOG_2_HZ 7 -#define HZ (1 << LOG_2_HZ) - -#endif /* __ASM_MACH_DEC_PARAM_H */ diff --git a/include/asm-mips/mach-generic/param.h b/include/asm-mips/mach-generic/param.h deleted file mode 100644 index a0d12f9..0000000 --- a/include/asm-mips/mach-generic/param.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2003 by Ralf Baechle - */ -#ifndef __ASM_MACH_GENERIC_PARAM_H -#define __ASM_MACH_GENERIC_PARAM_H - -#define HZ 1000 /* Internal kernel timer frequency */ - -#endif /* __ASM_MACH_GENERIC_PARAM_H */ diff --git a/include/asm-mips/mach-jazz/param.h b/include/asm-mips/mach-jazz/param.h deleted file mode 100644 index 639763a..0000000 --- a/include/asm-mips/mach-jazz/param.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2003 by Ralf Baechle - */ -#ifndef __ASM_MACH_JAZZ_PARAM_H -#define __ASM_MACH_JAZZ_PARAM_H - -/* - * Jazz is currently using the internal 100Hz timer of the R4030 - */ -#define HZ 100 /* Internal kernel timer frequency */ - -#endif /* __ASM_MACH_JAZZ_PARAM_H */ diff --git a/include/asm-mips/mach-mips/param.h b/include/asm-mips/mach-mips/param.h deleted file mode 100644 index 805ef6d..0000000 --- a/include/asm-mips/mach-mips/param.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2003 by Ralf Baechle - */ -#ifndef __ASM_MACH_MIPS_PARAM_H -#define __ASM_MACH_MIPS_PARAM_H - -#define HZ 100 /* Internal kernel timer frequency */ - -#endif /* __ASM_MACH_MIPS_PARAM_H */ diff --git a/include/asm-mips/mach-qemu/param.h b/include/asm-mips/mach-qemu/param.h deleted file mode 100644 index cb30ee4..0000000 --- a/include/asm-mips/mach-qemu/param.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2005 by Ralf Baechle - */ -#ifndef __ASM_MACH_QEMU_PARAM_H -#define __ASM_MACH_QEMU_PARAM_H - -#define HZ 100 /* Internal kernel timer frequency */ - -#endif /* __ASM_MACH_QEMU_PARAM_H */ diff --git a/include/asm-mips/param.h b/include/asm-mips/param.h index 2bead82..1d9bb8c 100644 --- a/include/asm-mips/param.h +++ b/include/asm-mips/param.h @@ -11,7 +11,7 @@ #ifdef __KERNEL__ -# include /* Internal kernel timer frequency */ +# define HZ CONFIG_HZ /* Internal kernel timer frequency */ # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ # define CLOCKS_PER_SEC (USER_HZ) /* like times() */ #endif From tbm@cyrius.com Fri Apr 7 17:10:44 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 17:11:17 +0100 (BST) Received: from sorrow.cyrius.com ([65.19.161.204]:26640 "HELO sorrow.cyrius.com") by ftp.linux-mips.org with SMTP id S8133545AbWDGQKo (ORCPT ); Fri, 7 Apr 2006 17:10:44 +0100 Received: by sorrow.cyrius.com (Postfix, from userid 10) id 6118264D3E; Fri, 7 Apr 2006 16:22:03 +0000 (UTC) Received: by deprecation.cyrius.com (Postfix, from userid 1000) id DA12266B68; Fri, 7 Apr 2006 18:21:53 +0200 (CEST) Date: Fri, 7 Apr 2006 18:21:53 +0200 From: Martin Michlmayr To: Russell King Cc: linux-mips@linux-mips.org Subject: Re: IP22 doesn't shutdown properly Message-ID: <20060407162153.GK6869@deprecation.cyrius.com> References: <20060217225824.GE20785@deprecation.cyrius.com> <20060223221350.GA5239@deprecation.cyrius.com> <20060224190517.GA28013@lst.de> <20060227105236.GI12044@deprecation.cyrius.com> <20060325173450.GC6100@flint.arm.linux.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060325173450.GC6100@flint.arm.linux.org.uk> User-Agent: Mutt/1.5.11+cvs20060330 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11058 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: tbm@cyrius.com Precedence: bulk X-list: linux-mips * Russell King [2006-03-25 17:34]: > > - if ((status & DCD) ^ up->prev_status) > > + if ((status ^ up->prev_status) ^ DCD) > Shouldn't this be (status ^ up->prev_status) & DCD ? > > > - if ((status & CTS) ^ up->prev_status) > > + if ((status ^ up->prev_status) ^ CTS) > Shouldn't this be (status ^ up->prev_status) & CTS ? Thanks for catching this! I obviously copied too much from sunzilog.c without thinking. Below is a new version which has this fix and which has been updated so it apples to 2.6.17-rc1. [PATCH] Sync ip22zilog with latest sunzilog driver ip22zilog is based on the sunzilog driver, but there hasn't been a sync since 2.6.0-test7. Sync the relevant changes that have been made since then. Signed-off-by: Martin Michlmayr --- a/drivers/serial/ip22zilog.c +++ b/drivers/serial/ip22zilog.c @@ -2,7 +2,7 @@ * Driver for Zilog serial chips found on SGI workstations and * servers. This driver could actually be made more generic. * - * This is based on the drivers/serial/sunzilog.c code as of 2.6.0-test7 and the + * This is based on the drivers/serial/sunzilog.c code as of 2.6.17-rc1 and the * old drivers/sgi/char/sgiserial.c code which itself is based of the original * drivers/sbus/char/zs.c code. A lot of code has been simply moved over * directly from there but much has been rewritten. Credits therefore go out @@ -86,15 +86,11 @@ struct uart_ip22zilog_port { unsigned int cflag; - /* L1-A keyboard break state. */ - int kbd_id; - int l1_down; - unsigned char parity_mask; unsigned char prev_status; }; -#define ZILOG_CHANNEL_FROM_PORT(PORT) ((struct zilog_channel *)((PORT)->membase)) +#define ZILOG_CHANNEL_FROM_PORT(PORT) ((struct zilog_channel __iomem *)((PORT)->membase)) #define UART_ZILOG(PORT) ((struct uart_ip22zilog_port *)(PORT)) #define IP22ZILOG_GET_CURR_REG(PORT, REGNUM) \ (UART_ZILOG(PORT)->curregs[REGNUM]) @@ -116,7 +112,7 @@ struct uart_ip22zilog_port { * The port lock must be held and local IRQs must be disabled * when {read,write}_zsreg is invoked. */ -static unsigned char read_zsreg(struct zilog_channel *channel, +static unsigned char read_zsreg(struct zilog_channel __iomem *channel, unsigned char reg) { unsigned char retval; @@ -129,7 +125,7 @@ static unsigned char read_zsreg(struct z return retval; } -static void write_zsreg(struct zilog_channel *channel, +static void write_zsreg(struct zilog_channel __iomem *channel, unsigned char reg, unsigned char value) { writeb(reg, &channel->control); @@ -138,7 +134,7 @@ static void write_zsreg(struct zilog_cha ZSDELAY(); } -static void ip22zilog_clear_fifo(struct zilog_channel *channel) +static void ip22zilog_clear_fifo(struct zilog_channel __iomem *channel) { int i; @@ -165,7 +161,7 @@ static void ip22zilog_clear_fifo(struct /* This function must only be called when the TX is not busy. The UART * port lock must be held and local interrupts disabled. */ -static void __load_zsregs(struct zilog_channel *channel, unsigned char *regs) +static void __load_zsregs(struct zilog_channel __iomem *channel, unsigned char *regs) { int i; @@ -241,7 +237,7 @@ static void __load_zsregs(struct zilog_c * The UART port lock must be held and local interrupts disabled. */ static void ip22zilog_maybe_update_regs(struct uart_ip22zilog_port *up, - struct zilog_channel *channel) + struct zilog_channel __iomem *channel) { if (!ZS_REGS_HELD(up)) { if (ZS_TX_ACTIVE(up)) { @@ -252,14 +248,20 @@ static void ip22zilog_maybe_update_regs( } } -static void ip22zilog_receive_chars(struct uart_ip22zilog_port *up, - struct zilog_channel *channel, - struct pt_regs *regs) -{ - struct tty_struct *tty = up->port.info->tty; /* XXX info==NULL? */ +static struct tty_struct * +ip22zilog_receive_chars(struct uart_ip22zilog_port *up, + struct zilog_channel __iomem *channel, + struct pt_regs *regs) +{ + struct tty_struct *tty; + unsigned char ch, r1, flag; + + tty = NULL; + if (up->port.info != NULL && /* Unopened serial console */ + up->port.info->tty != NULL) /* Keyboard || mouse */ + tty = up->port.info->tty; while (1) { - unsigned char ch, r1, flag; r1 = read_zsreg(channel, R1); if (r1 & (PAR_ERR | Rx_OVR | CRC_ERR)) { @@ -277,23 +279,17 @@ static void ip22zilog_receive_chars(stru if (ch & BRK_ABRT) r1 |= BRK_ABRT; + if (!(ch & Rx_CH_AV)) + break; + ch = readb(&channel->data); ZSDELAY(); ch &= up->parity_mask; - if (ZS_IS_CONS(up) && (r1 & BRK_ABRT)) { - /* Wait for BREAK to deassert to avoid potentially - * confusing the PROM. - */ - while (1) { - ch = readb(&channel->control); - ZSDELAY(); - if (!(ch & BRK_ABRT)) - break; - } - ip22_do_break(); - return; + if (tty == NULL) { + uart_handle_sysrq_char(&up->port, ch, regs); + continue; } /* A real serial line, record the character and status. */ @@ -304,7 +300,7 @@ static void ip22zilog_receive_chars(stru r1 &= ~(PAR_ERR | CRC_ERR); up->port.icount.brk++; if (uart_handle_break(&up->port)) - goto next_char; + continue; } else if (r1 & PAR_ERR) up->port.icount.parity++; @@ -321,7 +317,7 @@ static void ip22zilog_receive_chars(stru flag = TTY_FRAME; } if (uart_handle_sysrq_char(&up->port, ch, regs)) - goto next_char; + continue; if (up->port.ignore_status_mask == 0xff || (r1 & up->port.ignore_status_mask) == 0) @@ -329,18 +325,13 @@ static void ip22zilog_receive_chars(stru if (r1 & Rx_OVR) tty_insert_flip_char(tty, 0, TTY_OVERRUN); - next_char: - ch = readb(&channel->control); - ZSDELAY(); - if (!(ch & Rx_CH_AV)) - break; } - tty_flip_buffer_push(tty); + return tty; } static void ip22zilog_status_handle(struct uart_ip22zilog_port *up, - struct zilog_channel *channel, + struct zilog_channel __iomem *channel, struct pt_regs *regs) { unsigned char status; @@ -352,6 +343,22 @@ static void ip22zilog_status_handle(stru ZSDELAY(); ZS_WSYNC(channel); + if (status & BRK_ABRT) { + if (ZS_IS_CONS(up)) { + /* Wait for BREAK to deassert to avoid potentially + * confusing the PROM. + */ + while (1) { + status = readb(&channel->control); + ZSDELAY(); + if (!(status & BRK_ABRT)) + break; + } + ip22_do_break(); + return; + } + } + if (ZS_WANTS_MODEM_STATUS(up)) { if (status & SYNC) up->port.icount.dsr++; @@ -360,10 +367,10 @@ static void ip22zilog_status_handle(stru * But it does not tell us which bit has changed, we have to keep * track of this ourselves. */ - if ((status & DCD) ^ up->prev_status) + if ((status ^ up->prev_status) & DCD) uart_handle_dcd_change(&up->port, (status & DCD)); - if ((status & CTS) ^ up->prev_status) + if ((status ^ up->prev_status) & CTS) uart_handle_cts_change(&up->port, (status & CTS)); @@ -374,7 +381,7 @@ static void ip22zilog_status_handle(stru } static void ip22zilog_transmit_chars(struct uart_ip22zilog_port *up, - struct zilog_channel *channel) + struct zilog_channel __iomem *channel) { struct circ_buf *xmit; @@ -449,21 +456,23 @@ static irqreturn_t ip22zilog_interrupt(i struct uart_ip22zilog_port *up = dev_id; while (up) { - struct zilog_channel *channel + struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(&up->port); + struct tty_struct *tty; unsigned char r3; spin_lock(&up->port.lock); r3 = read_zsreg(channel, R3); /* Channel A */ + tty = NULL; if (r3 & (CHAEXT | CHATxIP | CHARxIP)) { writeb(RES_H_IUS, &channel->control); ZSDELAY(); ZS_WSYNC(channel); if (r3 & CHARxIP) - ip22zilog_receive_chars(up, channel, regs); + tty = ip22zilog_receive_chars(up, channel, regs); if (r3 & CHAEXT) ip22zilog_status_handle(up, channel, regs); if (r3 & CHATxIP) @@ -471,18 +480,22 @@ static irqreturn_t ip22zilog_interrupt(i } spin_unlock(&up->port.lock); + if (tty) + tty_flip_buffer_push(tty); + /* Channel B */ up = up->next; channel = ZILOG_CHANNEL_FROM_PORT(&up->port); spin_lock(&up->port.lock); + tty = NULL; if (r3 & (CHBEXT | CHBTxIP | CHBRxIP)) { writeb(RES_H_IUS, &channel->control); ZSDELAY(); ZS_WSYNC(channel); if (r3 & CHBRxIP) - ip22zilog_receive_chars(up, channel, regs); + tty = ip22zilog_receive_chars(up, channel, regs); if (r3 & CHBEXT) ip22zilog_status_handle(up, channel, regs); if (r3 & CHBTxIP) @@ -490,6 +503,9 @@ static irqreturn_t ip22zilog_interrupt(i } spin_unlock(&up->port.lock); + if (tty) + tty_flip_buffer_push(tty); + up = up->next; } @@ -501,7 +517,7 @@ static irqreturn_t ip22zilog_interrupt(i */ static __inline__ unsigned char ip22zilog_read_channel_status(struct uart_port *port) { - struct zilog_channel *channel; + struct zilog_channel __iomem *channel; unsigned char status; channel = ZILOG_CHANNEL_FROM_PORT(port); @@ -555,7 +571,7 @@ static unsigned int ip22zilog_get_mctrl( static void ip22zilog_set_mctrl(struct uart_port *port, unsigned int mctrl) { struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port; - struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port); + struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(port); unsigned char set_bits, clear_bits; set_bits = clear_bits = 0; @@ -587,7 +603,7 @@ static void ip22zilog_stop_tx(struct uar static void ip22zilog_start_tx(struct uart_port *port) { struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port; - struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port); + struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(port); unsigned char status; up->flags |= IP22ZILOG_FLAG_TX_ACTIVE; @@ -629,7 +645,7 @@ static void ip22zilog_start_tx(struct ua static void ip22zilog_stop_rx(struct uart_port *port) { struct uart_ip22zilog_port *up = UART_ZILOG(port); - struct zilog_channel *channel; + struct zilog_channel __iomem *channel; if (ZS_IS_CONS(up)) return; @@ -645,7 +661,7 @@ static void ip22zilog_stop_rx(struct uar static void ip22zilog_enable_ms(struct uart_port *port) { struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port; - struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port); + struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(port); unsigned char new_reg; new_reg = up->curregs[R15] | (DCDIE | SYNCIE | CTSIE); @@ -661,7 +677,7 @@ static void ip22zilog_enable_ms(struct u static void ip22zilog_break_ctl(struct uart_port *port, int break_state) { struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port; - struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port); + struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(port); unsigned char set_bits, clear_bits, new_reg; unsigned long flags; @@ -687,7 +703,7 @@ static void ip22zilog_break_ctl(struct u static void __ip22zilog_startup(struct uart_ip22zilog_port *up) { - struct zilog_channel *channel; + struct zilog_channel __iomem *channel; channel = ZILOG_CHANNEL_FROM_PORT(&up->port); up->prev_status = readb(&channel->control); @@ -742,7 +758,7 @@ static int ip22zilog_startup(struct uart static void ip22zilog_shutdown(struct uart_port *port) { struct uart_ip22zilog_port *up = UART_ZILOG(port); - struct zilog_channel *channel; + struct zilog_channel __iomem *channel; unsigned long flags; if (ZS_IS_CONS(up)) @@ -918,7 +934,7 @@ static struct uart_ops ip22zilog_pops = }; static struct uart_ip22zilog_port *ip22zilog_port_table; -static struct zilog_layout **ip22zilog_chip_regs; +static struct zilog_layout __iomem **ip22zilog_chip_regs; static struct uart_ip22zilog_port *ip22zilog_irq_chain; static int zilog_irq = -1; @@ -936,10 +952,10 @@ static void * __init alloc_one_table(uns static void __init ip22zilog_alloc_tables(void) { - ip22zilog_port_table = (struct uart_ip22zilog_port *) + ip22zilog_port_table = alloc_one_table(NUM_CHANNELS * sizeof(struct uart_ip22zilog_port)); - ip22zilog_chip_regs = (struct zilog_layout **) - alloc_one_table(NUM_IP22ZILOG * sizeof(struct zilog_layout *)); + ip22zilog_chip_regs = + alloc_one_table(NUM_IP22ZILOG * sizeof(struct zilog_layout __iomem *)); if (ip22zilog_port_table == NULL || ip22zilog_chip_regs == NULL) { panic("IP22-Zilog: Cannot allocate IP22-Zilog tables."); @@ -947,7 +963,7 @@ static void __init ip22zilog_alloc_table } /* Get the address of the registers for IP22-Zilog instance CHIP. */ -static struct zilog_layout * __init get_zs(int chip) +static struct zilog_layout __iomem * __init get_zs(int chip) { unsigned long base; @@ -961,13 +977,13 @@ static struct zilog_layout * __init get_ zilog_irq = SGI_SERIAL_IRQ; request_mem_region(base, 8, "IP22-Zilog"); - return (struct zilog_layout *) base; + return (struct zilog_layout __iomem *) base; } #define ZS_PUT_CHAR_MAX_DELAY 2000 /* 10 ms */ #ifdef CONFIG_SERIAL_IP22_ZILOG_CONSOLE -static void ip22zilog_put_char(struct uart_port *port, int ch) +static void ip22zilog_putchar(struct uart_port *port, int ch) { struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port); int loops = ZS_PUT_CHAR_MAX_DELAY; @@ -996,7 +1012,7 @@ ip22zilog_console_write(struct console * unsigned long flags; spin_lock_irqsave(&up->port.lock, flags); - uart_console_write(&up->port, s, count, ip22zilog_put_char); + uart_console_write(&up->port, s, count, ip22zilog_putchar); udelay(2); spin_unlock_irqrestore(&up->port.lock, flags); } @@ -1098,7 +1114,7 @@ static struct uart_driver ip22zilog_reg static void __init ip22zilog_prepare(void) { struct uart_ip22zilog_port *up; - struct zilog_layout *rp; + struct zilog_layout __iomem *rp; int channel, chip; /* @@ -1117,8 +1133,8 @@ static void __init ip22zilog_prepare(voi if (!ip22zilog_chip_regs[chip]) { ip22zilog_chip_regs[chip] = rp = get_zs(chip); - up[(chip * 2) + 0].port.membase = (char *) &rp->channelB; - up[(chip * 2) + 1].port.membase = (char *) &rp->channelA; + up[(chip * 2) + 0].port.membase = (void __iomem *) &rp->channelB; + up[(chip * 2) + 1].port.membase = (void __iomem *) &rp->channelA; /* In theory mapbase is the physical address ... */ up[(chip * 2) + 0].port.mapbase = @@ -1157,7 +1173,7 @@ static void __init ip22zilog_init_hw(voi for (i = 0; i < NUM_CHANNELS; i++) { struct uart_ip22zilog_port *up = &ip22zilog_port_table[i]; - struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(&up->port); + struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(&up->port); unsigned long flags; int baud, brg; -- Martin Michlmayr http://www.cyrius.com/ From anemo@mba.ocn.ne.jp Fri Apr 7 17:13:29 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 17:13:38 +0100 (BST) Received: from mba.ocn.ne.jp ([210.190.142.172]:31206 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S8133586AbWDGQN3 (ORCPT ); Fri, 7 Apr 2006 17:13:29 +0100 Received: from localhost (p8176-ipad03funabasi.chiba.ocn.ne.jp [219.160.88.176]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 997ED9A98; Sat, 8 Apr 2006 01:24:52 +0900 (JST) Date: Sat, 08 Apr 2006 01:25:11 +0900 (JST) Message-Id: <20060408.012511.75185496.anemo@mba.ocn.ne.jp> To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org Subject: [PATCH] nullify __ide_flush_{prologue,epilogue} on UP From: Atsushi Nemoto X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11059 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips Signed-off-by: Atsushi Nemoto diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h index 44266e5..e331535 100644 --- a/include/asm-mips/mach-generic/ide.h +++ b/include/asm-mips/mach-generic/ide.h @@ -106,14 +106,18 @@ static __inline__ unsigned long ide_defa /* MIPS port and memory-mapped I/O string operations. */ static inline void __ide_flush_prologue(void) { +#ifdef CONFIG_SMP if (cpu_has_dc_aliases) preempt_disable(); +#endif } static inline void __ide_flush_epilogue(void) { +#ifdef CONFIG_SMP if (cpu_has_dc_aliases) preempt_enable(); +#endif } static inline void __ide_flush_dcache_range(unsigned long addr, unsigned long size) From anemo@mba.ocn.ne.jp Fri Apr 7 17:21:48 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 17:21:58 +0100 (BST) Received: from mba.ocn.ne.jp ([210.190.142.172]:5857 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S8133569AbWDGQVs (ORCPT ); Fri, 7 Apr 2006 17:21:48 +0100 Received: from localhost (p8176-ipad03funabasi.chiba.ocn.ne.jp [219.160.88.176]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 5E1EEA96E; Sat, 8 Apr 2006 01:33:12 +0900 (JST) Date: Sat, 08 Apr 2006 01:33:31 +0900 (JST) Message-Id: <20060408.013331.71086855.anemo@mba.ocn.ne.jp> To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org Subject: [PATCH] use __ffs() instead of ffs() on waybit calculation From: Atsushi Nemoto X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11060 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips Signed-off-by: Atsushi Nemoto diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index d88c668..4182e11 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c @@ -750,12 +750,12 @@ static void __init probe_pcache(void) icache_size = 1 << (12 + ((config & CONF_IC) >> 9)); c->icache.linesz = 16 << ((config & CONF_IB) >> 5); c->icache.ways = 2; - c->icache.waybit = ffs(icache_size/2) - 1; + c->icache.waybit = __ffs(icache_size/2); dcache_size = 1 << (12 + ((config & CONF_DC) >> 6)); c->dcache.linesz = 16 << ((config & CONF_DB) >> 4); c->dcache.ways = 2; - c->dcache.waybit= ffs(dcache_size/2) - 1; + c->dcache.waybit= __ffs(dcache_size/2); c->options |= MIPS_CPU_CACHE_CDEX_P; break; @@ -838,12 +838,12 @@ static void __init probe_pcache(void) icache_size = 1 << (10 + ((config & CONF_IC) >> 9)); c->icache.linesz = 16 << ((config & CONF_IB) >> 5); c->icache.ways = 2; - c->icache.waybit = ffs(icache_size/2) - 1; + c->icache.waybit = __ffs(icache_size/2); dcache_size = 1 << (10 + ((config & CONF_DC) >> 6)); c->dcache.linesz = 16 << ((config & CONF_DB) >> 4); c->dcache.ways = 2; - c->dcache.waybit = ffs(dcache_size/2) - 1; + c->dcache.waybit = __ffs(dcache_size/2); c->options |= MIPS_CPU_CACHE_CDEX_P; break; @@ -874,12 +874,12 @@ static void __init probe_pcache(void) icache_size = 1 << (12 + ((config & CONF_IC) >> 9)); c->icache.linesz = 16 << ((config & CONF_IB) >> 5); c->icache.ways = 4; - c->icache.waybit = ffs(icache_size / c->icache.ways) - 1; + c->icache.waybit = __ffs(icache_size / c->icache.ways); dcache_size = 1 << (12 + ((config & CONF_DC) >> 6)); c->dcache.linesz = 16 << ((config & CONF_DB) >> 4); c->dcache.ways = 4; - c->dcache.waybit = ffs(dcache_size / c->dcache.ways) - 1; + c->dcache.waybit = __ffs(dcache_size / c->dcache.ways); #if !defined(CONFIG_SMP) || !defined(RM9000_CDEX_SMP_WAR) c->options |= MIPS_CPU_CACHE_CDEX_P; @@ -907,7 +907,7 @@ static void __init probe_pcache(void) icache_size = c->icache.sets * c->icache.ways * c->icache.linesz; - c->icache.waybit = ffs(icache_size/c->icache.ways) - 1; + c->icache.waybit = __ffs(icache_size/c->icache.ways); if (config & 0x8) /* VI bit */ c->icache.flags |= MIPS_CACHE_VTAG; @@ -927,7 +927,7 @@ static void __init probe_pcache(void) dcache_size = c->dcache.sets * c->dcache.ways * c->dcache.linesz; - c->dcache.waybit = ffs(dcache_size/c->dcache.ways) - 1; + c->dcache.waybit = __ffs(dcache_size/c->dcache.ways); c->options |= MIPS_CPU_PREFETCH; break; diff --git a/arch/mips/mm/sc-rm7k.c b/arch/mips/mm/sc-rm7k.c index 3b6cc9b..31ec730 100644 --- a/arch/mips/mm/sc-rm7k.c +++ b/arch/mips/mm/sc-rm7k.c @@ -138,7 +138,7 @@ void __init rm7k_sc_init(void) c->scache.linesz = sc_lsize; c->scache.ways = 4; - c->scache.waybit= ffs(scache_size / c->scache.ways) - 1; + c->scache.waybit= __ffs(scache_size / c->scache.ways); c->scache.waysize = scache_size / c->scache.ways; c->scache.sets = scache_size / (c->scache.linesz * c->scache.ways); printk(KERN_INFO "Secondary cache size %dK, linesize %d bytes.\n", From ralf@linux-mips.org Fri Apr 7 17:26:43 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 17:26:51 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:654 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133569AbWDGQ0n (ORCPT ); Fri, 7 Apr 2006 17:26:43 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k37GcAeH017043; Fri, 7 Apr 2006 17:38:10 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k37Gc91q017042; Fri, 7 Apr 2006 17:38:09 +0100 Date: Fri, 7 Apr 2006 17:38:09 +0100 From: Ralf Baechle To: Atsushi Nemoto Cc: linux-mips@linux-mips.org Subject: Re: [PATCH] nullify __ide_flush_{prologue,epilogue} on UP Message-ID: <20060407163809.GA10564@linux-mips.org> References: <20060408.012511.75185496.anemo@mba.ocn.ne.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060408.012511.75185496.anemo@mba.ocn.ne.jp> User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11061 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Sat, Apr 08, 2006 at 01:25:11AM +0900, Atsushi Nemoto wrote: > Signed-off-by: Atsushi Nemoto Looks good, applied. Actually I have my objections wrt to shared caches such as with SMP on the 34K but that's another project. Ralf From ralf@linux-mips.org Fri Apr 7 17:28:24 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 17:28:34 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:54927 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133616AbWDGQ2Y (ORCPT ); Fri, 7 Apr 2006 17:28:24 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k37GdpkP017118; Fri, 7 Apr 2006 17:39:51 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k37GdpP9017117; Fri, 7 Apr 2006 17:39:51 +0100 Date: Fri, 7 Apr 2006 17:39:51 +0100 From: Ralf Baechle To: Atsushi Nemoto Cc: linux-mips@linux-mips.org Subject: Re: [PATCH] use __ffs() instead of ffs() on waybit calculation Message-ID: <20060407163951.GB10564@linux-mips.org> References: <20060408.013331.71086855.anemo@mba.ocn.ne.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060408.013331.71086855.anemo@mba.ocn.ne.jp> User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11062 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Sat, Apr 08, 2006 at 01:33:31AM +0900, Atsushi Nemoto wrote: > Signed-off-by: Atsushi Nemoto Nice cleanup, applied. Ralf From macro@linux-mips.org Fri Apr 7 17:36:26 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 17:36:35 +0100 (BST) Received: from pollux.ds.pg.gda.pl ([153.19.208.7]:64782 "HELO pollux.ds.pg.gda.pl") by ftp.linux-mips.org with SMTP id S8133569AbWDGQg0 (ORCPT ); Fri, 7 Apr 2006 17:36:26 +0100 Received: from localhost (localhost [127.0.0.1]) by pollux.ds.pg.gda.pl (Postfix) with ESMTP id D8849F7F15; Fri, 7 Apr 2006 18:47:41 +0200 (CEST) Received: from pollux.ds.pg.gda.pl ([127.0.0.1]) by localhost (pollux.ds.pg.gda.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 18035-06; Fri, 7 Apr 2006 18:47:41 +0200 (CEST) Received: from piorun.ds.pg.gda.pl (piorun.ds.pg.gda.pl [153.19.208.8]) by pollux.ds.pg.gda.pl (Postfix) with ESMTP id A2AE0F6F50; Fri, 7 Apr 2006 18:46:02 +0200 (CEST) Received: from blysk.ds.pg.gda.pl (macro@blysk.ds.pg.gda.pl [153.19.208.6]) by piorun.ds.pg.gda.pl (8.13.6/8.13.1) with ESMTP id k37GkCC0027642; Fri, 7 Apr 2006 18:46:12 +0200 Date: Fri, 7 Apr 2006 17:46:06 +0100 (BST) From: "Maciej W. Rozycki" To: Atsushi Nemoto cc: ralf@linux-mips.org, linux-mips@linux-mips.org Subject: Re: [PATCH] use CONFIG_HZ In-Reply-To: <20060408.010348.41197502.anemo@mba.ocn.ne.jp> Message-ID: References: <20060407.011000.77652835.anemo@mba.ocn.ne.jp> <20060407115323.GB5909@linux-mips.org> <20060408.010348.41197502.anemo@mba.ocn.ne.jp> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Virus-Scanned: ClamAV 0.88.1/1381/Fri Apr 7 14:54:35 2006 on piorun.ds.pg.gda.pl X-Virus-Status: Clean X-Virus-Scanned: by amavisd-new at pollux.ds.pg.gda.pl Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11063 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: macro@linux-mips.org Precedence: bulk X-list: linux-mips On Sat, 8 Apr 2006, Atsushi Nemoto wrote: > Make HZ configurable (DECSTATION can select 128/256/1024 HZ, JAZZ can > only select 100 HZ, others can select 48/100/128/250/256/1000/1024 > HZ). Also remove all mach-xxx/param.h files and update all defconfigs > according to current HZ value. Thanks. I've got a suggestion SEAD (sead_defconfig) should use 100Hz by default too and given its usual setup I can't agree more. Maciej From ralf@linux-mips.org Fri Apr 7 17:52:34 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 17:52:42 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:17099 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133569AbWDGQwe (ORCPT ); Fri, 7 Apr 2006 17:52:34 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k37H41jD018636; Fri, 7 Apr 2006 18:04:01 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k37H414k018635; Fri, 7 Apr 2006 18:04:01 +0100 Date: Fri, 7 Apr 2006 18:04:01 +0100 From: Ralf Baechle To: "Maciej W. Rozycki" Cc: Atsushi Nemoto , linux-mips@linux-mips.org Subject: Re: [PATCH] use CONFIG_HZ Message-ID: <20060407170401.GA17163@linux-mips.org> References: <20060407.011000.77652835.anemo@mba.ocn.ne.jp> <20060407115323.GB5909@linux-mips.org> <20060408.010348.41197502.anemo@mba.ocn.ne.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11064 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Fri, Apr 07, 2006 at 05:46:06PM +0100, Maciej W. Rozycki wrote: > > Make HZ configurable (DECSTATION can select 128/256/1024 HZ, JAZZ can > > only select 100 HZ, others can select 48/100/128/250/256/1000/1024 > > HZ). Also remove all mach-xxx/param.h files and update all defconfigs > > according to current HZ value. > > Thanks. I've got a suggestion SEAD (sead_defconfig) should use 100Hz by > default too and given its usual setup I can't agree more. I think I'll apply Atsushi's patch with two changes: o SYS_SUPPORT_* -> SYS_SUPPORTS_* o 48Hz is a very extreme setting and I don't think it's useful for anything but very slow simulators, so I think I'm going to restrict this setting by a dependency on something like CONFIG_EXPERIMENTAL. Ralf From tbm@cyrius.com Fri Apr 7 18:08:01 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 18:08:10 +0100 (BST) Received: from sorrow.cyrius.com ([65.19.161.204]:35345 "HELO sorrow.cyrius.com") by ftp.linux-mips.org with SMTP id S8133536AbWDGRIB (ORCPT ); Fri, 7 Apr 2006 18:08:01 +0100 Received: by sorrow.cyrius.com (Postfix, from userid 10) id 6CC2564D3F; Fri, 7 Apr 2006 17:19:19 +0000 (UTC) Received: by deprecation.cyrius.com (Postfix, from userid 1000) id 60FB466B69; Fri, 7 Apr 2006 19:19:10 +0200 (CEST) Date: Fri, 7 Apr 2006 19:19:10 +0200 From: Martin Michlmayr To: Ralf Baechle Cc: linux-mips@linux-mips.org Subject: Re: Diff between Linus' and linux-mips git: elf.h Message-ID: <20060407171910.GU6869@deprecation.cyrius.com> References: <20060219234318.GA16311@deprecation.cyrius.com> <20060220000141.GX10266@deprecation.cyrius.com> <20060220001126.GA17967@deprecation.cyrius.com> <20060220003128.GD17967@deprecation.cyrius.com> <20060220113420.GB5594@linux-mips.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060220113420.GB5594@linux-mips.org> User-Agent: Mutt/1.5.11+cvs20060330 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11065 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: tbm@cyrius.com Precedence: bulk X-list: linux-mips * Ralf Baechle [2006-02-20 11:34]: > > Can we agree? > > -#define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */ > > +#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */ > Not really :-) > > I've dug deep into history - but it seems nobody remembers the reason for > this change anymore. I suspect actually both constant names might > historically have been in use. For the purposes of Linux it's probably > best to dump the whole number - it never had any relevance. Maybe you can remove it, or at least bring it in sync. -- Martin Michlmayr http://www.cyrius.com/ From kevink@mips.com Fri Apr 7 18:33:16 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 18:33:30 +0100 (BST) Received: from 209-232-97-206.ded.pacbell.net ([209.232.97.206]:21680 "EHLO dns0.mips.com") by ftp.linux-mips.org with ESMTP id S8133600AbWDGRdQ (ORCPT ); Fri, 7 Apr 2006 18:33:16 +0100 Received: from mercury.mips.com (sbcns-dmz [209.232.97.193]) by dns0.mips.com (8.12.11/8.12.11) with ESMTP id k37HiX71020170; Fri, 7 Apr 2006 10:44:34 -0700 (PDT) Received: from grendel (grendel [192.168.236.16]) by mercury.mips.com (8.13.5/8.13.5) with SMTP id k37HiQXw028374; Fri, 7 Apr 2006 10:44:32 -0700 (PDT) Message-ID: <090d01c65a6b$623f6480$10eca8c0@grendel> From: "Kevin D. Kissell" To: "Martin Michlmayr" , "Ralf Baechle" Cc: References: <20060219234318.GA16311@deprecation.cyrius.com> <20060220000141.GX10266@deprecation.cyrius.com> <20060220001126.GA17967@deprecation.cyrius.com> <20060220003128.GD17967@deprecation.cyrius.com> <20060220113420.GB5594@linux-mips.org> <20060407171910.GU6869@deprecation.cyrius.com> Subject: Re: Diff between Linus' and linux-mips git: elf.h Date: Fri, 7 Apr 2006 19:47:40 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2800.1506 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1506 X-Scanned-By: MIMEDefang 2.39 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11066 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: kevink@mips.com Precedence: bulk X-list: linux-mips Arguably, whatever's used by binutils should be the tie-breaker. Googling around, I see that the EM_MIPS_RS3_LE value was added in the October 4, 1999 draft of the ELF spec, but inexplicably the alias with EM_MIPS_RS4_BE was left in place - perhaps they were supposed to be disambiguated by some 32-vs-64-bit flag somewhere. A random sampling of ELF documents on the web shows the vast majority calling out RS3_LE and not RS4_BE. Regards, Kevin K. ----- Original Message ----- From: "Martin Michlmayr" To: "Ralf Baechle" Cc: Sent: Friday, April 07, 2006 7:19 PM Subject: Re: Diff between Linus' and linux-mips git: elf.h > * Ralf Baechle [2006-02-20 11:34]: > > > Can we agree? > > > -#define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */ > > > +#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */ > > Not really :-) > > > > I've dug deep into history - but it seems nobody remembers the reason for > > this change anymore. I suspect actually both constant names might > > historically have been in use. For the purposes of Linux it's probably > > best to dump the whole number - it never had any relevance. > > Maybe you can remove it, or at least bring it in sync. > -- > Martin Michlmayr > http://www.cyrius.com/ > > From sshtylyov@ru.mvista.com Fri Apr 7 20:42:39 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 20:42:49 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:37071 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133588AbWDGTmj (ORCPT ); Fri, 7 Apr 2006 20:42:39 +0100 Received: (qmail 19638 invoked from network); 7 Apr 2006 23:55:34 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 7 Apr 2006 23:55:34 -0000 Message-ID: <4436C301.2060001@ru.mvista.com> Date: Fri, 07 Apr 2006 23:52:33 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: linux-mips@linux-mips.org CC: Bob Breuer , Jordan Crouse Subject: Re: [PATCH] Fix swap entry for MIPS32 36-bit physical address References: <4433C9EE.8030402@ru.mvista.com> In-Reply-To: <4433C9EE.8030402@ru.mvista.com> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11067 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips Sergei Shtylyov wrote: > Hello. > > With 64-bit physical address enabled, 'swapon' was causing kernel oops > on Alchemy CPUs (MIPS32R1) because of the swap entry type field > corrupting the > _PAGE_FILE bit in pte_low. So, change layout of the swap entry to use > all bits > except _PAGE_PRESENT and _PAGE_FILE (the harware protection bits are loaded > from pte_high which should be cleared by __swp_entry_to_pte() macro) -- > which gives 25 bits for the swap entry offset. > Additionally, PTEs in MIPS32R2 should have the same layout for the > 36-bit physical address case as in MIPS32R1, according to the architecture > manuals -- so, fix the #ifdef's. I've decided to tead off that part (incomplete anyway) and move it to a separate patch which I'll post shortly. > WBR, Sergei > > Signed-off-by: Konstantin Baydarov > Signed-off-by: Sergei Shtylyov > > > > ------------------------------------------------------------------------ > > diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h > index 0cff64c..89c269f 100644 > --- a/include/asm-mips/pgtable-32.h > +++ b/include/asm-mips/pgtable-32.h > @@ -116,7 +116,7 @@ static inline void pmd_clear(pmd_t *pmdp > pmd_val(*pmdp) = ((unsigned long) invalid_pte_table); > } > > -#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) > +#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) > #define pte_page(x) pfn_to_page(pte_pfn(x)) > #define pte_pfn(x) ((unsigned long)((x).pte_high >> 6)) > static inline pte_t > @@ -139,7 +139,7 @@ pfn_pte(unsigned long pfn, pgprot_t prot > #define pte_pfn(x) ((unsigned long)((x).pte >> PAGE_SHIFT)) > #define pfn_pte(pfn, prot) __pte(((unsigned long long)(pfn) << PAGE_SHIFT) | pgprot_val(prot)) > #endif > -#endif /* defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) */ > +#endif /* defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) */ > > #define __pgd_offset(address) pgd_index(address) > #define __pud_offset(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) > @@ -190,11 +190,27 @@ pfn_pte(unsigned long pfn, pgprot_t prot > > #else > > +#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) > +/* > + * For 36-bit physical address we store swap entry in pte_low and 0 in pte_high, > + * which gives up 25 bits available for swap offset. > + */ > +#define __swp_type(x) ((x).val & 0x1f) > +#define __swp_offset(x) ((((x).val >> 5) & 0x1) | \ > + (((x).val >> 6) & 0xe) | \ > + (((x).val >> 11) << 4)) > +#define __swp_entry(type,offset) \ > + ((swp_entry_t) {((type) & 0x1f ) | \ > + (((offset) & 0x1) << 5) | \ > + (((offset) & 0xe) << 6) | \ > + (((offset) >> 4 ) << 11)}) > +#else > /* Swap entries must have VALID and GLOBAL bits cleared. */ > #define __swp_type(x) (((x).val >> 8) & 0x1f) > #define __swp_offset(x) ((x).val >> 13) > #define __swp_entry(type,offset) \ > ((swp_entry_t) { ((type) << 8) | ((offset) << 13) }) > +#endif /* defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) */ > > /* > * Bits 0, 1, 2, 7 and 8 are taken, split up the 27 bits of offset > @@ -202,7 +218,7 @@ pfn_pte(unsigned long pfn, pgprot_t prot > */ > #define PTE_FILE_MAX_BITS 27 > > -#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) > +#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) > /* fixme */ > #define pte_to_pgoff(_pte) (((_pte).pte_high >> 6) + ((_pte).pte_high & 0x3f)) > #define pgoff_to_pte(off) \ > diff --git a/include/asm-mips/pgtable-bits.h b/include/asm-mips/pgtable-bits.h > index 01e76e9..8cbc493 100644 > --- a/include/asm-mips/pgtable-bits.h > +++ b/include/asm-mips/pgtable-bits.h > @@ -33,7 +33,7 @@ > * unpredictable things. The code (when it is written) to deal with > * this problem will be in the update_mmu_cache() code for the r4k. > */ > -#if defined(CONFIG_CPU_MIPS32_R1) && defined(CONFIG_64BIT_PHYS_ADDR) > +#if defined(CONFIG_CPU_MIPS32) && defined(CONFIG_64BIT_PHYS_ADDR) > > #define _PAGE_PRESENT (1<<6) /* implemented in software */ > #define _PAGE_READ (1<<7) /* implemented in software */ > > From skiranp@cisco.com Fri Apr 7 21:27:41 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 21:27:49 +0100 (BST) Received: from sj-iport-4.cisco.com ([171.68.10.86]:63399 "EHLO sj-iport-4.cisco.com") by ftp.linux-mips.org with ESMTP id S8133586AbWDGU1k convert rfc822-to-8bit (ORCPT ); Fri, 7 Apr 2006 21:27:40 +0100 Received: from sj-core-4.cisco.com ([171.68.223.138]) by sj-iport-4.cisco.com with ESMTP; 07 Apr 2006 13:39:02 -0700 X-IronPort-AV: i="4.04,98,1144047600"; d="scan'208"; a="1792958079:sNHT29455192" Received: from xbh-sjc-211.amer.cisco.com (xbh-sjc-211.cisco.com [171.70.151.144]) by sj-core-4.cisco.com (8.12.10/8.12.6) with ESMTP id k37KcsYq013596 for ; Fri, 7 Apr 2006 13:39:01 -0700 (PDT) Received: from xmb-sjc-215.amer.cisco.com ([171.70.151.169]) by xbh-sjc-211.amer.cisco.com with Microsoft SMTPSVC(6.0.3790.211); Fri, 7 Apr 2006 13:38:55 -0700 X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT Subject: Oprofile on sibyte 2.4.18 kernel Date: Fri, 7 Apr 2006 13:38:54 -0700 Message-ID: <5547014632ED654F971D7E1E0C2E0C3E018DAFBB@xmb-sjc-215.amer.cisco.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: Oprofile on sibyte 2.4.18 kernel Thread-Index: AcZag0lud8MhRbSARI6GHA+OQL7jGw== From: "Shanthi Kiran Pendyala \(skiranp\)" To: "linux-mips" X-OriginalArrivalTime: 07 Apr 2006 20:38:55.0766 (UTC) FILETIME=[4A22FB60:01C65A83] Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11068 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: skiranp@cisco.com Precedence: bulk X-list: linux-mips Hi, Did anyone port oprofile to 2.4.x kernel on sibyte ?. Looking over the mailing list threads it looks like it has been given up as a lost cause. But business reasons require us to work with 2.4.18 kernel for the next 9-12 months and We really would like explore a port. Or are there other tools that I can use ? Thank you Shanthi kiran From sshtylyov@ru.mvista.com Fri Apr 7 22:09:22 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 22:09:31 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:4817 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133612AbWDGVJW (ORCPT ); Fri, 7 Apr 2006 22:09:22 +0100 Received: (qmail 20930 invoked from network); 8 Apr 2006 01:22:18 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 8 Apr 2006 01:22:18 -0000 Message-ID: <4436D74F.3040108@ru.mvista.com> Date: Sat, 08 Apr 2006 01:19:11 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 CC: linux-mips@linux-mips.org, Ralf Baechle , Pete Popov , Jordan Crouse Subject: Re: [PATCH] Fix swap entry for MIPS32 36-bit physical address References: <4433C9EE.8030402@ru.mvista.com> <4436C301.2060001@ru.mvista.com> In-Reply-To: <4436C301.2060001@ru.mvista.com> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit To: unlisted-recipients:; (no To-header on input) Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11069 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips Hello. Sergei Shtylyov wrote: >> Additionally, PTEs in MIPS32R2 should have the same layout for the >> 36-bit physical address case as in MIPS32R1, according to the >> architecture manuals -- so, fix the #ifdef's. > I've decided to tead off that part (incomplete anyway) and move it to > a separate patch which I'll post shortly. I'm really not sure that we need that #if defined(CONFIG_CPU_MIPS32) -- it renders CONFIG_64BIT_PHYS_ADDR non-working on all other 32-bit CPUs for which Kconfig entry claims that this support exists: config 64BIT_PHYS_ADDR bool "Support for 64-bit physical address space" depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && 32BIT At least RM7000 has the same PTE layout as MIPS32, I guess the others also do. I suspect that the intent was to limit this option to the Alchemy CPUs where it's *really* necessary? WBR, Sergei From sshtylyov@ru.mvista.com Fri Apr 7 22:10:22 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 22:10:31 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:7377 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133612AbWDGVKW (ORCPT ); Fri, 7 Apr 2006 22:10:22 +0100 Received: (qmail 20952 invoked from network); 8 Apr 2006 01:23:18 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 8 Apr 2006 01:23:18 -0000 Message-ID: <4436D793.6080701@ru.mvista.com> Date: Sat, 08 Apr 2006 01:20:19 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: linux-mips@linux-mips.org CC: Bob Breuer , Jordan Crouse , Konstantin Baidarov Subject: Re: [PATCH] Fix swap entry for MIPS32 36-bit physical address References: <4433C9EE.8030402@ru.mvista.com> <4436C301.2060001@ru.mvista.com> In-Reply-To: <4436C301.2060001@ru.mvista.com> Content-Type: multipart/mixed; boundary="------------090801050600050806060004" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11070 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips This is a multi-part message in MIME format. --------------090801050600050806060004 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Hello. With 64-bit physical address enabled, 'swapon' was causing kernel oops on Alchemy CPUs (MIPS32) because of the swap entry type field corrupting the _PAGE_FILE bit in pte_low. So, change layout of the swap entry to use all bits except _PAGE_PRESENT and _PAGE_FILE (the harware protection bits are loaded from pte_high which should be cleared by __swp_entry_to_pte() macro) -- which gives 25 bits for the swap entry offset. WBR, Sergei Signed-off-by: Konstantin Baydarov Signed-off-by: Sergei Shtylyov --------------090801050600050806060004 Content-Type: text/plain; name="MIPS32-36bit-phys-addr-swap-entry-fix.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="MIPS32-36bit-phys-addr-swap-entry-fix.patch" diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h index 4d6bc45..b0ad112 100644 --- a/include/asm-mips/pgtable-32.h +++ b/include/asm-mips/pgtable-32.h @@ -190,11 +190,27 @@ pfn_pte(unsigned long pfn, pgprot_t prot #else +#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) +/* + * For 36-bit physical address we store swap entry in pte_low and 0 in pte_high, + * which gives us 25 bits available for the offset... + */ +#define __swp_type(x) ((x).val & 0x1f) +#define __swp_offset(x) ((((x).val >> 5) & 0x1) | \ + (((x).val >> 6) & 0xe) | \ + (((x).val >> 11) << 4)) +#define __swp_entry(type,offset) \ + ((swp_entry_t) { ((type) & 0x1f) | \ + (((offset) & 0x1) << 5) | \ + (((offset) & 0xe) << 6) | \ + (((offset) >> 4 ) << 11) }) +#else /* Swap entries must have VALID and GLOBAL bits cleared. */ #define __swp_type(x) (((x).val >> 8) & 0x1f) #define __swp_offset(x) ((x).val >> 13) #define __swp_entry(type,offset) \ ((swp_entry_t) { ((type) << 8) | ((offset) << 13) }) +#endif /* defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) */ /* * Bits 0, 1, 2, 7 and 8 are taken, split up the 27 bits of offset --------------090801050600050806060004-- From sshtylyov@ru.mvista.com Fri Apr 7 22:54:54 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 22:55:02 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:49617 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133600AbWDGVyx (ORCPT ); Fri, 7 Apr 2006 22:54:53 +0100 Received: (qmail 21275 invoked from network); 8 Apr 2006 02:07:50 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 8 Apr 2006 02:07:50 -0000 Message-ID: <4436E201.4090409@ru.mvista.com> Date: Sat, 08 Apr 2006 02:04:49 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: linux-mips@linux-mips.org CC: Bob Breuer , Jordan Crouse , Konstantin Baidarov Subject: Re: [PATCH] Fix swap entry for MIPS32 36-bit physical address References: <4433C9EE.8030402@ru.mvista.com> <4436C301.2060001@ru.mvista.com> <4436D793.6080701@ru.mvista.com> In-Reply-To: <4436D793.6080701@ru.mvista.com> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11071 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips Hello. Sergei Shtylyov wrote: > With 64-bit physical address enabled, 'swapon' was causing kernel oops > on Alchemy CPUs (MIPS32) because of the swap entry type field corrupting > the _PAGE_FILE bit in pte_low. So, change layout of the swap entry to use > all bits > except _PAGE_PRESENT and _PAGE_FILE (the harware protection bits are loaded > from pte_high which should be cleared by __swp_entry_to_pte() macro) -- > which gives 25 bits for the swap entry offset. Hm, just noticed that this fix renders set_pte()/pte_clear() erroneous by reusing _PAGE_GLOBAL (bit 0) in pte_low field of pte_t -- pte_high should have been used instead or those macros fixed. So, refrain from committing as yet... WBR, Sergei > Signed-off-by: Konstantin Baydarov > Signed-off-by: Sergei Shtylyov > ------------------------------------------------------------------------ > > diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h > index 4d6bc45..b0ad112 100644 > --- a/include/asm-mips/pgtable-32.h > +++ b/include/asm-mips/pgtable-32.h > @@ -190,11 +190,27 @@ pfn_pte(unsigned long pfn, pgprot_t prot > > #else > > +#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) > +/* > + * For 36-bit physical address we store swap entry in pte_low and 0 in pte_high, > + * which gives us 25 bits available for the offset... > + */ > +#define __swp_type(x) ((x).val & 0x1f) > +#define __swp_offset(x) ((((x).val >> 5) & 0x1) | \ > + (((x).val >> 6) & 0xe) | \ > + (((x).val >> 11) << 4)) > +#define __swp_entry(type,offset) \ > + ((swp_entry_t) { ((type) & 0x1f) | \ > + (((offset) & 0x1) << 5) | \ > + (((offset) & 0xe) << 6) | \ > + (((offset) >> 4 ) << 11) }) > +#else > /* Swap entries must have VALID and GLOBAL bits cleared. */ > #define __swp_type(x) (((x).val >> 8) & 0x1f) > #define __swp_offset(x) ((x).val >> 13) > #define __swp_entry(type,offset) \ > ((swp_entry_t) { ((type) << 8) | ((offset) << 13) }) > +#endif /* defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) */ > > /* > * Bits 0, 1, 2, 7 and 8 are taken, split up the 27 bits of offset > > From ralf@linux-mips.org Fri Apr 7 23:10:22 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 07 Apr 2006 23:10:30 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:36824 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133622AbWDGWKW (ORCPT ); Fri, 7 Apr 2006 23:10:22 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k37MLoCT026146; Fri, 7 Apr 2006 23:21:50 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k37MLgCW026144; Fri, 7 Apr 2006 23:21:42 +0100 Date: Fri, 7 Apr 2006 23:21:42 +0100 From: Ralf Baechle To: "Kevin D. Kissell" Cc: Martin Michlmayr , linux-mips@linux-mips.org Subject: Re: Diff between Linus' and linux-mips git: elf.h Message-ID: <20060407222142.GA26104@linux-mips.org> References: <20060219234318.GA16311@deprecation.cyrius.com> <20060220000141.GX10266@deprecation.cyrius.com> <20060220001126.GA17967@deprecation.cyrius.com> <20060220003128.GD17967@deprecation.cyrius.com> <20060220113420.GB5594@linux-mips.org> <20060407171910.GU6869@deprecation.cyrius.com> <090d01c65a6b$623f6480$10eca8c0@grendel> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <090d01c65a6b$623f6480$10eca8c0@grendel> User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11072 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Fri, Apr 07, 2006 at 07:47:40PM +0200, Kevin D. Kissell wrote: > Arguably, whatever's used by binutils should be the tie-breaker. > Googling around, I see that the EM_MIPS_RS3_LE value was > added in the October 4, 1999 draft of the ELF spec, but inexplicably > the alias with EM_MIPS_RS4_BE was left in place - perhaps they > were supposed to be disambiguated by some 32-vs-64-bit flag > somewhere. A random sampling of ELF documents on the web > shows the vast majority calling out RS3_LE and not RS4_BE. No way to actually resolve this one; not even binutils oldtimer Ian Lance Taylor can remember the reasons for the change anymore. Ralf From sshtylyov@ru.mvista.com Fri Apr 7 23:59:55 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 08 Apr 2006 00:00:04 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:27091 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133623AbWDGW7z (ORCPT ); Fri, 7 Apr 2006 23:59:55 +0100 Received: (qmail 21725 invoked from network); 8 Apr 2006 03:12:52 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 8 Apr 2006 03:12:52 -0000 Message-ID: <4436F140.3030007@ru.mvista.com> Date: Sat, 08 Apr 2006 03:09:52 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: linux-mips CC: Clem Taylor , Jordan Crouse , Manish Lachwani Subject: [PATCH] FIx mprotect() syscall for MIPS32 w/36-bit physical address support References: <20060202165436.GB17352@linux-mips.org> In-Reply-To: <20060202165436.GB17352@linux-mips.org> Content-Type: multipart/mixed; boundary="------------000004060904030800020404" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11073 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips This is a multi-part message in MIME format. --------------000004060904030800020404 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Hello. Fix mprotect() syscall for MIPS32 CPUs with 36-bit physical address support: pte_modify() macro didn't clear the hardware page protection bits before modifying... WBR, Sergei Signed-off-by: Sergei Shtylyov --------------000004060904030800020404 Content-Type: text/plain; name="MIPS32-36bit-phys-addr-mprotect-fix.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="MIPS32-36bit-phys-addr-mprotect-fix.patch" diff --git a/include/asm-mips/pgtable.h b/include/asm-mips/pgtable.h index 702a28f..80b3605 100644 --- a/include/asm-mips/pgtable.h +++ b/include/asm-mips/pgtable.h @@ -335,8 +335,9 @@ static inline pgprot_t pgprot_noncached( #if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) { - pte.pte_low &= _PAGE_CHG_MASK; - pte.pte_low |= pgprot_val(newprot); + pte.pte_low &= _PAGE_CHG_MASK; + pte.pte_high &= ~0x3f; + pte.pte_low |= pgprot_val(newprot); pte.pte_high |= pgprot_val(newprot) & 0x3f; return pte; } --------------000004060904030800020404-- From ralf@linux-mips.org Sat Apr 8 00:08:42 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 08 Apr 2006 00:08:50 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:4750 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133617AbWDGXIm (ORCPT ); Sat, 8 Apr 2006 00:08:42 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k37NKAsO026851; Sat, 8 Apr 2006 00:20:10 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k37NK8LD026850; Sat, 8 Apr 2006 00:20:08 +0100 Date: Sat, 8 Apr 2006 00:20:08 +0100 From: Ralf Baechle To: "Shanthi Kiran Pendyala (skiranp)" Cc: linux-mips Subject: Re: Oprofile on sibyte 2.4.18 kernel Message-ID: <20060407232008.GB26104@linux-mips.org> References: <5547014632ED654F971D7E1E0C2E0C3E018DAFBB@xmb-sjc-215.amer.cisco.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5547014632ED654F971D7E1E0C2E0C3E018DAFBB@xmb-sjc-215.amer.cisco.com> User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11074 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Fri, Apr 07, 2006 at 01:38:54PM -0700, Shanthi Kiran Pendyala (skiranp) wrote: > Did anyone port oprofile to 2.4.x kernel on sibyte ?. > > Looking over the mailing list threads it looks like it has been given up > as a lost cause. Correct. So if at all you would have to rip oprofile from the 2.6 kernel and bolt that code back into the old kernel which would seem doable. The MIPS bits certainly don't rely on much 2.6 infrastructure. > But business reasons require us to work with 2.4.18 kernel for the next > 9-12 months and We really would like explore a port. You at least want a newer 2.4 variant; 2.4.18 is now over 4 years old, is from before the point where 2.4 really became stable and contains a number of security revelant holes. > Or are there other tools that I can use ? Gprof, perfex 2 - not sure if the MIPS port of it was ever published though. But nothing really that provides the same kind of information as oprofile. Ralf From sshtylyov@ru.mvista.com Sat Apr 8 04:46:10 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 08 Apr 2006 04:46:23 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:18135 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133352AbWDHDqK (ORCPT ); Sat, 8 Apr 2006 04:46:10 +0100 Received: (qmail 23491 invoked from network); 8 Apr 2006 07:59:09 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 8 Apr 2006 07:59:09 -0000 Message-ID: <44373456.2070107@ru.mvista.com> Date: Sat, 08 Apr 2006 07:56:06 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: linux-mips@linux-mips.org CC: Manish Lachwani , Jordan Crouse , Ralf Baechle Subject: Re: [PATCH] Enable 36-bit physical address on MIPS32R2 also References: <4433C9EE.8030402@ru.mvista.com> <4436C301.2060001@ru.mvista.com> In-Reply-To: <4436C301.2060001@ru.mvista.com> Content-Type: multipart/mixed; boundary="------------050807040407080201000703" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11075 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips This is a multi-part message in MIME format. --------------050807040407080201000703 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Hello. PTEs in MIPS32R2 have the same layout for the 36-bit physical address case as in MIPS32R1, according to the architecture manuals -- so, fix the #if's. Not sure that we need that #if defined(CONFIG_CPU_MIPS32) at all though... WBR, Sergei Signed-off-by: Sergei Shtylyov --------------050807040407080201000703 Content-Type: text/plain; name="MIPS32R2-36bit-phys-addr.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="MIPS32R2-36bit-phys-addr.patch" diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h index 4d6bc45..5f31351 100644 --- a/include/asm-mips/pgtable-32.h +++ b/include/asm-mips/pgtable-32.h @@ -116,7 +116,7 @@ static inline void pmd_clear(pmd_t *pmdp pmd_val(*pmdp) = ((unsigned long) invalid_pte_table); } -#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) +#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) #define pte_page(x) pfn_to_page(pte_pfn(x)) #define pte_pfn(x) ((unsigned long)((x).pte_high >> 6)) static inline pte_t @@ -137,9 +137,9 @@ pfn_pte(unsigned long pfn, pgprot_t prot #define pfn_pte(pfn, prot) __pte(((pfn) << (PAGE_SHIFT + 2)) | pgprot_val(prot)) #else #define pte_pfn(x) ((unsigned long)((x).pte >> PAGE_SHIFT)) -#define pfn_pte(pfn, prot) __pte(((unsigned long long)(pfn) << PAGE_SHIFT) | pgprot_val(prot)) +#define pfn_pte(pfn, prot) __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot)) #endif -#endif /* defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) */ +#endif /* defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) */ #define __pgd_offset(address) pgd_index(address) #define __pud_offset(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) @@ -202,7 +202,7 @@ pfn_pte(unsigned long pfn, pgprot_t prot */ #define PTE_FILE_MAX_BITS 27 -#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) +#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) /* fixme */ #define pte_to_pgoff(_pte) (((_pte).pte_high >> 6) + ((_pte).pte_high & 0x3f)) #define pgoff_to_pte(off) \ diff --git a/include/asm-mips/pgtable-bits.h b/include/asm-mips/pgtable-bits.h index 01e76e9..3aad751 100644 --- a/include/asm-mips/pgtable-bits.h +++ b/include/asm-mips/pgtable-bits.h @@ -33,7 +33,7 @@ * unpredictable things. The code (when it is written) to deal with * this problem will be in the update_mmu_cache() code for the r4k. */ -#if defined(CONFIG_CPU_MIPS32_R1) && defined(CONFIG_64BIT_PHYS_ADDR) +#if defined(CONFIG_CPU_MIPS32) && defined(CONFIG_64BIT_PHYS_ADDR) #define _PAGE_PRESENT (1<<6) /* implemented in software */ #define _PAGE_READ (1<<7) /* implemented in software */ @@ -123,7 +123,7 @@ #endif #endif -#endif /* defined(CONFIG_CPU_MIPS32_R1) && defined(CONFIG_64BIT_PHYS_ADDR) */ +#endif /* defined(CONFIG_CPU_MIPS32) && defined(CONFIG_64BIT_PHYS_ADDR) */ #define __READABLE (_PAGE_READ | _PAGE_SILENT_READ | _PAGE_ACCESSED) #define __WRITEABLE (_PAGE_WRITE | _PAGE_SILENT_WRITE | _PAGE_MODIFIED) @@ -140,7 +140,7 @@ #define PAGE_CACHABLE_DEFAULT _CACHE_CACHABLE_COW #endif -#if defined(CONFIG_CPU_MIPS32_R1) && defined(CONFIG_64BIT_PHYS_ADDR) +#if defined(CONFIG_CPU_MIPS32) && defined(CONFIG_64BIT_PHYS_ADDR) #define CONF_CM_DEFAULT (PAGE_CACHABLE_DEFAULT >> 3) #else #define CONF_CM_DEFAULT (PAGE_CACHABLE_DEFAULT >> 9) diff --git a/include/asm-mips/pgtable.h b/include/asm-mips/pgtable.h index 702a28f..925211d 100644 --- a/include/asm-mips/pgtable.h +++ b/include/asm-mips/pgtable.h @@ -85,7 +85,7 @@ extern void paging_init(void); #define pte_none(pte) (!(pte_val(pte) & ~_PAGE_GLOBAL)) #define pte_present(pte) (pte_val(pte) & _PAGE_PRESENT) -#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) +#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) static inline void set_pte(pte_t *ptep, pte_t pte) { ptep->pte_high = pte.pte_high; @@ -173,7 +173,7 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD * Undefined behaviour if not.. */ static inline int pte_user(pte_t pte) { BUG(); return 0; } -#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) +#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) static inline int pte_read(pte_t pte) { return (pte).pte_low & _PAGE_READ; } static inline int pte_write(pte_t pte) { return (pte).pte_low & _PAGE_WRITE; } static inline int pte_dirty(pte_t pte) { return (pte).pte_low & _PAGE_MODIFIED; } @@ -332,7 +332,7 @@ static inline pgprot_t pgprot_noncached( */ #define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot)) -#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) +#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) { pte.pte_low &= _PAGE_CHG_MASK; --------------050807040407080201000703-- From sshtylyov@ru.mvista.com Sat Apr 8 10:41:10 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 08 Apr 2006 10:41:20 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:25052 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133380AbWDHJlK (ORCPT ); Sat, 8 Apr 2006 10:41:10 +0100 Received: (qmail 25267 invoked from network); 8 Apr 2006 13:54:13 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 8 Apr 2006 13:54:13 -0000 Message-ID: <4437878C.3000603@ru.mvista.com> Date: Sat, 08 Apr 2006 13:51:08 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: linux-mips@linux-mips.org CC: Bob Breuer , Jordan Crouse , Konstantin Baidarov , Ralf Baechle , Pete Popov , Manish Lachwani Subject: [PATCH] Fix swap entry for MIPS32 with 36-bit physical address References: <4433C9EE.8030402@ru.mvista.com> <4436C301.2060001@ru.mvista.com> <4436D793.6080701@ru.mvista.com> <4436E201.4090409@ru.mvista.com> In-Reply-To: <4436E201.4090409@ru.mvista.com> Content-Type: multipart/mixed; boundary="------------090903080109000601080707" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11076 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips This is a multi-part message in MIME format. --------------090903080109000601080707 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit With 64-bit physical address enabled, 'swapon' was causing kernel oops on Alchemy CPUs (MIPS32) because of the swap entry type field corrupting the _PAGE_FILE bit in 'pte_low' field. So, switch to storing the swap entry in 'pte_high' field using all its bits except _PAGE_GLOBAL and _PAGE_VALID which gives 25 bits for the swap entry offset. WBR, Sergei Signed-off-by: Sergei Shtylyov --------------090903080109000601080707 Content-Type: text/plain; name="MIPS32-36bit-phys-addr-swap-entry-fix.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="MIPS32-36bit-phys-addr-swap-entry-fix.patch" diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h index 4d6bc45..a5ce3f1 100644 --- a/include/asm-mips/pgtable-32.h +++ b/include/asm-mips/pgtable-32.h @@ -191,10 +191,17 @@ pfn_pte(unsigned long pfn, pgprot_t prot #else /* Swap entries must have VALID and GLOBAL bits cleared. */ +#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) +#define __swp_type(x) (((x).val >> 2) & 0x1f) +#define __swp_offset(x) ((x).val >> 7) +#define __swp_entry(type,offset) \ + ((swp_entry_t) { ((type) << 2) | ((offset) << 7) }) +#else #define __swp_type(x) (((x).val >> 8) & 0x1f) -#define __swp_offset(x) ((x).val >> 13) +#define __swp_offset(x) ((x).val >> 13) #define __swp_entry(type,offset) \ - ((swp_entry_t) { ((type) << 8) | ((offset) << 13) }) + ((swp_entry_t) { ((type) << 8) | ((offset) << 13) }) +#endif /* defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) */ /* * Bits 0, 1, 2, 7 and 8 are taken, split up the 27 bits of offset @@ -218,7 +225,12 @@ pfn_pte(unsigned long pfn, pgprot_t prot #endif +#if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) +#define __pte_to_swp_entry(pte) ((swp_entry_t) { (pte).pte_high }) +#define __swp_entry_to_pte(x) ((pte_t) { 0, (x).val }) +#else #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) }) #define __swp_entry_to_pte(x) ((pte_t) { (x).val }) +#endif #endif /* _ASM_PGTABLE_32_H */ --------------090903080109000601080707-- From anemo@mba.ocn.ne.jp Sat Apr 8 16:17:44 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 08 Apr 2006 16:18:04 +0100 (BST) Received: from mba.ocn.ne.jp ([210.190.142.172]:30688 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S8133403AbWDHPRo (ORCPT ); Sat, 8 Apr 2006 16:17:44 +0100 Received: from localhost (p7032-ipad31funabasi.chiba.ocn.ne.jp [221.189.131.32]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 9AC13AAE7; Sun, 9 Apr 2006 00:29:09 +0900 (JST) Date: Sun, 09 Apr 2006 00:29:29 +0900 (JST) Message-Id: <20060409.002929.74751620.anemo@mba.ocn.ne.jp> To: ralf@linux-mips.org Cc: macro@linux-mips.org, linux-mips@linux-mips.org Subject: Re: [PATCH] use CONFIG_HZ From: Atsushi Nemoto In-Reply-To: <20060407170401.GA17163@linux-mips.org> References: <20060408.010348.41197502.anemo@mba.ocn.ne.jp> <20060407170401.GA17163@linux-mips.org> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11077 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips On Fri, 7 Apr 2006 18:04:01 +0100, Ralf Baechle wrote: > I think I'll apply Atsushi's patch with two changes: > > o SYS_SUPPORT_* -> SYS_SUPPORTS_* > o 48Hz is a very extreme setting and I don't think it's useful for > anything but very slow simulators, so I think I'm going to restrict > this setting by a dependency on something like CONFIG_EXPERIMENTAL. OK, Take 3. 48Hz are only available if explicitly listed in board definition. Make HZ configurable. DECSTATION can select 128/256/1024 HZ, JAZZ can only select 100 HZ, others can select 100/128/250/256/1000/1024 HZ if not explicitly specified). Also remove all mach-xxx/param.h files and update all defconfigs according to current HZ value. Signed-off-by: Atsushi Nemoto b/arch/mips/Kconfig | 75 ++++++++++++++++++++++++++++ b/arch/mips/configs/atlas_defconfig | 9 +++ b/arch/mips/configs/bigsur_defconfig | 9 +++ b/arch/mips/configs/capcella_defconfig | 9 +++ b/arch/mips/configs/cobalt_defconfig | 9 +++ b/arch/mips/configs/db1000_defconfig | 9 +++ b/arch/mips/configs/db1100_defconfig | 9 +++ b/arch/mips/configs/db1200_defconfig | 9 +++ b/arch/mips/configs/db1500_defconfig | 9 +++ b/arch/mips/configs/db1550_defconfig | 9 +++ b/arch/mips/configs/ddb5476_defconfig | 9 +++ b/arch/mips/configs/ddb5477_defconfig | 9 +++ b/arch/mips/configs/decstation_defconfig | 11 ++++ b/arch/mips/configs/e55_defconfig | 9 +++ b/arch/mips/configs/ev64120_defconfig | 9 +++ b/arch/mips/configs/ev96100_defconfig | 9 +++ b/arch/mips/configs/ip22_defconfig | 9 +++ b/arch/mips/configs/ip27_defconfig | 9 +++ b/arch/mips/configs/ip32_defconfig | 9 +++ b/arch/mips/configs/it8172_defconfig | 9 +++ b/arch/mips/configs/ivr_defconfig | 9 +++ b/arch/mips/configs/jaguar-atx_defconfig | 9 +++ b/arch/mips/configs/jmr3927_defconfig | 9 +++ b/arch/mips/configs/lasat200_defconfig | 9 +++ b/arch/mips/configs/malta_defconfig | 9 +++ b/arch/mips/configs/mipssim_defconfig | 9 +++ b/arch/mips/configs/mpc30x_defconfig | 9 +++ b/arch/mips/configs/ocelot_3_defconfig | 9 +++ b/arch/mips/configs/ocelot_c_defconfig | 9 +++ b/arch/mips/configs/ocelot_defconfig | 9 +++ b/arch/mips/configs/ocelot_g_defconfig | 9 +++ b/arch/mips/configs/pb1100_defconfig | 9 +++ b/arch/mips/configs/pb1500_defconfig | 9 +++ b/arch/mips/configs/pb1550_defconfig | 9 +++ b/arch/mips/configs/pnx8550-jbs_defconfig | 9 +++ b/arch/mips/configs/pnx8550-v2pci_defconfig | 9 +++ b/arch/mips/configs/qemu_defconfig | 9 +++ b/arch/mips/configs/rbhma4500_defconfig | 9 +++ b/arch/mips/configs/rm200_defconfig | 9 +++ b/arch/mips/configs/sb1250-swarm_defconfig | 9 +++ b/arch/mips/configs/sead_defconfig | 9 +++ b/arch/mips/configs/tb0226_defconfig | 9 +++ b/arch/mips/configs/tb0229_defconfig | 9 +++ b/arch/mips/configs/tb0287_defconfig | 9 +++ b/arch/mips/configs/workpad_defconfig | 9 +++ b/arch/mips/configs/yosemite_defconfig | 9 +++ b/arch/mips/dec/time.c | 2 b/arch/mips/defconfig | 9 +++ b/include/asm-mips/param.h | 2 include/asm-mips/mach-dec/param.h | 18 ------ include/asm-mips/mach-generic/param.h | 13 ---- include/asm-mips/mach-jazz/param.h | 16 ----- include/asm-mips/mach-mips/param.h | 13 ---- include/asm-mips/mach-qemu/param.h | 13 ---- 54 files changed, 493 insertions(+), 75 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 71d9a4b..8c364c9 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -142,6 +142,9 @@ config MACH_DECSTATION select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_SUPPORTS_128HZ + select SYS_SUPPORTS_256HZ + select SYS_SUPPORTS_1024HZ help This enables support for DEC's MIPS based workstations. For details see the Linux/MIPS FAQ on and the @@ -239,6 +242,7 @@ config MACH_JAZZ select SYS_HAS_CPU_R4X00 select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL + select SYS_SUPPORTS_100HZ help This a family of machines based on the MIPS R4030 chipset which was used by several vendors to build RISC/os and Windows NT workstations. @@ -1652,6 +1656,77 @@ config NR_CPUS This is purely to save memory - each supported CPU adds approximately eight kilobytes to the kernel image. +# +# Timer Interrupt Frequency Configuration +# + +choice + prompt "Timer frequency" + default HZ_250 + help + Allows the configuration of the timer frequency. + + config HZ_48 + bool "48 HZ" if SYS_SUPPORTS_48HZ + + config HZ_100 + bool "100 HZ" if SYS_SUPPORTS_100HZ || SYS_SUPPORTS_ARBIT_HZ + + config HZ_128 + bool "128 HZ" if SYS_SUPPORTS_128HZ || SYS_SUPPORTS_ARBIT_HZ + + config HZ_250 + bool "250 HZ" if SYS_SUPPORTS_250HZ || SYS_SUPPORTS_ARBIT_HZ + + config HZ_256 + bool "256 HZ" if SYS_SUPPORTS_256HZ || SYS_SUPPORTS_ARBIT_HZ + + config HZ_1000 + bool "1000 HZ" if SYS_SUPPORTS_1000HZ || SYS_SUPPORTS_ARBIT_HZ + + config HZ_1024 + bool "1024 HZ" if SYS_SUPPORTS_1024HZ || SYS_SUPPORTS_ARBIT_HZ + +endchoice + +config SYS_SUPPORTS_48HZ + bool + +config SYS_SUPPORTS_100HZ + bool + +config SYS_SUPPORTS_128HZ + bool + +config SYS_SUPPORTS_250HZ + bool + +config SYS_SUPPORTS_256HZ + bool + +config SYS_SUPPORTS_1000HZ + bool + +config SYS_SUPPORTS_1024HZ + bool + +config SYS_SUPPORTS_ARBIT_HZ + bool + default y if !SYS_SUPPORTS_48HZ && !SYS_SUPPORTS_100HZ && \ + !SYS_SUPPORTS_128HZ && !SYS_SUPPORTS_250HZ && \ + !SYS_SUPPORTS_256HZ && !SYS_SUPPORTS_1000HZ && \ + !SYS_SUPPORTS_1024HZ + +config HZ + int + default 48 if HZ_48 + default 100 if HZ_100 + default 128 if HZ_128 + default 250 if HZ_250 + default 256 if HZ_256 + default 1000 if HZ_1000 + default 1024 if HZ_1024 + source "kernel/Kconfig.preempt" config RTC_DS1742 diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig index 80da9c8..9dfc071 100644 --- a/arch/mips/configs/atlas_defconfig +++ b/arch/mips/configs/atlas_defconfig @@ -142,6 +142,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +CONFIG_HZ_100=y +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +# CONFIG_HZ_1000 is not set +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=100 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index 05566a2..4ceeb2b 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig @@ -144,6 +144,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_SMP=y CONFIG_NR_CPUS=4 CONFIG_PREEMPT_NONE=y diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig index a69dafb..17b1773 100644 --- a/arch/mips/configs/capcella_defconfig +++ b/arch/mips/configs/capcella_defconfig @@ -128,6 +128,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig index 6a4940b..fb5e788 100644 --- a/arch/mips/configs/cobalt_defconfig +++ b/arch/mips/configs/cobalt_defconfig @@ -128,6 +128,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig index 6d7bcc0..c2ef5ed 100644 --- a/arch/mips/configs/db1000_defconfig +++ b/arch/mips/configs/db1000_defconfig @@ -129,6 +129,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig index acd2ffe..4d6a4fa 100644 --- a/arch/mips/configs/db1100_defconfig +++ b/arch/mips/configs/db1100_defconfig @@ -129,6 +129,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig index d918754..948b18e 100644 --- a/arch/mips/configs/db1200_defconfig +++ b/arch/mips/configs/db1200_defconfig @@ -129,6 +129,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig index 5491a51..d0156a4 100644 --- a/arch/mips/configs/db1500_defconfig +++ b/arch/mips/configs/db1500_defconfig @@ -131,6 +131,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig index 425d939..ca0c0e4 100644 --- a/arch/mips/configs/db1550_defconfig +++ b/arch/mips/configs/db1550_defconfig @@ -130,6 +130,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig index 4837b3c..eaceb9e 100644 --- a/arch/mips/configs/ddb5476_defconfig +++ b/arch/mips/configs/ddb5476_defconfig @@ -129,6 +129,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig index e3a3786..003f801 100644 --- a/arch/mips/configs/ddb5477_defconfig +++ b/arch/mips/configs/ddb5477_defconfig @@ -129,6 +129,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig index b5b44a8..e85fcc2 100644 --- a/arch/mips/configs/decstation_defconfig +++ b/arch/mips/configs/decstation_defconfig @@ -128,6 +128,17 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +CONFIG_HZ_128=y +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +# CONFIG_HZ_1000 is not set +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_128HZ=y +CONFIG_SYS_SUPPORTS_256HZ=y +CONFIG_SYS_SUPPORTS_1024HZ=y +CONFIG_HZ=128 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig index 263cc38..cc9a1c3 100644 --- a/arch/mips/configs/e55_defconfig +++ b/arch/mips/configs/e55_defconfig @@ -126,6 +126,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig index e0d7e07..27a0d49 100644 --- a/arch/mips/configs/ev64120_defconfig +++ b/arch/mips/configs/ev64120_defconfig @@ -131,6 +131,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ev96100_defconfig b/arch/mips/configs/ev96100_defconfig index 095bfe3..d69f45e 100644 --- a/arch/mips/configs/ev96100_defconfig +++ b/arch/mips/configs/ev96100_defconfig @@ -135,6 +135,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index f66ba91..6eece7b 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig @@ -136,6 +136,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 33f18c6..4f03566 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig @@ -133,6 +133,15 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_NEED_MULTIPLE_NODES=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_MIGRATION=y CONFIG_SMP=y CONFIG_NR_CPUS=64 diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index 2b8f223..954c865 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig @@ -135,6 +135,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/it8172_defconfig b/arch/mips/configs/it8172_defconfig index a5ac713..8a572f6 100644 --- a/arch/mips/configs/it8172_defconfig +++ b/arch/mips/configs/it8172_defconfig @@ -130,6 +130,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ivr_defconfig b/arch/mips/configs/ivr_defconfig index 3cf9750..9a98ff4 100644 --- a/arch/mips/configs/ivr_defconfig +++ b/arch/mips/configs/ivr_defconfig @@ -127,6 +127,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig index 9f6303d..feea72c 100644 --- a/arch/mips/configs/jaguar-atx_defconfig +++ b/arch/mips/configs/jaguar-atx_defconfig @@ -136,6 +136,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 # CONFIG_SMP is not set CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig index a2ce2e1..f431533 100644 --- a/arch/mips/configs/jmr3927_defconfig +++ b/arch/mips/configs/jmr3927_defconfig @@ -125,6 +125,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig index d742529..6a0b89a 100644 --- a/arch/mips/configs/lasat200_defconfig +++ b/arch/mips/configs/lasat200_defconfig @@ -134,6 +134,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 50c8679..0aeedbd 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig @@ -148,6 +148,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +CONFIG_HZ_100=y +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +# CONFIG_HZ_1000 is not set +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=100 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig index 4b3342c..e94589e 100644 --- a/arch/mips/configs/mipssim_defconfig +++ b/arch/mips/configs/mipssim_defconfig @@ -134,6 +134,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig index 3e75368..1bc1407 100644 --- a/arch/mips/configs/mpc30x_defconfig +++ b/arch/mips/configs/mpc30x_defconfig @@ -128,6 +128,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig index 4197ac3..70a4cd6 100644 --- a/arch/mips/configs/ocelot_3_defconfig +++ b/arch/mips/configs/ocelot_3_defconfig @@ -136,6 +136,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 # CONFIG_SMP is not set CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig index da777cb..d9153a8 100644 --- a/arch/mips/configs/ocelot_c_defconfig +++ b/arch/mips/configs/ocelot_c_defconfig @@ -132,6 +132,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig index 9ff6ab5..d177372 100644 --- a/arch/mips/configs/ocelot_defconfig +++ b/arch/mips/configs/ocelot_defconfig @@ -137,6 +137,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig index 7df9ce9..cd05da7 100644 --- a/arch/mips/configs/ocelot_g_defconfig +++ b/arch/mips/configs/ocelot_g_defconfig @@ -135,6 +135,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig index fc28746..538a9b9 100644 --- a/arch/mips/configs/pb1100_defconfig +++ b/arch/mips/configs/pb1100_defconfig @@ -131,6 +131,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig index a09be54..68a7dc8 100644 --- a/arch/mips/configs/pb1500_defconfig +++ b/arch/mips/configs/pb1500_defconfig @@ -130,6 +130,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig index b8bcbc2..988f3e5 100644 --- a/arch/mips/configs/pb1550_defconfig +++ b/arch/mips/configs/pb1550_defconfig @@ -130,6 +130,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig index 91ff3ba..b4d1a3a 100644 --- a/arch/mips/configs/pnx8550-jbs_defconfig +++ b/arch/mips/configs/pnx8550-jbs_defconfig @@ -129,6 +129,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig index 932c803..f0eba36 100644 --- a/arch/mips/configs/pnx8550-v2pci_defconfig +++ b/arch/mips/configs/pnx8550-v2pci_defconfig @@ -130,6 +130,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig index 0d3ce64..51e9f7c 100644 --- a/arch/mips/configs/qemu_defconfig +++ b/arch/mips/configs/qemu_defconfig @@ -126,6 +126,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +CONFIG_HZ_100=y +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +# CONFIG_HZ_1000 is not set +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=100 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig index 0ad74a5..00362c5 100644 --- a/arch/mips/configs/rbhma4500_defconfig +++ b/arch/mips/configs/rbhma4500_defconfig @@ -138,6 +138,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig index fab27fe..311f49a 100644 --- a/arch/mips/configs/rm200_defconfig +++ b/arch/mips/configs/rm200_defconfig @@ -138,6 +138,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index 9060622..9ec34c1 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig @@ -148,6 +148,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_PREEMPT_NONE=y diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig index de02881..8f7c101 100644 --- a/arch/mips/configs/sead_defconfig +++ b/arch/mips/configs/sead_defconfig @@ -133,6 +133,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index 8f4f06c..a57849b 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_defconfig @@ -130,6 +130,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig index 5f54e27..59f7085 100644 --- a/arch/mips/configs/tb0229_defconfig +++ b/arch/mips/configs/tb0229_defconfig @@ -130,6 +130,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig index fe3ba4f..40b9409 100644 --- a/arch/mips/configs/tb0287_defconfig +++ b/arch/mips/configs/tb0287_defconfig @@ -135,6 +135,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig index bd5bd46..685923d 100644 --- a/arch/mips/configs/workpad_defconfig +++ b/arch/mips/configs/workpad_defconfig @@ -126,6 +126,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig index 2c0c25e..791c934 100644 --- a/arch/mips/configs/yosemite_defconfig +++ b/arch/mips/configs/yosemite_defconfig @@ -130,6 +130,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_PREEMPT_NONE=y diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c index 74cb055..76e4d09 100644 --- a/arch/mips/dec/time.c +++ b/arch/mips/dec/time.c @@ -181,7 +181,7 @@ void __init dec_time_init(void) } /* Set up the rate of periodic DS1287 interrupts. */ - CMOS_WRITE(RTC_REF_CLCK_32KHZ | (16 - LOG_2_HZ), RTC_REG_A); + CMOS_WRITE(RTC_REF_CLCK_32KHZ | (16 - __ffs(HZ)), RTC_REG_A); } EXPORT_SYMBOL(do_settimeofday); diff --git a/arch/mips/defconfig b/arch/mips/defconfig index f66ba91..6eece7b 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig @@ -136,6 +136,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set diff --git a/include/asm-mips/mach-dec/param.h b/include/asm-mips/mach-dec/param.h deleted file mode 100644 index 3e4f0e3..0000000 --- a/include/asm-mips/mach-dec/param.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2003 by Ralf Baechle - */ -#ifndef __ASM_MACH_DEC_PARAM_H -#define __ASM_MACH_DEC_PARAM_H - -/* - * log2(HZ), change this here if you want another HZ value. This is also - * used in dec_time_init. Minimum is 1, Maximum is 15. - */ -#define LOG_2_HZ 7 -#define HZ (1 << LOG_2_HZ) - -#endif /* __ASM_MACH_DEC_PARAM_H */ diff --git a/include/asm-mips/mach-generic/param.h b/include/asm-mips/mach-generic/param.h deleted file mode 100644 index a0d12f9..0000000 --- a/include/asm-mips/mach-generic/param.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2003 by Ralf Baechle - */ -#ifndef __ASM_MACH_GENERIC_PARAM_H -#define __ASM_MACH_GENERIC_PARAM_H - -#define HZ 1000 /* Internal kernel timer frequency */ - -#endif /* __ASM_MACH_GENERIC_PARAM_H */ diff --git a/include/asm-mips/mach-jazz/param.h b/include/asm-mips/mach-jazz/param.h deleted file mode 100644 index 639763a..0000000 --- a/include/asm-mips/mach-jazz/param.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2003 by Ralf Baechle - */ -#ifndef __ASM_MACH_JAZZ_PARAM_H -#define __ASM_MACH_JAZZ_PARAM_H - -/* - * Jazz is currently using the internal 100Hz timer of the R4030 - */ -#define HZ 100 /* Internal kernel timer frequency */ - -#endif /* __ASM_MACH_JAZZ_PARAM_H */ diff --git a/include/asm-mips/mach-mips/param.h b/include/asm-mips/mach-mips/param.h deleted file mode 100644 index 805ef6d..0000000 --- a/include/asm-mips/mach-mips/param.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2003 by Ralf Baechle - */ -#ifndef __ASM_MACH_MIPS_PARAM_H -#define __ASM_MACH_MIPS_PARAM_H - -#define HZ 100 /* Internal kernel timer frequency */ - -#endif /* __ASM_MACH_MIPS_PARAM_H */ diff --git a/include/asm-mips/mach-qemu/param.h b/include/asm-mips/mach-qemu/param.h deleted file mode 100644 index cb30ee4..0000000 --- a/include/asm-mips/mach-qemu/param.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2005 by Ralf Baechle - */ -#ifndef __ASM_MACH_QEMU_PARAM_H -#define __ASM_MACH_QEMU_PARAM_H - -#define HZ 100 /* Internal kernel timer frequency */ - -#endif /* __ASM_MACH_QEMU_PARAM_H */ diff --git a/include/asm-mips/param.h b/include/asm-mips/param.h index 2bead82..1d9bb8c 100644 --- a/include/asm-mips/param.h +++ b/include/asm-mips/param.h @@ -11,7 +11,7 @@ #ifdef __KERNEL__ -# include /* Internal kernel timer frequency */ +# define HZ CONFIG_HZ /* Internal kernel timer frequency */ # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ # define CLOCKS_PER_SEC (USER_HZ) /* like times() */ #endif From hvr@hvrlab.org Mon Apr 10 09:50:25 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 10 Apr 2006 09:50:37 +0100 (BST) Received: from h081217049130.dyn.cm.kabsi.at ([81.217.49.130]:14519 "EHLO phobos.hvrlab.org") by ftp.linux-mips.org with ESMTP id S8133510AbWDJIuZ (ORCPT ); Mon, 10 Apr 2006 09:50:25 +0100 Received: from phobos.hvrlab.org (localhost.localdomain [127.0.0.1]) by phobos.hvrlab.org (8.13.4/8.13.4/Debian-3) with ESMTP id k3A91xF0029833 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 10 Apr 2006 11:01:59 +0200 Received: (from hvr@localhost) by phobos.hvrlab.org (8.13.4/8.13.4/Submit) id k3A91sXm029832; Mon, 10 Apr 2006 11:01:54 +0200 Message-Id: <200604100901.k3A91sXm029832@phobos.hvrlab.org> To: linux-mips@linux-mips.org Cc: ppopov@embeddedalley.com From: Herbert Valerio Riedel Date: Mon Apr 10 10:38:45 2006 +0200 Subject: [PATCH] AU1xxxx mips_timer_interrupt() fixes X-Virus-Scanned: ClamAV 0.84/1388/Mon Apr 10 07:50:38 2006 on phobos.hvrlab.org X-Virus-Status: Clean Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11078 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: hvr@hvrlab.org Precedence: bulk X-list: linux-mips common/au1000/irq.c was missing a mips_timer_interrupt() prototype, whereas in common/au1000/time.c the actual mips_timer_interrupt() implementation was missing an irq_exit() invocation, causing a preempt_count() leak Signed-off-by: Herbert Valerio Riedel --- arch/mips/au1000/common/irq.c | 1 + arch/mips/au1000/common/time.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) d0a263ef156cf498d97cf6b2f37ba4d8d4a92559 diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c index da61de7..afe05ec 100644 --- a/arch/mips/au1000/common/irq.c +++ b/arch/mips/au1000/common/irq.c @@ -68,6 +68,7 @@ extern void set_debug_traps(void); extern irq_cpustat_t irq_stat [NR_CPUS]; +extern void mips_timer_interrupt(struct pt_regs *regs); static void setup_local_irq(unsigned int irq, int type, int int_req); static unsigned int startup_irq(unsigned int irq); diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c index f85f152..f74d66a 100644 --- a/arch/mips/au1000/common/time.c +++ b/arch/mips/au1000/common/time.c @@ -116,6 +116,7 @@ void mips_timer_interrupt(struct pt_regs null: ack_r4ktimer(0); + irq_exit(); } #ifdef CONFIG_PM -- 1.2.4 From ths@networkno.de Mon Apr 10 13:15:59 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 10 Apr 2006 13:16:10 +0100 (BST) Received: from bender.bawue.de ([193.7.176.20]:32907 "HELO bender.bawue.de") by ftp.linux-mips.org with SMTP id S8133530AbWDJMP7 convert rfc822-to-8bit (ORCPT ); Mon, 10 Apr 2006 13:15:59 +0100 Received: from lagash (unknown [194.74.144.146]) by bender.bawue.de (Postfix) with ESMTP id 5F6BA445B9; Mon, 10 Apr 2006 14:27:41 +0200 (MEST) Received: from ths by lagash with local (Exim 4.60) (envelope-from ) id 1FSvUC-0006Kg-0j; Mon, 10 Apr 2006 13:27:16 +0100 Date: Mon, 10 Apr 2006 13:27:15 +0100 To: Ralf Baechle Cc: "Kevin D. Kissell" , Martin Michlmayr , linux-mips@linux-mips.org Subject: Re: Diff between Linus' and linux-mips git: elf.h Message-ID: <20060410122715.GA5868@networkno.de> References: <20060219234318.GA16311@deprecation.cyrius.com> <20060220000141.GX10266@deprecation.cyrius.com> <20060220001126.GA17967@deprecation.cyrius.com> <20060220003128.GD17967@deprecation.cyrius.com> <20060220113420.GB5594@linux-mips.org> <20060407171910.GU6869@deprecation.cyrius.com> <090d01c65a6b$623f6480$10eca8c0@grendel> <20060407222142.GA26104@linux-mips.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: 8BIT In-Reply-To: <20060407222142.GA26104@linux-mips.org> User-Agent: Mutt/1.5.11+cvs20060126 From: Thiemo Seufer Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11079 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ths@networkno.de Precedence: bulk X-list: linux-mips Ralf Baechle wrote: > On Fri, Apr 07, 2006 at 07:47:40PM +0200, Kevin D. Kissell wrote: > > > Arguably, whatever's used by binutils should be the tie-breaker. > > Googling around, I see that the EM_MIPS_RS3_LE value was > > added in the October 4, 1999 draft of the ELF spec, but inexplicably > > the alias with EM_MIPS_RS4_BE was left in place - perhaps they > > were supposed to be disambiguated by some 32-vs-64-bit flag > > somewhere. A random sampling of ELF documents on the web > > shows the vast majority calling out RS3_LE and not RS4_BE. > > No way to actually resolve this one; not even binutils oldtimer > Ian Lance Taylor can remember the reasons for the change anymore. FWIW, the general rule is to use EM_MIPS == 8 for MIPS with both endiannesses and ignore EM_MIPS_*. So removing the other defines from the linux include file seems to be the sensible thing to do. (Binutils can't do the same due to backward compatibility concerns.) Thiemo From ralf@linux-mips.org Mon Apr 10 16:31:40 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 10 Apr 2006 16:31:48 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:25065 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133598AbWDJPbk (ORCPT ); Mon, 10 Apr 2006 16:31:40 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k3AFhPUF017603; Mon, 10 Apr 2006 17:43:25 +0200 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k3AFhKdT017601; Mon, 10 Apr 2006 17:43:20 +0200 Date: Mon, 10 Apr 2006 17:43:20 +0200 From: Ralf Baechle To: Thiemo Seufer Cc: "Kevin D. Kissell" , Martin Michlmayr , linux-mips@linux-mips.org Subject: Re: Diff between Linus' and linux-mips git: elf.h Message-ID: <20060410154320.GA17459@linux-mips.org> References: <20060219234318.GA16311@deprecation.cyrius.com> <20060220000141.GX10266@deprecation.cyrius.com> <20060220001126.GA17967@deprecation.cyrius.com> <20060220003128.GD17967@deprecation.cyrius.com> <20060220113420.GB5594@linux-mips.org> <20060407171910.GU6869@deprecation.cyrius.com> <090d01c65a6b$623f6480$10eca8c0@grendel> <20060407222142.GA26104@linux-mips.org> <20060410122715.GA5868@networkno.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060410122715.GA5868@networkno.de> User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11080 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Mon, Apr 10, 2006 at 01:27:15PM +0100, Thiemo Seufer wrote: > > No way to actually resolve this one; not even binutils oldtimer > > Ian Lance Taylor can remember the reasons for the change anymore. > > FWIW, the general rule is to use EM_MIPS == 8 for MIPS with both > endiannesses and ignore EM_MIPS_*. So removing the other defines > from the linux include file seems to be the sensible thing to do. > (Binutils can't do the same due to backward compatibility concerns.) Or rather convert it into a comment so this is the last time these constants have been discussed ... Ralf From mark.e.mason@broadcom.com Mon Apr 10 18:25:49 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 10 Apr 2006 18:25:58 +0100 (BST) Received: from mms3.broadcom.com ([216.31.210.19]:27402 "EHLO MMS3.broadcom.com") by ftp.linux-mips.org with ESMTP id S8133481AbWDJRZt convert rfc822-to-8bit (ORCPT ); Mon, 10 Apr 2006 18:25:49 +0100 Received: from 10.10.64.154 by MMS3.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.2.0)); Mon, 10 Apr 2006 10:37:15 -0700 X-Server-Uuid: B238DE4C-2139-4D32-96A8-DD564EF2313E Received: by mail-irva-10.broadcom.com (Postfix, from userid 47) id 3D3822B0; Mon, 10 Apr 2006 10:37:15 -0700 (PDT) Received: from mail-irva-8.broadcom.com (mail-irva-8 [10.10.64.221]) by mail-irva-10.broadcom.com (Postfix) with ESMTP id 0FF452AE; Mon, 10 Apr 2006 10:37:15 -0700 (PDT) Received: from mail-sj1-12.sj.broadcom.com (mail-sj1-12.sj.broadcom.com [10.16.128.215]) by mail-irva-8.broadcom.com (MOS 3.7.5-GA) with ESMTP id DGV78001; Mon, 10 Apr 2006 10:37:12 -0700 (PDT) Received: from NT-SJCA-0750.brcm.ad.broadcom.com (nt-sjca-0750 [10.16.192.220]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id EB9D520501; Mon, 10 Apr 2006 10:37:11 -0700 (PDT) X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Subject: RE: Oprofile on sibyte 2.4.18 kernel Date: Mon, 10 Apr 2006 10:37:10 -0700 Message-ID: <7E000E7F06B05C49BDBB769ADAF44D07989970@NT-SJCA-0750.brcm.ad.broadcom.com> Thread-Topic: Oprofile on sibyte 2.4.18 kernel Thread-Index: AcZag0lud8MhRbSARI6GHA+OQL7jGwCQb5sQ From: "Mark E Mason" To: "Shanthi Kiran Pendyala (skiranp)" , "linux-mips" X-TMWD-Spam-Summary: SEV=1.1; DFV=A2006041005; IFV=2.0.6,4.0-7; RPD=4.00.0004; RPDID=303030312E30413039303230372E34343341393641392E303036362D412D; ENG=IBF; TS=20060410173718; CAT=NONE; CON=NONE; X-MMS-Spam-Filter-ID: A2006041005_4.00.0004_2.0.6,4.0-7 X-WSS-ID: 682448413NG6720318-01-01 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8BIT Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11081 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: mark.e.mason@broadcom.com Precedence: bulk X-list: linux-mips Hello Shanthi, The Sibyte group at broadcom has a set profiling tools for Linux 2.4 which provide basically the same functionality as oprofile. Simply contact your FAE or email sibyte-software@broadcom.com to get a copy. Thanks, Mark Mason mason@broadcom.com > -----Original Message----- > From: linux-mips-bounce@linux-mips.org > [mailto:linux-mips-bounce@linux-mips.org] On Behalf Of > Shanthi Kiran Pendyala (skiranp) > Sent: Friday, April 07, 2006 1:39 PM > To: linux-mips > Subject: Oprofile on sibyte 2.4.18 kernel > > Hi, > > Did anyone port oprofile to 2.4.x kernel on sibyte ?. > > Looking over the mailing list threads it looks like it has > been given up as a lost cause. > > But business reasons require us to work with 2.4.18 kernel > for the next > 9-12 months and > We really would like explore a port. > > Or are there other tools that I can use ? > > Thank you > Shanthi kiran > > > From giometti@enneenne.com Mon Apr 10 21:13:54 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 10 Apr 2006 21:14:03 +0100 (BST) Received: from 81-174-11-161.f5.ngi.it ([81.174.11.161]:36053 "EHLO goldrake.enneenne.com") by ftp.linux-mips.org with ESMTP id S8133481AbWDJUNy (ORCPT ); Mon, 10 Apr 2006 21:13:54 +0100 Received: from zaigor.enneenne.com ([192.168.32.1]) by goldrake.enneenne.com with esmtp (Exim 4.50) id 1FT2uW-0005Vs-If; Mon, 10 Apr 2006 22:22:58 +0200 Received: from giometti by zaigor.enneenne.com with local (Exim 4.60) (envelope-from ) id 1FT2xS-0005c8-Qg; Mon, 10 Apr 2006 22:25:58 +0200 Date: Mon, 10 Apr 2006 22:25:58 +0200 From: Rodolfo Giometti To: linux-mips@linux-mips.org Cc: source@embeddedalley.com Message-ID: <20060410202558.GS23424@enneenne.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="f4arffV+Mc+T1KhS" Content-Disposition: inline Organization: GNU/Linux Device Drivers, Embedded Systems and Courses X-PGP-Key: gpg --keyserver keyserver.linux.it --recv-keys D25A5633 User-Agent: Mutt/1.5.11+cvs20060126 X-SA-Exim-Connect-IP: 192.168.32.1 X-SA-Exim-Mail-From: giometti@enneenne.com Subject: [PATCH] au1100fb suspend/resume support X-SA-Exim-Version: 4.2 (built Thu, 03 Mar 2005 10:44:12 +0100) X-SA-Exim-Scanned: Yes (on goldrake.enneenne.com) Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11082 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: giometti@linux.it Precedence: bulk X-list: linux-mips --f4arffV+Mc+T1KhS Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello, here a patch for au1100fb.c in order to add suspend/resume support. Ciao, Rodolfo -- GNU/Linux Solutions e-mail: giometti@enneenne.com Linux Device Driver giometti@gnudd.com Embedded Systems giometti@linux.it UNIX programming phone: +39 349 2432127 --f4arffV+Mc+T1KhS Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-au1100fb-pm Index: drivers/video/au1100fb.c =================================================================== RCS file: /home/develop/cvs_private/linux-mips-exadron/drivers/video/au1100fb.c,v retrieving revision 1.7 diff -u -r1.7 au1100fb.c --- a/drivers/video/au1100fb.c 2 Jan 2006 16:53:11 -0000 1.7 +++ b/drivers/video/au1100fb.c 10 Apr 2006 20:18:40 -0000 @@ -7,6 +7,8 @@ * Karl Lessard * * + * PM support added by Rodolfo Giometti + * * Copyright 2002 MontaVista Software * Author: MontaVista Software, Inc. * ppopov@mvista.com or source@mvista.com @@ -648,17 +650,66 @@ return 0; } +#ifdef CONFIG_PM +static u32 sys_clksrc; +static struct au1100fb_regs fbregs; int au1100fb_drv_suspend(struct device *dev, u32 state, u32 level) { - /* TODO */ + struct au1100fb_device *fbdev = (struct au1100fb_device*) dev_get_drvdata(dev); + + if (!fbdev) + return 0; + + switch (level) { + case SUSPEND_DISABLE : + /* Save the clock source state */ + sys_clksrc = au_readl(SYS_CLKSRC); + + /* Blank the LCD */ + au1100fb_fb_blank(VESA_POWERDOWN, &fbdev->info); + + /* Stop LCD clocking */ + au_writel(sys_clksrc & ~SYS_CS_MUD_MASK, SYS_CLKSRC); + + break; + + case SUSPEND_SAVE_STATE : + memcpy(&fbregs, fbdev->regs, sizeof(struct au1100fb_regs)); + + break; + + case SUSPEND_POWER_DOWN : + + break; + } + return 0; } int au1100fb_drv_resume(struct device *dev, u32 level) { - /* TODO */ + struct au1100fb_device *fbdev = (struct au1100fb_device*) dev_get_drvdata(dev); + + if (!fbdev) + return 0; + + switch (level) { + case RESUME_RESTORE_STATE : + memcpy(fbdev->regs, &fbregs, sizeof(struct au1100fb_regs)); + + break; + + case RESUME_ENABLE : + au_writel(sys_clksrc, SYS_CLKSRC); + + au1100fb_fb_blank(VESA_NO_BLANKING, &fbdev->info); + + break; + } + return 0; } +#endif static struct device_driver au1100fb_driver = { .name = "au1100-lcd", @@ -666,8 +717,10 @@ .probe = au1100fb_drv_probe, .remove = au1100fb_drv_remove, +#ifdef CONFIG_PM .suspend = au1100fb_drv_suspend, .resume = au1100fb_drv_resume, +#endif }; /*-------------------------------------------------------------------------*/ --f4arffV+Mc+T1KhS-- From skiranp@cisco.com Tue Apr 11 02:44:13 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 11 Apr 2006 02:44:22 +0100 (BST) Received: from test-iport-3.cisco.com ([171.71.176.78]:33390 "EHLO test-iport-3.cisco.com") by ftp.linux-mips.org with ESMTP id S8133642AbWDKBoN convert rfc822-to-8bit (ORCPT ); Tue, 11 Apr 2006 02:44:13 +0100 Received: from sj-core-2.cisco.com ([171.71.177.254]) by test-iport-3.cisco.com with ESMTP; 10 Apr 2006 18:55:51 -0700 Received: from xbh-sjc-211.amer.cisco.com (xbh-sjc-211.cisco.com [171.70.151.144]) by sj-core-2.cisco.com (8.12.10/8.12.6) with ESMTP id k3B1toGv029388; Mon, 10 Apr 2006 18:55:51 -0700 (PDT) Received: from xmb-sjc-215.amer.cisco.com ([171.70.151.169]) by xbh-sjc-211.amer.cisco.com with Microsoft SMTPSVC(6.0.3790.211); Mon, 10 Apr 2006 18:55:47 -0700 X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT Subject: RE: Oprofile on sibyte 2.4.18 kernel Date: Mon, 10 Apr 2006 18:55:46 -0700 Message-ID: <5547014632ED654F971D7E1E0C2E0C3E018DB5D0@xmb-sjc-215.amer.cisco.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: Oprofile on sibyte 2.4.18 kernel Thread-Index: AcZamdRoKUMjWTsKT5ersblLdXL9owCa8JOQ From: "Shanthi Kiran Pendyala \(skiranp\)" To: "Ralf Baechle" Cc: "linux-mips" X-OriginalArrivalTime: 11 Apr 2006 01:55:47.0356 (UTC) FILETIME=[0D2AA5C0:01C65D0B] Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11083 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: skiranp@cisco.com Precedence: bulk X-list: linux-mips Hi Ralf, Thanks for the reply. >Correct. So if at all you would have to rip oprofile from the >2.6 kernel and bolt that code back into the old kernel which >would seem doable. The MIPS bits certainly don't rely on much >2.6 infrastructure. #1: I looked at oprofile-0.9.1 and it lists this event for SB1 in the events/mips/sb1 directory ------------------------------------------------------------------------ --- event:10 counters:1,2,3 um:zero minimum:500 name:DCACHE_FILLED_SHD_NONC_EXC :Dcache is filled (shared, nonc, exclusive) ---------------------------------------------------------------- However this doesn't have an equivalent performance source Listed in the sibyte manual (table 33 system performance counter sources). #2: how does the mapping from event numbers to performance sources work for sibyte ? I looked at the op_model_mipsxx.c file in the 2.6 CVS tree and the macro it uses doesn't seem to match the format specified for perf_cnt_cfg register in sibyte. What am I missing ? Thx Kiran From Vadivelan@soc-soft.com Tue Apr 11 05:08:36 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 11 Apr 2006 05:08:46 +0100 (BST) Received: from mail.soc-soft.com ([202.56.254.199]:48139 "EHLO igateway.soc-soft.com") by ftp.linux-mips.org with ESMTP id S8133382AbWDKEIg convert rfc822-to-8bit (ORCPT ); Tue, 11 Apr 2006 05:08:36 +0100 Received: from keys.soc-soft.com ([192.168.4.44]) by igateway.soc-soft.com with InterScan VirusWall; Tue, 11 Apr 2006 09:50:15 +0530 Received: from soc-mail.soc-soft.com ([192.168.4.25]) by keys.soc-soft.com (PGP Universal service); Tue, 11 Apr 2006 09:46:30 +0530 X-PGP-Universal: processed; by keys.soc-soft.com on Tue, 11 Apr 2006 09:46:30 +0530 Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 8BIT X-MimeOLE: Produced By Microsoft Exchange V6.0.6249.0 Subject: RE: Init not working in 64-bit kernel Date: Tue, 11 Apr 2006 09:50:14 +0530 Message-ID: <4BF47D56A0DD2346A1B8D622C5C5902C015D8605@soc-mail.soc-soft.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: Init not working in 64-bit kernel Thread-Index: AcZMK/OMEVIBy6A9QvKes6ftrrvuVgQ8q/Gw From: To: , Cc: Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11084 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: Vadivelan@soc-soft.com Precedence: bulk X-list: linux-mips Hi, I'm sry. I couldn't reply immediately. I've fixed the problem. U'r suggestion was valuable. I've signed extended the addresses required and I'm able to boot the board. Thanking u. Regards, Vadi. -----Original Message----- From: Atsushi Nemoto [mailto:anemo@mba.ocn.ne.jp] Sent: Monday, March 20, 2006 8:08 PM To: ralf@linux-mips.org Cc: Vadivelan M; linux-mips@linux-mips.org Subject: Re: Init not working in 64-bit kernel >>>>> On Mon, 20 Mar 2006 13:14:52 +0000, Ralf Baechle >>>>> said: ralf> This kernel is already 15 months old and there have been a vast ralf> number of bug fixes since. And god knows what Montavista changed ralf> in their kernel - I don't have the faintest idea. In short, try a ralf> modern kernel. Btw, Linux 2.6.16 was released today and chances ralf> are it'll solve alot of your issues. I suppose he is trying 64bit kernel on RBTX4938 board, but the board dependent code seems not ready for 64bit. For example, there are some 0xff1fXXXX constants there and all these constants must be sign extended (0xffffffffff1fXXXX) for 64bit. Also these virtual address are mapped to 36bit physical address 0xfff1fXXXX so some assumption in the 32bit kernel (virt==phys for TX49 internal regs) is not true in 64bit kernel. --- Atsushi Nemoto The information contained in this e-mail message and in any annexure is confidential to the recipient and may contain privileged information. If you are not the intended recipient, please notify the sender and delete the message along with any annexure. You should not disclose, copy or otherwise use the information contained in the message or any annexure. Any views expressed in this e-mail are those of the individual sender except where the sender specifically states them to be the views of SoCrates Software India Pvt Ltd., Bangalore. From anemo@mba.ocn.ne.jp Tue Apr 11 10:43:05 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 11 Apr 2006 10:43:19 +0100 (BST) Received: from topsns2.toshiba-tops.co.jp ([202.230.225.126]:23813 "EHLO topsns2.toshiba-tops.co.jp") by ftp.linux-mips.org with ESMTP id S8133518AbWDKJnF (ORCPT ); Tue, 11 Apr 2006 10:43:05 +0100 Received: from topsms.toshiba-tops.co.jp by topsns2.toshiba-tops.co.jp via smtpd (for ftp.linux-mips.org [194.74.144.162]) with ESMTP; Tue, 11 Apr 2006 18:54:52 +0900 Received: from topsms.toshiba-tops.co.jp (localhost.localdomain [127.0.0.1]) by localhost.toshiba-tops.co.jp (Postfix) with ESMTP id D90C32072D; Tue, 11 Apr 2006 18:54:49 +0900 (JST) Received: from srd2sd.toshiba-tops.co.jp (srd2sd.toshiba-tops.co.jp [172.17.28.2]) by topsms.toshiba-tops.co.jp (Postfix) with ESMTP id CBF2A20727; Tue, 11 Apr 2006 18:54:49 +0900 (JST) Received: from localhost (fragile [172.17.28.65]) by srd2sd.toshiba-tops.co.jp (8.12.10/8.12.10) with ESMTP id k3B9sn4D056985; Tue, 11 Apr 2006 18:54:49 +0900 (JST) (envelope-from anemo@mba.ocn.ne.jp) Date: Tue, 11 Apr 2006 18:54:49 +0900 (JST) Message-Id: <20060411.185449.126141341.nemoto@toshiba-tops.co.jp> To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org Subject: Re: [PATCH] rewrite restore_fp_context/save_fp_context From: Atsushi Nemoto In-Reply-To: <20060208.015250.130239257.anemo@mba.ocn.ne.jp> References: <20060208.015250.130239257.anemo@mba.ocn.ne.jp> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11085 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips Revised for current git tree. smp_restore_fp_context()/smp_save_fp_context() are removed too. The setup_sigcontect()/restore_sigcontext() might sleep on put_user()/get_user() with preemption disabled (i.e. atomic context). Sleeping in atomic context is not allowed. This patch fixes this problem by rewriting restore_fp_context()/save_fp_context(). A path to save fp context was: (current.thread.fpu -> ) real FPU -> sigcontext on userstack And with this patch it is: (real FPU -> ) current.thread.fpu -> sigcontext on userstack While transfer between real FPU and current.thread.fpu can be done by usual context save/restore routines, all arch/mips/kernel/*_fpu.S, SMP-variant of {save,restore}_fp_context and SC_ symbols in asm-offset.h can be removed. Signed-off-by: Atsushi Nemoto arch/mips/kernel/r2300_fpu.S | 126 ---------------------- arch/mips/kernel/r4k_fpu.S | 188 ---------------------------------- arch/mips/kernel/r6000_fpu.S | 87 --------------- b/arch/mips/kernel/Makefile | 36 +++--- b/arch/mips/kernel/asm-offsets.c | 47 -------- b/arch/mips/kernel/signal-common.h | 56 +++++++--- b/arch/mips/kernel/signal32.c | 54 +++++++-- b/arch/mips/kernel/traps.c | 76 ------------- b/arch/mips/math-emu/kernel_linkage.c | 73 ------------- b/include/asm-mips/fpu.h | 9 - 10 files changed, 104 insertions(+), 648 deletions(-) diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index 34e8a25..7ef5bb6 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -13,24 +13,24 @@ binfmt_irix-objs := irixelf.o irixinv.o obj-$(CONFIG_MODULES) += mips_ksyms.o module.o -obj-$(CONFIG_CPU_R3000) += r2300_fpu.o r2300_switch.o -obj-$(CONFIG_CPU_TX39XX) += r2300_fpu.o r2300_switch.o -obj-$(CONFIG_CPU_TX49XX) += r4k_fpu.o r4k_switch.o -obj-$(CONFIG_CPU_R4000) += r4k_fpu.o r4k_switch.o -obj-$(CONFIG_CPU_VR41XX) += r4k_fpu.o r4k_switch.o -obj-$(CONFIG_CPU_R4300) += r4k_fpu.o r4k_switch.o -obj-$(CONFIG_CPU_R4X00) += r4k_fpu.o r4k_switch.o -obj-$(CONFIG_CPU_R5000) += r4k_fpu.o r4k_switch.o -obj-$(CONFIG_CPU_R5432) += r4k_fpu.o r4k_switch.o -obj-$(CONFIG_CPU_R8000) += r4k_fpu.o r4k_switch.o -obj-$(CONFIG_CPU_RM7000) += r4k_fpu.o r4k_switch.o -obj-$(CONFIG_CPU_RM9000) += r4k_fpu.o r4k_switch.o -obj-$(CONFIG_CPU_NEVADA) += r4k_fpu.o r4k_switch.o -obj-$(CONFIG_CPU_R10000) += r4k_fpu.o r4k_switch.o -obj-$(CONFIG_CPU_SB1) += r4k_fpu.o r4k_switch.o -obj-$(CONFIG_CPU_MIPS32) += r4k_fpu.o r4k_switch.o -obj-$(CONFIG_CPU_MIPS64) += r4k_fpu.o r4k_switch.o -obj-$(CONFIG_CPU_R6000) += r6000_fpu.o r4k_switch.o +obj-$(CONFIG_CPU_R3000) += r2300_switch.o +obj-$(CONFIG_CPU_TX39XX) += r2300_switch.o +obj-$(CONFIG_CPU_TX49XX) += r4k_switch.o +obj-$(CONFIG_CPU_R4000) += r4k_switch.o +obj-$(CONFIG_CPU_VR41XX) += r4k_switch.o +obj-$(CONFIG_CPU_R4300) += r4k_switch.o +obj-$(CONFIG_CPU_R4X00) += r4k_switch.o +obj-$(CONFIG_CPU_R5000) += r4k_switch.o +obj-$(CONFIG_CPU_R5432) += r4k_switch.o +obj-$(CONFIG_CPU_R8000) += r4k_switch.o +obj-$(CONFIG_CPU_RM7000) += r4k_switch.o +obj-$(CONFIG_CPU_RM9000) += r4k_switch.o +obj-$(CONFIG_CPU_NEVADA) += r4k_switch.o +obj-$(CONFIG_CPU_R10000) += r4k_switch.o +obj-$(CONFIG_CPU_SB1) += r4k_switch.o +obj-$(CONFIG_CPU_MIPS32) += r4k_switch.o +obj-$(CONFIG_CPU_MIPS64) += r4k_switch.o +obj-$(CONFIG_CPU_R6000) += r4k_switch.o obj-$(CONFIG_SMP) += smp.o diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c index 92b28b6..48c604c 100644 --- a/arch/mips/kernel/asm-offsets.c +++ b/arch/mips/kernel/asm-offsets.c @@ -244,53 +244,6 @@ void output_mm_defines(void) linefeed; } -#ifdef CONFIG_32BIT -void output_sc_defines(void) -{ - text("/* Linux sigcontext offsets. */"); - offset("#define SC_REGS ", struct sigcontext, sc_regs); - offset("#define SC_FPREGS ", struct sigcontext, sc_fpregs); - offset("#define SC_MDHI ", struct sigcontext, sc_mdhi); - offset("#define SC_MDLO ", struct sigcontext, sc_mdlo); - offset("#define SC_PC ", struct sigcontext, sc_pc); - offset("#define SC_STATUS ", struct sigcontext, sc_status); - offset("#define SC_FPC_CSR ", struct sigcontext, sc_fpc_csr); - offset("#define SC_FPC_EIR ", struct sigcontext, sc_fpc_eir); - offset("#define SC_HI1 ", struct sigcontext, sc_hi1); - offset("#define SC_LO1 ", struct sigcontext, sc_lo1); - offset("#define SC_HI2 ", struct sigcontext, sc_hi2); - offset("#define SC_LO2 ", struct sigcontext, sc_lo2); - offset("#define SC_HI3 ", struct sigcontext, sc_hi3); - offset("#define SC_LO3 ", struct sigcontext, sc_lo3); - linefeed; -} -#endif - -#ifdef CONFIG_64BIT -void output_sc_defines(void) -{ - text("/* Linux sigcontext offsets. */"); - offset("#define SC_REGS ", struct sigcontext, sc_regs); - offset("#define SC_FPREGS ", struct sigcontext, sc_fpregs); - offset("#define SC_MDHI ", struct sigcontext, sc_hi); - offset("#define SC_MDLO ", struct sigcontext, sc_lo); - offset("#define SC_PC ", struct sigcontext, sc_pc); - offset("#define SC_FPC_CSR ", struct sigcontext, sc_fpc_csr); - linefeed; -} -#endif - -#ifdef CONFIG_MIPS32_COMPAT -void output_sc32_defines(void) -{ - text("/* Linux 32-bit sigcontext offsets. */"); - offset("#define SC32_FPREGS ", struct sigcontext32, sc_fpregs); - offset("#define SC32_FPC_CSR ", struct sigcontext32, sc_fpc_csr); - offset("#define SC32_FPC_EIR ", struct sigcontext32, sc_fpc_eir); - linefeed; -} -#endif - void output_signal_defined(void) { text("/* Linux signal numbers. */"); diff --git a/arch/mips/kernel/r2300_fpu.S b/arch/mips/kernel/r2300_fpu.S deleted file mode 100644 index ac68e68..0000000 --- a/arch/mips/kernel/r2300_fpu.S +++ /dev/null @@ -1,126 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 1996, 1998 by Ralf Baechle - * - * Multi-arch abstraction and asm macros for easier reading: - * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) - * - * Further modifications to make this work: - * Copyright (c) 1998 Harald Koerfgen - */ -#include -#include -#include -#include -#include -#include - -#define EX(a,b) \ -9: a,##b; \ - .section __ex_table,"a"; \ - PTR 9b,bad_stack; \ - .previous - - .set noreorder - .set mips1 - /* Save floating point context */ -LEAF(_save_fp_context) - li v0, 0 # assume success - cfc1 t1,fcr31 - EX(swc1 $f0,(SC_FPREGS+0)(a0)) - EX(swc1 $f1,(SC_FPREGS+8)(a0)) - EX(swc1 $f2,(SC_FPREGS+16)(a0)) - EX(swc1 $f3,(SC_FPREGS+24)(a0)) - EX(swc1 $f4,(SC_FPREGS+32)(a0)) - EX(swc1 $f5,(SC_FPREGS+40)(a0)) - EX(swc1 $f6,(SC_FPREGS+48)(a0)) - EX(swc1 $f7,(SC_FPREGS+56)(a0)) - EX(swc1 $f8,(SC_FPREGS+64)(a0)) - EX(swc1 $f9,(SC_FPREGS+72)(a0)) - EX(swc1 $f10,(SC_FPREGS+80)(a0)) - EX(swc1 $f11,(SC_FPREGS+88)(a0)) - EX(swc1 $f12,(SC_FPREGS+96)(a0)) - EX(swc1 $f13,(SC_FPREGS+104)(a0)) - EX(swc1 $f14,(SC_FPREGS+112)(a0)) - EX(swc1 $f15,(SC_FPREGS+120)(a0)) - EX(swc1 $f16,(SC_FPREGS+128)(a0)) - EX(swc1 $f17,(SC_FPREGS+136)(a0)) - EX(swc1 $f18,(SC_FPREGS+144)(a0)) - EX(swc1 $f19,(SC_FPREGS+152)(a0)) - EX(swc1 $f20,(SC_FPREGS+160)(a0)) - EX(swc1 $f21,(SC_FPREGS+168)(a0)) - EX(swc1 $f22,(SC_FPREGS+176)(a0)) - EX(swc1 $f23,(SC_FPREGS+184)(a0)) - EX(swc1 $f24,(SC_FPREGS+192)(a0)) - EX(swc1 $f25,(SC_FPREGS+200)(a0)) - EX(swc1 $f26,(SC_FPREGS+208)(a0)) - EX(swc1 $f27,(SC_FPREGS+216)(a0)) - EX(swc1 $f28,(SC_FPREGS+224)(a0)) - EX(swc1 $f29,(SC_FPREGS+232)(a0)) - EX(swc1 $f30,(SC_FPREGS+240)(a0)) - EX(swc1 $f31,(SC_FPREGS+248)(a0)) - EX(sw t1,(SC_FPC_CSR)(a0)) - cfc1 t0,$0 # implementation/version - jr ra - .set nomacro - EX(sw t0,(SC_FPC_EIR)(a0)) - .set macro - END(_save_fp_context) - -/* - * Restore FPU state: - * - fp gp registers - * - cp1 status/control register - * - * We base the decision which registers to restore from the signal stack - * frame on the current content of c0_status, not on the content of the - * stack frame which might have been changed by the user. - */ -LEAF(_restore_fp_context) - li v0, 0 # assume success - EX(lw t0,(SC_FPC_CSR)(a0)) - EX(lwc1 $f0,(SC_FPREGS+0)(a0)) - EX(lwc1 $f1,(SC_FPREGS+8)(a0)) - EX(lwc1 $f2,(SC_FPREGS+16)(a0)) - EX(lwc1 $f3,(SC_FPREGS+24)(a0)) - EX(lwc1 $f4,(SC_FPREGS+32)(a0)) - EX(lwc1 $f5,(SC_FPREGS+40)(a0)) - EX(lwc1 $f6,(SC_FPREGS+48)(a0)) - EX(lwc1 $f7,(SC_FPREGS+56)(a0)) - EX(lwc1 $f8,(SC_FPREGS+64)(a0)) - EX(lwc1 $f9,(SC_FPREGS+72)(a0)) - EX(lwc1 $f10,(SC_FPREGS+80)(a0)) - EX(lwc1 $f11,(SC_FPREGS+88)(a0)) - EX(lwc1 $f12,(SC_FPREGS+96)(a0)) - EX(lwc1 $f13,(SC_FPREGS+104)(a0)) - EX(lwc1 $f14,(SC_FPREGS+112)(a0)) - EX(lwc1 $f15,(SC_FPREGS+120)(a0)) - EX(lwc1 $f16,(SC_FPREGS+128)(a0)) - EX(lwc1 $f17,(SC_FPREGS+136)(a0)) - EX(lwc1 $f18,(SC_FPREGS+144)(a0)) - EX(lwc1 $f19,(SC_FPREGS+152)(a0)) - EX(lwc1 $f20,(SC_FPREGS+160)(a0)) - EX(lwc1 $f21,(SC_FPREGS+168)(a0)) - EX(lwc1 $f22,(SC_FPREGS+176)(a0)) - EX(lwc1 $f23,(SC_FPREGS+184)(a0)) - EX(lwc1 $f24,(SC_FPREGS+192)(a0)) - EX(lwc1 $f25,(SC_FPREGS+200)(a0)) - EX(lwc1 $f26,(SC_FPREGS+208)(a0)) - EX(lwc1 $f27,(SC_FPREGS+216)(a0)) - EX(lwc1 $f28,(SC_FPREGS+224)(a0)) - EX(lwc1 $f29,(SC_FPREGS+232)(a0)) - EX(lwc1 $f30,(SC_FPREGS+240)(a0)) - EX(lwc1 $f31,(SC_FPREGS+248)(a0)) - jr ra - ctc1 t0,fcr31 - END(_restore_fp_context) - .set reorder - - .type fault@function - .ent fault -fault: li v0, -EFAULT - jr ra - .end fault diff --git a/arch/mips/kernel/r4k_fpu.S b/arch/mips/kernel/r4k_fpu.S deleted file mode 100644 index 283a985..0000000 --- a/arch/mips/kernel/r4k_fpu.S +++ /dev/null @@ -1,188 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 1996, 98, 99, 2000, 01 Ralf Baechle - * - * Multi-arch abstraction and asm macros for easier reading: - * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) - * - * Carsten Langgaard, carstenl@mips.com - * Copyright (C) 2000 MIPS Technologies, Inc. - * Copyright (C) 1999, 2001 Silicon Graphics, Inc. - */ -#include -#include -#include -#include -#include -#include -#include - - .macro EX insn, reg, src - .set push - .set nomacro -.ex\@: \insn \reg, \src - .set pop - .section __ex_table,"a" - PTR .ex\@, fault - .previous - .endm - - .set noreorder - .set mips3 - -LEAF(_save_fp_context) - cfc1 t1, fcr31 - -#ifdef CONFIG_64BIT - /* Store the 16 odd double precision registers */ - EX sdc1 $f1, SC_FPREGS+8(a0) - EX sdc1 $f3, SC_FPREGS+24(a0) - EX sdc1 $f5, SC_FPREGS+40(a0) - EX sdc1 $f7, SC_FPREGS+56(a0) - EX sdc1 $f9, SC_FPREGS+72(a0) - EX sdc1 $f11, SC_FPREGS+88(a0) - EX sdc1 $f13, SC_FPREGS+104(a0) - EX sdc1 $f15, SC_FPREGS+120(a0) - EX sdc1 $f17, SC_FPREGS+136(a0) - EX sdc1 $f19, SC_FPREGS+152(a0) - EX sdc1 $f21, SC_FPREGS+168(a0) - EX sdc1 $f23, SC_FPREGS+184(a0) - EX sdc1 $f25, SC_FPREGS+200(a0) - EX sdc1 $f27, SC_FPREGS+216(a0) - EX sdc1 $f29, SC_FPREGS+232(a0) - EX sdc1 $f31, SC_FPREGS+248(a0) -#endif - - /* Store the 16 even double precision registers */ - EX sdc1 $f0, SC_FPREGS+0(a0) - EX sdc1 $f2, SC_FPREGS+16(a0) - EX sdc1 $f4, SC_FPREGS+32(a0) - EX sdc1 $f6, SC_FPREGS+48(a0) - EX sdc1 $f8, SC_FPREGS+64(a0) - EX sdc1 $f10, SC_FPREGS+80(a0) - EX sdc1 $f12, SC_FPREGS+96(a0) - EX sdc1 $f14, SC_FPREGS+112(a0) - EX sdc1 $f16, SC_FPREGS+128(a0) - EX sdc1 $f18, SC_FPREGS+144(a0) - EX sdc1 $f20, SC_FPREGS+160(a0) - EX sdc1 $f22, SC_FPREGS+176(a0) - EX sdc1 $f24, SC_FPREGS+192(a0) - EX sdc1 $f26, SC_FPREGS+208(a0) - EX sdc1 $f28, SC_FPREGS+224(a0) - EX sdc1 $f30, SC_FPREGS+240(a0) - EX sw t1, SC_FPC_CSR(a0) - jr ra - li v0, 0 # success - END(_save_fp_context) - -#ifdef CONFIG_MIPS32_COMPAT - /* Save 32-bit process floating point context */ -LEAF(_save_fp_context32) - cfc1 t1, fcr31 - - EX sdc1 $f0, SC32_FPREGS+0(a0) - EX sdc1 $f2, SC32_FPREGS+16(a0) - EX sdc1 $f4, SC32_FPREGS+32(a0) - EX sdc1 $f6, SC32_FPREGS+48(a0) - EX sdc1 $f8, SC32_FPREGS+64(a0) - EX sdc1 $f10, SC32_FPREGS+80(a0) - EX sdc1 $f12, SC32_FPREGS+96(a0) - EX sdc1 $f14, SC32_FPREGS+112(a0) - EX sdc1 $f16, SC32_FPREGS+128(a0) - EX sdc1 $f18, SC32_FPREGS+144(a0) - EX sdc1 $f20, SC32_FPREGS+160(a0) - EX sdc1 $f22, SC32_FPREGS+176(a0) - EX sdc1 $f24, SC32_FPREGS+192(a0) - EX sdc1 $f26, SC32_FPREGS+208(a0) - EX sdc1 $f28, SC32_FPREGS+224(a0) - EX sdc1 $f30, SC32_FPREGS+240(a0) - EX sw t1, SC32_FPC_CSR(a0) - cfc1 t0, $0 # implementation/version - EX sw t0, SC32_FPC_EIR(a0) - - jr ra - li v0, 0 # success - END(_save_fp_context32) -#endif - -/* - * Restore FPU state: - * - fp gp registers - * - cp1 status/control register - */ -LEAF(_restore_fp_context) - EX lw t0, SC_FPC_CSR(a0) -#ifdef CONFIG_64BIT - EX ldc1 $f1, SC_FPREGS+8(a0) - EX ldc1 $f3, SC_FPREGS+24(a0) - EX ldc1 $f5, SC_FPREGS+40(a0) - EX ldc1 $f7, SC_FPREGS+56(a0) - EX ldc1 $f9, SC_FPREGS+72(a0) - EX ldc1 $f11, SC_FPREGS+88(a0) - EX ldc1 $f13, SC_FPREGS+104(a0) - EX ldc1 $f15, SC_FPREGS+120(a0) - EX ldc1 $f17, SC_FPREGS+136(a0) - EX ldc1 $f19, SC_FPREGS+152(a0) - EX ldc1 $f21, SC_FPREGS+168(a0) - EX ldc1 $f23, SC_FPREGS+184(a0) - EX ldc1 $f25, SC_FPREGS+200(a0) - EX ldc1 $f27, SC_FPREGS+216(a0) - EX ldc1 $f29, SC_FPREGS+232(a0) - EX ldc1 $f31, SC_FPREGS+248(a0) -#endif - EX ldc1 $f0, SC_FPREGS+0(a0) - EX ldc1 $f2, SC_FPREGS+16(a0) - EX ldc1 $f4, SC_FPREGS+32(a0) - EX ldc1 $f6, SC_FPREGS+48(a0) - EX ldc1 $f8, SC_FPREGS+64(a0) - EX ldc1 $f10, SC_FPREGS+80(a0) - EX ldc1 $f12, SC_FPREGS+96(a0) - EX ldc1 $f14, SC_FPREGS+112(a0) - EX ldc1 $f16, SC_FPREGS+128(a0) - EX ldc1 $f18, SC_FPREGS+144(a0) - EX ldc1 $f20, SC_FPREGS+160(a0) - EX ldc1 $f22, SC_FPREGS+176(a0) - EX ldc1 $f24, SC_FPREGS+192(a0) - EX ldc1 $f26, SC_FPREGS+208(a0) - EX ldc1 $f28, SC_FPREGS+224(a0) - EX ldc1 $f30, SC_FPREGS+240(a0) - ctc1 t0, fcr31 - jr ra - li v0, 0 # success - END(_restore_fp_context) - -#ifdef CONFIG_MIPS32_COMPAT -LEAF(_restore_fp_context32) - /* Restore an o32 sigcontext. */ - EX lw t0, SC32_FPC_CSR(a0) - EX ldc1 $f0, SC32_FPREGS+0(a0) - EX ldc1 $f2, SC32_FPREGS+16(a0) - EX ldc1 $f4, SC32_FPREGS+32(a0) - EX ldc1 $f6, SC32_FPREGS+48(a0) - EX ldc1 $f8, SC32_FPREGS+64(a0) - EX ldc1 $f10, SC32_FPREGS+80(a0) - EX ldc1 $f12, SC32_FPREGS+96(a0) - EX ldc1 $f14, SC32_FPREGS+112(a0) - EX ldc1 $f16, SC32_FPREGS+128(a0) - EX ldc1 $f18, SC32_FPREGS+144(a0) - EX ldc1 $f20, SC32_FPREGS+160(a0) - EX ldc1 $f22, SC32_FPREGS+176(a0) - EX ldc1 $f24, SC32_FPREGS+192(a0) - EX ldc1 $f26, SC32_FPREGS+208(a0) - EX ldc1 $f28, SC32_FPREGS+224(a0) - EX ldc1 $f30, SC32_FPREGS+240(a0) - ctc1 t0, fcr31 - jr ra - li v0, 0 # success - END(_restore_fp_context32) - .set reorder -#endif - - .type fault@function - .ent fault -fault: li v0, -EFAULT # failure - jr ra - .end fault diff --git a/arch/mips/kernel/r6000_fpu.S b/arch/mips/kernel/r6000_fpu.S deleted file mode 100644 index 43cda53..0000000 --- a/arch/mips/kernel/r6000_fpu.S +++ /dev/null @@ -1,87 +0,0 @@ -/* - * r6000_fpu.S: Save/restore floating point context for signal handlers. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 1996 by Ralf Baechle - * - * Multi-arch abstraction and asm macros for easier reading: - * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) - */ -#include -#include -#include -#include -#include - - .set noreorder - .set mips2 - /* Save floating point context */ - LEAF(_save_fp_context) - mfc0 t0,CP0_STATUS - sll t0,t0,2 - bgez t0,1f - nop - - cfc1 t1,fcr31 - /* Store the 16 double precision registers */ - sdc1 $f0,(SC_FPREGS+0)(a0) - sdc1 $f2,(SC_FPREGS+16)(a0) - sdc1 $f4,(SC_FPREGS+32)(a0) - sdc1 $f6,(SC_FPREGS+48)(a0) - sdc1 $f8,(SC_FPREGS+64)(a0) - sdc1 $f10,(SC_FPREGS+80)(a0) - sdc1 $f12,(SC_FPREGS+96)(a0) - sdc1 $f14,(SC_FPREGS+112)(a0) - sdc1 $f16,(SC_FPREGS+128)(a0) - sdc1 $f18,(SC_FPREGS+144)(a0) - sdc1 $f20,(SC_FPREGS+160)(a0) - sdc1 $f22,(SC_FPREGS+176)(a0) - sdc1 $f24,(SC_FPREGS+192)(a0) - sdc1 $f26,(SC_FPREGS+208)(a0) - sdc1 $f28,(SC_FPREGS+224)(a0) - sdc1 $f30,(SC_FPREGS+240)(a0) - jr ra - sw t0,SC_FPC_CSR(a0) -1: jr ra - nop - END(_save_fp_context) - -/* Restore FPU state: - * - fp gp registers - * - cp1 status/control register - * - * We base the decision which registers to restore from the signal stack - * frame on the current content of c0_status, not on the content of the - * stack frame which might have been changed by the user. - */ - LEAF(_restore_fp_context) - mfc0 t0,CP0_STATUS - sll t0,t0,2 - - bgez t0,1f - lw t0,SC_FPC_CSR(a0) - /* Restore the 16 double precision registers */ - ldc1 $f0,(SC_FPREGS+0)(a0) - ldc1 $f2,(SC_FPREGS+16)(a0) - ldc1 $f4,(SC_FPREGS+32)(a0) - ldc1 $f6,(SC_FPREGS+48)(a0) - ldc1 $f8,(SC_FPREGS+64)(a0) - ldc1 $f10,(SC_FPREGS+80)(a0) - ldc1 $f12,(SC_FPREGS+96)(a0) - ldc1 $f14,(SC_FPREGS+112)(a0) - ldc1 $f16,(SC_FPREGS+128)(a0) - ldc1 $f18,(SC_FPREGS+144)(a0) - ldc1 $f20,(SC_FPREGS+160)(a0) - ldc1 $f22,(SC_FPREGS+176)(a0) - ldc1 $f24,(SC_FPREGS+192)(a0) - ldc1 $f26,(SC_FPREGS+208)(a0) - ldc1 $f28,(SC_FPREGS+224)(a0) - ldc1 $f30,(SC_FPREGS+240)(a0) - jr ra - ctc1 t0,fcr31 -1: jr ra - nop - END(_restore_fp_context) diff --git a/arch/mips/kernel/signal-common.h b/arch/mips/kernel/signal-common.h index 3ca7862..64e6cf2 100644 --- a/arch/mips/kernel/signal-common.h +++ b/arch/mips/kernel/signal-common.h @@ -10,6 +10,42 @@ #include +/* + * Emulator context save/restore to/from a signal context + * presumed to be on the user stack, and therefore accessed + * with appropriate macros from uaccess.h + */ + +static inline int save_fp_context(struct sigcontext __user *sc) +{ + int i; + int err = 0; + + for (i = 0; i < 32; i++) { + err |= + __put_user(current->thread.fpu.soft.fpr[i], + &sc->sc_fpregs[i]); + } + err |= __put_user(current->thread.fpu.soft.fcr31, &sc->sc_fpc_csr); + + return err; +} + +static inline int restore_fp_context(struct sigcontext __user *sc) +{ + int i; + int err = 0; + + for (i = 0; i < 32; i++) { + err |= + __get_user(current->thread.fpu.soft.fpr[i], + &sc->sc_fpregs[i]); + } + err |= __get_user(current->thread.fpu.soft.fcr31, &sc->sc_fpc_csr); + + return err; +} + static inline int setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) { @@ -68,15 +104,14 @@ setup_sigcontext(struct pt_regs *regs, s * current FPU state. */ preempt_disable(); - - if (!is_fpu_owner()) { - own_fpu(); - restore_fp(current); + if (is_fpu_owner()) { + /* save current context to task_struct */ + save_fp(current); + lose_fpu(); } - err |= save_fp_context(sc); - preempt_enable(); + err |= save_fp_context(sc); out: return err; } @@ -138,19 +173,16 @@ restore_sigcontext(struct pt_regs *regs, err |= __get_user(used_math, &sc->sc_used_math); conditional_used_math(used_math); + /* signal handler may have used FPU. Give it up. */ preempt_disable(); + lose_fpu(); + preempt_enable(); if (used_math()) { /* restore fpu context if we have used it before */ - own_fpu(); err |= restore_fp_context(sc); - } else { - /* signal handler may have used FPU. Give it up. */ - lose_fpu(); } - preempt_enable(); - return err; } diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c index f32a229..eeba973 100644 --- a/arch/mips/kernel/signal32.c +++ b/arch/mips/kernel/signal32.c @@ -326,6 +326,40 @@ asmlinkage int sys32_sigaltstack(nabi_no return ret; } +/* + * This is the o32 version + */ + +static inline int save_fp_context32(struct sigcontext32 __user *sc) +{ + int i; + int err = 0; + + for (i = 0; i < 32; i+=2) { + err |= + __put_user(current->thread.fpu.soft.fpr[i], + &sc->sc_fpregs[i]); + } + err |= __put_user(current->thread.fpu.soft.fcr31, &sc->sc_fpc_csr); + + return err; +} + +static inline int restore_fp_context32(struct sigcontext32 __user *sc) +{ + int i; + int err = 0; + + for (i = 0; i < 32; i+=2) { + err |= + __get_user(current->thread.fpu.soft.fpr[i], + &sc->sc_fpregs[i]); + } + err |= __get_user(current->thread.fpu.soft.fcr31, &sc->sc_fpc_csr); + + return err; +} + static int restore_sigcontext32(struct pt_regs *regs, struct sigcontext32 __user *sc) { u32 used_math; @@ -367,19 +401,16 @@ static int restore_sigcontext32(struct p err |= __get_user(used_math, &sc->sc_used_math); conditional_used_math(used_math); + /* signal handler may have used FPU. Give it up. */ preempt_disable(); + lose_fpu(); + preempt_enable(); if (used_math()) { /* restore fpu context if we have used it before */ - own_fpu(); err |= restore_fp_context32(sc); - } else { - /* signal handler may have used FPU. Give it up. */ - lose_fpu(); } - preempt_enable(); - return err; } @@ -598,15 +629,14 @@ static inline int setup_sigcontext32(str * current FPU state. */ preempt_disable(); - - if (!is_fpu_owner()) { - own_fpu(); - restore_fp(current); + if (is_fpu_owner()) { + /* save current context to task_struct */ + save_fp(current); + lose_fpu(); } - err |= save_fp_context32(sc); - preempt_enable(); + err |= save_fp_context32(sc); out: return err; } diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 4901f0a..73e8c2f 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c @@ -1185,77 +1185,6 @@ void *set_vi_handler(int n, void *addr) } #endif -/* - * This is used by native signal handling - */ -asmlinkage int (*save_fp_context)(struct sigcontext *sc); -asmlinkage int (*restore_fp_context)(struct sigcontext *sc); - -extern asmlinkage int _save_fp_context(struct sigcontext *sc); -extern asmlinkage int _restore_fp_context(struct sigcontext *sc); - -extern asmlinkage int fpu_emulator_save_context(struct sigcontext *sc); -extern asmlinkage int fpu_emulator_restore_context(struct sigcontext *sc); - -#ifdef CONFIG_SMP -static int smp_save_fp_context(struct sigcontext *sc) -{ - return cpu_has_fpu - ? _save_fp_context(sc) - : fpu_emulator_save_context(sc); -} - -static int smp_restore_fp_context(struct sigcontext *sc) -{ - return cpu_has_fpu - ? _restore_fp_context(sc) - : fpu_emulator_restore_context(sc); -} -#endif - -static inline void signal_init(void) -{ -#ifdef CONFIG_SMP - /* For now just do the cpu_has_fpu check when the functions are invoked */ - save_fp_context = smp_save_fp_context; - restore_fp_context = smp_restore_fp_context; -#else - if (cpu_has_fpu) { - save_fp_context = _save_fp_context; - restore_fp_context = _restore_fp_context; - } else { - save_fp_context = fpu_emulator_save_context; - restore_fp_context = fpu_emulator_restore_context; - } -#endif -} - -#ifdef CONFIG_MIPS32_COMPAT - -/* - * This is used by 32-bit signal stuff on the 64-bit kernel - */ -asmlinkage int (*save_fp_context32)(struct sigcontext32 *sc); -asmlinkage int (*restore_fp_context32)(struct sigcontext32 *sc); - -extern asmlinkage int _save_fp_context32(struct sigcontext32 *sc); -extern asmlinkage int _restore_fp_context32(struct sigcontext32 *sc); - -extern asmlinkage int fpu_emulator_save_context32(struct sigcontext32 *sc); -extern asmlinkage int fpu_emulator_restore_context32(struct sigcontext32 *sc); - -static inline void signal32_init(void) -{ - if (cpu_has_fpu) { - save_fp_context32 = _save_fp_context32; - restore_fp_context32 = _restore_fp_context32; - } else { - save_fp_context32 = fpu_emulator_save_context32; - restore_fp_context32 = fpu_emulator_restore_context32; - } -} -#endif - extern void cpu_cache_init(void); extern void tlb_init(void); extern void flush_tlb_handlers(void); @@ -1488,11 +1417,6 @@ void __init trap_init(void) else memcpy((void *)(CAC_BASE + 0x080), &except_vec3_generic, 0x80); - signal_init(); -#ifdef CONFIG_MIPS32_COMPAT - signal32_init(); -#endif - flush_icache_range(ebase, ebase + 0x400); flush_tlb_handlers(); } diff --git a/arch/mips/math-emu/kernel_linkage.c b/arch/mips/math-emu/kernel_linkage.c index d187ab7..3367ace 100644 --- a/arch/mips/math-emu/kernel_linkage.c +++ b/arch/mips/math-emu/kernel_linkage.c @@ -44,76 +44,3 @@ void fpu_emulator_init_fpu(void) current->thread.fpu.soft.fpr[i] = SIGNALLING_NAN; } } - - -/* - * Emulator context save/restore to/from a signal context - * presumed to be on the user stack, and therefore accessed - * with appropriate macros from uaccess.h - */ - -int fpu_emulator_save_context(struct sigcontext *sc) -{ - int i; - int err = 0; - - for (i = 0; i < 32; i++) { - err |= - __put_user(current->thread.fpu.soft.fpr[i], - &sc->sc_fpregs[i]); - } - err |= __put_user(current->thread.fpu.soft.fcr31, &sc->sc_fpc_csr); - - return err; -} - -int fpu_emulator_restore_context(struct sigcontext *sc) -{ - int i; - int err = 0; - - for (i = 0; i < 32; i++) { - err |= - __get_user(current->thread.fpu.soft.fpr[i], - &sc->sc_fpregs[i]); - } - err |= __get_user(current->thread.fpu.soft.fcr31, &sc->sc_fpc_csr); - - return err; -} - -#ifdef CONFIG_64BIT -/* - * This is the o32 version - */ - -int fpu_emulator_save_context32(struct sigcontext32 *sc) -{ - int i; - int err = 0; - - for (i = 0; i < 32; i+=2) { - err |= - __put_user(current->thread.fpu.soft.fpr[i], - &sc->sc_fpregs[i]); - } - err |= __put_user(current->thread.fpu.soft.fcr31, &sc->sc_fpc_csr); - - return err; -} - -int fpu_emulator_restore_context32(struct sigcontext32 *sc) -{ - int i; - int err = 0; - - for (i = 0; i < 32; i+=2) { - err |= - __get_user(current->thread.fpu.soft.fpr[i], - &sc->sc_fpregs[i]); - } - err |= __get_user(current->thread.fpu.soft.fcr31, &sc->sc_fpc_csr); - - return err; -} -#endif diff --git a/include/asm-mips/fpu.h b/include/asm-mips/fpu.h index b0f5001..9b519a5 100644 --- a/include/asm-mips/fpu.h +++ b/include/asm-mips/fpu.h @@ -25,15 +25,6 @@ #include #endif -struct sigcontext; -struct sigcontext32; - -extern asmlinkage int (*save_fp_context)(struct sigcontext *sc); -extern asmlinkage int (*restore_fp_context)(struct sigcontext *sc); - -extern asmlinkage int (*save_fp_context32)(struct sigcontext32 *sc); -extern asmlinkage int (*restore_fp_context32)(struct sigcontext32 *sc); - extern void fpu_emulator_init_fpu(void); extern void _init_fpu(void); extern void _save_fp(struct task_struct *); From mark.e.mason@broadcom.com Tue Apr 11 22:30:33 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 11 Apr 2006 22:30:49 +0100 (BST) Received: from mms1.broadcom.com ([216.31.210.17]:8717 "EHLO mms1.broadcom.com") by ftp.linux-mips.org with ESMTP id S8133576AbWDKVad convert rfc822-to-8bit (ORCPT ); Tue, 11 Apr 2006 22:30:33 +0100 Received: from 10.10.64.154 by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.2.0)); Tue, 11 Apr 2006 14:42:08 -0700 X-Server-Uuid: F962EFE0-448C-40EE-8100-87DF498ED0EA Received: by mail-irva-10.broadcom.com (Postfix, from userid 47) id 745402AF; Tue, 11 Apr 2006 14:42:08 -0700 (PDT) Received: from mail-irva-8.broadcom.com (mail-irva-8 [10.10.64.221]) by mail-irva-10.broadcom.com (Postfix) with ESMTP id 471EE2AE; Tue, 11 Apr 2006 14:42:08 -0700 (PDT) Received: from mail-sj1-12.sj.broadcom.com (mail-sj1-12.sj.broadcom.com [10.16.128.215]) by mail-irva-8.broadcom.com (MOS 3.7.5-GA) with ESMTP id DHC21575; Tue, 11 Apr 2006 14:42:07 -0700 (PDT) Received: from NT-SJCA-0750.brcm.ad.broadcom.com (nt-sjca-0750 [10.16.192.220]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id 362B520501; Tue, 11 Apr 2006 14:42:07 -0700 (PDT) X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Subject: RE: Oprofile on sibyte 2.4.18 kernel Date: Tue, 11 Apr 2006 14:42:06 -0700 Message-ID: <7E000E7F06B05C49BDBB769ADAF44D07989B08@NT-SJCA-0750.brcm.ad.broadcom.com> Thread-Topic: Oprofile on sibyte 2.4.18 kernel Thread-Index: AcZamdRoKUMjWTsKT5ersblLdXL9owCa8JOQACmOKlA= From: "Mark E Mason" To: "Shanthi Kiran Pendyala (skiranp)" , "Ralf Baechle" cc: "linux-mips" X-TMWD-Spam-Summary: SEV=1.1; DFV=A2006041107; IFV=2.0.6,4.0-7; RPD=4.00.0004; RPDID=303030312E30413039303230372E34343343323138362E303036332D412D; ENG=IBF; TS=20060411214211; CAT=NONE; CON=NONE; X-MMS-Spam-Filter-ID: A2006041107_4.00.0004_2.0.6,4.0-7 X-WSS-ID: 6822FD3A0HW6367332-01-01 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8BIT Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11086 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: mark.e.mason@broadcom.com Precedence: bulk X-list: linux-mips Hello, FYI: don't use the oprofile tools tarball - use the latest from the CVS site on sourceforge. The last tarball on the website is more than a bit out of date. I'll follow up on your other questions in a separate email (in a little while....). /Mark > > #1: I looked at oprofile-0.9.1 and it lists this event for SB1 in the > events/mips/sb1 directory > -------------------------------------------------------------- > ---------- > --- > event:10 counters:1,2,3 um:zero minimum:500 > name:DCACHE_FILLED_SHD_NONC_EXC :Dcache is filled (shared, nonc, > exclusive) > ---------------------------------------------------------------- > > However this doesn't have an equivalent performance source > Listed in the sibyte manual (table 33 system performance > counter sources). Are you looking in Sb1-UM100-RDS.pdf? This is in table 95 in my copy, on page 96/97 (section 11). Also note that the table isn't in order -- event #10 appears on the top of the 2nd page. It's logical grouping, not numeric. > #2: how does the mapping from event numbers to performance > sources work for sibyte ? > > I looked at the op_model_mipsxx.c file in the 2.6 CVS tree > and the macro it uses doesn't seem to match the format > specified for perf_cnt_cfg register in sibyte. Are you using the kernel from CVS instead of git? The SB1 oprofile support didn't turn up in the kernel until sometime mid-January, and is only available through the git version (the CVS version of the kernel is long out of date). HTH, Mark From skiranp@cisco.com Tue Apr 11 23:57:47 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 11 Apr 2006 23:57:55 +0100 (BST) Received: from sj-iport-4.cisco.com ([171.68.10.86]:30590 "EHLO sj-iport-4.cisco.com") by ftp.linux-mips.org with ESMTP id S8133580AbWDKW5q convert rfc822-to-8bit (ORCPT ); Tue, 11 Apr 2006 23:57:46 +0100 Received: from sj-core-4.cisco.com ([171.68.223.138]) by sj-iport-4.cisco.com with ESMTP; 11 Apr 2006 16:09:30 -0700 X-IronPort-AV: i="4.04,113,1144047600"; d="scan'208"; a="1794034317:sNHT30742856" Received: from xbh-sjc-211.amer.cisco.com (xbh-sjc-211.cisco.com [171.70.151.144]) by sj-core-4.cisco.com (8.12.10/8.12.6) with ESMTP id k3BN9RYq004906; Tue, 11 Apr 2006 16:09:30 -0700 (PDT) Received: from xmb-sjc-215.amer.cisco.com ([171.70.151.169]) by xbh-sjc-211.amer.cisco.com with Microsoft SMTPSVC(6.0.3790.211); Tue, 11 Apr 2006 16:09:29 -0700 X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT Subject: RE: Oprofile on sibyte 2.4.18 kernel Date: Tue, 11 Apr 2006 16:09:28 -0700 Message-ID: <5547014632ED654F971D7E1E0C2E0C3E0194AD2D@xmb-sjc-215.amer.cisco.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: Oprofile on sibyte 2.4.18 kernel Thread-Index: AcZamdRoKUMjWTsKT5ersblLdXL9owCa8JOQACmOKlAAA+V1oA== From: "Shanthi Kiran Pendyala \(skiranp\)" To: "Mark E Mason" Cc: "linux-mips" X-OriginalArrivalTime: 11 Apr 2006 23:09:29.0241 (UTC) FILETIME=[FC28E090:01C65DBC] Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11087 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: skiranp@cisco.com Precedence: bulk X-list: linux-mips Hi Mark, Thx for the info. The doc I have has the title 1250_1125-UM100-RDS.pdf. I went back to docsafe And looked for the sb1-um100-rds.pdf doc that you mention. I thought sb1 is the core and if two of these cores are present it is labelled 1250 and If only one is present it is marketed as 1125 ? Is my understanding wrong ? Let me look at this document and see if it answers my questions. Also, yes I was looking at 2.6 git tree, not the CVS tree as I said below.. Sorry about That. Shanthi kiran >-----Original Message----- >From: Mark E Mason [mailto:mark.e.mason@broadcom.com] >Sent: Tuesday, April 11, 2006 2:42 PM >To: Shanthi Kiran Pendyala (skiranp); Ralf Baechle >Cc: linux-mips >Subject: RE: Oprofile on sibyte 2.4.18 kernel > >Hello, > >FYI: don't use the oprofile tools tarball - use the latest >from the CVS site on sourceforge. The last tarball on the >website is more than a bit out of date. > >I'll follow up on your other questions in a separate email (in >a little while....). > >/Mark > >> >> #1: I looked at oprofile-0.9.1 and it lists this event for SB1 in the >> events/mips/sb1 directory >> -------------------------------------------------------------- >> ---------- >> --- >> event:10 counters:1,2,3 um:zero minimum:500 >> name:DCACHE_FILLED_SHD_NONC_EXC :Dcache is filled (shared, nonc, >> exclusive) >> ---------------------------------------------------------------- >> >> However this doesn't have an equivalent performance source Listed in >> the sibyte manual (table 33 system performance counter sources). > >Are you looking in Sb1-UM100-RDS.pdf? This is in table 95 in >my copy, on page 96/97 (section 11). Also note that the table >isn't in order -- event #10 appears on the top of the 2nd >page. It's logical grouping, not numeric. > >> #2: how does the mapping from event numbers to performance sources >> work for sibyte ? >> >> I looked at the op_model_mipsxx.c file in the 2.6 CVS tree and the >> macro it uses doesn't seem to match the format specified for >> perf_cnt_cfg register in sibyte. > >Are you using the kernel from CVS instead of git? The SB1 >oprofile support didn't turn up in the kernel until sometime >mid-January, and is only available through the git version >(the CVS version of the kernel is long out of date). > >HTH, >Mark > From mark.e.mason@broadcom.com Wed Apr 12 00:17:34 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 12 Apr 2006 00:17:43 +0100 (BST) Received: from mms2.broadcom.com ([216.31.210.18]:28939 "EHLO mms2.broadcom.com") by ftp.linux-mips.org with ESMTP id S8133594AbWDKXRe convert rfc822-to-8bit (ORCPT ); Wed, 12 Apr 2006 00:17:34 +0100 Received: from 10.10.64.154 by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.2.0)); Tue, 11 Apr 2006 16:29:08 -0700 X-Server-Uuid: D9EB6F12-1469-4C1C-87A2-5E4C0D6F9D06 Received: by mail-irva-10.broadcom.com (Postfix, from userid 47) id AC7F42B0; Tue, 11 Apr 2006 16:29:07 -0700 (PDT) Received: from mail-irva-8.broadcom.com (mail-irva-8 [10.10.64.221]) by mail-irva-10.broadcom.com (Postfix) with ESMTP id 169172B3; Tue, 11 Apr 2006 16:29:06 -0700 (PDT) Received: from mail-sj1-12.sj.broadcom.com (mail-sj1-12.sj.broadcom.com [10.16.128.215]) by mail-irva-8.broadcom.com (MOS 3.7.5-GA) with ESMTP id DHC57767; Tue, 11 Apr 2006 16:29:05 -0700 (PDT) Received: from NT-SJCA-0750.brcm.ad.broadcom.com (nt-sjca-0750 [10.16.192.220]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id 4D85C20501; Tue, 11 Apr 2006 16:29:05 -0700 (PDT) X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Subject: RE: Oprofile on sibyte 2.4.18 kernel Date: Tue, 11 Apr 2006 16:29:03 -0700 Message-ID: <7E000E7F06B05C49BDBB769ADAF44D07989B22@NT-SJCA-0750.brcm.ad.broadcom.com> Thread-Topic: Oprofile on sibyte 2.4.18 kernel Thread-Index: AcZamdRoKUMjWTsKT5ersblLdXL9owCa8JOQACmOKlAAA+V1oAAA4vMQ From: "Mark E Mason" To: "Shanthi Kiran Pendyala (skiranp)" cc: "linux-mips" X-TMWD-Spam-Summary: SEV=1.1; DFV=A2006041109; IFV=2.0.6,4.0-7; RPD=4.00.0004; RPDID=303030312E30413039303230362E34343343334139372E303031452D412D; ENG=IBF; TS=20060411232909; CAT=NONE; CON=NONE; X-MMS-Spam-Filter-ID: A2006041109_4.00.0004_2.0.6,4.0-7 X-WSS-ID: 6822E44E1744900368-01-01 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8BIT Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11088 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: mark.e.mason@broadcom.com Precedence: bulk X-list: linux-mips Hello, > -----Original Message----- > From: Shanthi Kiran Pendyala (skiranp) [mailto:skiranp@cisco.com] > Sent: Tuesday, April 11, 2006 4:09 PM > To: Mark E Mason > Cc: linux-mips > Subject: RE: Oprofile on sibyte 2.4.18 kernel > > Hi Mark, > > Thx for the info. > > The doc I have has the title 1250_1125-UM100-RDS.pdf. I went > back to docsafe And looked for the sb1-um100-rds.pdf doc that > you mention. Ah - got it. What you're looking at here is the table for the SOC performance counters, which aren't currently supported by oprofile. If you compare the two, the SOC performance counters deal with activity on the system Z-bus, the core performance counters deal with processor cycles, instruction execution, L1 cache activity and the like. > I thought sb1 is the core and if two of these cores are > present it is labelled 1250 and If only one is present it is > marketed as 1125 ? Is my understanding wrong ? This is correct. From the documentation port of view, all of the "core stuff" is in the SB1-UM100-RDS.pdf manual, the "SOC stuff" is in the 1250_1125_UM100-RDS.pdf manual. At this point, oprofile only supports the core performance counters. > > Let me look at this document and see if it answers my questions. > > Also, yes I was looking at 2.6 git tree, not the CVS tree as > I said below.. Sorry about That. Not a problem. Please let us know if you have any more questions. Thanks, Mark From ralf@linux-mips.org Wed Apr 12 15:05:32 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 12 Apr 2006 15:05:40 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:214 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133625AbWDLOFc (ORCPT ); Wed, 12 Apr 2006 15:05:32 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k3BMO71f015577; Wed, 12 Apr 2006 00:24:07 +0200 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k3BMO6Ew015575; Wed, 12 Apr 2006 00:24:06 +0200 Date: Wed, 12 Apr 2006 00:24:05 +0200 From: Ralf Baechle To: Mark E Mason Cc: "Shanthi Kiran Pendyala (skiranp)" , linux-mips Subject: Re: Oprofile on sibyte 2.4.18 kernel Message-ID: <20060411222405.GA14848@linux-mips.org> References: <7E000E7F06B05C49BDBB769ADAF44D07989B08@NT-SJCA-0750.brcm.ad.broadcom.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7E000E7F06B05C49BDBB769ADAF44D07989B08@NT-SJCA-0750.brcm.ad.broadcom.com> User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11089 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Tue, Apr 11, 2006 at 02:42:06PM -0700, Mark E Mason wrote: > FYI: don't use the oprofile tools tarball - use the latest from the CVS > site on sourceforge. The last tarball on the website is more than a bit > out of date. That's documented in the wiki btw :-) Ralf From freddy@dusktilldawn.nl Thu Apr 13 13:59:39 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 13 Apr 2006 13:59:48 +0100 (BST) Received: from tool.snarl.nl ([213.84.251.124]:19863 "HELO tool.snarl.nl") by ftp.linux-mips.org with SMTP id S8133387AbWDMM7j (ORCPT ); Thu, 13 Apr 2006 13:59:39 +0100 Received: from localhost (tool.local.snarl.nl [127.0.0.1]) by tool.snarl.nl (Postfix) with ESMTP id EB52B5DF46 for ; Thu, 13 Apr 2006 15:11:17 +0200 (CEST) Received: from tool.snarl.nl ([127.0.0.1]) by localhost (tool.local.snarl.nl [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 05285-01-3 for ; Thu, 13 Apr 2006 15:11:17 +0200 (CEST) Received: by tool.snarl.nl (Postfix, from userid 1000) id 8D6845DF41; Thu, 13 Apr 2006 15:11:17 +0200 (CEST) Date: Thu, 13 Apr 2006 15:11:17 +0200 From: Freddy Spierenburg To: linux-mips@linux-mips.org Subject: UART trouble on the DBAu1100 Message-ID: <20060413131117.GP11097@dusktilldawn.nl> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="xJjS+Ds6jmpBvWv0" Content-Disposition: inline X-User-Agent-Feature: All mail clients suck. This one just sucks less. X-GPG-Key: http://snarl.nl/~freddy/keys/freddyPublicKey.gpg User-Agent: Mutt/1.5.11+cvs20060403 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11090 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: freddy@dusktilldawn.nl Precedence: bulk X-list: linux-mips --xJjS+Ds6jmpBvWv0 Content-Type: multipart/mixed; boundary="z87VqPJ/HsYrR2WM" Content-Disposition: inline --z87VqPJ/HsYrR2WM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, I have a problem and yet am not sure where to look. It's a problem in the serial driver for the internal UART's of the AU1100. It appeared ever since 2.6.15. 2.6.14 is working like a charm, but 2.6.15 gives me the trouble. When I open a tty with the open(2) system call (see attached open.c) I see that the UART sends a 0x36 byte on the line. But that's not the only trouble. I also do not receive any bytes received by the UART. All the received bytes stay in the input buffer of the UART only to be send up to userland as soon as the UART is asked to send a byte on the line itself. Then in one take all the bytes are received by the application listening. Reproducing is easy with a program like picocom. Just start it on both ends (one called 'a' and the other called 'b') and type on one (a) end. You will see nothing at the other (b) end. Then type 1 or more characters on the other (b) end and you will see that character appear at the one (a) end and all the other previously types at the one (a) end appear on the other (b) end. I am currently looking into the source to see what's changed, but any help would be greatly appreciated :-) --=20 $ cat ~/.signature Freddy Spierenburg http://freddy.snarl.nl/ GnuPG: 0x7941D1E1=3DC948 5851 26D2 FA5C 39F1 E588 6F17 FD5D 7941 D1E1 $ # Please read http://www.ietf.org/rfc/rfc2015.txt before complain! --z87VqPJ/HsYrR2WM Content-Type: text/x-csrc; charset=us-ascii Content-Disposition: attachment; filename="open.c" #include #include #include #include #include int main(int argc,char **argv) { int fd; char *tty; tty=argc>1?argv[1]:"/dev/ttyS0"; fd=open(tty,O_RDWR); if(fd==-1) { perror("Can't open tty"); } else { if(argc>2) { /* Closing or not doesn't matter, it's the open() system call. */ close(fd); } else { /* Nice sleep so you see the character is sent by the open and * not by whatever else one can think of. */ sleep(2); } } return(0); } --z87VqPJ/HsYrR2WM-- --xJjS+Ds6jmpBvWv0 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) iD8DBQFEPk31bxf9XXlB0eERAnfMAKDW9Oc8Olo8qEolnsELgJU4Y9M+EwCcD2Wr lYI7iR2FuCczMh7566TLGcg= =J9uQ -----END PGP SIGNATURE----- --xJjS+Ds6jmpBvWv0-- From ppopov@embeddedalley.com Thu Apr 13 21:43:10 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 13 Apr 2006 21:43:19 +0100 (BST) Received: from smtp105.biz.mail.mud.yahoo.com ([68.142.200.253]:29841 "HELO smtp105.biz.mail.mud.yahoo.com") by ftp.linux-mips.org with SMTP id S8133706AbWDMUnK (ORCPT ); Thu, 13 Apr 2006 21:43:10 +0100 Received: (qmail 54308 invoked from network); 13 Apr 2006 20:55:06 -0000 Received: from unknown (HELO ?192.168.1.103?) (ppopov@embeddedalley.com@71.128.175.242 with plain) by smtp105.biz.mail.mud.yahoo.com with SMTP; 13 Apr 2006 20:55:06 -0000 Subject: mips64 kgdb fpu access bug From: Pete Popov Reply-To: ppopov@embeddedalley.com To: "'linux-mips@linux-mips.org'" Content-Type: text/plain Organization: Embedded Alley Solutions, Inc Date: Thu, 13 Apr 2006 13:54:59 -0700 Message-Id: <1144961699.8372.127.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.4.1 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11091 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ppopov@embeddedalley.com Precedence: bulk X-list: linux-mips I'm running into a random problem with a mips64 kernel (2.6.14 based). I see the problem on the MIPS Malta 5kf board but it seems like a generic bug to me. What happens is that CP0 FR bit is zero and an add register is accessed by an instruction whose datatype is 64 bits. That results in a reserved instruction kernel fault. I see this bug in gdb-low.S - the code checks to see if CU1 is enabled but then it seems to assume that FR is always 1 when running a 64bit kernel. However, I also randomly see the bug without kgdb being enabled when we hit _save_fp and this macro: .macro fpu_save_double thread status tmp1 tmp2 sll \tmp2, \tmp1, 5 bgez \tmp2, 2f fpu_save_16odd \thread 2: fpu_save_16even \thread \tmp1 # clobbers t1 .endm tmp1 is "t0" and it's not clear to me why we're checking t0 instead of status in order to decide whether to save the odd registers or not. I must be missing something because others would have hit this bug by now. Any clues would be appreciated. Thanks, Pete From AScislowicz@Tarari.com Thu Apr 13 23:45:02 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 13 Apr 2006 23:45:29 +0100 (BST) Received: from smtp6.centerbeam.com ([63.120.115.250]:11272 "EHLO SMTP6.centerbeam.com") by ftp.linux-mips.org with ESMTP id S8133712AbWDMWpC (ORCPT ); Thu, 13 Apr 2006 23:45:02 +0100 Received: from tararisvle2k03.tarari.centerbeam.com ([64.95.101.58]) by SMTP6.centerbeam.com with Microsoft SMTPSVC(6.0.3790.1830); Thu, 13 Apr 2006 15:56:54 -0700 X-MimeOLE: Produced By Microsoft Exchange V6.5.7226.0 Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----_=_NextPart_001_01C65F4D.8DC96563" Subject: System freeze accompanied by msg 'BUG: soft lockup detected on CPU' Date: Thu, 13 Apr 2006 15:56:51 -0700 Message-ID: X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: System freeze accompanied by msg 'BUG: soft lockup detected on CPU' Thread-Index: AcZfTVy3pSLw6qJtRI+89j49BtKCLgAAChuw From: "Adam Scislowicz" To: X-OriginalArrivalTime: 13 Apr 2006 22:56:54.0591 (UTC) FILETIME=[8F2DECF0:01C65F4D] Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11092 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: AScislowicz@tarari.com Precedence: bulk X-list: linux-mips This is a multi-part message in MIME format. ------_=_NextPart_001_01C65F4D.8DC96563 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Kernel: Linux 2.6.15 Target: mips (32bit, big endian), SMP 4way (2way also crashes) preemption model =3D server (least preempt), do not preempt the big = kernel crash Board: Broadcom 1480B How to reproduce: I made a bash script which awks a file line by line... while true; do echo "crash me..." ls done The neither the 'echo' or 'ls' commands are necessary. Originally I would see it crash in a bash script which calls awk, or during the init sciprts sometimes. The above script causes it to crash within a minute every time I have run it. [4294909.579000] BUG: soft lockup detected on CPU#0! [4294909.579000] Cpu 0 [4294909.579000] $ 0 : 00000000 30001f00 00000002 00000000 [4294909.579000] $ 4 : 30001f01 b00260c8 0f0f0f0f 00000004 [4294909.579000] $ 8 : 00000000 1000001e 70000053 00000063 [4294909.579000] $12 : 7fca0010 00000004 00000000 00000004 [4294909.579000] $16 : 00000004 00000003 00000000 00000001 [4294909.579000] $20 : 8010e398 8f949dc8 8f93be20 00000000 [4294909.579000] $24 : 00000000 2aabb750 [4294909.579000] $28 : 8f948000 8f949d70 2ab0dd0b 8010b2f8 [4294909.579000] Hi : 00000000 [4294909.579000] Lo : 0000000c [4294909.579000] epc : 8010b314 smp_call_function+0x11c/0x1bc Not tainted [4294909.579000] ra : 8010b2f8 smp_call_function+0x100/0x1bc [4294909.579000] Status: 30001f03 KERNEL EXL IE [4294909.579000] Cause : 00809000 [4294909.579000] PrId : 01041100 With 8010e398 being sb1_flush_icache_page_ipi() Thank, Adam Scislowicz=20 -- kernel .config # # Automatically generated make config: don't edit # Linux kernel version: 2.6.15 # Wed Apr 12 13:52:44 2006 # CONFIG_MIPS=3Dy # # Machine selection # # CONFIG_MIPS_MTX1 is not set # CONFIG_MIPS_BOSPORUS is not set # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set # CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set # CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MIPS_EV64120 is not set # CONFIG_MIPS_EV96100 is not set # CONFIG_MIPS_IVR is not set # CONFIG_MIPS_ITE8172 is not set # CONFIG_MACH_JAZZ is not set # CONFIG_LASAT is not set # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_MALTA is not set # CONFIG_MIPS_SEAD is not set # CONFIG_MIPS_SIM is not set # CONFIG_MOMENCO_JAGUAR_ATX is not set # CONFIG_MOMENCO_OCELOT is not set # CONFIG_MOMENCO_OCELOT_3 is not set # CONFIG_MOMENCO_OCELOT_C is not set # CONFIG_MOMENCO_OCELOT_G is not set # CONFIG_MIPS_XXS1500 is not set # CONFIG_PNX8550_V2PCI is not set # CONFIG_PNX8550_JBS is not set # CONFIG_DDB5074 is not set # CONFIG_DDB5476 is not set # CONFIG_DDB5477 is not set # CONFIG_MACH_VR41XX is not set # CONFIG_PMC_YOSEMITE is not set # CONFIG_QEMU is not set # CONFIG_SGI_IP22 is not set # CONFIG_SGI_IP27 is not set # CONFIG_SGI_IP32 is not set CONFIG_SIBYTE_BIGSUR=3Dy # CONFIG_SIBYTE_SWARM is not set # CONFIG_SIBYTE_SENTOSA is not set # CONFIG_SIBYTE_RHONE is not set # CONFIG_SIBYTE_CARMEL is not set # CONFIG_SIBYTE_PTSWARM is not set # CONFIG_SIBYTE_LITTLESUR is not set # CONFIG_SIBYTE_CRHINE is not set # CONFIG_SIBYTE_CRHONE is not set # CONFIG_SNI_RM200_PCI is not set # CONFIG_TOSHIBA_JMR3927 is not set # CONFIG_TOSHIBA_RBTX4927 is not set # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_SIBYTE_BCM1x80=3Dy CONFIG_SIBYTE_SB1xxx_SOC=3Dy # CONFIG_CPU_SB1_PASS_1 is not set # CONFIG_CPU_SB1_PASS_2_1250 is not set # CONFIG_CPU_SB1_PASS_2_2 is not set # CONFIG_CPU_SB1_PASS_4 is not set # CONFIG_CPU_SB1_PASS_2_112x is not set # CONFIG_CPU_SB1_PASS_3 is not set # CONFIG_SIMULATION is not set # CONFIG_SB1_CEX_ALWAYS_FATAL is not set # CONFIG_SB1_CERR_STALL is not set CONFIG_SIBYTE_CFE=3Dy # CONFIG_SIBYTE_CFE_CONSOLE is not set # CONFIG_SIBYTE_BUS_WATCHER is not set # CONFIG_SIBYTE_SB1250_PROF is not set # CONFIG_SIBYTE_TBPROF is not set CONFIG_RWSEM_GENERIC_SPINLOCK=3Dy CONFIG_GENERIC_CALIBRATE_DELAY=3Dy CONFIG_DMA_COHERENT=3Dy CONFIG_CPU_BIG_ENDIAN=3Dy # CONFIG_CPU_LITTLE_ENDIAN is not set CONFIG_SYS_SUPPORTS_BIG_ENDIAN=3Dy CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=3Dy CONFIG_SWAP_IO_SPACE=3Dy CONFIG_BOOT_ELF32=3Dy CONFIG_MIPS_L1_CACHE_SHIFT=3D5 # # CPU selection # # CONFIG_CPU_MIPS32_R1 is not set # CONFIG_CPU_MIPS32_R2 is not set # CONFIG_CPU_MIPS64_R1 is not set # CONFIG_CPU_MIPS64_R2 is not set # CONFIG_CPU_R3000 is not set # CONFIG_CPU_TX39XX is not set # CONFIG_CPU_VR41XX is not set # CONFIG_CPU_R4300 is not set # CONFIG_CPU_R4X00 is not set # CONFIG_CPU_TX49XX is not set # CONFIG_CPU_R5000 is not set # CONFIG_CPU_R5432 is not set # CONFIG_CPU_R6000 is not set # CONFIG_CPU_NEVADA is not set # CONFIG_CPU_R8000 is not set # CONFIG_CPU_R10000 is not set # CONFIG_CPU_RM7000 is not set # CONFIG_CPU_RM9000 is not set CONFIG_CPU_SB1=3Dy CONFIG_SYS_HAS_CPU_SB1=3Dy CONFIG_SYS_SUPPORTS_32BIT_KERNEL=3Dy CONFIG_SYS_SUPPORTS_64BIT_KERNEL=3Dy CONFIG_CPU_SUPPORTS_32BIT_KERNEL=3Dy CONFIG_CPU_SUPPORTS_64BIT_KERNEL=3Dy # # Kernel type # CONFIG_32BIT=3Dy # CONFIG_64BIT is not set CONFIG_PAGE_SIZE_4KB=3Dy # CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PAGE_SIZE_16KB is not set # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_SIBYTE_DMA_PAGEOPS is not set # CONFIG_MIPS_MT is not set # CONFIG_64BIT_PHYS_ADDR is not set # CONFIG_CPU_ADVANCED is not set CONFIG_CPU_HAS_LLSC=3Dy CONFIG_CPU_HAS_SYNC=3Dy CONFIG_GENERIC_HARDIRQS=3Dy CONFIG_GENERIC_IRQ_PROBE=3Dy CONFIG_CPU_SUPPORTS_HIGHMEM=3Dy CONFIG_ARCH_FLATMEM_ENABLE=3Dy CONFIG_SELECT_MEMORY_MODEL=3Dy CONFIG_FLATMEM_MANUAL=3Dy # CONFIG_DISCONTIGMEM_MANUAL is not set # CONFIG_SPARSEMEM_MANUAL is not set CONFIG_FLATMEM=3Dy CONFIG_FLAT_NODE_MEM_MAP=3Dy # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=3D4 CONFIG_SMP=3Dy CONFIG_NR_CPUS=3D4 CONFIG_PREEMPT_NONE=3Dy # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_BKL is not set # # Code maturity level options # CONFIG_EXPERIMENTAL=3Dy CONFIG_CLEAN_COMPILE=3Dy CONFIG_LOCK_KERNEL=3Dy CONFIG_INIT_ENV_ARG_LIMIT=3D32 # # General setup # CONFIG_LOCALVERSION=3D"" CONFIG_LOCALVERSION_AUTO=3Dy CONFIG_SWAP=3Dy CONFIG_SYSVIPC=3Dy # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=3Dy # CONFIG_AUDIT is not set CONFIG_HOTPLUG=3Dy CONFIG_KOBJECT_UEVENT=3Dy CONFIG_IKCONFIG=3Dy CONFIG_IKCONFIG_PROC=3Dy # CONFIG_CPUSETS is not set CONFIG_INITRAMFS_SOURCE=3D"" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_EMBEDDED=3Dy CONFIG_KALLSYMS=3Dy # CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_PRINTK=3Dy CONFIG_BUG=3Dy CONFIG_BASE_FULL=3Dy CONFIG_FUTEX=3Dy CONFIG_EPOLL=3Dy CONFIG_SHMEM=3Dy CONFIG_CC_ALIGN_FUNCTIONS=3D0 CONFIG_CC_ALIGN_LABELS=3D0 CONFIG_CC_ALIGN_LOOPS=3D0 CONFIG_CC_ALIGN_JUMPS=3D0 # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=3D0 # # Loadable module support # CONFIG_MODULES=3Dy CONFIG_MODULE_UNLOAD=3Dy # CONFIG_MODULE_FORCE_UNLOAD is not set CONFIG_OBSOLETE_MODPARM=3Dy CONFIG_MODVERSIONS=3Dy CONFIG_MODULE_SRCVERSION_ALL=3Dy CONFIG_KMOD=3Dy CONFIG_STOP_MACHINE=3Dy # # Block layer # # CONFIG_LBD is not set # # IO Schedulers # CONFIG_IOSCHED_NOOP=3Dy CONFIG_IOSCHED_AS=3Dy CONFIG_IOSCHED_DEADLINE=3Dy CONFIG_IOSCHED_CFQ=3Dy CONFIG_DEFAULT_AS=3Dy # CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED=3D"anticipatory" # # Bus options (PCI, PCMCIA, EISA, ISA, TC) # CONFIG_HW_HAS_PCI=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DOMAINS=3Dy CONFIG_PCI_LEGACY_PROC=3Dy CONFIG_PCI_DEBUG=3Dy CONFIG_MMU=3Dy # # PCCARD (PCMCIA/CardBus) support # CONFIG_PCCARD=3Dy # CONFIG_PCMCIA_DEBUG is not set CONFIG_PCMCIA=3Dy CONFIG_PCMCIA_LOAD_CIS=3Dy CONFIG_PCMCIA_IOCTL=3Dy # CONFIG_CARDBUS is not set # # PC-card bridges # # CONFIG_YENTA is not set # CONFIG_PD6729 is not set # CONFIG_I82092 is not set # # PCI Hotplug Support # # CONFIG_HOTPLUG_PCI is not set # # Executable file formats # CONFIG_BINFMT_ELF=3Dy # CONFIG_BINFMT_MISC is not set CONFIG_TRAD_SIGNALS=3Dy # # Networking # CONFIG_NET=3Dy # # Networking options # CONFIG_PACKET=3Dy CONFIG_PACKET_MMAP=3Dy CONFIG_UNIX=3Dy CONFIG_XFRM=3Dy CONFIG_XFRM_USER=3Dm CONFIG_NET_KEY=3Dy CONFIG_INET=3Dy # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=3Dy CONFIG_IP_PNP=3Dy CONFIG_IP_PNP_DHCP=3Dy CONFIG_IP_PNP_BOOTP=3Dy # CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_ARPD is not set # CONFIG_SYN_COOKIES is not set # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set CONFIG_INET_TUNNEL=3Dm CONFIG_INET_DIAG=3Dy CONFIG_INET_TCP_DIAG=3Dy # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_BIC=3Dy # CONFIG_IPV6 is not set # CONFIG_NETFILTER is not set # # DCCP Configuration (EXPERIMENTAL) # # CONFIG_IP_DCCP is not set # # SCTP Configuration (EXPERIMENTAL) # # CONFIG_IP_SCTP is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # # QoS and/or fair queueing # # CONFIG_NET_SCHED is not set # # Network testing # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_IEEE80211 is not set # # Device Drivers # # # Generic Driver Options # CONFIG_STANDALONE=3Dy CONFIG_PREVENT_FIRMWARE_BUILD=3Dy CONFIG_FW_LOADER=3Dy # CONFIG_DEBUG_DRIVER is not set # # Connector - unified userspace <-> kernelspace linker # # CONFIG_CONNECTOR is not set # # Memory Technology Devices (MTD) # # CONFIG_MTD is not set # # Parallel port support # # CONFIG_PARPORT is not set # # Plug and Play support # # # Block devices # # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=3Dy # CONFIG_BLK_DEV_CRYPTOLOOP is not set CONFIG_BLK_DEV_NBD=3Dm # CONFIG_BLK_DEV_SX8 is not set CONFIG_BLK_DEV_RAM=3Dy CONFIG_BLK_DEV_RAM_COUNT=3D16 CONFIG_BLK_DEV_RAM_SIZE=3D65536 CONFIG_BLK_DEV_INITRD=3Dy # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # # ATA/ATAPI/MFM/RLL support # CONFIG_IDE=3Dy CONFIG_BLK_DEV_IDE=3Dy # # Please see Documentation/ide.txt for help/info on IDE drives # # CONFIG_BLK_DEV_IDE_SATA is not set CONFIG_BLK_DEV_IDEDISK=3Dy # CONFIG_IDEDISK_MULTI_MODE is not set CONFIG_BLK_DEV_IDECS=3Dy CONFIG_BLK_DEV_IDECD=3Dy CONFIG_BLK_DEV_IDETAPE=3Dy CONFIG_BLK_DEV_IDEFLOPPY=3Dy # CONFIG_IDE_TASK_IOCTL is not set # # IDE chipset support/bugfixes # CONFIG_IDE_GENERIC=3Dy # CONFIG_BLK_DEV_IDEPCI is not set # CONFIG_BLK_DEV_IDE_SWARM is not set # CONFIG_IDE_ARM is not set # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set # CONFIG_BLK_DEV_HD is not set # # SCSI device support # # CONFIG_RAID_ATTRS is not set # CONFIG_SCSI is not set # # Multi-device support (RAID and LVM) # # CONFIG_MD is not set # # Fusion MPT device support # # CONFIG_FUSION is not set # # IEEE 1394 (FireWire) support # # CONFIG_IEEE1394 is not set # # I2O device support # # CONFIG_I2O is not set # # Network device support # CONFIG_NETDEVICES=3Dy # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set # # ARCnet devices # # CONFIG_ARCNET is not set # # PHY device support # # CONFIG_PHYLIB is not set # # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=3Dy CONFIG_MII=3Dy # CONFIG_HAPPYMEAL is not set # CONFIG_SUNGEM is not set # CONFIG_CASSINI is not set # CONFIG_NET_VENDOR_3COM is not set # # Tulip family network device support # # CONFIG_NET_TULIP is not set # CONFIG_HP100 is not set # CONFIG_NET_PCI is not set # # Ethernet (1000 Mbit) # # CONFIG_ACENIC is not set # CONFIG_DL2K is not set # CONFIG_E1000 is not set # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set # CONFIG_R8169 is not set CONFIG_NET_SB1250_MAC=3Dy # CONFIG_SIS190 is not set # CONFIG_SKGE is not set # CONFIG_SK98LIN is not set # CONFIG_TIGON3 is not set # CONFIG_BNX2 is not set # # Ethernet (10000 Mbit) # # CONFIG_CHELSIO_T1 is not set # CONFIG_IXGB is not set # CONFIG_S2IO is not set # # Token Ring devices # # CONFIG_TR is not set # # Wireless LAN (non-hamradio) # # CONFIG_NET_RADIO is not set # # PCMCIA network device support # # CONFIG_NET_PCMCIA is not set # # Wan interfaces # # CONFIG_WAN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set # # ISDN subsystem # # CONFIG_ISDN is not set # # Telephony Support # # CONFIG_PHONE is not set # # Input device support # # CONFIG_INPUT is not set # # Hardware I/O ports # CONFIG_SERIO=3Dy # CONFIG_SERIO_I8042 is not set CONFIG_SERIO_SERPORT=3Dy # CONFIG_SERIO_PCIPS2 is not set # CONFIG_SERIO_LIBPS2 is not set CONFIG_SERIO_RAW=3Dm # CONFIG_GAMEPORT is not set # # Character devices # # CONFIG_VT is not set CONFIG_SERIAL_NONSTANDARD=3Dy # CONFIG_ROCKETPORT is not set # CONFIG_CYCLADES is not set # CONFIG_DIGIEPCA is not set # CONFIG_MOXA_SMARTIO is not set # CONFIG_ISI is not set # CONFIG_SYNCLINKMP is not set # CONFIG_N_HDLC is not set # CONFIG_SPECIALIX is not set # CONFIG_SX is not set # CONFIG_STALDRV is not set CONFIG_SIBYTE_SB1250_DUART=3Dy CONFIG_SIBYTE_SB1250_DUART_CONSOLE=3Dy # # Serial drivers # # CONFIG_SERIAL_8250 is not set # # Non-8250 serial port support # # CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=3Dy CONFIG_LEGACY_PTYS=3Dy CONFIG_LEGACY_PTY_COUNT=3D256 # # IPMI # # CONFIG_IPMI_HANDLER is not set # # Watchdog Cards # # CONFIG_WATCHDOG is not set # CONFIG_RTC is not set CONFIG_GEN_RTC=3Dy # CONFIG_GEN_RTC_X is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # # Ftape, the floppy tape device driver # # CONFIG_DRM is not set # # PCMCIA character devices # # CONFIG_SYNCLINK_CS is not set # CONFIG_CARDMAN_4000 is not set # CONFIG_CARDMAN_4040 is not set # CONFIG_RAW_DRIVER is not set # # TPM devices # # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set # # I2C support # CONFIG_I2C=3Dy CONFIG_I2C_CHARDEV=3Dy # # I2C Algorithms # # CONFIG_I2C_ALGOBIT is not set # CONFIG_I2C_ALGOPCF is not set # CONFIG_I2C_ALGOPCA is not set CONFIG_I2C_ALGO_SIBYTE=3Dy # # I2C Hardware Bus support # # CONFIG_I2C_ALI1535 is not set # CONFIG_I2C_ALI1563 is not set # CONFIG_I2C_ALI15X3 is not set # CONFIG_I2C_AMD756 is not set # CONFIG_I2C_AMD8111 is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_I810 is not set # CONFIG_I2C_PIIX4 is not set # CONFIG_I2C_NFORCE2 is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_PROSAVAGE is not set # CONFIG_I2C_SAVAGE4 is not set CONFIG_I2C_SIBYTE=3Dy # CONFIG_SCx200_ACB is not set # CONFIG_I2C_SIS5595 is not set # CONFIG_I2C_SIS630 is not set # CONFIG_I2C_SIS96X is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set # CONFIG_I2C_VOODOO3 is not set # CONFIG_I2C_PCA_ISA is not set # # Miscellaneous I2C Chip support # CONFIG_SENSORS_DS1337=3Dy CONFIG_SENSORS_DS1374=3Dy CONFIG_SENSORS_EEPROM=3Dy CONFIG_SENSORS_PCF8574=3Dy CONFIG_SENSORS_PCA9539=3Dy CONFIG_SENSORS_PCF8591=3Dy CONFIG_SENSORS_RTC8564=3Dy CONFIG_SENSORS_MAX6875=3Dy # CONFIG_RTC_X1205_I2C is not set CONFIG_I2C_DEBUG_CORE=3Dy CONFIG_I2C_DEBUG_ALGO=3Dy CONFIG_I2C_DEBUG_BUS=3Dy CONFIG_I2C_DEBUG_CHIP=3Dy # # Dallas's 1-wire bus # # CONFIG_W1 is not set # # Hardware Monitoring support # # CONFIG_HWMON is not set # CONFIG_HWMON_VID is not set # # Misc devices # # # Multimedia Capabilities Port drivers # # # Multimedia devices # # CONFIG_VIDEO_DEV is not set # # Digital Video Broadcasting Devices # # CONFIG_DVB is not set # # Graphics support # # CONFIG_FB is not set # # Sound # # CONFIG_SOUND is not set # # USB support # CONFIG_USB_ARCH_HAS_HCD=3Dy CONFIG_USB_ARCH_HAS_OHCI=3Dy # CONFIG_USB is not set # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # # # USB Gadget Support # # CONFIG_USB_GADGET is not set # # MMC/SD Card support # # CONFIG_MMC is not set # # InfiniBand support # # CONFIG_INFINIBAND is not set # # SN Devices # # # File systems # CONFIG_EXT2_FS=3Dy CONFIG_EXT2_FS_XATTR=3Dy CONFIG_EXT2_FS_POSIX_ACL=3Dy CONFIG_EXT2_FS_SECURITY=3Dy # CONFIG_EXT2_FS_XIP is not set # CONFIG_EXT3_FS is not set # CONFIG_JBD is not set CONFIG_FS_MBCACHE=3Dy # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=3Dy # CONFIG_XFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set CONFIG_INOTIFY=3Dy # CONFIG_QUOTA is not set CONFIG_DNOTIFY=3Dy # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set CONFIG_FUSE_FS=3Dy # # CD-ROM/DVD Filesystems # # CONFIG_ISO9660_FS is not set # CONFIG_UDF_FS is not set # # DOS/FAT/NT Filesystems # CONFIG_FAT_FS=3Dy CONFIG_MSDOS_FS=3Dy CONFIG_VFAT_FS=3Dy CONFIG_FAT_DEFAULT_CODEPAGE=3D437 CONFIG_FAT_DEFAULT_IOCHARSET=3D"iso8859-1" # CONFIG_NTFS_FS is not set # # Pseudo filesystems # CONFIG_PROC_FS=3Dy CONFIG_PROC_KCORE=3Dy CONFIG_SYSFS=3Dy # CONFIG_TMPFS is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=3Dy # CONFIG_RELAYFS_FS is not set # # Miscellaneous filesystems # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set # # Network File Systems # CONFIG_NFS_FS=3Dy CONFIG_NFS_V3=3Dy # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set CONFIG_ROOT_NFS=3Dy CONFIG_LOCKD=3Dy CONFIG_LOCKD_V4=3Dy CONFIG_NFS_COMMON=3Dy CONFIG_SUNRPC=3Dy # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set # CONFIG_9P_FS is not set # # Partition Types # # CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=3Dy # # Native Language Support # CONFIG_NLS=3Dy CONFIG_NLS_DEFAULT=3D"iso8859-1" # CONFIG_NLS_CODEPAGE_437 is not set # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set # CONFIG_NLS_CODEPAGE_852 is not set # CONFIG_NLS_CODEPAGE_855 is not set # CONFIG_NLS_CODEPAGE_857 is not set # CONFIG_NLS_CODEPAGE_860 is not set # CONFIG_NLS_CODEPAGE_861 is not set # CONFIG_NLS_CODEPAGE_862 is not set # CONFIG_NLS_CODEPAGE_863 is not set # CONFIG_NLS_CODEPAGE_864 is not set # CONFIG_NLS_CODEPAGE_865 is not set # CONFIG_NLS_CODEPAGE_866 is not set # CONFIG_NLS_CODEPAGE_869 is not set # CONFIG_NLS_CODEPAGE_936 is not set # CONFIG_NLS_CODEPAGE_950 is not set # CONFIG_NLS_CODEPAGE_932 is not set # CONFIG_NLS_CODEPAGE_949 is not set # CONFIG_NLS_CODEPAGE_874 is not set # CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ASCII is not set # CONFIG_NLS_ISO8859_1 is not set # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set # CONFIG_NLS_ISO8859_5 is not set # CONFIG_NLS_ISO8859_6 is not set # CONFIG_NLS_ISO8859_7 is not set # CONFIG_NLS_ISO8859_9 is not set # CONFIG_NLS_ISO8859_13 is not set # CONFIG_NLS_ISO8859_14 is not set # CONFIG_NLS_ISO8859_15 is not set # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set # CONFIG_NLS_UTF8 is not set # # Profiling support # # CONFIG_PROFILING is not set # # Kernel hacking # CONFIG_PRINTK_TIME=3Dy CONFIG_DEBUG_KERNEL=3Dy CONFIG_MAGIC_SYSRQ=3Dy CONFIG_LOG_BUF_SHIFT=3D16 CONFIG_DETECT_SOFTLOCKUP=3Dy # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_KOBJECT is not set # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_FS is not set # CONFIG_DEBUG_VM is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_CROSSCOMPILE=3Dy CONFIG_CMDLINE=3D"" # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_KGDB is not set # CONFIG_SB1XXX_CORELIS is not set # CONFIG_RUNTIME_DEBUG is not set # # Security options # CONFIG_KEYS=3Dy CONFIG_KEYS_DEBUG_PROC_KEYS=3Dy # CONFIG_SECURITY is not set # # Cryptographic options # CONFIG_CRYPTO=3Dy CONFIG_CRYPTO_HMAC=3Dy CONFIG_CRYPTO_NULL=3Dy CONFIG_CRYPTO_MD4=3Dy CONFIG_CRYPTO_MD5=3Dy CONFIG_CRYPTO_SHA1=3Dy CONFIG_CRYPTO_SHA256=3Dy CONFIG_CRYPTO_SHA512=3Dy CONFIG_CRYPTO_WP512=3Dm CONFIG_CRYPTO_TGR192=3Dm CONFIG_CRYPTO_DES=3Dy CONFIG_CRYPTO_BLOWFISH=3Dy CONFIG_CRYPTO_TWOFISH=3Dy CONFIG_CRYPTO_SERPENT=3Dy CONFIG_CRYPTO_AES=3Dm # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set CONFIG_CRYPTO_TEA=3Dm # CONFIG_CRYPTO_ARC4 is not set CONFIG_CRYPTO_KHAZAD=3Dm CONFIG_CRYPTO_ANUBIS=3Dm CONFIG_CRYPTO_DEFLATE=3Dy CONFIG_CRYPTO_MICHAEL_MIC=3Dy # CONFIG_CRYPTO_CRC32C is not set # CONFIG_CRYPTO_TEST is not set # # Hardware crypto devices # # # Library routines # # CONFIG_CRC_CCITT is not set # CONFIG_CRC16 is not set CONFIG_CRC32=3Dy # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=3Dy CONFIG_ZLIB_DEFLATE=3Dy ------_=_NextPart_001_01C65F4D.8DC96563 Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Kernel= : Linux 2.6.15

Target= : mips (32bit, big endian), SMP 4way (2way also crashes)

preemp= tion model =3D server (least preempt), do not preempt the big kernel cras= h

Board:= Broadcom 1480B

How to= reproduce: I made a bash script which awks a file line by line…

      =   while true; do

      =           echo “crash me…”

      =           ls

      =   done

The ne= ither the ‘echo’ or ‘ls’ commands are necessary. = Originally I would see it crash in a bash script which calls awk, or duri= ng the init sciprts sometimes. The above script causes it to crash within= a minute every time I have run it.

[42949= 09.579000] BUG: soft lockup detected on CPU#0!

[42949= 09.579000] Cpu 0

[42949= 09.579000] $ 0   : 00000000 30001f00 00000002 00000000

[42949= 09.579000] $ 4   : 30001f01 b00260c8 0f0f0f0f 00000004

[42949= 09.579000] $ 8   : 00000000 1000001e 70000053 00000063

[42949= 09.579000] $12   : 7fca0010 00000004 00000000 00000004

[42949= 09.579000] $16   : 00000004 00000003 00000000 00000001

[42949= 09.579000] $20   : 8010e398 8f949dc8 8f93be20 00000000

[42949= 09.579000] $24   : 00000000 2aabb750

[42949= 09.579000] $28   : 8f948000 8f949d70 2ab0dd0b 8010b2f8

[42949= 09.579000] Hi    : 00000000

[42949= 09.579000] Lo    : 0000000c

[42949= 09.579000] epc   : 8010b314 smp_call_function+0x11c/0x1bc =     Not tainted

[42949= 09.579000] ra    : 8010b2f8 smp_call_function+0x100/0x1bc<= /FONT>

[42949= 09.579000] Status: 30001f03    KERNEL EXL IE=

[42949= 09.579000] Cause : 00809000

[42949= 09.579000] PrId  : 01041100

With 8= 010e398 being sb1_flush_icache_page_ipi()

Thank,=

Adam S= cislowicz

-- ker= nel .config

#

# Auto= matically generated make config: don't edit

# Linu= x kernel version: 2.6.15

# Wed = Apr 12 13:52:44 2006

#

CONFIG= _MIPS=3Dy

#

# Mach= ine selection

#

# CONF= IG_MIPS_MTX1 is not set

# CONF= IG_MIPS_BOSPORUS is not set

# CONF= IG_MIPS_PB1000 is not set

# CONF= IG_MIPS_PB1100 is not set

# CONF= IG_MIPS_PB1500 is not set

# CONF= IG_MIPS_PB1550 is not set

# CONF= IG_MIPS_PB1200 is not set

# CONF= IG_MIPS_DB1000 is not set

# CONF= IG_MIPS_DB1100 is not set

# CONF= IG_MIPS_DB1500 is not set

# CONF= IG_MIPS_DB1550 is not set

# CONF= IG_MIPS_DB1200 is not set

# CONF= IG_MIPS_MIRAGE is not set

# CONF= IG_MIPS_COBALT is not set

# CONF= IG_MACH_DECSTATION is not set

# CONF= IG_MIPS_EV64120 is not set

# CONF= IG_MIPS_EV96100 is not set

# CONF= IG_MIPS_IVR is not set

# CONF= IG_MIPS_ITE8172 is not set

# CONF= IG_MACH_JAZZ is not set

# CONF= IG_LASAT is not set

# CONF= IG_MIPS_ATLAS is not set

# CONF= IG_MIPS_MALTA is not set

# CONF= IG_MIPS_SEAD is not set

# CONF= IG_MIPS_SIM is not set

# CONF= IG_MOMENCO_JAGUAR_ATX is not set

# CONF= IG_MOMENCO_OCELOT is not set

# CONF= IG_MOMENCO_OCELOT_3 is not set

# CONF= IG_MOMENCO_OCELOT_C is not set

# CONF= IG_MOMENCO_OCELOT_G is not set

# CONF= IG_MIPS_XXS1500 is not set

# CONF= IG_PNX8550_V2PCI is not set

# CONF= IG_PNX8550_JBS is not set

# CONF= IG_DDB5074 is not set

# CONF= IG_DDB5476 is not set

# CONF= IG_DDB5477 is not set

# CONF= IG_MACH_VR41XX is not set

# CONF= IG_PMC_YOSEMITE is not set

# CONF= IG_QEMU is not set

# CONF= IG_SGI_IP22 is not set

# CONF= IG_SGI_IP27 is not set

# CONF= IG_SGI_IP32 is not set

CONFIG= _SIBYTE_BIGSUR=3Dy

# CONF= IG_SIBYTE_SWARM is not set

# CONF= IG_SIBYTE_SENTOSA is not set

# CONF= IG_SIBYTE_RHONE is not set

# CONF= IG_SIBYTE_CARMEL is not set

# CONF= IG_SIBYTE_PTSWARM is not set

# CONF= IG_SIBYTE_LITTLESUR is not set

# CONF= IG_SIBYTE_CRHINE is not set

# CONF= IG_SIBYTE_CRHONE is not set

# CONF= IG_SNI_RM200_PCI is not set

# CONF= IG_TOSHIBA_JMR3927 is not set

# CONF= IG_TOSHIBA_RBTX4927 is not set

# CONF= IG_TOSHIBA_RBTX4938 is not set

CONFIG= _SIBYTE_BCM1x80=3Dy

CONFIG= _SIBYTE_SB1xxx_SOC=3Dy

# CONF= IG_CPU_SB1_PASS_1 is not set

# CONF= IG_CPU_SB1_PASS_2_1250 is not set

# CONF= IG_CPU_SB1_PASS_2_2 is not set

# CONF= IG_CPU_SB1_PASS_4 is not set

# CONF= IG_CPU_SB1_PASS_2_112x is not set

# CONF= IG_CPU_SB1_PASS_3 is not set

# CONF= IG_SIMULATION is not set

# CONF= IG_SB1_CEX_ALWAYS_FATAL is not set

# CONF= IG_SB1_CERR_STALL is not set

CONFIG= _SIBYTE_CFE=3Dy

# CONF= IG_SIBYTE_CFE_CONSOLE is not set

# CONF= IG_SIBYTE_BUS_WATCHER is not set

# CONF= IG_SIBYTE_SB1250_PROF is not set

# CONF= IG_SIBYTE_TBPROF is not set

CONFIG= _RWSEM_GENERIC_SPINLOCK=3Dy

CONFIG= _GENERIC_CALIBRATE_DELAY=3Dy

CONFIG= _DMA_COHERENT=3Dy

CONFIG= _CPU_BIG_ENDIAN=3Dy

# CONF= IG_CPU_LITTLE_ENDIAN is not set

CONFIG= _SYS_SUPPORTS_BIG_ENDIAN=3Dy

CONFIG= _SYS_SUPPORTS_LITTLE_ENDIAN=3Dy

CONFIG= _SWAP_IO_SPACE=3Dy

CONFIG= _BOOT_ELF32=3Dy

CONFIG= _MIPS_L1_CACHE_SHIFT=3D5

#

# CPU = selection

#

# CONF= IG_CPU_MIPS32_R1 is not set

# CONF= IG_CPU_MIPS32_R2 is not set

# CONF= IG_CPU_MIPS64_R1 is not set

# CONF= IG_CPU_MIPS64_R2 is not set

# CONF= IG_CPU_R3000 is not set

# CONF= IG_CPU_TX39XX is not set

# CONF= IG_CPU_VR41XX is not set

# CONF= IG_CPU_R4300 is not set

# CONF= IG_CPU_R4X00 is not set

# CONF= IG_CPU_TX49XX is not set

# CONF= IG_CPU_R5000 is not set

# CONF= IG_CPU_R5432 is not set

# CONF= IG_CPU_R6000 is not set

# CONF= IG_CPU_NEVADA is not set

# CONF= IG_CPU_R8000 is not set

# CONF= IG_CPU_R10000 is not set

# CONF= IG_CPU_RM7000 is not set

# CONF= IG_CPU_RM9000 is not set

CONFIG= _CPU_SB1=3Dy

CONFIG= _SYS_HAS_CPU_SB1=3Dy

CONFIG= _SYS_SUPPORTS_32BIT_KERNEL=3Dy

CONFIG= _SYS_SUPPORTS_64BIT_KERNEL=3Dy

CONFIG= _CPU_SUPPORTS_32BIT_KERNEL=3Dy

CONFIG= _CPU_SUPPORTS_64BIT_KERNEL=3Dy

#

# Kern= el type

#

CONFIG= _32BIT=3Dy

# CONF= IG_64BIT is not set

CONFIG= _PAGE_SIZE_4KB=3Dy

# CONF= IG_PAGE_SIZE_8KB is not set

# CONF= IG_PAGE_SIZE_16KB is not set

# CONF= IG_PAGE_SIZE_64KB is not set

# CONF= IG_SIBYTE_DMA_PAGEOPS is not set

# CONF= IG_MIPS_MT is not set

# CONF= IG_64BIT_PHYS_ADDR is not set

# CONF= IG_CPU_ADVANCED is not set

CONFIG= _CPU_HAS_LLSC=3Dy

CONFIG= _CPU_HAS_SYNC=3Dy

CONFIG= _GENERIC_HARDIRQS=3Dy

CONFIG= _GENERIC_IRQ_PROBE=3Dy

CONFIG= _CPU_SUPPORTS_HIGHMEM=3Dy

CONFIG= _ARCH_FLATMEM_ENABLE=3Dy

CONFIG= _SELECT_MEMORY_MODEL=3Dy

CONFIG= _FLATMEM_MANUAL=3Dy

# CONF= IG_DISCONTIGMEM_MANUAL is not set

# CONF= IG_SPARSEMEM_MANUAL is not set

CONFIG= _FLATMEM=3Dy

CONFIG= _FLAT_NODE_MEM_MAP=3Dy

# CONF= IG_SPARSEMEM_STATIC is not set

CONFIG= _SPLIT_PTLOCK_CPUS=3D4

CONFIG= _SMP=3Dy

CONFIG= _NR_CPUS=3D4

CONFIG= _PREEMPT_NONE=3Dy

# CONF= IG_PREEMPT_VOLUNTARY is not set

# CONF= IG_PREEMPT is not set

# CONF= IG_PREEMPT_BKL is not set

#

# Code= maturity level options

#

CONFIG= _EXPERIMENTAL=3Dy

CONFIG= _CLEAN_COMPILE=3Dy

CONFIG= _LOCK_KERNEL=3Dy

CONFIG= _INIT_ENV_ARG_LIMIT=3D32

#

# Gene= ral setup

#

CONFIG= _LOCALVERSION=3D""

CONFIG= _LOCALVERSION_AUTO=3Dy

CONFIG= _SWAP=3Dy

CONFIG= _SYSVIPC=3Dy

# CONF= IG_POSIX_MQUEUE is not set

# CONF= IG_BSD_PROCESS_ACCT is not set

CONFIG= _SYSCTL=3Dy

# CONF= IG_AUDIT is not set

CONFIG= _HOTPLUG=3Dy

CONFIG= _KOBJECT_UEVENT=3Dy

CONFIG= _IKCONFIG=3Dy

CONFIG= _IKCONFIG_PROC=3Dy

# CONF= IG_CPUSETS is not set

CONFIG= _INITRAMFS_SOURCE=3D""

# CONF= IG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG= _EMBEDDED=3Dy

CONFIG= _KALLSYMS=3Dy

# CONF= IG_KALLSYMS_ALL is not set

# CONF= IG_KALLSYMS_EXTRA_PASS is not set

CONFIG= _PRINTK=3Dy

CONFIG= _BUG=3Dy

CONFIG= _BASE_FULL=3Dy

CONFIG= _FUTEX=3Dy

CONFIG= _EPOLL=3Dy

CONFIG= _SHMEM=3Dy

CONFIG= _CC_ALIGN_FUNCTIONS=3D0

CONFIG= _CC_ALIGN_LABELS=3D0

CONFIG= _CC_ALIGN_LOOPS=3D0

CONFIG= _CC_ALIGN_JUMPS=3D0

# CONF= IG_TINY_SHMEM is not set

CONFIG= _BASE_SMALL=3D0

#

# Load= able module support

#

CONFIG= _MODULES=3Dy

CONFIG= _MODULE_UNLOAD=3Dy

# CONF= IG_MODULE_FORCE_UNLOAD is not set

CONFIG= _OBSOLETE_MODPARM=3Dy

CONFIG= _MODVERSIONS=3Dy

CONFIG= _MODULE_SRCVERSION_ALL=3Dy

CONFIG= _KMOD=3Dy

CONFIG= _STOP_MACHINE=3Dy

#

# Bloc= k layer

#

# CONF= IG_LBD is not set

#

# IO S= chedulers

#

CONFIG= _IOSCHED_NOOP=3Dy

CONFIG= _IOSCHED_AS=3Dy

CONFIG= _IOSCHED_DEADLINE=3Dy

CONFIG= _IOSCHED_CFQ=3Dy

CONFIG= _DEFAULT_AS=3Dy

# CONF= IG_DEFAULT_DEADLINE is not set

# CONF= IG_DEFAULT_CFQ is not set

# CONF= IG_DEFAULT_NOOP is not set

CONFIG= _DEFAULT_IOSCHED=3D"anticipatory"

#

# Bus = options (PCI, PCMCIA, EISA, ISA, TC)

#

CONFIG= _HW_HAS_PCI=3Dy

CONFIG= _PCI=3Dy

CONFIG= _PCI_DOMAINS=3Dy

CONFIG= _PCI_LEGACY_PROC=3Dy

CONFIG= _PCI_DEBUG=3Dy

CONFIG= _MMU=3Dy

#

# PCCA= RD (PCMCIA/CardBus) support

#

CONFIG= _PCCARD=3Dy

# CONF= IG_PCMCIA_DEBUG is not set

CONFIG= _PCMCIA=3Dy

CONFIG= _PCMCIA_LOAD_CIS=3Dy

CONFIG= _PCMCIA_IOCTL=3Dy

# CONF= IG_CARDBUS is not set

#

# PC-c= ard bridges

#

# CONF= IG_YENTA is not set

# CONF= IG_PD6729 is not set

# CONF= IG_I82092 is not set

#

# PCI = Hotplug Support

#

# CONF= IG_HOTPLUG_PCI is not set

#

# Exec= utable file formats

#

CONFIG= _BINFMT_ELF=3Dy

# CONF= IG_BINFMT_MISC is not set

CONFIG= _TRAD_SIGNALS=3Dy

#

# Netw= orking

#

CONFIG= _NET=3Dy

#

# Netw= orking options

#

CONFIG= _PACKET=3Dy

CONFIG= _PACKET_MMAP=3Dy

CONFIG= _UNIX=3Dy

CONFIG= _XFRM=3Dy

CONFIG= _XFRM_USER=3Dm

CONFIG= _NET_KEY=3Dy

CONFIG= _INET=3Dy

# CONF= IG_IP_MULTICAST is not set

# CONF= IG_IP_ADVANCED_ROUTER is not set

CONFIG= _IP_FIB_HASH=3Dy

CONFIG= _IP_PNP=3Dy

CONFIG= _IP_PNP_DHCP=3Dy

CONFIG= _IP_PNP_BOOTP=3Dy

# CONF= IG_IP_PNP_RARP is not set

# CONF= IG_NET_IPIP is not set

# CONF= IG_NET_IPGRE is not set

# CONF= IG_ARPD is not set

# CONF= IG_SYN_COOKIES is not set

# CONF= IG_INET_AH is not set

# CONF= IG_INET_ESP is not set

# CONF= IG_INET_IPCOMP is not set

CONFIG= _INET_TUNNEL=3Dm

CONFIG= _INET_DIAG=3Dy

CONFIG= _INET_TCP_DIAG=3Dy

# CONF= IG_TCP_CONG_ADVANCED is not set

CONFIG= _TCP_CONG_BIC=3Dy

# CONF= IG_IPV6 is not set

# CONF= IG_NETFILTER is not set

#

# DCCP= Configuration (EXPERIMENTAL)

#

# CONF= IG_IP_DCCP is not set

#

# SCTP= Configuration (EXPERIMENTAL)

#

# CONF= IG_IP_SCTP is not set

# CONF= IG_ATM is not set

# CONF= IG_BRIDGE is not set

# CONF= IG_VLAN_8021Q is not set

# CONF= IG_DECNET is not set

# CONF= IG_LLC2 is not set

# CONF= IG_IPX is not set

# CONF= IG_ATALK is not set

# CONF= IG_X25 is not set

# CONF= IG_LAPB is not set

# CONF= IG_NET_DIVERT is not set

# CONF= IG_ECONET is not set

# CONF= IG_WAN_ROUTER is not set

#

# QoS = and/or fair queueing

#

# CONF= IG_NET_SCHED is not set

#

# Netw= ork testing

#

# CONF= IG_NET_PKTGEN is not set

# CONF= IG_HAMRADIO is not set

# CONF= IG_IRDA is not set

# CONF= IG_BT is not set

# CONF= IG_IEEE80211 is not set

#

# Devi= ce Drivers

#

#

# Gene= ric Driver Options

#

CONFIG= _STANDALONE=3Dy

CONFIG= _PREVENT_FIRMWARE_BUILD=3Dy

CONFIG= _FW_LOADER=3Dy

# CONF= IG_DEBUG_DRIVER is not set

#

# Conn= ector - unified userspace <-> kernelspace linker

#

# CONF= IG_CONNECTOR is not set

#

# Memo= ry Technology Devices (MTD)

#

# CONF= IG_MTD is not set

#

# Para= llel port support

#

# CONF= IG_PARPORT is not set

#

# Plug= and Play support

#

#

# Bloc= k devices

#

# CONF= IG_BLK_CPQ_DA is not set

# CONF= IG_BLK_CPQ_CISS_DA is not set

# CONF= IG_BLK_DEV_DAC960 is not set

# CONF= IG_BLK_DEV_UMEM is not set

# CONF= IG_BLK_DEV_COW_COMMON is not set

CONFIG= _BLK_DEV_LOOP=3Dy

# CONF= IG_BLK_DEV_CRYPTOLOOP is not set

CONFIG= _BLK_DEV_NBD=3Dm

# CONF= IG_BLK_DEV_SX8 is not set

CONFIG= _BLK_DEV_RAM=3Dy

CONFIG= _BLK_DEV_RAM_COUNT=3D16

CONFIG= _BLK_DEV_RAM_SIZE=3D65536

CONFIG= _BLK_DEV_INITRD=3Dy

# CONF= IG_CDROM_PKTCDVD is not set

# CONF= IG_ATA_OVER_ETH is not set

#

# ATA/= ATAPI/MFM/RLL support

#

CONFIG= _IDE=3Dy

CONFIG= _BLK_DEV_IDE=3Dy

#

# Plea= se see Documentation/ide.txt for help/info on IDE drives

#

# CONF= IG_BLK_DEV_IDE_SATA is not set

CONFIG= _BLK_DEV_IDEDISK=3Dy

# CONF= IG_IDEDISK_MULTI_MODE is not set

CONFIG= _BLK_DEV_IDECS=3Dy

CONFIG= _BLK_DEV_IDECD=3Dy

CONFIG= _BLK_DEV_IDETAPE=3Dy

CONFIG= _BLK_DEV_IDEFLOPPY=3Dy

# CONF= IG_IDE_TASK_IOCTL is not set

#

# IDE = chipset support/bugfixes

#

CONFIG= _IDE_GENERIC=3Dy

# CONF= IG_BLK_DEV_IDEPCI is not set

# CONF= IG_BLK_DEV_IDE_SWARM is not set

# CONF= IG_IDE_ARM is not set

# CONF= IG_BLK_DEV_IDEDMA is not set

# CONF= IG_IDEDMA_AUTO is not set

# CONF= IG_BLK_DEV_HD is not set

#

# SCSI= device support

#

# CONF= IG_RAID_ATTRS is not set

# CONF= IG_SCSI is not set

#

# Mult= i-device support (RAID and LVM)

#

# CONF= IG_MD is not set

#

# Fusi= on MPT device support

#

# CONF= IG_FUSION is not set

#

# IEEE= 1394 (FireWire) support

#

# CONF= IG_IEEE1394 is not set

#

# I2O = device support

#

# CONF= IG_I2O is not set

#

# Netw= ork device support

#

CONFIG= _NETDEVICES=3Dy

# CONF= IG_DUMMY is not set

# CONF= IG_BONDING is not set

# CONF= IG_EQUALIZER is not set

# CONF= IG_TUN is not set

#

# ARCn= et devices

#

# CONF= IG_ARCNET is not set

#

# PHY = device support

#

# CONF= IG_PHYLIB is not set

#

# Ethe= rnet (10 or 100Mbit)

#

CONFIG= _NET_ETHERNET=3Dy

CONFIG= _MII=3Dy

# CONF= IG_HAPPYMEAL is not set

# CONF= IG_SUNGEM is not set

# CONF= IG_CASSINI is not set

# CONF= IG_NET_VENDOR_3COM is not set

#

# Tuli= p family network device support

#

# CONF= IG_NET_TULIP is not set

# CONF= IG_HP100 is not set

# CONF= IG_NET_PCI is not set

#

# Ethe= rnet (1000 Mbit)

#

# CONF= IG_ACENIC is not set

# CONF= IG_DL2K is not set

# CONF= IG_E1000 is not set

# CONF= IG_NS83820 is not set

# CONF= IG_HAMACHI is not set

# CONF= IG_YELLOWFIN is not set

# CONF= IG_R8169 is not set

CONFIG= _NET_SB1250_MAC=3Dy

# CONF= IG_SIS190 is not set

# CONF= IG_SKGE is not set

# CONF= IG_SK98LIN is not set

# CONF= IG_TIGON3 is not set

# CONF= IG_BNX2 is not set

#

# Ethe= rnet (10000 Mbit)

#

# CONF= IG_CHELSIO_T1 is not set

# CONF= IG_IXGB is not set

# CONF= IG_S2IO is not set

#

# Toke= n Ring devices

#

# CONF= IG_TR is not set

#

# Wire= less LAN (non-hamradio)

#

# CONF= IG_NET_RADIO is not set

#

# PCMC= IA network device support

#

# CONF= IG_NET_PCMCIA is not set

#

# Wan = interfaces

#

# CONF= IG_WAN is not set

# CONF= IG_FDDI is not set

# CONF= IG_HIPPI is not set

# CONF= IG_PPP is not set

# CONF= IG_SLIP is not set

# CONF= IG_SHAPER is not set

# CONF= IG_NETCONSOLE is not set

# CONF= IG_NETPOLL is not set

# CONF= IG_NET_POLL_CONTROLLER is not set

#

# ISDN= subsystem

#

# CONF= IG_ISDN is not set

#

# Tele= phony Support

#

# CONF= IG_PHONE is not set

#

# Inpu= t device support

#

# CONF= IG_INPUT is not set

#

# Hard= ware I/O ports

#

CONFIG= _SERIO=3Dy

# CONF= IG_SERIO_I8042 is not set

CONFIG= _SERIO_SERPORT=3Dy

# CONF= IG_SERIO_PCIPS2 is not set

# CONF= IG_SERIO_LIBPS2 is not set

CONFIG= _SERIO_RAW=3Dm

# CONF= IG_GAMEPORT is not set

#

# Char= acter devices

#

# CONF= IG_VT is not set

CONFIG= _SERIAL_NONSTANDARD=3Dy

# CONF= IG_ROCKETPORT is not set

# CONF= IG_CYCLADES is not set

# CONF= IG_DIGIEPCA is not set

# CONF= IG_MOXA_SMARTIO is not set

# CONF= IG_ISI is not set

# CONF= IG_SYNCLINKMP is not set

# CONF= IG_N_HDLC is not set

# CONF= IG_SPECIALIX is not set

# CONF= IG_SX is not set

# CONF= IG_STALDRV is not set

CONFIG= _SIBYTE_SB1250_DUART=3Dy

CONFIG= _SIBYTE_SB1250_DUART_CONSOLE=3Dy

#

# Seri= al drivers

#

# CONF= IG_SERIAL_8250 is not set

#

# Non-= 8250 serial port support

#

# CONF= IG_SERIAL_JSM is not set

CONFIG= _UNIX98_PTYS=3Dy

CONFIG= _LEGACY_PTYS=3Dy

CONFIG= _LEGACY_PTY_COUNT=3D256

#

# IPMI=

#

# CONF= IG_IPMI_HANDLER is not set

#

# Watc= hdog Cards

#

# CONF= IG_WATCHDOG is not set

# CONF= IG_RTC is not set

CONFIG= _GEN_RTC=3Dy

# CONF= IG_GEN_RTC_X is not set

# CONF= IG_DTLK is not set

# CONF= IG_R3964 is not set

# CONF= IG_APPLICOM is not set

#

# Ftap= e, the floppy tape device driver

#

# CONF= IG_DRM is not set

#

# PCMC= IA character devices

#

# CONF= IG_SYNCLINK_CS is not set

# CONF= IG_CARDMAN_4000 is not set

# CONF= IG_CARDMAN_4040 is not set

# CONF= IG_RAW_DRIVER is not set

#

# TPM = devices

#

# CONF= IG_TCG_TPM is not set

# CONF= IG_TELCLOCK is not set

#

# I2C = support

#

CONFIG= _I2C=3Dy

CONFIG= _I2C_CHARDEV=3Dy

#

# I2C = Algorithms

#

# CONF= IG_I2C_ALGOBIT is not set

# CONF= IG_I2C_ALGOPCF is not set

# CONF= IG_I2C_ALGOPCA is not set

CONFIG= _I2C_ALGO_SIBYTE=3Dy

#

# I2C = Hardware Bus support

#

# CONF= IG_I2C_ALI1535 is not set

# CONF= IG_I2C_ALI1563 is not set

# CONF= IG_I2C_ALI15X3 is not set

# CONF= IG_I2C_AMD756 is not set

# CONF= IG_I2C_AMD8111 is not set

# CONF= IG_I2C_I801 is not set

# CONF= IG_I2C_I810 is not set

# CONF= IG_I2C_PIIX4 is not set

# CONF= IG_I2C_NFORCE2 is not set

# CONF= IG_I2C_PARPORT_LIGHT is not set

# CONF= IG_I2C_PROSAVAGE is not set

# CONF= IG_I2C_SAVAGE4 is not set

CONFIG= _I2C_SIBYTE=3Dy

# CONF= IG_SCx200_ACB is not set

# CONF= IG_I2C_SIS5595 is not set

# CONF= IG_I2C_SIS630 is not set

# CONF= IG_I2C_SIS96X is not set

# CONF= IG_I2C_STUB is not set

# CONF= IG_I2C_VIA is not set

# CONF= IG_I2C_VIAPRO is not set

# CONF= IG_I2C_VOODOO3 is not set

# CONF= IG_I2C_PCA_ISA is not set

#

# Misc= ellaneous I2C Chip support

#

CONFIG= _SENSORS_DS1337=3Dy

CONFIG= _SENSORS_DS1374=3Dy

CONFIG= _SENSORS_EEPROM=3Dy

CONFIG= _SENSORS_PCF8574=3Dy

CONFIG= _SENSORS_PCA9539=3Dy

CONFIG= _SENSORS_PCF8591=3Dy

CONFIG= _SENSORS_RTC8564=3Dy

CONFIG= _SENSORS_MAX6875=3Dy

# CONF= IG_RTC_X1205_I2C is not set

CONFIG= _I2C_DEBUG_CORE=3Dy

CONFIG= _I2C_DEBUG_ALGO=3Dy

CONFIG= _I2C_DEBUG_BUS=3Dy

CONFIG= _I2C_DEBUG_CHIP=3Dy

#

# Dall= as's 1-wire bus

#

# CONF= IG_W1 is not set

#

# Hard= ware Monitoring support

#

# CONF= IG_HWMON is not set

# CONF= IG_HWMON_VID is not set

#

# Misc= devices

#

#

# Mult= imedia Capabilities Port drivers

#

#

# Mult= imedia devices

#

# CONF= IG_VIDEO_DEV is not set

#

# Digi= tal Video Broadcasting Devices

#

# CONF= IG_DVB is not set

#

# Grap= hics support

#

# CONF= IG_FB is not set

#

# Soun= d

#

# CONF= IG_SOUND is not set

#

# USB = support

#

CONFIG= _USB_ARCH_HAS_HCD=3Dy

CONFIG= _USB_ARCH_HAS_OHCI=3Dy

# CONF= IG_USB is not set

#

# NOTE= : USB_STORAGE enables SCSI, and 'SCSI disk support'

#

#

# USB = Gadget Support

#

# CONF= IG_USB_GADGET is not set

#

# MMC/= SD Card support

#

# CONF= IG_MMC is not set

#

# Infi= niBand support

#

# CONF= IG_INFINIBAND is not set

#

# SN D= evices

#

#

# File= systems

#

CONFIG= _EXT2_FS=3Dy

CONFIG= _EXT2_FS_XATTR=3Dy

CONFIG= _EXT2_FS_POSIX_ACL=3Dy

CONFIG= _EXT2_FS_SECURITY=3Dy

# CONF= IG_EXT2_FS_XIP is not set

# CONF= IG_EXT3_FS is not set

# CONF= IG_JBD is not set

CONFIG= _FS_MBCACHE=3Dy

# CONF= IG_REISERFS_FS is not set

# CONF= IG_JFS_FS is not set

CONFIG= _FS_POSIX_ACL=3Dy

# CONF= IG_XFS_FS is not set

# CONF= IG_MINIX_FS is not set

# CONF= IG_ROMFS_FS is not set

CONFIG= _INOTIFY=3Dy

# CONF= IG_QUOTA is not set

CONFIG= _DNOTIFY=3Dy

# CONF= IG_AUTOFS_FS is not set

# CONF= IG_AUTOFS4_FS is not set

CONFIG= _FUSE_FS=3Dy

#

# CD-R= OM/DVD Filesystems

#

# CONF= IG_ISO9660_FS is not set

# CONF= IG_UDF_FS is not set

#

# DOS/= FAT/NT Filesystems

#

CONFIG= _FAT_FS=3Dy

CONFIG= _MSDOS_FS=3Dy

CONFIG= _VFAT_FS=3Dy

CONFIG= _FAT_DEFAULT_CODEPAGE=3D437

CONFIG= _FAT_DEFAULT_IOCHARSET=3D"iso8859-1"

# CONF= IG_NTFS_FS is not set

#

# Pseu= do filesystems

#

CONFIG= _PROC_FS=3Dy

CONFIG= _PROC_KCORE=3Dy

CONFIG= _SYSFS=3Dy

# CONF= IG_TMPFS is not set

# CONF= IG_HUGETLB_PAGE is not set

CONFIG= _RAMFS=3Dy

# CONF= IG_RELAYFS_FS is not set

#

# Misc= ellaneous filesystems

#

# CONF= IG_ADFS_FS is not set

# CONF= IG_AFFS_FS is not set

# CONF= IG_HFS_FS is not set

# CONF= IG_HFSPLUS_FS is not set

# CONF= IG_BEFS_FS is not set

# CONF= IG_BFS_FS is not set

# CONF= IG_EFS_FS is not set

# CONF= IG_CRAMFS is not set

# CONF= IG_VXFS_FS is not set

# CONF= IG_HPFS_FS is not set

# CONF= IG_QNX4FS_FS is not set

# CONF= IG_SYSV_FS is not set

# CONF= IG_UFS_FS is not set

#

# Netw= ork File Systems

#

CONFIG= _NFS_FS=3Dy

CONFIG= _NFS_V3=3Dy

# CONF= IG_NFS_V3_ACL is not set

# CONF= IG_NFS_V4 is not set

# CONF= IG_NFS_DIRECTIO is not set

# CONF= IG_NFSD is not set

CONFIG= _ROOT_NFS=3Dy

CONFIG= _LOCKD=3Dy

CONFIG= _LOCKD_V4=3Dy

CONFIG= _NFS_COMMON=3Dy

CONFIG= _SUNRPC=3Dy

# CONF= IG_RPCSEC_GSS_KRB5 is not set

# CONF= IG_RPCSEC_GSS_SPKM3 is not set

# CONF= IG_SMB_FS is not set

# CONF= IG_CIFS is not set

# CONF= IG_NCP_FS is not set

# CONF= IG_CODA_FS is not set

# CONF= IG_AFS_FS is not set

# CONF= IG_9P_FS is not set

#

# Part= ition Types

#

# CONF= IG_PARTITION_ADVANCED is not set

CONFIG= _MSDOS_PARTITION=3Dy

#

# Nati= ve Language Support

#

CONFIG= _NLS=3Dy

CONFIG= _NLS_DEFAULT=3D"iso8859-1"

# CONF= IG_NLS_CODEPAGE_437 is not set

# CONF= IG_NLS_CODEPAGE_737 is not set

# CONF= IG_NLS_CODEPAGE_775 is not set

# CONF= IG_NLS_CODEPAGE_850 is not set

# CONF= IG_NLS_CODEPAGE_852 is not set

# CONF= IG_NLS_CODEPAGE_855 is not set

# CONF= IG_NLS_CODEPAGE_857 is not set

# CONF= IG_NLS_CODEPAGE_860 is not set

# CONF= IG_NLS_CODEPAGE_861 is not set

# CONF= IG_NLS_CODEPAGE_862 is not set

# CONF= IG_NLS_CODEPAGE_863 is not set

# CONF= IG_NLS_CODEPAGE_864 is not set

# CONF= IG_NLS_CODEPAGE_865 is not set

# CONF= IG_NLS_CODEPAGE_866 is not set

# CONF= IG_NLS_CODEPAGE_869 is not set

# CONF= IG_NLS_CODEPAGE_936 is not set

# CONF= IG_NLS_CODEPAGE_950 is not set

# CONF= IG_NLS_CODEPAGE_932 is not set

# CONF= IG_NLS_CODEPAGE_949 is not set

# CONF= IG_NLS_CODEPAGE_874 is not set

# CONF= IG_NLS_ISO8859_8 is not set

# CONF= IG_NLS_CODEPAGE_1250 is not set

# CONF= IG_NLS_CODEPAGE_1251 is not set

# CONF= IG_NLS_ASCII is not set

# CONF= IG_NLS_ISO8859_1 is not set

# CONF= IG_NLS_ISO8859_2 is not set

# CONF= IG_NLS_ISO8859_3 is not set

# CONF= IG_NLS_ISO8859_4 is not set

# CONF= IG_NLS_ISO8859_5 is not set

# CONF= IG_NLS_ISO8859_6 is not set

# CONF= IG_NLS_ISO8859_7 is not set

# CONF= IG_NLS_ISO8859_9 is not set

# CONF= IG_NLS_ISO8859_13 is not set

# CONF= IG_NLS_ISO8859_14 is not set

# CONF= IG_NLS_ISO8859_15 is not set

# CONF= IG_NLS_KOI8_R is not set

# CONF= IG_NLS_KOI8_U is not set

# CONF= IG_NLS_UTF8 is not set

#

# Prof= iling support

#

# CONF= IG_PROFILING is not set

#

# Kern= el hacking

#

CONFIG= _PRINTK_TIME=3Dy

CONFIG= _DEBUG_KERNEL=3Dy

CONFIG= _MAGIC_SYSRQ=3Dy

CONFIG= _LOG_BUF_SHIFT=3D16

CONFIG= _DETECT_SOFTLOCKUP=3Dy

# CONF= IG_SCHEDSTATS is not set

# CONF= IG_DEBUG_SLAB is not set

# CONF= IG_DEBUG_SPINLOCK is not set

# CONF= IG_DEBUG_SPINLOCK_SLEEP is not set

# CONF= IG_DEBUG_KOBJECT is not set

# CONF= IG_DEBUG_INFO is not set

# CONF= IG_DEBUG_FS is not set

# CONF= IG_DEBUG_VM is not set

# CONF= IG_RCU_TORTURE_TEST is not set

CONFIG= _CROSSCOMPILE=3Dy

CONFIG= _CMDLINE=3D""

# CONF= IG_DEBUG_STACK_USAGE is not set

# CONF= IG_KGDB is not set

# CONF= IG_SB1XXX_CORELIS is not set

# CONF= IG_RUNTIME_DEBUG is not set

#

# Secu= rity options

#

CONFIG= _KEYS=3Dy

CONFIG= _KEYS_DEBUG_PROC_KEYS=3Dy

# CONF= IG_SECURITY is not set

#

# Cryp= tographic options

#

CONFIG= _CRYPTO=3Dy

CONFIG= _CRYPTO_HMAC=3Dy

CONFIG= _CRYPTO_NULL=3Dy

CONFIG= _CRYPTO_MD4=3Dy

CONFIG= _CRYPTO_MD5=3Dy

CONFIG= _CRYPTO_SHA1=3Dy

CONFIG= _CRYPTO_SHA256=3Dy

CONFIG= _CRYPTO_SHA512=3Dy

CONFIG= _CRYPTO_WP512=3Dm

CONFIG= _CRYPTO_TGR192=3Dm

CONFIG= _CRYPTO_DES=3Dy

CONFIG= _CRYPTO_BLOWFISH=3Dy

CONFIG= _CRYPTO_TWOFISH=3Dy

CONFIG= _CRYPTO_SERPENT=3Dy

CONFIG= _CRYPTO_AES=3Dm

# CONF= IG_CRYPTO_CAST5 is not set

# CONF= IG_CRYPTO_CAST6 is not set

CONFIG= _CRYPTO_TEA=3Dm

# CONF= IG_CRYPTO_ARC4 is not set

CONFIG= _CRYPTO_KHAZAD=3Dm

CONFIG= _CRYPTO_ANUBIS=3Dm

CONFIG= _CRYPTO_DEFLATE=3Dy

CONFIG= _CRYPTO_MICHAEL_MIC=3Dy

# CONF= IG_CRYPTO_CRC32C is not set

# CONF= IG_CRYPTO_TEST is not set

#

# Hard= ware crypto devices

#

#

# Libr= ary routines

#

# CONF= IG_CRC_CCITT is not set

# CONF= IG_CRC16 is not set

CONFIG= _CRC32=3Dy

# CONF= IG_LIBCRC32C is not set

CONFIG= _ZLIB_INFLATE=3Dy

CONFIG= _ZLIB_DEFLATE=3Dy

= ------_=_NextPart_001_01C65F4D.8DC96563-- From geoffrey.levand@am.sony.com Fri Apr 14 03:51:59 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 14 Apr 2006 03:52:09 +0100 (BST) Received: from mail8.fw-bc.sony.com ([160.33.98.75]:10136 "EHLO mail8.fw-bc.sony.com") by ftp.linux-mips.org with ESMTP id S8133716AbWDNCv7 (ORCPT ); Fri, 14 Apr 2006 03:51:59 +0100 Received: from mail3.sjc.in.sel.sony.com (mail3.sjc.in.sel.sony.com [43.134.1.211]) by mail8.fw-bc.sony.com (8.12.11/8.12.11) with ESMTP id k3E33u8i001534; Fri, 14 Apr 2006 03:03:57 GMT Received: from [192.168.1.10] ([43.134.85.105]) by mail3.sjc.in.sel.sony.com (8.12.11/8.12.11) with ESMTP id k3E33unE022597; Fri, 14 Apr 2006 03:03:56 GMT Message-ID: <443F111C.2000302@am.sony.com> Date: Thu, 13 Apr 2006 20:03:56 -0700 From: Geoff Levand User-Agent: Mozilla Thunderbird 1.0.7-1.1.fc4 (X11/20050929) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Atsushi Nemoto CC: ralf@linux-mips.org, linux-mips@linux-mips.org Subject: Re: [PATCH] local_r4k_flush_cache_page fix References: <20060201.000356.25911337.anemo@mba.ocn.ne.jp> <20060313.182303.115641770.nemoto@toshiba-tops.co.jp> In-Reply-To: <20060313.182303.115641770.nemoto@toshiba-tops.co.jp> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11093 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: geoffrey.levand@am.sony.com Precedence: bulk X-list: linux-mips Nemoto-san, Your changes caused me some problems with linux-2.6.16.1 on tx4937: / # ps -A CPU 0 Unable to handle kernel paging request at virtual address 7fa99400, epc == 80031018, ra == 80030 Oops[#1]: Cpu 0 $ 0 : 00000000 10008401 7fa99400 7fa99400 $ 4 : 7fa99000 00000004 00000000 7fa9a000 $ 8 : 7fa99400 00000001 00000001 fffffff8 $12 : 00000006 00000000 00000000 2ace3bdc $16 : 7fa99000 81338de0 00000004 80290000 $20 : 7fa24278 87ea0000 00000000 81338de0 $24 : 00000050 800305ac $28 : 87e36000 87e37dd8 00000000 800318b0 Hi : ffffffe0 Lo : 00000002 epc : 80031018 tx49_blast_icache32_page_indexed+0x220/0x6c8 Not tainted ra : 800318b0 r4k_flush_cache_page+0x22c/0x274 Status: 10008403 KERNEL EXL IE Cause : 10000008 BadVA : 7fa99400 PrId : 00002d30 Modules linked in: Process ps (pid: 23, threadinfo=87e36000, task=8124a468) Stack : 00000010 87e37e38 87e37e34 87e37ea8 813495f4 7fa99fc4 000013b4 87ea0000 0000001b 0000001b 7fa99fc4 813b4fc4 800520c4 80051f94 00000000 00000001 00000001 800a8194 00000000 00000001 87e37e30 87e37e34 81027680 813495f4 87ea0000 81338e14 0000001b 81338de0 00000000 87ea0000 7fa24278 81157898 00000000 1010e140 10008bcc 800d1ca0 81157898 8114c2dc 7fa24278 87e37f18 ... Call Trace: [<800520c4>] access_process_vm+0x1cc/0x200 [<80051f94>] access_process_vm+0x9c/0x200 [<800a8194>] __path_lookup_intent_open+0x60/0xc8 [<800d1ca0>] proc_pid_cmdline+0x6c/0x11c [<800d272c>] proc_info_read+0x78/0xd0 [<8004e4d0>] tasklet_action+0xc8/0x1a4 [<80090da8>] vfs_read+0xa8/0x1bc [<80090d80>] vfs_read+0x80/0x1bc [<80091228>] sys_read+0x54/0xa0 [<8009026c>] do_sys_open+0x11c/0x16c [<8002c624>] stack_done+0x20/0x3c Code: 24880400 0800c427 01001821 bc400020 bc400040 bc400060 bc400080 bc4000a0 Segmentation fault The revert below seemed to make it work. -Geoff Index: 2.6.16.1/arch/mips/mm/c-r4k.c =================================================================== --- 2.6.16.1.orig/arch/mips/mm/c-r4k.c 2006-03-19 21:53:29.000000000 -0800 +++ 2.6.16.1/arch/mips/mm/c-r4k.c 2006-04-13 19:39:02.000000000 -0700 @@ -383,7 +383,6 @@ struct flush_cache_page_args *fcp_args = args; struct vm_area_struct *vma = fcp_args->vma; unsigned long addr = fcp_args->addr; - unsigned long paddr = fcp_args->pfn << PAGE_SHIFT; int exec = vma->vm_flags & VM_EXEC; struct mm_struct *mm = vma->vm_mm; pgd_t *pgdp; @@ -433,11 +432,11 @@ * Do indexed flush, too much work to get the (possible) TLB refills * to work correctly. */ + addr = INDEX_BASE + (addr & (dcache_size - 1)); if (cpu_has_dc_aliases || (exec && !cpu_has_ic_fills_f_dc)) { - r4k_blast_dcache_page_indexed(cpu_has_pindexed_dcache ? - paddr : addr); + r4k_blast_dcache_page_indexed(addr); if (exec && !cpu_icache_snoops_remote_store) { - r4k_blast_scache_page_indexed(paddr); + r4k_blast_scache_page_indexed(addr); } } if (exec) { Atsushi Nemoto wrote: >>>>>> On Wed, 01 Feb 2006 00:03:56 +0900 (JST), Atsushi Nemoto said: > anemo> If dcache_size != icache_size or dcache_size != scache_size, > anemo> icache/scache does not flushed properly. Use correct cache size to > anemo> calculate index value for scache/icache. > > Ping. I believe current c-r4k.c still broken for CPUs with large > set-assotiative cache or physically indexed cache. Here is a patch > against current GIT tree. > > > If dcache_size != icache_size or dcache_size != scache_size, or > set-associative cache, icache/scache does not flushed properly. Make > blast_?cache_page_indexed() masks its index value correctly. Also, > use physical address for physically indexed pcache/scache. > > Signed-off-by: Atsushi Nemoto > > diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c > index 0668e9b..9572ed4 100644 > --- a/arch/mips/mm/c-r4k.c > +++ b/arch/mips/mm/c-r4k.c > @@ -375,6 +375,7 @@ static void r4k_flush_cache_mm(struct mm > struct flush_cache_page_args { > struct vm_area_struct *vma; > unsigned long addr; > + unsigned long pfn; > }; > > static inline void local_r4k_flush_cache_page(void *args) > @@ -382,6 +383,7 @@ static inline void local_r4k_flush_cache > struct flush_cache_page_args *fcp_args = args; > struct vm_area_struct *vma = fcp_args->vma; > unsigned long addr = fcp_args->addr; > + unsigned long paddr = fcp_args->pfn << PAGE_SHIFT; > int exec = vma->vm_flags & VM_EXEC; > struct mm_struct *mm = vma->vm_mm; > pgd_t *pgdp; > @@ -431,11 +433,12 @@ static inline void local_r4k_flush_cache > * Do indexed flush, too much work to get the (possible) TLB refills > * to work correctly. > */ > - addr = INDEX_BASE + (addr & (dcache_size - 1)); > if (cpu_has_dc_aliases || (exec && !cpu_has_ic_fills_f_dc)) { > - r4k_blast_dcache_page_indexed(addr); > - if (exec && !cpu_icache_snoops_remote_store) > - r4k_blast_scache_page_indexed(addr); > + r4k_blast_dcache_page_indexed(cpu_has_pindexed_dcache ? > + paddr : addr); > + if (exec && !cpu_icache_snoops_remote_store) { > + r4k_blast_scache_page_indexed(paddr); > + } > } > if (exec) { > if (cpu_has_vtag_icache) { > @@ -455,6 +458,7 @@ static void r4k_flush_cache_page(struct > > args.vma = vma; > args.addr = addr; > + args.pfn = pfn; > > on_each_cpu(local_r4k_flush_cache_page, &args, 1, 1); > } > @@ -956,6 +960,7 @@ static void __init probe_pcache(void) > switch (c->cputype) { > case CPU_20KC: > case CPU_25KF: > + c->dcache.flags |= MIPS_CACHE_PINDEX; > case CPU_R10000: > case CPU_R12000: > case CPU_SB1: > diff --git a/arch/mips/mm/c-tx39.c b/arch/mips/mm/c-tx39.c > index 7c572be..fe232e3 100644 > --- a/arch/mips/mm/c-tx39.c > +++ b/arch/mips/mm/c-tx39.c > @@ -210,7 +210,6 @@ static void tx39_flush_cache_page(struct > * Do indexed flush, too much work to get the (possible) TLB refills > * to work correctly. > */ > - page = (KSEG0 + (page & (dcache_size - 1))); > if (cpu_has_dc_aliases || exec) > tx39_blast_dcache_page_indexed(page); > if (exec) > diff --git a/include/asm-mips/cpu-features.h b/include/asm-mips/cpu-features.h > index 78c9cc2..3f2b6d9 100644 > --- a/include/asm-mips/cpu-features.h > +++ b/include/asm-mips/cpu-features.h > @@ -96,6 +96,9 @@ > #ifndef cpu_has_ic_fills_f_dc > #define cpu_has_ic_fills_f_dc (cpu_data[0].icache.flags & MIPS_CACHE_IC_F_DC) > #endif > +#ifndef cpu_has_pindexed_dcache > +#define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX) > +#endif > > /* > * I-Cache snoops remote store. This only matters on SMP. Some multiprocessors > diff --git a/include/asm-mips/cpu-info.h b/include/asm-mips/cpu-info.h > index d5cf519..140be1c 100644 > --- a/include/asm-mips/cpu-info.h > +++ b/include/asm-mips/cpu-info.h > @@ -39,6 +39,7 @@ struct cache_desc { > #define MIPS_CACHE_ALIASES 0x00000004 /* Cache could have aliases */ > #define MIPS_CACHE_IC_F_DC 0x00000008 /* Ic can refill from D-cache */ > #define MIPS_IC_SNOOPS_REMOTE 0x00000010 /* Ic snoops remote stores */ > +#define MIPS_CACHE_PINDEX 0x00000020 /* Physically indexed cache */ > > struct cpuinfo_mips { > unsigned long udelay_val; > diff --git a/include/asm-mips/r4kcache.h b/include/asm-mips/r4kcache.h > index 9632c27..0bcb79a 100644 > --- a/include/asm-mips/r4kcache.h > +++ b/include/asm-mips/r4kcache.h > @@ -257,7 +257,8 @@ static inline void blast_##pfx##cache##l > \ > static inline void blast_##pfx##cache##lsize##_page_indexed(unsigned long page) \ > { \ > - unsigned long start = page; \ > + unsigned long indexmask = current_cpu_data.desc.waysize - 1; \ > + unsigned long start = INDEX_BASE + (page & indexmask); \ > unsigned long end = start + PAGE_SIZE; \ > unsigned long ws_inc = 1UL << current_cpu_data.desc.waybit; \ > unsigned long ws_end = current_cpu_data.desc.ways << \ > > From anemo@mba.ocn.ne.jp Fri Apr 14 03:57:46 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 14 Apr 2006 03:57:57 +0100 (BST) Received: from topsns2.toshiba-tops.co.jp ([202.230.225.126]:14201 "EHLO topsns2.toshiba-tops.co.jp") by ftp.linux-mips.org with ESMTP id S8133715AbWDNC5q (ORCPT ); Fri, 14 Apr 2006 03:57:46 +0100 Received: from topsms.toshiba-tops.co.jp by topsns2.toshiba-tops.co.jp via smtpd (for ftp.linux-mips.org [194.74.144.162]) with ESMTP; Fri, 14 Apr 2006 12:09:50 +0900 Received: from topsms.toshiba-tops.co.jp (localhost.localdomain [127.0.0.1]) by localhost.toshiba-tops.co.jp (Postfix) with ESMTP id 25808207A8; Fri, 14 Apr 2006 12:09:45 +0900 (JST) Received: from srd2sd.toshiba-tops.co.jp (srd2sd.toshiba-tops.co.jp [172.17.28.2]) by topsms.toshiba-tops.co.jp (Postfix) with ESMTP id 131F420237; Fri, 14 Apr 2006 12:09:45 +0900 (JST) Received: from localhost (fragile [172.17.28.65]) by srd2sd.toshiba-tops.co.jp (8.12.10/8.12.10) with ESMTP id k3E39i4D071077; Fri, 14 Apr 2006 12:09:44 +0900 (JST) (envelope-from anemo@mba.ocn.ne.jp) Date: Fri, 14 Apr 2006 12:09:44 +0900 (JST) Message-Id: <20060414.120944.25476367.nemoto@toshiba-tops.co.jp> To: ppopov@embeddedalley.com Cc: linux-mips@linux-mips.org Subject: Re: mips64 kgdb fpu access bug From: Atsushi Nemoto In-Reply-To: <1144961699.8372.127.camel@localhost.localdomain> References: <1144961699.8372.127.camel@localhost.localdomain> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11094 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips On Thu, 13 Apr 2006 13:54:59 -0700, Pete Popov wrote: > .macro fpu_save_double thread status tmp1 tmp2 > sll \tmp2, \tmp1, 5 > bgez \tmp2, 2f > fpu_save_16odd \thread > 2: > fpu_save_16even \thread \tmp1 # clobbers t1 > .endm > > tmp1 is "t0" and it's not clear to me why we're checking t0 instead of > status in order to decide whether to save the odd registers or not. I > must be missing something because others would have hit this bug by now. > Any clues would be appreciated. It seems commit d0fd5c21d07d6e13993a77f4471d8003a271a12b was somewhat broken. Could you try this patch? fix register usage in fpu_save_double() and make fpu_restore_double() more symmetric with fpu_save_double(). Signed-off-by: Atsushi Nemoto diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S index 0b1b54a..db94e55 100644 --- a/arch/mips/kernel/r4k_switch.S +++ b/arch/mips/kernel/r4k_switch.S @@ -75,8 +75,8 @@ and t0, t0, t1 LONG_S t0, ST_OFF(t3) - fpu_save_double a0 t1 t0 t2 # c0_status passed in t1 - # clobbers t0 and t2 + fpu_save_double a0 t0 t1 # c0_status passed in t0 + # clobbers t1 1: /* @@ -129,9 +129,9 @@ */ LEAF(_save_fp) #ifdef CONFIG_64BIT - mfc0 t1, CP0_STATUS + mfc0 t0, CP0_STATUS #endif - fpu_save_double a0 t1 t0 t2 # clobbers t1 + fpu_save_double a0 t0 t1 # clobbers t1 jr ra END(_save_fp) @@ -139,7 +139,10 @@ LEAF(_save_fp) * Restore a thread's fp context. */ LEAF(_restore_fp) - fpu_restore_double a0, t1 # clobbers t1 +#ifdef CONFIG_64BIT + mfc0 t0, CP0_STATUS +#endif + fpu_restore_double a0 t0 t1 # clobbers t1 jr ra END(_restore_fp) diff --git a/include/asm-mips/asmmacro-32.h b/include/asm-mips/asmmacro-32.h index 11daf5c..5de3963 100644 --- a/include/asm-mips/asmmacro-32.h +++ b/include/asm-mips/asmmacro-32.h @@ -12,7 +12,7 @@ #include #include - .macro fpu_save_double thread status tmp1=t0 tmp2 + .macro fpu_save_double thread status tmp1=t0 cfc1 \tmp1, fcr31 sdc1 $f0, THREAD_FPR0(\thread) sdc1 $f2, THREAD_FPR2(\thread) @@ -70,7 +70,7 @@ sw \tmp, THREAD_FCR31(\thread) .endm - .macro fpu_restore_double thread tmp=t0 + .macro fpu_restore_double thread status tmp=t0 lw \tmp, THREAD_FCR31(\thread) ldc1 $f0, THREAD_FPR0(\thread) ldc1 $f2, THREAD_FPR2(\thread) diff --git a/include/asm-mips/asmmacro-64.h b/include/asm-mips/asmmacro-64.h index 559c355..225feef 100644 --- a/include/asm-mips/asmmacro-64.h +++ b/include/asm-mips/asmmacro-64.h @@ -53,12 +53,12 @@ sdc1 $f31, THREAD_FPR31(\thread) .endm - .macro fpu_save_double thread status tmp1 tmp2 - sll \tmp2, \tmp1, 5 - bgez \tmp2, 2f + .macro fpu_save_double thread status tmp + sll \tmp, \status, 5 + bgez \tmp, 2f fpu_save_16odd \thread 2: - fpu_save_16even \thread \tmp1 # clobbers t1 + fpu_save_16even \thread \tmp .endm .macro fpu_restore_16even thread tmp=t0 @@ -101,13 +101,12 @@ ldc1 $f31, THREAD_FPR31(\thread) .endm - .macro fpu_restore_double thread tmp - mfc0 t0, CP0_STATUS - sll t1, t0, 5 - bgez t1, 1f # 16 register mode? + .macro fpu_restore_double thread status tmp + sll \tmp, \status, 5 + bgez \tmp, 1f # 16 register mode? - fpu_restore_16odd a0 -1: fpu_restore_16even a0, t0 # clobbers t0 + fpu_restore_16odd \thread +1: fpu_restore_16even \thread \tmp .endm .macro cpu_save_nonscratch thread From anemo@mba.ocn.ne.jp Fri Apr 14 04:02:12 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 14 Apr 2006 04:02:24 +0100 (BST) Received: from topsns2.toshiba-tops.co.jp ([202.230.225.126]:43648 "EHLO topsns2.toshiba-tops.co.jp") by ftp.linux-mips.org with ESMTP id S8133715AbWDNDCM (ORCPT ); Fri, 14 Apr 2006 04:02:12 +0100 Received: from topsms.toshiba-tops.co.jp by topsns2.toshiba-tops.co.jp via smtpd (for ftp.linux-mips.org [194.74.144.162]) with ESMTP; Fri, 14 Apr 2006 12:14:17 +0900 Received: from topsms.toshiba-tops.co.jp (localhost.localdomain [127.0.0.1]) by localhost.toshiba-tops.co.jp (Postfix) with ESMTP id C3535207B3; Fri, 14 Apr 2006 12:14:15 +0900 (JST) Received: from srd2sd.toshiba-tops.co.jp (srd2sd.toshiba-tops.co.jp [172.17.28.2]) by topsms.toshiba-tops.co.jp (Postfix) with ESMTP id AEA0D20257; Fri, 14 Apr 2006 12:14:15 +0900 (JST) Received: from localhost (fragile [172.17.28.65]) by srd2sd.toshiba-tops.co.jp (8.12.10/8.12.10) with ESMTP id k3E3EF4D071113; Fri, 14 Apr 2006 12:14:15 +0900 (JST) (envelope-from anemo@mba.ocn.ne.jp) Date: Fri, 14 Apr 2006 12:14:15 +0900 (JST) Message-Id: <20060414.121415.130240785.nemoto@toshiba-tops.co.jp> To: geoffrey.levand@am.sony.com Cc: ralf@linux-mips.org, linux-mips@linux-mips.org Subject: Re: [PATCH] local_r4k_flush_cache_page fix From: Atsushi Nemoto In-Reply-To: <443F111C.2000302@am.sony.com> References: <20060201.000356.25911337.anemo@mba.ocn.ne.jp> <20060313.182303.115641770.nemoto@toshiba-tops.co.jp> <443F111C.2000302@am.sony.com> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11095 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips On Thu, 13 Apr 2006 20:03:56 -0700, Geoff Levand wrote: > Nemoto-san, > > Your changes caused me some problems with linux-2.6.16.1 on tx4937: Yes, it's my mistake. I posted a patch on 4 Apr and the fix is in linux-mips.org git tree. (both master and linux-2.6.16-stable branch). --- Atsushi Nemoto From domen.puncer@ultra.si Fri Apr 14 06:54:43 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 14 Apr 2006 06:54:55 +0100 (BST) Received: from deliver-1.mx.triera.net ([213.161.0.31]:35548 "HELO deliver-1.mx.triera.net") by ftp.linux-mips.org with SMTP id S8133355AbWDNFyn (ORCPT ); Fri, 14 Apr 2006 06:54:43 +0100 Received: from localhost (in-3.mx.triera.net [213.161.0.27]) by deliver-1.mx.triera.net (Postfix) with ESMTP id 16ED6C052; Fri, 14 Apr 2006 08:06:39 +0200 (CEST) Received: from smtp.triera.net (smtp.triera.net [213.161.0.30]) by in-3.mx.triera.net (Postfix) with SMTP id 250381BC091; Fri, 14 Apr 2006 08:06:39 +0200 (CEST) Received: from localhost (unknown [213.161.20.162]) by smtp.triera.net (Postfix) with ESMTP id 5DFC21A18BC; Fri, 14 Apr 2006 08:06:39 +0200 (CEST) Date: Fri, 14 Apr 2006 08:06:41 +0200 From: Domen Puncer To: Freddy Spierenburg Cc: linux-mips@linux-mips.org Subject: Re: UART trouble on the DBAu1100 Message-ID: <20060414060640.GE29489@domen.ultra.si> References: <20060413131117.GP11097@dusktilldawn.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060413131117.GP11097@dusktilldawn.nl> User-Agent: Mutt/1.5.11 X-Virus-Scanned: Triera AV Service Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11096 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: domen.puncer@ultra.si Precedence: bulk X-list: linux-mips On 13/04/06 15:11 +0200, Freddy Spierenburg wrote: > Hi, > > I have a problem and yet am not sure where to look. It's a > problem in the serial driver for the internal UART's of the > AU1100. It appeared ever since 2.6.15. 2.6.14 is working like a > charm, but 2.6.15 gives me the trouble. > > When I open a tty with the open(2) system call (see attached open.c) > I see that the UART sends a 0x36 byte on the line. We had the same problem on Au1200, applying http://www.linux-mips.org/archives/linux-mips/2006-03/msg00259.html (or maybe a different version of this patch) fixed it. > > But that's not the only trouble. I also do not receive any > bytes received by the UART. All the received bytes stay > in the input buffer of the UART only to be send up to userland > as soon as the UART is asked to send a byte on the line itself. > Then in one take all the bytes are received by the application > listening. I may be way off, but maybe it's just flow control that needs to be turned off. Domen From ppopov@embeddedalley.com Fri Apr 14 10:38:22 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 14 Apr 2006 10:38:32 +0100 (BST) Received: from smtp103.biz.mail.mud.yahoo.com ([68.142.200.238]:19037 "HELO smtp103.biz.mail.mud.yahoo.com") by ftp.linux-mips.org with SMTP id S8133376AbWDNJiW (ORCPT ); Fri, 14 Apr 2006 10:38:22 +0100 Received: (qmail 47557 invoked from network); 14 Apr 2006 09:50:22 -0000 Received: from unknown (HELO ?192.168.1.102?) (ppopov@embeddedalley.com@63.194.214.47 with plain) by smtp103.biz.mail.mud.yahoo.com with SMTP; 14 Apr 2006 09:50:22 -0000 Subject: Re: mips64 kgdb fpu access bug From: Pete Popov Reply-To: ppopov@embeddedalley.com To: Atsushi Nemoto Cc: linux-mips@linux-mips.org In-Reply-To: <20060414.120944.25476367.nemoto@toshiba-tops.co.jp> References: <1144961699.8372.127.camel@localhost.localdomain> <20060414.120944.25476367.nemoto@toshiba-tops.co.jp> Content-Type: text/plain Organization: Embedded Alley Solutions, Inc Date: Fri, 14 Apr 2006 02:50:20 -0700 Message-Id: <1145008220.11383.26.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.4.1 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11097 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ppopov@embeddedalley.com Precedence: bulk X-list: linux-mips Looks good on inspection and my kernel boots fine now. It used to crash consistently with this particular configuration and root file system. Now I need to cook up something similar for the kgdb support :) Thanks! Pete On Fri, 2006-04-14 at 12:09 +0900, Atsushi Nemoto wrote: > On Thu, 13 Apr 2006 13:54:59 -0700, Pete Popov wrote: > > .macro fpu_save_double thread status tmp1 tmp2 > > sll \tmp2, \tmp1, 5 > > bgez \tmp2, 2f > > fpu_save_16odd \thread > > 2: > > fpu_save_16even \thread \tmp1 # clobbers t1 > > .endm > > > > tmp1 is "t0" and it's not clear to me why we're checking t0 instead of > > status in order to decide whether to save the odd registers or not. I > > must be missing something because others would have hit this bug by now. > > Any clues would be appreciated. > > It seems commit d0fd5c21d07d6e13993a77f4471d8003a271a12b was somewhat > broken. > > Could you try this patch? > > > fix register usage in fpu_save_double() and make fpu_restore_double() > more symmetric with fpu_save_double(). > > Signed-off-by: Atsushi Nemoto > > diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S > index 0b1b54a..db94e55 100644 > --- a/arch/mips/kernel/r4k_switch.S > +++ b/arch/mips/kernel/r4k_switch.S > @@ -75,8 +75,8 @@ > and t0, t0, t1 > LONG_S t0, ST_OFF(t3) > > - fpu_save_double a0 t1 t0 t2 # c0_status passed in t1 > - # clobbers t0 and t2 > + fpu_save_double a0 t0 t1 # c0_status passed in t0 > + # clobbers t1 > 1: > > /* > @@ -129,9 +129,9 @@ > */ > LEAF(_save_fp) > #ifdef CONFIG_64BIT > - mfc0 t1, CP0_STATUS > + mfc0 t0, CP0_STATUS > #endif > - fpu_save_double a0 t1 t0 t2 # clobbers t1 > + fpu_save_double a0 t0 t1 # clobbers t1 > jr ra > END(_save_fp) > > @@ -139,7 +139,10 @@ LEAF(_save_fp) > * Restore a thread's fp context. > */ > LEAF(_restore_fp) > - fpu_restore_double a0, t1 # clobbers t1 > +#ifdef CONFIG_64BIT > + mfc0 t0, CP0_STATUS > +#endif > + fpu_restore_double a0 t0 t1 # clobbers t1 > jr ra > END(_restore_fp) > > diff --git a/include/asm-mips/asmmacro-32.h b/include/asm-mips/asmmacro-32.h > index 11daf5c..5de3963 100644 > --- a/include/asm-mips/asmmacro-32.h > +++ b/include/asm-mips/asmmacro-32.h > @@ -12,7 +12,7 @@ > #include > #include > > - .macro fpu_save_double thread status tmp1=t0 tmp2 > + .macro fpu_save_double thread status tmp1=t0 > cfc1 \tmp1, fcr31 > sdc1 $f0, THREAD_FPR0(\thread) > sdc1 $f2, THREAD_FPR2(\thread) > @@ -70,7 +70,7 @@ > sw \tmp, THREAD_FCR31(\thread) > .endm > > - .macro fpu_restore_double thread tmp=t0 > + .macro fpu_restore_double thread status tmp=t0 > lw \tmp, THREAD_FCR31(\thread) > ldc1 $f0, THREAD_FPR0(\thread) > ldc1 $f2, THREAD_FPR2(\thread) > diff --git a/include/asm-mips/asmmacro-64.h b/include/asm-mips/asmmacro-64.h > index 559c355..225feef 100644 > --- a/include/asm-mips/asmmacro-64.h > +++ b/include/asm-mips/asmmacro-64.h > @@ -53,12 +53,12 @@ > sdc1 $f31, THREAD_FPR31(\thread) > .endm > > - .macro fpu_save_double thread status tmp1 tmp2 > - sll \tmp2, \tmp1, 5 > - bgez \tmp2, 2f > + .macro fpu_save_double thread status tmp > + sll \tmp, \status, 5 > + bgez \tmp, 2f > fpu_save_16odd \thread > 2: > - fpu_save_16even \thread \tmp1 # clobbers t1 > + fpu_save_16even \thread \tmp > .endm > > .macro fpu_restore_16even thread tmp=t0 > @@ -101,13 +101,12 @@ > ldc1 $f31, THREAD_FPR31(\thread) > .endm > > - .macro fpu_restore_double thread tmp > - mfc0 t0, CP0_STATUS > - sll t1, t0, 5 > - bgez t1, 1f # 16 register mode? > + .macro fpu_restore_double thread status tmp > + sll \tmp, \status, 5 > + bgez \tmp, 1f # 16 register mode? > > - fpu_restore_16odd a0 > -1: fpu_restore_16even a0, t0 # clobbers t0 > + fpu_restore_16odd \thread > +1: fpu_restore_16even \thread \tmp > .endm > > .macro cpu_save_nonscratch thread From anemo@mba.ocn.ne.jp Fri Apr 14 15:52:03 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 14 Apr 2006 15:52:12 +0100 (BST) Received: from mba.ocn.ne.jp ([210.190.142.172]:1276 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S8133449AbWDNOwD (ORCPT ); Fri, 14 Apr 2006 15:52:03 +0100 Received: from localhost (p1197-ipad209funabasi.chiba.ocn.ne.jp [58.88.112.197]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 39D1C8ECA; Sat, 15 Apr 2006 00:03:55 +0900 (JST) Date: Sat, 15 Apr 2006 00:04:18 +0900 (JST) Message-Id: <20060415.000418.07644633.anemo@mba.ocn.ne.jp> To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org Subject: Re: [MIPS] Makefile crapectomy. From: Atsushi Nemoto In-Reply-To: References: X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11098 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips On Mon, 20 Mar 2006 12:33:21 +0000, linux-mips@linux-mips.org wrote: > Author: Ralf Baechle Wed Mar 8 11:35:00 2006 +0000 > Commit: 434c1922d9865f1da02a2db604c1fdf8bee56b71 > Gitweb: http://www.linux-mips.org/g/linux/434c1922 > Branch: master > > Dump all the ridiculously complicated stuff that was needed support > compilers older and newer than 3.0. This commit breaks sparse for 64bit kernel. The -m64 option is required. Also, some macro values (such as _MIPS_TUNE, etc.) contain double-quote characters so it would be better quoting arguments by single-quote characters. Signed-off-by: Atsushi Nemoto diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 0d86f31..61359b7 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -616,7 +616,10 @@ LDFLAGS += -m $(ld-emul) ifdef CONFIG_MIPS CHECKFLAGS += $(shell $(CC) $(CFLAGS) -dM -E -xc /dev/null | \ egrep -vw '__GNUC_(MAJOR|MINOR|PATCHLEVEL)__' | \ - sed -e 's/^\#define /-D/' -e 's/ /="/' -e 's/$$/"/') + sed -e 's/^\#define /-D/' -e "s/ /='/" -e "s/$$/'/") +ifdef CONFIG_64BIT +CHECKFLAGS += -m64 +endif endif OBJCOPYFLAGS += --remove-section=.reginfo From geoffrey.levand@am.sony.com Fri Apr 14 16:25:59 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 14 Apr 2006 16:26:08 +0100 (BST) Received: from mail8.fw-bc.sony.com ([160.33.98.75]:26350 "EHLO mail8.fw-bc.sony.com") by ftp.linux-mips.org with ESMTP id S8133449AbWDNPZ7 (ORCPT ); Fri, 14 Apr 2006 16:25:59 +0100 Received: from mail3.sjc.in.sel.sony.com (mail3.sjc.in.sel.sony.com [43.134.1.211]) by mail8.fw-bc.sony.com (8.12.11/8.12.11) with ESMTP id k3EFc0tK016106; Fri, 14 Apr 2006 15:38:00 GMT Received: from [192.168.1.10] ([43.134.85.105]) by mail3.sjc.in.sel.sony.com (8.12.11/8.12.11) with ESMTP id k3EFc0m2022865; Fri, 14 Apr 2006 15:38:00 GMT Message-ID: <443FC1D8.8010500@am.sony.com> Date: Fri, 14 Apr 2006 08:38:00 -0700 From: Geoff Levand User-Agent: Mozilla Thunderbird 1.0.7-1.1.fc4 (X11/20050929) X-Accept-Language: en-us, en MIME-Version: 1.0 To: anemo@mba.ocn.ne.jp CC: linux-mips@linux-mips.org Subject: tx49 Ether problems Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11099 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: geoffrey.levand@am.sony.com Precedence: bulk X-list: linux-mips Nemoto-san, I seem to get a lot of problems with an nfs root fs on tx4937 board. I haven't looked at it closely yet, but I guess its some problem with the ne2000 driver. I wanted to know if you know anything about this. -Geoff nfs: server 192.168.1.10 not responding, still trying nfs: server 192.168.1.10 not responding, still trying nfs: server 192.168.1.10 not responding, still trying nfs: server 192.168.1.10 OK nfs: server 192.168.1.10 not responding, still trying nfs: server 192.168.1.10 not responding, still trying nfs: server 192.168.1.10 OK nfs: server 192.168.1.10 not responding, still trying nfs: server 192.168.1.10 not responding, still trying nfs: server 192.168.1.10 not responding, still trying nfs: server 192.168.1.10 OK From anemo@mba.ocn.ne.jp Fri Apr 14 16:52:51 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 14 Apr 2006 16:52:58 +0100 (BST) Received: from mba.ocn.ne.jp ([210.190.142.172]:49887 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S8133461AbWDNPwu (ORCPT ); Fri, 14 Apr 2006 16:52:50 +0100 Received: from localhost (p1197-ipad209funabasi.chiba.ocn.ne.jp [58.88.112.197]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 2CF09A4EE; Sat, 15 Apr 2006 01:04:55 +0900 (JST) Date: Sat, 15 Apr 2006 01:05:18 +0900 (JST) Message-Id: <20060415.010518.126141918.anemo@mba.ocn.ne.jp> To: geoffrey.levand@am.sony.com Cc: linux-mips@linux-mips.org Subject: Re: tx49 Ether problems From: Atsushi Nemoto In-Reply-To: <443FC1D8.8010500@am.sony.com> References: <443FC1D8.8010500@am.sony.com> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11100 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips On Fri, 14 Apr 2006 08:38:00 -0700, Geoff Levand wrote: > I seem to get a lot of problems with an nfs root fs > on tx4937 board. I haven't looked at it closely yet, > but I guess its some problem with the ne2000 driver. > I wanted to know if you know anything about this. Please look at: http://www.linux-mips.org/cgi-bin/mesg.cgi?a=linux-mips&i=20060226.230541.75185772.anemo%40mba.ocn.ne.jp With a quick glance of ne.c, it seems ei_status.stop_page should be changed to 0x60 on the board. Please confirm its value. --- Atsushi Nemoto From AScislowicz@Tarari.com Fri Apr 14 21:00:11 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 14 Apr 2006 21:00:24 +0100 (BST) Received: from smtp5.centerbeam.com ([63.120.115.249]:11792 "EHLO SMTP5.centerbeam.com") by ftp.linux-mips.org with ESMTP id S8133461AbWDNUAK convert rfc822-to-8bit (ORCPT ); Fri, 14 Apr 2006 21:00:10 +0100 Received: from tararisvle2k03.tarari.centerbeam.com ([64.95.101.58]) by SMTP5.centerbeam.com with Microsoft SMTPSVC(6.0.3790.1830); Fri, 14 Apr 2006 13:11:37 -0700 X-MimeOLE: Produced By Microsoft Exchange V6.5.7226.0 Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT Subject: RE: System freeze accompanied by msg 'BUG: soft lockup detected on CPU' Date: Fri, 14 Apr 2006 13:11:33 -0700 Message-ID: X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: System freeze accompanied by msg 'BUG: soft lockup detected on CPU' Thread-Index: AcZfTVy3pSLw6qJtRI+89j49BtKCLgAAChuwACx367A= From: "Adam Scislowicz" To: Cc: "David Marlatt" X-OriginalArrivalTime: 14 Apr 2006 20:11:37.0866 (UTC) FILETIME=[A2C386A0:01C65FFF] Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11101 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: AScislowicz@tarari.com Precedence: bulk X-list: linux-mips After enabling spin-lock debugging I get further details: [4294704.376000] BUG: soft lockup detected on CPU#0! [4294704.376000] Cpu 0 [4294704.376000] $ 0 : 00000000 10001f00 00000002 00000000 [4294704.376000] $ 4 : 10001f01 b00260c8 0f0f0f0f 00000004 [4294704.376000] $ 8 : 00000000 1000001e 80177c98 fffffff0 [4294704.376000] $12 : 00000000 00000004 00000000 00000004 [4294704.376000] $16 : 00000004 00000003 00000000 00000001 [4294704.376000] $20 : 8010e398 8a365dc8 8a391200 00000000 [4294704.376000] $24 : 00000003 0045d7d8 [4294704.376000] $28 : 8a364000 8a365d70 0045d7d8 8010b278 [4294704.376000] Hi : ffffec1d [4294704.376000] Lo : 000006a1 [4294704.376000] epc : 8010b294 smp_call_function+0x11c/0x1b8 Not tainted [4294704.376000] ra : 8010b278 smp_call_function+0x100/0x1b8 [4294704.376000] Status: 10001f03 KERNEL EXL IE [4294704.376000] Cause : 00809000 [4294704.376000] PrId : 01041100 [4294707.641000] BUG: spinlock lockup on CPU#3, crash_me.sh/717, 80397dc0 [4294707.648000] Call Trace: [4294707.650000] [<8024bf08>] __spin_lock_debug+0xe0/0xec [4294707.655000] [<8024be60>] __spin_lock_debug+0x38/0xec [4294707.660000] [<8034a02c>] _spin_unlock+0x10/0x1c [4294707.665000] [<8024bfb4>] _raw_spin_lock+0xa0/0xd8 [4294707.670000] [<801642cc>] __pte_alloc+0xf0/0x15c [4294707.675000] [<80164210>] __pte_alloc+0x34/0x15c [4294707.680000] [<80349ff4>] _spin_lock+0x10/0x1c [4294707.684000] [<8034a01c>] _spin_unlock+0x0/0x1c [4294707.689000] [<8034a02c>] _spin_unlock+0x10/0x1c [4294707.693000] [<8010b228>] smp_call_function+0xb0/0x1b8 [4294707.699000] [<801646a4>] copy_pte_range+0x1e8/0x3e0 [4294707.704000] [<8010de84>] sb1_flush_cache_page_ipi+0x0/0x28 [4294707.709000] [<8010de84>] sb1_flush_cache_page_ipi+0x0/0x28 [4294707.715000] [<8010df18>] sb1_flush_cache_page+0x6c/0x7c [4294707.720000] [<8034a084>] _spin_unlock_irqrestore+0x14/0x3c [4294707.726000] [<802460ac>] __up_write+0x10c/0x1c4 [4294707.731000] [<801667e4>] do_wp_page+0x530/0x5e4 [4294707.736000] [<801667c8>] do_wp_page+0x514/0x5e4 [4294707.740000] [<80245fa0>] __up_write+0x0/0x1c4 [4294707.745000] [<80167dcc>] __handle_mm_fault+0x2d8/0x300 [4294707.750000] [<8011e8f4>] sched_fork+0x2c/0xe0 [4294707.755000] [<8013f13c>] attach_pid+0x0/0xe8 [4294707.759000] [<8034a1d4>] _write_unlock_irq+0x10/0x2c [4294707.764000] [<8010cdd8>] do_page_fault+0x198/0x380 [4294707.769000] [<80156894>] free_hot_page+0x10/0x1c [4294707.774000] [<80157218>] __free_pages+0x70/0x98 [4294707.779000] [<80127254>] do_fork+0x7c/0x248 [4294707.783000] [<801018f0>] bcm1480_unmask_irq+0xd8/0xf0 [4294707.789000] [<80157288>] free_pages+0x48/0x60 [4294707.793000] [<801254f0>] __mmdrop+0x38/0x54 [4294707.797000] [<80121bc0>] default_wake_function+0x0/0x2c [4294707.803000] [<80348674>] schedule+0x69c/0xaa0 [4294707.807000] [<8010d818>] tlb_do_page_fault_1+0x100/0x108 [4294707.813000] [<80102aa8>] work_resched+0x8/0x34 [4294707.818000] _____________________________________________ From: Adam Scislowicz Sent: Thursday, April 13, 2006 3:57 PM To: 'linux-mips@linux-mips.org' Subject: System freeze accompanied by msg 'BUG: soft lockup detected on CPU' Kernel: Linux 2.6.15 Target: mips (32bit, big endian), SMP 4way (2way also crashes) preemption model = server (least preempt), do not preempt the big kernel crash Board: Broadcom 1480B How to reproduce: I made a bash script which awks a file line by line... while true; do echo "crash me..." ls done The neither the 'echo' or 'ls' commands are necessary. Originally I would see it crash in a bash script which calls awk, or during the init sciprts sometimes. The above script causes it to crash within a minute every time I have run it. [4294909.579000] BUG: soft lockup detected on CPU#0! [4294909.579000] Cpu 0 [4294909.579000] $ 0 : 00000000 30001f00 00000002 00000000 [4294909.579000] $ 4 : 30001f01 b00260c8 0f0f0f0f 00000004 [4294909.579000] $ 8 : 00000000 1000001e 70000053 00000063 [4294909.579000] $12 : 7fca0010 00000004 00000000 00000004 [4294909.579000] $16 : 00000004 00000003 00000000 00000001 [4294909.579000] $20 : 8010e398 8f949dc8 8f93be20 00000000 [4294909.579000] $24 : 00000000 2aabb750 [4294909.579000] $28 : 8f948000 8f949d70 2ab0dd0b 8010b2f8 [4294909.579000] Hi : 00000000 [4294909.579000] Lo : 0000000c [4294909.579000] epc : 8010b314 smp_call_function+0x11c/0x1bc Not tainted [4294909.579000] ra : 8010b2f8 smp_call_function+0x100/0x1bc [4294909.579000] Status: 30001f03 KERNEL EXL IE [4294909.579000] Cause : 00809000 [4294909.579000] PrId : 01041100 With 8010e398 being sb1_flush_icache_page_ipi() Thank, Adam Scislowicz -- kernel .config # # Automatically generated make config: don't edit # Linux kernel version: 2.6.15 # Wed Apr 12 13:52:44 2006 # CONFIG_MIPS=y # # Machine selection # # CONFIG_MIPS_MTX1 is not set # CONFIG_MIPS_BOSPORUS is not set # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set # CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set # CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MIPS_EV64120 is not set # CONFIG_MIPS_EV96100 is not set # CONFIG_MIPS_IVR is not set # CONFIG_MIPS_ITE8172 is not set # CONFIG_MACH_JAZZ is not set # CONFIG_LASAT is not set # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_MALTA is not set # CONFIG_MIPS_SEAD is not set # CONFIG_MIPS_SIM is not set # CONFIG_MOMENCO_JAGUAR_ATX is not set # CONFIG_MOMENCO_OCELOT is not set # CONFIG_MOMENCO_OCELOT_3 is not set # CONFIG_MOMENCO_OCELOT_C is not set # CONFIG_MOMENCO_OCELOT_G is not set # CONFIG_MIPS_XXS1500 is not set # CONFIG_PNX8550_V2PCI is not set # CONFIG_PNX8550_JBS is not set # CONFIG_DDB5074 is not set # CONFIG_DDB5476 is not set # CONFIG_DDB5477 is not set # CONFIG_MACH_VR41XX is not set # CONFIG_PMC_YOSEMITE is not set # CONFIG_QEMU is not set # CONFIG_SGI_IP22 is not set # CONFIG_SGI_IP27 is not set # CONFIG_SGI_IP32 is not set CONFIG_SIBYTE_BIGSUR=y # CONFIG_SIBYTE_SWARM is not set # CONFIG_SIBYTE_SENTOSA is not set # CONFIG_SIBYTE_RHONE is not set # CONFIG_SIBYTE_CARMEL is not set # CONFIG_SIBYTE_PTSWARM is not set # CONFIG_SIBYTE_LITTLESUR is not set # CONFIG_SIBYTE_CRHINE is not set # CONFIG_SIBYTE_CRHONE is not set # CONFIG_SNI_RM200_PCI is not set # CONFIG_TOSHIBA_JMR3927 is not set # CONFIG_TOSHIBA_RBTX4927 is not set # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_SIBYTE_BCM1x80=y CONFIG_SIBYTE_SB1xxx_SOC=y # CONFIG_CPU_SB1_PASS_1 is not set # CONFIG_CPU_SB1_PASS_2_1250 is not set # CONFIG_CPU_SB1_PASS_2_2 is not set # CONFIG_CPU_SB1_PASS_4 is not set # CONFIG_CPU_SB1_PASS_2_112x is not set # CONFIG_CPU_SB1_PASS_3 is not set # CONFIG_SIMULATION is not set # CONFIG_SB1_CEX_ALWAYS_FATAL is not set # CONFIG_SB1_CERR_STALL is not set CONFIG_SIBYTE_CFE=y # CONFIG_SIBYTE_CFE_CONSOLE is not set # CONFIG_SIBYTE_BUS_WATCHER is not set # CONFIG_SIBYTE_SB1250_PROF is not set # CONFIG_SIBYTE_TBPROF is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_DMA_COHERENT=y CONFIG_CPU_BIG_ENDIAN=y # CONFIG_CPU_LITTLE_ENDIAN is not set CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y CONFIG_SWAP_IO_SPACE=y CONFIG_BOOT_ELF32=y CONFIG_MIPS_L1_CACHE_SHIFT=5 # # CPU selection # # CONFIG_CPU_MIPS32_R1 is not set # CONFIG_CPU_MIPS32_R2 is not set # CONFIG_CPU_MIPS64_R1 is not set # CONFIG_CPU_MIPS64_R2 is not set # CONFIG_CPU_R3000 is not set # CONFIG_CPU_TX39XX is not set # CONFIG_CPU_VR41XX is not set # CONFIG_CPU_R4300 is not set # CONFIG_CPU_R4X00 is not set # CONFIG_CPU_TX49XX is not set # CONFIG_CPU_R5000 is not set # CONFIG_CPU_R5432 is not set # CONFIG_CPU_R6000 is not set # CONFIG_CPU_NEVADA is not set # CONFIG_CPU_R8000 is not set # CONFIG_CPU_R10000 is not set # CONFIG_CPU_RM7000 is not set # CONFIG_CPU_RM9000 is not set CONFIG_CPU_SB1=y CONFIG_SYS_HAS_CPU_SB1=y CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y # # Kernel type # CONFIG_32BIT=y # CONFIG_64BIT is not set CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PAGE_SIZE_16KB is not set # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_SIBYTE_DMA_PAGEOPS is not set # CONFIG_MIPS_MT is not set # CONFIG_64BIT_PHYS_ADDR is not set # CONFIG_CPU_ADVANCED is not set CONFIG_CPU_HAS_LLSC=y CONFIG_CPU_HAS_SYNC=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_CPU_SUPPORTS_HIGHMEM=y CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y # CONFIG_DISCONTIGMEM_MANUAL is not set # CONFIG_SPARSEMEM_MANUAL is not set CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_SMP=y CONFIG_NR_CPUS=4 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_BKL is not set # # Code maturity level options # CONFIG_EXPERIMENTAL=y CONFIG_CLEAN_COMPILE=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup # CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y # CONFIG_AUDIT is not set CONFIG_HOTPLUG=y CONFIG_KOBJECT_UEVENT=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y # CONFIG_CPUSETS is not set CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_EMBEDDED=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y CONFIG_CC_ALIGN_FUNCTIONS=0 CONFIG_CC_ALIGN_LABELS=0 CONFIG_CC_ALIGN_LOOPS=0 CONFIG_CC_ALIGN_JUMPS=0 # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # # Loadable module support # CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set CONFIG_OBSOLETE_MODPARM=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_KMOD=y CONFIG_STOP_MACHINE=y # # Block layer # # CONFIG_LBD is not set # # IO Schedulers # CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="anticipatory" # # Bus options (PCI, PCMCIA, EISA, ISA, TC) # CONFIG_HW_HAS_PCI=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PCI_LEGACY_PROC=y CONFIG_PCI_DEBUG=y CONFIG_MMU=y # # PCCARD (PCMCIA/CardBus) support # CONFIG_PCCARD=y # CONFIG_PCMCIA_DEBUG is not set CONFIG_PCMCIA=y CONFIG_PCMCIA_LOAD_CIS=y CONFIG_PCMCIA_IOCTL=y # CONFIG_CARDBUS is not set # # PC-card bridges # # CONFIG_YENTA is not set # CONFIG_PD6729 is not set # CONFIG_I82092 is not set # # PCI Hotplug Support # # CONFIG_HOTPLUG_PCI is not set # # Executable file formats # CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_MISC is not set CONFIG_TRAD_SIGNALS=y # # Networking # CONFIG_NET=y # # Networking options # CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y CONFIG_XFRM_USER=m CONFIG_NET_KEY=y CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y # CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_ARPD is not set # CONFIG_SYN_COOKIES is not set # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set CONFIG_INET_TUNNEL=m CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_BIC=y # CONFIG_IPV6 is not set # CONFIG_NETFILTER is not set # # DCCP Configuration (EXPERIMENTAL) # # CONFIG_IP_DCCP is not set # # SCTP Configuration (EXPERIMENTAL) # # CONFIG_IP_SCTP is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # # QoS and/or fair queueing # # CONFIG_NET_SCHED is not set # # Network testing # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_IEEE80211 is not set # # Device Drivers # # # Generic Driver Options # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y # CONFIG_DEBUG_DRIVER is not set # # Connector - unified userspace <-> kernelspace linker # # CONFIG_CONNECTOR is not set # # Memory Technology Devices (MTD) # # CONFIG_MTD is not set # # Parallel port support # # CONFIG_PARPORT is not set # # Plug and Play support # # # Block devices # # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_SX8 is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=65536 CONFIG_BLK_DEV_INITRD=y # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # # ATA/ATAPI/MFM/RLL support # CONFIG_IDE=y CONFIG_BLK_DEV_IDE=y # # Please see Documentation/ide.txt for help/info on IDE drives # # CONFIG_BLK_DEV_IDE_SATA is not set CONFIG_BLK_DEV_IDEDISK=y # CONFIG_IDEDISK_MULTI_MODE is not set CONFIG_BLK_DEV_IDECS=y CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDETAPE=y CONFIG_BLK_DEV_IDEFLOPPY=y # CONFIG_IDE_TASK_IOCTL is not set # # IDE chipset support/bugfixes # CONFIG_IDE_GENERIC=y # CONFIG_BLK_DEV_IDEPCI is not set # CONFIG_BLK_DEV_IDE_SWARM is not set # CONFIG_IDE_ARM is not set # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set # CONFIG_BLK_DEV_HD is not set # # SCSI device support # # CONFIG_RAID_ATTRS is not set # CONFIG_SCSI is not set # # Multi-device support (RAID and LVM) # # CONFIG_MD is not set # # Fusion MPT device support # # CONFIG_FUSION is not set # # IEEE 1394 (FireWire) support # # CONFIG_IEEE1394 is not set # # I2O device support # # CONFIG_I2O is not set # # Network device support # CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set # # ARCnet devices # # CONFIG_ARCNET is not set # # PHY device support # # CONFIG_PHYLIB is not set # # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y CONFIG_MII=y # CONFIG_HAPPYMEAL is not set # CONFIG_SUNGEM is not set # CONFIG_CASSINI is not set # CONFIG_NET_VENDOR_3COM is not set # # Tulip family network device support # # CONFIG_NET_TULIP is not set # CONFIG_HP100 is not set # CONFIG_NET_PCI is not set # # Ethernet (1000 Mbit) # # CONFIG_ACENIC is not set # CONFIG_DL2K is not set # CONFIG_E1000 is not set # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set # CONFIG_R8169 is not set CONFIG_NET_SB1250_MAC=y # CONFIG_SIS190 is not set # CONFIG_SKGE is not set # CONFIG_SK98LIN is not set # CONFIG_TIGON3 is not set # CONFIG_BNX2 is not set # # Ethernet (10000 Mbit) # # CONFIG_CHELSIO_T1 is not set # CONFIG_IXGB is not set # CONFIG_S2IO is not set # # Token Ring devices # # CONFIG_TR is not set # # Wireless LAN (non-hamradio) # # CONFIG_NET_RADIO is not set # # PCMCIA network device support # # CONFIG_NET_PCMCIA is not set # # Wan interfaces # # CONFIG_WAN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set # # ISDN subsystem # # CONFIG_ISDN is not set # # Telephony Support # # CONFIG_PHONE is not set # # Input device support # # CONFIG_INPUT is not set # # Hardware I/O ports # CONFIG_SERIO=y # CONFIG_SERIO_I8042 is not set CONFIG_SERIO_SERPORT=y # CONFIG_SERIO_PCIPS2 is not set # CONFIG_SERIO_LIBPS2 is not set CONFIG_SERIO_RAW=m # CONFIG_GAMEPORT is not set # # Character devices # # CONFIG_VT is not set CONFIG_SERIAL_NONSTANDARD=y # CONFIG_ROCKETPORT is not set # CONFIG_CYCLADES is not set # CONFIG_DIGIEPCA is not set # CONFIG_MOXA_SMARTIO is not set # CONFIG_ISI is not set # CONFIG_SYNCLINKMP is not set # CONFIG_N_HDLC is not set # CONFIG_SPECIALIX is not set # CONFIG_SX is not set # CONFIG_STALDRV is not set CONFIG_SIBYTE_SB1250_DUART=y CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y # # Serial drivers # # CONFIG_SERIAL_8250 is not set # # Non-8250 serial port support # # CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 # # IPMI # # CONFIG_IPMI_HANDLER is not set # # Watchdog Cards # # CONFIG_WATCHDOG is not set # CONFIG_RTC is not set CONFIG_GEN_RTC=y # CONFIG_GEN_RTC_X is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # # Ftape, the floppy tape device driver # # CONFIG_DRM is not set # # PCMCIA character devices # # CONFIG_SYNCLINK_CS is not set # CONFIG_CARDMAN_4000 is not set # CONFIG_CARDMAN_4040 is not set # CONFIG_RAW_DRIVER is not set # # TPM devices # # CONFIG_TCG_TPM is not set # CONFIG_TELCLOCK is not set # # I2C support # CONFIG_I2C=y CONFIG_I2C_CHARDEV=y # # I2C Algorithms # # CONFIG_I2C_ALGOBIT is not set # CONFIG_I2C_ALGOPCF is not set # CONFIG_I2C_ALGOPCA is not set CONFIG_I2C_ALGO_SIBYTE=y # # I2C Hardware Bus support # # CONFIG_I2C_ALI1535 is not set # CONFIG_I2C_ALI1563 is not set # CONFIG_I2C_ALI15X3 is not set # CONFIG_I2C_AMD756 is not set # CONFIG_I2C_AMD8111 is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_I810 is not set # CONFIG_I2C_PIIX4 is not set # CONFIG_I2C_NFORCE2 is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_PROSAVAGE is not set # CONFIG_I2C_SAVAGE4 is not set CONFIG_I2C_SIBYTE=y # CONFIG_SCx200_ACB is not set # CONFIG_I2C_SIS5595 is not set # CONFIG_I2C_SIS630 is not set # CONFIG_I2C_SIS96X is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set # CONFIG_I2C_VOODOO3 is not set # CONFIG_I2C_PCA_ISA is not set # # Miscellaneous I2C Chip support # CONFIG_SENSORS_DS1337=y CONFIG_SENSORS_DS1374=y CONFIG_SENSORS_EEPROM=y CONFIG_SENSORS_PCF8574=y CONFIG_SENSORS_PCA9539=y CONFIG_SENSORS_PCF8591=y CONFIG_SENSORS_RTC8564=y CONFIG_SENSORS_MAX6875=y # CONFIG_RTC_X1205_I2C is not set CONFIG_I2C_DEBUG_CORE=y CONFIG_I2C_DEBUG_ALGO=y CONFIG_I2C_DEBUG_BUS=y CONFIG_I2C_DEBUG_CHIP=y # # Dallas's 1-wire bus # # CONFIG_W1 is not set # # Hardware Monitoring support # # CONFIG_HWMON is not set # CONFIG_HWMON_VID is not set # # Misc devices # # # Multimedia Capabilities Port drivers # # # Multimedia devices # # CONFIG_VIDEO_DEV is not set # # Digital Video Broadcasting Devices # # CONFIG_DVB is not set # # Graphics support # # CONFIG_FB is not set # # Sound # # CONFIG_SOUND is not set # # USB support # CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y # CONFIG_USB is not set # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # # # USB Gadget Support # # CONFIG_USB_GADGET is not set # # MMC/SD Card support # # CONFIG_MMC is not set # # InfiniBand support # # CONFIG_INFINIBAND is not set # # SN Devices # # # File systems # CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y # CONFIG_EXT2_FS_XIP is not set # CONFIG_EXT3_FS is not set # CONFIG_JBD is not set CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y # CONFIG_XFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set CONFIG_INOTIFY=y # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set CONFIG_FUSE_FS=y # # CD-ROM/DVD Filesystems # # CONFIG_ISO9660_FS is not set # CONFIG_UDF_FS is not set # # DOS/FAT/NT Filesystems # CONFIG_FAT_FS=y CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_NTFS_FS is not set # # Pseudo filesystems # CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_SYSFS=y # CONFIG_TMPFS is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y # CONFIG_RELAYFS_FS is not set # # Miscellaneous filesystems # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set # # Network File Systems # CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set CONFIG_ROOT_NFS=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set # CONFIG_9P_FS is not set # # Partition Types # # CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y # # Native Language Support # CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NLS_CODEPAGE_437 is not set # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set # CONFIG_NLS_CODEPAGE_852 is not set # CONFIG_NLS_CODEPAGE_855 is not set # CONFIG_NLS_CODEPAGE_857 is not set # CONFIG_NLS_CODEPAGE_860 is not set # CONFIG_NLS_CODEPAGE_861 is not set # CONFIG_NLS_CODEPAGE_862 is not set # CONFIG_NLS_CODEPAGE_863 is not set # CONFIG_NLS_CODEPAGE_864 is not set # CONFIG_NLS_CODEPAGE_865 is not set # CONFIG_NLS_CODEPAGE_866 is not set # CONFIG_NLS_CODEPAGE_869 is not set # CONFIG_NLS_CODEPAGE_936 is not set # CONFIG_NLS_CODEPAGE_950 is not set # CONFIG_NLS_CODEPAGE_932 is not set # CONFIG_NLS_CODEPAGE_949 is not set # CONFIG_NLS_CODEPAGE_874 is not set # CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ASCII is not set # CONFIG_NLS_ISO8859_1 is not set # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set # CONFIG_NLS_ISO8859_5 is not set # CONFIG_NLS_ISO8859_6 is not set # CONFIG_NLS_ISO8859_7 is not set # CONFIG_NLS_ISO8859_9 is not set # CONFIG_NLS_ISO8859_13 is not set # CONFIG_NLS_ISO8859_14 is not set # CONFIG_NLS_ISO8859_15 is not set # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set # CONFIG_NLS_UTF8 is not set # # Profiling support # # CONFIG_PROFILING is not set # # Kernel hacking # CONFIG_PRINTK_TIME=y CONFIG_DEBUG_KERNEL=y CONFIG_MAGIC_SYSRQ=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_DETECT_SOFTLOCKUP=y # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_KOBJECT is not set # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_FS is not set # CONFIG_DEBUG_VM is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_CROSSCOMPILE=y CONFIG_CMDLINE="" # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_KGDB is not set # CONFIG_SB1XXX_CORELIS is not set # CONFIG_RUNTIME_DEBUG is not set # # Security options # CONFIG_KEYS=y CONFIG_KEYS_DEBUG_PROC_KEYS=y # CONFIG_SECURITY is not set # # Cryptographic options # CONFIG_CRYPTO=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_MD4=y CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_BLOWFISH=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_SERPENT=y CONFIG_CRYPTO_AES=m # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set CONFIG_CRYPTO_TEA=m # CONFIG_CRYPTO_ARC4 is not set CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_MICHAEL_MIC=y # CONFIG_CRYPTO_CRC32C is not set # CONFIG_CRYPTO_TEST is not set # # Hardware crypto devices # # # Library routines # # CONFIG_CRC_CCITT is not set # CONFIG_CRC16 is not set CONFIG_CRC32=y # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y From rostedt@goodmis.org Fri Apr 14 22:08:18 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 14 Apr 2006 22:08:27 +0100 (BST) Received: from ms-smtp-04.nyroc.rr.com ([24.24.2.58]:59055 "EHLO ms-smtp-04.nyroc.rr.com") by ftp.linux-mips.org with ESMTP id S8133461AbWDNVIS (ORCPT ); Fri, 14 Apr 2006 22:08:18 +0100 Received: from [192.168.23.10] (cpe-24-94-51-176.stny.res.rr.com [24.94.51.176]) by ms-smtp-04.nyroc.rr.com (8.13.4/8.13.4) with ESMTP id k3ELItOg007003; Fri, 14 Apr 2006 17:18:57 -0400 (EDT) Subject: [PATCH 00/05] robust per_cpu allocation for modules From: Steven Rostedt To: LKML , Andrew Morton Cc: Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, paulus@samba.org, linux390@de.ibm.com, lethal@linux-sh.org, davem@davemloft.net, chris@zankel.net Content-Type: text/plain Date: Fri, 14 Apr 2006 17:18:55 -0400 Message-Id: <1145049535.1336.128.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: Symantec AntiVirus Scan Engine Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11102 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: rostedt@goodmis.org Precedence: bulk X-list: linux-mips The current method of allocating space for per_cpu variables in modules is not robust and consumes quite a bit of space. per_cpu variables: The per_cpu variables are declared by code that needs to have variables spaced out by cache lines on SMP machines, such that, writing to any of these variables on one CPU wont be in danger of writing into a cache line of a global variable shared by other CPUs. If this were to happen, the performance would go down by having the CPUs unnecessarily needing to update cache lines across CPUs for even read only global variables. To solve this, a developer needs only to declare a per_cpu variable using the DECLARE_PER_CPU(type, var) macro. This would then place the variable into the .data.percpu section. On boot up, an area is allocated by the size of this section + PERCPU_ENOUGH_ROOM (mentioned later) times NR_CPUS. Then the .data.percpu section is copied into this area once for NR_CPUS. The .data.percpu section is later discarded (the variables now exist in the allocated area). The __per_cpu_offset[] array holds the difference between the .data.percpu section and the location where the data is actually stored. __per_cpu_offset[0] holds the difference for the variables assigned to cpu 0, __per_cpu_offset[1] holds the difference for the variables to cpu 1, and so on. To access a per_cpu variable, the per_cpu(var, cpu) macro is used. This macro returns the address of the variable (still pointing to the discarded .data.percpu section) plus the __per_cpu_offset[cpu]. So the result is the location to the actual variable for the specified CPU located in the allocated area. Modules: Since there is no way to know from per_cpu if the variable was part of a module, or part of the kernel, the variables for the module need to be located in the same allocated area as the per_cpu variables created in the kernel. Why is that? The per_cpu variables are used in the kernel basically like normal variables. For example: with: DEFINE_PER_CPU(int, myint); we can do the following: per_cpu(myint, cpu) = 4; int i = per_cpu(myint, cpu); int *i = &per_cpu(myint, cpu); Not to mention that we can export these variables as well so that a module can be using a per_cpu variable from the kernel, or even declared in another module and exported (the net code does this). Now remember, the variables are still located in the discarded sections, but their content is in allocated space offset per cpu. We have a single array storing these offsets (__per_cpu_offset). So this makes it very difficult to define special DEFINE/DECLARE_PER_CPU macros and use the CONFIG_MODULE to play magic in figuring things out. Mainly because we have one per_cpu macro that can be used in a module referencing per_cpu variables declared in the kernel, declared in the given module, or even declared in another module. PERCPU_ENOUGH_ROOM: When you configure an SMP kernel with loadable modules, the kernel needs to take an aggressive stance and preallocate enough room to hold the per_cpu variables in all the modules that could be loaded. To make matters worst, this space is allocated per cpu! So if you have a 64 processor machine with loadable modules, you are allocating extra space for each of the 64 CPUs even if you never load a module that has a per_cpu variable in it! Currently PERCPU_ENOUGH_ROOM is defined as 32768 (32K). On my 2x intel SMP machine, with my normal configuration, using 2.6.17-rc1, the size of .data.percpu is 17892 (17K). So the extra space for the modules is 32768 - 17892 = 14876 (14K). Now this is needed for every CPU so I am actually using 14876 * 2 = 29752 (or 29K). Now looking at the modules that I have loaded, none of them had a .data.percpu section defined, so that 29K was a complete waste! So the current solution has two flaws: 1. not robust. If we someday add more modules that together take up more than 14K, we need to manually update the PERCPU_ENOUGH_ROOM. 2. waste of memory. We have 14K of memory wasted per CPU. Remember a 64 processor machine would be wasting 896K of memory! A solution: I spent some time trying to come up with a solution to all this. Something that wouldn't be too intrusive to the way things already work. I received nice input from Andi Kleen and Thomas Gleixner. I first tried to use the __builtin_choose_expr and __builtin_types_compatible_p to determine if a variable is from the kernel or modules at compile time. But unfortunately, I've been told that makes things too complex, but even worst it had "show stopping" flaws. Ideally this could be resolved at link time of the module, but that too would require looking into the relocation tables which are different for every architecture. This would be too intrusive, and prone to bugs. So I went for a much simpler solution. This solution is not optimal in saving space, but it does much better than what is currently implemented, and is still easy to understand and manage, which alone may outweigh an optimal space solution. First off, if CONFIG_SMP or CONFIG_MODULES is not set, the solution is the same as it currently is. So my solution only affects the kernel if both CONFIG_SMP and CONFIG_MODULES are set (this is the same configuration that wastes the memory in the current implementation). I created a new section called, .data.percpu_offset. This section will hold a pointer for every variable that is declared as per_cpu with DEFINE_PER_CPU. Although this wastes space too, the amount of space needed for my setup (the same configuration that wastes 14K per cpu) is 4368 (4K). Since this section is not copied for every CPU, this saves us 10K for the first cpu (14 - 4) and 14K for every CPU after that! So this saves on my setup 24K. (Note: I noticed that I used the default NR_CPUS which is 8, so this really saved me 108K). The data in .data.percpu_offset holds is referenced by the per_cpu variable name which points to the __per_cpu_offset array. For modules, it will point to the per_cpu_offset array of the module. Example: DEFINE_PER_CPU(int, myint); would now create a variable called per_cpu_offset__myint in the .data.percpu_offset section. This variable will point to the (if defined in the kernel) __per_cpu_offset[] array. If this was a module variable, it would point to the module per_cpu_offset[] array which is created when the modules is loaded. So now I get rid of the PERCPU_ENOUGH_ROOM constant and some of the complexity in kernel/module.c that shares code with the kernel, and each module has it's own allocation of per_cpu data. And this means the per_cpu data is more robust (can handle future changes in the modules) and saves up space. Draw backs: The one draw back I have on this, is because the DECLARE_PER_CPU macro declares two variables now, you can't declare a "static DEFINE_PER_CPU". So instead I created a DEFINE_STATIC_PER_CPU macro to handle this case. The following patch set is against 2.6.17-rc1, but this patch set is currently only for i386. I have a x86_64 that I can work on to port, but I will need the help of others to port to some other archs, mostly the other 64 bit archs. I tried to CC the maintainers of the other archs (those listed in the vmlinux.lds, include/asm-/percpu.h files and the MAINTAINER file). I'm not going to spam the CC list (nor Andrew) with the rest of the patches (only 5). Please see LKML for the rest. -- Steve From akpm@osdl.org Fri Apr 14 22:59:25 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 14 Apr 2006 22:59:33 +0100 (BST) Received: from smtp.osdl.org ([65.172.181.4]:910 "EHLO smtp.osdl.org") by ftp.linux-mips.org with ESMTP id S8133482AbWDNV7Z (ORCPT ); Fri, 14 Apr 2006 22:59:25 +0100 Received: from shell0.pdx.osdl.net (fw.osdl.org [65.172.181.6]) by smtp.osdl.org (8.12.8/8.12.8) with ESMTP id k3EM48tH031292 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Fri, 14 Apr 2006 15:04:09 -0700 Received: from akpm.pao.digeo.com (shell0.pdx.osdl.net [10.9.0.31]) by shell0.pdx.osdl.net (8.13.1/8.11.6) with SMTP id k3EM3vnJ010157; Fri, 14 Apr 2006 15:03:59 -0700 Date: Fri, 14 Apr 2006 15:06:25 -0700 From: Andrew Morton To: Steven Rostedt Cc: linux-kernel@vger.kernel.org, torvalds@osdl.org, mingo@elte.hu, tglx@linutronix.de, ak@suse.de, mj@atrey.karlin.mff.cuni.cz, bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, chris@zankel.net, marc@tensilica.com, joe@tensilica.com, davidm@hpl.hp.com, rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, paulus@samba.org, linux390@de.ibm.com, davem@davemloft.net Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules Message-Id: <20060414150625.3ba369d2.akpm@osdl.org> In-Reply-To: <1145049535.1336.128.camel@localhost.localdomain> References: <1145049535.1336.128.camel@localhost.localdomain> X-Mailer: Sylpheed version 1.0.0 (GTK+ 1.2.10; i386-vine-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-MIMEDefang-Filter: osdl$Revision: 1.133 $ X-Scanned-By: MIMEDefang 2.36 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11103 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: akpm@osdl.org Precedence: bulk X-list: linux-mips Steven Rostedt wrote: > > Example: > > DEFINE_PER_CPU(int, myint); > > would now create a variable called per_cpu_offset__myint in > the .data.percpu_offset section. Suppose two .c files each have DEFINE_STATIC_PER_CPU(myint) Do we end up with two per_cpu_offset__myint's in the same section? From kenneth.w.chen@intel.com Fri Apr 14 23:00:59 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 14 Apr 2006 23:01:08 +0100 (BST) Received: from mga03.intel.com ([143.182.124.21]:94 "EHLO azsmga101-1.ch.intel.com") by ftp.linux-mips.org with ESMTP id S8133482AbWDNWA7 (ORCPT ); Fri, 14 Apr 2006 23:00:59 +0100 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101-1.ch.intel.com with ESMTP; 14 Apr 2006 15:12:58 -0700 Received: from azsmsx331.ch.intel.com (HELO azsmsx331-2.ch.intel.com) ([10.2.161.41]) by azsmga001.ch.intel.com with ESMTP; 14 Apr 2006 15:12:58 -0700 X-IronPort-AV: i="4.04,121,1144047600"; d="scan'208"; a="23376468:sNHT25077682" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by azsmsx331-2.ch.intel.com with Microsoft SMTPSVC(6.0.3790.1830); Fri, 14 Apr 2006 15:12:56 -0700 Received: from azsmsx331.ch.intel.com (HELO azsmsx331-2.ch.intel.com) ([10.2.161.41]) by orsmga001.jf.intel.com with ESMTP; 14 Apr 2006 15:12:53 -0700 X-IronPort-AV: i="4.04,121,1144047600"; d="scan'208"; a="23405727:sNHT15785287" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by azsmsx331-2.ch.intel.com with Microsoft SMTPSVC(6.0.3790.1830); Fri, 14 Apr 2006 15:12:52 -0700 Received: from kwchen-mobl1.amr.corp.intel.com (HELO kwchenmobl1) ([10.3.52.228]) by orsmga001.jf.intel.com with ESMTP; 14 Apr 2006 15:12:51 -0700 Message-Id: <4t16i2$ma94t@orsmga001.jf.intel.com> TrustExchangeSourcedMail: True X-IronPort-AV: i="4.04,121,1144047600"; d="scan'208"; a="23405725:sNHT17212258" From: "Chen, Kenneth W" To: "'Steven Rostedt'" , "LKML" , "Andrew Morton" Cc: "Linus Torvalds" , "Ingo Molnar" , "Thomas Gleixner" , "Andi Kleen" , "Martin Mares" , , , , , "Chris Zankel" , "Marc Gauthier" , "Joe Taylor" , "David Mosberger-Tang" , , , , "Luck, Tony" , , , , , , , , , , , Subject: RE: [PATCH 00/05] robust per_cpu allocation for modules Date: Fri, 14 Apr 2006 15:12:52 -0700 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Office Outlook, Build 11.0.6353 Thread-Index: AcZgCRaKo5LPRXFvTha4PDZxynOXogAByO9A In-Reply-To: <1145049535.1336.128.camel@localhost.localdomain> X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2180 X-OriginalArrivalTime: 14 Apr 2006 22:12:52.0761 (UTC) FILETIME=[92F06890:01C66010] Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11104 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: kenneth.w.chen@intel.com Precedence: bulk X-list: linux-mips Steven Rostedt wrote on Friday, April 14, 2006 2:19 PM > So the current solution has two flaws: > 1. not robust. If we someday add more modules that together take up > more than 14K, we need to manually update the PERCPU_ENOUGH_ROOM. > 2. waste of memory. We have 14K of memory wasted per CPU. Remember > a 64 processor machine would be wasting 896K of memory! If someone who has the money to own a 64-process machine, 896K of memory is pocket change ;-) - Ken From rostedt@goodmis.org Fri Apr 14 23:01:38 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 14 Apr 2006 23:01:56 +0100 (BST) Received: from ms-smtp-02.nyroc.rr.com ([24.24.2.56]:38062 "EHLO ms-smtp-02.nyroc.rr.com") by ftp.linux-mips.org with ESMTP id S8133482AbWDNWBi (ORCPT ); Fri, 14 Apr 2006 23:01:38 +0100 Received: from [192.168.23.10] (cpe-24-94-51-176.stny.res.rr.com [24.94.51.176]) by ms-smtp-02.nyroc.rr.com (8.13.4/8.13.4) with ESMTP id k3EMCO9t012386; Fri, 14 Apr 2006 18:12:25 -0400 (EDT) Date: Fri, 14 Apr 2006 18:12:24 -0400 (EDT) From: Steven Rostedt X-X-Sender: rostedt@gandalf.stny.rr.com To: Andrew Morton cc: linux-kernel@vger.kernel.org, torvalds@osdl.org, mingo@elte.hu, tglx@linutronix.de, ak@suse.de, mj@atrey.karlin.mff.cuni.cz, bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, chris@zankel.net, marc@tensilica.com, joe@tensilica.com, davidm@hpl.hp.com, rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, paulus@samba.org, linux390@de.ibm.com, davem@davemloft.net Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules In-Reply-To: <20060414150625.3ba369d2.akpm@osdl.org> Message-ID: References: <1145049535.1336.128.camel@localhost.localdomain> <20060414150625.3ba369d2.akpm@osdl.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Virus-Scanned: Symantec AntiVirus Scan Engine Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11105 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: rostedt@goodmis.org Precedence: bulk X-list: linux-mips On Fri, 14 Apr 2006, Andrew Morton wrote: > Steven Rostedt wrote: > > > > Example: > > > > DEFINE_PER_CPU(int, myint); > > > > would now create a variable called per_cpu_offset__myint in > > the .data.percpu_offset section. > > Suppose two .c files each have > > DEFINE_STATIC_PER_CPU(myint) > > Do we end up with two per_cpu_offset__myint's in the same section? > Both variables are defined as static: ie. #define DEFINE_STATIC_PER_CPU(type, name) \ static __attribute__((__section__(".data.percpu_offset"))) unsigned long *per_cpu_offset__##name; \ static __attribute__((__section__(".data.percpu"))) __typeof__(type) per_cpu__##name So the per_cpu_offset__myint is also static, and gcc should treat it properly. Although, yes there are probably going to be two variables named per_cpu_offset__myint in the same section, but the scope of those should only be visible by who sees the static. Works like any other variable that's static, and even the current way DEFINE_PER_CPU works with statics. Thanks, -- Steve From geoffrey.levand@am.sony.com Sat Apr 15 00:27:21 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 15 Apr 2006 00:27:32 +0100 (BST) Received: from mail8.fw-sd.sony.com ([160.33.66.75]:8352 "EHLO mail8.fw-sd.sony.com") by ftp.linux-mips.org with ESMTP id S8133715AbWDNX1V (ORCPT ); Sat, 15 Apr 2006 00:27:21 +0100 Received: from mail3.sjc.in.sel.sony.com (mail3.sjc.in.sel.sony.com [43.134.1.211]) by mail8.fw-sd.sony.com (8.12.11/8.12.11) with ESMTP id k3ENdHfp010566; Fri, 14 Apr 2006 23:39:17 GMT Received: from [192.168.1.10] ([43.134.85.105]) by mail3.sjc.in.sel.sony.com (8.12.11/8.12.11) with ESMTP id k3ENdHSC015891; Fri, 14 Apr 2006 23:39:17 GMT Message-ID: <444032A5.3030304@am.sony.com> Date: Fri, 14 Apr 2006 16:39:17 -0700 From: Geoff Levand User-Agent: Mozilla Thunderbird 1.0.7-1.1.fc4 (X11/20050929) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Atsushi Nemoto , ralf@linux-mips.org CC: "Levand, Geoffrey" , linux-mips@linux-mips.org Subject: Re: tx49 Ether problems References: <20060415.010518.126141918.anemo@mba.ocn.ne.jp> In-Reply-To: <20060415.010518.126141918.anemo@mba.ocn.ne.jp> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11106 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: geoffrey.levand@am.sony.com Precedence: bulk X-list: linux-mips Atsushi Nemoto wrote: > On Fri, 14 Apr 2006 08:38:00 -0700, Geoff Levand > wrote: >> I seem to get a lot of problems with an nfs root fs >> on tx4937 board. I haven't looked at it closely yet, >> but I guess its some problem with the ne2000 driver. >> I wanted to know if you know anything about this. > > Please look at: > > http://www.linux-mips.org/cgi-bin/mesg.cgi?a=linux-mips&i=20060226.23054 > 1.75185772.anemo%40mba.ocn.ne.jp > > With a quick glance of ne.c, it seems ei_status.stop_page should be > changed to 0x60 on the board. Please confirm its value. > Yes, this seems to fix the problem. -Geoff Index: 2.6.16.1/drivers/net/ne.c =================================================================== --- 2.6.16.1.orig/drivers/net/ne.c 2006-04-14 15:54:41.000000000 -0700 +++ 2.6.16.1/drivers/net/ne.c 2006-04-14 16:27:51.000000000 -0700 @@ -140,7 +140,8 @@ #define NE1SM_START_PG 0x20 /* First page of TX buffer */ #define NE1SM_STOP_PG 0x40 /* Last page +1 of RX ring */ #define NESM_START_PG 0x40 /* First page of TX buffer */ -#define NESM_STOP_PG 0x80 /* Last page +1 of RX ring */ +#define NESM_8_STOP_PG 0x60 /* Last page +1 of RX ring, RTL8019 8 bit mode */ +#define NESM_STOP_PG 0x80 /* Last page +1 of RX ring */ #if defined(CONFIG_PLAT_MAPPI) # define DCR_VAL 0x4b @@ -516,6 +517,7 @@ ei_status.tx_start_page = start_page; ei_status.stop_page = stop_page; #if defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938) + ei_status.stop_page = NESM_8_STOP_PG; wordlength = 1; #endif From rostedt@goodmis.org Sat Apr 15 03:58:55 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 15 Apr 2006 03:59:06 +0100 (BST) Received: from ms-smtp-04.nyroc.rr.com ([24.24.2.58]:36500 "EHLO ms-smtp-04.nyroc.rr.com") by ftp.linux-mips.org with ESMTP id S8133721AbWDOC6z (ORCPT ); Sat, 15 Apr 2006 03:58:55 +0100 Received: from [192.168.23.10] (cpe-24-94-51-176.stny.res.rr.com [24.94.51.176]) by ms-smtp-04.nyroc.rr.com (8.13.4/8.13.4) with ESMTP id k3F3APqT003523; Fri, 14 Apr 2006 23:10:26 -0400 (EDT) Subject: [PATCH 00/08] robust per_cpu allocation for modules - V2 From: Steven Rostedt To: LKML Cc: Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, paulus@samba.org, linux390@de.ibm.com, davem@davemloft.net, SamRavnborg In-Reply-To: <1145049535.1336.128.camel@localhost.localdomain> References: <1145049535.1336.128.camel@localhost.localdomain> Content-Type: text/plain Date: Fri, 14 Apr 2006 23:10:24 -0400 Message-Id: <1145070624.27407.26.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: Symantec AntiVirus Scan Engine Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11107 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: rostedt@goodmis.org Precedence: bulk X-list: linux-mips This is version 2 of the percpu patch set. Changes from version 1: - Created a PERCPU_OFFSET variable to use in vmlinux.lds.h (suggested by Sam Ravnborg) - Added support for x86_64 (Steven Rostedt) The support for x86_64 goes back to the asm-generic handling when both CONFIG_SMP and CONFIG_MODULES are set. This is due to the fact that the __per_cpu_offset array is no longer referenced in per_cpu, but instead a per per_cpu variable is used to find the offset. Again, the rest of the patches are only sent to the LKML. Still I need help to port this to the rest of the architectures. Thanks, -- Steve From bunk@stusta.de Sat Apr 15 15:11:08 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 15 Apr 2006 15:11:17 +0100 (BST) Received: from emailhub.stusta.mhn.de ([141.84.69.5]:41742 "HELO mailout.stusta.mhn.de") by ftp.linux-mips.org with SMTP id S8133514AbWDOOLI (ORCPT ); Sat, 15 Apr 2006 15:11:08 +0100 Received: (qmail 8994 invoked from network); 15 Apr 2006 14:23:16 -0000 Received: from r063144.stusta.swh.mhn.de (10.150.63.144) by mailout.stusta.mhn.de with SMTP; 15 Apr 2006 14:23:16 -0000 Received: by r063144.stusta.swh.mhn.de (Postfix, from userid 1000) id F3E2E18106; Sat, 15 Apr 2006 16:23:16 +0200 (CEST) Date: Sat, 15 Apr 2006 16:23:16 +0200 From: Adrian Bunk To: Samuel.Ortiz@nokia.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, Jean-Luc Leger Subject: [2.6 patch] fix the AU1000_FIR dependencies Message-ID: <20060415142316.GH15022@stusta.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.11+cvs20060403 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11108 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: bunk@stusta.de Precedence: bulk X-list: linux-mips This patrch fixes the AU1000_FIR dependencies. Spotted by Jean-Luc Leger. Signed-off-by: Adrian Bunk --- linux-2.6.17-rc1-mm2-full/drivers/net/irda/Kconfig.old 2006-04-15 16:17:36.000000000 +0200 +++ linux-2.6.17-rc1-mm2-full/drivers/net/irda/Kconfig 2006-04-15 16:18:06.000000000 +0200 @@ -350,7 +350,7 @@ config AU1000_FIR tristate "Alchemy Au1000 SIR/FIR" - depends on MIPS_AU1000 && IRDA + depends on SOC_AU1000 && IRDA config SMC_IRCC_FIR tristate "SMSC IrCC (EXPERIMENTAL)" From nickpiggin@yahoo.com.au Sat Apr 15 19:46:16 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 15 Apr 2006 19:46:26 +0100 (BST) Received: from smtp109.mail.mud.yahoo.com ([209.191.85.219]:50358 "HELO smtp109.mail.mud.yahoo.com") by ftp.linux-mips.org with SMTP id S8133543AbWDOSqQ (ORCPT ); Sat, 15 Apr 2006 19:46:16 +0100 Received: (qmail 34515 invoked from network); 15 Apr 2006 05:32:25 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com.au; h=Received:Message-ID:Date:From:User-Agent:X-Accept-Language:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Content-Transfer-Encoding; b=5xB/LXGcOqlmU7cxQqVDB2BvHv9bQNqBkpJzgwo6QEO6oiOKgrrzFoA9pylW7iF37saoVBaQxzzxort+U0SKu8buzkxu7DUqmGXWG7CsQ76Ua5lpcxxCOL/+OSEerqnavEXd54/3O4J3Ppw815kAWxhWltl6nXSEk02O0oN72lo= ; Received: from unknown (HELO ?192.168.0.1?) (nickpiggin@203.173.5.206 with plain) by smtp109.mail.mud.yahoo.com with SMTP; 15 Apr 2006 05:32:25 -0000 Message-ID: <4440855A.7040203@yahoo.com.au> Date: Sat, 15 Apr 2006 15:32:10 +1000 From: Nick Piggin User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.12) Gecko/20051007 Debian/1.7.12-1 X-Accept-Language: en MIME-Version: 1.0 To: Steven Rostedt CC: LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, paulus@samba.org, linux390@de.ibm.com, davem@davemloft.net Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules References: <1145049535.1336.128.camel@localhost.localdomain> In-Reply-To: <1145049535.1336.128.camel@localhost.localdomain> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11109 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: nickpiggin@yahoo.com.au Precedence: bulk X-list: linux-mips Steven Rostedt wrote: > would now create a variable called per_cpu_offset__myint in > the .data.percpu_offset section. This variable will point to the (if > defined in the kernel) __per_cpu_offset[] array. If this was a module > variable, it would point to the module per_cpu_offset[] array which is > created when the modules is loaded. If I'm following you correctly, this adds another dependent load to a per-CPU data access, and from memory that isn't node-affine. If so, I think people with SMP and NUMA kernels would care more about performance and scalability than the few k of memory this saves. -- SUSE Labs, Novell Inc. Send instant messages to your online friends http://au.messenger.yahoo.com From rostedt@goodmis.org Sat Apr 15 21:06:01 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 15 Apr 2006 21:07:18 +0100 (BST) Received: from ms-smtp-04.nyroc.rr.com ([24.24.2.58]:63105 "EHLO ms-smtp-04.nyroc.rr.com") by ftp.linux-mips.org with ESMTP id S8133543AbWDOUGB (ORCPT ); Sat, 15 Apr 2006 21:06:01 +0100 Received: from [192.168.23.10] (cpe-24-94-51-176.stny.res.rr.com [24.94.51.176]) by ms-smtp-04.nyroc.rr.com (8.13.4/8.13.4) with ESMTP id k3FKH17L021633; Sat, 15 Apr 2006 16:17:01 -0400 (EDT) Date: Sat, 15 Apr 2006 16:17:01 -0400 (EDT) From: Steven Rostedt X-X-Sender: rostedt@gandalf.stny.rr.com To: Nick Piggin cc: LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, paulus@samba.org, linux390@de.ibm.com, davem@davemloft.net Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules In-Reply-To: <4440855A.7040203@yahoo.com.au> Message-ID: References: <1145049535.1336.128.camel@localhost.localdomain> <4440855A.7040203@yahoo.com.au> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Virus-Scanned: Symantec AntiVirus Scan Engine Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11110 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: rostedt@goodmis.org Precedence: bulk X-list: linux-mips On Sat, 15 Apr 2006, Nick Piggin wrote: > Steven Rostedt wrote: > > > would now create a variable called per_cpu_offset__myint in > > the .data.percpu_offset section. This variable will point to the (if > > defined in the kernel) __per_cpu_offset[] array. If this was a module > > variable, it would point to the module per_cpu_offset[] array which is > > created when the modules is loaded. > > If I'm following you correctly, this adds another dependent load > to a per-CPU data access, and from memory that isn't node-affine. > > If so, I think people with SMP and NUMA kernels would care more > about performance and scalability than the few k of memory this > saves. It's not just about saving memory, but also to make it more robust. But that's another story. Since both the offset array, and the variables are mainly read only (only written on boot up), added the fact that the added variables are in their own section. Couldn't something be done to help pre load this in a local cache, or something similar? I understand SMP issues pretty well, but NUMA is still somewhat foreign to me. -- Steve From sshtylyov@ru.mvista.com Sat Apr 15 21:41:33 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 15 Apr 2006 21:41:51 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:17065 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133543AbWDOUld (ORCPT ); Sat, 15 Apr 2006 21:41:33 +0100 Received: (qmail 5600 invoked from network); 16 Apr 2006 00:56:13 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 16 Apr 2006 00:56:13 -0000 Message-ID: <44415D17.1070005@ru.mvista.com> Date: Sun, 16 Apr 2006 00:52:39 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: Geoff Levand CC: Atsushi Nemoto , ralf@linux-mips.org, linux-mips@linux-mips.org Subject: Re: tx49 Ether problems References: <20060415.010518.126141918.anemo@mba.ocn.ne.jp> <444032A5.3030304@am.sony.com> In-Reply-To: <444032A5.3030304@am.sony.com> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11111 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips Hello. Geoff Levand wrote: >>On Fri, 14 Apr 2006 08:38:00 -0700, Geoff Levand >> wrote: >>>I seem to get a lot of problems with an nfs root fs >>>on tx4937 board. I haven't looked at it closely yet, >>>but I guess its some problem with the ne2000 driver. >>>I wanted to know if you know anything about this. >>Please look at: >>http://www.linux-mips.org/cgi-bin/mesg.cgi?a=linux-mips&i=20060226.23054 >>1.75185772.anemo%40mba.ocn.ne.jp >>With a quick glance of ne.c, it seems ei_status.stop_page should be >>changed to 0x60 on the board. Please confirm its value. > Yes, this seems to fix the problem. > Index: 2.6.16.1/drivers/net/ne.c > =================================================================== > --- 2.6.16.1.orig/drivers/net/ne.c 2006-04-14 15:54:41.000000000 -0700 > +++ 2.6.16.1/drivers/net/ne.c 2006-04-14 16:27:51.000000000 -0700 > @@ -140,7 +140,8 @@ > #define NE1SM_START_PG 0x20 /* First page of TX buffer */ > #define NE1SM_STOP_PG 0x40 /* Last page +1 of RX ring */ > #define NESM_START_PG 0x40 /* First page of TX buffer */ > -#define NESM_STOP_PG 0x80 /* Last page +1 of RX ring */ > +#define NESM_8_STOP_PG 0x60 /* Last page +1 of RX ring, RTL8019 8 bit mode */ > +#define NESM_STOP_PG 0x80 /* Last page +1 of RX ring */ > > #if defined(CONFIG_PLAT_MAPPI) > # define DCR_VAL 0x4b > @@ -516,6 +517,7 @@ > ei_status.tx_start_page = start_page; > ei_status.stop_page = stop_page; > #if defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938) > + ei_status.stop_page = NESM_8_STOP_PG; > wordlength = 1; > #endif This is really strange place for that #ifdef -- 'wordlength' is determined much earlier in this function (and stop_page is set to 0x40 for 8-bit case), shouldn't #ifdef be moved instead? WBR, Sergei From nickpiggin@yahoo.com.au Sun Apr 16 03:35:26 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 16 Apr 2006 03:35:36 +0100 (BST) Received: from smtp108.mail.mud.yahoo.com ([209.191.85.218]:63358 "HELO smtp108.mail.mud.yahoo.com") by ftp.linux-mips.org with SMTP id S8133721AbWDPCf0 (ORCPT ); Sun, 16 Apr 2006 03:35:26 +0100 Received: (qmail 48349 invoked from network); 16 Apr 2006 02:47:30 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com.au; h=Received:Message-ID:Date:From:User-Agent:X-Accept-Language:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Content-Transfer-Encoding; b=0Y0ORF1oarZ8AXm1g7Pizo0yBb+ji4fqmn0ipmML1auVaaYFtidM2OXa+tJRz02rr56cdfJ5I9Mw0ZoXbxwr38/WwDPN9eshOTe8q/u06tvAtk2U6+rh69sp0ptLAC2ERqxB27SWYwmn7qyXppBsQBpjVYyXuDnhaP+mpt3Po3U= ; Received: from unknown (HELO ?192.168.0.1?) (nickpiggin@203.173.5.206 with plain) by smtp108.mail.mud.yahoo.com with SMTP; 16 Apr 2006 02:47:29 -0000 Message-ID: <4441B02D.4000405@yahoo.com.au> Date: Sun, 16 Apr 2006 12:47:09 +1000 From: Nick Piggin User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.12) Gecko/20051007 Debian/1.7.12-1 X-Accept-Language: en MIME-Version: 1.0 To: Steven Rostedt CC: LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, paulus@samba.org, linux390@de.ibm.com, davem@davemloft.net Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules References: <1145049535.1336.128.camel@localhost.localdomain> <4440855A.7040203@yahoo.com.au> In-Reply-To: Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11112 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: nickpiggin@yahoo.com.au Precedence: bulk X-list: linux-mips Steven Rostedt wrote: > On Sat, 15 Apr 2006, Nick Piggin wrote: > > >>Steven Rostedt wrote: >> >> >>> would now create a variable called per_cpu_offset__myint in >>>the .data.percpu_offset section. This variable will point to the (if >>>defined in the kernel) __per_cpu_offset[] array. If this was a module >>>variable, it would point to the module per_cpu_offset[] array which is >>>created when the modules is loaded. >> >>If I'm following you correctly, this adds another dependent load >>to a per-CPU data access, and from memory that isn't node-affine. >> >>If so, I think people with SMP and NUMA kernels would care more >>about performance and scalability than the few k of memory this >>saves. > > > It's not just about saving memory, but also to make it more robust. But > that's another story. But making it slower isn't going to be popular. Why is your module using so much per-cpu memory, anyway? > > Since both the offset array, and the variables are mainly read only (only > written on boot up), added the fact that the added variables are in their > own section. Couldn't something be done to help pre load this in a local > cache, or something similar? It it would still add to the dependent loads on the critical path, so it now prevents the compiler/programmer/oooe engine from speculatively loading the __per_cpu_offset. And it does increase cache footprint of per-cpu accesses, which are supposed to be really light and substitute for [NR_CPUS] arrays. I don't think it would have been hard for the original author to make it robust... just not both fast and robust. PERCPU_ENOUGH_ROOM seems like an ugly hack at first glance, but I'm fairly sure it was a result of design choices. -- SUSE Labs, Novell Inc. Send instant messages to your online friends http://au.messenger.yahoo.com From rostedt@goodmis.org Sun Apr 16 04:43:18 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 16 Apr 2006 04:43:29 +0100 (BST) Received: from ms-smtp-03.nyroc.rr.com ([24.24.2.57]:22426 "EHLO ms-smtp-03.nyroc.rr.com") by ftp.linux-mips.org with ESMTP id S8126482AbWDPDnS (ORCPT ); Sun, 16 Apr 2006 04:43:18 +0100 Received: from [192.168.23.10] (cpe-24-94-51-176.stny.res.rr.com [24.94.51.176]) by ms-smtp-03.nyroc.rr.com (8.13.4/8.13.4) with ESMTP id k3G3r00R021434; Sat, 15 Apr 2006 23:53:02 -0400 (EDT) Date: Sat, 15 Apr 2006 23:53:00 -0400 (EDT) From: Steven Rostedt X-X-Sender: rostedt@gandalf.stny.rr.com To: Nick Piggin cc: LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, paulus@samba.org, linux390@de.ibm.com, davem@davemloft.net Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules In-Reply-To: <4441B02D.4000405@yahoo.com.au> Message-ID: References: <1145049535.1336.128.camel@localhost.localdomain> <4440855A.7040203@yahoo.com.au> <4441B02D.4000405@yahoo.com.au> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Virus-Scanned: Symantec AntiVirus Scan Engine Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11113 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: rostedt@goodmis.org Precedence: bulk X-list: linux-mips On Sun, 16 Apr 2006, Nick Piggin wrote: > Steven Rostedt wrote: > > > > It's not just about saving memory, but also to make it more robust. But > > that's another story. > > But making it slower isn't going to be popular. You're right and I've been thinking of modifications to fix that. These patches were to shake up ideas. > > Why is your module using so much per-cpu memory, anyway? Wasn't my module anyway. The problem appeared in the -rt patch set, when tracing was turned on. Some module was affected, and grew it's per_cpu size by quite a bit. In fact we had to increase PERCPU_ENOUGH_ROOM by up to something like 300K. > > > > > Since both the offset array, and the variables are mainly read only (only > > written on boot up), added the fact that the added variables are in their > > own section. Couldn't something be done to help pre load this in a local > > cache, or something similar? > > It it would still add to the dependent loads on the critical path, so > it now prevents the compiler/programmer/oooe engine from speculatively > loading the __per_cpu_offset. > > And it does increase cache footprint of per-cpu accesses, which are > supposed to be really light and substitute for [NR_CPUS] arrays. > > I don't think it would have been hard for the original author to make > it robust... just not both fast and robust. PERCPU_ENOUGH_ROOM seems > like an ugly hack at first glance, but I'm fairly sure it was a result > of design choices. > Yeah, and I discovered the reasons for those choices as I worked on this. I've put a little more thought into this and still think there's a solution to not slow things down. Since the per_cpu_offset section is still smaller than the PERCPU_ENOUGH_ROOM and robust, I could still copy it into a per cpu memory field, and even add the __per_cpu_offset to it. This would still save quite a bit of space. So now I'm asking for advice on some ideas that can be a work around to keep the robustness and speed. Is there a way (for archs that support it) to allocate memory in a per cpu manner. So each CPU would have its own variable table in the memory that is best of it. Then have a field (like the pda in x86_64) to point to this section, and use the linker offsets to index and find the per_cpu variables. So this solution still has one more redirection than the current solution (per_cpu_offset__##var -> __per_cpu_offset -> actual_var where as the current solution is __per_cpu_offset -> actual_var), but all the loads would be done from memory that would only be specified for a particular CPU. The generic case would still be the same as the patches I already sent, but the archs that can support it, can have something like the above. Would something like that be acceptible? Thanks, -- Steve From paulus@ozlabs.org Sun Apr 16 07:23:08 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 16 Apr 2006 07:23:16 +0100 (BST) Received: from ozlabs.org ([203.10.76.45]:36279 "HELO ozlabs.org") by ftp.linux-mips.org with SMTP id S8133465AbWDPGXI (ORCPT ); Sun, 16 Apr 2006 07:23:08 +0100 Received: by ozlabs.org (Postfix, from userid 1003) id B56AD67A60; Sun, 16 Apr 2006 16:35:15 +1000 (EST) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <17473.58781.901412.135671@cargo.ozlabs.ibm.com> Date: Sun, 16 Apr 2006 16:35:09 +1000 From: Paul Mackerras To: Steven Rostedt Cc: LKML , Andrew Morton , linux-mips@linux-mips.org, David Mosberger-Tang , linux-ia64@vger.kernel.org, Martin Mares , spyro@f2s.com, Joe Taylor , linuxppc-dev@ozlabs.org, benedict.gaster@superh.com, bjornw@axis.com, Ingo Molnar , grundler@parisc-linux.org, starvik@axis.com, Linus Torvalds , Thomas Gleixner , rth@twiddle.net, chris@zankel.net, tony.luck@intel.com, Andi Kleen , ralf@linux-mips.org, Marc Gauthier , lethal@linux-sh.org, schwidefsky@de.ibm.com, linux390@de.ibm.com, davem@davemloft.net, parisc-linux@parisc-linux.org Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules In-Reply-To: <1145049535.1336.128.camel@localhost.localdomain> References: <1145049535.1336.128.camel@localhost.localdomain> X-Mailer: VM 7.19 under Emacs 21.4.1 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11114 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: paulus@samba.org Precedence: bulk X-list: linux-mips Steven Rostedt writes: > The data in .data.percpu_offset holds is referenced by the per_cpu > variable name which points to the __per_cpu_offset array. For modules, > it will point to the per_cpu_offset array of the module. > > Example: > > DEFINE_PER_CPU(int, myint); > > would now create a variable called per_cpu_offset__myint in > the .data.percpu_offset section. This variable will point to the (if > defined in the kernel) __per_cpu_offset[] array. If this was a module > variable, it would point to the module per_cpu_offset[] array which is > created when the modules is loaded. This sounds like you have an extra memory reference each time a per-cpu variable is accessed. Have you tried to measure the performance impact of that? If so, how much performance does it lose? Paul. From paulus@ozlabs.org Sun Apr 16 07:50:13 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 16 Apr 2006 07:50:22 +0100 (BST) Received: from ozlabs.org ([203.10.76.45]:2236 "HELO ozlabs.org") by ftp.linux-mips.org with SMTP id S8133423AbWDPGuN (ORCPT ); Sun, 16 Apr 2006 07:50:13 +0100 Received: by ozlabs.org (Postfix, from userid 1003) id 2A1FB67A76; Sun, 16 Apr 2006 17:02:24 +1000 (EST) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <17473.60411.690686.714791@cargo.ozlabs.ibm.com> Date: Sun, 16 Apr 2006 17:02:19 +1000 From: Paul Mackerras To: Steven Rostedt Cc: Nick Piggin , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, linux390@de.ibm.com, davem@davemloft.net, rusty@rustcorp.com.au Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules In-Reply-To: References: <1145049535.1336.128.camel@localhost.localdomain> <4440855A.7040203@yahoo.com.au> <4441B02D.4000405@yahoo.com.au> X-Mailer: VM 7.19 under Emacs 21.4.1 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11115 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: paulus@samba.org Precedence: bulk X-list: linux-mips Steven Rostedt writes: > So now I'm asking for advice on some ideas that can be a work around to > keep the robustness and speed. Ideally, what I'd like to do on powerpc is to dedicate one register to storing a per-cpu base address or offset, and be able to resolve the offset at link time, so that per-cpu variable accesses just become a register + offset memory access. (For modules, "link time" would be module load time.) We *might* be able to use some of the infrastructure that was put into gcc and binutils to support TLS (thread local storage) to achieve this. (See http://people.redhat.com/drepper/tls.pdf for some of the details of that.) Also, I've added Rusty Russell to the cc list, since he designed the per-cpu variable stuff in the first place, and would be able to explain the trade-offs that led to the PERCPU_ENOUGH_ROOM thing. (I think you're discovering them as you go, though. :) Paul. From rostedt@goodmis.org Sun Apr 16 14:30:27 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 16 Apr 2006 14:30:38 +0100 (BST) Received: from ms-smtp-02.nyroc.rr.com ([24.24.2.56]:6567 "EHLO ms-smtp-02.nyroc.rr.com") by ftp.linux-mips.org with ESMTP id S8133560AbWDPNa1 (ORCPT ); Sun, 16 Apr 2006 14:30:27 +0100 Received: from [192.168.23.10] (cpe-24-94-51-176.stny.res.rr.com [24.94.51.176]) by ms-smtp-02.nyroc.rr.com (8.13.4/8.13.4) with ESMTP id k3GDe40t022973; Sun, 16 Apr 2006 09:40:07 -0400 (EDT) Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules From: Steven Rostedt To: Paul Mackerras Cc: Nick Piggin , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, linux390@de.ibm.com, davem@davemloft.net, rusty@rustcorp.com.au In-Reply-To: <17473.60411.690686.714791@cargo.ozlabs.ibm.com> References: <1145049535.1336.128.camel@localhost.localdomain> <4440855A.7040203@yahoo.com.au> <4441B02D.4000405@yahoo.com.au> <17473.60411.690686.714791@cargo.ozlabs.ibm.com> Content-Type: text/plain Date: Sun, 16 Apr 2006 09:40:04 -0400 Message-Id: <1145194804.27407.103.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: Symantec AntiVirus Scan Engine Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11116 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: rostedt@goodmis.org Precedence: bulk X-list: linux-mips On Sun, 2006-04-16 at 17:02 +1000, Paul Mackerras wrote: > Steven Rostedt writes: > > > So now I'm asking for advice on some ideas that can be a work around to > > keep the robustness and speed. > > Ideally, what I'd like to do on powerpc is to dedicate one register to > storing a per-cpu base address or offset, and be able to resolve the > offset at link time, so that per-cpu variable accesses just become a > register + offset memory access. (For modules, "link time" would be > module load time.) That was my original goal too, but the per_cpu and modules has problems to solve this. > > We *might* be able to use some of the infrastructure that was put into > gcc and binutils to support TLS (thread local storage) to achieve > this. (See http://people.redhat.com/drepper/tls.pdf for some of the > details of that.) Thanks for the pointer I'll give it a read (but on Monday). > > Also, I've added Rusty Russell to the cc list, since he designed the > per-cpu variable stuff in the first place, and would be able to > explain the trade-offs that led to the PERCPU_ENOUGH_ROOM thing. (I > think you're discovering them as you go, though. :) Thanks for adding Rusty, I thought I did, but looking back to my original posts, I must have missed him. Since Rusty's on the list now, here's the issues I have already found that caused the use of PERCPU_ENOUGH_ROOM. I'll try to explain them the best I can such that others also understand the issues at hand, and Rusty can jump in and tell us where I missed. I've explained some of this in my first email, but I'll repeat it again here. I'll first explain things how they are done generic and then what I understand the x86_64 does (I believe ppc is similar). The per_cpu variables are defined with the macro DEFINE_PER_CPU(type, var) This macro just places the variable into the section .data.percpu and prepends the prefix "per_cpu__" to the variable. To use this variable in another .c file the declaration is used by the macro DECLARE_PER_CPU(type, var) This macro is simply the extern declaration of the variable with the prefix added. If this variable is to be used outside the kernel, or in the case it was declared in a module and needs to be used in other modules, it is exported with the macro EXPORT_PER_CPU_SYMBOL(var) or EXPORT_PER_CPU_SYMBOL_GPL(var) This macro is the same as their EXPORT_SYMBOL equivalents except that it adds the per_cpu__ prefix. >From the above, it can be seen that on boot up the per_cpu variables are really just allocate once in their own section .data.percpu. So the kernel now figures out the size of this section cache aligns it and then allocates (ALIGN(size,SMP_CACHE_BYTES) * NR_CPUS). It then copies the contents of the .data.percpu section into this newly allocated area NR_CPUS times. The offset for each allocation is stored in the __per_cpu_offset[] array. This offset is the difference from the start of each allocated per_cpu area to the start of the .data.percpu section. Now that the section has been copied for every CPU into it's own area, the original .data.percpu section can be discarded and freed for use elsewhere. To access the per_cpu variables the macro per_cpu(var, cpu) is used. This macro is where the magic happens. The macro adds the prefix "per_cpu__" to the var and then takes its address and adds the offset of __per_cpu_offset[cpu] to it to resolve the actual location that the variable is at. This macro is also done such that it can be used as a normal variable. For example: DEFINE_PER_CPU(int, myint); int t = per_cpu(myint, cpu); per_cpu(myint, cpu) = t; int *y = &per_cpu(myint, cpu); And it handles arrays as well. DEFINE_PER_CPU(int, myintarr[10]); per_cpu(myintarray[3], cpu) = 2; and so on. This is all fine until we add loadable module support that also uses their own per_cpu variables, and it makes it even worst that the modules too can export these variables to be used in other modules. To handle this, Rusty added a reserved area in the per_cpu allocation of PERCPU_ENOUGH_ROOM. This size is meant to hold both the kernel per_cpu variables as well as the module ones. So if CONFIG_MODULES is defined and PERCPU_ENOUGH_ROOM is greater than the size of the .data.percpu section, then the PERCPU_ENOUGH_ROOM is used in the allocation of the per_cpu area. The allocation size is PERCPU_ENOUGH_ROOM * NR_CPUS, and the offsets of each cpu area is separated by PERCPU_ENOUGH_ROOM bytes. When a module is loaded, a slightly complex algorithm is used to find and keep track of what reserved area is available, and which is not. When a module is using per_cpu data, it finds memory in this reserve and then its .data.percpu section is copied into this reserve NR_CPUS times (this isn't quite accurate, since the macro for_each_possible_cpu is used here). The reason that this is done, is that the per_cpu macro cant know whether or not the per_cpu variable was declared in a kernel or in a module. So the __pre_cpu_offset[] array offset can't be used if the module allocation is in its own separate area. Remember that this offset array stores the difference from where the variable originally was and where it is now for each cpu. You might think you could just allocate the space for this in a module since we have control of the linker to place the section anywhere we want, and then play with the difference such that the __per_cpu_offset would find the new location, but this can only work for cpu[0]. Remember that this offset array is spaced by the size of .data.percpu, so how can you guarantee to allocate the space for CPU 1 for a module that would then be offset to the location by __per_cpu_offse[1]? So the module solution cant be solved this way. My solution, was to change this by creating a new section called .data.percpu_offset. This section would hold a pointer to the __per_cpu_offset (for kernel or module) for every per_cpu variable defined. This is done by making DEFINE_PER_CPU(var,cpu) not only define the pre_cpu__##var but also a per_cpu_offset__##var. This way the per_cpu macro can use the name to find the area that the variable resides. And so modules can now allocate their own space. Now a quick description of what x86_64 does. Instead of allocating one big chunk for the per_cpu area that contains the variables for all the CPUs, it allocates one chunk per cpu in the cpu node area. So that the memory for a per_cpu of a given CPU is in an area that can be quickly received by that CPU nicely in a NUMA fashion. This is because instead of using the __pre_cpu_offset array, it uses a PDA descriptor that is used to store data for each CPU. Now my solution is still in its infancy, and can still be optimized. Ideally, we want this to be as fast as the current solution, or at least not any noticeable difference. my current solution doesn't do this, but before we strike it down, is there ways to change that and make it do so. The added space in the .data.percpu_offset is much smaller then the extra space in PERCPU_ENOUGH_ROOM, so if I need to duplicate the .data.percpu_offset, then we still save space and keep it robust where we wont need to ever worry about adjusting PERCPU_ENOUGH_ROOM. But then again, if I where to duplicate this section, then I would have the same problem finding this section as I do with finding the per_cpu__##var! :( I'll think more about this, but maybe someone else has some crazy ideas that can find a solution to this that is both fast and robust. Some ideas come in looking at gcc builtin macros and linker magic. One thing we can tell is the address of these variables, and maybe that can be used in the per_cpu macro to determine where to find the variables. Some people may think I'm stubborn in wanting to fix this, but I still think that, although it's fast, the current solution is somewhat a hack. And I still believe we can clean it up without hurting performance. Thanks for the time in reading all of this. -- Steve From sam@ravnborg.org Sun Apr 16 14:52:46 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 16 Apr 2006 14:52:55 +0100 (BST) Received: from pasmtp.tele.dk ([193.162.159.95]:6931 "HELO pasmtp.tele.dk") by ftp.linux-mips.org with SMTP id S8133570AbWDPNwq (ORCPT ); Sun, 16 Apr 2006 14:52:46 +0100 Received: from mars.ravnborg.org (0x50a0757d.hrnxx9.adsl-dhcp.tele.dk [80.160.117.125]) by pasmtp.tele.dk (Postfix) with ESMTP id 2852F1EC320; Sun, 16 Apr 2006 16:04:03 +0200 (CEST) Received: by mars.ravnborg.org (Postfix, from userid 1000) id 4BF0C43C21C; Sun, 16 Apr 2006 16:03:59 +0200 (CEST) Date: Sun, 16 Apr 2006 16:03:59 +0200 From: Sam Ravnborg To: Steven Rostedt Cc: Paul Mackerras , Nick Piggin , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, linux390@de.ibm.com, davem@davemloft.net, rusty@rustcorp.com.au Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules Message-ID: <20060416140359.GA15091@mars.ravnborg.org> References: <1145049535.1336.128.camel@localhost.localdomain> <4440855A.7040203@yahoo.com.au> <4441B02D.4000405@yahoo.com.au> <17473.60411.690686.714791@cargo.ozlabs.ibm.com> <1145194804.27407.103.camel@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1145194804.27407.103.camel@localhost.localdomain> User-Agent: Mutt/1.5.11 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11117 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sam@ravnborg.org Precedence: bulk X-list: linux-mips On Sun, Apr 16, 2006 at 09:40:04AM -0400, Steven Rostedt wrote: > The per_cpu variables are defined with the macro > DEFINE_PER_CPU(type, var) > > This macro just places the variable into the section .data.percpu and > prepends the prefix "per_cpu__" to the variable. > > To use this variable in another .c file the declaration is used by the > macro > DECLARE_PER_CPU(type, var) > > This macro is simply the extern declaration of the variable with the > prefix added. Suprisingly this macro shows up in ~19 .c files. Only valid usage is forward declaration of a later static definition with DEFINE_PER_CPU. arch/m32r/kernel/smp.c + arch/m32r/kernel/smpboot.c is jsut one example. Just a random comment not related to Steven's patches. Sam From yoichi_yuasa@tripeaks.co.jp Sun Apr 16 15:00:08 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 16 Apr 2006 15:00:29 +0100 (BST) Received: from mo00.po.2iij.Net ([210.130.202.204]:35039 "EHLO mo00.po.2iij.net") by ftp.linux-mips.org with ESMTP id S8133570AbWDPOAI (ORCPT ); Sun, 16 Apr 2006 15:00:08 +0100 Received: NPO MO00 id k3GECN8e019660; Sun, 16 Apr 2006 23:12:23 +0900 (JST) Received: from localhost.localdomain (249.29.30.125.dy.iij4u.or.jp [125.30.29.249]) by mbox.po.2iij.net (NPO-MR/mbox01) id k3GECISm005603 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NOT); Sun, 16 Apr 2006 23:12:20 +0900 (JST) Date: Sun, 16 Apr 2006 23:12:16 +0900 From: Yoichi Yuasa To: Ralf Baechle Cc: linux-mips@linux-mips.org, yoichi_yuasa@tripeaks.co.jp Subject: [PATCH] vr41xx: defconfig update Message-Id: <20060416231216.1accadac.yoichi_yuasa@tripeaks.co.jp> Organization: TriPeaks Corporation X-Mailer: Sylpheed version 1.0.4 (GTK+ 1.2.10; i386-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-Envid: tripeaks.co.jp Envelope-Id: tripeaks.co.jp X-archive-position: 11118 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: yoichi_yuasa@tripeaks.co.jp Precedence: bulk X-list: linux-mips Hi Ralf, This patch updates defconfig for VR41xx machines. Please apply. Yoichi Signed-off-by: Yoichi Yuasa diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/configs/capcella_defconfig mips/arch/mips/configs/capcella_defconfig --- mips-orig/arch/mips/configs/capcella_defconfig 2006-04-16 18:05:09.964059750 +0900 +++ mips/arch/mips/configs/capcella_defconfig 2006-04-16 20:39:33.223572000 +0900 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-rc1 -# Fri Jan 27 15:39:54 2006 +# Linux kernel version: 2.6.17-rc1 +# Sun Apr 16 18:28:22 2006 # CONFIG_MIPS=y @@ -72,6 +72,8 @@ CONFIG_ZAO_CAPCELLA=y CONFIG_PCI_VR41XX=y # CONFIG_VRC4173 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y @@ -91,7 +93,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_CPU_MIPS64_R2 is not set # CONFIG_CPU_R3000 is not set # CONFIG_CPU_TX39XX is not set -# CONFIG_CPU_VR41XX is not set +CONFIG_CPU_VR41XX=y # CONFIG_CPU_R4300 is not set # CONFIG_CPU_R4X00 is not set # CONFIG_CPU_TX49XX is not set @@ -104,18 +106,22 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_CPU_RM7000 is not set # CONFIG_CPU_RM9000 is not set # CONFIG_CPU_SB1 is not set +CONFIG_SYS_HAS_CPU_VR41XX=y +CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y # # Kernel type # -# CONFIG_32BIT is not set +CONFIG_32BIT=y # CONFIG_64BIT is not set CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PAGE_SIZE_16KB is not set # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_MIPS_MT is not set -CONFIG_CPU_HAS_LLSC=y +# CONFIG_CPU_ADVANCED is not set CONFIG_CPU_HAS_SYNC=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y @@ -136,7 +142,6 @@ CONFIG_PREEMPT_NONE=y # Code maturity level options # CONFIG_EXPERIMENTAL=y -CONFIG_CLEAN_COMPILE=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 @@ -152,6 +157,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_EMBEDDED=y @@ -165,11 +171,8 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y -CONFIG_CC_ALIGN_FUNCTIONS=0 -CONFIG_CC_ALIGN_LABELS=0 -CONFIG_CC_ALIGN_LOOPS=0 -CONFIG_CC_ALIGN_JUMPS=0 CONFIG_SLAB=y +CONFIG_DOUBLEFAULT=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # CONFIG_SLOB is not set @@ -180,7 +183,6 @@ CONFIG_BASE_SMALL=0 CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_OBSOLETE_MODPARM=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_KMOD=y @@ -188,6 +190,9 @@ CONFIG_KMOD=y # # Block layer # +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set # # IO Schedulers @@ -207,7 +212,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_HW_HAS_PCI=y CONFIG_PCI=y -CONFIG_PCI_LEGACY_PROC=y CONFIG_MMU=y # @@ -225,6 +229,7 @@ CONFIG_MMU=y # CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_MISC is not set +CONFIG_TRAD_SIGNALS=y # # Networking @@ -234,6 +239,7 @@ CONFIG_NET=y # # Networking options # +# CONFIG_NETDEBUG is not set CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y @@ -256,12 +262,15 @@ CONFIG_IP_PNP_BOOTP=y # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set -CONFIG_INET_TUNNEL=m +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_BIC=y # CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set # CONFIG_NETFILTER is not set # @@ -273,6 +282,11 @@ CONFIG_TCP_CONG_BIC=y # SCTP Configuration (EXPERIMENTAL) # # CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set # CONFIG_VLAN_8021Q is not set @@ -282,11 +296,6 @@ CONFIG_TCP_CONG_BIC=y # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set - -# -# TIPC Configuration (EXPERIMENTAL) -# -# CONFIG_TIPC is not set # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set @@ -303,10 +312,7 @@ CONFIG_TCP_CONG_BIC=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set # CONFIG_BT is not set -CONFIG_IEEE80211=m -# CONFIG_IEEE80211_DEBUG is not set -CONFIG_IEEE80211_CRYPT_WEP=m -CONFIG_IEEE80211_CRYPT_CCMP=m +# CONFIG_IEEE80211 is not set # # Device Drivers @@ -349,10 +355,12 @@ CONFIG_CONNECTOR=m # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set -# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +# CONFIG_BLK_DEV_INITRD is not set # CONFIG_CDROM_PKTCDVD is not set -CONFIG_ATA_OVER_ETH=m +# CONFIG_ATA_OVER_ETH is not set # # ATA/ATAPI/MFM/RLL support @@ -579,6 +587,11 @@ CONFIG_HW_CONSOLE=y # # Non-8250 serial port support # +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_VR41XX=y +CONFIG_SERIAL_VR41XX_CONSOLE=y +# CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 @@ -602,6 +615,7 @@ CONFIG_LEGACY_PTY_COUNT=256 # Ftape, the floppy tape device driver # # CONFIG_DRM is not set +CONFIG_GPIO_VR41XX=y # CONFIG_RAW_DRIVER is not set # @@ -637,10 +651,6 @@ CONFIG_LEGACY_PTY_COUNT=256 # # -# Multimedia Capabilities Port drivers -# - -# # Multimedia devices # # CONFIG_VIDEO_DEV is not set @@ -671,6 +681,7 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y # CONFIG_USB is not set # @@ -688,13 +699,48 @@ CONFIG_USB_ARCH_HAS_OHCI=y # CONFIG_MMC is not set # +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# # InfiniBand support # # CONFIG_INFINIBAND is not set # -# SN Devices +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) +# + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y + +# +# RTC drivers # +# CONFIG_RTC_DRV_M48T86 is not set +CONFIG_RTC_DRV_VR41XX=y +# CONFIG_RTC_DRV_TEST is not set # # File systems @@ -713,7 +759,7 @@ CONFIG_EXT2_FS=y CONFIG_INOTIFY=y # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y -CONFIG_AUTOFS_FS=y +# CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=m @@ -736,10 +782,9 @@ CONFIG_FUSE_FS=m CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_SYSFS=y -# CONFIG_TMPFS is not set +CONFIG_TMPFS=y # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y -CONFIG_RELAYFS_FS=m # CONFIG_CONFIGFS_FS is not set # @@ -806,44 +851,20 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_MAGIC_SYSRQ is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_DEBUG_FS is not set CONFIG_CROSSCOMPILE=y CONFIG_CMDLINE="mem=32M console=ttyVR0,38400" # # Security options # -CONFIG_KEYS=y -CONFIG_KEYS_DEBUG_PROC_KEYS=y +# CONFIG_KEYS is not set # CONFIG_SECURITY is not set # # Cryptographic options # -CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -# CONFIG_CRYPTO_TEST is not set +# CONFIG_CRYPTO is not set # # Hardware crypto devices @@ -853,8 +874,6 @@ CONFIG_CRYPTO_CRC32C=m # Library routines # # CONFIG_CRC_CCITT is not set -CONFIG_CRC16=m +# CONFIG_CRC16 is not set CONFIG_CRC32=y -CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=m -CONFIG_ZLIB_DEFLATE=m +# CONFIG_LIBCRC32C is not set diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/configs/e55_defconfig mips/arch/mips/configs/e55_defconfig --- mips-orig/arch/mips/configs/e55_defconfig 2006-04-16 18:05:09.968058000 +0900 +++ mips/arch/mips/configs/e55_defconfig 2006-04-16 18:11:51.879241250 +0900 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-rc1 -# Fri Jan 27 15:40:04 2006 +# Linux kernel version: 2.6.17-rc1 +# Thu Apr 6 15:18:12 2006 # CONFIG_MIPS=y @@ -70,6 +70,8 @@ CONFIG_CASIO_E55=y # CONFIG_VICTOR_MPC30X is not set # CONFIG_ZAO_CAPCELLA is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y @@ -89,7 +91,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_CPU_MIPS64_R2 is not set # CONFIG_CPU_R3000 is not set # CONFIG_CPU_TX39XX is not set -# CONFIG_CPU_VR41XX is not set +CONFIG_CPU_VR41XX=y # CONFIG_CPU_R4300 is not set # CONFIG_CPU_R4X00 is not set # CONFIG_CPU_TX49XX is not set @@ -102,18 +104,22 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_CPU_RM7000 is not set # CONFIG_CPU_RM9000 is not set # CONFIG_CPU_SB1 is not set +CONFIG_SYS_HAS_CPU_VR41XX=y +CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y # # Kernel type # -# CONFIG_32BIT is not set +CONFIG_32BIT=y # CONFIG_64BIT is not set CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PAGE_SIZE_16KB is not set # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_MIPS_MT is not set -CONFIG_CPU_HAS_LLSC=y +# CONFIG_CPU_ADVANCED is not set CONFIG_CPU_HAS_SYNC=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y @@ -134,7 +140,6 @@ CONFIG_PREEMPT_NONE=y # Code maturity level options # CONFIG_EXPERIMENTAL=y -CONFIG_CLEAN_COMPILE=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 @@ -145,11 +150,10 @@ CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y -# CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y -# CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_EMBEDDED=y @@ -163,10 +167,6 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y -CONFIG_CC_ALIGN_FUNCTIONS=0 -CONFIG_CC_ALIGN_LABELS=0 -CONFIG_CC_ALIGN_LOOPS=0 -CONFIG_CC_ALIGN_JUMPS=0 CONFIG_SLAB=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -178,7 +178,6 @@ CONFIG_BASE_SMALL=0 CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_OBSOLETE_MODPARM=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_KMOD=y @@ -186,6 +185,9 @@ CONFIG_KMOD=y # # Block layer # +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set # # IO Schedulers @@ -220,85 +222,12 @@ CONFIG_MMU=y # CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_MISC is not set +CONFIG_TRAD_SIGNALS=y # # Networking # -CONFIG_NET=y - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=y -CONFIG_XFRM=y -CONFIG_XFRM_USER=m -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -# CONFIG_IP_ADVANCED_ROUTER is not set -CONFIG_IP_FIB_HASH=y -# CONFIG_IP_PNP is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE is not set -# CONFIG_IP_MROUTE is not set -# CONFIG_ARPD is not set -# CONFIG_SYN_COOKIES is not set -# CONFIG_INET_AH is not set -# CONFIG_INET_ESP is not set -# CONFIG_INET_IPCOMP is not set -CONFIG_INET_TUNNEL=m -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_BIC=y -# CONFIG_IPV6 is not set -# CONFIG_NETFILTER is not set - -# -# DCCP Configuration (EXPERIMENTAL) -# -# CONFIG_IP_DCCP is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# -# CONFIG_IP_SCTP is not set -# CONFIG_ATM is not set -# CONFIG_BRIDGE is not set -# CONFIG_VLAN_8021Q is not set -# CONFIG_DECNET is not set -# CONFIG_LLC2 is not set -# CONFIG_IPX is not set -# CONFIG_ATALK is not set -# CONFIG_X25 is not set -# CONFIG_LAPB is not set - -# -# TIPC Configuration (EXPERIMENTAL) -# -# CONFIG_TIPC is not set -# CONFIG_NET_DIVERT is not set -# CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set - -# -# QoS and/or fair queueing -# -# CONFIG_NET_SCHED is not set - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set -# CONFIG_HAMRADIO is not set -# CONFIG_IRDA is not set -# CONFIG_BT is not set -CONFIG_IEEE80211=m -# CONFIG_IEEE80211_DEBUG is not set -CONFIG_IEEE80211_CRYPT_WEP=m -CONFIG_IEEE80211_CRYPT_CCMP=m +# CONFIG_NET is not set # # Device Drivers @@ -314,7 +243,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # # Connector - unified userspace <-> kernelspace linker # -CONFIG_CONNECTOR=m # # Memory Technology Devices (MTD) @@ -336,11 +264,11 @@ CONFIG_CONNECTOR=m # # CONFIG_BLK_DEV_COW_COMMON is not set # CONFIG_BLK_DEV_LOOP is not set -# CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +# CONFIG_BLK_DEV_INITRD is not set # CONFIG_CDROM_PKTCDVD is not set -# CONFIG_ATA_OVER_ETH is not set # # ATA/ATAPI/MFM/RLL support @@ -399,81 +327,8 @@ CONFIG_IDE_GENERIC=y # # -# Network device support -# -CONFIG_NETDEVICES=y -# CONFIG_DUMMY is not set -# CONFIG_BONDING is not set -# CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set - -# -# ARCnet devices -# -# CONFIG_ARCNET is not set - -# -# PHY device support -# -CONFIG_PHYLIB=m - -# -# MII PHY device drivers -# -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m -CONFIG_CICADA_PHY=m - -# -# Ethernet (10 or 100Mbit) -# -CONFIG_NET_ETHERNET=y -# CONFIG_MII is not set -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_NET_VENDOR_SMC is not set -# CONFIG_DM9000 is not set -# CONFIG_NET_VENDOR_RACAL is not set -# CONFIG_AT1700 is not set -# CONFIG_DEPCA is not set -# CONFIG_HP100 is not set -# CONFIG_NET_ISA is not set -# CONFIG_NET_PCI is not set - -# -# Ethernet (1000 Mbit) -# - -# -# Ethernet (10000 Mbit) -# - -# -# Token Ring devices -# -# CONFIG_TR is not set - -# -# Wireless LAN (non-hamradio) -# -# CONFIG_NET_RADIO is not set - -# -# Wan interfaces -# -# CONFIG_WAN is not set -# CONFIG_PPP is not set -# CONFIG_SLIP is not set -# CONFIG_SHAPER is not set -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set - -# # ISDN subsystem # -# CONFIG_ISDN is not set # # Telephony Support @@ -509,11 +364,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 # # Hardware I/O ports # -CONFIG_SERIO=y -# CONFIG_SERIO_I8042 is not set -CONFIG_SERIO_SERPORT=y -# CONFIG_SERIO_LIBPS2 is not set -CONFIG_SERIO_RAW=m +# CONFIG_SERIO is not set # CONFIG_GAMEPORT is not set # @@ -532,6 +383,10 @@ CONFIG_HW_CONSOLE=y # # Non-8250 serial port support # +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_VR41XX=y +CONFIG_SERIAL_VR41XX_CONSOLE=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 @@ -560,12 +415,14 @@ CONFIG_WATCHDOG=y # CONFIG_WDT is not set # CONFIG_RTC is not set # CONFIG_GEN_RTC is not set +# CONFIG_RTC_VR41XX is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set # # Ftape, the floppy tape device driver # +CONFIG_GPIO_VR41XX=y # CONFIG_RAW_DRIVER is not set # @@ -601,10 +458,6 @@ CONFIG_WATCHDOG=y # # -# Multimedia Capabilities Port drivers -# - -# # Multimedia devices # # CONFIG_VIDEO_DEV is not set @@ -612,7 +465,6 @@ CONFIG_WATCHDOG=y # # Digital Video Broadcasting Devices # -# CONFIG_DVB is not set # # Graphics support @@ -636,6 +488,7 @@ CONFIG_DUMMY_CONSOLE=y # # CONFIG_USB_ARCH_HAS_HCD is not set # CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USB_ARCH_HAS_EHCI is not set # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' @@ -652,14 +505,24 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_MMC is not set # +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# # InfiniBand support # # -# SN Devices +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) # # +# Real Time Clock +# +# CONFIG_RTC_CLASS is not set + +# # File systems # CONFIG_EXT2_FS=y @@ -670,13 +533,12 @@ CONFIG_EXT2_FS=y # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set -# CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set CONFIG_INOTIFY=y # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y -CONFIG_AUTOFS_FS=y +# CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=m @@ -699,10 +561,9 @@ CONFIG_FUSE_FS=m CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_SYSFS=y -# CONFIG_TMPFS is not set +CONFIG_TMPFS=y # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y -CONFIG_RELAYFS_FS=m # CONFIG_CONFIGFS_FS is not set # @@ -723,29 +584,6 @@ CONFIG_RELAYFS_FS=m # CONFIG_UFS_FS is not set # -# Network File Systems -# -CONFIG_NFS_FS=m -# CONFIG_NFS_V3 is not set -# CONFIG_NFS_V4 is not set -# CONFIG_NFS_DIRECTIO is not set -CONFIG_NFSD=m -# CONFIG_NFSD_V3 is not set -# CONFIG_NFSD_TCP is not set -CONFIG_LOCKD=m -CONFIG_EXPORTFS=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -# CONFIG_RPCSEC_GSS_KRB5 is not set -# CONFIG_RPCSEC_GSS_SPKM3 is not set -# CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set -# CONFIG_NCP_FS is not set -# CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set -# CONFIG_9P_FS is not set - -# # Partition Types # # CONFIG_PARTITION_ADVANCED is not set @@ -768,44 +606,20 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_MAGIC_SYSRQ is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_DEBUG_FS is not set CONFIG_CROSSCOMPILE=y CONFIG_CMDLINE="console=ttyVR0,19200 mem=8M" # # Security options # -CONFIG_KEYS=y -CONFIG_KEYS_DEBUG_PROC_KEYS=y +# CONFIG_KEYS is not set # CONFIG_SECURITY is not set # # Cryptographic options # -CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -# CONFIG_CRYPTO_TEST is not set +# CONFIG_CRYPTO is not set # # Hardware crypto devices @@ -815,8 +629,6 @@ CONFIG_CRYPTO_CRC32C=m # Library routines # # CONFIG_CRC_CCITT is not set -CONFIG_CRC16=m -CONFIG_CRC32=m -CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=m -CONFIG_ZLIB_DEFLATE=m +# CONFIG_CRC16 is not set +# CONFIG_CRC32 is not set +# CONFIG_LIBCRC32C is not set diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/configs/tb0226_defconfig mips/arch/mips/configs/tb0226_defconfig --- mips-orig/arch/mips/configs/tb0226_defconfig 2006-04-16 18:05:09.976054500 +0900 +++ mips/arch/mips/configs/tb0226_defconfig 2006-04-16 18:11:51.883241500 +0900 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-rc1 -# Fri Jan 27 15:40:34 2006 +# Linux kernel version: 2.6.17-rc1 +# Wed Apr 12 23:22:47 2006 # CONFIG_MIPS=y @@ -68,12 +68,14 @@ CONFIG_MACH_VR41XX=y # CONFIG_NEC_CMBVR4133 is not set CONFIG_TANBAC_TB022X=y CONFIG_TANBAC_TB0226=y -CONFIG_TANBAC_TB0287=y +# CONFIG_TANBAC_TB0287 is not set # CONFIG_VICTOR_MPC30X is not set # CONFIG_ZAO_CAPCELLA is not set CONFIG_PCI_VR41XX=y # CONFIG_VRC4173 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y @@ -93,7 +95,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_CPU_MIPS64_R2 is not set # CONFIG_CPU_R3000 is not set # CONFIG_CPU_TX39XX is not set -# CONFIG_CPU_VR41XX is not set +CONFIG_CPU_VR41XX=y # CONFIG_CPU_R4300 is not set # CONFIG_CPU_R4X00 is not set # CONFIG_CPU_TX49XX is not set @@ -106,18 +108,22 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_CPU_RM7000 is not set # CONFIG_CPU_RM9000 is not set # CONFIG_CPU_SB1 is not set +CONFIG_SYS_HAS_CPU_VR41XX=y +CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y # # Kernel type # -# CONFIG_32BIT is not set +CONFIG_32BIT=y # CONFIG_64BIT is not set CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PAGE_SIZE_16KB is not set # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_MIPS_MT is not set -CONFIG_CPU_HAS_LLSC=y +# CONFIG_CPU_ADVANCED is not set CONFIG_CPU_HAS_SYNC=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y @@ -138,7 +144,6 @@ CONFIG_PREEMPT_NONE=y # Code maturity level options # CONFIG_EXPERIMENTAL=y -CONFIG_CLEAN_COMPILE=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 @@ -154,6 +159,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_EMBEDDED=y @@ -167,11 +173,8 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y -CONFIG_CC_ALIGN_FUNCTIONS=0 -CONFIG_CC_ALIGN_LABELS=0 -CONFIG_CC_ALIGN_LOOPS=0 -CONFIG_CC_ALIGN_JUMPS=0 CONFIG_SLAB=y +CONFIG_DOUBLEFAULT=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # CONFIG_SLOB is not set @@ -182,7 +185,6 @@ CONFIG_BASE_SMALL=0 CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_OBSOLETE_MODPARM=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_KMOD=y @@ -190,6 +192,9 @@ CONFIG_KMOD=y # # Block layer # +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set # # IO Schedulers @@ -209,7 +214,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_HW_HAS_PCI=y CONFIG_PCI=y -# CONFIG_PCI_LEGACY_PROC is not set CONFIG_MMU=y # @@ -227,6 +231,7 @@ CONFIG_MMU=y # CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_MISC is not set +CONFIG_TRAD_SIGNALS=y # # Networking @@ -236,11 +241,10 @@ CONFIG_NET=y # # Networking options # +# CONFIG_NETDEBUG is not set CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y -CONFIG_XFRM=y -CONFIG_XFRM_USER=m # CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y @@ -264,12 +268,15 @@ CONFIG_SYN_COOKIES=y # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set -CONFIG_INET_TUNNEL=m +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_BIC=y # CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set # CONFIG_NETFILTER is not set # @@ -281,6 +288,11 @@ CONFIG_TCP_CONG_BIC=y # SCTP Configuration (EXPERIMENTAL) # # CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set # CONFIG_VLAN_8021Q is not set @@ -290,11 +302,6 @@ CONFIG_TCP_CONG_BIC=y # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set - -# -# TIPC Configuration (EXPERIMENTAL) -# -# CONFIG_TIPC is not set # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set @@ -315,6 +322,7 @@ CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m CONFIG_IEEE80211_CRYPT_CCMP=m +# CONFIG_IEEE80211_SOFTMAC is not set # # Device Drivers @@ -359,11 +367,12 @@ CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 +# CONFIG_BLK_DEV_INITRD is not set # CONFIG_CDROM_PKTCDVD is not set -CONFIG_ATA_OVER_ETH=m +# CONFIG_ATA_OVER_ETH is not set # # ATA/ATAPI/MFM/RLL support @@ -508,8 +517,8 @@ CONFIG_NET_PCI=y # CONFIG_B44 is not set # CONFIG_FORCEDETH is not set # CONFIG_DGRS is not set -CONFIG_EEPRO100=y -# CONFIG_E100 is not set +# CONFIG_EEPRO100 is not set +CONFIG_E100=y # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set @@ -626,6 +635,11 @@ CONFIG_HW_CONSOLE=y # # Non-8250 serial port support # +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_VR41XX=y +CONFIG_SERIAL_VR41XX_CONSOLE=y +# CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 @@ -686,10 +700,6 @@ CONFIG_GPIO_VR41XX=y # # -# Multimedia Capabilities Port drivers -# - -# # Multimedia devices # # CONFIG_VIDEO_DEV is not set @@ -698,6 +708,7 @@ CONFIG_GPIO_VR41XX=y # Digital Video Broadcasting Devices # # CONFIG_DVB is not set +# CONFIG_USB_DABUSB is not set # # Graphics support @@ -720,6 +731,7 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB=y # CONFIG_USB_DEBUG is not set @@ -757,7 +769,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # # may also be needed; see USB_STORAGE Help for more information # -CONFIG_USB_STORAGE=m +CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_FREECOM is not set @@ -801,15 +813,6 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_MICROTEK is not set # -# USB Multimedia devices -# -# CONFIG_USB_DABUSB is not set - -# -# Video4Linux support is needed for USB Multimedia device support -# - -# # USB Network Adapters # # CONFIG_USB_CATC is not set @@ -817,7 +820,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set # CONFIG_USB_USBNET is not set -CONFIG_USB_MON=y +# CONFIG_USB_MON is not set # # USB port drivers @@ -861,13 +864,48 @@ CONFIG_USB_MON=y # CONFIG_MMC is not set # +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# # InfiniBand support # # CONFIG_INFINIBAND is not set # -# SN Devices +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) +# + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y + +# +# RTC drivers # +# CONFIG_RTC_DRV_M48T86 is not set +CONFIG_RTC_DRV_VR41XX=y +# CONFIG_RTC_DRV_TEST is not set # # File systems @@ -912,7 +950,6 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y -CONFIG_RELAYFS_FS=m # CONFIG_CONFIGFS_FS is not set # @@ -1024,6 +1061,7 @@ CONFIG_NLS_ISO8859_1=m # CONFIG_MAGIC_SYSRQ is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_DEBUG_FS is not set CONFIG_CROSSCOMPILE=y CONFIG_CMDLINE="mem=32M console=ttyVR0,115200" diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/configs/tb0229_defconfig mips/arch/mips/configs/tb0229_defconfig --- mips-orig/arch/mips/configs/tb0229_defconfig 2006-04-16 18:05:09.976054500 +0900 +++ mips/arch/mips/configs/tb0229_defconfig 2006-04-16 18:11:51.883241500 +0900 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-rc1 -# Fri Jan 27 15:40:35 2006 +# Linux kernel version: 2.6.17-rc1 +# Wed Apr 12 23:21:37 2006 # CONFIG_MIPS=y @@ -68,12 +68,14 @@ CONFIG_MACH_VR41XX=y # CONFIG_NEC_CMBVR4133 is not set CONFIG_TANBAC_TB022X=y # CONFIG_TANBAC_TB0226 is not set -CONFIG_TANBAC_TB0287=y +# CONFIG_TANBAC_TB0287 is not set # CONFIG_VICTOR_MPC30X is not set # CONFIG_ZAO_CAPCELLA is not set CONFIG_PCI_VR41XX=y # CONFIG_VRC4173 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y @@ -93,7 +95,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_CPU_MIPS64_R2 is not set # CONFIG_CPU_R3000 is not set # CONFIG_CPU_TX39XX is not set -# CONFIG_CPU_VR41XX is not set +CONFIG_CPU_VR41XX=y # CONFIG_CPU_R4300 is not set # CONFIG_CPU_R4X00 is not set # CONFIG_CPU_TX49XX is not set @@ -106,18 +108,22 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_CPU_RM7000 is not set # CONFIG_CPU_RM9000 is not set # CONFIG_CPU_SB1 is not set +CONFIG_SYS_HAS_CPU_VR41XX=y +CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y # # Kernel type # -# CONFIG_32BIT is not set +CONFIG_32BIT=y # CONFIG_64BIT is not set CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PAGE_SIZE_16KB is not set # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_MIPS_MT is not set -CONFIG_CPU_HAS_LLSC=y +# CONFIG_CPU_ADVANCED is not set CONFIG_CPU_HAS_SYNC=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y @@ -138,7 +144,6 @@ CONFIG_PREEMPT_NONE=y # Code maturity level options # CONFIG_EXPERIMENTAL=y -CONFIG_CLEAN_COMPILE=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 @@ -154,6 +159,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_EMBEDDED=y @@ -167,11 +173,8 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y -CONFIG_CC_ALIGN_FUNCTIONS=0 -CONFIG_CC_ALIGN_LABELS=0 -CONFIG_CC_ALIGN_LOOPS=0 -CONFIG_CC_ALIGN_JUMPS=0 CONFIG_SLAB=y +CONFIG_DOUBLEFAULT=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # CONFIG_SLOB is not set @@ -182,7 +185,6 @@ CONFIG_BASE_SMALL=0 CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_OBSOLETE_MODPARM=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_KMOD=y @@ -190,6 +192,9 @@ CONFIG_KMOD=y # # Block layer # +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set # # IO Schedulers @@ -209,7 +214,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_HW_HAS_PCI=y CONFIG_PCI=y -# CONFIG_PCI_LEGACY_PROC is not set CONFIG_MMU=y # @@ -227,6 +231,7 @@ CONFIG_MMU=y # CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_MISC is not set +CONFIG_TRAD_SIGNALS=y # # Networking @@ -236,11 +241,10 @@ CONFIG_NET=y # # Networking options # +# CONFIG_NETDEBUG is not set CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y -CONFIG_XFRM=y -CONFIG_XFRM_USER=m # CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y @@ -265,12 +269,15 @@ CONFIG_SYN_COOKIES=y # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set CONFIG_INET_TUNNEL=m CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_BIC=y # CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set # CONFIG_NETFILTER is not set # @@ -282,6 +289,11 @@ CONFIG_TCP_CONG_BIC=y # SCTP Configuration (EXPERIMENTAL) # # CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set # CONFIG_VLAN_8021Q is not set @@ -291,11 +303,6 @@ CONFIG_TCP_CONG_BIC=y # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set - -# -# TIPC Configuration (EXPERIMENTAL) -# -# CONFIG_TIPC is not set # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set @@ -312,10 +319,7 @@ CONFIG_TCP_CONG_BIC=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set # CONFIG_BT is not set -CONFIG_IEEE80211=m -# CONFIG_IEEE80211_DEBUG is not set -CONFIG_IEEE80211_CRYPT_WEP=m -CONFIG_IEEE80211_CRYPT_CCMP=m +# CONFIG_IEEE80211 is not set # # Device Drivers @@ -326,12 +330,12 @@ CONFIG_IEEE80211_CRYPT_CCMP=m # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=m +# CONFIG_FW_LOADER is not set # # Connector - unified userspace <-> kernelspace linker # -CONFIG_CONNECTOR=m +# CONFIG_CONNECTOR is not set # # Memory Technology Devices (MTD) @@ -364,10 +368,8 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 # CONFIG_BLK_DEV_INITRD is not set -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set -CONFIG_ATA_OVER_ETH=m +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set # # ATA/ATAPI/MFM/RLL support @@ -444,30 +446,7 @@ CONFIG_MII=y # # CONFIG_NET_TULIP is not set # CONFIG_HP100 is not set -CONFIG_NET_PCI=y -# CONFIG_PCNET32 is not set -# CONFIG_AMD8111_ETH is not set -# CONFIG_ADAPTEC_STARFIRE is not set -# CONFIG_B44 is not set -# CONFIG_FORCEDETH is not set -# CONFIG_DGRS is not set -CONFIG_EEPRO100=y -# CONFIG_E100 is not set -# CONFIG_FEALNX is not set -# CONFIG_NATSEMI is not set -# CONFIG_NE2K_PCI is not set -# CONFIG_8139CP is not set -CONFIG_8139TOO=y -CONFIG_8139TOO_PIO=y -# CONFIG_8139TOO_TUNE_TWISTER is not set -# CONFIG_8139TOO_8129 is not set -# CONFIG_8139_OLD_RX_RESET is not set -# CONFIG_SIS900 is not set -# CONFIG_EPIC100 is not set -# CONFIG_SUNDANCE is not set -# CONFIG_TLAN is not set -# CONFIG_VIA_RHINE is not set -# CONFIG_LAN_SAA9730 is not set +# CONFIG_NET_PCI is not set # # Ethernet (1000 Mbit) @@ -484,7 +463,6 @@ CONFIG_R8169=y # CONFIG_SKGE is not set # CONFIG_SKY2 is not set # CONFIG_SK98LIN is not set -# CONFIG_VIA_VELOCITY is not set # CONFIG_TIGON3 is not set # CONFIG_BNX2 is not set @@ -511,19 +489,8 @@ CONFIG_R8169=y # CONFIG_WAN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOE=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y +# CONFIG_PPP is not set +# CONFIG_SLIP is not set # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -584,6 +551,11 @@ CONFIG_HW_CONSOLE=y # # Non-8250 serial port support # +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_VR41XX=y +CONFIG_SERIAL_VR41XX_CONSOLE=y +# CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 @@ -608,6 +580,7 @@ CONFIG_TANBAC_TB0219=y # Ftape, the floppy tape device driver # # CONFIG_DRM is not set +CONFIG_GPIO_VR41XX=y # CONFIG_RAW_DRIVER is not set # @@ -643,10 +616,6 @@ CONFIG_TANBAC_TB0219=y # # -# Multimedia Capabilities Port drivers -# - -# # Multimedia devices # # CONFIG_VIDEO_DEV is not set @@ -655,6 +624,7 @@ CONFIG_TANBAC_TB0219=y # Digital Video Broadcasting Devices # # CONFIG_DVB is not set +# CONFIG_USB_DABUSB is not set # # Graphics support @@ -677,6 +647,7 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB=m # CONFIG_USB_DEBUG is not set @@ -748,15 +719,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_MDC800 is not set # -# USB Multimedia devices -# -# CONFIG_USB_DABUSB is not set - -# -# Video4Linux support is needed for USB Multimedia device support -# - -# # USB Network Adapters # # CONFIG_USB_CATC is not set @@ -808,13 +770,48 @@ CONFIG_USB_MON=y # CONFIG_MMC is not set # +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# # InfiniBand support # # CONFIG_INFINIBAND is not set # -# SN Devices +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) +# + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y + +# +# RTC drivers # +# CONFIG_RTC_DRV_M48T86 is not set +CONFIG_RTC_DRV_VR41XX=y +# CONFIG_RTC_DRV_TEST is not set # # File systems @@ -822,32 +819,16 @@ CONFIG_USB_MON=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m -CONFIG_EXT3_FS_XATTR=y -# CONFIG_EXT3_FS_POSIX_ACL is not set -CONFIG_EXT3_FS_SECURITY=y -CONFIG_JBD=m -# CONFIG_JBD_DEBUG is not set -CONFIG_FS_MBCACHE=y +# CONFIG_EXT3_FS is not set # CONFIG_REISERFS_FS is not set -CONFIG_JFS_FS=m -# CONFIG_JFS_POSIX_ACL is not set -# CONFIG_JFS_SECURITY is not set -# CONFIG_JFS_DEBUG is not set -# CONFIG_JFS_STATISTICS is not set +# CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set -CONFIG_XFS_FS=y -CONFIG_XFS_EXPORT=y -CONFIG_XFS_QUOTA=y -# CONFIG_XFS_SECURITY is not set -CONFIG_XFS_POSIX_ACL=y -# CONFIG_XFS_RT is not set +# CONFIG_XFS_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set CONFIG_ROMFS_FS=m CONFIG_INOTIFY=y # CONFIG_QUOTA is not set -CONFIG_QUOTACTL=y CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=y @@ -856,20 +837,14 @@ CONFIG_FUSE_FS=m # # CD-ROM/DVD Filesystems # -CONFIG_ISO9660_FS=y -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_ZISOFS_FS=y +# CONFIG_ISO9660_FS is not set # CONFIG_UDF_FS is not set # # DOS/FAT/NT Filesystems # -CONFIG_FAT_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_MSDOS_FS is not set +# CONFIG_VFAT_FS is not set # CONFIG_NTFS_FS is not set # @@ -881,7 +856,6 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y -CONFIG_RELAYFS_FS=m # CONFIG_CONFIGFS_FS is not set # @@ -922,9 +896,7 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp932" +# CONFIG_SMB_FS is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set @@ -940,46 +912,7 @@ CONFIG_MSDOS_PARTITION=y # # Native Language Support # -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" -CONFIG_NLS_CODEPAGE_437=m -# CONFIG_NLS_CODEPAGE_737 is not set -# CONFIG_NLS_CODEPAGE_775 is not set -# CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_CODEPAGE_852 is not set -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -# CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set -# CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set -# CONFIG_NLS_CODEPAGE_869 is not set -# CONFIG_NLS_CODEPAGE_936 is not set -# CONFIG_NLS_CODEPAGE_950 is not set -CONFIG_NLS_CODEPAGE_932=m -# CONFIG_NLS_CODEPAGE_949 is not set -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set -# CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=m -# CONFIG_NLS_ISO8859_2 is not set -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_KOI8_U is not set -# CONFIG_NLS_UTF8 is not set +# CONFIG_NLS is not set # # Profiling support @@ -993,44 +926,20 @@ CONFIG_NLS_ISO8859_1=m # CONFIG_MAGIC_SYSRQ is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_DEBUG_FS is not set CONFIG_CROSSCOMPILE=y CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" # # Security options # -CONFIG_KEYS=y -CONFIG_KEYS_DEBUG_PROC_KEYS=y +# CONFIG_KEYS is not set # CONFIG_SECURITY is not set # # Cryptographic options # -CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -# CONFIG_CRYPTO_TEST is not set +# CONFIG_CRYPTO is not set # # Hardware crypto devices @@ -1039,9 +948,8 @@ CONFIG_CRYPTO_CRC32C=m # # Library routines # -CONFIG_CRC_CCITT=m -CONFIG_CRC16=m +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set CONFIG_CRC32=y -CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=m +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=m diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/configs/tb0287_defconfig mips/arch/mips/configs/tb0287_defconfig --- mips-orig/arch/mips/configs/tb0287_defconfig 2006-04-16 18:05:09.976054500 +0900 +++ mips/arch/mips/configs/tb0287_defconfig 2006-04-16 18:11:51.887241750 +0900 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16 -# Wed Mar 22 11:07:34 2006 +# Linux kernel version: 2.6.17-rc1 +# Wed Apr 12 23:20:39 2006 # CONFIG_MIPS=y @@ -74,6 +74,8 @@ CONFIG_TANBAC_TB0287=y CONFIG_PCI_VR41XX=y # CONFIG_VRC4173 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y @@ -108,7 +110,6 @@ CONFIG_CPU_VR41XX=y # CONFIG_CPU_SB1 is not set CONFIG_SYS_HAS_CPU_VR41XX=y CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y -CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y @@ -158,6 +159,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_EMBEDDED=y @@ -171,11 +173,8 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y -CONFIG_CC_ALIGN_FUNCTIONS=0 -CONFIG_CC_ALIGN_LABELS=0 -CONFIG_CC_ALIGN_LOOPS=0 -CONFIG_CC_ALIGN_JUMPS=0 CONFIG_SLAB=y +CONFIG_DOUBLEFAULT=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # CONFIG_SLOB is not set @@ -186,7 +185,6 @@ CONFIG_BASE_SMALL=0 CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_OBSOLETE_MODPARM=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_KMOD=y @@ -195,6 +193,8 @@ CONFIG_KMOD=y # Block layer # # CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set # # IO Schedulers @@ -214,7 +214,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_HW_HAS_PCI=y CONFIG_PCI=y -# CONFIG_PCI_LEGACY_PROC is not set CONFIG_MMU=y # @@ -246,8 +245,6 @@ CONFIG_NET=y CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y -CONFIG_XFRM=y -CONFIG_XFRM_USER=m # CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y @@ -272,6 +269,7 @@ CONFIG_SYN_COOKIES=y # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set CONFIG_INET_TUNNEL=m CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y @@ -289,6 +287,8 @@ CONFIG_TCP_CONG_HTCP=m # CONFIG_TCP_CONG_VEGAS is not set # CONFIG_TCP_CONG_SCALABLE is not set # CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set # CONFIG_NETFILTER is not set # @@ -715,7 +715,6 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_WATCHDOG is not set # CONFIG_RTC is not set # CONFIG_GEN_RTC is not set -# CONFIG_RTC_VR41XX is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set @@ -761,10 +760,6 @@ CONFIG_GPIO_VR41XX=y # # -# Multimedia Capabilities Port drivers -# - -# # Multimedia devices # # CONFIG_VIDEO_DEV is not set @@ -773,17 +768,53 @@ CONFIG_GPIO_VR41XX=y # Digital Video Broadcasting Devices # # CONFIG_DVB is not set +# CONFIG_USB_DABUSB is not set # # Graphics support # -# CONFIG_FB is not set +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_MACMODES is not set +CONFIG_FB_FIRMWARE_EDID=y +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +CONFIG_FB_SMIVGX=y +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_VIRTUAL is not set # # Console display driver support # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE is not set + +# +# Logo configuration +# +# CONFIG_LOGO is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # # Sound @@ -795,6 +826,7 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB=m # CONFIG_USB_DEBUG is not set @@ -881,15 +913,6 @@ CONFIG_USB_HIDINPUT=y # CONFIG_USB_MICROTEK is not set # -# USB Multimedia devices -# -# CONFIG_USB_DABUSB is not set - -# -# Video4Linux support is needed for USB Multimedia device support -# - -# # USB Network Adapters # # CONFIG_USB_CATC is not set @@ -940,6 +963,19 @@ CONFIG_USB_MON=y # CONFIG_MMC is not set # +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# # InfiniBand support # # CONFIG_INFINIBAND is not set @@ -949,6 +985,11 @@ CONFIG_USB_MON=y # # +# Real Time Clock +# +# CONFIG_RTC_CLASS is not set + +# # File systems # CONFIG_EXT2_FS=y @@ -1002,7 +1043,6 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y -# CONFIG_RELAYFS_FS is not set # CONFIG_CONFIGFS_FS is not set # @@ -1068,14 +1108,14 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_MAGIC_SYSRQ is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_DEBUG_FS is not set CONFIG_CROSSCOMPILE=y CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" # # Security options # -CONFIG_KEYS=y -CONFIG_KEYS_DEBUG_PROC_KEYS=y +# CONFIG_KEYS is not set # CONFIG_SECURITY is not set # diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/configs/workpad_defconfig mips/arch/mips/configs/workpad_defconfig --- mips-orig/arch/mips/configs/workpad_defconfig 2006-04-16 18:05:09.976054500 +0900 +++ mips/arch/mips/configs/workpad_defconfig 2006-04-16 18:11:51.887241750 +0900 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-rc1 -# Fri Jan 27 15:40:36 2006 +# Linux kernel version: 2.6.17-rc1 +# Thu Apr 6 15:26:25 2006 # CONFIG_MIPS=y @@ -70,6 +70,8 @@ CONFIG_IBM_WORKPAD=y # CONFIG_VICTOR_MPC30X is not set # CONFIG_ZAO_CAPCELLA is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_NONCOHERENT=y @@ -89,7 +91,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_CPU_MIPS64_R2 is not set # CONFIG_CPU_R3000 is not set # CONFIG_CPU_TX39XX is not set -# CONFIG_CPU_VR41XX is not set +CONFIG_CPU_VR41XX=y # CONFIG_CPU_R4300 is not set # CONFIG_CPU_R4X00 is not set # CONFIG_CPU_TX49XX is not set @@ -102,18 +104,22 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_CPU_RM7000 is not set # CONFIG_CPU_RM9000 is not set # CONFIG_CPU_SB1 is not set +CONFIG_SYS_HAS_CPU_VR41XX=y +CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y # # Kernel type # -# CONFIG_32BIT is not set +CONFIG_32BIT=y # CONFIG_64BIT is not set CONFIG_PAGE_SIZE_4KB=y # CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PAGE_SIZE_16KB is not set # CONFIG_PAGE_SIZE_64KB is not set # CONFIG_MIPS_MT is not set -CONFIG_CPU_HAS_LLSC=y +# CONFIG_CPU_ADVANCED is not set CONFIG_CPU_HAS_SYNC=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y @@ -134,7 +140,6 @@ CONFIG_PREEMPT_NONE=y # Code maturity level options # CONFIG_EXPERIMENTAL=y -CONFIG_CLEAN_COMPILE=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 @@ -150,6 +155,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_EMBEDDED=y @@ -163,10 +169,6 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y -CONFIG_CC_ALIGN_FUNCTIONS=0 -CONFIG_CC_ALIGN_LABELS=0 -CONFIG_CC_ALIGN_LOOPS=0 -CONFIG_CC_ALIGN_JUMPS=0 CONFIG_SLAB=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -178,7 +180,6 @@ CONFIG_BASE_SMALL=0 CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_OBSOLETE_MODPARM=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_KMOD=y @@ -186,6 +187,9 @@ CONFIG_KMOD=y # # Block layer # +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set # # IO Schedulers @@ -221,6 +225,7 @@ CONFIG_PCMCIA_IOCTL=y # CONFIG_I82365 is not set # CONFIG_TCIC is not set CONFIG_PCMCIA_PROBE=y +CONFIG_PCMCIA_VRC4171=y # # PCI Hotplug Support @@ -231,6 +236,7 @@ CONFIG_PCMCIA_PROBE=y # CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_MISC is not set +CONFIG_TRAD_SIGNALS=y # # Networking @@ -240,6 +246,7 @@ CONFIG_NET=y # # Networking options # +# CONFIG_NETDEBUG is not set CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y @@ -259,12 +266,15 @@ CONFIG_IP_FIB_HASH=y # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set -CONFIG_INET_TUNNEL=m +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_BIC=y # CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set # CONFIG_NETFILTER is not set # @@ -276,6 +286,11 @@ CONFIG_TCP_CONG_BIC=y # SCTP Configuration (EXPERIMENTAL) # # CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set # CONFIG_VLAN_8021Q is not set @@ -285,11 +300,6 @@ CONFIG_TCP_CONG_BIC=y # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set - -# -# TIPC Configuration (EXPERIMENTAL) -# -# CONFIG_TIPC is not set # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set @@ -306,10 +316,8 @@ CONFIG_TCP_CONG_BIC=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set # CONFIG_BT is not set -CONFIG_IEEE80211=m -# CONFIG_IEEE80211_DEBUG is not set -CONFIG_IEEE80211_CRYPT_WEP=m -CONFIG_IEEE80211_CRYPT_CCMP=m +# CONFIG_IEEE80211 is not set +CONFIG_WIRELESS_EXT=y # # Device Drivers @@ -348,10 +356,12 @@ CONFIG_CONNECTOR=m # CONFIG_BLK_DEV_COW_COMMON is not set # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +# CONFIG_BLK_DEV_INITRD is not set # CONFIG_CDROM_PKTCDVD is not set -CONFIG_ATA_OVER_ETH=m +# CONFIG_ATA_OVER_ETH is not set # # ATA/ATAPI/MFM/RLL support @@ -469,7 +479,38 @@ CONFIG_MII=m # # Wireless LAN (non-hamradio) # -# CONFIG_NET_RADIO is not set +CONFIG_NET_RADIO=y +# CONFIG_NET_WIRELESS_RTNETLINK is not set + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +# CONFIG_ARLAN is not set +# CONFIG_WAVELAN is not set +# CONFIG_PCMCIA_WAVELAN is not set +# CONFIG_PCMCIA_NETWAVE is not set + +# +# Wireless 802.11 Frequency Hopping cards support +# +# CONFIG_PCMCIA_RAYCS is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +CONFIG_HERMES=m +# CONFIG_ATMEL is not set + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +CONFIG_PCMCIA_HERMES=m +# CONFIG_PCMCIA_SPECTRUM is not set +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_WL3501 is not set +# CONFIG_HOSTAP is not set +CONFIG_NET_WIRELESS=y # # PCMCIA network device support @@ -513,10 +554,7 @@ CONFIG_INPUT=y # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set # CONFIG_INPUT_EVDEV is not set @@ -534,11 +572,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # # Hardware I/O ports # -CONFIG_SERIO=y -# CONFIG_SERIO_I8042 is not set -CONFIG_SERIO_SERPORT=y -# CONFIG_SERIO_LIBPS2 is not set -CONFIG_SERIO_RAW=m +# CONFIG_SERIO is not set # CONFIG_GAMEPORT is not set # @@ -557,6 +591,10 @@ CONFIG_HW_CONSOLE=y # # Non-8250 serial port support # +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_VR41XX=y +CONFIG_SERIAL_VR41XX_CONSOLE=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 @@ -569,22 +607,10 @@ CONFIG_LEGACY_PTY_COUNT=256 # # Watchdog Cards # -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -# CONFIG_SOFT_WATCHDOG is not set - -# -# ISA-based Watchdog Cards -# -# CONFIG_PCWATCHDOG is not set -# CONFIG_MIXCOMWD is not set -# CONFIG_WDT is not set +# CONFIG_WATCHDOG is not set # CONFIG_RTC is not set # CONFIG_GEN_RTC is not set +# CONFIG_RTC_VR41XX is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set @@ -598,6 +624,7 @@ CONFIG_WATCHDOG=y # CONFIG_SYNCLINK_CS is not set # CONFIG_CARDMAN_4000 is not set # CONFIG_CARDMAN_4040 is not set +# CONFIG_GPIO_VR41XX is not set # CONFIG_RAW_DRIVER is not set # @@ -633,10 +660,6 @@ CONFIG_WATCHDOG=y # # -# Multimedia Capabilities Port drivers -# - -# # Multimedia devices # # CONFIG_VIDEO_DEV is not set @@ -668,6 +691,7 @@ CONFIG_DUMMY_CONSOLE=y # # CONFIG_USB_ARCH_HAS_HCD is not set # CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USB_ARCH_HAS_EHCI is not set # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' @@ -684,12 +708,22 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_MMC is not set # +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# # InfiniBand support # # -# SN Devices +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) +# + +# +# Real Time Clock # +# CONFIG_RTC_CLASS is not set # # File systems @@ -711,7 +745,7 @@ CONFIG_FS_POSIX_ACL=y CONFIG_INOTIFY=y # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y -CONFIG_AUTOFS_FS=y +# CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=m @@ -734,10 +768,9 @@ CONFIG_FUSE_FS=m CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_SYSFS=y -# CONFIG_TMPFS is not set +CONFIG_TMPFS=y # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y -CONFIG_RELAYFS_FS=m # CONFIG_CONFIGFS_FS is not set # @@ -803,44 +836,20 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_MAGIC_SYSRQ is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_DEBUG_FS is not set CONFIG_CROSSCOMPILE=y CONFIG_CMDLINE="console=ttyVR0,19200 mem=16M" # # Security options # -CONFIG_KEYS=y -CONFIG_KEYS_DEBUG_PROC_KEYS=y +# CONFIG_KEYS is not set # CONFIG_SECURITY is not set # # Cryptographic options # -CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -# CONFIG_CRYPTO_TEST is not set +# CONFIG_CRYPTO is not set # # Hardware crypto devices @@ -850,8 +859,6 @@ CONFIG_CRYPTO_CRC32C=m # Library routines # # CONFIG_CRC_CCITT is not set -CONFIG_CRC16=m +# CONFIG_CRC16 is not set CONFIG_CRC32=y -CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=m -CONFIG_ZLIB_DEFLATE=m +# CONFIG_LIBCRC32C is not set From sshtylyov@ru.mvista.com Mon Apr 17 09:05:44 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 09:06:03 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:15843 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133719AbWDQIFo (ORCPT ); Mon, 17 Apr 2006 09:05:44 +0100 Received: (qmail 10798 invoked from network); 16 Apr 2006 22:53:59 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 16 Apr 2006 22:53:59 -0000 Message-ID: <444291E9.2070407@ru.mvista.com> Date: Sun, 16 Apr 2006 22:50:17 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: Geoff Levand , Atsushi Nemoto CC: linux-mips@linux-mips.org Subject: Re: tx49 Ether problems References: <20060415.010518.126141918.anemo@mba.ocn.ne.jp> <444032A5.3030304@am.sony.com> <44415D17.1070005@ru.mvista.com> In-Reply-To: <44415D17.1070005@ru.mvista.com> Content-Type: multipart/mixed; boundary="------------010205010502030804020507" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11119 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips This is a multi-part message in MIME format. --------------010205010502030804020507 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Hello. Sergei Shtylyov wrote: >>> On Fri, 14 Apr 2006 08:38:00 -0700, Geoff Levand >>> wrote: >>>> I seem to get a lot of problems with an nfs root fs >>>> on tx4937 board. I haven't looked at it closely yet, >>>> but I guess its some problem with the ne2000 driver. >>>> I wanted to know if you know anything about this. >>> Please look at: >>> http://www.linux-mips.org/cgi-bin/mesg.cgi?a=linux-mips&i=20060226.23054 >>> 1.75185772.anemo%40mba.ocn.ne.jp >>> With a quick glance of ne.c, it seems ei_status.stop_page should be >>> changed to 0x60 on the board. Please confirm its value. Hm, all this is very, very strange -- SAPROM readback indicates 16-bit DCR is set to 0x49 by the driver which means 16-bit mode but RTL8019's data bus on Toshiba RBTX4938 board is 8-bit according to its manual. In 16-bit mode stop_page value of 0x80 is legitimate, and I haven't heard of any problems so far (until Geoff's report). However, even in 16-bit mode, 8-bit data I/O only works (which is enforced by that late #if override below), and if I force 8-bit mode from the very beginning, everything works again -- I guess the RTL8019AS chip senses the correct slot size at reset, and just ignores DCR.WTS bit then. BUT, if I force NE1SM_START_PG and NE1SM_STOP_PG to be used as the values start_page and stop_page, the driver doesn't work. RTL8019AS has 16 KB of SRAM, so I guess they're mapped at address 0x4000 insternally, and the start_page should be 0x40 indeed. I've also found out that SAPROM bytes 6..15 (after removing the duplicates) contain the string "RBTX4938BB" which can be used for recognition instead of the first 3 bytes of the Ethernet address. >> Yes, this seems to fix the problem. >> Index: 2.6.16.1/drivers/net/ne.c >> =================================================================== >> --- 2.6.16.1.orig/drivers/net/ne.c 2006-04-14 15:54:41.000000000 -0700 >> +++ 2.6.16.1/drivers/net/ne.c 2006-04-14 16:27:51.000000000 -0700 >> @@ -140,7 +140,8 @@ >> #define NE1SM_START_PG 0x20 /* First page of TX buffer */ >> #define NE1SM_STOP_PG 0x40 /* Last page +1 of RX ring */ >> #define NESM_START_PG 0x40 /* First page of TX buffer */ >> -#define NESM_STOP_PG 0x80 /* Last page +1 of RX ring */ >> +#define NESM_8_STOP_PG 0x60 /* Last page +1 of RX ring, RTL8019 >> 8 bit mode */ >> +#define NESM_STOP_PG 0x80 /* Last page +1 of RX ring */ >> >> #if defined(CONFIG_PLAT_MAPPI) >> # define DCR_VAL 0x4b >> @@ -516,6 +517,7 @@ >> ei_status.tx_start_page = start_page; >> ei_status.stop_page = stop_page; >> #if defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938) >> + ei_status.stop_page = NESM_8_STOP_PG; >> wordlength = 1; >> #endif > > > This is really strange place for that #ifdef -- 'wordlength' is > determined much earlier in this function (and stop_page is set to 0x40 > for 8-bit case), shouldn't #ifdef be moved instead? What I think we actually need is more generic fix for RTL8019AS, not the board specific hacks -- if this RX ring stop page value limitation *really* needs to be enforced. I've cooked up a patch, please try it... WBR, Sergei --------------010205010502030804020507 Content-Type: text/plain; name="RTL8019AS-8bit-PSTOP-limitation.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="RTL8019AS-8bit-PSTOP-limitation.patch" diff --git a/drivers/net/ne.c b/drivers/net/ne.c index 08b218c..04b396b 100644 --- a/drivers/net/ne.c +++ b/drivers/net/ne.c @@ -139,7 +139,8 @@ bad_clone_list[] __initdata = { #if defined(CONFIG_PLAT_MAPPI) # define DCR_VAL 0x4b -#elif defined(CONFIG_PLAT_OAKS32R) +#elif defined(CONFIG_PLAT_OAKS32R) || \ + defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938) # define DCR_VAL 0x48 #else # define DCR_VAL 0x49 @@ -396,7 +397,13 @@ static int __init ne_probe1(struct net_d /* We must set the 8390 for word mode. */ outb_p(DCR_VAL, ioaddr + EN0_DCFG); start_page = NESM_START_PG; - stop_page = NESM_STOP_PG; + + if (!(DCR_VAL & 0x01) && + inb(ioaddr + EN0_RCNTLO) == 0x50 && + inb(ioaddr + EN0_RCNTHI) == 0x70) + stop_page = 0x60; + else + stop_page = NESM_STOP_PG; } else { start_page = NE1SM_START_PG; stop_page = NE1SM_STOP_PG; @@ -509,15 +516,8 @@ static int __init ne_probe1(struct net_d ei_status.name = name; ei_status.tx_start_page = start_page; ei_status.stop_page = stop_page; -#if defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938) - wordlength = 1; -#endif -#ifdef CONFIG_PLAT_OAKS32R - ei_status.word16 = 0; -#else - ei_status.word16 = (wordlength == 2); -#endif + ei_status.word16 = ((DCR_VAL & 0x01) && wordlength == 2); ei_status.rx_start_page = start_page + TX_PAGES; #ifdef PACKETBUF_MEMSIZE --------------010205010502030804020507-- From arnd@arndb.de Mon Apr 17 09:07:24 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 09:07:42 +0100 (BST) Received: from moutng.kundenserver.de ([212.227.126.187]:24557 "EHLO moutng.kundenserver.de") by ftp.linux-mips.org with ESMTP id S8133726AbWDQIHX (ORCPT ); Mon, 17 Apr 2006 09:07:23 +0100 Received: from [84.160.53.210] (helo=noname) by mrelayeu.kundenserver.de (node=mrelayeu10) with ESMTP (Nemesis), id 0ML31I-1FV9Gb3v8u-0006E7; Sun, 16 Apr 2006 17:34:31 +0200 From: Arnd Bergmann To: Steven Rostedt Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules Date: Sun, 16 Apr 2006 17:34:18 +0200 User-Agent: KMail/1.9.1 Cc: Paul Mackerras , Nick Piggin , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, linux390@de.ibm.com, davem@davemloft.net, rusty@rustcorp.com.au References: <1145049535.1336.128.camel@localhost.localdomain> <17473.60411.690686.714791@cargo.ozlabs.ibm.com> <1145194804.27407.103.camel@localhost.localdomain> In-Reply-To: <1145194804.27407.103.camel@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200604161734.20256.arnd@arndb.de> X-Provags-ID: kundenserver.de abuse@kundenserver.de login:c48f057754fc1b1a557605ab9fa6da41 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11120 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: arnd@arndb.de Precedence: bulk X-list: linux-mips On Sunday 16 April 2006 15:40, Steven Rostedt wrote: > I'll think more about this, but maybe someone else has some crazy ideas > that can find a solution to this that is both fast and robust. Ok, you asked for a crazy idea, you're going to get it ;-) You could take a fixed range from the vmalloc area (e.g. 1MB per cpu) and use that to remap pages on demand when you need per cpu data. #define PER_CPU_BASE 0xe000000000000000UL /* arch dependant */ #define PER_CPU_SHIFT 0x100000UL #define __per_cpu_offset(__cpu) (PER_CPU_BASE + PER_CPU_STRIDE * (__cpu)) #define per_cpu(var, cpu) (*RELOC_HIDE(&per_cpu__##var, __per_cpu_offset(cpu))) #define __get_cpu_var(var) per_cpu(var, smp_processor_id()) This is a lot like the current sparc64 implementation already is. The tricky part here is the remapping of pages. You'd need to alloc_pages_node() new pages whenever the already reserved space is not enough for the module you want to load and then map_vm_area() them into the space reserved for them. Advantages of this solution are: - no dependant load access for per_cpu() - might be flexible enough to implement a faster per_cpu_ptr() - can be combined with ia64-style per-cpu remapping Disadvantages are: - you can't use huge tlbs for mapping per cpu data like the regular linear mapping -> may be slower on some archs - does not work in real mode, so percpu data can't be used inside exception handlers on some architectures. - memory consumption is rather high when PAGE_SIZE is large Arnd <>< From tony.luck@gmail.com Mon Apr 17 09:13:51 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 09:14:03 +0100 (BST) Received: from uproxy.gmail.com ([66.249.92.175]:17758 "EHLO uproxy.gmail.com") by ftp.linux-mips.org with ESMTP id S8127231AbWDQINv convert rfc822-to-8bit (ORCPT ); Mon, 17 Apr 2006 09:13:51 +0100 Received: by uproxy.gmail.com with SMTP id u2so360082uge for ; Mon, 17 Apr 2006 01:26:11 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=XsJOhvzZ+2UaFIE3BGl6tmZNQcYbZ0gMOmNZVhsF3DsVarouTDFdkIA8puoO1ZrnwkWORPIczK+KjlnBxheDVE5drWZJNjLgYzSXLMeqhs+4ly34eZ6Lzcrsc9M/A7S8dUCCAN3T2lDhBXN2iEO37pBa1Ds2eJ2uB1u75HckXd4= Received: by 10.78.45.13 with SMTP id s13mr128771hus; Sun, 16 Apr 2006 11:03:03 -0700 (PDT) Received: by 10.78.46.14 with HTTP; Sun, 16 Apr 2006 11:03:03 -0700 (PDT) Message-ID: <12c511ca0604161103l3013f5f1t99c93ee38f102e95@mail.gmail.com> Date: Sun, 16 Apr 2006 11:03:03 -0700 From: "Tony Luck" To: "Arnd Bergmann" Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules Cc: "Steven Rostedt" , "Paul Mackerras" , "Nick Piggin" , LKML , "Andrew Morton" , "Linus Torvalds" , "Ingo Molnar" , "Thomas Gleixner" , "Andi Kleen" , "Martin Mares" , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, "Chris Zankel" , "Marc Gauthier" , "Joe Taylor" , "David Mosberger-Tang" , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, linux390@de.ibm.com, davem@davemloft.net, rusty@rustcorp.com.au In-Reply-To: <200604161734.20256.arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Content-Disposition: inline References: <1145049535.1336.128.camel@localhost.localdomain> <17473.60411.690686.714791@cargo.ozlabs.ibm.com> <1145194804.27407.103.camel@localhost.localdomain> <200604161734.20256.arnd@arndb.de> Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11121 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: tony.luck@intel.com Precedence: bulk X-list: linux-mips On 4/16/06, Arnd Bergmann wrote: > #define PER_CPU_BASE 0xe000000000000000UL /* arch dependant */ On ia64 the percpu area is at 0xffffffffffff0000 so that it can be addressed without tying up another register (all percpu addresses are small negative offsets from "r0"). When David Mosberger chose this address he said that gcc 4 would actually make ue of this, but I haven't checked the generated code to see whether it really is doing so. -Tony From anemo@mba.ocn.ne.jp Mon Apr 17 09:15:31 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 09:15:41 +0100 (BST) Received: from topsns2.toshiba-tops.co.jp ([202.230.225.126]:60193 "EHLO topsns2.toshiba-tops.co.jp") by ftp.linux-mips.org with ESMTP id S8133728AbWDQIPb (ORCPT ); Mon, 17 Apr 2006 09:15:31 +0100 Received: from topsms.toshiba-tops.co.jp by topsns2.toshiba-tops.co.jp via smtpd (for ftp.linux-mips.org [194.74.144.162]) with ESMTP; Mon, 17 Apr 2006 17:27:52 +0900 Received: from topsms.toshiba-tops.co.jp (localhost.localdomain [127.0.0.1]) by localhost.toshiba-tops.co.jp (Postfix) with ESMTP id 07431207C0; Mon, 17 Apr 2006 11:09:48 +0900 (JST) Received: from srd2sd.toshiba-tops.co.jp (srd2sd.toshiba-tops.co.jp [172.17.28.2]) by topsms.toshiba-tops.co.jp (Postfix) with ESMTP id EF2542026B; Mon, 17 Apr 2006 11:09:47 +0900 (JST) Received: from localhost (fragile [172.17.28.65]) by srd2sd.toshiba-tops.co.jp (8.12.10/8.12.10) with ESMTP id k3H29j4D084555; Mon, 17 Apr 2006 11:09:46 +0900 (JST) (envelope-from anemo@mba.ocn.ne.jp) Date: Mon, 17 Apr 2006 11:09:45 +0900 (JST) Message-Id: <20060417.110945.59031594.nemoto@toshiba-tops.co.jp> To: sshtylyov@ru.mvista.com Cc: geoffrey.levand@am.sony.com, linux-mips@linux-mips.org Subject: Re: tx49 Ether problems From: Atsushi Nemoto In-Reply-To: <444291E9.2070407@ru.mvista.com> References: <444032A5.3030304@am.sony.com> <44415D17.1070005@ru.mvista.com> <444291E9.2070407@ru.mvista.com> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11122 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips On Sun, 16 Apr 2006 22:50:17 +0400, Sergei Shtylyov wrote: > > This is really strange place for that #ifdef -- 'wordlength' is > > determined much earlier in this function (and stop_page is set to 0x40 > > for 8-bit case), shouldn't #ifdef be moved instead? > > What I think we actually need is more generic fix for RTL8019AS, not the > board specific hacks -- if this RX ring stop page value limitation *really* > needs to be enforced. I agree with you. Then how about something like CONFIG_NE2000_RTL8019_BYTEMODE? Also, setting 0xbad value to mem_end can skip the Product-ID checking without inflating bad_clone_list. Just a thought... --- Atsushi Nemoto From rusty@rustcorp.com.au Mon Apr 17 09:42:00 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 09:42:10 +0100 (BST) Received: from ozlabs.org ([203.10.76.45]:2456 "HELO ozlabs.org") by ftp.linux-mips.org with SMTP id S8127173AbWDQImA (ORCPT ); Mon, 17 Apr 2006 09:42:00 +0100 Received: from [192.168.1.68] (ppp62-226.lns1.cbr1.internode.on.net [59.167.62.226]) (using SSLv3 with cipher RC4-MD5 (128/128 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTP id BE0C767B1A; Mon, 17 Apr 2006 16:47:43 +1000 (EST) Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules From: Rusty Russell To: Steven Rostedt Cc: Paul Mackerras , Nick Piggin , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, linux390@de.ibm.com, davem@davemloft.net In-Reply-To: <1145194804.27407.103.camel@localhost.localdomain> References: <1145049535.1336.128.camel@localhost.localdomain> <4440855A.7040203@yahoo.com.au> <4441B02D.4000405@yahoo.com.au> <17473.60411.690686.714791@cargo.ozlabs.ibm.com> <1145194804.27407.103.camel@localhost.localdomain> Content-Type: text/plain Date: Mon, 17 Apr 2006 16:47:24 +1000 Message-Id: <1145256445.28600.34.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.4.1 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11123 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: rusty@rustcorp.com.au Precedence: bulk X-list: linux-mips On Sun, 2006-04-16 at 09:40 -0400, Steven Rostedt wrote: > The reason that this is done, is that the per_cpu macro cant know > whether or not the per_cpu variable was declared in a kernel or in a > module. So the __pre_cpu_offset[] array offset can't be used if the > module allocation is in its own separate area. Remember that this offset > array stores the difference from where the variable originally was and > where it is now for each cpu. Actually, the reason this is done is because the per_cpu_offset[] is designed to be replaced by a register or an expression on archs which care, and this is simple. The main problem is that so many archs want different things, it's a very UN task to build infrastructure. I have always recommended using the same scheme to implement real dynamic per-cpu allocation (which would then replace the mini-allocator inside the module code). In fact, I had such an implementation which I reduced to the module case (dynamic per-cpu was too far-out at the time). The arch would allocate a virtual memory hole for each CPU, and map pages as required (this is the simplest of several potential schemes). This gives the "same space between CPUs" property which is required for the ptr + per-cpu-offset scheme. An arch would supply functions like: /* Returns address of new memory chunk(s) * (add __per_cpu_offset to get virtual addresses). */ unsigned long alloc_percpu_memory(unsigned long *size); /* Set by ia64 to reserve the first chunk for percpu vars * in modules only. #define __MODULE_RESERVE_FIRST_CHUNK And an allocator would work on top of these. I'm glad someone is looking at this again! Rusty. -- ccontrol: http://ozlabs.org/~rusty/ccontrol From rostedt@goodmis.org Mon Apr 17 10:16:46 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 10:16:56 +0100 (BST) Received: from ms-smtp-01.nyroc.rr.com ([24.24.2.55]:58299 "EHLO ms-smtp-01.nyroc.rr.com") by ftp.linux-mips.org with ESMTP id S8133138AbWDQJQq convert rfc822-to-8bit (ORCPT ); Mon, 17 Apr 2006 10:16:46 +0100 Received: from [192.168.23.10] (cpe-24-94-51-176.stny.res.rr.com [24.94.51.176]) by ms-smtp-01.nyroc.rr.com (8.13.4/8.13.4) with ESMTP id k3H2HoiP026771; Sun, 16 Apr 2006 22:17:50 -0400 (EDT) Date: Sun, 16 Apr 2006 22:17:50 -0400 (EDT) From: Steven Rostedt X-X-Sender: rostedt@gandalf.stny.rr.com To: Arnd Bergmann cc: Paul Mackerras , Nick Piggin , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, linux390@de.ibm.com, davem@davemloft.net, rusty@rustcorp.com.au Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules In-Reply-To: <200604170407.26111.arnd@arndb.de> Message-ID: References: <1145049535.1336.128.camel@localhost.localdomain> <200604161734.20256.arnd@arndb.de> <1145234750.27828.8.camel@localhost.localdomain> <200604170407.26111.arnd@arndb.de> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=utf-8 Content-Transfer-Encoding: 8BIT X-Virus-Scanned: Symantec AntiVirus Scan Engine Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11124 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: rostedt@goodmis.org Precedence: bulk X-list: linux-mips On Mon, 17 Apr 2006, Arnd Bergmann wrote: > Am Monday 17 April 2006 02:45 schrieb Steven Rostedt: > > > - does not work in real mode, so percpu data can't be used > > >   inside exception handlers on some architectures. > > > > This is probably a big issue.  I believe interrupt context in hrtimers > > uses per_cpu variables. > > If it's just about hrtimers, it should be harmless, since they > are run in softirq context. Even regular interrupt handlers are > always called with paging enabled, otherwise you could not > have them im modules. Ah, you're right. You said exceptions, I'm thinking interrupts. I was a little confused why it wouldn't work. > > > > - memory consumption is rather high when PAGE_SIZE is large > > > > That's also something that I'm trying to solve.  To use the least amount > > of memory and still have the performance. > > > > Now, I've also thought about allocating per_cpu and when a module is > > loaded, reallocate more memory and copy it again.  Use something like > > the kstopmachine to sync the system so that the CPUS don't update any > > per_cpu variables while this is happening, so that things can't get out > > of sync. > > I guess this breaks if someone holds a pointer to a per-cpu variable > while a module gets loaded. > Argh, good point, I didn't think about that. Hmm, this solution is looking harder and harder. Darn, I was really hoping this could be a little better in space savings and robustness. It's starting to seem clearer that Rusty's little hack, may be the best solution. If that's the case, I can at least take comfort in knowing that the time I spent on this is documented in LKML archives, and perhaps can keep others from spending the time too. That said, I haven't quite given up, and may spend a couple more sleepless nights pondering this. -- Steve From rostedt@goodmis.org Mon Apr 17 10:23:56 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 10:24:05 +0100 (BST) Received: from ms-smtp-01.nyroc.rr.com ([24.24.2.55]:53191 "EHLO ms-smtp-01.nyroc.rr.com") by ftp.linux-mips.org with ESMTP id S8133138AbWDQJX4 (ORCPT ); Mon, 17 Apr 2006 10:23:56 +0100 Received: from [192.168.23.10] (cpe-24-94-51-176.stny.res.rr.com [24.94.51.176]) by ms-smtp-01.nyroc.rr.com (8.13.4/8.13.4) with ESMTP id k3GG6Lf0013043; Sun, 16 Apr 2006 12:06:22 -0400 (EDT) Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules From: Steven Rostedt To: Nick Piggin Cc: LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, paulus@samba.org, linux390@de.ibm.com, davem@davemloft.net In-Reply-To: <4441ECE6.5010709@yahoo.com.au> References: <1145049535.1336.128.camel@localhost.localdomain> <4440855A.7040203@yahoo.com.au> <4441B02D.4000405@yahoo.com.au> <4441ECE6.5010709@yahoo.com.au> Content-Type: text/plain Date: Sun, 16 Apr 2006 12:06:21 -0400 Message-Id: <1145203581.27407.112.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: Symantec AntiVirus Scan Engine Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11125 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: rostedt@goodmis.org Precedence: bulk X-list: linux-mips On Sun, 2006-04-16 at 17:06 +1000, Nick Piggin wrote: > Steven Rostedt wrote: > > On Sun, 16 Apr 2006, Nick Piggin wrote: > > >>Why is your module using so much per-cpu memory, anyway? > > > > > > Wasn't my module anyway. The problem appeared in the -rt patch set, when > > tracing was turned on. Some module was affected, and grew it's per_cpu > > size by quite a bit. In fact we had to increase PERCPU_ENOUGH_ROOM by up > > to something like 300K. > > Well that's easy then, just configure PERCPU_ENOUGH_ROOM to be larger > when tracing is on in the -rt patchset? Or use alloc_percpu for the > tracing data? > Yeah, we already know this. The -rt patch was what showed the problem, not the reason I was writing these patches. > >>I don't think it would have been hard for the original author to make > >>it robust... just not both fast and robust. PERCPU_ENOUGH_ROOM seems > >>like an ugly hack at first glance, but I'm fairly sure it was a result > >>of design choices. > > > > Yeah, and I discovered the reasons for those choices as I worked on this. > > I've put a little more thought into this and still think there's a > > solution to not slow things down. > > > > Since the per_cpu_offset section is still smaller than the > > PERCPU_ENOUGH_ROOM and robust, I could still copy it into a per cpu memory > > field, and even add the __per_cpu_offset to it. This would still save > > quite a bit of space. > > Well I don't think making it per-cpu would help much (presumably it > is not going to be written to very frequently) -- I guess it would > be a small advantage on NUMA. The main problem is the extra load in > the fastpath. > > You can't start the next load until the results of the first come > back. Yep, you're right here, and it bothers me too that this slows down performance. > > > So now I'm asking for advice on some ideas that can be a work around to > > keep the robustness and speed. > > > > Is there a way (for archs that support it) to allocate memory in a per cpu > > manner. So each CPU would have its own variable table in the memory that > > is best of it. Then have a field (like the pda in x86_64) to point to > > this section, and use the linker offsets to index and find the per_cpu > > variables. > > > > So this solution still has one more redirection than the current solution > > (per_cpu_offset__##var -> __per_cpu_offset -> actual_var where as the > > current solution is __per_cpu_offset -> actual_var), but all the loads > > would be done from memory that would only be specified for a particular > > CPU. > > > > The generic case would still be the same as the patches I already sent, > > but the archs that can support it, can have something like the above. > > > > Would something like that be acceptible? > > I still don't understand what the justification is for slowing down > this critical bit of infrastructure for something that is only a > problem in the -rt patchset, and even then only a problem when tracing > is enabled. > It's because I'm anal retentive :-) I noticed that the current solution is somewhat a hack, and thought maybe it could be done cleaner. Perhaps I'm wrong and the hack _is_ the best solution, but it doesn't hurt in trying to improve it. Or the very least, prove that the current solution is the way to go. I'm not trying to solve an issue with the -rt patch and tracing, I'm just trying to make Linux a little more efficient in saving space. And you may be right that we cant do that without hurting performance, and thus we keep things as is. But I don't want to give up without a fight and miss something that can solve all this and keep Linux the best OS on the market! (not to say that it isn't even with the current solution) -- Steve From rostedt@goodmis.org Mon Apr 17 11:01:49 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 11:01:58 +0100 (BST) Received: from ms-smtp-01.nyroc.rr.com ([24.24.2.55]:7560 "EHLO ms-smtp-01.nyroc.rr.com") by ftp.linux-mips.org with ESMTP id S8133138AbWDQKBt (ORCPT ); Mon, 17 Apr 2006 11:01:49 +0100 Received: from [192.168.23.10] (cpe-24-94-51-176.stny.res.rr.com [24.94.51.176]) by ms-smtp-01.nyroc.rr.com (8.13.4/8.13.4) with ESMTP id k3H0joEj019170; Sun, 16 Apr 2006 20:45:51 -0400 (EDT) Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules From: Steven Rostedt To: Arnd Bergmann Cc: Paul Mackerras , Nick Piggin , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, linux390@de.ibm.com, davem@davemloft.net, rusty@rustcorp.com.au In-Reply-To: <200604161734.20256.arnd@arndb.de> References: <1145049535.1336.128.camel@localhost.localdomain> <17473.60411.690686.714791@cargo.ozlabs.ibm.com> <1145194804.27407.103.camel@localhost.localdomain> <200604161734.20256.arnd@arndb.de> Content-Type: text/plain Date: Sun, 16 Apr 2006 20:45:50 -0400 Message-Id: <1145234750.27828.8.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: Symantec AntiVirus Scan Engine Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11126 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: rostedt@goodmis.org Precedence: bulk X-list: linux-mips On Sun, 2006-04-16 at 17:34 +0200, Arnd Bergmann wrote: > On Sunday 16 April 2006 15:40, Steven Rostedt wrote: > > I'll think more about this, but maybe someone else has some crazy ideas > > that can find a solution to this that is both fast and robust. > > Ok, you asked for a crazy idea, you're going to get it ;-) > > You could take a fixed range from the vmalloc area (e.g. 1MB per cpu) > and use that to remap pages on demand when you need per cpu data. > > #define PER_CPU_BASE 0xe000000000000000UL /* arch dependant */ > #define PER_CPU_SHIFT 0x100000UL > #define __per_cpu_offset(__cpu) (PER_CPU_BASE + PER_CPU_STRIDE * (__cpu)) > #define per_cpu(var, cpu) (*RELOC_HIDE(&per_cpu__##var, __per_cpu_offset(cpu))) > #define __get_cpu_var(var) per_cpu(var, smp_processor_id()) > > This is a lot like the current sparc64 implementation already is. > Hmm, interesting idea. > The tricky part here is the remapping of pages. You'd need to > alloc_pages_node() new pages whenever the already reserved space is > not enough for the module you want to load and then map_vm_area() > them into the space reserved for them. > > Advantages of this solution are: > - no dependant load access for per_cpu() > - might be flexible enough to implement a faster per_cpu_ptr() > - can be combined with ia64-style per-cpu remapping > > Disadvantages are: > - you can't use huge tlbs for mapping per cpu data like the > regular linear mapping -> may be slower on some archs > - does not work in real mode, so percpu data can't be used > inside exception handlers on some architectures. This is probably a big issue. I believe interrupt context in hrtimers uses per_cpu variables. > - memory consumption is rather high when PAGE_SIZE is large That's also something that I'm trying to solve. To use the least amount of memory and still have the performance. Now, I've also thought about allocating per_cpu and when a module is loaded, reallocate more memory and copy it again. Use something like the kstopmachine to sync the system so that the CPUS don't update any per_cpu variables while this is happening, so that things can't get out of sync. This shouldn't be too much of an issue, since this would only be done when a module is being loaded, and that is a user event that doesn't happen often. We would still need to use the method of keeping track of what is allocated and freed, so that when a module is unloaded, we can still free the area in the per_cpu data. And reallocate that area if a module is added that uses less or the same amount of memory as what was freed. -- Steve From sshtylyov@ru.mvista.com Mon Apr 17 11:17:53 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 11:18:01 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:40879 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133403AbWDQKRx (ORCPT ); Mon, 17 Apr 2006 11:17:53 +0100 Received: (qmail 9892 invoked from network); 16 Apr 2006 19:46:16 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 16 Apr 2006 19:46:16 -0000 Message-ID: <444265EB.50503@ru.mvista.com> Date: Sun, 16 Apr 2006 19:42:35 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: jgarzik@pobox.com CC: linux-net@vger.kernel.org, Linux-MIPS Subject: [PATCH] NEx000: fix RTL8019AS base address for RBTX4938 Content-Type: multipart/mixed; boundary="------------080305010002070700050107" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11127 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips This is a multi-part message in MIME format. --------------080305010002070700050107 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Correct the base address of the Realtek RTL8019AS chip on the Toshiba RBTX4938 board -- this should make the driver work at least when CONFIG_PCI is enabled. Signed-off-by: Yuri Shpilevsky Signed-off-by: Sergei Shtylyov --------------080305010002070700050107 Content-Type: text/plain; name="RBTX4938-fix-RTL8019AS-base-addr.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="RBTX4938-fix-RTL8019AS-base-addr.patch" diff --git a/drivers/net/ne.c b/drivers/net/ne.c index 08b218c..93c494b 100644 --- a/drivers/net/ne.c +++ b/drivers/net/ne.c @@ -226,7 +226,7 @@ struct net_device * __init ne_probe(int netdev_boot_setup_check(dev); #ifdef CONFIG_TOSHIBA_RBTX4938 - dev->base_addr = 0x07f20280; + dev->base_addr = RBTX4938_RTL_8019_BASE; dev->irq = RBTX4938_RTL_8019_IRQ; #endif err = do_ne_probe(dev); --------------080305010002070700050107-- From arnd@arndb.de Mon Apr 17 11:24:19 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 11:24:28 +0100 (BST) Received: from moutng.kundenserver.de ([212.227.126.183]:33791 "EHLO moutng.kundenserver.de") by ftp.linux-mips.org with ESMTP id S8133415AbWDQKYT convert rfc822-to-8bit (ORCPT ); Mon, 17 Apr 2006 11:24:19 +0100 Received: from [84.160.53.210] (helo=noname) by mrelayeu.kundenserver.de (node=mrelayeu7) with ESMTP (Nemesis), id 0ML2Dk-1FVJ8i0kPD-00038H; Mon, 17 Apr 2006 04:06:59 +0200 From: Arnd Bergmann To: Steven Rostedt Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules Date: Mon, 17 Apr 2006 04:07:23 +0200 User-Agent: KMail/1.9.1 Cc: Paul Mackerras , Nick Piggin , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, linux390@de.ibm.com, davem@davemloft.net, rusty@rustcorp.com.au References: <1145049535.1336.128.camel@localhost.localdomain> <200604161734.20256.arnd@arndb.de> <1145234750.27828.8.camel@localhost.localdomain> In-Reply-To: <1145234750.27828.8.camel@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8BIT Content-Disposition: inline Message-Id: <200604170407.26111.arnd@arndb.de> X-Provags-ID: kundenserver.de abuse@kundenserver.de login:bf0b512fe2ff06b96d9695102898be39 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11128 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: arnd@arndb.de Precedence: bulk X-list: linux-mips Am Monday 17 April 2006 02:45 schrieb Steven Rostedt: > > - does not work in real mode, so percpu data can't be used > >   inside exception handlers on some architectures. > > This is probably a big issue.  I believe interrupt context in hrtimers > uses per_cpu variables. If it's just about hrtimers, it should be harmless, since they are run in softirq context. Even regular interrupt handlers are always called with paging enabled, otherwise you could not have them im modules. > > - memory consumption is rather high when PAGE_SIZE is large > > That's also something that I'm trying to solve.  To use the least amount > of memory and still have the performance. > > Now, I've also thought about allocating per_cpu and when a module is > loaded, reallocate more memory and copy it again.  Use something like > the kstopmachine to sync the system so that the CPUS don't update any > per_cpu variables while this is happening, so that things can't get out > of sync. I guess this breaks if someone holds a pointer to a per-cpu variable while a module gets loaded. Arnd <>< From rostedt@goodmis.org Mon Apr 17 12:22:38 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 12:22:49 +0100 (BST) Received: from ms-smtp-03.nyroc.rr.com ([24.24.2.57]:57321 "EHLO ms-smtp-03.nyroc.rr.com") by ftp.linux-mips.org with ESMTP id S8133403AbWDQLWh (ORCPT ); Mon, 17 Apr 2006 12:22:37 +0100 Received: from [192.168.23.10] (cpe-24-94-51-176.stny.res.rr.com [24.94.51.176]) by ms-smtp-03.nyroc.rr.com (8.13.4/8.13.4) with ESMTP id k3HBXbAI001217; Mon, 17 Apr 2006 07:33:39 -0400 (EDT) Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules From: Steven Rostedt To: Rusty Russell Cc: Paul Mackerras , Nick Piggin , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, linux390@de.ibm.com, davem@davemloft.net, Arnd Bergmann In-Reply-To: <1145256445.28600.34.camel@localhost.localdomain> References: <1145049535.1336.128.camel@localhost.localdomain> <4440855A.7040203@yahoo.com.au> <4441B02D.4000405@yahoo.com.au> <17473.60411.690686.714791@cargo.ozlabs.ibm.com> <1145194804.27407.103.camel@localhost.localdomain> <1145256445.28600.34.camel@localhost.localdomain> Content-Type: text/plain Date: Mon, 17 Apr 2006 07:33:36 -0400 Message-Id: <1145273616.27828.21.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: Symantec AntiVirus Scan Engine Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11129 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: rostedt@goodmis.org Precedence: bulk X-list: linux-mips On Mon, 2006-04-17 at 16:47 +1000, Rusty Russell wrote: > > The arch would allocate a virtual memory hole for each CPU, and map > pages as required (this is the simplest of several potential schemes). > This gives the "same space between CPUs" property which is required for > the ptr + per-cpu-offset scheme. An arch would supply functions like: > > /* Returns address of new memory chunk(s) > * (add __per_cpu_offset to get virtual addresses). */ > unsigned long alloc_percpu_memory(unsigned long *size); > > /* Set by ia64 to reserve the first chunk for percpu vars > * in modules only. > #define __MODULE_RESERVE_FIRST_CHUNK > > And an allocator would work on top of these. > > I'm glad someone is looking at this again! Hi Rusty, thanks for the input. Arnd Bergmann also suggested doing the same thing. I've slept on this thought last night and I'm starting to like it more and more. At least it seems to be a better solution than some of the things that I've come up with. I'll start playing around a little and see what I can do with it. I also need to start doing some other work too, so this might take a month or two to get some results. So hopefully, I'll have another patch set in June or July that will be more acceptable. I'd like to thank all those that responded with ideas and criticisms. It's been very helpful. -- Steve From anemo@mba.ocn.ne.jp Mon Apr 17 12:48:22 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 12:48:32 +0100 (BST) Received: from topsns2.toshiba-tops.co.jp ([202.230.225.126]:47116 "EHLO topsns2.toshiba-tops.co.jp") by ftp.linux-mips.org with ESMTP id S8133425AbWDQLsW (ORCPT ); Mon, 17 Apr 2006 12:48:22 +0100 Received: from topsms.toshiba-tops.co.jp by topsns2.toshiba-tops.co.jp via smtpd (for ftp.linux-mips.org [194.74.144.162]) with ESMTP; Mon, 17 Apr 2006 21:00:45 +0900 Received: from topsms.toshiba-tops.co.jp (localhost.localdomain [127.0.0.1]) by localhost.toshiba-tops.co.jp (Postfix) with ESMTP id 38BA620274; Mon, 17 Apr 2006 21:00:40 +0900 (JST) Received: from srd2sd.toshiba-tops.co.jp (srd2sd.toshiba-tops.co.jp [172.17.28.2]) by topsms.toshiba-tops.co.jp (Postfix) with ESMTP id 2D0ED2019E; Mon, 17 Apr 2006 21:00:40 +0900 (JST) Received: from localhost (fragile [172.17.28.65]) by srd2sd.toshiba-tops.co.jp (8.12.10/8.12.10) with ESMTP id k3HC0d4D087061; Mon, 17 Apr 2006 21:00:39 +0900 (JST) (envelope-from anemo@mba.ocn.ne.jp) Date: Mon, 17 Apr 2006 21:00:39 +0900 (JST) Message-Id: <20060417.210039.95063383.nemoto@toshiba-tops.co.jp> To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org, sam@ravnborg.org Subject: [PATCH] fix modpost segfault for 64bit mipsel kernel From: Atsushi Nemoto X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11130 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips 64bit mips has different r_info layout. This patch fixes modpost segfault for 64bit little endian mips kernel. Signed-off-by: Atsushi Nemoto diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index cd00e9f..7846600 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -712,7 +712,13 @@ static void check_sec_ref(struct module r.r_offset = TO_NATIVE(rela->r_offset); r.r_info = TO_NATIVE(rela->r_info); r.r_addend = TO_NATIVE(rela->r_addend); +#if KERNEL_ELFCLASS == ELFCLASS64 && KERNEL_ELFDATA == ELFDATA2LSB + sym = elf->symtab_start + + (hdr->e_machine == EM_MIPS ? + (Elf32_Word)r.r_info : ELF_R_SYM(r.r_info)); +#else sym = elf->symtab_start + ELF_R_SYM(r.r_info); +#endif /* Skip special sections */ if (sym->st_shndx >= SHN_LORESERVE) continue; From anemo@mba.ocn.ne.jp Mon Apr 17 13:06:50 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 13:06:59 +0100 (BST) Received: from topsns2.toshiba-tops.co.jp ([202.230.225.126]:8479 "EHLO topsns2.toshiba-tops.co.jp") by ftp.linux-mips.org with ESMTP id S8133415AbWDQMGu (ORCPT ); Mon, 17 Apr 2006 13:06:50 +0100 Received: from topsms.toshiba-tops.co.jp by topsns2.toshiba-tops.co.jp via smtpd (for ftp.linux-mips.org [194.74.144.162]) with ESMTP; Mon, 17 Apr 2006 21:19:14 +0900 Received: from topsms.toshiba-tops.co.jp (localhost.localdomain [127.0.0.1]) by localhost.toshiba-tops.co.jp (Postfix) with ESMTP id D441D207C2; Mon, 17 Apr 2006 21:19:12 +0900 (JST) Received: from srd2sd.toshiba-tops.co.jp (srd2sd.toshiba-tops.co.jp [172.17.28.2]) by topsms.toshiba-tops.co.jp (Postfix) with ESMTP id C927620797; Mon, 17 Apr 2006 21:19:12 +0900 (JST) Received: from localhost (fragile [172.17.28.65]) by srd2sd.toshiba-tops.co.jp (8.12.10/8.12.10) with ESMTP id k3HCJC4D087091; Mon, 17 Apr 2006 21:19:12 +0900 (JST) (envelope-from anemo@mba.ocn.ne.jp) Date: Mon, 17 Apr 2006 21:19:12 +0900 (JST) Message-Id: <20060417.211912.108120254.nemoto@toshiba-tops.co.jp> To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org, mita@miraclelinux.com Subject: [PATCH] fix bitops for MIPS32/MIPS64 CPUs From: Atsushi Nemoto X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11131 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips With recent rewrite for generic bitops, fls() for 32bit kernel with MIPS64_CPU is broken. Also, ffs(), fls() should be defined the same way as the libc and compiler built-in routines (returns int instead of unsigned long). Signed-off-by: Atsushi Nemoto diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h index a1728f8..d2f4445 100644 --- a/include/asm-mips/bitops.h +++ b/include/asm-mips/bitops.h @@ -467,64 +467,56 @@ static inline unsigned long __ffs(unsign } /* - * ffs - find first bit set. + * fls - find last bit set. * @word: The word to search * - * Returns 1..SZLONG - * Returns 0 if no bit exists + * This is defined the same way as ffs. + * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32. */ - -static inline unsigned long ffs(unsigned long word) +static inline int fls(int word) { - if (!word) - return 0; + __asm__ ("clz %0, %1" : "=r" (word) : "r" (word)); - return __ffs(word) + 1; + return 32 - word; } -/* - * ffz - find first zero in word. - * @word: The word to search - * - * Undefined if no zero exists, so code should check against ~0UL first. - */ -static inline unsigned long ffz(unsigned long word) +#if defined(CONFIG_64BIT) && defined(CONFIG_CPU_MIPS64) +static inline int fls64(__u64 word) { - return __ffs (~word); + __asm__ ("dclz %0, %1" : "=r" (word) : "r" (word)); + + return 64 - word; } +#else +#include +#endif /* - * fls - find last bit set. + * ffs - find first bit set. * @word: The word to search * - * Returns 1..SZLONG - * Returns 0 if no bit exists + * This is defined the same way as + * the libc and compiler builtin ffs routines, therefore + * differs in spirit from the above ffz (man ffs). */ -static inline unsigned long fls(unsigned long word) +static inline int ffs(int word) { -#ifdef CONFIG_CPU_MIPS32 - __asm__ ("clz %0, %1" : "=r" (word) : "r" (word)); - - return 32 - word; -#endif - -#ifdef CONFIG_CPU_MIPS64 - __asm__ ("dclz %0, %1" : "=r" (word) : "r" (word)); + if (!word) + return 0; - return 64 - word; -#endif + return fls(word & -word); } #else #include #include -#include #include +#include #endif /*defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64) */ -#include +#include #include #ifdef __KERNEL__ From anemo@mba.ocn.ne.jp Mon Apr 17 13:12:27 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 13:12:36 +0100 (BST) Received: from topsns2.toshiba-tops.co.jp ([202.230.225.126]:11555 "EHLO topsns2.toshiba-tops.co.jp") by ftp.linux-mips.org with ESMTP id S8133475AbWDQMM1 (ORCPT ); Mon, 17 Apr 2006 13:12:27 +0100 Received: from topsms.toshiba-tops.co.jp by topsns2.toshiba-tops.co.jp via smtpd (for ftp.linux-mips.org [194.74.144.162]) with ESMTP; Mon, 17 Apr 2006 21:24:51 +0900 Received: from topsms.toshiba-tops.co.jp (localhost.localdomain [127.0.0.1]) by localhost.toshiba-tops.co.jp (Postfix) with ESMTP id CA1CC207C0; Mon, 17 Apr 2006 21:24:49 +0900 (JST) Received: from srd2sd.toshiba-tops.co.jp (srd2sd.toshiba-tops.co.jp [172.17.28.2]) by topsms.toshiba-tops.co.jp (Postfix) with ESMTP id BE7F520728; Mon, 17 Apr 2006 21:24:49 +0900 (JST) Received: from localhost (fragile [172.17.28.65]) by srd2sd.toshiba-tops.co.jp (8.12.10/8.12.10) with ESMTP id k3HCOn4D087121; Mon, 17 Apr 2006 21:24:49 +0900 (JST) (envelope-from anemo@mba.ocn.ne.jp) Date: Mon, 17 Apr 2006 21:24:49 +0900 (JST) Message-Id: <20060417.212449.51866545.nemoto@toshiba-tops.co.jp> To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org Subject: [PATCH] use __ffs() instead of ffs() in ip32_irq0() From: Atsushi Nemoto X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11132 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips With recent rewrite for generic bitops, ffs() is defined the same way as the libc and compiler built-in routines (returns int instead of unsigned long). Use __ffs() for 64bit value. Signed-off-by: Atsushi Nemoto diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c index 22a6df9..de01c98 100644 --- a/arch/mips/sgi-ip32/ip32-irq.c +++ b/arch/mips/sgi-ip32/ip32-irq.c @@ -507,13 +507,14 @@ static void ip32_irq0(struct pt_regs *re int irq = 0; crime_int = crime->istat & crime_mask; - irq = ffs(crime_int); - crime_int = 1 << (irq - 1); + irq = __ffs(crime_int); + crime_int = 1 << irq; if (crime_int & CRIME_MACEISA_INT_MASK) { unsigned long mace_int = mace->perif.ctrl.istat; - irq = ffs(mace_int & maceisa_mask) + 32; + irq = __ffs(mace_int & maceisa_mask) + 32; } + irq++; DBG("*irq %u*\n", irq); do_IRQ(irq, regs); } From ths@networkno.de Mon Apr 17 13:41:35 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 13:41:45 +0100 (BST) Received: from bender.bawue.de ([193.7.176.20]:44510 "HELO bender.bawue.de") by ftp.linux-mips.org with SMTP id S8133448AbWDQMlf (ORCPT ); Mon, 17 Apr 2006 13:41:35 +0100 Received: from lagash (88-106-238-34.dynamic.dsl.as9105.com [88.106.238.34]) (using TLSv1 with cipher DES-CBC3-SHA (168/168 bits)) (No client certificate requested) by bender.bawue.de (Postfix) with ESMTP id 298F944EE4; Mon, 17 Apr 2006 14:53:59 +0200 (MEST) Received: from ths by lagash with local (Exim 4.61) (envelope-from ) id 1FVTEc-00048m-G0; Mon, 17 Apr 2006 13:53:42 +0100 Date: Mon, 17 Apr 2006 13:53:32 +0100 To: Atsushi Nemoto Cc: linux-mips@linux-mips.org, ralf@linux-mips.org, sam@ravnborg.org Subject: Re: [PATCH] fix modpost segfault for 64bit mipsel kernel Message-ID: <20060417125332.GB28935@networkno.de> References: <20060417.210039.95063383.nemoto@toshiba-tops.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060417.210039.95063383.nemoto@toshiba-tops.co.jp> User-Agent: Mutt/1.5.11+cvs20060403 From: Thiemo Seufer Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11133 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ths@networkno.de Precedence: bulk X-list: linux-mips Atsushi Nemoto wrote: > 64bit mips has different r_info layout. This patch fixes modpost > segfault for 64bit little endian mips kernel. > > Signed-off-by: Atsushi Nemoto > > diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c > index cd00e9f..7846600 100644 > --- a/scripts/mod/modpost.c > +++ b/scripts/mod/modpost.c > @@ -712,7 +712,13 @@ static void check_sec_ref(struct module > r.r_offset = TO_NATIVE(rela->r_offset); > r.r_info = TO_NATIVE(rela->r_info); > r.r_addend = TO_NATIVE(rela->r_addend); > +#if KERNEL_ELFCLASS == ELFCLASS64 && KERNEL_ELFDATA == ELFDATA2LSB > + sym = elf->symtab_start + > + (hdr->e_machine == EM_MIPS ? > + (Elf32_Word)r.r_info : ELF_R_SYM(r.r_info)); > +#else > sym = elf->symtab_start + ELF_R_SYM(r.r_info); > +#endif This doesn't look right. ELF64_R_SYM/ELF64_R_TYPE should be fixed for mips64 instead. Thiemo From sshtylyov@ru.mvista.com Mon Apr 17 13:55:12 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 13:55:21 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:32940 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133415AbWDQMzM (ORCPT ); Mon, 17 Apr 2006 13:55:12 +0100 Received: (qmail 19578 invoked from network); 17 Apr 2006 17:10:18 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 17 Apr 2006 17:10:18 -0000 Message-ID: <444392CF.7070808@ru.mvista.com> Date: Mon, 17 Apr 2006 17:06:23 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: Atsushi Nemoto CC: geoffrey.levand@am.sony.com, linux-mips@linux-mips.org Subject: Re: tx49 Ether problems References: <444032A5.3030304@am.sony.com> <44415D17.1070005@ru.mvista.com> <444291E9.2070407@ru.mvista.com> <20060417.110945.59031594.nemoto@toshiba-tops.co.jp> In-Reply-To: <20060417.110945.59031594.nemoto@toshiba-tops.co.jp> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11134 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips Hello. Atsushi Nemoto wrote: > On Sun, 16 Apr 2006 22:50:17 +0400, Sergei Shtylyov wrote: >>> This is really strange place for that #ifdef -- 'wordlength' is >>>determined much earlier in this function (and stop_page is set to 0x40 >>>for 8-bit case), shouldn't #ifdef be moved instead? >> What I think we actually need is more generic fix for RTL8019AS, not the >>board specific hacks -- if this RX ring stop page value limitation *really* >>needs to be enforced. > I agree with you. Then how about something like > CONFIG_NE2000_RTL8019_BYTEMODE? Have you looked at the patch? RTL8019 is easily detectable at runtime, so the limitation is easily enforcable w/o extra Kconfig option, I think > Also, setting 0xbad value to mem_end > can skip the Product-ID checking without inflating bad_clone_list. > Just a thought... 0xbad in dev->mem_end currently skips 8390 reset which is not a good thing for the clones for which it does work... > --- > Atsushi Nemoto WBR, Sergei From sam@ravnborg.org Mon Apr 17 14:27:52 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 14:28:01 +0100 (BST) Received: from pasmtp.tele.dk ([193.162.159.95]:48396 "HELO pasmtp.tele.dk") by ftp.linux-mips.org with SMTP id S8133588AbWDQN1w (ORCPT ); Mon, 17 Apr 2006 14:27:52 +0100 Received: from mars.ravnborg.org (0x50a0757d.hrnxx9.adsl-dhcp.tele.dk [80.160.117.125]) by pasmtp.tele.dk (Postfix) with ESMTP id 2F01E1EC308; Mon, 17 Apr 2006 15:40:07 +0200 (CEST) Received: by mars.ravnborg.org (Postfix, from userid 1000) id 88A6943C21C; Mon, 17 Apr 2006 15:40:05 +0200 (CEST) Date: Mon, 17 Apr 2006 15:40:05 +0200 From: Sam Ravnborg To: Atsushi Nemoto Cc: linux-mips@linux-mips.org, ralf@linux-mips.org Subject: Re: [PATCH] fix modpost segfault for 64bit mipsel kernel Message-ID: <20060417134005.GA13304@mars.ravnborg.org> References: <20060417.210039.95063383.nemoto@toshiba-tops.co.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060417.210039.95063383.nemoto@toshiba-tops.co.jp> User-Agent: Mutt/1.5.11 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11135 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sam@ravnborg.org Precedence: bulk X-list: linux-mips On Mon, Apr 17, 2006 at 09:00:39PM +0900, Atsushi Nemoto wrote: > 64bit mips has different r_info layout. This patch fixes modpost > segfault for 64bit little endian mips kernel. > > Signed-off-by: Atsushi Nemoto > > diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c > index cd00e9f..7846600 100644 > --- a/scripts/mod/modpost.c > +++ b/scripts/mod/modpost.c > @@ -712,7 +712,13 @@ static void check_sec_ref(struct module > r.r_offset = TO_NATIVE(rela->r_offset); > r.r_info = TO_NATIVE(rela->r_info); > r.r_addend = TO_NATIVE(rela->r_addend); > +#if KERNEL_ELFCLASS == ELFCLASS64 && KERNEL_ELFDATA == ELFDATA2LSB > + sym = elf->symtab_start + > + (hdr->e_machine == EM_MIPS ? > + (Elf32_Word)r.r_info : ELF_R_SYM(r.r_info)); > +#else > sym = elf->symtab_start + ELF_R_SYM(r.r_info); > +#endif > /* Skip special sections */ > if (sym->st_shndx >= SHN_LORESERVE) > continue; Hi Atsushi So with 64bit mips with the above we read r.r_info with no modifications. But the elf.h I have on my system looks like this: /* How to extract and insert information held in the r_info field. */ #define ELF32_R_SYM(val) ((val) >> 8) #define ELF32_R_TYPE(val) ((val) & 0xff) #define ELF32_R_INFO(sym, type) (((sym) << 8) + ((type) & 0xff)) #define ELF64_R_SYM(i) ((i) >> 32) #define ELF64_R_TYPE(i) ((i) & 0xffffffff) #define ELF64_R_INFO(sym,type) ((((Elf64_Xword) (sym)) << 32) + (type)) So the difference between 64bit and 32bit is only the number of right shifts. Maybe we need to do some simple range check also so it becomes: if ((sym->st_shndx >= SHN_LORESERVE) || (sym > elf->symtab_stop)) continue; Could you try this - and if you still see the SEGVAL then try to print out the value of all members in 'r'. You can also try to add '-g' to HOSTCFLAGS in toplevel makefile. Then use make V=1 to see what arguments modpost is caleld with and call it from the commandline or from a debugger. Sam From ths@networkno.de Mon Apr 17 14:55:37 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 14:55:45 +0100 (BST) Received: from bender.bawue.de ([193.7.176.20]:12270 "HELO bender.bawue.de") by ftp.linux-mips.org with SMTP id S8133415AbWDQNzh (ORCPT ); Mon, 17 Apr 2006 14:55:37 +0100 Received: from lagash (88-106-238-34.dynamic.dsl.as9105.com [88.106.238.34]) (using TLSv1 with cipher DES-CBC3-SHA (168/168 bits)) (No client certificate requested) by bender.bawue.de (Postfix) with ESMTP id 49B55450DE; Mon, 17 Apr 2006 16:08:01 +0200 (MEST) Received: from ths by lagash with local (Exim 4.61) (envelope-from ) id 1FVUOH-0004kx-CC; Mon, 17 Apr 2006 15:07:45 +0100 Date: Mon, 17 Apr 2006 15:07:35 +0100 From: Thiemo Seufer To: Atsushi Nemoto Cc: linux-mips@linux-mips.org, ralf@linux-mips.org, sam@ravnborg.org Subject: Re: [PATCH] fix modpost segfault for 64bit mipsel kernel Message-ID: <20060417140735.GC28935@networkno.de> References: <20060417.210039.95063383.nemoto@toshiba-tops.co.jp> <20060417125332.GB28935@networkno.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060417125332.GB28935@networkno.de> User-Agent: Mutt/1.5.11+cvs20060403 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11136 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ths@networkno.de Precedence: bulk X-list: linux-mips Thiemo Seufer wrote: > Atsushi Nemoto wrote: > > 64bit mips has different r_info layout. This patch fixes modpost > > segfault for 64bit little endian mips kernel. > > > > Signed-off-by: Atsushi Nemoto > > > > diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c > > index cd00e9f..7846600 100644 > > --- a/scripts/mod/modpost.c > > +++ b/scripts/mod/modpost.c > > @@ -712,7 +712,13 @@ static void check_sec_ref(struct module > > r.r_offset = TO_NATIVE(rela->r_offset); > > r.r_info = TO_NATIVE(rela->r_info); > > r.r_addend = TO_NATIVE(rela->r_addend); > > +#if KERNEL_ELFCLASS == ELFCLASS64 && KERNEL_ELFDATA == ELFDATA2LSB > > + sym = elf->symtab_start + > > + (hdr->e_machine == EM_MIPS ? > > + (Elf32_Word)r.r_info : ELF_R_SYM(r.r_info)); > > +#else > > sym = elf->symtab_start + ELF_R_SYM(r.r_info); > > +#endif > > This doesn't look right. ELF64_R_SYM/ELF64_R_TYPE should be fixed for > mips64 instead. I should have read more carefully. The ELF_R_SYM seems to be correct, if this patch makes it work fo you then the toolchain you use creates broken (word-swapped ?) relocation entries for mips64el. Thiemo From anemo@mba.ocn.ne.jp Mon Apr 17 15:56:33 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 15:56:42 +0100 (BST) Received: from mba.ocn.ne.jp ([210.190.142.172]:20932 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S8133600AbWDQO4d (ORCPT ); Mon, 17 Apr 2006 15:56:33 +0100 Received: from localhost (p1246-ipad213funabasi.chiba.ocn.ne.jp [124.85.66.246]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 466D4AE62; Tue, 18 Apr 2006 00:08:53 +0900 (JST) Date: Tue, 18 Apr 2006 00:09:18 +0900 (JST) Message-Id: <20060418.000918.95064811.anemo@mba.ocn.ne.jp> To: sshtylyov@ru.mvista.com Cc: geoffrey.levand@am.sony.com, linux-mips@linux-mips.org Subject: Re: tx49 Ether problems From: Atsushi Nemoto In-Reply-To: <444392CF.7070808@ru.mvista.com> References: <444291E9.2070407@ru.mvista.com> <20060417.110945.59031594.nemoto@toshiba-tops.co.jp> <444392CF.7070808@ru.mvista.com> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11137 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips On Mon, 17 Apr 2006 17:06:23 +0400, Sergei Shtylyov wrote: > > I agree with you. Then how about something like > > CONFIG_NE2000_RTL8019_BYTEMODE? > > Have you looked at the patch? RTL8019 is easily detectable at > runtime, so the limitation is easily enforcable w/o extra Kconfig > option, I think Well, I meant something like: #elif defined(CONFIG_NE2000_RTL8019_BYTEMODE) # define DCR_VAL 0x48 #else # define DCR_VAL 0x49 to avoid changing #elif line every time when we want to support a new board with byte-mode RTL8019AS. Of course, calculating DCR_VAL at runtime would be much better but I'm not sure if we can do it ... > > Also, setting 0xbad value to mem_end > > can skip the Product-ID checking without inflating bad_clone_list. > > Just a thought... > > 0xbad in dev->mem_end currently skips 8390 reset which is not a > good thing for the clones for which it does work... The 8390 reset will not skipped. The difference is behavior _after_ detection of no reset ack, isn't it? --- Atsushi Nemoto From anemo@mba.ocn.ne.jp Mon Apr 17 16:34:31 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 16:34:42 +0100 (BST) Received: from mba.ocn.ne.jp ([210.190.142.172]:35552 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S8133415AbWDQPeb (ORCPT ); Mon, 17 Apr 2006 16:34:31 +0100 Received: from localhost (p1246-ipad213funabasi.chiba.ocn.ne.jp [124.85.66.246]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 2779CA2C9; Tue, 18 Apr 2006 00:46:53 +0900 (JST) Date: Tue, 18 Apr 2006 00:47:18 +0900 (JST) Message-Id: <20060418.004718.108120830.anemo@mba.ocn.ne.jp> To: ths@networkno.de Cc: linux-mips@linux-mips.org, ralf@linux-mips.org, sam@ravnborg.org Subject: Re: [PATCH] fix modpost segfault for 64bit mipsel kernel From: Atsushi Nemoto In-Reply-To: <20060417140735.GC28935@networkno.de> References: <20060417.210039.95063383.nemoto@toshiba-tops.co.jp> <20060417125332.GB28935@networkno.de> <20060417140735.GC28935@networkno.de> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11138 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips On Mon, 17 Apr 2006 15:07:35 +0100, Thiemo Seufer wrote: > I should have read more carefully. The ELF_R_SYM seems to be correct, if > this patch makes it work fo you then the toolchain you use creates broken > (word-swapped ?) relocation entries for mips64el. Looking at following codes in glibc source (sysdeps/mips/elf/ldsodefs.h), I thought r_info on 64bit mips needs special handling. Is not this structure used for 64bit kernel modules? typedef struct { Elf32_Word r_sym; /* Symbol index */ unsigned char r_ssym; /* Special symbol for 2nd relocation */ unsigned char r_type3; /* 3rd relocation type */ unsigned char r_type2; /* 2nd relocation type */ unsigned char r_type1; /* 1st relocation type */ } _Elf64_Mips_R_Info; typedef union { Elf64_Xword r_info_number; _Elf64_Mips_R_Info r_info_fields; } _Elf64_Mips_R_Info_union; ... typedef struct { Elf64_Addr r_offset; /* Address */ _Elf64_Mips_R_Info_union r_info; /* Relocation type and symbol index */ Elf64_Sxword r_addend; /* Addend */ } Elf64_Mips_Rela; #define ELF64_MIPS_R_SYM(i) \ ((__extension__ (_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_sym) ... #undef ELF64_R_SYM #define ELF64_R_SYM(i) ELF64_MIPS_R_SYM (i) --- Atsushi Nemoto From anemo@mba.ocn.ne.jp Mon Apr 17 16:50:40 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 16:50:50 +0100 (BST) Received: from mba.ocn.ne.jp ([210.190.142.172]:51152 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S8133415AbWDQPuk (ORCPT ); Mon, 17 Apr 2006 16:50:40 +0100 Received: from localhost (p1246-ipad213funabasi.chiba.ocn.ne.jp [124.85.66.246]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id A4203A744; Tue, 18 Apr 2006 01:03:02 +0900 (JST) Date: Tue, 18 Apr 2006 01:03:27 +0900 (JST) Message-Id: <20060418.010327.115906647.anemo@mba.ocn.ne.jp> To: sam@ravnborg.org Cc: linux-mips@linux-mips.org, ralf@linux-mips.org Subject: Re: [PATCH] fix modpost segfault for 64bit mipsel kernel From: Atsushi Nemoto In-Reply-To: <20060417134005.GA13304@mars.ravnborg.org> References: <20060417.210039.95063383.nemoto@toshiba-tops.co.jp> <20060417134005.GA13304@mars.ravnborg.org> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11139 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips On Mon, 17 Apr 2006 15:40:05 +0200, Sam Ravnborg wrote: > Maybe we need to do some simple range check also so it becomes: > if ((sym->st_shndx >= SHN_LORESERVE) || (sym > elf->symtab_stop)) > continue; > > Could you try this - and if you still see the SEGVAL then try to print > out the value of all members in 'r'. > > You can also try to add '-g' to HOSTCFLAGS in toplevel makefile. > Then use make V=1 to see what arguments modpost is caleld with and call > it from the commandline or from a debugger. When segfault happened, 'sym' has an invalid value. Here is gdb session log: $ gdb scripts/mod/modpost GNU gdb 6.3-debian Copyright 2004 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Type "show copying" to see the conditions. There is absolutely no warranty for GDB. Type "show warranty" for details. This GDB was configured as "i386-linux"...Using host libthread_db library "/lib/tls/libthread_db.so.1". (gdb) run -m -a -o /home/git/build-swarm-le/Module.symvers vmlinux crypto/aes.o crypto/anubis.o crypto/arc4.o crypto/blowfish.o crypto/cast5.o crypto/cast6.o crypto/crc32c.o crypto/crypto_null.o crypto/deflate.o crypto/des.o crypto/khazad.o crypto/md4.o crypto/md5.o crypto/michael_mic.o crypto/serpent.o crypto/sha1.o crypto/sha256.o crypto/sha512.o crypto/tea.o crypto/tgr192.o crypto/twofish.o crypto/wp512.o drivers/base/firmware_class.o drivers/block/aoe/aoe.o drivers/block/pktcdvd.o drivers/connector/cn.o drivers/input/serio/serio_raw.o drivers/net/phy/cicada.o drivers/net/phy/davicom.o drivers/net/phy/libphy.o drivers/net/phy/lxt.o drivers/net/phy/marvell.o drivers/net/phy/qsemi.o fs/fuse/fuse.o lib/crc16.o lib/libcrc32c.o lib/zlib_deflate/zlib_deflate.o lib/zlib_inflate/zlib_inflate.o net/ieee80211/ieee80211.o net/ieee80211/ieee80211_crypt.o net/ieee80211/ieee80211_crypt_ccmp.o net/ieee80211/ieee80211_crypt_wep.o net/xfrm/xfrm_user.o Starting program: /home/git/build-swarm-le/scripts/mod/modpost -m -a -o /home/git/build-swarm-le/Module.symvers vmlinux crypto/aes.o crypto/anubis.o crypto/arc4.o crypto/blowfish.o crypto/cast5.o crypto/cast6.o crypto/crc32c.o crypto/crypto_null.o crypto/deflate.o crypto/des.o crypto/khazad.o crypto/md4.o crypto/md5.o crypto/michael_mic.o crypto/serpent.o crypto/sha1.o crypto/sha256.o crypto/sha512.o crypto/tea.o crypto/tgr192.o crypto/twofish.o crypto/wp512.o drivers/base/firmware_class.o drivers/block/aoe/aoe.o drivers/block/pktcdvd.o drivers/connector/cn.o drivers/input/serio/serio_raw.o drivers/net/phy/cicada.o drivers/net/phy/davicom.o drivers/net/phy/libphy.o drivers/net/phy/lxt.o drivers/net/phy/marvell.o drivers/net/phy/qsemi.o fs/fuse/fuse.o lib/crc16.o lib/libcrc32c.o lib/zlib_deflate/zlib_deflate.o lib/zlib_inflate/zlib_inflate.o net/ieee80211/ieee80211.o net/ieee80211/ieee80211_crypt.o net/ieee80211/ieee80211_crypt_ccmp.o net/ieee80211/ieee80211_crypt_wep.o net/xfrm/xfrm_user.o Program received signal SIGSEGV, Segmentation fault. check_sec_ref (mod=0x806a2d8, modname=0xbffff79a "crypto/aes.o", elf=0xbffff230, section=0x804a050 , section_ref_ok=0x804a0b0 ) at /home/git/linux-mips/scripts/mod/modpost.c:717 717 if (sym->st_shndx >= SHN_LORESERVE) (gdb) p/x sym $1 = 0xf8161a58 (gdb) p/x elf->symtab_start $2 = 0x40161a58 (gdb) p/x r $3 = {r_offset = 0x1a4, r_info = 0x1d00000000000004, r_addend = 0x2028} I suppose r_info have is following layout on 64bit mips: typedef struct { Elf32_Word r_sym; /* Symbol index */ unsigned char r_ssym; /* Special symbol for 2nd relocation */ unsigned char r_type3; /* 3rd relocation type */ unsigned char r_type2; /* 2nd relocation type */ unsigned char r_type1; /* 1st relocation type */ } _Elf64_Mips_R_Info; For 64bit big-endian mips, r_info was byte-swapped by TO_NATIVE, so I can use standard ELF_R_SYM(). --- Atsushi Nemoto From sshtylyov@ru.mvista.com Mon Apr 17 16:56:03 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 16:56:12 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:29588 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133415AbWDQP4D (ORCPT ); Mon, 17 Apr 2006 16:56:03 +0100 Received: (qmail 22071 invoked from network); 17 Apr 2006 20:11:14 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 17 Apr 2006 20:11:14 -0000 Message-ID: <4443BD39.4030200@ru.mvista.com> Date: Mon, 17 Apr 2006 20:07:21 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: Atsushi Nemoto CC: linux-mips@linux-mips.org Subject: Re: tx49 Ether problems References: <444291E9.2070407@ru.mvista.com> <20060417.110945.59031594.nemoto@toshiba-tops.co.jp> <444392CF.7070808@ru.mvista.com> <20060418.000918.95064811.anemo@mba.ocn.ne.jp> In-Reply-To: <20060418.000918.95064811.anemo@mba.ocn.ne.jp> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11140 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips Hello. Atsushi Nemoto wrote: > On Mon, 17 Apr 2006 17:06:23 +0400, Sergei Shtylyov wrote: >>>I agree with you. Then how about something like >>>CONFIG_NE2000_RTL8019_BYTEMODE? >> Have you looked at the patch? RTL8019 is easily detectable at >>runtime, so the limitation is easily enforcable w/o extra Kconfig >>option, I think > Well, I meant something like: > #elif defined(CONFIG_NE2000_RTL8019_BYTEMODE) > # define DCR_VAL 0x48 > #else > # define DCR_VAL 0x49 > to avoid changing #elif line every time when we want to support a new > board with byte-mode RTL8019AS. Of course, calculating DCR_VAL at > runtime would be much better but I'm not sure if we can do it ... Hm, with only 3-4 known boards so far (all Toshiba RBTX49[23][78], RBTX4925 also has the chip but I see no 2.6 support for this board), I doubt that it's worth the effort. And the option sounds a bit "too specific", IMO. :-) >>> Also, setting 0xbad value to mem_end >>>can skip the Product-ID checking without inflating bad_clone_list. >>>Just a thought... Er, calling RTL8019AS in 8-bit mode "NE2000" (as the driver would have done in case of RBTX49xx if we have used 0xbad), is not a correct thing. :-) >> 0xbad in dev->mem_end currently skips 8390 reset which is not a >>good thing for the clones for which it does work... > The 8390 reset will not skipped. The difference is behavior _after_ > detection of no reset ack, isn't it? Yes, I was too hasty and have overlooked this. :-) > --- > Atsushi Nemoto WBR, Sergei From sshtylyov@ru.mvista.com Mon Apr 17 17:01:13 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 17:01:24 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:29846 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8133415AbWDQQBN (ORCPT ); Mon, 17 Apr 2006 17:01:13 +0100 Received: (qmail 22195 invoked from network); 17 Apr 2006 20:16:20 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 17 Apr 2006 20:16:20 -0000 Message-ID: <4443BE71.6090908@ru.mvista.com> Date: Mon, 17 Apr 2006 20:12:33 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: Atsushi Nemoto CC: linux-mips@linux-mips.org Subject: Re: tx49 Ether problems References: <444291E9.2070407@ru.mvista.com> <20060417.110945.59031594.nemoto@toshiba-tops.co.jp> <444392CF.7070808@ru.mvista.com> <20060418.000918.95064811.anemo@mba.ocn.ne.jp> <4443BD39.4030200@ru.mvista.com> In-Reply-To: <4443BD39.4030200@ru.mvista.com> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11141 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips Hello. Sergei Shtylyov wrote: >> On Mon, 17 Apr 2006 17:06:23 +0400, Sergei Shtylyov >> wrote: >>>> I agree with you. Then how about something like >>>> CONFIG_NE2000_RTL8019_BYTEMODE? >>> Have you looked at the patch? RTL8019 is easily detectable at >>> runtime, so the limitation is easily enforcable w/o extra Kconfig >>> option, I think >> Well, I meant something like: >> #elif defined(CONFIG_NE2000_RTL8019_BYTEMODE) >> # define DCR_VAL 0x48 >> #else >> # define DCR_VAL 0x49 >> to avoid changing #elif line every time when we want to support a new >> board with byte-mode RTL8019AS. Of course, calculating DCR_VAL at >> runtime would be much better but I'm not sure if we can do it ... > Hm, with only 3-4 known boards so far (all Toshiba RBTX49[23][78], > RBTX4925 also has the chip but I see no 2.6 support for this board), I > doubt that it's worth the effort. And the option sounds a bit "too > specific", IMO. :-) Especially given the fact that it can't be attributed to RTL8019 only. Historically, there was CONFIG_NE2000_8BIT option but it's been eliminated long ago. Maybe it's worth reviving it indeed... >> --- >> Atsushi Nemoto WBR, Sergei From ths@networkno.de Mon Apr 17 17:15:42 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 17:15:50 +0100 (BST) Received: from bender.bawue.de ([193.7.176.20]:49562 "HELO bender.bawue.de") by ftp.linux-mips.org with SMTP id S8133621AbWDQQPm (ORCPT ); Mon, 17 Apr 2006 17:15:42 +0100 Received: from lagash (88-106-238-34.dynamic.dsl.as9105.com [88.106.238.34]) (using TLSv1 with cipher DES-CBC3-SHA (168/168 bits)) (No client certificate requested) by bender.bawue.de (Postfix) with ESMTP id F1D32449AF; Mon, 17 Apr 2006 18:28:06 +0200 (MEST) Received: from ths by lagash with local (Exim 4.61) (envelope-from ) id 1FVWZs-0005S9-Cs; Mon, 17 Apr 2006 17:27:52 +0100 Date: Mon, 17 Apr 2006 17:27:42 +0100 From: Thiemo Seufer To: Atsushi Nemoto Cc: linux-mips@linux-mips.org, ralf@linux-mips.org, sam@ravnborg.org Subject: Re: [PATCH] fix modpost segfault for 64bit mipsel kernel Message-ID: <20060417162742.GD28935@networkno.de> References: <20060417.210039.95063383.nemoto@toshiba-tops.co.jp> <20060417125332.GB28935@networkno.de> <20060417140735.GC28935@networkno.de> <20060418.004718.108120830.anemo@mba.ocn.ne.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060418.004718.108120830.anemo@mba.ocn.ne.jp> User-Agent: Mutt/1.5.11+cvs20060403 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11142 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ths@networkno.de Precedence: bulk X-list: linux-mips Atsushi Nemoto wrote: > On Mon, 17 Apr 2006 15:07:35 +0100, Thiemo Seufer wrote: > > I should have read more carefully. The ELF_R_SYM seems to be correct, if > > this patch makes it work fo you then the toolchain you use creates broken > > (word-swapped ?) relocation entries for mips64el. > > Looking at following codes in glibc source > (sysdeps/mips/elf/ldsodefs.h), I thought r_info on 64bit mips needs > special handling. Is not this structure used for 64bit kernel > modules? > > typedef struct > { > Elf32_Word r_sym; /* Symbol index */ > unsigned char r_ssym; /* Special symbol for 2nd relocation */ > unsigned char r_type3; /* 3rd relocation type */ > unsigned char r_type2; /* 2nd relocation type */ > unsigned char r_type1; /* 1st relocation type */ > } _Elf64_Mips_R_Info; Hm, binutils uses generically 64bit quantities: #define ELF32_R_SYM(i) ((i) >> 8) #define ELF32_R_TYPE(i) ((i) & 0xff) #define ELF32_R_INFO(s,t) (((s) << 8) + ((t) & 0xff)) #define ELF64_R_SYM(i) ((i) >> 32) #define ELF64_R_TYPE(i) ((i) & 0xffffffff) #define ELF64_R_INFO(s,t) (((bfd_vma) (s) << 31 << 1) + (bfd_vma) (t)) But for MIPS64 the same as glibc: typedef struct { /* Address of relocation. */ unsigned char r_offset[8]; /* Symbol index. */ unsigned char r_sym[4]; /* Special symbol. */ unsigned char r_ssym[1]; /* Third relocation. */ unsigned char r_type3[1]; /* Second relocation. */ unsigned char r_type2[1]; /* First relocation. */ unsigned char r_type[1]; /* Addend. */ unsigned char r_addend[8]; } Elf64_Mips_External_Rela; /* MIPS ELF 64 relocation info access macros. */ #define ELF64_MIPS_R_SSYM(i) (((i) >> 24) & 0xff) #define ELF64_MIPS_R_TYPE3(i) (((i) >> 16) & 0xff) #define ELF64_MIPS_R_TYPE2(i) (((i) >> 8) & 0xff) #define ELF64_MIPS_R_TYPE(i) ((i) & 0xff) So it is the r.r_info = TO_NATIVE(rela->r_info); in modpost.c which breaks both SYM and TYPE because it assumes a 64bit integer. The proper solution would be to add a Elf64_Mips_Rela structure (with lots of nearly identical duplicated code), the hack would be to cast r_info to a 32bit integer for mips, before feeding it to TO_NATIVE (which works until somebody asks for the TYPE, then a separate mips64 version becomes inevitable.) Thiemo From christoph@schroedinger.engr.sgi.com Mon Apr 17 17:43:51 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 17:44:00 +0100 (BST) Received: from omx1-ext.sgi.com ([192.48.179.11]:15086 "EHLO omx1.americas.sgi.com") by ftp.linux-mips.org with ESMTP id S8133415AbWDQQnv (ORCPT ); Mon, 17 Apr 2006 17:43:51 +0100 Received: from imr2.americas.sgi.com (imr2.americas.sgi.com [198.149.16.18]) by omx1.americas.sgi.com (8.12.10/8.12.9/linux-outbound_gateway-1.1) with ESMTP id k3HGt3nx026307; Mon, 17 Apr 2006 11:55:04 -0500 Received: from spindle.corp.sgi.com (spindle.corp.sgi.com [198.29.75.13]) by imr2.americas.sgi.com (8.12.9/8.12.10/SGI_generic_relay-1.2) with ESMTP id k3HHDK7p24865408; Mon, 17 Apr 2006 10:13:21 -0700 (PDT) Received: from schroedinger.engr.sgi.com (schroedinger.engr.sgi.com [163.154.5.55]) by spindle.corp.sgi.com (SGI-8.12.5/8.12.9/generic_config-1.2) with ESMTP id k3HGt2nB33109877; Mon, 17 Apr 2006 09:55:02 -0700 (PDT) Received: from christoph (helo=localhost) by schroedinger.engr.sgi.com with local-esmtp (Exim 3.36 #1 (Debian)) id 1FVX0A-0007kz-00; Mon, 17 Apr 2006 09:55:02 -0700 Date: Mon, 17 Apr 2006 09:55:02 -0700 (PDT) From: Christoph Lameter To: kiran@scalex86.org cc: Nick Piggin , Steven Rostedt , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, paulus@samba.org, linux390@de.ibm.com, davem@davemloft.net Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules In-Reply-To: <4440855A.7040203@yahoo.com.au> Message-ID: References: <1145049535.1336.128.camel@localhost.localdomain> <4440855A.7040203@yahoo.com.au> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11143 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: clameter@sgi.com Precedence: bulk X-list: linux-mips On Sat, 15 Apr 2006, Nick Piggin wrote: > If I'm following you correctly, this adds another dependent load > to a per-CPU data access, and from memory that isn't node-affine. I am also concerned about that. Kiran has a patch to avoid allocpercpu having to go through one level of indirection that I guess would no longer work with this scheme. > If so, I think people with SMP and NUMA kernels would care more > about performance and scalability than the few k of memory this > saves. Right. From ak@suse.de Mon Apr 17 17:59:23 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 17:59:33 +0100 (BST) Received: from mx2.suse.de ([195.135.220.15]:53168 "HELO mx2.suse.de") by ftp.linux-mips.org with SMTP id S8133415AbWDQQ7X (ORCPT ); Mon, 17 Apr 2006 17:59:23 +0100 Received: from Relay1.suse.de (mail2.suse.de [195.135.221.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id CC1C81EBCD; Mon, 17 Apr 2006 19:11:36 +0200 (CEST) From: Andi Kleen To: Nick Piggin Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules Date: Mon, 17 Apr 2006 19:10:46 +0200 User-Agent: KMail/1.9.1 Cc: Steven Rostedt , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, paulus@samba.org, linux390@de.ibm.com, davem@davemloft.net References: <1145049535.1336.128.camel@localhost.localdomain> <4441ECE6.5010709@yahoo.com.au> In-Reply-To: <4441ECE6.5010709@yahoo.com.au> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200604171910.48838.ak@suse.de> Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11144 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ak@suse.de Precedence: bulk X-list: linux-mips On Sunday 16 April 2006 09:06, Nick Piggin wrote: > I still don't understand what the justification is for slowing down > this critical bit of infrastructure for something that is only a > problem in the -rt patchset, and even then only a problem when tracing > is enabled. There are actually problems outside -rt. e.g. the Xen kernel was running into a near overflow and as more and more code is using per cpu variables others might too. I'm confident the problem can be solved without adding more variables though - e.g. in the way rusty proposed. -Andi From kiran@scalex86.org Mon Apr 17 20:53:01 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 20:53:11 +0100 (BST) Received: from ns1.siteground.net ([207.218.208.2]:25556 "EHLO serv01.siteground.net") by ftp.linux-mips.org with ESMTP id S8133415AbWDQTxB (ORCPT ); Mon, 17 Apr 2006 20:53:01 +0100 Received: from adsl-69-227-37-145.dsl.pltn13.pacbell.net ([69.227.37.145] helo=localhost.localdomain) by serv01.siteground.net with esmtpa (Exim 4.52) id 1FVZy3-0005BH-7V; Mon, 17 Apr 2006 15:05:03 -0500 Date: Mon, 17 Apr 2006 13:06:06 -0700 From: Ravikiran G Thirumalai To: Arnd Bergmann Cc: Steven Rostedt , Paul Mackerras , Nick Piggin , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, linux390@de.ibm.com, davem@davemloft.net, rusty@rustcorp.com.au, Christoph Lameter , dipankar@in.ibm.com Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules Message-ID: <20060417200606.GA3945@localhost.localdomain> References: <1145049535.1336.128.camel@localhost.localdomain> <17473.60411.690686.714791@cargo.ozlabs.ibm.com> <1145194804.27407.103.camel@localhost.localdomain> <200604161734.20256.arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200604161734.20256.arnd@arndb.de> User-Agent: Mutt/1.4.2.1i X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - serv01.siteground.net X-AntiAbuse: Original Domain - linux-mips.org X-AntiAbuse: Originator/Caller UID/GID - [0 0] / [47 12] X-AntiAbuse: Sender Address Domain - scalex86.org X-Source: X-Source-Args: X-Source-Dir: Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11145 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: kiran@scalex86.org Precedence: bulk X-list: linux-mips On Sun, Apr 16, 2006 at 05:34:18PM +0200, Arnd Bergmann wrote: > On Sunday 16 April 2006 15:40, Steven Rostedt wrote: > > I'll think more about this, but maybe someone else has some crazy ideas > > that can find a solution to this that is both fast and robust. > > Ok, you asked for a crazy idea, you're going to get it ;-) > > You could take a fixed range from the vmalloc area (e.g. 1MB per cpu) > and use that to remap pages on demand when you need per cpu data. > > #define PER_CPU_BASE 0xe000000000000000UL /* arch dependant */ > #define PER_CPU_SHIFT 0x100000UL > #define __per_cpu_offset(__cpu) (PER_CPU_BASE + PER_CPU_STRIDE * (__cpu)) > #define per_cpu(var, cpu) (*RELOC_HIDE(&per_cpu__##var, __per_cpu_offset(cpu))) > #define __get_cpu_var(var) per_cpu(var, smp_processor_id()) > > This is a lot like the current sparc64 implementation already is. > > The tricky part here is the remapping of pages. You'd need to > alloc_pages_node() new pages whenever the already reserved space is > not enough for the module you want to load and then map_vm_area() > them into the space reserved for them. > > Advantages of this solution are: > - no dependant load access for per_cpu() > - might be flexible enough to implement a faster per_cpu_ptr() > - can be combined with ia64-style per-cpu remapping An implemenation similar to one you are mentioning was already proposed sometime back. http://lwn.net/Articles/119532/ The design was also meant to not restrict/limit per-cpu memory being allocated from modules. Maybe it was too early then, and maybe now is the right time, going by the interest in this thread :). IMHO, a new solution should fix both static and dynamic per-cpu allocators, - Avoid possibility of false sharing for dynamically allocated per-CPU data (with current alloc percpu) - work early enough -- if alloc_percpu can work early enough, (we can use that for counters like slab cachep stats which is currently racy; using atomic_t for them would be bad for performance) An extra dereference in Steven's original proposal is bad, (I had done some measurements earlier). My implementation had one less reference compared to static per-cpu allocators, but the performance of both were the same as the __per_cpu_offset table is always cache hot. > > Disadvantages are: > - you can't use huge tlbs for mapping per cpu data like the > regular linear mapping -> may be slower on some archs Yep, we waste a few tlb entries then, which is a bit of concern, but then we might be able to use hugetlbs for blocks of per-cpu data and minimize the impact. Thanks, Kiran From kiran@scalex86.org Mon Apr 17 22:49:15 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 17 Apr 2006 22:49:25 +0100 (BST) Received: from ns1.siteground.net ([207.218.208.2]:20355 "EHLO serv01.siteground.net") by ftp.linux-mips.org with ESMTP id S8133643AbWDQVtP (ORCPT ); Mon, 17 Apr 2006 22:49:15 +0100 Received: from adsl-69-227-37-145.dsl.pltn13.pacbell.net ([69.227.37.145] helo=localhost.localdomain) by serv01.siteground.net with esmtpa (Exim 4.52) id 1FVbmp-0008Rz-R8; Mon, 17 Apr 2006 17:01:36 -0500 Date: Mon, 17 Apr 2006 15:02:38 -0700 From: Ravikiran G Thirumalai To: Christoph Lameter Cc: Nick Piggin , Steven Rostedt , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, paulus@samba.org, linux390@de.ibm.com, davem@davemloft.net Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules Message-ID: <20060417220238.GD3945@localhost.localdomain> References: <1145049535.1336.128.camel@localhost.localdomain> <4440855A.7040203@yahoo.com.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.1i X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - serv01.siteground.net X-AntiAbuse: Original Domain - linux-mips.org X-AntiAbuse: Originator/Caller UID/GID - [0 0] / [47 12] X-AntiAbuse: Sender Address Domain - scalex86.org X-Source: X-Source-Args: X-Source-Dir: Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11146 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: kiran@scalex86.org Precedence: bulk X-list: linux-mips On Mon, Apr 17, 2006 at 09:55:02AM -0700, Christoph Lameter wrote: > On Sat, 15 Apr 2006, Nick Piggin wrote: > > > If I'm following you correctly, this adds another dependent load > > to a per-CPU data access, and from memory that isn't node-affine. > > I am also concerned about that. Kiran has a patch to avoid allocpercpu > having to go through one level of indirection that I guess would no > longer work with this scheme. The alloc_percpu reimplementation would work regardless of changes to static per-cpu areas. But, any extra indirection as was proposed initially is bad IMHO. > > > If so, I think people with SMP and NUMA kernels would care more > > about performance and scalability than the few k of memory this > > saves. > > Right. Me too :) Kiran From rostedt@goodmis.org Tue Apr 18 00:33:26 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 18 Apr 2006 00:33:35 +0100 (BST) Received: from ms-smtp-02.nyroc.rr.com ([24.24.2.56]:27847 "EHLO ms-smtp-02.nyroc.rr.com") by ftp.linux-mips.org with ESMTP id S8133724AbWDQXd0 (ORCPT ); Tue, 18 Apr 2006 00:33:26 +0100 Received: from [192.168.23.10] (cpe-24-94-51-176.stny.res.rr.com [24.94.51.176]) by ms-smtp-02.nyroc.rr.com (8.13.4/8.13.4) with ESMTP id k3HNiYUW011451; Mon, 17 Apr 2006 19:44:35 -0400 (EDT) Date: Mon, 17 Apr 2006 19:44:34 -0400 (EDT) From: Steven Rostedt X-X-Sender: rostedt@gandalf.stny.rr.com To: Ravikiran G Thirumalai cc: Christoph Lameter , Nick Piggin , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, paulus@samba.org, linux390@de.ibm.com, davem@davemloft.net Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules In-Reply-To: <20060417220238.GD3945@localhost.localdomain> Message-ID: References: <1145049535.1336.128.camel@localhost.localdomain> <4440855A.7040203@yahoo.com.au> <20060417220238.GD3945@localhost.localdomain> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Virus-Scanned: Symantec AntiVirus Scan Engine Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11147 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: rostedt@goodmis.org Precedence: bulk X-list: linux-mips On Mon, 17 Apr 2006, Ravikiran G Thirumalai wrote: > On Mon, Apr 17, 2006 at 09:55:02AM -0700, Christoph Lameter wrote: > > On Sat, 15 Apr 2006, Nick Piggin wrote: > > > > > If I'm following you correctly, this adds another dependent load > > > to a per-CPU data access, and from memory that isn't node-affine. > > > > I am also concerned about that. Kiran has a patch to avoid allocpercpu > > having to go through one level of indirection that I guess would no > > longer work with this scheme. > > The alloc_percpu reimplementation would work regardless of changes to > static per-cpu areas. But, any extra indirection as was proposed initially > is bad IMHO. > Don't worry, that idea has been shot down more than once ;-) > > > > > If so, I think people with SMP and NUMA kernels would care more > > > about performance and scalability than the few k of memory this > > > saves. > > > > Right. > > Me too :) > Understood, but I'm going to start looking in the way Rusty and Arnd suggested with the vmalloc approach. This would allow for saving of memory and dynamic allocation of module memory making it more robust. And all this without that evil extra indirection! So lets put my original patches where they belong, in the bit grave and continue on. I lived, I learned and I've been shown the Way (thanks to all BTW). So now we can focus on a better solution. Cheers, -- Steve From christoph@schroedinger.engr.sgi.com Tue Apr 18 00:37:39 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 18 Apr 2006 00:37:49 +0100 (BST) Received: from omx2-ext.sgi.com ([192.48.171.19]:5296 "EHLO omx2.sgi.com") by ftp.linux-mips.org with ESMTP id S8133730AbWDQXhj (ORCPT ); Tue, 18 Apr 2006 00:37:39 +0100 Received: from internal-mail-relay1.corp.sgi.com (internal-mail-relay1.corp.sgi.com [198.149.32.52]) by omx2.sgi.com (8.12.11/8.12.9/linux-outbound_gateway-1.1) with ESMTP id k3I229b4009982; Mon, 17 Apr 2006 19:02:09 -0700 Received: from spindle.corp.sgi.com (spindle.corp.sgi.com [198.29.75.13]) by internal-mail-relay1.corp.sgi.com (8.12.9/8.12.10/SGI_generic_relay-1.2) with ESMTP id k3HNsgpG8012564; Mon, 17 Apr 2006 16:54:42 -0700 (PDT) Received: from schroedinger.engr.sgi.com (schroedinger.engr.sgi.com [163.154.5.55]) by spindle.corp.sgi.com (SGI-8.12.5/8.12.9/generic_config-1.2) with ESMTP id k3HNmqnB33074263; Mon, 17 Apr 2006 16:48:52 -0700 (PDT) Received: from christoph (helo=localhost) by schroedinger.engr.sgi.com with local-esmtp (Exim 3.36 #1 (Debian)) id 1FVdSe-0008HW-00; Mon, 17 Apr 2006 16:48:52 -0700 Date: Mon, 17 Apr 2006 16:48:52 -0700 (PDT) From: Christoph Lameter To: Steven Rostedt cc: Ravikiran G Thirumalai , Nick Piggin , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, paulus@samba.org, linux390@de.ibm.com, davem@davemloft.net Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules In-Reply-To: Message-ID: References: <1145049535.1336.128.camel@localhost.localdomain> <4440855A.7040203@yahoo.com.au> <20060417220238.GD3945@localhost.localdomain> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11148 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: clameter@sgi.com Precedence: bulk X-list: linux-mips On Mon, 17 Apr 2006, Steven Rostedt wrote: > So now we can focus on a better solution. Could you have a look at Kiran's work? Maybe one result of your work could be that the existing indirection for alloc_percpu could be avoided? From jsungkim@lge.com Tue Apr 18 01:25:39 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 18 Apr 2006 01:25:48 +0100 (BST) Received: from mail1.lge.co.kr ([156.147.1.151]:27375 "EHLO mail1.lge.co.kr") by ftp.linux-mips.org with ESMTP id S8133731AbWDRAZj (ORCPT ); Tue, 18 Apr 2006 01:25:39 +0100 Received: from [150.150.71.243] (jsungkim@lge.com) by mail1.lge.co.kr (Terrace MailWatcher) with ESMTP id 2006041809:37:57:896309.21746.24 for ; Tue, 18 Apr 2006 09:37:57 +0900 (KST) From: "Kim, Jong-Sung" To: Subject: Reading an entire cacheline Date: Tue, 18 Apr 2006 09:37:18 +0900 Message-ID: <058801c66280$3fa1ebb0$f3479696@LGE.NET> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Office Outlook 11 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2670 thread-index: AcZigD+A+CMHDL7jSviP63YyQN7LKw== X-TERRACE-SPAMMARK: NOT spam-marked. (by Terrace) Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11149 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: jsungkim@lge.com Precedence: bulk X-list: linux-mips Hi, Is there any way to read an entire cacheline from the MIPS5Kf? Four sequential cache instructions do similarly, but sometimes the tags from a same cacheline differ. How can I read a consistent cacheline safely? Thanks. From rostedt@goodmis.org Tue Apr 18 02:40:23 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 18 Apr 2006 02:40:34 +0100 (BST) Received: from ms-smtp-02.nyroc.rr.com ([24.24.2.56]:38279 "EHLO ms-smtp-02.nyroc.rr.com") by ftp.linux-mips.org with ESMTP id S8133742AbWDRBkX (ORCPT ); Tue, 18 Apr 2006 02:40:23 +0100 Received: from [192.168.23.10] (cpe-24-94-51-176.stny.res.rr.com [24.94.51.176]) by ms-smtp-02.nyroc.rr.com (8.13.4/8.13.4) with ESMTP id k3I1pNOW003024; Mon, 17 Apr 2006 21:51:23 -0400 (EDT) Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules From: Steven Rostedt To: Christoph Lameter Cc: Ravikiran G Thirumalai , Nick Piggin , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, paulus@samba.org, linux390@de.ibm.com, davem@davemloft.net In-Reply-To: References: <1145049535.1336.128.camel@localhost.localdomain> <4440855A.7040203@yahoo.com.au> <20060417220238.GD3945@localhost.localdomain> Content-Type: text/plain Date: Mon, 17 Apr 2006 21:51:23 -0400 Message-Id: <1145325083.17085.37.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: Symantec AntiVirus Scan Engine Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11150 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: rostedt@goodmis.org Precedence: bulk X-list: linux-mips On Mon, 2006-04-17 at 16:48 -0700, Christoph Lameter wrote: > On Mon, 17 Apr 2006, Steven Rostedt wrote: > > > So now we can focus on a better solution. > > Could you have a look at Kiran's work? > > Maybe one result of your work could be that the existing indirection > for alloc_percpu could be avoided? Sure, I'll spend some time looking at what others have done and see what I can put together. I'm also very busy on other stuff at the moment, so this will be something I do more on the side. Don't think there's a rush here, but I stated in a previous post, I probably wont have something out for a month or two. -- Steve From nickpiggin@yahoo.com.au Tue Apr 18 07:46:06 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 18 Apr 2006 07:46:15 +0100 (BST) Received: from smtp104.mail.mud.yahoo.com ([209.191.85.214]:62051 "HELO smtp104.mail.mud.yahoo.com") by ftp.linux-mips.org with SMTP id S8133366AbWDRGqG (ORCPT ); Tue, 18 Apr 2006 07:46:06 +0100 Received: (qmail 62129 invoked from network); 18 Apr 2006 06:42:58 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com.au; h=Received:Message-ID:Date:From:User-Agent:X-Accept-Language:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Content-Transfer-Encoding; b=dJPbW3t6xPNCfvF6yqd1GCrNucJLx6TBPHnc78OkIR11SlIiNv7iThiodhX8cMBfax80X22ISPEab+ZhthQXDGunPGx4j3/dPw2Q0Bg7P2PcBjUKyqe7jco/laGmdrwvONv2v4kEGGN69+11G4tEh6VtqzxKyq9vXw2TSlK9UBU= ; Received: from unknown (HELO ?192.168.0.1?) (nickpiggin@203.173.7.230 with plain) by smtp104.mail.mud.yahoo.com with SMTP; 18 Apr 2006 06:42:57 -0000 Message-ID: <44448A60.4040903@yahoo.com.au> Date: Tue, 18 Apr 2006 16:42:40 +1000 From: Nick Piggin User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.12) Gecko/20051007 Debian/1.7.12-1 X-Accept-Language: en MIME-Version: 1.0 To: Steven Rostedt CC: Ravikiran G Thirumalai , Christoph Lameter , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, benedict.gaster@superh.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , David Mosberger-Tang , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, paulus@samba.org, linux390@de.ibm.com, davem@davemloft.net Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules References: <1145049535.1336.128.camel@localhost.localdomain> <4440855A.7040203@yahoo.com.au> <20060417220238.GD3945@localhost.localdomain> In-Reply-To: Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11151 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: nickpiggin@yahoo.com.au Precedence: bulk X-list: linux-mips Steven Rostedt wrote: > Understood, but I'm going to start looking in the way Rusty and Arnd > suggested with the vmalloc approach. This would allow for saving of > memory and dynamic allocation of module memory making it more robust. And > all this without that evil extra indirection! Remember that this approach could effectively just move the indirection to the TLB / page tables (well, I say "moves" because large kernel mappings are effectively free compared with 4K mappings). So be careful about coding up a large amount of work before unleashing it: I doubt you'll be able to find a solution that doesn't involve tradeoffs somewhere (but wohoo if you can). -- SUSE Labs, Novell Inc. Send instant messages to your online friends http://au.messenger.yahoo.com From vmehul@razamicroelectronics.com Tue Apr 18 08:00:42 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 18 Apr 2006 08:00:50 +0100 (BST) Received: from mx1.razamicroelectronics.com ([63.111.213.197]:8753 "EHLO hq-ex-mb01.razamicroelectronics.com") by ftp.linux-mips.org with ESMTP id S8133367AbWDRHAm (ORCPT ); Tue, 18 Apr 2006 08:00:42 +0100 X-MimeOLE: Produced By Microsoft Exchange V6.5.7226.0 Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----_=_NextPart_001_01C662B7.88BA32FD" Subject: Can you please help me out -- Issue with GDB on mips board ???? Date: Tue, 18 Apr 2006 00:13:03 -0700 Message-ID: <2E96546B3C2C8B4CA739323C6058204A726D89@hq-ex-mb01.razamicroelectronics.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: Can you please help me out -- Issue with GDB on mips board ???? Thread-Index: AcZit4i11tTncAklSFi4o/i9SrUQGQ== From: "V Mehul" To: Cc: Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11152 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: vmehul@razamicroelectronics.com Precedence: bulk X-list: linux-mips This is a multi-part message in MIME format. ------_=_NextPart_001_01C662B7.88BA32FD Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable hi, i am working on i386 based board and want some information. i am = using mips-linux 2.6.6 kernel on target board and linux 2.6.9 on intel = board. I am running an application under "gdbserver" on the target mips = board, but am not able to do a single step inside the function. Foll. = error is displayed "ptrace : Input/Output error", the "ptrace.c" file under arch/mips/kernel/ does not have support = for PTRACE_SINGLESTEP because of which the above error is occuring. = Though i386,alpha,arm etc. architecture has this support, but why mips = doesnt have this ? =20 I am not a member of this group, so kindly reply me on my personal = id. Regards, Mehul. ------_=_NextPart_001_01C662B7.88BA32FD Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Can you please help me out -- Issue with GDB on mips board = ????

hi,
       i am working on i386 based board = and want some information. i am using mips-linux 2.6.6 kernel on target = board and linux 2.6.9 on intel board. I am running an application under = "gdbserver" on the target mips board, but am not able to do a = single step inside the function. Foll. error is displayed
          "ptrace : = Input/Output error",

   the  "ptrace.c" file under arch/mips/kernel/ = does not have support for PTRACE_SINGLESTEP because of which the above = error is occuring. Though i386,alpha,arm etc. architecture has this = support, but why mips doesnt have this ?

   I am not a member of this group, so kindly reply me on my = personal id.

Regards,
Mehul.

------_=_NextPart_001_01C662B7.88BA32FD-- From rostedt@goodmis.org Tue Apr 18 13:36:28 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 18 Apr 2006 13:36:39 +0100 (BST) Received: from ms-smtp-02.nyroc.rr.com ([24.24.2.56]:10898 "EHLO ms-smtp-02.nyroc.rr.com") by ftp.linux-mips.org with ESMTP id S8133480AbWDRMgX (ORCPT ); Tue, 18 Apr 2006 13:36:23 +0100 Received: from [192.168.23.10] (cpe-24-94-51-176.stny.res.rr.com [24.94.51.176]) by ms-smtp-02.nyroc.rr.com (8.13.4/8.13.4) with ESMTP id k3IClv3e001514; Tue, 18 Apr 2006 08:47:57 -0400 (EDT) Subject: Re: [PATCH 00/05] robust per_cpu allocation for modules From: Steven Rostedt To: Nick Piggin Cc: Ravikiran G Thirumalai , Christoph Lameter , LKML , Andrew Morton , Linus Torvalds , Ingo Molnar , Thomas Gleixner , Andi Kleen , Martin Mares , bjornw@axis.com, schwidefsky@de.ibm.com, lethal@linux-sh.org, Chris Zankel , Marc Gauthier , Joe Taylor , rth@twiddle.net, spyro@f2s.com, starvik@axis.com, tony.luck@intel.com, linux-ia64@vger.kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, grundler@parisc-linux.org, parisc-linux@parisc-linux.org, linuxppc-dev@ozlabs.org, paulus@samba.org, linux390@de.ibm.com, davem@davemloft.net In-Reply-To: <44448A60.4040903@yahoo.com.au> References: <1145049535.1336.128.camel@localhost.localdomain> <4440855A.7040203@yahoo.com.au> <20060417220238.GD3945@localhost.localdomain> <44448A60.4040903@yahoo.com.au> Content-Type: text/plain Date: Tue, 18 Apr 2006 08:47:57 -0400 Message-Id: <1145364477.17085.54.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: Symantec AntiVirus Scan Engine Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11153 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: rostedt@goodmis.org Precedence: bulk X-list: linux-mips [Removed from CC davidm@hpl.hp.com and benedict.gaster@superh.com because I keep getting "unknown user" bounces from them] On Tue, 2006-04-18 at 16:42 +1000, Nick Piggin wrote: > Steven Rostedt wrote: > > > Understood, but I'm going to start looking in the way Rusty and Arnd > > suggested with the vmalloc approach. This would allow for saving of > > memory and dynamic allocation of module memory making it more robust. And > > all this without that evil extra indirection! > > Remember that this approach could effectively just move the indirection to > the TLB / page tables (well, I say "moves" because large kernel mappings > are effectively free compared with 4K mappings). Yeah, I thought about the paging latencies when it was first mentioned. And this is something that's going to be very hard to know the impact, because it will be different on every system. > > So be careful about coding up a large amount of work before unleashing it: > I doubt you'll be able to find a solution that doesn't involve tradeoffs > somewhere (but wohoo if you can). > OK, but as I mentioned that this is now more of a side project, so a month of work is not really going to be a month of work ;) I'll first try to get something that just "works" and then post an RFC PATCH set, to get more ideas. Since obviously there's a lot of people out there that know their systems much better than I do ;) Thanks, -- Steve From Rajesh_Palani@pmc-sierra.com Tue Apr 18 18:38:14 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 18 Apr 2006 18:38:24 +0100 (BST) Received: from father.pmc-sierra.com ([216.241.224.13]:28613 "HELO father.pmc-sierra.bc.ca") by ftp.linux-mips.org with SMTP id S8133489AbWDRRiO (ORCPT ); Tue, 18 Apr 2006 18:38:14 +0100 Received: (qmail 4660 invoked by uid 101); 18 Apr 2006 17:50:33 -0000 Received: from unknown (HELO ogyruan.pmc-sierra.bc.ca) (216.241.226.236) by father.pmc-sierra.com with SMTP; 18 Apr 2006 17:50:33 -0000 Received: from bby1exi01.pmc_nt.nt.pmc-sierra.bc.ca (bby1exi01.pmc-sierra.bc.ca [216.241.231.251]) by ogyruan.pmc-sierra.bc.ca (8.13.3/8.12.7) with ESMTP id k3IHoWgF026358 for ; Tue, 18 Apr 2006 10:50:33 -0700 Received: by bby1exi01.pmc-sierra.bc.ca with Internet Mail Service (5.5.2656.59) id <132HTRND>; Tue, 18 Apr 2006 10:50:32 -0700 Message-ID: <12E9F4D6141E504DA2F115E577252AC7C09451@sjc1exm04.pmc-sierra.bc.ca> From: Raj Palani To: linux-mips@linux-mips.org Subject: Question on SMP warning in irq_cpu.c Date: Tue, 18 Apr 2006 10:50:28 -0700 MIME-Version: 1.0 X-Mailer: Internet Mail Service (5.5.2656.59) Content-Type: multipart/alternative; boundary="----_=_NextPart_001_01C66310.947F7908" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11154 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: Rajesh_Palani@pmc-sierra.com Precedence: bulk X-list: linux-mips This message is in MIME format. Since your mail reader does not understand this format, some or all of this message may not be legible. ------_=_NextPart_001_01C66310.947F7908 Content-Type: text/plain Hi, I have a question regarding the following warning in the arch/mips/kernel/irq_cpu.c. What is the reason for this comment and in case it is not SMP safe, what are the changes needed to make it SMP safe? /* * Almost all MIPS CPUs define 8 interrupt sources. They are typically * level triggered (i.e., cannot be cleared from CPU; must be cleared from * device). The first two are software interrupts which we don't really * use or support. The last one is usually the CPU timer interrupt if * counter register is present or, for CPUs with an external FPU, by * convention it's the FPU exception interrupt. * * Don't even think about using this on SMP. You have been warned. * * This file exports one global function: * void mips_cpu_irq_init(int irq_base); */ Thanks. Raj ------_=_NextPart_001_01C66310.947F7908 Content-Type: text/html Content-Transfer-Encoding: quoted-printable Question on SMP warning in irq_cpu.c

Hi,
   I have a question = regarding the following warning in the = arch/mips/kernel/irq_cpu.c.
   What is the reason = for this comment and in case it is not SMP safe, what are the changes = needed to make it SMP safe?
/*
 * Almost all MIPS CPUs = define 8 interrupt sources.  They are typically
 * level triggered (i.e., = cannot be cleared from CPU; must be cleared from
 * device).  The = first two are software interrupts which we don't really
 * use or support.  = The last one is usually the CPU timer interrupt if
 * counter register is = present or, for CPUs with an external FPU, by
 * convention it's the FPU = exception interrupt.
 *
 * Don't even think about = using this on SMP.  You have been warned.
 *
 * This file exports one = global function:
 *      void mips_cpu_irq_init(int = irq_base);
 */
   Thanks.
   Raj

------_=_NextPart_001_01C66310.947F7908-- From drow@nevyn.them.org Tue Apr 18 19:22:48 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 18 Apr 2006 19:22:56 +0100 (BST) Received: from nevyn.them.org ([66.93.172.17]:61860 "EHLO nevyn.them.org") by ftp.linux-mips.org with ESMTP id S8133480AbWDRSWs (ORCPT ); Tue, 18 Apr 2006 19:22:48 +0100 Received: from drow by nevyn.them.org with local (Exim 4.54) id 1FVv2j-00056K-DF; Tue, 18 Apr 2006 14:35:17 -0400 Date: Tue, 18 Apr 2006 14:35:17 -0400 From: Daniel Jacobowitz To: V Mehul Cc: linux-mips@linux-mips.org Subject: Re: Can you please help me out -- Issue with GDB on mips board ???? Message-ID: <20060418183517.GA19593@nevyn.them.org> References: <2E96546B3C2C8B4CA739323C6058204A726D89@hq-ex-mb01.razamicroelectronics.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2E96546B3C2C8B4CA739323C6058204A726D89@hq-ex-mb01.razamicroelectronics.com> User-Agent: Mutt/1.5.8i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11155 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: dan@debian.org Precedence: bulk X-list: linux-mips On Tue, Apr 18, 2006 at 12:13:03AM -0700, V Mehul wrote: > > hi, > i am working on i386 based board and want some information. i > am using mips-linux 2.6.6 kernel on target board and linux > 2.6.9 on intel board. I am running an application under > "gdbserver" on the target mips board, but am not able to do > a single step inside the function. Foll. error is displayed > "ptrace : Input/Output error", > > the "ptrace.c" file under arch/mips/kernel/ does not have support > for PTRACE_SINGLESTEP because of which the above error is > occuring. Though i386,alpha,arm etc. architecture has this > support, but why mips doesnt have this ? Because the hardware doesn't. GDB doesn't need it, either. It sounds like your GDB is not correctly configured for mips-linux. -- Daniel Jacobowitz CodeSourcery From anemo@mba.ocn.ne.jp Wed Apr 19 03:09:33 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 19 Apr 2006 03:09:43 +0100 (BST) Received: from mba.ocn.ne.jp ([210.190.142.172]:62456 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S8133553AbWDSCJd (ORCPT ); Wed, 19 Apr 2006 03:09:33 +0100 Received: from localhost (p8141-ipad204funabasi.chiba.ocn.ne.jp [222.146.95.141]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id E2DD5A744; Wed, 19 Apr 2006 11:22:01 +0900 (JST) Date: Wed, 19 Apr 2006 11:22:28 +0900 (JST) Message-Id: <20060419.112228.108306767.anemo@mba.ocn.ne.jp> To: ths@networkno.de Cc: linux-mips@linux-mips.org, ralf@linux-mips.org, sam@ravnborg.org Subject: Re: [PATCH] fix modpost segfault for 64bit mipsel kernel From: Atsushi Nemoto In-Reply-To: <20060417162742.GD28935@networkno.de> References: <20060417140735.GC28935@networkno.de> <20060418.004718.108120830.anemo@mba.ocn.ne.jp> <20060417162742.GD28935@networkno.de> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11156 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips On Mon, 17 Apr 2006 17:27:42 +0100, Thiemo Seufer wrote: > So it is the > > r.r_info = TO_NATIVE(rela->r_info); > > in modpost.c which breaks both SYM and TYPE because it assumes a > 64bit integer. The proper solution would be to add a Elf64_Mips_Rela > structure (with lots of nearly identical duplicated code), the hack > would be to cast r_info to a 32bit integer for mips, before feeding > it to TO_NATIVE (which works until somebody asks for the TYPE, then > a separate mips64 version becomes inevitable.) I'd like to fix in _proper_ way. Please review. Thanks. 64bit mips has different r_info layout. This patch fixes modpost segfault for 64bit little endian mips kernel. Signed-off-by: Atsushi Nemoto diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index cd00e9f..4ce95c6 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -710,7 +710,20 @@ static void check_sec_ref(struct module Elf_Rela r; const char *secname; r.r_offset = TO_NATIVE(rela->r_offset); +#if KERNEL_ELFCLASS == ELFCLASS64 + if (hdr->e_machine == EM_MIPS) { + unsigned int r_sym = + ELF64_MIPS_R_SYM(rela->r_info); + unsigned int r_type = + ELF64_MIPS_R_TYPE(rela->r_info); + r.r_info = ELF_R_INFO(TO_NATIVE(r_sym), + TO_NATIVE(r_type)); + } else { + r.r_info = TO_NATIVE(rela->r_info); + } +#else r.r_info = TO_NATIVE(rela->r_info); +#endif r.r_addend = TO_NATIVE(rela->r_addend); sym = elf->symtab_start + ELF_R_SYM(r.r_info); /* Skip special sections */ diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index b14255c..7d1c04d 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -24,6 +24,7 @@ #define Elf_Rela Elf32_Rela #define ELF_R_SYM ELF32_R_SYM #define ELF_R_TYPE ELF32_R_TYPE +#define ELF_R_INFO ELF32_R_INFO #else #define Elf_Ehdr Elf64_Ehdr @@ -37,8 +38,43 @@ #define Elf_Rela Elf64_Rela #define ELF_R_SYM ELF64_R_SYM #define ELF_R_TYPE ELF64_R_TYPE +#define ELF_R_INFO ELF64_R_INFO #endif +/* The 64-bit MIPS ELF ABI uses an unusual reloc format. */ +typedef struct +{ + Elf32_Word r_sym; /* Symbol index */ + unsigned char r_ssym; /* Special symbol for 2nd relocation */ + unsigned char r_type3; /* 3rd relocation type */ + unsigned char r_type2; /* 2nd relocation type */ + unsigned char r_type1; /* 1st relocation type */ +} _Elf64_Mips_R_Info; + +typedef union +{ + Elf64_Xword r_info_number; + _Elf64_Mips_R_Info r_info_fields; +} _Elf64_Mips_R_Info_union; + +typedef struct +{ + Elf64_Addr r_offset; /* Address */ + _Elf64_Mips_R_Info_union r_info; /* Relocation type and symbol index */ + Elf64_Sxword r_addend; /* Addend */ +} Elf64_Mips_Rela; + +#define ELF64_MIPS_R_SYM(i) \ + ((__extension__ (_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_sym) +#define ELF64_MIPS_R_TYPE(i) \ + (((_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_type1 \ + | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \ + ).r_info_fields.r_type2 << 8) \ + | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \ + ).r_info_fields.r_type3 << 16) \ + | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \ + ).r_info_fields.r_ssym << 24)) + #if KERNEL_ELFDATA != HOST_ELFDATA static inline void __endian(const void *src, void *dest, unsigned int size) From ashley_jones_2000@yahoo.com Wed Apr 19 06:12:38 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 19 Apr 2006 06:12:47 +0100 (BST) Received: from web38415.mail.mud.yahoo.com ([209.191.125.46]:45912 "HELO web38415.mail.mud.yahoo.com") by ftp.linux-mips.org with SMTP id S8133443AbWDSFMh (ORCPT ); Wed, 19 Apr 2006 06:12:37 +0100 Received: (qmail 9666 invoked by uid 60001); 19 Apr 2006 05:25:06 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Message-ID:Received:Date:From:Subject:To:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=cykdPOz4JMahGx6WweuHMxxxtQcH+c1NjD+chlDc5TvrRwvkIvjq6CHLILpRBYVOrorLhzayj/5ZirsA5a9J/7h+1NyO7h0kaMxplIe3zVvCjM6v1HvA377P6n8L3mfpRPzpREtBZuJDGupEaIJpbBSBYAjOl4gC1fTQPtCFg3I= ; Message-ID: <20060419052506.9664.qmail@web38415.mail.mud.yahoo.com> Received: from [203.92.57.132] by web38415.mail.mud.yahoo.com via HTTP; Tue, 18 Apr 2006 22:25:06 PDT Date: Tue, 18 Apr 2006 22:25:06 -0700 (PDT) From: ashley jones Subject: Re: single step on sibyte board To: Ralf Baechle , linux-mips@linux-mips.org In-Reply-To: <20060418200034.GA8200@linux-mips.org> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="0-1888674231-1145424306=:5426" Content-Transfer-Encoding: 8bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11157 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ashley_jones_2000@yahoo.com Precedence: bulk X-list: linux-mips --0-1888674231-1145424306=:5426 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit hi ralf, thanks for your reply, Ralf Baechle wrote: On Tue, Apr 18, 2006 at 09:14:04AM -0700, ashley jones wrote: > I am trying to debug an application running on sibyte (linux 2.6.14) using gdbserver from AMD board. I am able to setup breakpoints and initial break point also gets hit, but when i do single step using "step" it prompts foll. error > ptrace: Input/Output Error > and board gets hang. is this supported or am doing some thing wrong ? can you please give some pointers from here ? I am using gdb-6.4 version on host (AMD) and target ( sibyte ) That looks like you may have a problem with the connection to your target, so gdb can't really talk to the gdb server. Ralf But i am able to setup initial connection, and also first breakpoint gets hit. Is it like gdbserver (for mips) doesnt support single step command? or is it like i have not configured gdb properly ? I have downloaded fresh gdb-6.4 src, and ran "configure" scripts on my target (sibyte). Am i missing anything ? Regards, A'Jones. --------------------------------- Love cheap thrills? Enjoy PC-to-Phone calls to 30+ countries for just 2¢/min with Yahoo! Messenger with Voice. --0-1888674231-1145424306=:5426 Content-Type: text/html; charset=iso-8859-1 Content-Transfer-Encoding: 8bit

hi ralf,
        thanks for your reply,

Ralf Baechle <ralf@linux-mips.org> wrote:
On Tue, Apr 18, 2006 at 09:14:04AM -0700, ashley jones wrote:

> I am trying to debug an application running on sibyte (linux 2.6.14) using gdbserver from AMD board. I am able to setup breakpoints and initial break point also gets hit, but when i do single step using "step" it prompts foll. error
> ptrace: Input/Output Error
> and board gets hang. is this supported or am doing some thing wrong ? can you please give some pointers from here ? I am using gdb-6.4 version on host (AMD) and target ( sibyte )

That looks like you may have a problem with the connection to your
target, so gdb can't really talk to the gdb server.

Ralf
But i am able to setup initial connection, and also first breakpoint gets hit. Is it like gdbserver (for mips) doesnt support single step command? or is it like i have not configured gdb properly ? I have downloaded fresh gdb-6.4 src, and ran "configure" scripts on my target (sibyte). Am i missing anything ?
 
 
Regards,
A'Jones.

Love cheap thrills? Enjoy PC-to-Phone calls to 30+ countries for just 2¢/min with Yahoo! Messenger with Voice. --0-1888674231-1145424306=:5426-- From anemo@mba.ocn.ne.jp Wed Apr 19 15:59:04 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 19 Apr 2006 15:59:19 +0100 (BST) Received: from mba.ocn.ne.jp ([210.190.142.172]:25563 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S8133360AbWDSO7E (ORCPT ); Wed, 19 Apr 2006 15:59:04 +0100 Received: from localhost (p6027-ipad29funabasi.chiba.ocn.ne.jp [221.184.73.27]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id B56CCAF80; Thu, 20 Apr 2006 00:11:36 +0900 (JST) Date: Thu, 20 Apr 2006 00:12:05 +0900 (JST) Message-Id: <20060420.001205.11963701.anemo@mba.ocn.ne.jp> To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org Subject: [PATCH] fix ip27 build From: Atsushi Nemoto X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11158 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips Signed-off-by: Atsushi Nemoto diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c index cddf1ce..36b662e 100644 --- a/arch/mips/sgi-ip27/ip27-timer.c +++ b/arch/mips/sgi-ip27/ip27-timer.c @@ -122,7 +122,7 @@ again: xtime.tv_sec > last_rtc_update + 660 && (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { - if (rtc_set_time(xtime.tv_sec) == 0) { + if (rtc_mips_set_time(xtime.tv_sec) == 0) { last_rtc_update = xtime.tv_sec; } else { last_rtc_update = xtime.tv_sec - 600; From drow@nevyn.them.org Wed Apr 19 16:09:52 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 19 Apr 2006 16:10:00 +0100 (BST) Received: from nevyn.them.org ([66.93.172.17]:61661 "EHLO nevyn.them.org") by ftp.linux-mips.org with ESMTP id S8133394AbWDSPJw (ORCPT ); Wed, 19 Apr 2006 16:09:52 +0100 Received: from drow by nevyn.them.org with local (Exim 4.54) id 1FWEVg-0003fc-8r; Wed, 19 Apr 2006 11:22:28 -0400 Date: Wed, 19 Apr 2006 11:22:28 -0400 From: Daniel Jacobowitz To: ashley jones Cc: Ralf Baechle , linux-mips@linux-mips.org Subject: Re: single step on sibyte board Message-ID: <20060419152228.GA14058@nevyn.them.org> References: <20060418200034.GA8200@linux-mips.org> <20060419052506.9664.qmail@web38415.mail.mud.yahoo.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060419052506.9664.qmail@web38415.mail.mud.yahoo.com> User-Agent: Mutt/1.5.8i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11159 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: dan@debian.org Precedence: bulk X-list: linux-mips On Tue, Apr 18, 2006 at 10:25:06PM -0700, ashley jones wrote: > But i am able to setup initial connection, and also first > breakpoint gets hit. Is it like gdbserver (for mips) doesnt support > single step command? or is it like i have not configured gdb > properly ? I have downloaded fresh gdb-6.4 src, and ran "configure" > scripts on my target (sibyte). Am i missing anything ? How did you configure your host gdb? Use mips-linux or mips64-linux and it will not attempt to single step. -- Daniel Jacobowitz CodeSourcery From sshtylyov@ru.mvista.com Wed Apr 19 19:34:58 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 19 Apr 2006 19:35:17 +0100 (BST) Received: from rtsoft2.corbina.net ([85.21.88.2]:7042 "HELO mail.dev.rtsoft.ru") by ftp.linux-mips.org with SMTP id S8126482AbWDSSe6 (ORCPT ); Wed, 19 Apr 2006 19:34:58 +0100 Received: (qmail 26893 invoked from network); 19 Apr 2006 22:50:27 -0000 Received: from wasted.dev.rtsoft.ru (HELO ?192.168.1.248?) (192.168.1.248) by mail.dev.rtsoft.ru with SMTP; 19 Apr 2006 22:50:27 -0000 Message-ID: <4446857D.90507@ru.mvista.com> Date: Wed, 19 Apr 2006 22:46:21 +0400 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: jgarzik@pobox.com CC: Rodolfo Giometti , netdev@vger.kernel.org, Linux-MIPS Subject: [PATCH] au1000_eth.c probe code straightened up References: <20060405154711.GL7029@enneenne.com> <20060405222332.GO7029@enneenne.com> <20060405222620.GP7029@enneenne.com> <4435290C.50607@ru.mvista.com> <20060406155011.GC23424@enneenne.com> In-Reply-To: <20060406155011.GC23424@enneenne.com> Content-Type: multipart/mixed; boundary="------------000609040906060803090001" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11160 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips This is a multi-part message in MIME format. --------------000609040906060803090001 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Straighten up the AMD Au1xx0 Ethernet probing code, make it print out (and store in the 'net_device' structure) the physical address of the controller, not the KSEG1-based virtual. Make the driver also claim/release the 4-byte MAC enable registers and assign to the Ethernet ports two consecutive MAC addresses to match those that are printed on their stickers. Signed-off-by: Sergei Shtylyov --------------000609040906060803090001 Content-Type: text/plain; name="au1000_eth-probe-rewrite.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="au1000_eth-probe-rewrite.patch" diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index 1363083..d5dfc78 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c @@ -2,7 +2,7 @@ * * Alchemy Au1x00 ethernet driver * - * Copyright 2001,2002,2003 MontaVista Software Inc. + * Copyright 2001-2003, 2006 MontaVista Software Inc. * Copyright 2002 TimeSys Corp. * Added ethtool/mii-tool support, * Copyright 2004 Matt Porter @@ -67,7 +67,7 @@ static int au1000_debug = 5; static int au1000_debug = 3; #endif -#define DRV_NAME "au1000eth" +#define DRV_NAME "au1000_eth" #define DRV_VERSION "1.5" #define DRV_AUTHOR "Pete Popov " #define DRV_DESC "Au1xxx on-chip Ethernet driver" @@ -79,7 +79,7 @@ MODULE_LICENSE("GPL"); // prototypes static void hard_stop(struct net_device *); static void enable_rx_tx(struct net_device *dev); -static struct net_device * au1000_probe(u32 ioaddr, int irq, int port_num); +static struct net_device * au1000_probe(int port_num); static int au1000_init(struct net_device *); static int au1000_open(struct net_device *); static int au1000_close(struct net_device *); @@ -1159,12 +1159,27 @@ setup_hw_rings(struct au1000_private *au } static struct { - int port; u32 base_addr; u32 macen_addr; int irq; struct net_device *dev; -} iflist[2]; +} iflist[2] = { +#ifdef CONFIG_SOC_AU1000 + {AU1000_ETH0_BASE, AU1000_MAC0_ENABLE, AU1000_MAC0_DMA_INT}, + {AU1000_ETH1_BASE, AU1000_MAC1_ENABLE, AU1000_MAC1_DMA_INT} +#endif +#ifdef CONFIG_SOC_AU1100 + {AU1100_ETH0_BASE, AU1100_MAC0_ENABLE, AU1100_MAC0_DMA_INT} +#endif +#ifdef CONFIG_SOC_AU1500 + {AU1500_ETH0_BASE, AU1500_MAC0_ENABLE, AU1500_MAC0_DMA_INT}, + {AU1500_ETH1_BASE, AU1500_MAC1_ENABLE, AU1500_MAC1_DMA_INT} +#endif +#ifdef CONFIG_SOC_AU1550 + {AU1550_ETH0_BASE, AU1550_MAC0_ENABLE, AU1550_MAC0_DMA_INT}, + {AU1550_ETH1_BASE, AU1550_MAC1_ENABLE, AU1550_MAC1_DMA_INT} +#endif +}; static int num_ifs; @@ -1175,58 +1190,14 @@ static int num_ifs; */ static int __init au1000_init_module(void) { - struct cpuinfo_mips *c = ¤t_cpu_data; int ni = (int)((au_readl(SYS_PINFUNC) & (u32)(SYS_PF_NI2)) >> 4); struct net_device *dev; int i, found_one = 0; - switch (c->cputype) { -#ifdef CONFIG_SOC_AU1000 - case CPU_AU1000: - num_ifs = 2 - ni; - iflist[0].base_addr = AU1000_ETH0_BASE; - iflist[1].base_addr = AU1000_ETH1_BASE; - iflist[0].macen_addr = AU1000_MAC0_ENABLE; - iflist[1].macen_addr = AU1000_MAC1_ENABLE; - iflist[0].irq = AU1000_MAC0_DMA_INT; - iflist[1].irq = AU1000_MAC1_DMA_INT; - break; -#endif -#ifdef CONFIG_SOC_AU1100 - case CPU_AU1100: - num_ifs = 1 - ni; - iflist[0].base_addr = AU1100_ETH0_BASE; - iflist[0].macen_addr = AU1100_MAC0_ENABLE; - iflist[0].irq = AU1100_MAC0_DMA_INT; - break; -#endif -#ifdef CONFIG_SOC_AU1500 - case CPU_AU1500: - num_ifs = 2 - ni; - iflist[0].base_addr = AU1500_ETH0_BASE; - iflist[1].base_addr = AU1500_ETH1_BASE; - iflist[0].macen_addr = AU1500_MAC0_ENABLE; - iflist[1].macen_addr = AU1500_MAC1_ENABLE; - iflist[0].irq = AU1500_MAC0_DMA_INT; - iflist[1].irq = AU1500_MAC1_DMA_INT; - break; -#endif -#ifdef CONFIG_SOC_AU1550 - case CPU_AU1550: - num_ifs = 2 - ni; - iflist[0].base_addr = AU1550_ETH0_BASE; - iflist[1].base_addr = AU1550_ETH1_BASE; - iflist[0].macen_addr = AU1550_MAC0_ENABLE; - iflist[1].macen_addr = AU1550_MAC1_ENABLE; - iflist[0].irq = AU1550_MAC0_DMA_INT; - iflist[1].irq = AU1550_MAC1_DMA_INT; - break; -#endif - default: - num_ifs = 0; - } + num_ifs = NUM_ETH_INTERFACES - ni; + for(i = 0; i < num_ifs; i++) { - dev = au1000_probe(iflist[i].base_addr, iflist[i].irq, i); + dev = au1000_probe(i); iflist[i].dev = dev; if (dev) found_one++; @@ -1435,8 +1406,7 @@ static struct ethtool_ops au1000_ethtool .get_link = au1000_get_link }; -static struct net_device * -au1000_probe(u32 ioaddr, int irq, int port_num) +static struct net_device * au1000_probe(int port_num) { static unsigned version_printed = 0; struct au1000_private *aup = NULL; @@ -1444,94 +1414,95 @@ au1000_probe(u32 ioaddr, int irq, int po db_dest_t *pDB, *pDBfree; char *pmac, *argptr; char ethaddr[6]; - int i, err; + int irq, i, err; + u32 base, macen; + + if (port_num >= NUM_ETH_INTERFACES) + return NULL; - if (!request_mem_region(CPHYSADDR(ioaddr), MAC_IOSIZE, "Au1x00 ENET")) + base = CPHYSADDR(iflist[port_num].base_addr ); + macen = CPHYSADDR(iflist[port_num].macen_addr); + irq = iflist[port_num].irq; + + if (!request_mem_region( base, MAC_IOSIZE, "Au1x00 ENET") || + !request_mem_region(macen, 4, "Au1x00 ENET")) return NULL; - if (version_printed++ == 0) + if (version_printed++ == 0) printk("%s version %s %s\n", DRV_NAME, DRV_VERSION, DRV_AUTHOR); dev = alloc_etherdev(sizeof(struct au1000_private)); if (!dev) { - printk (KERN_ERR "au1000 eth: alloc_etherdev failed\n"); + printk(KERN_ERR "%s: alloc_etherdev failed\n", DRV_NAME); return NULL; } - if ((err = register_netdev(dev))) { - printk(KERN_ERR "Au1x_eth Cannot register net device err %d\n", - err); + if ((err = register_netdev(dev)) != 0) { + printk(KERN_ERR "%s: Cannot register net device, error %d\n", + DRV_NAME, err); free_netdev(dev); return NULL; } - printk("%s: Au1x Ethernet found at 0x%x, irq %d\n", - dev->name, ioaddr, irq); + printk("%s: Au1xx0 Ethernet found at 0x%x, irq %d\n", + dev->name, base, irq); aup = dev->priv; /* Allocate the data buffers */ /* Snooping works fine with eth on all au1xxx */ - aup->vaddr = (u32)dma_alloc_noncoherent(NULL, - MAX_BUF_SIZE * (NUM_TX_BUFFS+NUM_RX_BUFFS), - &aup->dma_addr, - 0); + aup->vaddr = (u32)dma_alloc_noncoherent(NULL, MAX_BUF_SIZE * + (NUM_TX_BUFFS + NUM_RX_BUFFS), + &aup->dma_addr, 0); if (!aup->vaddr) { free_netdev(dev); - release_mem_region(CPHYSADDR(ioaddr), MAC_IOSIZE); + release_mem_region( base, MAC_IOSIZE); + release_mem_region(macen, 4); return NULL; } /* aup->mac is the base address of the MAC's registers */ - aup->mac = (volatile mac_reg_t *)((unsigned long)ioaddr); + aup->mac = (volatile mac_reg_t *)iflist[port_num].base_addr; + /* Setup some variables for quick register address access */ - if (ioaddr == iflist[0].base_addr) - { - /* check env variables first */ - if (!get_ethernet_addr(ethaddr)) { + aup->enable = (volatile u32 *)iflist[port_num].macen_addr; + aup->mac_id = port_num; + au_macs[port_num] = aup; + + if (port_num == 0) { + /* Check the environment variables first */ + if (get_ethernet_addr(ethaddr) == 0) memcpy(au1000_mac_addr, ethaddr, sizeof(au1000_mac_addr)); - } else { + else { /* Check command line */ argptr = prom_getcmdline(); - if ((pmac = strstr(argptr, "ethaddr=")) == NULL) { - printk(KERN_INFO "%s: No mac address found\n", - dev->name); - /* use the hard coded mac addresses */ - } else { + if ((pmac = strstr(argptr, "ethaddr=")) == NULL) + printk(KERN_INFO "%s: No MAC address found\n", + dev->name); + /* Use the hard coded MAC addresses */ + else { str2eaddr(ethaddr, pmac + strlen("ethaddr=")); memcpy(au1000_mac_addr, ethaddr, - sizeof(au1000_mac_addr)); + sizeof(au1000_mac_addr)); } } - aup->enable = (volatile u32 *) - ((unsigned long)iflist[0].macen_addr); - memcpy(dev->dev_addr, au1000_mac_addr, sizeof(au1000_mac_addr)); + setup_hw_rings(aup, MAC0_RX_DMA_ADDR, MAC0_TX_DMA_ADDR); - aup->mac_id = 0; - au_macs[0] = aup; - } - else - if (ioaddr == iflist[1].base_addr) - { - aup->enable = (volatile u32 *) - ((unsigned long)iflist[1].macen_addr); - memcpy(dev->dev_addr, au1000_mac_addr, sizeof(au1000_mac_addr)); - dev->dev_addr[4] += 0x10; + } else if (port_num == 1) setup_hw_rings(aup, MAC1_RX_DMA_ADDR, MAC1_TX_DMA_ADDR); - aup->mac_id = 1; - au_macs[1] = aup; - } - else - { - printk(KERN_ERR "%s: bad ioaddr\n", dev->name); - } - /* bring the device out of reset, otherwise probing the mii - * will hang */ + /* + * Assign to the Ethernet ports two consecutive MAC addresses + * to match those that are printed on their stickers + */ + memcpy(dev->dev_addr, au1000_mac_addr, sizeof(au1000_mac_addr)); + dev->dev_addr[5] += port_num; + + /* Bring the device out of reset, otherwise probing the MII will hang */ *aup->enable = MAC_EN_CLOCK_ENABLE; au_sync_delay(2); - *aup->enable = MAC_EN_RESET0 | MAC_EN_RESET1 | - MAC_EN_RESET2 | MAC_EN_CLOCK_ENABLE; + *aup->enable = MAC_EN_RESET0 | MAC_EN_RESET1 | MAC_EN_RESET2 | + MAC_EN_CLOCK_ENABLE; au_sync_delay(2); aup->mii = kmalloc(sizeof(struct mii_phy), GFP_KERNEL); @@ -1580,7 +1551,7 @@ au1000_probe(u32 ioaddr, int irq, int po } spin_lock_init(&aup->lock); - dev->base_addr = ioaddr; + dev->base_addr = base; dev->irq = irq; dev->open = au1000_open; dev->hard_start_xmit = au1000_tx; @@ -1614,13 +1585,12 @@ err_out: if (aup->tx_db_inuse[i]) ReleaseDB(aup, aup->tx_db_inuse[i]); } - dma_free_noncoherent(NULL, - MAX_BUF_SIZE * (NUM_TX_BUFFS+NUM_RX_BUFFS), - (void *)aup->vaddr, - aup->dma_addr); + dma_free_noncoherent(NULL, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS), + (void *)aup->vaddr, aup->dma_addr); unregister_netdev(dev); free_netdev(dev); - release_mem_region(CPHYSADDR(ioaddr), MAC_IOSIZE); + release_mem_region( base, MAC_IOSIZE); + release_mem_region(macen, 4); return NULL; } @@ -1805,20 +1775,18 @@ static void __exit au1000_cleanup_module aup = (struct au1000_private *) dev->priv; unregister_netdev(dev); kfree(aup->mii); - for (j = 0; j < NUM_RX_DMA; j++) { + for (j = 0; j < NUM_RX_DMA; j++) if (aup->rx_db_inuse[j]) ReleaseDB(aup, aup->rx_db_inuse[j]); - } - for (j = 0; j < NUM_TX_DMA; j++) { + for (j = 0; j < NUM_TX_DMA; j++) if (aup->tx_db_inuse[j]) ReleaseDB(aup, aup->tx_db_inuse[j]); - } - dma_free_noncoherent(NULL, - MAX_BUF_SIZE * (NUM_TX_BUFFS+NUM_RX_BUFFS), - (void *)aup->vaddr, - aup->dma_addr); + dma_free_noncoherent(NULL, MAX_BUF_SIZE * + (NUM_TX_BUFFS + NUM_RX_BUFFS), + (void *)aup->vaddr, aup->dma_addr); + release_mem_region(dev->base_addr, MAC_IOSIZE); + release_mem_region(CPHYSADDR(iflist[i].macen_addr), 4); free_netdev(dev); - release_mem_region(CPHYSADDR(iflist[i].base_addr), MAC_IOSIZE); } } } --------------000609040906060803090001-- From ths@networkno.de Thu Apr 20 01:06:57 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 20 Apr 2006 01:07:28 +0100 (BST) Received: from bender.bawue.de ([193.7.176.20]:8874 "HELO bender.bawue.de") by ftp.linux-mips.org with SMTP id S8133430AbWDTAGw (ORCPT ); Thu, 20 Apr 2006 01:06:52 +0100 Received: from lagash (88-106-238-34.dynamic.dsl.as9105.com [88.106.238.34]) (using TLSv1 with cipher DES-CBC3-SHA (168/168 bits)) (No client certificate requested) by bender.bawue.de (Postfix) with ESMTP id 1C924441E3; Thu, 20 Apr 2006 02:19:29 +0200 (MEST) Received: from ths by lagash with local (Exim 4.61) (envelope-from ) id 1FWMt4-0004Jx-Rj; Thu, 20 Apr 2006 01:19:10 +0100 Date: Thu, 20 Apr 2006 01:19:00 +0100 From: Thiemo Seufer To: Atsushi Nemoto Cc: linux-mips@linux-mips.org, ralf@linux-mips.org, sam@ravnborg.org Subject: Re: [PATCH] fix modpost segfault for 64bit mipsel kernel Message-ID: <20060420001900.GC30806@networkno.de> References: <20060417140735.GC28935@networkno.de> <20060418.004718.108120830.anemo@mba.ocn.ne.jp> <20060417162742.GD28935@networkno.de> <20060419.112228.108306767.anemo@mba.ocn.ne.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060419.112228.108306767.anemo@mba.ocn.ne.jp> User-Agent: Mutt/1.5.11+cvs20060403 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11161 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ths@networkno.de Precedence: bulk X-list: linux-mips Atsushi Nemoto wrote: > On Mon, 17 Apr 2006 17:27:42 +0100, Thiemo Seufer wrote: > > So it is the > > > > r.r_info = TO_NATIVE(rela->r_info); > > > > in modpost.c which breaks both SYM and TYPE because it assumes a > > 64bit integer. The proper solution would be to add a Elf64_Mips_Rela > > structure (with lots of nearly identical duplicated code), the hack > > would be to cast r_info to a 32bit integer for mips, before feeding > > it to TO_NATIVE (which works until somebody asks for the TYPE, then > > a separate mips64 version becomes inevitable.) > > I'd like to fix in _proper_ way. Please review. Thanks. > > > 64bit mips has different r_info layout. This patch fixes modpost > segfault for 64bit little endian mips kernel. > > Signed-off-by: Atsushi Nemoto > > diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c > index cd00e9f..4ce95c6 100644 > --- a/scripts/mod/modpost.c > +++ b/scripts/mod/modpost.c > @@ -710,7 +710,20 @@ static void check_sec_ref(struct module > Elf_Rela r; > const char *secname; > r.r_offset = TO_NATIVE(rela->r_offset); > +#if KERNEL_ELFCLASS == ELFCLASS64 > + if (hdr->e_machine == EM_MIPS) { > + unsigned int r_sym = > + ELF64_MIPS_R_SYM(rela->r_info); > + unsigned int r_type = > + ELF64_MIPS_R_TYPE(rela->r_info); > + r.r_info = ELF_R_INFO(TO_NATIVE(r_sym), > + TO_NATIVE(r_type)); [snip] > +/* The 64-bit MIPS ELF ABI uses an unusual reloc format. */ > +typedef struct > +{ > + Elf32_Word r_sym; /* Symbol index */ > + unsigned char r_ssym; /* Special symbol for 2nd relocation */ > + unsigned char r_type3; /* 3rd relocation type */ > + unsigned char r_type2; /* 2nd relocation type */ > + unsigned char r_type1; /* 1st relocation type */ > +} _Elf64_Mips_R_Info; [snip] > +#define ELF64_MIPS_R_TYPE(i) \ > + (((_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_type1 \ > + | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \ > + ).r_info_fields.r_type2 << 8) \ > + | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \ > + ).r_info_fields.r_type3 << 16) \ > + | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \ > + ).r_info_fields.r_ssym << 24)) Why is it the right thing to combine the type info into a 32bit word? It will never get used as such for MIPS ELF64. I would have expected something like: #define ELF64_MIPS_R_INFO(sym,ssym,t3,t2,t1) \ {( \ _Elf64_Mips_R_Info info = { \ .r_sym = sym, \ .r_ssym = ssym, \ .r_type3 = t3, \ .r_type2 = t2, \ .r_type1 = t1, \ } \ (Elf64_Xword)info; \ )} without a corresponding ELF64_MIPS_R_TYPE, and then: if (hdr->e_ident[EI_CLASS] == ELFCLASS64 && hdr->e_machine == EM_MIPS) { _Elf64_Mips_R_Info info = (_Elf64_Mips_R_Info)r.r_info; r.r_info = ELF64_MIPS_R_INFO(TO_NATIVE(info.r_sym), info.r_ssym, info.r_type3, info.r_type2, info.r_type1); } Thiemo From ashley_jones_2000@yahoo.com Thu Apr 20 06:12:13 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 20 Apr 2006 06:12:24 +0100 (BST) Received: from web38404.mail.mud.yahoo.com ([209.191.125.35]:2403 "HELO web38404.mail.mud.yahoo.com") by ftp.linux-mips.org with SMTP id S8133503AbWDTFMN (ORCPT ); Thu, 20 Apr 2006 06:12:13 +0100 Received: (qmail 38879 invoked by uid 60001); 20 Apr 2006 05:24:47 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Message-ID:Received:Date:From:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=s53VdCeKd+P0qoBqBVGFmxVJeLKLhJcCdZ3TIWdxBU/mgKVJ872dp8neMKBL+tfEt9xz6rSnH9im1WeeBYFyf+lAGm6j0UJOfiNvSUZjHEJV8jdCpTyoPpp/phyd1H/AeB9Pu/7+GMl65gcd5aCLURvy9FhzGA+eR9Osu41tlFE= ; Message-ID: <20060420052447.38877.qmail@web38404.mail.mud.yahoo.com> Received: from [203.92.57.132] by web38404.mail.mud.yahoo.com via HTTP; Wed, 19 Apr 2006 22:24:47 PDT Date: Wed, 19 Apr 2006 22:24:47 -0700 (PDT) From: ashley jones Subject: Re: single step on sibyte board To: Daniel Jacobowitz Cc: Ralf Baechle , linux-mips@linux-mips.org In-Reply-To: <20060419152228.GA14058@nevyn.them.org> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="0-1368257701-1145510687=:37781" Content-Transfer-Encoding: 8bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11162 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ashley_jones_2000@yahoo.com Precedence: bulk X-list: linux-mips --0-1368257701-1145510687=:37781 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit hi daniel, it works now, host gdb was not properly configured. thanks for your help. Thanks n Regards, A'Jones. Daniel Jacobowitz wrote: On Tue, Apr 18, 2006 at 10:25:06PM -0700, ashley jones wrote: > But i am able to setup initial connection, and also first > breakpoint gets hit. Is it like gdbserver (for mips) doesnt support > single step command? or is it like i have not configured gdb > properly ? I have downloaded fresh gdb-6.4 src, and ran "configure" > scripts on my target (sibyte). Am i missing anything ? How did you configure your host gdb? Use mips-linux or mips64-linux and it will not attempt to single step. -- Daniel Jacobowitz CodeSourcery --------------------------------- Yahoo! Messenger with Voice. Make PC-to-Phone Calls to the US (and 30+ countries) for 2¢/min or less. --0-1368257701-1145510687=:37781 Content-Type: text/html; charset=iso-8859-1 Content-Transfer-Encoding: 8bit
hi daniel,
          it works now, host gdb was not properly configured. thanks for your help.
 
Thanks n Regards,
A'Jones.


Daniel Jacobowitz <dan@debian.org> wrote:
On Tue, Apr 18, 2006 at 10:25:06PM -0700, ashley jones wrote:
> But i am able to setup initial connection, and also first
> breakpoint gets hit. Is it like gdbserver (for mips) doesnt support
> single step command? or is it like i have not configured gdb
> properly ? I have downloaded fresh gdb-6.4 src, and ran "configure"
> scripts on my target (sibyte). Am i missing anything ?

How did you configure your host gdb?

Use mips-linux or mips64-linux and it will not attempt to single step.

--
Daniel Jacobowitz
CodeSourcery


Yahoo! Messenger with Voice. Make PC-to-Phone Calls to the US (and 30+ countries) for 2¢/min or less. --0-1368257701-1145510687=:37781-- From jonah@omegav.ntnu.no Thu Apr 20 13:43:28 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 20 Apr 2006 13:43:37 +0100 (BST) Received: from fri.itea.ntnu.no ([129.241.7.60]:57735 "HELO fri.itea.ntnu.no") by ftp.linux-mips.org with SMTP id S8133542AbWDTMn2 (ORCPT ); Thu, 20 Apr 2006 13:43:28 +0100 Received: from localhost (localhost [127.0.0.1]) by fri.itea.ntnu.no (Postfix) with ESMTP id DDABE7EC3; Thu, 20 Apr 2006 14:56:00 +0200 (CEST) Received: from invalid.ed.ntnu.no (invalid.ed.ntnu.no [129.241.205.150]) by fri.itea.ntnu.no (Postfix) with ESMTP; Thu, 20 Apr 2006 14:55:59 +0200 (CEST) Received: from invalid.ed.ntnu.no (jonah@localhost.ed.ntnu.no [127.0.0.1]) by invalid.ed.ntnu.no (8.13.6/8.13.6) with ESMTP id k3KCtxYf005084 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO); Thu, 20 Apr 2006 14:55:59 +0200 (CEST) (envelope-from jonah@omegav.ntnu.no) Received: from localhost (jonah@localhost) by invalid.ed.ntnu.no (8.13.6/8.13.6/Submit) with ESMTP id k3KCtxD3005081; Thu, 20 Apr 2006 14:55:59 +0200 (CEST) (envelope-from jonah@omegav.ntnu.no) X-Authentication-Warning: invalid.ed.ntnu.no: jonah owned process doing -bs Date: Thu, 20 Apr 2006 14:55:59 +0200 (CEST) From: Jon Anders Haugum X-X-Sender: jonah@invalid.ed.ntnu.no To: rmk+serial@arm.linux.org.uk Cc: linux-serial@vger.kernel.org, linux-mips@linux-mips.org Subject: [PATCH] serial8250: set divisor register correctly for AMD Alchemy SoC uart. 3rd edition. Message-ID: <20060420144509.V1601@invalid.ed.ntnu.no> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Content-Scanned: with sophos and spamassassin at mailgw.ntnu.no. Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11163 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: jonah@omegav.ntnu.no Precedence: bulk X-list: linux-mips Alchemy SoC uart have got a non-standard divisor register that needs some special handling. This patch adds divisor read/write functions with test and special handling for Alchemy internal uart. Signed-off-by: Jon Anders Haugum --- 3rd edition: - Removed section covering 16C850 autoconfig. --- linux-2.6.16-rc5/drivers/serial/8250.c.orig 2006-03-03 02:12:10.000000000 +0100 +++ linux-2.6.16-rc5/drivers/serial/8250.c 2006-03-03 02:16:19.000000000 +0100 @@ -362,6 +362,40 @@ serial_out(struct uart_8250_port *up, in #define serial_inp(up, offset) serial_in(up, offset) #define serial_outp(up, offset, value) serial_out(up, offset, value) +/* Uart divisor latch read */ +static inline int _serial_dl_read(struct uart_8250_port *up) +{ + return serial_inp(up, UART_DLL) | serial_inp(up, UART_DLM) << 8; +} + +/* Uart divisor latch write */ +static inline void _serial_dl_write(struct uart_8250_port *up, int value) +{ + serial_outp(up, UART_DLL, value & 0xff); + serial_outp(up, UART_DLM, value >> 8 & 0xff); +} + +#ifdef CONFIG_SERIAL_8250_AU1X00 +/* Au1x00 haven't got a standard divisor latch */ +static int serial_dl_read(struct uart_8250_port *up) +{ + if (up->port.iotype == UPIO_AU) + return __raw_readl(up->port.membase + 0x28); + else + return _serial_dl_read(up); +} + +static void serial_dl_write(struct uart_8250_port *up, int value) +{ + if (up->port.iotype == UPIO_AU) + __raw_writel(value, up->port.membase + 0x28); + else + _serial_dl_write(up, value); +} +#else +#define serial_dl_read(up) _serial_dl_read(up) +#define serial_dl_write(up, value) _serial_dl_write(up, value) +#endif /* * For the 16C950 @@ -494,7 +528,8 @@ static void disable_rsa(struct uart_8250 */ static int size_fifo(struct uart_8250_port *up) { - unsigned char old_fcr, old_mcr, old_dll, old_dlm, old_lcr; + unsigned char old_fcr, old_mcr, old_lcr; + unsigned short old_dl; int count; old_lcr = serial_inp(up, UART_LCR); @@ -505,10 +540,8 @@ static int size_fifo(struct uart_8250_po UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT); serial_outp(up, UART_MCR, UART_MCR_LOOP); serial_outp(up, UART_LCR, UART_LCR_DLAB); - old_dll = serial_inp(up, UART_DLL); - old_dlm = serial_inp(up, UART_DLM); - serial_outp(up, UART_DLL, 0x01); - serial_outp(up, UART_DLM, 0x00); + old_dl = serial_dl_read(up); + serial_dl_write(up, 0x0001); serial_outp(up, UART_LCR, 0x03); for (count = 0; count < 256; count++) serial_outp(up, UART_TX, count); @@ -519,8 +552,7 @@ static int size_fifo(struct uart_8250_po serial_outp(up, UART_FCR, old_fcr); serial_outp(up, UART_MCR, old_mcr); serial_outp(up, UART_LCR, UART_LCR_DLAB); - serial_outp(up, UART_DLL, old_dll); - serial_outp(up, UART_DLM, old_dlm); + serial_dl_write(up, old_dl); serial_outp(up, UART_LCR, old_lcr); return count; @@ -750,8 +780,7 @@ static void autoconfig_16550a(struct uar serial_outp(up, UART_LCR, 0xE0); - quot = serial_inp(up, UART_DLM) << 8; - quot += serial_inp(up, UART_DLL); + quot = serial_dl_read(up); quot <<= 3; status1 = serial_in(up, 0x04); /* EXCR1 */ @@ -759,8 +788,7 @@ static void autoconfig_16550a(struct uar status1 |= 0x10; /* 1.625 divisor for baud_base --> 921600 */ serial_outp(up, 0x04, status1); - serial_outp(up, UART_DLL, quot & 0xff); - serial_outp(up, UART_DLM, quot >> 8); + serial_dl_write(up, quot); serial_outp(up, UART_LCR, 0); @@ -1862,8 +1890,7 @@ serial8250_set_termios(struct uart_port serial_outp(up, UART_LCR, cval | UART_LCR_DLAB);/* set DLAB */ } - serial_outp(up, UART_DLL, quot & 0xff); /* LS of divisor */ - serial_outp(up, UART_DLM, quot >> 8); /* MS of divisor */ + serial_dl_write(up, quot); /* * LCR DLAB must be set to enable 64-byte FIFO mode. If the FCR From jonah@omegav.ntnu.no Thu Apr 20 13:58:55 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 20 Apr 2006 13:59:09 +0100 (BST) Received: from signal.itea.ntnu.no ([129.241.190.231]:12724 "HELO signal.itea.ntnu.no") by ftp.linux-mips.org with SMTP id S8133551AbWDTM6z (ORCPT ); Thu, 20 Apr 2006 13:58:55 +0100 Received: from localhost (localhost [127.0.0.1]) by signal.itea.ntnu.no (Postfix) with ESMTP id BC46A33769; Thu, 20 Apr 2006 15:11:37 +0200 (CEST) Received: from invalid.ed.ntnu.no (invalid.ed.ntnu.no [129.241.205.150]) by signal.itea.ntnu.no (Postfix) with ESMTP; Thu, 20 Apr 2006 15:11:37 +0200 (CEST) Received: from invalid.ed.ntnu.no (jonah@localhost.ed.ntnu.no [127.0.0.1]) by invalid.ed.ntnu.no (8.13.6/8.13.6) with ESMTP id k3KDBb6V005335 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO); Thu, 20 Apr 2006 15:11:37 +0200 (CEST) (envelope-from jonah@omegav.ntnu.no) Received: from localhost (jonah@localhost) by invalid.ed.ntnu.no (8.13.6/8.13.6/Submit) with ESMTP id k3KDBY7k005331; Thu, 20 Apr 2006 15:11:35 +0200 (CEST) (envelope-from jonah@omegav.ntnu.no) X-Authentication-Warning: invalid.ed.ntnu.no: jonah owned process doing -bs Date: Thu, 20 Apr 2006 15:11:34 +0200 (CEST) From: Jon Anders Haugum X-X-Sender: jonah@invalid.ed.ntnu.no To: Domen Puncer Cc: Freddy Spierenburg , linux-mips@linux-mips.org Subject: Re: UART trouble on the DBAu1100 In-Reply-To: <20060414060640.GE29489@domen.ultra.si> Message-ID: <20060420145753.C1601@invalid.ed.ntnu.no> References: <20060413131117.GP11097@dusktilldawn.nl> <20060414060640.GE29489@domen.ultra.si> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Content-Scanned: with sophos and spamassassin at mailgw.ntnu.no. Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11164 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: jonah@omegav.ntnu.no Precedence: bulk X-list: linux-mips On Fri, 14 Apr 2006, Domen Puncer wrote: > On 13/04/06 15:11 +0200, Freddy Spierenburg wrote: > > > But that's not the only trouble. I also do not receive any > > bytes received by the UART. All the received bytes stay > > in the input buffer of the UART only to be send up to userland > > as soon as the UART is asked to send a byte on the line itself. > > Then in one take all the bytes are received by the application > > listening. > > I may be way off, but maybe it's just flow control that needs > to be turned off. If this is uart 0, it's probably a problem with that uart having irq number 0. Which in the 8250 driver is interpreted as no interrupt. A quick (and dirty) patch: --- linux/drivers/serial/8250.c_org 2006-03-31 16:07:57.682822888 +0200 +++ linux/drivers/serial/8250.c 2006-03-31 16:08:22.969978656 +0200 @@ -78,7 +78,7 @@ static unsigned int nr_uarts = CONFIG_SE * machine types want others as well - they're free * to redefine this in their header file. */ -#define is_real_interrupt(irq) ((irq) != 0) +#define is_real_interrupt(irq) (1) #ifdef CONFIG_SERIAL_8250_DETECT_IRQ #define CONFIG_SERIAL_DETECT_IRQ 1 But this is not a desired solution according to this: http://lkml.org/lkml/2006/3/29/91 Have somebody got a idea about how a mapping of interrupt numbers should be done in order to avoid irq 0 for Alchemy? -- Jon Anders Haugum From freddy@dusktilldawn.nl Thu Apr 20 15:16:14 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 20 Apr 2006 15:16:23 +0100 (BST) Received: from tool.snarl.nl ([213.84.251.124]:54693 "HELO tool.snarl.nl") by ftp.linux-mips.org with SMTP id S8133547AbWDTOQO (ORCPT ); Thu, 20 Apr 2006 15:16:14 +0100 Received: from localhost (tool.local.snarl.nl [127.0.0.1]) by tool.snarl.nl (Postfix) with ESMTP id 6E1C35E58B; Thu, 20 Apr 2006 16:28:49 +0200 (CEST) Received: from tool.snarl.nl ([127.0.0.1]) by localhost (tool.local.snarl.nl [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 25788-01; Thu, 20 Apr 2006 16:28:48 +0200 (CEST) Received: by tool.snarl.nl (Postfix, from userid 1000) id 89FC05DF5C; Thu, 20 Apr 2006 16:28:47 +0200 (CEST) Date: Thu, 20 Apr 2006 16:28:47 +0200 From: Freddy Spierenburg To: Jon Anders Haugum Cc: Domen Puncer , linux-mips@linux-mips.org Subject: Re: UART trouble on the DBAu1100 Message-ID: <20060420142847.GR11097@dusktilldawn.nl> References: <20060413131117.GP11097@dusktilldawn.nl> <20060414060640.GE29489@domen.ultra.si> <20060420145753.C1601@invalid.ed.ntnu.no> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="b//ZgE2eAae+kIBt" Content-Disposition: inline In-Reply-To: <20060420145753.C1601@invalid.ed.ntnu.no> X-User-Agent-Feature: All mail clients suck. This one just sucks less. X-GPG-Key: http://snarl.nl/~freddy/keys/freddyPublicKey.gpg User-Agent: Mutt/1.5.11+cvs20060403 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11165 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: freddy@dusktilldawn.nl Precedence: bulk X-list: linux-mips --b//ZgE2eAae+kIBt Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Jon, On Thu, Apr 20, 2006 at 03:11:34PM +0200, Jon Anders Haugum wrote: > On Fri, 14 Apr 2006, Domen Puncer wrote: > > On 13/04/06 15:11 +0200, Freddy Spierenburg wrote: > > > All the received bytes stay in the input buffer of the UART > > > only to be send up to userland as soon as the UART is asked > > > to send a byte on the line itself. > >=20 > > I may be way off, but maybe it's just flow control that needs > > to be turned off. >=20 > If this is uart 0, it's probably a problem with that uart having irq=20 > number 0. Which in the 8250 driver is interpreted as no interrupt. No, it was actually all caused by the incorrect usage of the non standard Au1x00 divisor latch. When I applied your patch all worked and I was once again a happy man. Thanks for the work! --=20 $ cat ~/.signature Freddy Spierenburg http://freddy.snarl.nl/ GnuPG: 0x7941D1E1=3DC948 5851 26D2 FA5C 39F1 E588 6F17 FD5D 7941 D1E1 $ # Please read http://www.ietf.org/rfc/rfc2015.txt before complain! --b//ZgE2eAae+kIBt Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) iD8DBQFER5qfbxf9XXlB0eERAv9cAKCbYr56WZPdjoEYAZqK4EO9iNjYewCg7Vro CQmXGOPt7JhPrVkMFkEPHbo= =64t0 -----END PGP SIGNATURE----- --b//ZgE2eAae+kIBt-- From anemo@mba.ocn.ne.jp Thu Apr 20 16:49:32 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 20 Apr 2006 16:49:43 +0100 (BST) Received: from mba.ocn.ne.jp ([210.190.142.172]:45545 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S8133547AbWDTPtc (ORCPT ); Thu, 20 Apr 2006 16:49:32 +0100 Received: from localhost (p1086-ipad27funabasi.chiba.ocn.ne.jp [220.107.192.86]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 592CBA6A4; Fri, 21 Apr 2006 01:02:08 +0900 (JST) Date: Fri, 21 Apr 2006 01:02:37 +0900 (JST) Message-Id: <20060421.010237.25910405.anemo@mba.ocn.ne.jp> To: ths@networkno.de Cc: linux-mips@linux-mips.org, ralf@linux-mips.org, sam@ravnborg.org Subject: Re: [PATCH] fix modpost segfault for 64bit mipsel kernel From: Atsushi Nemoto In-Reply-To: <20060420001900.GC30806@networkno.de> References: <20060417162742.GD28935@networkno.de> <20060419.112228.108306767.anemo@mba.ocn.ne.jp> <20060420001900.GC30806@networkno.de> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11166 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips On Thu, 20 Apr 2006 01:19:00 +0100, Thiemo Seufer wrote: > > +#define ELF64_MIPS_R_TYPE(i) \ > > + (((_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_type1 \ > > + | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \ > > + ).r_info_fields.r_type2 << 8) \ > > + | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \ > > + ).r_info_fields.r_type3 << 16) \ > > + | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \ > > + ).r_info_fields.r_ssym << 24)) > > Why is it the right thing to combine the type info into a 32bit word? Well, I just take ELF64_MIPS_R_TYPE() from glibc source. > It will never get used as such for MIPS ELF64. I would have expected > something like: > > #define ELF64_MIPS_R_INFO(sym,ssym,t3,t2,t1) \ > {( \ > _Elf64_Mips_R_Info info = { \ > .r_sym = sym, \ > .r_ssym = ssym, \ > .r_type3 = t3, \ > .r_type2 = t2, \ > .r_type1 = t1, \ > } \ > (Elf64_Xword)info; \ > )} > > without a corresponding ELF64_MIPS_R_TYPE, and then: > > if (hdr->e_ident[EI_CLASS] == ELFCLASS64 > && hdr->e_machine == EM_MIPS) { > _Elf64_Mips_R_Info info = (_Elf64_Mips_R_Info)r.r_info; > r.r_info = ELF64_MIPS_R_INFO(TO_NATIVE(info.r_sym), > info.r_ssym, info.r_type3, > info.r_type2, info.r_type1); > } Sorry, I can not see what you mean ... it just does byte-swap only r_sym part, doesn't it? It is not enough because a position of r_sym in MIPS ELF64 r_info is different from standard ELF64 r_info. And I found my previous patch does unnecessary byte-swap on r_type. This is a take 3. It also checks hdr->e_ident[EI_CLASS] instead of KERNEL_ELFCLASS. 64bit mips has different r_info layout. This patch fixes modpost segfault for 64bit little endian mips kernel. Signed-off-by: Atsushi Nemoto diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index cd00e9f..8f5e814 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -710,7 +710,17 @@ static void check_sec_ref(struct module Elf_Rela r; const char *secname; r.r_offset = TO_NATIVE(rela->r_offset); - r.r_info = TO_NATIVE(rela->r_info); + if (hdr->e_ident[EI_CLASS] == ELFCLASS64 && + hdr->e_machine == EM_MIPS) { + unsigned int r_sym = + ELF64_MIPS_R_SYM(rela->r_info); + unsigned int r_type = + ELF64_MIPS_R_TYPE(rela->r_info); + r.r_info = ELF_R_INFO(TO_NATIVE(r_sym), + r_type); + } else { + r.r_info = TO_NATIVE(rela->r_info); + } r.r_addend = TO_NATIVE(rela->r_addend); sym = elf->symtab_start + ELF_R_SYM(r.r_info); /* Skip special sections */ diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index b14255c..7d1c04d 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -24,6 +24,7 @@ #define Elf_Rela Elf32_Rela #define ELF_R_SYM ELF32_R_SYM #define ELF_R_TYPE ELF32_R_TYPE +#define ELF_R_INFO ELF32_R_INFO #else #define Elf_Ehdr Elf64_Ehdr @@ -37,8 +38,43 @@ #define Elf_Rela Elf64_Rela #define ELF_R_SYM ELF64_R_SYM #define ELF_R_TYPE ELF64_R_TYPE +#define ELF_R_INFO ELF64_R_INFO #endif +/* The 64-bit MIPS ELF ABI uses an unusual reloc format. */ +typedef struct +{ + Elf32_Word r_sym; /* Symbol index */ + unsigned char r_ssym; /* Special symbol for 2nd relocation */ + unsigned char r_type3; /* 3rd relocation type */ + unsigned char r_type2; /* 2nd relocation type */ + unsigned char r_type1; /* 1st relocation type */ +} _Elf64_Mips_R_Info; + +typedef union +{ + Elf64_Xword r_info_number; + _Elf64_Mips_R_Info r_info_fields; +} _Elf64_Mips_R_Info_union; + +typedef struct +{ + Elf64_Addr r_offset; /* Address */ + _Elf64_Mips_R_Info_union r_info; /* Relocation type and symbol index */ + Elf64_Sxword r_addend; /* Addend */ +} Elf64_Mips_Rela; + +#define ELF64_MIPS_R_SYM(i) \ + ((__extension__ (_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_sym) +#define ELF64_MIPS_R_TYPE(i) \ + (((_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_type1 \ + | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \ + ).r_info_fields.r_type2 << 8) \ + | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \ + ).r_info_fields.r_type3 << 16) \ + | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \ + ).r_info_fields.r_ssym << 24)) + #if KERNEL_ELFDATA != HOST_ELFDATA static inline void __endian(const void *src, void *dest, unsigned int size) From ths@networkno.de Thu Apr 20 17:11:11 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 20 Apr 2006 17:11:20 +0100 (BST) Received: from bender.bawue.de ([193.7.176.20]:59033 "HELO bender.bawue.de") by ftp.linux-mips.org with SMTP id S8133547AbWDTQLL (ORCPT ); Thu, 20 Apr 2006 17:11:11 +0100 Received: from lagash (unknown [194.74.144.146]) by bender.bawue.de (Postfix) with ESMTP id CEAD7441B4; Thu, 20 Apr 2006 18:23:53 +0200 (MEST) Received: from ths by lagash with local (Exim 4.61) (envelope-from ) id 1FWbw7-0004r3-IB; Thu, 20 Apr 2006 17:23:19 +0100 Date: Thu, 20 Apr 2006 17:23:19 +0100 From: Thiemo Seufer To: Atsushi Nemoto Cc: linux-mips@linux-mips.org, ralf@linux-mips.org, sam@ravnborg.org Subject: Re: [PATCH] fix modpost segfault for 64bit mipsel kernel Message-ID: <20060420162319.GD10665@networkno.de> References: <20060417162742.GD28935@networkno.de> <20060419.112228.108306767.anemo@mba.ocn.ne.jp> <20060420001900.GC30806@networkno.de> <20060421.010237.25910405.anemo@mba.ocn.ne.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060421.010237.25910405.anemo@mba.ocn.ne.jp> User-Agent: Mutt/1.5.11+cvs20060403 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11167 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ths@networkno.de Precedence: bulk X-list: linux-mips Atsushi Nemoto wrote: > On Thu, 20 Apr 2006 01:19:00 +0100, Thiemo Seufer wrote: > > > +#define ELF64_MIPS_R_TYPE(i) \ > > > + (((_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_type1 \ > > > + | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \ > > > + ).r_info_fields.r_type2 << 8) \ > > > + | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \ > > > + ).r_info_fields.r_type3 << 16) \ > > > + | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \ > > > + ).r_info_fields.r_ssym << 24)) > > > > Why is it the right thing to combine the type info into a 32bit word? > > Well, I just take ELF64_MIPS_R_TYPE() from glibc source. It is not more useful in glibc. :-) Any use of the TYPE data will have to take the MIPS64 specifics in account, and thus split it up again into single characters. > > It will never get used as such for MIPS ELF64. I would have expected > > something like: > > > > #define ELF64_MIPS_R_INFO(sym,ssym,t3,t2,t1) \ > > {( \ > > _Elf64_Mips_R_Info info = { \ > > .r_sym = sym, \ > > .r_ssym = ssym, \ > > .r_type3 = t3, \ > > .r_type2 = t2, \ > > .r_type1 = t1, \ > > } \ > > (Elf64_Xword)info; \ > > )} > > > > without a corresponding ELF64_MIPS_R_TYPE, and then: > > > > if (hdr->e_ident[EI_CLASS] == ELFCLASS64 > > && hdr->e_machine == EM_MIPS) { > > _Elf64_Mips_R_Info info = (_Elf64_Mips_R_Info)r.r_info; > > r.r_info = ELF64_MIPS_R_INFO(TO_NATIVE(info.r_sym), > > info.r_ssym, info.r_type3, > > info.r_type2, info.r_type1); > > } > > Sorry, I can not see what you mean ... it just does byte-swap only > r_sym part, doesn't it? It is not enough because a position of r_sym > in MIPS ELF64 r_info is different from standard ELF64 r_info. But it does so for a _Elf64_Mips_R_Info struct, which already keeps the position of its r_sym field endianness independent. Thiemo From anemo@mba.ocn.ne.jp Thu Apr 20 17:52:05 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 20 Apr 2006 17:52:20 +0100 (BST) Received: from mba.ocn.ne.jp ([210.190.142.172]:9668 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S8133570AbWDTQwF (ORCPT ); Thu, 20 Apr 2006 17:52:05 +0100 Received: from localhost (p1086-ipad27funabasi.chiba.ocn.ne.jp [220.107.192.86]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 602B8959F; Fri, 21 Apr 2006 02:04:45 +0900 (JST) Date: Fri, 21 Apr 2006 02:05:14 +0900 (JST) Message-Id: <20060421.020514.96686583.anemo@mba.ocn.ne.jp> To: ths@networkno.de Cc: linux-mips@linux-mips.org, ralf@linux-mips.org, sam@ravnborg.org Subject: Re: [PATCH] fix modpost segfault for 64bit mipsel kernel From: Atsushi Nemoto In-Reply-To: <20060420162319.GD10665@networkno.de> References: <20060420001900.GC30806@networkno.de> <20060421.010237.25910405.anemo@mba.ocn.ne.jp> <20060420162319.GD10665@networkno.de> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11168 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips On Thu, 20 Apr 2006 17:23:19 +0100, Thiemo Seufer wrote: > > Well, I just take ELF64_MIPS_R_TYPE() from glibc source. > > It is not more useful in glibc. :-) Any use of the TYPE data will have > to take the MIPS64 specifics in account, and thus split it up again > into single characters. OK, then I drop TYPE data and simplify the patch. Take 4. 64bit mips has different r_info layout. This patch fixes modpost segfault for 64bit little endian mips kernel. Signed-off-by: Atsushi Nemoto diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index cd00e9f..fcd4306 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -709,10 +709,17 @@ static void check_sec_ref(struct module for (rela = start; rela < stop; rela++) { Elf_Rela r; const char *secname; + unsigned int r_sym; r.r_offset = TO_NATIVE(rela->r_offset); - r.r_info = TO_NATIVE(rela->r_info); + if (hdr->e_ident[EI_CLASS] == ELFCLASS64 && + hdr->e_machine == EM_MIPS) { + r_sym = ELF64_MIPS_R_SYM(rela->r_info); + r_sym = TO_NATIVE(r_sym); + } else { + r_sym = ELF_R_SYM(TO_NATIVE(rela->r_info)); + } r.r_addend = TO_NATIVE(rela->r_addend); - sym = elf->symtab_start + ELF_R_SYM(r.r_info); + sym = elf->symtab_start + r_sym; /* Skip special sections */ if (sym->st_shndx >= SHN_LORESERVE) continue; diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index b14255c..89b96c6 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -39,6 +39,25 @@ #define ELF_R_TYPE ELF64_R_TYPE #endif +/* The 64-bit MIPS ELF ABI uses an unusual reloc format. */ +typedef struct +{ + Elf32_Word r_sym; /* Symbol index */ + unsigned char r_ssym; /* Special symbol for 2nd relocation */ + unsigned char r_type3; /* 3rd relocation type */ + unsigned char r_type2; /* 2nd relocation type */ + unsigned char r_type1; /* 1st relocation type */ +} _Elf64_Mips_R_Info; + +typedef union +{ + Elf64_Xword r_info_number; + _Elf64_Mips_R_Info r_info_fields; +} _Elf64_Mips_R_Info_union; + +#define ELF64_MIPS_R_SYM(i) \ + ((__extension__ (_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_sym) + #if KERNEL_ELFDATA != HOST_ELFDATA static inline void __endian(const void *src, void *dest, unsigned int size) From eric.gaulin@gmail.com Fri Apr 21 14:03:07 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 21 Apr 2006 14:03:19 +0100 (BST) Received: from wproxy.gmail.com ([64.233.184.231]:37102 "EHLO wproxy.gmail.com") by ftp.linux-mips.org with ESMTP id S8133613AbWDUNDH (ORCPT ); Fri, 21 Apr 2006 14:03:07 +0100 Received: by wproxy.gmail.com with SMTP id i32so374280wra for ; Fri, 21 Apr 2006 06:15:54 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:mime-version:content-type; b=JJZNwkJjmSYVpgP1rCAY5r+Q6oeAnUeHrHvMzMHURPT2mXxo29LjkrV9AvmO5HHlQXCF/f626n13GL3GN9sR1Gj1mwp736xasT0rznJ/UkSQr4ZiPIW+RI8ypWjaphAHKQwLvRHMdQWY72Txcev3sHaIHX8Ynr+8NIKKnWik1rI= Received: by 10.65.243.20 with SMTP id v20mr1011060qbr; Fri, 21 Apr 2006 06:15:54 -0700 (PDT) Received: by 10.65.155.8 with HTTP; Fri, 21 Apr 2006 06:15:54 -0700 (PDT) Message-ID: <7f0c7cce0604210615s67c3f5aegc4ee3d6541f92c67@mail.gmail.com> Date: Fri, 21 Apr 2006 09:15:54 -0400 From: "Eric Gaulin" To: linux-mips@linux-mips.org Subject: Au1200 MAE drivers MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_11372_22360034.1145625354220" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 11169 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: eric.gaulin@gmail.com Precedence: bulk X-list: linux-mips ------=_Part_11372_22360034.1145625354220 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi, We have the DbAu1200 evaluation board from