From ralf@linux-mips.org Tue May 1 13:03:59 2007 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 01 May 2007 13:04:03 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:22696 "EHLO dl5rb.ham-radio-op.net") by ftp.linux-mips.org with ESMTP id S20022751AbXEAMD7 (ORCPT ); Tue, 1 May 2007 13:03:59 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by dl5rb.ham-radio-op.net (8.13.8/8.13.8) with ESMTP id l41C3Ove008537; Tue, 1 May 2007 13:03:25 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.8/8.13.8/Submit) id l416VYUg005206; Tue, 1 May 2007 07:31:34 +0100 Date: Tue, 1 May 2007 07:31:34 +0100 From: Ralf Baechle To: Atsushi Nemoto Cc: linux-mips@linux-mips.org, netdev@vger.kernel.org, jeff@garzik.org, sshtylyov@ru.mvista.com, akpm@linux-foundation.org Subject: Re: [PATCH 4/5] ne: MIPS: Use platform_driver for ne on RBTX49XX Message-ID: <20070501063134.GA5183@linux-mips.org> References: <20070501.002758.15250764.anemo@mba.ocn.ne.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070501.002758.15250764.anemo@mba.ocn.ne.jp> User-Agent: Mutt/1.4.2.2i 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: 14957 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, May 01, 2007 at 12:27:58AM +0900, Atsushi Nemoto wrote: > This patch lets RBTX49XX boards use generic platform_driver interface > for the ne driver. > > * Use platform_device to pass ioaddr and irq to the ne driver. > * Remove unnecessary ifdefs for RBTX49XX from the ne driver. > * Make the ne driver selectable on these boards regardless of CONFIG_ISA > > Signed-off-by: Atsushi Nemoto Acked-by: Ralf Baechle Ralf From ths@networkno.de Tue May 1 19:10:38 2007 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 01 May 2007 19:10:40 +0100 (BST) Received: from phoenix.bawue.net ([193.7.176.60]:55529 "EHLO mail.bawue.net") by ftp.linux-mips.org with ESMTP id S20022839AbXEASKi (ORCPT ); Tue, 1 May 2007 19:10:38 +0100 Received: from lagash (intrt.mips-uk.com [194.74.144.130]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.bawue.net (Postfix) with ESMTP id 27EBEB937F; Tue, 1 May 2007 20:10:33 +0200 (CEST) Received: from ths by lagash with local (Exim 4.67) (envelope-from ) id 1Hiwor-0004LC-AF; Tue, 01 May 2007 19:11:21 +0100 Date: Tue, 1 May 2007 19:11:21 +0100 To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org Subject: [PATCH] Use do_div for a subtract loop Message-ID: <20070501181121.GC30083@networkno.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) 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: 14958 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 Hello All, this patch switches the subtract loop in timespec_add_ns to use do_div. The latest GCC SVN version grew intelligent enough to optimize the loop to a division which calls libgcc's __udivdi3, which breaks kernel builds. Tested by building and booting a little endian qemu MIPS kernel. Thiemo Signed-off-by: Thiemo Seufer diff --git a/include/linux/time.h b/include/linux/time.h index 8ea8dea..e1a11d7 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -5,6 +5,7 @@ #ifdef __KERNEL__ # include +# include #endif #ifndef _STRUCT_TIMESPEC @@ -169,9 +170,10 @@ extern struct timeval ns_to_timeval(const s64 nsec); static inline void timespec_add_ns(struct timespec *a, u64 ns) { ns += a->tv_nsec; - while(unlikely(ns >= NSEC_PER_SEC)) { - ns -= NSEC_PER_SEC; - a->tv_sec++; + if(unlikely(ns >= NSEC_PER_SEC)) { + u64 tmp = ns; + ns = do_div(tmp, NSEC_PER_SEC); + a->tv_sec += tmp; } a->tv_nsec = ns; } From ths@networkno.de Tue May 1 19:14:03 2007 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 01 May 2007 19:14:05 +0100 (BST) Received: from phoenix.bawue.net ([193.7.176.60]:22764 "EHLO mail.bawue.net") by ftp.linux-mips.org with ESMTP id S20022838AbXEASOD (ORCPT ); Tue, 1 May 2007 19:14:03 +0100 Received: from lagash (intrt.mips-uk.com [194.74.144.130]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.bawue.net (Postfix) with ESMTP id 7A86CB8C56; Tue, 1 May 2007 20:13:28 +0200 (CEST) Received: from ths by lagash with local (Exim 4.67) (envelope-from ) id 1Hiwrg-0004MI-Un; Tue, 01 May 2007 19:14:16 +0100 Date: Tue, 1 May 2007 19:14:16 +0100 To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org Subject: [PATCH] Add a __ucmpdi2 implementation Message-ID: <20070501181416.GD30083@networkno.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) 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: 14959 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 Hello All, this patch adds a __ucmpdi2 implementation, recent GCC SVN versions generate calls to it from some of the FPU emulator functions. Tested by building and booting a little endian qemu MIPS kernel. Thiemo Signed-off-by: Thiemo Seufer diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index d7d3b14..5dad13e 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile @@ -9,4 +9,4 @@ obj-y += iomap.o obj-$(CONFIG_PCI) += iomap-pci.o # libgcc-style stuff needed in the kernel -lib-y += ashldi3.o ashrdi3.o lshrdi3.o +lib-y += ashldi3.o ashrdi3.o lshrdi3.o ucmpdi2.o diff --git a/arch/mips/lib/ucmpdi2.c b/arch/mips/lib/ucmpdi2.c new file mode 100644 index 0000000..e9ff258 --- /dev/null +++ b/arch/mips/lib/ucmpdi2.c @@ -0,0 +1,19 @@ +#include + +#include "libgcc.h" + +word_type __ucmpdi2 (unsigned long a, unsigned long b) +{ + const DWunion au = {.ll = a}; + const DWunion bu = {.ll = b}; + + if ((unsigned int) au.s.high < (unsigned int) bu.s.high) + return 0; + else if ((unsigned int) au.s.high > (unsigned int) bu.s.high) + return 2; + if ((unsigned int) au.s.low < (unsigned int) bu.s.low) + return 0; + else if ((unsigned int) au.s.low > (unsigned int) bu.s.low) + return 2; + return 1; +} From ths@networkno.de Tue May 1 23:51:31 2007 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 01 May 2007 23:51:33 +0100 (BST) Received: from phoenix.bawue.net ([193.7.176.60]:5046 "EHLO mail.bawue.net") by ftp.linux-mips.org with ESMTP id S20022872AbXEAWvb (ORCPT ); Tue, 1 May 2007 23:51:31 +0100 Received: from lagash (88-106-169-123.dynamic.dsl.as9105.com [88.106.169.123]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.bawue.net (Postfix) with ESMTP id E33AFB82C9 for ; Wed, 2 May 2007 00:51:25 +0200 (CEST) Received: from ths by lagash with local (Exim 4.67) (envelope-from ) id 1Hj1Cg-00039J-Iv for linux-mips@linux-mips.org; Tue, 01 May 2007 23:52:14 +0100 Date: Tue, 1 May 2007 23:52:14 +0100 To: linux-mips@linux-mips.org Subject: Some potential FPU emulator problem Message-ID: <20070501225214.GE30083@networkno.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) 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: 14960 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 Hello All, I used the appended patch which enables the assert() in the FPU emulator. The result (running in qemu) is: [snip] Will now check root file system:fsck 1.40-WIP (14-Nov-2006) [/sbin/fsck.ext3 (1) -- /] fsck.ext3 -a -C0 /dev/hda1 /dev/hda1: clean, 21846/131072 files, 371295/524272 blocks . EXT3 FS on hda1, internal journal Setting the system clock.. System Clock set. Local time: Tue May 1 22:43:28 UTC 2007. Cleaning up ifupdown.... Loading device-mapper support. Will now check all file systems. fsck 1.40-WIP (14-Nov-2006) Checking all file systems. Done checking file systems. A log is being saved in /var/log/fsck/checkfs if that location is writable. Setting kernel variables...done. Will now mount local filesystems:. Will now activate swapfile swap:done. BUG: soft lockup detected on CPU#0! Call Trace: [<80016d98>] dump_stack+0x8/0x34 [<800594ac>] softlockup_tick+0x114/0x178 [<800405bc>] update_process_times+0x38/0x90 [<80016510>] timer_interrupt+0x120/0x150 [<80059b60>] handle_IRQ_event+0x6c/0xdc [<8005b650>] handle_level_irq+0xd4/0x17c [<80010b70>] plat_irq_dispatch+0xb0/0x150 [<80011200>] ret_from_irq+0x0/0x4 [<80249a28>] _spin_unlock_irqrestore+0x28/0x48 [<80042ed0>] force_sig_info+0xa4/0xf8 [<80017f1c>] do_tr+0xb4/0x134 [<800111e0>] ret_from_exception+0x0/0x20 [<80021dac>] ieee754sp_format+0x28/0x50c [<80027e14>] ieee754sp_fdp+0x94/0x3d0 [<80020194>] fpu_emulator_cop1Handler+0x1334/0x1b40 [<80017934>] do_cpu+0x344/0x380 [<800111e0>] ret_from_exception+0x0/0x20 Without this patch the same configuration boot fine. I don't know i f this just means one of the asserts is broken or if there is something wrong with the FPU emulation. Thiemo diff --git a/arch/mips/math-emu/ieee754dp.h b/arch/mips/math-emu/ieee754dp.h index a37370d..f777806 100644 --- a/arch/mips/math-emu/ieee754dp.h +++ b/arch/mips/math-emu/ieee754dp.h @@ -28,7 +28,7 @@ #include "ieee754int.h" -#define assert(expr) ((void)0) +#define assert(expr) BUG_ON(expr) /* 3bit extended double precision sticky right shift */ #define XDPSRS(v,rs) \ diff --git a/arch/mips/math-emu/ieee754sp.h b/arch/mips/math-emu/ieee754sp.h index ae82f51..68bd4c0 100644 --- a/arch/mips/math-emu/ieee754sp.h +++ b/arch/mips/math-emu/ieee754sp.h @@ -28,7 +28,7 @@ #include "ieee754int.h" -#define assert(expr) ((void)0) +#define assert(expr) BUG_ON(expr) /* 3bit extended single precision sticky right shift */ #define SPXSRSXn(rs) \ From anemo@mba.ocn.ne.jp Wed May 2 16:00:27 2007 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 02 May 2007 16:00:29 +0100 (BST) Received: from mba.ocn.ne.jp ([122.1.175.29]:11213 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S20022991AbXEBPA1 (ORCPT ); Wed, 2 May 2007 16:00:27 +0100 Received: from localhost (p6152-ipad211funabasi.chiba.ocn.ne.jp [58.91.162.152]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 12F89A6BE; Thu, 3 May 2007 00:00:22 +0900 (JST) Date: Thu, 03 May 2007 00:00:27 +0900 (JST) Message-Id: <20070503.000027.25909441.anemo@mba.ocn.ne.jp> To: ths@networkno.de Cc: linux-mips@linux-mips.org Subject: Re: Some potential FPU emulator problem From: Atsushi Nemoto In-Reply-To: <20070501225214.GE30083@networkno.de> References: <20070501225214.GE30083@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 5.2 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: 14961 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 Tue, 1 May 2007 23:52:14 +0100, Thiemo Seufer wrote: > [<80042ed0>] force_sig_info+0xa4/0xf8 > [<80017f1c>] do_tr+0xb4/0x134 > [<800111e0>] ret_from_exception+0x0/0x20 > [<80021dac>] ieee754sp_format+0x28/0x50c > [<80027e14>] ieee754sp_fdp+0x94/0x3d0 > [<80020194>] fpu_emulator_cop1Handler+0x1334/0x1b40 > [<80017934>] do_cpu+0x344/0x380 > [<800111e0>] ret_from_exception+0x0/0x20 Is this kernel contain commit ba755f8ec80fdbf2b5212622eabf7355464c6327 ? I suppose the fix might show you a little bit better result. > Without this patch the same configuration boot fine. I don't know i > f this just means one of the asserts is broken or if there is > something wrong with the FPU emulation. Perhaps the triggered assert() is the first one in ieee754sp_format(), but I do not know if it was a proper test... --- Atsushi Nemoto From vagabon.xyz@gmail.com Fri May 4 11:55:44 2007 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 04 May 2007 11:55:47 +0100 (BST) Received: from mu-out-0910.google.com ([209.85.134.185]:52069 "EHLO mu-out-0910.google.com") by ftp.linux-mips.org with ESMTP id S20021957AbXEDKzo (ORCPT ); Fri, 4 May 2007 11:55:44 +0100 Received: by mu-out-0910.google.com with SMTP id w1so826293mue for ; Fri, 04 May 2007 03:55:43 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:reply-to:user-agent:mime-version:to:cc:subject:content-type:content-transfer-encoding:from; b=elSDFqR2Goe8FR09bC6K+DOFvO/jzF9KTNNSu+++GRePEJ/XgOCG+rhq7V67ZCmgmSI3hlbdYu3ovV/CO/MwX6FSBr8lbx7U49FnjaJBOmgIt5CrBs+VEomwreGJl4B2D8U7j4bIEWphJzr0HLWbrIsPXOd2wjqFEFAO30TpDCs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:reply-to:user-agent:mime-version:to:cc:subject:content-type:content-transfer-encoding:from; b=tgYZv+iW72H37+47bwjY/gjzrXOA4E4kYfCrWUX/ZteEEs3eg+u1Zk1mo/UiBc7KkvjLsyUsVZj4BJFW+J3vjxa0WJG/omRlFnCWrqrD/maw1OQx35Q/Yg2KqXKvWBufIUOk8fx8jZRLsgbjMX6JUlt3GUpq3EIU9+QKeWgtYQQ= Received: by 10.82.184.2 with SMTP id h2mr6169759buf.1178276141988; Fri, 04 May 2007 03:55:41 -0700 (PDT) Received: from ?192.168.0.24? ( [81.252.61.1]) by mx.google.com with ESMTP id c24sm377310ika.2007.05.04.03.55.35; Fri, 04 May 2007 03:55:38 -0700 (PDT) Message-ID: <463B117F.1070009@innova-card.com> Date: Fri, 04 May 2007 12:57:03 +0200 Reply-To: Franck User-Agent: Thunderbird 1.5.0.4 (X11/20060614) MIME-Version: 1.0 To: Ralf Baechle CC: linux-mips Subject: [PATCH] Simplify pte_offset_{map,map_nested}() on 32 bits [try #2] Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit From: Franck Bui-Huu 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: 14962 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: vagabon.xyz@gmail.com Precedence: bulk X-list: linux-mips From: Franck Bui-Huu Since both kernel and process page tables are never allocated in highmem these 2 macros were doing unnecessary extra works for getting a pte from a pmd. This patch also clean up pte allocation functions by passing __GFP_ZERO to alloc_pages() and by removing a useless local variable. With this patch the size of the kernel is slighly reduced. Signed-off-by: Franck Bui-Huu --- Hi Ralf, Maybe I'm missing something but it seems that page tables are never allocated from highmem. Please correct me if I'm wrong. This patch boot fine on a 32-bits platform without highmem though. This patch does not include any modifications for 64-bits platforms since I can't test them but this assertion should be more true since there's no highmem on these platforms. I can make another patch for such platforms if you think it makes sense. Please consider, Franck include/asm-mips/pgalloc.h | 22 ++++++---------------- include/asm-mips/pgtable-32.h | 13 +++++-------- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/include/asm-mips/pgalloc.h b/include/asm-mips/pgalloc.h index 5685d4f..a3b9953 100644 --- a/include/asm-mips/pgalloc.h +++ b/include/asm-mips/pgalloc.h @@ -62,26 +62,16 @@ static inline void pgd_free(pgd_t *pgd) free_pages((unsigned long)pgd, PGD_ORDER); } -static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, - unsigned long address) +static inline pte_t * +pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address) { - pte_t *pte; - - pte = (pte_t *) __get_free_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, PTE_ORDER); - - return pte; + return (pte_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, PTE_ORDER); } -static inline struct page *pte_alloc_one(struct mm_struct *mm, - unsigned long address) +static inline struct page * +pte_alloc_one(struct mm_struct *mm, unsigned long address) { - struct page *pte; - - pte = alloc_pages(GFP_KERNEL | __GFP_REPEAT, PTE_ORDER); - if (pte) - clear_highpage(pte); - - return pte; + return alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, PTE_ORDER); } static inline void pte_free_kernel(pte_t *pte) diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h index 2fbd47e..9e0a8c7 100644 --- a/include/asm-mips/pgtable-32.h +++ b/include/asm-mips/pgtable-32.h @@ -143,6 +143,7 @@ pfn_pte(unsigned long pfn, pgprot_t prot) #define __pgd_offset(address) pgd_index(address) #define __pud_offset(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) #define __pmd_offset(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) +#define __pte_offset(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE-1)) /* to find an entry in a kernel page-table-directory */ #define pgd_offset_k(address) pgd_offset(&init_mm, address) @@ -153,19 +154,15 @@ pfn_pte(unsigned long pfn, pgprot_t prot) #define pgd_offset(mm,addr) ((mm)->pgd + pgd_index(addr)) /* Find an entry in the third-level page table.. */ -#define __pte_offset(address) \ - (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) #define pte_offset(dir, address) \ ((pte_t *) pmd_page_vaddr(*(dir)) + __pte_offset(address)) #define pte_offset_kernel(dir, address) \ ((pte_t *) pmd_page_vaddr(*(dir)) + __pte_offset(address)) -#define pte_offset_map(dir, address) \ - ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address)) -#define pte_offset_map_nested(dir, address) \ - ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address)) -#define pte_unmap(pte) ((void)(pte)) -#define pte_unmap_nested(pte) ((void)(pte)) +#define pte_offset_map(dir, address) pte_offset_kernel(dir,address) +#define pte_offset_map_nested(dir, address) pte_offset_kernel(dir,address) +#define pte_unmap(pte) ((void)(pte)) +#define pte_unmap_nested(pte) ((void)(pte)) #if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX) -- 1.5.1.3 From vagabon.xyz@gmail.com Fri May 4 16:35:16 2007 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 04 May 2007 16:35:18 +0100 (BST) Received: from ug-out-1314.google.com ([66.249.92.174]:30613 "EHLO ug-out-1314.google.com") by ftp.linux-mips.org with ESMTP id S20022115AbXEDPfQ (ORCPT ); Fri, 4 May 2007 16:35:16 +0100 Received: by ug-out-1314.google.com with SMTP id 40so585612uga for ; Fri, 04 May 2007 08:35:15 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:received:to:cc:subject:date:message-id:x-mailer:in-reply-to:references:from; b=LOqRDPmNQi9mHy6zNYfTEJ7bIDS5J8huiCcvlKdRyOsrrzq5ZemZwtqZJPN/e1JWYP8oaF8+73Z9zxGeRdUe9U6ZRSkXBR+HG6d5Umxv570Tzw0BGhMp+zJcLe3okZRzesZ5YfCj5dXnswRm7JTPyQo7zMevOiLelcPWyyblCfo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:to:cc:subject:date:message-id:x-mailer:in-reply-to:references:from; b=J/jIny91Ino2wqa3AfVP0RJeW9Fw198M+JFbdJq9gClVh16d9EoPKtR5WNaMB2oiRjLXDqgke42OQexgWJBj9ZavqHoLUtlHd1+MOqewsaj4bhuBCQtXQBtwkgl5u2MBi1wXc3fRdpCmOCXQF/yiBx78OKzTNkrofAo2DQLQg+g= Received: by 10.82.187.16 with SMTP id k16mr6791308buf.1178292915444; Fri, 04 May 2007 08:35:15 -0700 (PDT) Received: from spoutnik.innova-card.com ( [81.252.61.1]) by mx.google.com with ESMTP id c25sm94823ika.2007.05.04.08.35.12; Fri, 04 May 2007 08:35:13 -0700 (PDT) Received: by spoutnik.innova-card.com (Postfix, from userid 500) id BFA7023F773; Fri, 4 May 2007 17:36:46 +0200 (CEST) To: ralf@linux-mips.org, anemo@mba.ocn.ne.jp Cc: linux-mips@linux-mips.org Subject: [PATCH 3/3] time: implement read_persistent_clock() Date: Fri, 4 May 2007 17:36:46 +0200 Message-Id: <1178293006620-git-send-email-fbuihuu@gmail.com> X-Mailer: git-send-email 1.5.1.3 In-Reply-To: <11782930063123-git-send-email-fbuihuu@gmail.com> References: <1178293006633-git-send-email-fbuihuu@gmail.com> <11782930063123-git-send-email-fbuihuu@gmail.com> From: Franck Bui-Huu 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: 14963 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: vagabon.xyz@gmail.com Precedence: bulk X-list: linux-mips From: Franck Bui-Huu This function is needed by timekeeping subsystem. This also removes the need to setup xtime. Signed-off-by: Franck Bui-Huu --- arch/mips/kernel/time.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 5a4fd06..0d6efda 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c @@ -326,17 +326,16 @@ static void __init init_mips_clocksource(void) clocksource_register(&clocksource_mips); } +unsigned long read_persistent_clock(void) +{ + return rtc_mips_get_time(); +} + void __init time_init(void) { if (!rtc_mips_set_mmss) rtc_mips_set_mmss = rtc_mips_set_time; - xtime.tv_sec = rtc_mips_get_time(); - xtime.tv_nsec = 0; - - set_normalized_timespec(&wall_to_monotonic, - -xtime.tv_sec, -xtime.tv_nsec); - /* Choose appropriate high precision timer routines. */ if (!cpu_has_counter && !clocksource_mips.read) /* No high precision timer -- sorry. */ -- 1.5.1.3 From vagabon.xyz@gmail.com Fri May 4 16:35:38 2007 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 04 May 2007 16:35:41 +0100 (BST) Received: from ug-out-1314.google.com ([66.249.92.172]:54169 "EHLO ug-out-1314.google.com") by ftp.linux-mips.org with ESMTP id S20022136AbXEDPfV (ORCPT ); Fri, 4 May 2007 16:35:21 +0100 Received: by ug-out-1314.google.com with SMTP id 40so585624uga for ; Fri, 04 May 2007 08:35:20 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:received:to:cc:subject:date:message-id:x-mailer:in-reply-to:references:from; b=jXct1Nt4dPMyxV1iLyLJPHOVHuJRVbbmWyJtABDBFTVbmUydY8rt0gV0w5szQjnvna0notS8zUlKpXL6gkAFli+V/GJd2Ezsdp9tZM5gFLrmJgn9HbO9ew/WdMAMLrUU9BBPczzYvtePqnpxpBGj4MM3fnerzbp2Sfbt5nmil1M= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:to:cc:subject:date:message-id:x-mailer:in-reply-to:references:from; b=X6TWkN7JGwMIE1PtVgfxP1agZeRSOVuEe7OntGhm4RSoWhE6EdckLra/BSv0HyAOYLw95qKtpZQ3aIbTcaA3Ukyf5ZCaQVa+tmOxtY2jtqnkbwLQhJF0SO3CbyF8NWNWfmxyoIttehbxWgqYJDN0Q433WRHSBIfNb5Z/2GPPaRw= Received: by 10.82.185.12 with SMTP id i12mr6712598buf.1178292920039; Fri, 04 May 2007 08:35:20 -0700 (PDT) Received: from spoutnik.innova-card.com ( [81.252.61.1]) by mx.google.com with ESMTP id z34sm102534ikz.2007.05.04.08.35.16; Fri, 04 May 2007 08:35:18 -0700 (PDT) Received: by spoutnik.innova-card.com (Postfix, from userid 500) id 99BD323F772; Fri, 4 May 2007 17:36:46 +0200 (CEST) To: ralf@linux-mips.org, anemo@mba.ocn.ne.jp Cc: linux-mips@linux-mips.org Subject: [PATCH 2/3] time: replace board_time_init() by plat_clk_setup() Date: Fri, 4 May 2007 17:36:45 +0200 Message-Id: <11782930063123-git-send-email-fbuihuu@gmail.com> X-Mailer: git-send-email 1.5.1.3 In-Reply-To: <1178293006633-git-send-email-fbuihuu@gmail.com> References: <1178293006633-git-send-email-fbuihuu@gmail.com> From: Franck Bui-Huu 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: 14964 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: vagabon.xyz@gmail.com Precedence: bulk X-list: linux-mips From: Franck Bui-Huu This patch introduces plat_clk_setup() which is a hook that platforms can implement to setup clock and mips_hpt_frequency. This was done by board_time_init function pointer previously. There are 3 reasons why we should prefer plat_clk_setup() over board_time_init: 1/ There's no need for platforms to initialize a function pointer anymore. 2/ board_time_init was previously initialized in plat_mem_setup() which is normally used to setup platform's *memories*. 3/ plat_clk_setup() is called earlier in boot process. Therefore others subsystems can get the time during their initialisation, timekeeping subsystem is an example. Signed-off-by: Franck Bui-Huu --- arch/mips/au1000/common/setup.c | 2 -- arch/mips/au1000/common/time.c | 4 ---- arch/mips/basler/excite/excite_setup.c | 5 +---- arch/mips/ddb5xxx/ddb5477/setup.c | 4 +--- arch/mips/dec/setup.c | 3 --- arch/mips/dec/time.c | 2 +- arch/mips/emma2rh/markeins/setup.c | 4 +--- arch/mips/gt64120/wrppmc/setup.c | 4 ---- arch/mips/gt64120/wrppmc/time.c | 2 +- arch/mips/jmr3927/rbhma3100/setup.c | 4 +--- arch/mips/kernel/setup.c | 13 +++++++++++++ arch/mips/kernel/time.c | 16 +++------------- arch/mips/lasat/setup.c | 4 +--- arch/mips/mips-boards/atlas/atlas_setup.c | 2 -- arch/mips/mips-boards/generic/time.c | 2 +- arch/mips/mips-boards/malta/malta_setup.c | 2 -- arch/mips/mips-boards/sead/sead_setup.c | 4 ---- arch/mips/mips-boards/sim/sim_setup.c | 2 -- arch/mips/mips-boards/sim/sim_time.c | 2 +- arch/mips/momentum/jaguar_atx/setup.c | 6 +----- arch/mips/momentum/ocelot_3/setup.c | 5 +---- arch/mips/momentum/ocelot_c/setup.c | 8 ++------ arch/mips/momentum/ocelot_g/gt-irq.c | 2 +- arch/mips/momentum/ocelot_g/setup.c | 3 --- arch/mips/philips/pnx8550/common/setup.c | 3 --- arch/mips/philips/pnx8550/common/time.c | 5 ++--- arch/mips/pmc-sierra/yosemite/setup.c | 4 ++-- arch/mips/sgi-ip22/ip22-time.c | 4 +--- arch/mips/sgi-ip27/ip27-init.c | 3 --- arch/mips/sgi-ip27/ip27-timer.c | 2 +- arch/mips/sgi-ip32/ip32-setup.c | 4 +--- arch/mips/sibyte/swarm/setup.c | 3 +-- arch/mips/sni/pcimt.c | 1 - arch/mips/sni/pcit.c | 1 - arch/mips/sni/rm200.c | 1 - arch/mips/sni/time.c | 2 +- arch/mips/tx4927/common/tx4927_setup.c | 5 +---- arch/mips/tx4938/common/setup.c | 4 +--- arch/mips/vr41xx/common/init.c | 8 +------- include/asm-mips/sni.h | 3 --- 40 files changed, 42 insertions(+), 116 deletions(-) diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c index 13fe187..646d7aa 100644 --- a/arch/mips/au1000/common/setup.c +++ b/arch/mips/au1000/common/setup.c @@ -50,7 +50,6 @@ extern void au1000_halt(void); extern void au1000_power_off(void); extern void au1x_time_init(void); extern void au1x_timer_setup(struct irqaction *irq); -extern void au1xxx_time_init(void); extern void set_cpuspec(void); void __init plat_mem_setup(void) @@ -121,7 +120,6 @@ void __init plat_mem_setup(void) _machine_restart = au1000_restart; _machine_halt = au1000_halt; pm_power_off = au1000_power_off; - board_time_init = au1xxx_time_init; /* IO/MEM resources. */ set_io_port_base(0); diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c index fa1c62f..b32bf46 100644 --- a/arch/mips/au1000/common/time.c +++ b/arch/mips/au1000/common/time.c @@ -358,7 +358,3 @@ void __init plat_timer_setup(struct irqaction *irq) #endif } - -void __init au1xxx_time_init(void) -{ -} diff --git a/arch/mips/basler/excite/excite_setup.c b/arch/mips/basler/excite/excite_setup.c index 2f0e4c0..a337e0d 100644 --- a/arch/mips/basler/excite/excite_setup.c +++ b/arch/mips/basler/excite/excite_setup.c @@ -67,7 +67,7 @@ DEFINE_SPINLOCK(titan_lock); int titan_irqflags; -static void excite_timer_init(void) +void __init plat_clk_setup(void) { const u32 modebit5 = ocd_readl(0x00e4); unsigned int @@ -260,9 +260,6 @@ void __init plat_mem_setup(void) /* Announce RAM to system */ add_memory_region(0x00000000, memsize, BOOT_MEM_RAM); - /* Set up timer initialization hooks */ - board_time_init = excite_timer_init; - /* Set up the peripheral address map */ *(boot_ocd_base + (LKB9 / sizeof (u32))) = 0; *(boot_ocd_base + (LKB10 / sizeof (u32))) = 0; diff --git a/arch/mips/ddb5xxx/ddb5477/setup.c b/arch/mips/ddb5xxx/ddb5477/setup.c index f0cc0e8..94aebbb 100644 --- a/arch/mips/ddb5xxx/ddb5477/setup.c +++ b/arch/mips/ddb5xxx/ddb5477/setup.c @@ -121,7 +121,7 @@ static unsigned int __init detect_bus_frequency(unsigned long rtc_base) return freq; } -static void __init ddb_time_init(void) +void __init plat_clk_setup(void) { unsigned long rtc_base; unsigned int i; @@ -176,8 +176,6 @@ void __init plat_mem_setup(void) set_io_port_base(KSEG1ADDR(DDB_PCI_IO_BASE)); - board_time_init = ddb_time_init; - _machine_restart = ddb_machine_restart; _machine_halt = ddb_machine_halt; pm_power_off = ddb_machine_power_off; diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c index b8a5e75..25b879b 100644 --- a/arch/mips/dec/setup.c +++ b/arch/mips/dec/setup.c @@ -146,12 +146,9 @@ static void __init dec_be_init(void) } -extern void dec_time_init(void); - void __init plat_mem_setup(void) { board_be_init = dec_be_init; - board_time_init = dec_time_init; wbflush_setup(); diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c index 8b7e0c1..47d11a2 100644 --- a/arch/mips/dec/time.c +++ b/arch/mips/dec/time.c @@ -161,7 +161,7 @@ static cycle_t dec_ioasic_hpt_read(void) } -void __init dec_time_init(void) +void __init plat_clk_setup(void) { rtc_mips_get_time = dec_rtc_get_time; rtc_mips_set_mmss = dec_rtc_set_mmss; diff --git a/arch/mips/emma2rh/markeins/setup.c b/arch/mips/emma2rh/markeins/setup.c index b29a447..2cd8c28 100644 --- a/arch/mips/emma2rh/markeins/setup.c +++ b/arch/mips/emma2rh/markeins/setup.c @@ -88,7 +88,7 @@ static unsigned int __init detect_bus_frequency(unsigned long rtc_base) return clock[reg]; } -static void __init emma2rh_time_init(void) +void __init plat_clk_setup(void) { u32 reg; if (bus_frequency == 0) @@ -148,8 +148,6 @@ void __init plat_mem_setup(void) set_io_port_base(KSEG1ADDR(EMMA2RH_PCI_IO_BASE)); - board_time_init = emma2rh_time_init; - _machine_restart = markeins_machine_restart; _machine_halt = markeins_machine_halt; pm_power_off = markeins_machine_power_off; diff --git a/arch/mips/gt64120/wrppmc/setup.c b/arch/mips/gt64120/wrppmc/setup.c index 121188d..46abb59 100644 --- a/arch/mips/gt64120/wrppmc/setup.c +++ b/arch/mips/gt64120/wrppmc/setup.c @@ -125,7 +125,6 @@ static void wrppmc_setup_serial(void) void __init plat_mem_setup(void) { - extern void wrppmc_time_init(void); extern void wrppmc_machine_restart(char *command); extern void wrppmc_machine_halt(void); extern void wrppmc_machine_power_off(void); @@ -134,9 +133,6 @@ void __init plat_mem_setup(void) _machine_halt = wrppmc_machine_halt; pm_power_off = wrppmc_machine_power_off; - /* Use MIPS Count/Compare Timer */ - board_time_init = wrppmc_time_init; - /* This makes the operations of 'in/out[bwl]' to the * physical address ( < KSEG0) can work via KSEG1 */ diff --git a/arch/mips/gt64120/wrppmc/time.c b/arch/mips/gt64120/wrppmc/time.c index 5b44085..dbb8fae 100644 --- a/arch/mips/gt64120/wrppmc/time.c +++ b/arch/mips/gt64120/wrppmc/time.c @@ -38,7 +38,7 @@ void __init plat_timer_setup(struct irqaction *irq) * NOTE: We disable all GT64120 timers, and use MIPS processor internal * timer as the source of kernel clock tick. */ -void __init wrppmc_time_init(void) +void __init plat_clk_setup(void) { /* Disable GT64120 timers */ GT_WRITE(GT_TC_CONTROL_OFS, 0x00); diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c index 8303001..8c4a988 100644 --- a/arch/mips/jmr3927/rbhma3100/setup.c +++ b/arch/mips/jmr3927/rbhma3100/setup.c @@ -109,7 +109,7 @@ static void jmr3927_timer_ack(void) jmr3927_tmrptr->tisr = 0; /* ack interrupt */ } -static void __init jmr3927_time_init(void) +void __init plat_clk_setup(void) { clocksource_mips.read = jmr3927_hpt_read; mips_timer_ack = jmr3927_timer_ack; @@ -141,8 +141,6 @@ void __init plat_mem_setup(void) set_io_port_base(JMR3927_PORT_BASE + JMR3927_PCIIO); - board_time_init = jmr3927_time_init; - _machine_restart = jmr3927_machine_restart; _machine_halt = jmr3927_machine_halt; pm_power_off = jmr3927_machine_power_off; diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 4975da0..6cdd596 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -521,6 +521,18 @@ static void __init resource_init(void) } } +/* + * plat_clk_setup() -- optional + * + * a) set up RTC routines, + * b) calibrate and set the mips_hpt_frequency (only needed if + * you intended to use cpu counter as timer interrupt source) + */ +void __init __weak plat_clk_setup(void) +{ + return; +} + void __init setup_arch(char **cmdline_p) { cpu_probe(); @@ -549,6 +561,7 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_SMP plat_smp_setup(); #endif + plat_clk_setup(); } static int __init fpu_disable(char *s) diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 751b4a1..5a4fd06 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c @@ -239,21 +239,14 @@ asmlinkage void ll_local_timer_interrupt(int irq) /* * time_init() - it does the following things. * - * 1) board_time_init() - - * a) (optional) set up RTC routines, - * b) (optional) calibrate and set the mips_hpt_frequency - * (only needed if you intended to use cpu counter as timer interrupt - * source) - * 2) setup xtime based on rtc_mips_get_time(). - * 3) calculate a couple of cached variables for later usage - * 4) plat_timer_setup() - + * 1) setup xtime based on rtc_mips_get_time(). + * 2) calculate a couple of cached variables for later usage + * 3) plat_timer_setup() - * a) (optional) over-write any choices made above by time_init(). * b) machine specific code should setup the timer irqaction. * c) enable the timer interrupt */ -void (*board_time_init)(void); - unsigned int mips_hpt_frequency; static struct irqaction timer_irqaction = { @@ -335,9 +328,6 @@ static void __init init_mips_clocksource(void) void __init time_init(void) { - if (board_time_init) - board_time_init(); - if (!rtc_mips_set_mmss) rtc_mips_set_mmss = rtc_mips_set_time; diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c index 488007f..1b3221c 100644 --- a/arch/mips/lasat/setup.c +++ b/arch/mips/lasat/setup.c @@ -109,7 +109,7 @@ static struct notifier_block lasat_panic_block[] = { lasat_panic_prom_monitor, NULL, INT_MIN } }; -static void lasat_time_init(void) +void __init plat_clk_setup(void) { mips_hpt_frequency = lasat_board_info.li_cpu_hz / 2; } @@ -164,8 +164,6 @@ void __init plat_mem_setup(void) lasat_reboot_setup(); - board_time_init = lasat_time_init; - #ifdef CONFIG_DS1603 ds1603 = &ds_defs[mips_machtype]; rtc_mips_get_time = ds1603_read; diff --git a/arch/mips/mips-boards/atlas/atlas_setup.c b/arch/mips/mips-boards/atlas/atlas_setup.c index 0c6b0ce..cc4057e 100644 --- a/arch/mips/mips-boards/atlas/atlas_setup.c +++ b/arch/mips/mips-boards/atlas/atlas_setup.c @@ -34,7 +34,6 @@ #include extern void mips_reboot_setup(void); -extern void mips_time_init(void); extern unsigned long mips_rtc_get_time(void); #ifdef CONFIG_KGDB @@ -61,7 +60,6 @@ void __init plat_mem_setup(void) #endif mips_reboot_setup(); - board_time_init = mips_time_init; rtc_mips_get_time = mips_rtc_get_time; } diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c index df2a2bd..d24ffe9 100644 --- a/arch/mips/mips-boards/generic/time.c +++ b/arch/mips/mips-boards/generic/time.c @@ -249,7 +249,7 @@ unsigned long __init mips_rtc_get_time(void) return mc146818_get_cmos_time(); } -void __init mips_time_init(void) +void __init plat_clk_setup(void) { unsigned int est_freq; diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c index 7873932..2602131 100644 --- a/arch/mips/mips-boards/malta/malta_setup.c +++ b/arch/mips/mips-boards/malta/malta_setup.c @@ -36,7 +36,6 @@ #endif extern void mips_reboot_setup(void); -extern void mips_time_init(void); extern unsigned long mips_rtc_get_time(void); #ifdef CONFIG_KGDB @@ -182,6 +181,5 @@ void __init plat_mem_setup(void) #endif mips_reboot_setup(); - board_time_init = mips_time_init; rtc_mips_get_time = mips_rtc_get_time; } diff --git a/arch/mips/mips-boards/sead/sead_setup.c b/arch/mips/mips-boards/sead/sead_setup.c index a189dec..ad52e14 100644 --- a/arch/mips/mips-boards/sead/sead_setup.c +++ b/arch/mips/mips-boards/sead/sead_setup.c @@ -34,8 +34,6 @@ #include extern void mips_reboot_setup(void); -extern void mips_time_init(void); - static void __init serial_init(void); const char *get_system_type(void) @@ -49,8 +47,6 @@ void __init plat_mem_setup(void) serial_init (); - board_time_init = mips_time_init; - mips_reboot_setup(); } diff --git a/arch/mips/mips-boards/sim/sim_setup.c b/arch/mips/mips-boards/sim/sim_setup.c index b705f09..58c427a 100644 --- a/arch/mips/mips-boards/sim/sim_setup.c +++ b/arch/mips/mips-boards/sim/sim_setup.c @@ -36,7 +36,6 @@ #include -extern void sim_time_init(void); static void __init serial_init(void); unsigned int _isbonito = 0; @@ -54,7 +53,6 @@ void __init plat_mem_setup(void) serial_init(); - board_time_init = sim_time_init; pr_info("Linux started...\n"); #ifdef CONFIG_MIPS_MT_SMP diff --git a/arch/mips/mips-boards/sim/sim_time.c b/arch/mips/mips-boards/sim/sim_time.c index d3a21c7..2dcda66 100644 --- a/arch/mips/mips-boards/sim/sim_time.c +++ b/arch/mips/mips-boards/sim/sim_time.c @@ -146,7 +146,7 @@ static unsigned int __init estimate_cpu_frequency(void) return count; } -void __init sim_time_init(void) +void __init plat_clk_setup(void) { unsigned int est_freq, flags; diff --git a/arch/mips/momentum/jaguar_atx/setup.c b/arch/mips/momentum/jaguar_atx/setup.c index 5a51014..14ed3f5 100644 --- a/arch/mips/momentum/jaguar_atx/setup.c +++ b/arch/mips/momentum/jaguar_atx/setup.c @@ -75,8 +75,6 @@ extern void momenco_jaguar_restart(char *command); extern void momenco_jaguar_halt(void); extern void momenco_jaguar_power_off(void); -void momenco_time_init(void); - static char reset_reason; static inline unsigned long ENTRYLO(unsigned long paddr) @@ -220,7 +218,7 @@ void __init plat_timer_setup(struct irqaction *irq) * Ugly but the least of all evils. TLB initialization did flush the TLB so * We need to setup mappings again before we can touch the RTC. */ -void momenco_time_init(void) +void __init plat_clk_setup(void) { wire_stupidity_into_tlb(); @@ -360,8 +358,6 @@ void __init plat_mem_setup(void) { unsigned int tmpword; - board_time_init = momenco_time_init; - _machine_restart = momenco_jaguar_restart; _machine_halt = momenco_jaguar_halt; pm_power_off = momenco_jaguar_power_off; diff --git a/arch/mips/momentum/ocelot_3/setup.c b/arch/mips/momentum/ocelot_3/setup.c index ff0829f..7191dc4 100644 --- a/arch/mips/momentum/ocelot_3/setup.c +++ b/arch/mips/momentum/ocelot_3/setup.c @@ -98,7 +98,6 @@ extern void momenco_ocelot_restart(char *command); extern void momenco_ocelot_halt(void); extern void momenco_ocelot_power_off(void); -void momenco_time_init(void); static char reset_reason; void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1, @@ -201,7 +200,7 @@ void __init plat_timer_setup(struct irqaction *irq) setup_irq(7, irq); /* Timer interrupt, unmask status IM7 */ } -void momenco_time_init(void) +void __init plat_clk_setup(void) { setup_wired_tlb_entries(); @@ -315,8 +314,6 @@ void __init plat_mem_setup(void) { unsigned int tmpword; - board_time_init = momenco_time_init; - _machine_restart = momenco_ocelot_restart; _machine_halt = momenco_ocelot_halt; pm_power_off = momenco_ocelot_power_off; diff --git a/arch/mips/momentum/ocelot_c/setup.c b/arch/mips/momentum/ocelot_c/setup.c index 0b6b233..8e083c8 100644 --- a/arch/mips/momentum/ocelot_c/setup.c +++ b/arch/mips/momentum/ocelot_c/setup.c @@ -76,8 +76,6 @@ extern void momenco_ocelot_restart(char *command); extern void momenco_ocelot_halt(void); extern void momenco_ocelot_power_off(void); -void momenco_time_init(void); - static char reset_reason; void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1, unsigned long entryhi, unsigned long pagemask); @@ -210,7 +208,7 @@ void __init plat_timer_setup(struct irqaction *irq) setup_irq(7, irq); } -void momenco_time_init(void) +void __init plat_clk_setup(void) { #ifdef CONFIG_CPU_SR71000 mips_hpt_frequency = cpu_clock; @@ -219,7 +217,7 @@ void momenco_time_init(void) #else #error Unknown CPU for this board #endif - printk("momenco_time_init cpu_clock=%d\n", cpu_clock); + printk("%s cpu_clock=%d\n", __FUNCTION__, cpu_clock); rtc_mips_get_time = m48t37y_get_time; rtc_mips_set_time = m48t37y_set_time; @@ -229,8 +227,6 @@ void __init plat_mem_setup(void) { unsigned int tmpword; - board_time_init = momenco_time_init; - _machine_restart = momenco_ocelot_restart; _machine_halt = momenco_ocelot_halt; pm_power_off = momenco_ocelot_power_off; diff --git a/arch/mips/momentum/ocelot_g/gt-irq.c b/arch/mips/momentum/ocelot_g/gt-irq.c index e5576bd..8b06f4f 100644 --- a/arch/mips/momentum/ocelot_g/gt-irq.c +++ b/arch/mips/momentum/ocelot_g/gt-irq.c @@ -156,7 +156,7 @@ static irqreturn_t gt64240_p0int_irq(int irq, void *dev) * that is passed in as *irq (=irq0 in ../kernel/time.c). * We will do our own timer interrupt handling. */ -void gt64240_time_init(void) +void plat_clk_setup(void) { static struct irqaction timer; diff --git a/arch/mips/momentum/ocelot_g/setup.c b/arch/mips/momentum/ocelot_g/setup.c index 9db638a..b0513cc 100644 --- a/arch/mips/momentum/ocelot_g/setup.c +++ b/arch/mips/momentum/ocelot_g/setup.c @@ -75,7 +75,6 @@ extern void momenco_ocelot_restart(char *command); extern void momenco_ocelot_halt(void); extern void momenco_ocelot_power_off(void); -extern void gt64240_time_init(void); extern void momenco_ocelot_irq_setup(void); static char reset_reason; @@ -170,8 +169,6 @@ void __init plat_mem_setup(void) void (*l3func)(unsigned long) = (void *) KSEG1ADDR(setup_l3cache); unsigned int tmpword; - board_time_init = gt64240_time_init; - _machine_restart = momenco_ocelot_restart; _machine_halt = momenco_ocelot_halt; pm_power_off = momenco_ocelot_power_off; diff --git a/arch/mips/philips/pnx8550/common/setup.c b/arch/mips/philips/pnx8550/common/setup.c index 5bd7374..2ce298f 100644 --- a/arch/mips/philips/pnx8550/common/setup.c +++ b/arch/mips/philips/pnx8550/common/setup.c @@ -47,7 +47,6 @@ extern void pnx8550_machine_halt(void); extern void pnx8550_machine_power_off(void); extern struct resource ioport_resource; extern struct resource iomem_resource; -extern void pnx8550_time_init(void); extern void rs_kgdb_hook(int tty_no); extern char *prom_getcmdline(void); @@ -104,8 +103,6 @@ void __init plat_mem_setup(void) _machine_halt = pnx8550_machine_halt; pm_power_off = pnx8550_machine_power_off; - board_time_init = pnx8550_time_init; - /* Clear the Global 2 Register, PCI Inta Output Enable Registers Bit 1:Enable DAC Powerdown -> 0:DACs are enabled and are working normally diff --git a/arch/mips/philips/pnx8550/common/time.c b/arch/mips/philips/pnx8550/common/time.c index 68def38..0e1ae35 100644 --- a/arch/mips/philips/pnx8550/common/time.c +++ b/arch/mips/philips/pnx8550/common/time.c @@ -46,16 +46,15 @@ static void timer_ack(void) } /* - * pnx8550_time_init() - it does the following things: + * plat_clk_setup() - it does the following things: * - * 1) board_time_init() - * a) (optional) set up RTC routines, * b) (optional) calibrate and set the mips_hpt_frequency * (only needed if you intended to use cpu counter as timer interrupt * source) */ -void pnx8550_time_init(void) +void __init plat_clk_setup(void) { unsigned int n; unsigned int m; diff --git a/arch/mips/pmc-sierra/yosemite/setup.c b/arch/mips/pmc-sierra/yosemite/setup.c index 6a6e15e..ceae27c 100644 --- a/arch/mips/pmc-sierra/yosemite/setup.c +++ b/arch/mips/pmc-sierra/yosemite/setup.c @@ -137,8 +137,9 @@ void __init plat_timer_setup(struct irqaction *irq) setup_irq(7, irq); } -void yosemite_time_init(void) +void __init plat_clk_setup(void) { + /* FIXME: what's this code is doing ? */ mips_hpt_frequency = cpu_clock / 2; mips_hpt_frequency = 33000000 * 3 * 5; } @@ -220,7 +221,6 @@ static void __init py_late_time_init(void) void __init plat_mem_setup(void) { - board_time_init = yosemite_time_init; late_time_init = py_late_time_init; /* Add memory regions */ diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c index 8e88a44..202fe80 100644 --- a/arch/mips/sgi-ip22/ip22-time.c +++ b/arch/mips/sgi-ip22/ip22-time.c @@ -128,7 +128,7 @@ static unsigned long dosample(void) /* * Here we need to calibrate the cycle counter to at least be close. */ -static __init void indy_time_init(void) +void __init plat_clk_setup(void) { unsigned long r4k_ticks[3]; unsigned long r4k_tick; @@ -213,6 +213,4 @@ void __init ip22_time_init(void) /* setup hookup functions */ rtc_mips_get_time = indy_rtc_get_time; rtc_mips_set_time = indy_rtc_set_time; - - board_time_init = indy_time_init; } diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c index 74158d3..8427231 100644 --- a/arch/mips/sgi-ip27/ip27-init.c +++ b/arch/mips/sgi-ip27/ip27-init.c @@ -191,7 +191,6 @@ static inline void ioc3_eth_init(void) ioc3->eier = 0; } -extern void ip27_time_init(void); extern void ip27_reboot_setup(void); void __init plat_mem_setup(void) @@ -238,6 +237,4 @@ void __init plat_mem_setup(void) per_cpu_init(); set_io_port_base(IO_BASE); - - board_time_init = ip27_time_init; } diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c index 8c3c78c..d7740c4 100644 --- a/arch/mips/sgi-ip27/ip27-timer.c +++ b/arch/mips/sgi-ip27/ip27-timer.c @@ -223,7 +223,7 @@ static cycle_t ip27_hpt_read(void) return REMOTE_HUB_L(cputonasid(0), PI_RT_COUNT); } -void __init ip27_time_init(void) +void __init plat_clk_setup(void) { clocksource_mips.read = ip27_hpt_read; mips_hpt_frequency = CYCLES_PER_SEC; diff --git a/arch/mips/sgi-ip32/ip32-setup.c b/arch/mips/sgi-ip32/ip32-setup.c index 57708fe..0910b84 100644 --- a/arch/mips/sgi-ip32/ip32-setup.c +++ b/arch/mips/sgi-ip32/ip32-setup.c @@ -71,7 +71,7 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str) /* An arbitrary time; this can be decreased if reliability looks good */ #define WAIT_MS 10 -void __init ip32_time_init(void) +void __init plat_clk_setup(void) { printk(KERN_INFO "Calibrating system timer... "); write_c0_count(0); @@ -94,8 +94,6 @@ void __init plat_mem_setup(void) rtc_mips_get_time = mc146818_get_cmos_time; rtc_mips_set_mmss = mc146818_set_rtc_mmss; - board_time_init = ip32_time_init; - #ifdef CONFIG_SERIAL_8250 { static struct uart_port o2_serial[2]; diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c index 83572d8..93f8d14 100644 --- a/arch/mips/sibyte/swarm/setup.c +++ b/arch/mips/sibyte/swarm/setup.c @@ -69,7 +69,7 @@ const char *get_system_type(void) return "SiByte " SIBYTE_BOARD_NAME; } -void __init swarm_time_init(void) +void __init plat_clk_setup(void) { #if defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X) /* Setup HPT */ @@ -116,7 +116,6 @@ void __init plat_mem_setup(void) panic_timeout = 5; /* For debug. */ - board_time_init = swarm_time_init; board_be_handler = swarm_be_handler; if (xicor_probe()) { diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c index 9ee208d..ba04719 100644 --- a/arch/mips/sni/pcimt.c +++ b/arch/mips/sni/pcimt.c @@ -280,7 +280,6 @@ void sni_pcimt_init(void) sni_pcimt_sc_init(); rtc_mips_get_time = mc146818_get_cmos_time; rtc_mips_set_time = mc146818_set_rtc_mmss; - board_time_init = sni_cpu_time_init; ioport_resource.end = sni_io_resource.end; #ifdef CONFIG_PCI PCIBIOS_MIN_IO = 0x9000; diff --git a/arch/mips/sni/pcit.c b/arch/mips/sni/pcit.c index 00d151f..4d722ae 100644 --- a/arch/mips/sni/pcit.c +++ b/arch/mips/sni/pcit.c @@ -247,7 +247,6 @@ void sni_pcit_init(void) { rtc_mips_get_time = mc146818_get_cmos_time; rtc_mips_set_time = mc146818_set_rtc_mmss; - board_time_init = sni_cpu_time_init; ioport_resource.end = sni_io_resource.end; #ifdef CONFIG_PCI PCIBIOS_MIN_IO = 0x9000; diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c index b82ff12..2421441 100644 --- a/arch/mips/sni/rm200.c +++ b/arch/mips/sni/rm200.c @@ -182,5 +182,4 @@ void sni_rm200_init(void) ioport_resource.end += 0x02000000; ds1216_base = (volatile unsigned char *) SNI_DS1216_RM200_BASE; rtc_mips_get_time = ds1216_get_cmos_time; - board_time_init = sni_cpu_time_init; } diff --git a/arch/mips/sni/time.c b/arch/mips/sni/time.c index 20028fc..85b4986 100644 --- a/arch/mips/sni/time.c +++ b/arch/mips/sni/time.c @@ -71,7 +71,7 @@ static __init unsigned long dosample(void) /* * Here we need to calibrate the cycle counter to at least be close. */ -__init void sni_cpu_time_init(void) +void __init plat_clk_setup(void) { unsigned long r4k_ticks[3]; unsigned long r4k_tick; diff --git a/arch/mips/tx4927/common/tx4927_setup.c b/arch/mips/tx4927/common/tx4927_setup.c index c8e49fe..60f594c 100644 --- a/arch/mips/tx4927/common/tx4927_setup.c +++ b/arch/mips/tx4927/common/tx4927_setup.c @@ -49,14 +49,11 @@ #undef DEBUG -void __init tx4927_time_init(void); void dump_cp0(char *key); void __init plat_mem_setup(void) { - board_time_init = tx4927_time_init; - #ifdef CONFIG_TOSHIBA_RBTX4927 { extern void toshiba_rbtx4927_setup(void); @@ -65,7 +62,7 @@ void __init plat_mem_setup(void) #endif } -void __init tx4927_time_init(void) +void __init plat_clk_setup(void) { #ifdef CONFIG_TOSHIBA_RBTX4927 diff --git a/arch/mips/tx4938/common/setup.c b/arch/mips/tx4938/common/setup.c index 142abf4..e7f2dfc 100644 --- a/arch/mips/tx4938/common/setup.c +++ b/arch/mips/tx4938/common/setup.c @@ -37,18 +37,16 @@ extern void toshiba_rbtx4938_setup(void); extern void rbtx4938_time_init(void); void __init tx4938_setup(void); -void __init tx4938_time_init(void); void dump_cp0(char *key); void __init plat_mem_setup(void) { - board_time_init = tx4938_time_init; toshiba_rbtx4938_setup(); } void __init -tx4938_time_init(void) +plat_clk_setup(void) { rbtx4938_time_init(); } diff --git a/arch/mips/vr41xx/common/init.c b/arch/mips/vr41xx/common/init.c index 4f97e0b..14ac696 100644 --- a/arch/mips/vr41xx/common/init.c +++ b/arch/mips/vr41xx/common/init.c @@ -36,7 +36,7 @@ static void __init iomem_resource_init(void) iomem_resource.end = IO_MEM_RESOURCE_END; } -static void __init setup_timer_frequency(void) +void __init plat_clk_setup(void) { unsigned long tclock; @@ -53,16 +53,10 @@ void __init plat_timer_setup(struct irqaction *irq) setup_irq(TIMER_IRQ, irq); } -static void __init timer_init(void) -{ - board_time_init = setup_timer_frequency; -} - void __init plat_mem_setup(void) { vr41xx_calculate_clock_frequency(); - timer_init(); iomem_resource_init(); } diff --git a/include/asm-mips/sni.h b/include/asm-mips/sni.h index f257509..5667797 100644 --- a/include/asm-mips/sni.h +++ b/include/asm-mips/sni.h @@ -209,9 +209,6 @@ extern void sni_pcit_cplus_irq_init (void); extern void sni_rm200_irq_init (void); extern void sni_pcimt_irq_init (void); -/* timer inits */ -extern void sni_cpu_time_init(void); - /* common irq stuff */ extern void (*sni_hwint)(void); extern struct irqaction sni_isa_irq; -- 1.5.1.3 From vagabon.xyz@gmail.com Fri May 4 16:36:22 2007 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 04 May 2007 16:36:23 +0100 (BST) Received: from ug-out-1314.google.com ([66.249.92.174]:43674 "EHLO ug-out-1314.google.com") by ftp.linux-mips.org with ESMTP id S20022135AbXEDPgW (ORCPT ); Fri, 4 May 2007 16:36:22 +0100 Received: by ug-out-1314.google.com with SMTP id 40so585614uga for ; Fri, 04 May 2007 08:35:16 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:received:to:cc:subject:date:message-id:x-mailer:from; b=c+OqXXqjikgZbmhYCXb5vFf6/QV1ldL0zAXokz+7A9YcU1zA9uujCeskm2YzTXoZXgBfls22B9udk+eOGS17ihWbI1vgv48lNC2VmrqDRz5gIacV6Z1aqi3tECda3qnfFNfK/BYIE/ug7uEyUHzLhlD+6V73jTk/u89ArGBBzYE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:to:cc:subject:date:message-id:x-mailer:from; b=kI9p8vj36AjKwUJ0Ax7ywHXrgADxazPPgKl3YPdmaNYvClQxn/BwL8ntHiHlA8571NpB1PCmtySz2GgwWnl4D5TVGJ9b2TLXxFaEtQRGoOcspzDmhTfIvUzTHu/TsF40exwh5ADoqaMkgV0crZwpGl0biIqg8nWPjraevJz9kX8= Received: by 10.82.145.7 with SMTP id s7mr6745753bud.1178292916323; Fri, 04 May 2007 08:35:16 -0700 (PDT) Received: from spoutnik.innova-card.com ( [81.252.61.1]) by mx.google.com with ESMTP id y37sm149313iky.2007.05.04.08.35.13; Fri, 04 May 2007 08:35:15 -0700 (PDT) Received: by spoutnik.innova-card.com (Postfix, from userid 500) id 6D82323F76E; Fri, 4 May 2007 17:36:46 +0200 (CEST) To: ralf@linux-mips.org, anemo@mba.ocn.ne.jp Cc: linux-mips@linux-mips.org Subject: [PATCH 1/3] clocksource: use CLOCKSOURCE_MASK() macro Date: Fri, 4 May 2007 17:36:44 +0200 Message-Id: <1178293006633-git-send-email-fbuihuu@gmail.com> X-Mailer: git-send-email 1.5.1.3 From: Franck Bui-Huu 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: 14965 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: vagabon.xyz@gmail.com Precedence: bulk X-list: linux-mips From: Franck Bui-Huu Signed-off-by: Franck Bui-Huu --- arch/mips/kernel/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index e5e56bd..751b4a1 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c @@ -306,7 +306,7 @@ static unsigned int __init calibrate_hpt(void) struct clocksource clocksource_mips = { .name = "MIPS", - .mask = 0xffffffff, + .mask = CLOCKSOURCE_MASK(32), .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; -- 1.5.1.3 From anemo@mba.ocn.ne.jp Sat May 5 17:03:26 2007 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 05 May 2007 17:03:31 +0100 (BST) Received: from mba.ocn.ne.jp ([122.1.175.29]:49143 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S20022578AbXEEQD0 (ORCPT ); Sat, 5 May 2007 17:03:26 +0100 Received: from localhost (p1094-ipad26funabasi.chiba.ocn.ne.jp [220.104.87.94]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id CA0BFA104; Sun, 6 May 2007 01:03:05 +0900 (JST) Date: Sun, 06 May 2007 01:03:13 +0900 (JST) Message-Id: <20070506.010313.41199101.anemo@mba.ocn.ne.jp> To: vagabon.xyz@gmail.com Cc: ralf@linux-mips.org, linux-mips@linux-mips.org Subject: Re: [PATCH 2/3] time: replace board_time_init() by plat_clk_setup() From: Atsushi Nemoto In-Reply-To: <11782930063123-git-send-email-fbuihuu@gmail.com> References: <1178293006633-git-send-email-fbuihuu@gmail.com> <11782930063123-git-send-email-fbuihuu@gmail.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 5.2 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: 14966 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, 4 May 2007 17:36:45 +0200, Franck Bui-Huu wrote: > This patch introduces plat_clk_setup() which is a hook that platforms > can implement to setup clock and mips_hpt_frequency. > > This was done by board_time_init function pointer previously. > > There are 3 reasons why we should prefer plat_clk_setup() over > board_time_init: > > 1/ There's no need for platforms to initialize a function > pointer anymore. > > 2/ board_time_init was previously initialized in plat_mem_setup() > which is normally used to setup platform's *memories*. > > 3/ plat_clk_setup() is called earlier in boot process. Therefore > others subsystems can get the time during their initialisation, > timekeeping subsystem is an example. Though providing plat_clk_setup() for timekeeping code might be a good idea, I think your patch break at least those two platforms: MOMENCO_JAGUAR_ATX: momenco_time_init() assumes tlb_init() was already called. (wire_stupidity_into_tlb() calls local_flush_tlb_all()) MOMENCO_OCELOT_G: gt64240_time_init() assumes IRQ subsystem are already initialized. How about keeping board_time_init pointer as is and adding plat_clk_setup only for simple platforms? --- Atsushi Nemoto From anemo@mba.ocn.ne.jp Sat May 5 17:17:56 2007 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 05 May 2007 17:17:58 +0100 (BST) Received: from mba.ocn.ne.jp ([122.1.175.29]:216 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S20022580AbXEEQR4 (ORCPT ); Sat, 5 May 2007 17:17:56 +0100 Received: from localhost (p1094-ipad26funabasi.chiba.ocn.ne.jp [220.104.87.94]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 25266969E; Sun, 6 May 2007 01:16:28 +0900 (JST) Date: Sun, 06 May 2007 01:16:36 +0900 (JST) Message-Id: <20070506.011636.92588372.anemo@mba.ocn.ne.jp> To: vagabon.xyz@gmail.com Cc: ralf@linux-mips.org, linux-mips@linux-mips.org Subject: Re: [PATCH 2/3] time: replace board_time_init() by plat_clk_setup() From: Atsushi Nemoto In-Reply-To: <11782930063123-git-send-email-fbuihuu@gmail.com> References: <1178293006633-git-send-email-fbuihuu@gmail.com> <11782930063123-git-send-email-fbuihuu@gmail.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 5.2 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: 14967 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, 4 May 2007 17:36:45 +0200, Franck Bui-Huu wrote: > --- a/arch/mips/kernel/time.c > +++ b/arch/mips/kernel/time.c > @@ -239,21 +239,14 @@ asmlinkage void ll_local_timer_interrupt(int irq) > /* > * time_init() - it does the following things. > * > - * 1) board_time_init() - > - * a) (optional) set up RTC routines, > - * b) (optional) calibrate and set the mips_hpt_frequency > - * (only needed if you intended to use cpu counter as timer interrupt > - * source) > - * 2) setup xtime based on rtc_mips_get_time(). > - * 3) calculate a couple of cached variables for later usage > - * 4) plat_timer_setup() - > + * 1) setup xtime based on rtc_mips_get_time(). > + * 2) calculate a couple of cached variables for later usage > + * 3) plat_timer_setup() - > * a) (optional) over-write any choices made above by time_init(). > * b) machine specific code should setup the timer irqaction. > * c) enable the timer interrupt > */ > > -void (*board_time_init)(void); > - > unsigned int mips_hpt_frequency; > > static struct irqaction timer_irqaction = { As I wrote in another mail I think we can not remove board_time_init for now, but if you really removed it please update Documentation/mips/time.README too. --- Atsushi Nemoto From vagabon.xyz@gmail.com Mon May 7 09:51:23 2007 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 07 May 2007 09:51:27 +0100 (BST) Received: from nz-out-0506.google.com ([64.233.162.234]:43769 "EHLO nz-out-0506.google.com") by ftp.linux-mips.org with ESMTP id S20021969AbXEGIvX (ORCPT ); Mon, 7 May 2007 09:51:23 +0100 Received: by nz-out-0506.google.com with SMTP id x7so1593998nzc for ; Mon, 07 May 2007 01:50:22 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=Y++pxD+tD/TDeG6S0D/Lle5UsC/I74lqP3nZnUDKuf7qNCyCsh+0ITIDfUTqP+5KBLXZZ6lBQWDzpNIDenVPEYNUCLT9IlnJIderkpi/khah+QNZvrkkDhKmR79s+xtbz2ktaxqgsZW34ArbM1oolsenRp04qCSdgHmnxAzxgts= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=pGlGtz/GnMNjZcBfKt7Dc9VgzV5tXilILdISt8Q9qJIkKshXuCyHqQ2/DEGG9WGgbdn3SG3mUizwwmPux0WSfn0yzqjXsjvMGQN8fS154mep13qLAEyuI2LJUMk47Svw47hQTr9DwZB+k2DjglYGLI9ibA4U6AvgEsb5C8Yf2OU= Received: by 10.114.136.1 with SMTP id j1mr2055588wad.1178527820528; Mon, 07 May 2007 01:50:20 -0700 (PDT) Received: by 10.115.94.16 with HTTP; Mon, 7 May 2007 01:50:20 -0700 (PDT) Message-ID: Date: Mon, 7 May 2007 10:50:20 +0200 From: "Franck Bui-Huu" To: "Atsushi Nemoto" Subject: Re: [PATCH 2/3] time: replace board_time_init() by plat_clk_setup() Cc: ralf@linux-mips.org, linux-mips@linux-mips.org In-Reply-To: <20070506.010313.41199101.anemo@mba.ocn.ne.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <1178293006633-git-send-email-fbuihuu@gmail.com> <11782930063123-git-send-email-fbuihuu@gmail.com> <20070506.010313.41199101.anemo@mba.ocn.ne.jp> 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: 14968 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: vagabon.xyz@gmail.com Precedence: bulk X-list: linux-mips Hi Atsushi, On 5/5/07, Atsushi Nemoto wrote: > > Though providing plat_clk_setup() for timekeeping code might be a good > idea, I think your patch break at least those two platforms: > > MOMENCO_JAGUAR_ATX: momenco_time_init() assumes tlb_init() was already > called. (wire_stupidity_into_tlb() calls local_flush_tlb_all()) > Ok, but in this case it seems a bad use of time init hook: the platform seems to use its time init hook to setup the tlb. That sounds pretty hackish, isn't it ? If so, doesn't it mean that we should give the opportunity to platform's code to modify the tlb mapping properly ? Actually I had the same problem with mapped kernels and the only way to solve it was to hack tlb_init()... BTW, do you know why wire_stupidity_into_tlb() is called twice: one time in plat_mem_setup() and a second time in momenco_time_init() ? Note for the former case, tlb_init() hasn't been called yet... > MOMENCO_OCELOT_G: gt64240_time_init() assumes IRQ subsystem are > already initialized. > heh ? why not using plat_timer_setup() hook in this case ? > How about keeping board_time_init pointer as is and adding > plat_clk_setup only for simple platforms? > Not sure that would force us to duplicate all timekeeping stuff in time_init() hook because of several hacks. If this is really true, let's try to clean up some code. Thanks -- Franck From vagabon.xyz@gmail.com Mon May 7 09:52:18 2007 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 07 May 2007 09:52:20 +0100 (BST) Received: from wr-out-0506.google.com ([64.233.184.232]:35554 "EHLO wr-out-0506.google.com") by ftp.linux-mips.org with ESMTP id S20021969AbXEGIwS (ORCPT ); Mon, 7 May 2007 09:52:18 +0100 Received: by wr-out-0506.google.com with SMTP id q50so1540760wrq for ; Mon, 07 May 2007 01:51:17 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=Sy1WoHd9aDWCLegy0Pqr3py11INU6Gyt9vFDNme8Mjvow2ULdrc0hoM/GFnNMUa6ugJTB8TWUnjv5dsGqPdHFd2/mhXORPkuGO0hNpf49aKwGngFRYWpLMudpDfdJThfXyscvgtRlCygFTf6YK7PQ97TClSteuLixL5ibVRZxNo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=eBAYlLdDiggmi1R1C5GrQPOXxF+OFQLJz82dwCJOrtXiYSIr14+3gqy02+dOL1TYb8EobF7d0PcPTJa8QZRF7Z8iBNVDlJj4mGTt8CFKrv96ZqurYBqUHQMu6sZmnyRlhIh2wE68Ay0Fp78nvwqMH1jxstXlOmwMqhy8Ho5JqK0= Received: by 10.115.46.9 with SMTP id y9mr990947waj.1178527877426; Mon, 07 May 2007 01:51:17 -0700 (PDT) Received: by 10.115.94.16 with HTTP; Mon, 7 May 2007 01:51:17 -0700 (PDT) Message-ID: Date: Mon, 7 May 2007 10:51:17 +0200 From: "Franck Bui-Huu" To: "Atsushi Nemoto" Subject: Re: [PATCH 2/3] time: replace board_time_init() by plat_clk_setup() Cc: ralf@linux-mips.org, linux-mips@linux-mips.org In-Reply-To: <20070506.011636.92588372.anemo@mba.ocn.ne.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <1178293006633-git-send-email-fbuihuu@gmail.com> <11782930063123-git-send-email-fbuihuu@gmail.com> <20070506.011636.92588372.anemo@mba.ocn.ne.jp> 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: 14969 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: vagabon.xyz@gmail.com Precedence: bulk X-list: linux-mips On 5/5/07, Atsushi Nemoto wrote: > As I wrote in another mail I think we can not remove board_time_init > for now, but if you really removed it please update > Documentation/mips/time.README too. > Let see where this thread will lead us but in any cases I agree. -- Franck From anemo@mba.ocn.ne.jp Mon May 7 10:28:45 2007 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 07 May 2007 10:28:47 +0100 (BST) Received: from topsns2.toshiba-tops.co.jp ([202.230.225.126]:64226 "EHLO topsns2.toshiba-tops.co.jp") by ftp.linux-mips.org with ESMTP id S20021984AbXEGJ2p (ORCPT ); Mon, 7 May 2007 10:28:45 +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, 7 May 2007 18:28:43 +0900 Received: from topsms.toshiba-tops.co.jp (localhost.localdomain [127.0.0.1]) by localhost.toshiba-tops.co.jp (Postfix) with ESMTP id 105B24220B; Mon, 7 May 2007 18:28:38 +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 04FFD204C3; Mon, 7 May 2007 18:28:38 +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 l479SbW0068428; Mon, 7 May 2007 18:28:37 +0900 (JST) (envelope-from anemo@mba.ocn.ne.jp) Date: Mon, 07 May 2007 18:28:37 +0900 (JST) Message-Id: <20070507.182837.126143175.nemoto@toshiba-tops.co.jp> To: vagabon.xyz@gmail.com Cc: ralf@linux-mips.org, linux-mips@linux-mips.org Subject: Re: [PATCH 2/3] time: replace board_time_init() by plat_clk_setup() From: Atsushi Nemoto In-Reply-To: References: <11782930063123-git-send-email-fbuihuu@gmail.com> <20070506.010313.41199101.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 5.2 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: 14970 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, 7 May 2007 10:50:20 +0200, "Franck Bui-Huu" wrote: > > How about keeping board_time_init pointer as is and adding > > plat_clk_setup only for simple platforms? > > Not sure that would force us to duplicate all timekeeping stuff in > time_init() hook because of several hacks. If this is really true, > let's try to clean up some code. Well, I have not looked closer those hackish board_time_init functions yet. Maybe we can do the cleanups, but frankly, now I think it is a time for removal of them. Both boards have been listed on http://www.linux-mips.org/wiki/Category:Deprecated since Jun 2006. --- Atsushi Nemoto From vagabon.xyz@gmail.com Mon May 7 11:09:06 2007 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 07 May 2007 11:09:08 +0100 (BST) Received: from wr-out-0506.google.com ([64.233.184.224]:48216 "EHLO wr-out-0506.google.com") by ftp.linux-mips.org with ESMTP id S20021928AbXEGKJG (ORCPT ); Mon, 7 May 2007 11:09:06 +0100 Received: by wr-out-0506.google.com with SMTP id q50so1555911wrq for ; Mon, 07 May 2007 03:08:05 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=j0dAkv4fnT1g01eKe4/0j7u2jLnnlc6VtTpIXhrUJ0x3cO2/0oXwhSjfdPrFHCYzmVekX0eA0tfh20gZt2mbK6HXM9PEbHG+Hbphpn/3IV15+9n/xXYaPe+O/Yskbdd6pDg/Qx2RmxpRNmLeLhJA1aamtn1Jx0gB6TVkyixc61M= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=raAbReImDrvq6GS1qMrUQbOSRURo2Xo4ypbjyi0hsaVc9AVKCBXibKirGCWHhwT/StjaNYFoXQQqL/XuZvShAWrW+gzY/oLDpBw6UPM00ZN118giiu8HgOn06HBjNpzGp5X/WE2I0MzWfFTH1Je/D/cvk+BJn4fjFVnaiatgg8Q= Received: by 10.114.75.1 with SMTP id x1mr140829waa.1178532485029; Mon, 07 May 2007 03:08:05 -0700 (PDT) Received: by 10.115.94.16 with HTTP; Mon, 7 May 2007 03:08:04 -0700 (PDT) Message-ID: Date: Mon, 7 May 2007 12:08:04 +0200 From: "Franck Bui-Huu" To: "Atsushi Nemoto" Subject: Re: [PATCH 2/3] time: replace board_time_init() by plat_clk_setup() Cc: ralf@linux-mips.org, linux-mips@linux-mips.org In-Reply-To: <20070507.182837.126143175.nemoto@toshiba-tops.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <11782930063123-git-send-email-fbuihuu@gmail.com> <20070506.010313.41199101.anemo@mba.ocn.ne.jp> <20070507.182837.126143175.nemoto@toshiba-tops.co.jp> 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: 14971 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: vagabon.xyz@gmail.com Precedence: bulk X-list: linux-mips On 5/7/07, Atsushi Nemoto wrote: > > Well, I have not looked closer those hackish board_time_init functions > yet. Maybe we can do the cleanups, but frankly, now I think it is a > time for removal of them. > Amen. Unfortunately I don't know and don't have any idea if it's now a good thing to get rid of these 2 board supports... Maybe submitting a patch to linux-mips which does that could be a good start... Let's see... -- Franck From vagabon.xyz@gmail.com Mon May 7 12:09:26 2007 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 07 May 2007 12:09:28 +0100 (BST) Received: from wx-out-0506.google.com ([66.249.82.238]:6482 "EHLO wx-out-0506.google.com") by ftp.linux-mips.org with ESMTP id S20021936AbXEGLJ0 (ORCPT ); Mon, 7 May 2007 12:09:26 +0100 Received: by wx-out-0506.google.com with SMTP id s14so746125wxc for ; Mon, 07 May 2007 04:09:24 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:received:to:cc:subject:date:message-id:x-mailer:from; b=e9Ozlg3N9t0ZelpehxEXXoI3bsVUsrWzTXjVrtkZbcikBRtjFbJdh0jZU8mU9SnG+qGgeYD5kRkNgp4as52wfA9bgGA57slaEPFZgeGgD1gzRn3ZUK0y9jdvw33em6hbTCh97B/EvPqwk2LDkFLMs5mPmq5DUzP+eYNgdPEPqDg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:to:cc:subject:date:message-id:x-mailer:from; b=ZC01Um9s5tEdiAOqfVuy2AWPV+2ZtyrsgxuDT6XDQ2T+GexvaHj2yNxxcEZvU/+mB5RtptYGp2uRpzLs9wLUlTSZcPxBfToI5cRsqpYSAOiT66Fvg7hpXOn1mcbsi9GXp1J3XNBVJf8BNpTMWT4SNkwBriD0asWiE1ZsWpNqoSw= Received: by 10.90.63.16 with SMTP id l16mr4787601aga.1178536164513; Mon, 07 May 2007 04:09:24 -0700 (PDT) Received: from spoutnik.innova-card.com ( [81.252.61.1]) by mx.google.com with ESMTP id m6sm10187529wrm.2007.05.07.04.09.21; Mon, 07 May 2007 04:09:23 -0700 (PDT) Received: by spoutnik.innova-card.com (Postfix, from userid 500) id 32E9C23F76E; Mon, 7 May 2007 13:11:13 +0200 (CEST) To: ralf@linux-mips.org Cc: anemo@mba.ocn.ne.jp, linux-mips@linux-mips.org Subject: [RFC 0/3] Remove Momentum Jaguar and Ocelot G board supports Date: Mon, 7 May 2007 13:11:10 +0200 Message-Id: <11785362732731-git-send-email-fbuihuu@gmail.com> X-Mailer: git-send-email 1.5.1.3 From: Franck Bui-Huu 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: 14972 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: vagabon.xyz@gmail.com Precedence: bulk X-list: linux-mips Hi all, These 2 boards have several hacks that make them annoying to support. Specially when improving generic MIPS code. Since they're scheduled for removal since June 2006, it should be high time to get rid of them. Please consider, Franck --- arch/mips/Kconfig | 51 +-- arch/mips/Makefile | 20 - arch/mips/configs/jaguar-atx_defconfig | 897 --------------------- arch/mips/configs/ocelot_g_defconfig | 981 ----------------------- arch/mips/mm/highmem.c | 21 - arch/mips/mm/init.c | 3 - arch/mips/momentum/Kconfig | 6 - arch/mips/momentum/jaguar_atx/Makefile | 12 - arch/mips/momentum/jaguar_atx/dbg_io.c | 125 --- arch/mips/momentum/jaguar_atx/irq.c | 94 --- arch/mips/momentum/jaguar_atx/ja-console.c | 101 --- arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h | 54 -- arch/mips/momentum/jaguar_atx/platform.c | 208 ----- arch/mips/momentum/jaguar_atx/prom.c | 210 ----- arch/mips/momentum/jaguar_atx/reset.c | 56 -- arch/mips/momentum/jaguar_atx/setup.c | 475 ----------- arch/mips/momentum/ocelot_g/Makefile | 6 - arch/mips/momentum/ocelot_g/dbg_io.c | 121 --- arch/mips/momentum/ocelot_g/gt-irq.c | 212 ----- arch/mips/momentum/ocelot_g/irq.c | 101 --- arch/mips/momentum/ocelot_g/ocelot_pld.h | 30 - arch/mips/momentum/ocelot_g/prom.c | 84 -- arch/mips/momentum/ocelot_g/reset.c | 47 -- arch/mips/momentum/ocelot_g/setup.c | 267 ------ arch/mips/pci/Makefile | 2 - arch/mips/pci/fixup-jaguar.c | 43 - arch/mips/pci/fixup-ocelot-g.c | 37 - arch/mips/pci/pci-ocelot-g.c | 97 --- 28 files changed, 3 insertions(+), 4358 deletions(-) delete mode 100644 arch/mips/configs/jaguar-atx_defconfig delete mode 100644 arch/mips/configs/ocelot_g_defconfig delete mode 100644 arch/mips/momentum/Kconfig delete mode 100644 arch/mips/momentum/jaguar_atx/Makefile delete mode 100644 arch/mips/momentum/jaguar_atx/dbg_io.c delete mode 100644 arch/mips/momentum/jaguar_atx/irq.c delete mode 100644 arch/mips/momentum/jaguar_atx/ja-console.c delete mode 100644 arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h delete mode 100644 arch/mips/momentum/jaguar_atx/platform.c delete mode 100644 arch/mips/momentum/jaguar_atx/prom.c delete mode 100644 arch/mips/momentum/jaguar_atx/reset.c delete mode 100644 arch/mips/momentum/jaguar_atx/setup.c delete mode 100644 arch/mips/momentum/ocelot_g/Makefile delete mode 100644 arch/mips/momentum/ocelot_g/dbg_io.c delete mode 100644 arch/mips/momentum/ocelot_g/gt-irq.c delete mode 100644 arch/mips/momentum/ocelot_g/irq.c delete mode 100644 arch/mips/momentum/ocelot_g/ocelot_pld.h delete mode 100644 arch/mips/momentum/ocelot_g/prom.c delete mode 100644 arch/mips/momentum/ocelot_g/reset.c delete mode 100644 arch/mips/momentum/ocelot_g/setup.c delete mode 100644 arch/mips/pci/fixup-jaguar.c delete mode 100644 arch/mips/pci/fixup-ocelot-g.c delete mode 100644 arch/mips/pci/pci-ocelot-g.c From vagabon.xyz@gmail.com Mon May 7 12:09:48 2007 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 07 May 2007 12:09:52 +0100 (BST) Received: from wx-out-0506.google.com ([66.249.82.238]:6482 "EHLO wx-out-0506.google.com") by ftp.linux-mips.org with ESMTP id S20022026AbXEGLJa (ORCPT ); Mon, 7 May 2007 12:09:30 +0100 Received: by wx-out-0506.google.com with SMTP id s14so746125wxc for ; Mon, 07 May 2007 04:09:28 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:received:to:cc:subject:date:message-id:x-mailer:in-reply-to:references:from; b=e3XNEtIfFL+pPGtUiaNc3kdfFrJKsXddEImxlFSI6XQuLwm+y1zocHljdJpAQWacNyHm1ebFS/AVwoAskhF7DK39pfm9JhdaqkiwzTaSfQeQx7+5CcGSBPvGxaHnWYXk3PvW/vuvNVWtfXqvdyUZGNvWqdPAmHbkZEvslYW/qmA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:to:cc:subject:date:message-id:x-mailer:in-reply-to:references:from; b=Vo4Pg1dk8fEhb1c4XyD+m36B9rRwTypZafPUUZNIf55u97UDLTiyxX+//aCJNV0Mum91/Mw0i/kYcRuQ5sEYBiHbQ/fEJOyolUlPmDfZS9P+wZIwj3hkLtwS1jnd1lEAthY3cSxcOVJTqQxT06urF7vIIiHQBGV1H0Jsa65Pw6c= Received: by 10.90.116.6 with SMTP id o6mr1870345agc.1178536168606; Mon, 07 May 2007 04:09:28 -0700 (PDT) Received: from spoutnik.innova-card.com ( [81.252.61.1]) by mx.google.com with ESMTP id q57sm10146488wrq.2007.05.07.04.09.21; Mon, 07 May 2007 04:09:26 -0700 (PDT) Received: by spoutnik.innova-card.com (Postfix, from userid 500) id 634FF23F76F; Mon, 7 May 2007 13:11:13 +0200 (CEST) To: ralf@linux-mips.org Cc: anemo@mba.ocn.ne.jp, linux-mips@linux-mips.org Subject: [PATCH 1/3] Remove Momenco Ocelot G support Date: Mon, 7 May 2007 13:11:11 +0200 Message-Id: <1178536273551-git-send-email-fbuihuu@gmail.com> X-Mailer: git-send-email 1.5.1.3 In-Reply-To: <11785362732731-git-send-email-fbuihuu@gmail.com> References: <11785362732731-git-send-email-fbuihuu@gmail.com> From: Franck Bui-Huu 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: 14973 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: vagabon.xyz@gmail.com Precedence: bulk X-list: linux-mips From: Franck Bui-Huu Signed-off-by: Franck Bui-Huu --- arch/mips/Kconfig | 23 +- arch/mips/Makefile | 9 - arch/mips/configs/ocelot_g_defconfig | 981 ------------------------------ arch/mips/momentum/ocelot_g/Makefile | 6 - arch/mips/momentum/ocelot_g/dbg_io.c | 121 ---- arch/mips/momentum/ocelot_g/gt-irq.c | 212 ------- arch/mips/momentum/ocelot_g/irq.c | 101 --- arch/mips/momentum/ocelot_g/ocelot_pld.h | 30 - arch/mips/momentum/ocelot_g/prom.c | 84 --- arch/mips/momentum/ocelot_g/reset.c | 47 -- arch/mips/momentum/ocelot_g/setup.c | 267 -------- arch/mips/pci/Makefile | 1 - arch/mips/pci/fixup-ocelot-g.c | 37 -- arch/mips/pci/pci-ocelot-g.c | 97 --- 14 files changed, 3 insertions(+), 2013 deletions(-) delete mode 100644 arch/mips/configs/ocelot_g_defconfig delete mode 100644 arch/mips/momentum/ocelot_g/Makefile delete mode 100644 arch/mips/momentum/ocelot_g/dbg_io.c delete mode 100644 arch/mips/momentum/ocelot_g/gt-irq.c delete mode 100644 arch/mips/momentum/ocelot_g/irq.c delete mode 100644 arch/mips/momentum/ocelot_g/ocelot_pld.h delete mode 100644 arch/mips/momentum/ocelot_g/prom.c delete mode 100644 arch/mips/momentum/ocelot_g/reset.c delete mode 100644 arch/mips/momentum/ocelot_g/setup.c delete mode 100644 arch/mips/pci/fixup-ocelot-g.c delete mode 100644 arch/mips/pci/pci-ocelot-g.c diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 130d825..ab79b98 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -446,23 +446,6 @@ config MOMENCO_OCELOT_C The Ocelot is a MIPS-based Single Board Computer (SBC) made by Momentum Computer . -config MOMENCO_OCELOT_G - bool "Momentum Ocelot-G board" - select DMA_NONCOHERENT - select HW_HAS_PCI - select IRQ_CPU - select IRQ_CPU_RM7K - select PCI_MARVELL - select RM7000_CPU_SCACHE - select SWAP_IO_SPACE - select SYS_HAS_CPU_RM7000 - select SYS_SUPPORTS_32BIT_KERNEL - select SYS_SUPPORTS_64BIT_KERNEL if BROKEN - select SYS_SUPPORTS_BIG_ENDIAN - help - The Ocelot is a MIPS-based Single Board Computer (SBC) made by - Momentum Computer . - config MIPS_XXS1500 bool "MyCable XXS1500 board" select DMA_NONCOHERENT @@ -1080,9 +1063,9 @@ config WDT_RM9000 choice prompt "Galileo Chip Clock" #default SYSCLK_83 if MIPS_EV64120 - depends on MIPS_EV64120 || MOMENCO_OCELOT || MOMENCO_OCELOT_G + depends on MIPS_EV64120 || MOMENCO_OCELOT default SYSCLK_83 if MIPS_EV64120 - default SYSCLK_100 if MOMENCO_OCELOT || MOMENCO_OCELOT_G + default SYSCLK_100 if MOMENCO_OCELOT config SYSCLK_75 bool "75" if MIPS_EV64120 @@ -1091,7 +1074,7 @@ config SYSCLK_83 bool "83.3" if MIPS_EV64120 config SYSCLK_100 - bool "100" if MIPS_EV64120 || MOMENCO_OCELOT || MOMENCO_OCELOT_G + bool "100" if MIPS_EV64120 || MOMENCO_OCELOT endchoice diff --git a/arch/mips/Makefile b/arch/mips/Makefile index f2f742d..3e8a777 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -343,15 +343,6 @@ cflags-$(CONFIG_MOMENCO_OCELOT) += -Iinclude/asm-mips/mach-ocelot load-$(CONFIG_MOMENCO_OCELOT) += 0xffffffff80100000 # -# Momentum Ocelot-G board -# -# The Ocelot-G setup.o must be linked early - it does the ioremap() for the -# mips_io_port_base. -# -core-$(CONFIG_MOMENCO_OCELOT_G) += arch/mips/momentum/ocelot_g/ -load-$(CONFIG_MOMENCO_OCELOT_G) += 0xffffffff80100000 - -# # Momentum Ocelot-C and -CS boards # # The Ocelot-C[S] setup.o must be linked early - it does the ioremap() for the diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig deleted file mode 100644 index 7078e6b..0000000 --- a/arch/mips/configs/ocelot_g_defconfig +++ /dev/null @@ -1,981 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.20 -# Tue Feb 20 21:47:36 2007 -# -CONFIG_MIPS=y - -# -# Machine selection -# -CONFIG_ZONE_DMA=y -# 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_BASLER_EXCITE is not set -# CONFIG_MIPS_COBALT is not set -# CONFIG_MACH_DECSTATION is not set -# CONFIG_MIPS_EV64120 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_WR_PPMC 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=y -# CONFIG_MIPS_XXS1500 is not set -# CONFIG_PNX8550_JBS is not set -# CONFIG_PNX8550_STB810 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_MARKEINS is not set -# CONFIG_SGI_IP22 is not set -# CONFIG_SGI_IP27 is not set -# CONFIG_SGI_IP32 is not set -# CONFIG_SIBYTE_BIGSUR is not set -# 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_RM is not set -# CONFIG_TOSHIBA_JMR3927 is not set -# CONFIG_TOSHIBA_RBTX4927 is not set -# CONFIG_TOSHIBA_RBTX4938 is not set -CONFIG_RWSEM_GENERIC_SPINLOCK=y -# CONFIG_ARCH_HAS_ILOG2_U32 is not set -# CONFIG_ARCH_HAS_ILOG2_U64 is not set -CONFIG_GENERIC_FIND_NEXT_BIT=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_GENERIC_TIME=y -CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y -# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set -CONFIG_DMA_NONCOHERENT=y -CONFIG_DMA_NEED_PCI_MAP_STATE=y -CONFIG_CPU_BIG_ENDIAN=y -# CONFIG_CPU_LITTLE_ENDIAN is not set -CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y -CONFIG_IRQ_CPU=y -CONFIG_IRQ_CPU_RM7K=y -CONFIG_PCI_MARVELL=y -CONFIG_SWAP_IO_SPACE=y -# CONFIG_SYSCLK_75 is not set -# CONFIG_SYSCLK_83 is not set -CONFIG_SYSCLK_100=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=y -# CONFIG_CPU_RM9000 is not set -# CONFIG_CPU_SB1 is not set -CONFIG_SYS_HAS_CPU_RM7000=y -CONFIG_SYS_SUPPORTS_32BIT_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_BOARD_SCACHE=y -CONFIG_RM7000_CPU_SCACHE=y -CONFIG_CPU_HAS_PREFETCH=y -CONFIG_MIPS_MT_DISABLED=y -# CONFIG_MIPS_MT_SMP is not set -# CONFIG_MIPS_MT_SMTC is not set -# CONFIG_MIPS_VPE_LOADER is not set -# CONFIG_64BIT_PHYS_ADDR 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_RESOURCES_64BIT=y -CONFIG_ZONE_DMA_FLAG=1 -# 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 -# CONFIG_KEXEC is not set -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" - -# -# Code maturity level options -# -CONFIG_EXPERIMENTAL=y -CONFIG_BROKEN_ON_SMP=y -CONFIG_INIT_ENV_ARG_LIMIT=32 - -# -# General setup -# -CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -# CONFIG_IPC_NS is not set -CONFIG_SYSVIPC_SYSCTL=y -# CONFIG_POSIX_MQUEUE is not set -# CONFIG_BSD_PROCESS_ACCT is not set -# CONFIG_TASKSTATS is not set -# CONFIG_UTS_NS is not set -# CONFIG_AUDIT is not set -# CONFIG_IKCONFIG is not set -CONFIG_SYSFS_DEPRECATED=y -CONFIG_RELAY=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_SYSCTL=y -CONFIG_EMBEDDED=y -CONFIG_SYSCTL_SYSCALL=y -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_EXTRA_PASS is not set -CONFIG_HOTPLUG=y -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SHMEM=y -CONFIG_SLAB=y -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_RT_MUTEXES=y -# CONFIG_TINY_SHMEM is not set -CONFIG_BASE_SMALL=0 -# CONFIG_SLOB is not set - -# -# Loadable module support -# -# CONFIG_MODULES is not set - -# -# Block layer -# -CONFIG_BLOCK=y -# CONFIG_LBD is not set -# CONFIG_BLK_DEV_IO_TRACE is not set -CONFIG_LSF=y - -# -# 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_MMU=y - -# -# PCCARD (PCMCIA/CardBus) support -# -# CONFIG_PCCARD 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 - -# -# Power management options -# -CONFIG_PM=y -# CONFIG_PM_LEGACY is not set -# CONFIG_PM_DEBUG is not set -# CONFIG_PM_SYSFS_DEPRECATED is not set - -# -# Networking -# -CONFIG_NET=y - -# -# Networking options -# -# CONFIG_NETDEBUG is not set -# CONFIG_PACKET is not set -CONFIG_UNIX=y -CONFIG_XFRM=y -CONFIG_XFRM_USER=y -# CONFIG_XFRM_SUB_POLICY is not set -CONFIG_XFRM_MIGRATE=y -CONFIG_NET_KEY=y -CONFIG_NET_KEY_MIGRATE=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 is not set -# 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_XFRM_TUNNEL is not set -# CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_CUBIC=y -CONFIG_DEFAULT_TCP_CONG="cubic" -CONFIG_TCP_MD5SIG=y -# CONFIG_IPV6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -CONFIG_NETWORK_SECMARK=y -# CONFIG_NETFILTER is not set - -# -# DCCP Configuration (EXPERIMENTAL) -# -# CONFIG_IP_DCCP is not set - -# -# 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 -# 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_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=y -# CONFIG_IEEE80211_DEBUG is not set -CONFIG_IEEE80211_CRYPT_WEP=y -CONFIG_IEEE80211_CRYPT_CCMP=y -CONFIG_IEEE80211_SOFTMAC=y -# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set -CONFIG_WIRELESS_EXT=y - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=y -# CONFIG_SYS_HYPERVISOR is not set - -# -# Connector - unified userspace <-> kernelspace linker -# -CONFIG_CONNECTOR=y -CONFIG_PROC_EVENTS=y - -# -# Memory Technology Devices (MTD) -# -# CONFIG_MTD is not set - -# -# Parallel port support -# -# CONFIG_PARPORT is not set - -# -# Plug and Play support -# -# CONFIG_PNPACPI is not set - -# -# 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 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_INITRD is not set -CONFIG_CDROM_PKTCDVD=y -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set -CONFIG_ATA_OVER_ETH=y - -# -# Misc devices -# -CONFIG_SGI_IOC4=y -# CONFIG_TIFM_CORE is not set - -# -# ATA/ATAPI/MFM/RLL support -# -# CONFIG_IDE is not set - -# -# SCSI device support -# -CONFIG_RAID_ATTRS=y -# CONFIG_SCSI is not set -# CONFIG_SCSI_NETLINK is not set - -# -# Serial ATA (prod) and Parallel ATA (experimental) drivers -# -# CONFIG_ATA 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=y - -# -# MII PHY device drivers -# -CONFIG_MARVELL_PHY=y -CONFIG_DAVICOM_PHY=y -CONFIG_QSEMI_PHY=y -CONFIG_LXT_PHY=y -CONFIG_CICADA_PHY=y -CONFIG_VITESSE_PHY=y -CONFIG_SMSC_PHY=y -# CONFIG_BROADCOM_PHY is not set -# CONFIG_FIXED_PHY is not set - -# -# Ethernet (10 or 100Mbit) -# -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_GALILEO_64240_ETH=y -# CONFIG_HAPPYMEAL is not set -# CONFIG_SUNGEM is not set -# CONFIG_CASSINI is not set -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_DM9000 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_SIS190 is not set -# CONFIG_SKGE is not set -# CONFIG_SKY2 is not set -# CONFIG_SK98LIN is not set -# CONFIG_TIGON3 is not set -# CONFIG_BNX2 is not set -CONFIG_QLA3XXX=y -# CONFIG_ATL1 is not set - -# -# Ethernet (10000 Mbit) -# -# CONFIG_CHELSIO_T1 is not set -CONFIG_CHELSIO_T3=y -# CONFIG_IXGB is not set -# CONFIG_S2IO is not set -# CONFIG_MYRI10GE is not set -CONFIG_NETXEN_NIC=y - -# -# 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_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=y -# CONFIG_INPUT_FF_MEMLESS is not set - -# -# 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_JOYDEV is not set -# CONFIG_INPUT_TSDEV is not set -# CONFIG_INPUT_EVDEV is not set -# CONFIG_INPUT_EVBUG is not set - -# -# Input Device Drivers -# -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_MISC 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=y -# CONFIG_GAMEPORT is not set - -# -# Character devices -# -CONFIG_VT=y -CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_SERIAL_NONSTANDARD is not set - -# -# Serial drivers -# -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -# CONFIG_SERIAL_8250_EXTENDED is not set - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -# 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_HW_RANDOM is not set -# CONFIG_RTC is not set -# CONFIG_GEN_RTC is not set -# CONFIG_DTLK is not set -# CONFIG_R3964 is not set -# CONFIG_APPLICOM is not set -# CONFIG_DRM is not set -# CONFIG_RAW_DRIVER is not set - -# -# TPM devices -# -# CONFIG_TCG_TPM is not set - -# -# I2C support -# -# CONFIG_I2C is not set - -# -# SPI support -# -# CONFIG_SPI is not set -# CONFIG_SPI_MASTER is not set - -# -# Dallas's 1-wire bus -# -# CONFIG_W1 is not set - -# -# Hardware Monitoring support -# -# CONFIG_HWMON is not set -# CONFIG_HWMON_VID is not set - -# -# Multimedia devices -# -# CONFIG_VIDEO_DEV is not set - -# -# Digital Video Broadcasting Devices -# -# CONFIG_DVB is not set - -# -# Graphics support -# -# CONFIG_FIRMWARE_EDID is not set -# CONFIG_FB is not set - -# -# Console display driver support -# -# CONFIG_VGA_CONSOLE is not set -CONFIG_DUMMY_CONSOLE=y -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set - -# -# Sound -# -# CONFIG_SOUND is not set - -# -# HID Devices -# -# CONFIG_HID is not set - -# -# USB support -# -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB_ARCH_HAS_EHCI=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 - -# -# LED devices -# -# CONFIG_NEW_LEDS is not set - -# -# LED drivers -# - -# -# LED Triggers -# - -# -# InfiniBand support -# -# CONFIG_INFINIBAND is not set - -# -# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) -# - -# -# Real Time Clock -# -# CONFIG_RTC_CLASS is not set - -# -# DMA Engine support -# -# CONFIG_DMA_ENGINE is not set - -# -# DMA Clients -# - -# -# DMA Devices -# - -# -# Auxiliary Display support -# - -# -# Virtualization -# - -# -# File systems -# -CONFIG_EXT2_FS=y -# CONFIG_EXT2_FS_XATTR is not set -# CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set -# CONFIG_EXT4DEV_FS is not set -# CONFIG_REISERFS_FS is not set -# CONFIG_JFS_FS is not set -CONFIG_FS_POSIX_ACL=y -# CONFIG_XFS_FS is not set -# CONFIG_GFS2_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_INOTIFY_USER=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 -CONFIG_GENERIC_ACL=y - -# -# CD-ROM/DVD Filesystems -# -# CONFIG_ISO9660_FS is not set -# CONFIG_UDF_FS is not set - -# -# DOS/FAT/NT Filesystems -# -# CONFIG_MSDOS_FS is not set -# CONFIG_VFAT_FS is not set -# CONFIG_NTFS_FS is not set - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_KCORE=y -CONFIG_PROC_SYSCTL=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -# CONFIG_HUGETLB_PAGE is not set -CONFIG_RAMFS=y -CONFIG_CONFIGFS_FS=y - -# -# Miscellaneous filesystems -# -# CONFIG_ADFS_FS is not set -# CONFIG_AFFS_FS is not set -# CONFIG_ECRYPT_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 is not set -# CONFIG_NFS_V4 is not set -# CONFIG_NFS_DIRECTIO is not set -CONFIG_NFSD=y -# CONFIG_NFSD_V3 is not set -# CONFIG_NFSD_TCP is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y -CONFIG_EXPORTFS=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 is not set - -# -# Distributed Lock Manager -# -CONFIG_DLM=y -CONFIG_DLM_TCP=y -# CONFIG_DLM_SCTP is not set -# CONFIG_DLM_DEBUG is not set - -# -# Profiling support -# -# CONFIG_PROFILING is not set - -# -# Kernel hacking -# -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set -CONFIG_ENABLE_MUST_CHECK=y -# CONFIG_MAGIC_SYSRQ is not set -# CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_DEBUG_FS is not set -# CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_KERNEL is not set -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_CROSSCOMPILE=y -CONFIG_CMDLINE="" - -# -# Security options -# -CONFIG_KEYS=y -CONFIG_KEYS_DEBUG_PROC_KEYS=y -# CONFIG_SECURITY is not set - -# -# Cryptographic options -# -CONFIG_CRYPTO=y -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_XCBC=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=y -CONFIG_CRYPTO_TGR192=y -CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_PCBC=y -CONFIG_CRYPTO_LRW=y -CONFIG_CRYPTO_DES=y -CONFIG_CRYPTO_FCRYPT=y -CONFIG_CRYPTO_BLOWFISH=y -CONFIG_CRYPTO_TWOFISH=y -CONFIG_CRYPTO_TWOFISH_COMMON=y -CONFIG_CRYPTO_SERPENT=y -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_CAST5=y -CONFIG_CRYPTO_CAST6=y -CONFIG_CRYPTO_TEA=y -CONFIG_CRYPTO_ARC4=y -CONFIG_CRYPTO_KHAZAD=y -CONFIG_CRYPTO_ANUBIS=y -CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_MICHAEL_MIC=y -CONFIG_CRYPTO_CRC32C=y -CONFIG_CRYPTO_CAMELLIA=y - -# -# Hardware crypto devices -# - -# -# Library routines -# -CONFIG_BITREVERSE=y -# CONFIG_CRC_CCITT is not set -CONFIG_CRC16=y -CONFIG_CRC32=y -CONFIG_LIBCRC32C=y -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y -CONFIG_PLIST=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y diff --git a/arch/mips/momentum/ocelot_g/Makefile b/arch/mips/momentum/ocelot_g/Makefile deleted file mode 100644 index c0a0030..0000000 --- a/arch/mips/momentum/ocelot_g/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# -# Makefile for Momentum Computer's Ocelot-G board. -# - -obj-y += irq.o gt-irq.o prom.o reset.o setup.o -obj-$(CONFIG_KGDB) += dbg_io.o diff --git a/arch/mips/momentum/ocelot_g/dbg_io.c b/arch/mips/momentum/ocelot_g/dbg_io.c deleted file mode 100644 index 32d6fb4..0000000 --- a/arch/mips/momentum/ocelot_g/dbg_io.c +++ /dev/null @@ -1,121 +0,0 @@ - -#include /* For the serial port location and base baud */ - -/* --- CONFIG --- */ - -typedef unsigned char uint8; -typedef unsigned int uint32; - -/* --- END OF CONFIG --- */ - -#define UART16550_BAUD_2400 2400 -#define UART16550_BAUD_4800 4800 -#define UART16550_BAUD_9600 9600 -#define UART16550_BAUD_19200 19200 -#define UART16550_BAUD_38400 38400 -#define UART16550_BAUD_57600 57600 -#define UART16550_BAUD_115200 115200 - -#define UART16550_PARITY_NONE 0 -#define UART16550_PARITY_ODD 0x08 -#define UART16550_PARITY_EVEN 0x18 -#define UART16550_PARITY_MARK 0x28 -#define UART16550_PARITY_SPACE 0x38 - -#define UART16550_DATA_5BIT 0x0 -#define UART16550_DATA_6BIT 0x1 -#define UART16550_DATA_7BIT 0x2 -#define UART16550_DATA_8BIT 0x3 - -#define UART16550_STOP_1BIT 0x0 -#define UART16550_STOP_2BIT 0x4 - -/* ----------------------------------------------------- */ - -/* === CONFIG === */ - -/* [jsun] we use the second serial port for kdb */ -#define BASE OCELOT_SERIAL1_BASE -#define MAX_BAUD OCELOT_BASE_BAUD - -/* === END OF CONFIG === */ - -#define REG_OFFSET 4 - -/* register offset */ -#define OFS_RCV_BUFFER 0 -#define OFS_TRANS_HOLD 0 -#define OFS_SEND_BUFFER 0 -#define OFS_INTR_ENABLE (1*REG_OFFSET) -#define OFS_INTR_ID (2*REG_OFFSET) -#define OFS_DATA_FORMAT (3*REG_OFFSET) -#define OFS_LINE_CONTROL (3*REG_OFFSET) -#define OFS_MODEM_CONTROL (4*REG_OFFSET) -#define OFS_RS232_OUTPUT (4*REG_OFFSET) -#define OFS_LINE_STATUS (5*REG_OFFSET) -#define OFS_MODEM_STATUS (6*REG_OFFSET) -#define OFS_RS232_INPUT (6*REG_OFFSET) -#define OFS_SCRATCH_PAD (7*REG_OFFSET) - -#define OFS_DIVISOR_LSB (0*REG_OFFSET) -#define OFS_DIVISOR_MSB (1*REG_OFFSET) - - -/* memory-mapped read/write of the port */ -#define UART16550_READ(y) (*((volatile uint8*)(BASE + y))) -#define UART16550_WRITE(y, z) ((*((volatile uint8*)(BASE + y))) = z) - -void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop) -{ - /* disable interrupts */ - UART16550_WRITE(OFS_INTR_ENABLE, 0); - - /* set up baud rate */ - { - uint32 divisor; - - /* set DIAB bit */ - UART16550_WRITE(OFS_LINE_CONTROL, 0x80); - - /* set divisor */ - divisor = MAX_BAUD / baud; - UART16550_WRITE(OFS_DIVISOR_LSB, divisor & 0xff); - UART16550_WRITE(OFS_DIVISOR_MSB, (divisor & 0xff00) >> 8); - - /* clear DIAB bit */ - UART16550_WRITE(OFS_LINE_CONTROL, 0x0); - } - - /* set data format */ - UART16550_WRITE(OFS_DATA_FORMAT, data | parity | stop); -} - -static int remoteDebugInitialized = 0; - -uint8 getDebugChar(void) -{ - if (!remoteDebugInitialized) { - remoteDebugInitialized = 1; - debugInit(UART16550_BAUD_38400, - UART16550_DATA_8BIT, - UART16550_PARITY_NONE, UART16550_STOP_1BIT); - } - - while ((UART16550_READ(OFS_LINE_STATUS) & 0x1) == 0); - return UART16550_READ(OFS_RCV_BUFFER); -} - - -int putDebugChar(uint8 byte) -{ - if (!remoteDebugInitialized) { - remoteDebugInitialized = 1; - debugInit(UART16550_BAUD_38400, - UART16550_DATA_8BIT, - UART16550_PARITY_NONE, UART16550_STOP_1BIT); - } - - while ((UART16550_READ(OFS_LINE_STATUS) & 0x20) == 0); - UART16550_WRITE(OFS_SEND_BUFFER, byte); - return 1; -} diff --git a/arch/mips/momentum/ocelot_g/gt-irq.c b/arch/mips/momentum/ocelot_g/gt-irq.c deleted file mode 100644 index e5576bd..0000000 --- a/arch/mips/momentum/ocelot_g/gt-irq.c +++ /dev/null @@ -1,212 +0,0 @@ -/* - * - * Copyright 2002 Momentum Computer - * Author: mdharm@momenco.com - * - * arch/mips/momentum/ocelot_g/gt_irq.c - * Interrupt routines for gt64240. Currently it only handles timer irq. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - */ -#include -#include -#include -#include -#include -#include -#include - -unsigned long bus_clock; - -/* - * These are interrupt handlers for the GT on-chip interrupts. They - * all come in to the MIPS on a single interrupt line, and have to - * be handled and ack'ed differently than other MIPS interrupts. - */ - -#if 0 - -struct tq_struct irq_handlers[MAX_CAUSE_REGS][MAX_CAUSE_REG_WIDTH]; -void hook_irq_handler(int int_cause, int bit_num, void *isr_ptr); - -/* - * Hooks IRQ handler to the system. When the system is interrupted - * the interrupt service routine is called. - * - * Inputs : - * int_cause - The interrupt cause number. In EVB64120 two parameters - * are declared, INT_CAUSE_MAIN and INT_CAUSE_HIGH. - * bit_num - Indicates which bit number in the cause register - * isr_ptr - Pointer to the interrupt service routine - */ -void hook_irq_handler(int int_cause, int bit_num, void *isr_ptr) -{ - irq_handlers[int_cause][bit_num].routine = isr_ptr; -} - - -/* - * Enables the IRQ on Galileo Chip - * - * Inputs : - * int_cause - The interrupt cause number. In EVB64120 two parameters - * are declared, INT_CAUSE_MAIN and INT_CAUSE_HIGH. - * bit_num - Indicates which bit number in the cause register - * - * Outputs : - * 1 if successful, 0 if failure - */ -int enable_galileo_irq(int int_cause, int bit_num) -{ - if (int_cause == INT_CAUSE_MAIN) - SET_REG_BITS(CPU_INTERRUPT_MASK_REGISTER, (1 << bit_num)); - else if (int_cause == INT_CAUSE_HIGH) - SET_REG_BITS(CPU_HIGH_INTERRUPT_MASK_REGISTER, - (1 << bit_num)); - else - return 0; - - return 1; -} - -/* - * Disables the IRQ on Galileo Chip - * - * Inputs : - * int_cause - The interrupt cause number. In EVB64120 two parameters - * are declared, INT_CAUSE_MAIN and INT_CAUSE_HIGH. - * bit_num - Indicates which bit number in the cause register - * - * Outputs : - * 1 if successful, 0 if failure - */ -int disable_galileo_irq(int int_cause, int bit_num) -{ - if (int_cause == INT_CAUSE_MAIN) - RESET_REG_BITS(CPU_INTERRUPT_MASK_REGISTER, - (1 << bit_num)); - else if (int_cause == INT_CAUSE_HIGH) - RESET_REG_BITS(CPU_HIGH_INTERRUPT_MASK_REGISTER, - (1 << bit_num)); - else - return 0; - return 1; -} -#endif /* 0 */ - -/* - * Interrupt handler for interrupts coming from the Galileo chip via P0_INT#. - * - * We route the timer interrupt to P0_INT# (IRQ 6), and that's all this - * routine can handle, for now. - * - * In the future, we'll route more interrupts to this pin, and that's why - * we keep this particular structure in the function. - */ - -static irqreturn_t gt64240_p0int_irq(int irq, void *dev) -{ - uint32_t irq_src, irq_src_mask; - int handled; - - /* get the low interrupt cause register */ - irq_src = MV_READ(LOW_INTERRUPT_CAUSE_REGISTER); - - /* get the mask register for this pin */ - irq_src_mask = MV_READ(PCI_0INTERRUPT_CAUSE_MASK_REGISTER_LOW); - - /* mask off only the interrupts we're interested in */ - irq_src = irq_src & irq_src_mask; - - handled = IRQ_NONE; - - /* Check for timer interrupt */ - if (irq_src & 0x00000100) { - handled = IRQ_HANDLED; - irq_src &= ~0x00000100; - - /* Clear any pending cause bits */ - MV_WRITE(TIMER_COUNTER_0_3_INTERRUPT_CAUSE, 0x0); - - /* handle the timer call */ - do_timer(1); -#ifndef CONFIG_SMP - update_process_times(user_mode(get_irq_regs())); -#endif - } - - if (irq_src) { - printk(KERN_INFO - "UNKNOWN P0_INT# interrupt received, irq_src=0x%x\n", - irq_src); - } - - return handled; -} - -/* - * Initializes timer using galileo's built in timer. - */ - -/* - * This will ignore the standard MIPS timer interrupt handler - * that is passed in as *irq (=irq0 in ../kernel/time.c). - * We will do our own timer interrupt handling. - */ -void gt64240_time_init(void) -{ - static struct irqaction timer; - - /* Stop the timer -- we'll use timer #0 */ - MV_WRITE(TIMER_COUNTER_0_3_CONTROL, 0x0); - - /* Load timer value for 100 Hz */ - MV_WRITE(TIMER_COUNTER0, bus_clock / 100); - - /* - * Create the IRQ structure entry for the timer. Since we're too early - * in the boot process to use the "request_irq()" call, we'll hard-code - * the values to the correct interrupt line. - */ - timer.handler = >64240_p0int_irq; - timer.flags = IRQF_SHARED | IRQF_DISABLED; - timer.name = "timer"; - timer.dev_id = NULL; - timer.next = NULL; - timer.mask = CPU_MASK_NONE; - irq_desc[6].action = &timer; - - enable_irq(6); - - /* Clear any pending cause bits */ - MV_WRITE(TIMER_COUNTER_0_3_INTERRUPT_CAUSE, 0x0); - - /* Enable the interrupt for timer 0 */ - MV_WRITE(TIMER_COUNTER_0_3_INTERRUPT_MASK, 0x1); - - /* Enable the timer interrupt for GT-64240 pin P0_INT# */ - MV_WRITE (PCI_0INTERRUPT_CAUSE_MASK_REGISTER_LOW, 0x100); - - /* Configure and start the timer */ - MV_WRITE(TIMER_COUNTER_0_3_CONTROL, 0x3); -} - -void gt64240_irq_init(void) -{ -#if 0 - int i, j; - - /* Reset irq handlers pointers to NULL */ - for (i = 0; i < MAX_CAUSE_REGS; i++) { - for (j = 0; j < MAX_CAUSE_REG_WIDTH; j++) { - irq_handlers[i][j].next = NULL; - irq_handlers[i][j].sync = 0; - irq_handlers[i][j].routine = NULL; - irq_handlers[i][j].data = NULL; - } - } -#endif /* 0 */ -} diff --git a/arch/mips/momentum/ocelot_g/irq.c b/arch/mips/momentum/ocelot_g/irq.c deleted file mode 100644 index 273541f..0000000 --- a/arch/mips/momentum/ocelot_g/irq.c +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (C) 2000 RidgeRun, Inc. - * Author: RidgeRun, Inc. - * glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com - * - * Copyright 2001 MontaVista Software Inc. - * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net - * Copyright (C) 2000, 01, 05 Ralf Baechle (ralf@linux-mips.org) - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -asmlinkage void plat_irq_dispatch(void) -{ - unsigned int pending = read_c0_cause() & read_c0_status(); - - if (pending & STATUSF_IP2) - do_IRQ(2); - else if (pending & STATUSF_IP3) - do_IRQ(3); - else if (pending & STATUSF_IP4) - do_IRQ(4); - else if (pending & STATUSF_IP5) - do_IRQ(5); - else if (pending & STATUSF_IP6) - do_IRQ(6); - else if (pending & STATUSF_IP7) - do_IRQ(7); - else { - /* - * Now look at the extended interrupts - */ - pending = (read_c0_cause() & (read_c0_intcontrol() << 8)) >> 16; - - if (pending & STATUSF_IP8) - do_IRQ(8); - else if (pending & STATUSF_IP9) - do_IRQ(9); - else if (pending & STATUSF_IP10) - do_IRQ(10); - else if (pending & STATUSF_IP11) - do_IRQ(11); - else - spurious_interrupt(); - } -} - -extern void gt64240_irq_init(void); - -void __init arch_init_irq(void) -{ - /* - * Clear all of the interrupts while we change the able around a bit. - * int-handler is not on bootstrap - */ - clear_c0_status(ST0_IM); - local_irq_disable(); - - mips_cpu_irq_init(); - rm7k_cpu_irq_init(); - - gt64240_irq_init(); -} diff --git a/arch/mips/momentum/ocelot_g/ocelot_pld.h b/arch/mips/momentum/ocelot_g/ocelot_pld.h deleted file mode 100644 index 95e0534..0000000 --- a/arch/mips/momentum/ocelot_g/ocelot_pld.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Ocelot Board Register Definitions - * - * (C) 2001 Red Hat, Inc. - * - * GPL'd - */ -#ifndef __MOMENCO_OCELOT_PLD_H__ -#define __MOMENCO_OCELOT_PLD_H__ - -#define OCELOT_CS0_ADDR (0xfc000000) - -#define OCELOT_REG_BOARDREV (0) -#define OCELOT_REG_PLD1_ID (1) -#define OCELOT_REG_PLD2_ID (2) -#define OCELOT_REG_RESET_STATUS (3) -#define OCELOT_REG_BOARD_STATUS (4) -#define OCELOT_REG_CPCI_ID (5) -#define OCELOT_REG_I2C_CTRL (8) -#define OCELOT_REG_EEPROM_MODE (9) -#define OCELOT_REG_INTMASK (10) -#define OCELOT_REG_INTSTATUS (11) -#define OCELOT_REG_INTSET (12) -#define OCELOT_REG_INTCLR (13) - -#define __PLD_REG_TO_ADDR(reg) ((void *) OCELOT_CS0_ADDR + OCELOT_REG_##reg) -#define OCELOT_PLD_WRITE(x, reg) writeb(x, __PLD_REG_TO_ADDR(reg)) -#define OCELOT_PLD_READ(reg) readb(__PLD_REG_TO_ADDR(reg)) - -#endif /* __MOMENCO_OCELOT_PLD_H__ */ diff --git a/arch/mips/momentum/ocelot_g/prom.c b/arch/mips/momentum/ocelot_g/prom.c deleted file mode 100644 index 836d083..0000000 --- a/arch/mips/momentum/ocelot_g/prom.c +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2002 Momentum Computer Inc. - * Author: Matthew Dharm - * - * Based on Ocelot Linux port, which is - * Copyright 2001 MontaVista Software Inc. - * Author: jsun@mvista.com or jsun@junsun.net - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - */ -#include -#include -#include -#include - -#include -#include -#include -#include - -#include "ocelot_pld.h" - -struct callvectors* debug_vectors; - -extern unsigned long marvell_base; -extern unsigned long bus_clock; - -#ifdef CONFIG_GALILEO_GT64240_ETH -extern unsigned char prom_mac_addr_base[6]; -#endif - -const char *get_system_type(void) -{ - return "Momentum Ocelot"; -} - -void __init prom_init(void) -{ - int argc = fw_arg0; - char **arg = (char **) fw_arg1; - char **env = (char **) fw_arg2; - struct callvectors *cv = (struct callvectors *) fw_arg3; - int i; - - /* save the PROM vectors for debugging use */ - debug_vectors = cv; - - /* arg[0] is "g", the rest is boot parameters */ - arcs_cmdline[0] = '\0'; - for (i = 1; i < argc; i++) { - if (strlen(arcs_cmdline) + strlen(arg[i] + 1) - >= sizeof(arcs_cmdline)) - break; - strcat(arcs_cmdline, arg[i]); - strcat(arcs_cmdline, " "); - } - - mips_machgroup = MACH_GROUP_MOMENCO; - mips_machtype = MACH_MOMENCO_OCELOT_G; - -#ifdef CONFIG_GALILEO_GT64240_ETH - /* get the base MAC address for on-board ethernet ports */ - memcpy(prom_mac_addr_base, (void*)0xfc807cf2, 6); -#endif - - while (*env) { - if (strncmp("gtbase", *env, strlen("gtbase")) == 0) { - marvell_base = simple_strtol(*env + strlen("gtbase="), - NULL, 16); - } - if (strncmp("busclock", *env, strlen("busclock")) == 0) { - bus_clock = simple_strtol(*env + strlen("busclock="), - NULL, 10); - } - env++; - } -} - -void __init prom_free_prom_memory(void) -{ -} diff --git a/arch/mips/momentum/ocelot_g/reset.c b/arch/mips/momentum/ocelot_g/reset.c deleted file mode 100644 index 3fd499a..0000000 --- a/arch/mips/momentum/ocelot_g/reset.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * Copyright (C) 1997, 2001 Ralf Baechle - * Copyright 2001 MontaVista Software Inc. - * Author: jsun@mvista.com or jsun@junsun.net - */ -#include -#include -#include -#include -#include -#include -#include -#include - -void momenco_ocelot_restart(char *command) -{ - void *nvram = ioremap_nocache(0x2c807000, 0x1000); - - if (!nvram) { - printk(KERN_NOTICE "ioremap of reset register failed\n"); - return; - } - writeb(0x84, nvram + 0xff7); /* Ask the NVRAM/RTC/watchdog chip to - assert reset in 1/16 second */ - mdelay(10+(1000/16)); - iounmap(nvram); - printk(KERN_NOTICE "Watchdog reset failed\n"); -} - -void momenco_ocelot_halt(void) -{ - printk(KERN_NOTICE "\n** You can safely turn off the power\n"); - while (1) - __asm__(".set\tmips3\n\t" - "wait\n\t" - ".set\tmips0"); -} - -void momenco_ocelot_power_off(void) -{ - momenco_ocelot_halt(); -} diff --git a/arch/mips/momentum/ocelot_g/setup.c b/arch/mips/momentum/ocelot_g/setup.c deleted file mode 100644 index 9db638a..0000000 --- a/arch/mips/momentum/ocelot_g/setup.c +++ /dev/null @@ -1,267 +0,0 @@ -/* - * BRIEF MODULE DESCRIPTION - * Momentum Computer Ocelot-G (CP7000G) - board dependent boot routines - * - * Copyright (C) 1996, 1997, 2001 Ralf Baechle - * Copyright (C) 2000 RidgeRun, Inc. - * Copyright (C) 2001 Red Hat, Inc. - * Copyright (C) 2002 Momentum Computer - * - * Author: Matthew Dharm, Momentum Computer - * mdharm@momenco.com - * - * Author: RidgeRun, Inc. - * glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com - * - * Copyright 2001 MontaVista Software Inc. - * Author: jsun@mvista.com or jsun@junsun.net - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "ocelot_pld.h" - -#ifdef CONFIG_GALILEO_GT64240_ETH -extern unsigned char prom_mac_addr_base[6]; -#endif - -unsigned long marvell_base; - -/* These functions are used for rebooting or halting the machine*/ -extern void momenco_ocelot_restart(char *command); -extern void momenco_ocelot_halt(void); -extern void momenco_ocelot_power_off(void); - -extern void gt64240_time_init(void); -extern void momenco_ocelot_irq_setup(void); - -static char reset_reason; - -static unsigned long ENTRYLO(unsigned long paddr) -{ - return ((paddr & PAGE_MASK) | - (_PAGE_PRESENT | __READABLE | __WRITE