From vagabon.xyz@gmail.com Fri Dec 1 09:40:53 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 09:40:58 +0000 (GMT) Received: from ug-out-1314.google.com ([66.249.92.172]:52778 "EHLO ug-out-1314.google.com") by ftp.linux-mips.org with ESMTP id S20037860AbWLAJkx (ORCPT ); Fri, 1 Dec 2006 09:40:53 +0000 Received: by ug-out-1314.google.com with SMTP id 40so2560184uga for ; Fri, 01 Dec 2006 01:40:53 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:cc:mime-version:content-type:content-transfer-encoding:content-disposition; b=htNn/jqLzg6aKMBFrh4x0Ek/xMhkjbreJbPmd+mc766S0wfNQBhoPYzhD824Z4c8+j3t2qoPCyX/7XhxGHgMvQeGobVovbduGXQqpbwL0q2APL1wuVoj4X6uQpYRQBkMyJ/4XUA3PTNzZ8D+zbxWTHtXzzix3VfMkQosUYu13lo= Received: by 10.78.83.13 with SMTP id g13mr4620878hub.1164966052368; Fri, 01 Dec 2006 01:40:52 -0800 (PST) Received: by 10.78.124.19 with HTTP; Fri, 1 Dec 2006 01:40:52 -0800 (PST) Message-ID: Date: Fri, 1 Dec 2006 10:40:52 +0100 From: "Franck Bui-Huu" To: "Atsushi Nemoto" Subject: Is _do_IRQ() not needed anymore ? Cc: linux-mips MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 13281 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 Atsushi, First thanks for your work on irq cleanup. Now it seems that __do_IRQ() is not needed anymore. I dunno if it's true for all platforms though. Does something like this make sense for example ? -- >8 -- diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 5ff94e5..a4c5306 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -913,8 +913,13 @@ config SYS_SUPPORTS_BIG_ENDIAN config SYS_SUPPORTS_LITTLE_ENDIAN bool +config GENERIC_HARDIRQS_NO__DO_IRQ + bool + default n + config IRQ_CPU bool + select GENERIC_HARDIRQS_NO__DO_IRQ config IRQ_CPU_RM7K bool -- Franck From anemo@mba.ocn.ne.jp Fri Dec 1 09:57:48 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 09:57:52 +0000 (GMT) Received: from topsns2.toshiba-tops.co.jp ([202.230.225.126]:11025 "EHLO topsns2.toshiba-tops.co.jp") by ftp.linux-mips.org with ESMTP id S20037861AbWLAJ5s (ORCPT ); Fri, 1 Dec 2006 09:57:48 +0000 Received: from topsms.toshiba-tops.co.jp by topsns2.toshiba-tops.co.jp via smtpd (for ftp.linux-mips.org [194.74.144.162]) with ESMTP; Fri, 1 Dec 2006 18:57:47 +0900 Received: from topsms.toshiba-tops.co.jp (localhost.localdomain [127.0.0.1]) by localhost.toshiba-tops.co.jp (Postfix) with ESMTP id 9CEFE25786; Fri, 1 Dec 2006 18:57:41 +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 9122720474; Fri, 1 Dec 2006 18:57:41 +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 kB19vfW0064617; Fri, 1 Dec 2006 18:57:41 +0900 (JST) (envelope-from anemo@mba.ocn.ne.jp) Date: Fri, 01 Dec 2006 18:57:40 +0900 (JST) Message-Id: <20061201.185740.03976990.nemoto@toshiba-tops.co.jp> To: vagabon.xyz@gmail.com Cc: linux-mips@linux-mips.org Subject: Re: Is _do_IRQ() not needed anymore ? From: Atsushi Nemoto In-Reply-To: References: X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 13282 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, 1 Dec 2006 10:40:52 +0100, "Franck Bui-Huu" wrote: > Now it seems that __do_IRQ() is not needed anymore. I dunno if it's > true for all platforms though. Does something like this make sense for > example ? > > -- >8 -- > diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig > index 5ff94e5..a4c5306 100644 > --- a/arch/mips/Kconfig > +++ b/arch/mips/Kconfig > @@ -913,8 +913,13 @@ config SYS_SUPPORTS_BIG_ENDIAN > config SYS_SUPPORTS_LITTLE_ENDIAN > bool > > +config GENERIC_HARDIRQS_NO__DO_IRQ > + bool > + default n > + No, there are irq chips still need __do_IRQ(). Please grep 'set_irq_chip('. If _all_ irq chip were converted to use flow handler, GENERIC_HARDIRQS_NO__DO_IRQ will be good. But we have i8259... --- Atsushi Nemoto From vagabon.xyz@gmail.com Fri Dec 1 10:06:46 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 10:06:50 +0000 (GMT) Received: from ug-out-1314.google.com ([66.249.92.169]:47267 "EHLO ug-out-1314.google.com") by ftp.linux-mips.org with ESMTP id S20037863AbWLAKGq (ORCPT ); Fri, 1 Dec 2006 10:06:46 +0000 Received: by ug-out-1314.google.com with SMTP id 40so2566123uga for ; Fri, 01 Dec 2006 02:06:45 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=UTWwr7qVzA//Fkw7I98lElC4TW82CbAbgR7isMY75OB+w8ripAjP8NvxulQy0jgoAIgn8276FlTW/Vohsyb+ZbBMdoRYroXTapdOzXhg6vlnzbmTtf6E1WkDOzCfsPfep9TGjcqM34HjtNee/fgPI0BBaWnQtjqqT1cZBHBjDSQ= Received: by 10.78.201.2 with SMTP id y2mr4626608huf.1164967604951; Fri, 01 Dec 2006 02:06:44 -0800 (PST) Received: by 10.78.124.19 with HTTP; Fri, 1 Dec 2006 02:06:44 -0800 (PST) Message-ID: Date: Fri, 1 Dec 2006 11:06:44 +0100 From: "Franck Bui-Huu" To: "Atsushi Nemoto" Subject: Re: Is _do_IRQ() not needed anymore ? Cc: linux-mips@linux-mips.org In-Reply-To: <20061201.185740.03976990.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: <20061201.185740.03976990.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: 13283 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 12/1/06, Atsushi Nemoto wrote: > No, there are irq chips still need __do_IRQ(). Please grep > 'set_irq_chip('. > > If _all_ irq chip were converted to use flow handler, > GENERIC_HARDIRQS_NO__DO_IRQ will be good. But we have i8259... That's why in my example I made GENERIC_HARDIRQS_NO__DO_IRQ config default to 'n' and selected by a irq chip that doens't use __do_IRQ() anymore, well I think... -- Franck From anemo@mba.ocn.ne.jp Fri Dec 1 10:10:53 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 10:10:57 +0000 (GMT) Received: from topsns2.toshiba-tops.co.jp ([202.230.225.126]:7215 "EHLO topsns2.toshiba-tops.co.jp") by ftp.linux-mips.org with ESMTP id S20037863AbWLAKKx (ORCPT ); Fri, 1 Dec 2006 10:10:53 +0000 Received: from topsms.toshiba-tops.co.jp by topsns2.toshiba-tops.co.jp via smtpd (for ftp.linux-mips.org [194.74.144.162]) with ESMTP; Fri, 1 Dec 2006 19:10:52 +0900 Received: from topsms.toshiba-tops.co.jp (localhost.localdomain [127.0.0.1]) by localhost.toshiba-tops.co.jp (Postfix) with ESMTP id 2A0D2417B2; Fri, 1 Dec 2006 19:10:50 +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 1BEF61F537; Fri, 1 Dec 2006 19:10:50 +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 kB1AAnW0064682; Fri, 1 Dec 2006 19:10:49 +0900 (JST) (envelope-from anemo@mba.ocn.ne.jp) Date: Fri, 01 Dec 2006 19:10:49 +0900 (JST) Message-Id: <20061201.191049.63741937.nemoto@toshiba-tops.co.jp> To: vagabon.xyz@gmail.com Cc: linux-mips@linux-mips.org Subject: Re: Is _do_IRQ() not needed anymore ? From: Atsushi Nemoto In-Reply-To: References: <20061201.185740.03976990.nemoto@toshiba-tops.co.jp> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 13284 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, 1 Dec 2006 11:06:44 +0100, "Franck Bui-Huu" wrote: > > If _all_ irq chip were converted to use flow handler, > > GENERIC_HARDIRQS_NO__DO_IRQ will be good. But we have i8259... > > That's why in my example I made GENERIC_HARDIRQS_NO__DO_IRQ config > default to 'n' and selected by a irq chip that doens't use __do_IRQ() > anymore, well I think... You can use both irq_cpu and i8259 same time. :) --- Atsushi Nemoto From vagabon.xyz@gmail.com Fri Dec 1 10:19:35 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 10:19:40 +0000 (GMT) Received: from ug-out-1314.google.com ([66.249.92.174]:15324 "EHLO ug-out-1314.google.com") by ftp.linux-mips.org with ESMTP id S20037861AbWLAKTf (ORCPT ); Fri, 1 Dec 2006 10:19:35 +0000 Received: by ug-out-1314.google.com with SMTP id 40so2568997uga for ; Fri, 01 Dec 2006 02:19:35 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=b8XbmV27V8DNGeeoN4tB3lu2Z2RD53fzWn/cHEc2MkPN+RyJ/nEqFCO08tMR/TR+B7r/sjtH6JOfM/GKbBQ9pgnNETEWzvDPo4w2b4JXROcw70f6hPusY0IatcgulJT8Z0U6qhdC5bCRJ+fkW/ezyPJhn1DSp1EZHIsz/9KAibA= Received: by 10.78.204.20 with SMTP id b20mr4669601hug.1164968374207; Fri, 01 Dec 2006 02:19:34 -0800 (PST) Received: by 10.78.124.19 with HTTP; Fri, 1 Dec 2006 02:19:34 -0800 (PST) Message-ID: Date: Fri, 1 Dec 2006 11:19:34 +0100 From: "Franck Bui-Huu" To: "Atsushi Nemoto" Subject: Re: Is _do_IRQ() not needed anymore ? Cc: linux-mips@linux-mips.org In-Reply-To: <20061201.191049.63741937.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: <20061201.185740.03976990.nemoto@toshiba-tops.co.jp> <20061201.191049.63741937.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: 13285 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 12/1/06, Atsushi Nemoto wrote: > On Fri, 1 Dec 2006 11:06:44 +0100, "Franck Bui-Huu" wrote: > > > If _all_ irq chip were converted to use flow handler, > > > GENERIC_HARDIRQS_NO__DO_IRQ will be good. But we have i8259... > > > > That's why in my example I made GENERIC_HARDIRQS_NO__DO_IRQ config > > default to 'n' and selected by a irq chip that doens't use __do_IRQ() > > anymore, well I think... > > You can use both irq_cpu and i8259 same time. :) > ok bad example. Why not making the select thing part of the platform config like this ? diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 5ff94e5..8565533 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -233,6 +233,7 @@ config LASAT select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL select SYS_SUPPORTS_LITTLE_ENDIAN + select GENERIC_HARDIRQS_NO__DO_IRQ config MIPS_ATLAS bool "MIPS Atlas board" @@ -913,6 +914,10 @@ config SYS_SUPPORTS_BIG_ENDIAN config SYS_SUPPORTS_LITTLE_ENDIAN bool +config GENERIC_HARDIRQS_NO__DO_IRQ + bool + default n + config IRQ_CPU bool -- Franck From anemo@mba.ocn.ne.jp Fri Dec 1 10:41:06 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 10:41:10 +0000 (GMT) Received: from topsns2.toshiba-tops.co.jp ([202.230.225.126]:56417 "EHLO topsns2.toshiba-tops.co.jp") by ftp.linux-mips.org with ESMTP id S20037860AbWLAKlG (ORCPT ); Fri, 1 Dec 2006 10:41:06 +0000 Received: from topsms.toshiba-tops.co.jp by topsns2.toshiba-tops.co.jp via smtpd (for ftp.linux-mips.org [194.74.144.162]) with ESMTP; Fri, 1 Dec 2006 19:41:04 +0900 Received: from topsms.toshiba-tops.co.jp (localhost.localdomain [127.0.0.1]) by localhost.toshiba-tops.co.jp (Postfix) with ESMTP id DD2D53EEA7; Fri, 1 Dec 2006 19:41:02 +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 CAACA20403; Fri, 1 Dec 2006 19:41:02 +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 kB1Af2W0064777; Fri, 1 Dec 2006 19:41:02 +0900 (JST) (envelope-from anemo@mba.ocn.ne.jp) Date: Fri, 01 Dec 2006 19:41:02 +0900 (JST) Message-Id: <20061201.194102.89066483.nemoto@toshiba-tops.co.jp> To: vagabon.xyz@gmail.com Cc: linux-mips@linux-mips.org Subject: Re: Is _do_IRQ() not needed anymore ? From: Atsushi Nemoto In-Reply-To: References: <20061201.191049.63741937.nemoto@toshiba-tops.co.jp> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 13286 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, 1 Dec 2006 11:19:34 +0100, "Franck Bui-Huu" wrote: > ok bad example. Why not making the select thing part of the platform > config like this ? > > diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig > index 5ff94e5..8565533 100644 > --- a/arch/mips/Kconfig > +++ b/arch/mips/Kconfig > @@ -233,6 +233,7 @@ config LASAT > select SYS_SUPPORTS_32BIT_KERNEL > select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL > select SYS_SUPPORTS_LITTLE_ENDIAN > + select GENERIC_HARDIRQS_NO__DO_IRQ > > config MIPS_ATLAS > bool "MIPS Atlas board" > @@ -913,6 +914,10 @@ config SYS_SUPPORTS_BIG_ENDIAN > config SYS_SUPPORTS_LITTLE_ENDIAN > bool > > +config GENERIC_HARDIRQS_NO__DO_IRQ > + bool > + default n > + > config IRQ_CPU > bool This looks good for me. Also, if you selected GENERIC_HARDIRQS_NO__DO_IRQ, you can remove .end handler. But adding "#ifdef GENERIC_HARDIRQS_NO__DO_IRQ" for each .end might be slightly ugly... --- Atsushi Nemoto From vagabon.xyz@gmail.com Fri Dec 1 11:03:55 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 11:03:56 +0000 (GMT) Received: from ug-out-1314.google.com ([66.249.92.170]:14008 "EHLO ug-out-1314.google.com") by ftp.linux-mips.org with ESMTP id S20037868AbWLALDz (ORCPT ); Fri, 1 Dec 2006 11:03:55 +0000 Received: by ug-out-1314.google.com with SMTP id 40so2580110uga for ; Fri, 01 Dec 2006 03:03:54 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=r27rTY33VktGd72AYvDQ9VKenKKzqUtLuy5GgMyd0XjsdsqGyQDCZx2uP4SSojFr5O3w8vpSqX9p7lAFll8Fe7xMikyjO928EbL+Lbl+Hlc3kTkXsYoHxaAixtNbV0Ei09l2xB/4YubcVoSkz5AdkX/tTC5MgsZm4S399Q18Gdk= Received: by 10.78.185.7 with SMTP id i7mr4679654huf.1164971034538; Fri, 01 Dec 2006 03:03:54 -0800 (PST) Received: by 10.78.124.19 with HTTP; Fri, 1 Dec 2006 03:03:54 -0800 (PST) Message-ID: Date: Fri, 1 Dec 2006 12:03:54 +0100 From: "Franck Bui-Huu" To: "Atsushi Nemoto" Subject: Re: Is _do_IRQ() not needed anymore ? Cc: linux-mips@linux-mips.org In-Reply-To: <20061201.194102.89066483.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: <20061201.191049.63741937.nemoto@toshiba-tops.co.jp> <20061201.194102.89066483.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: 13287 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 12/1/06, Atsushi Nemoto wrote: > > Also, if you selected GENERIC_HARDIRQS_NO__DO_IRQ, you can remove .end > handler. But adding "#ifdef GENERIC_HARDIRQS_NO__DO_IRQ" for each > .end might be slightly ugly... > why not simply removing it since it won't be used anymore ? -- Franck From vagabon.xyz@gmail.com Fri Dec 1 11:12:23 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 11:12:27 +0000 (GMT) Received: from ug-out-1314.google.com ([66.249.92.172]:61919 "EHLO ug-out-1314.google.com") by ftp.linux-mips.org with ESMTP id S20037868AbWLALMX (ORCPT ); Fri, 1 Dec 2006 11:12:23 +0000 Received: by ug-out-1314.google.com with SMTP id 40so2582156uga for ; Fri, 01 Dec 2006 03:12:22 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=hh4qMNW+Cgkh4514GIaQhWqSn4RiDrunrDMfsgNKSczjALBJdMznBie8RI6zdc6W1lBiq1mbw605ftM7uGcGbHgvqxh7OczSuDAvGaXkLD9mJBr8xmt0AMgc7KDDBMLS1N/lCoeRmeQj8yYHI3lLOCImvYhWmQgXb9E73cGfMGQ= Received: by 10.78.166.7 with SMTP id o7mr4716677hue.1164971542386; Fri, 01 Dec 2006 03:12:22 -0800 (PST) Received: by 10.78.124.19 with HTTP; Fri, 1 Dec 2006 03:12:22 -0800 (PST) Message-ID: Date: Fri, 1 Dec 2006 12:12:22 +0100 From: "Franck Bui-Huu" To: "Atsushi Nemoto" Subject: Re: Is _do_IRQ() not needed anymore ? Cc: linux-mips@linux-mips.org In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <20061201.191049.63741937.nemoto@toshiba-tops.co.jp> <20061201.194102.89066483.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: 13288 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 12/1/06, Franck Bui-Huu wrote: > On 12/1/06, Atsushi Nemoto wrote: > > > > Also, if you selected GENERIC_HARDIRQS_NO__DO_IRQ, you can remove .end > > handler. But adding "#ifdef GENERIC_HARDIRQS_NO__DO_IRQ" for each > > .end might be slightly ugly... > > > > why not simply removing it since it won't be used anymore ? > oops sorry I take it back, I already forgot my first wrong assumption... -- Franck From anemo@mba.ocn.ne.jp Fri Dec 1 11:12:55 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 11:12:59 +0000 (GMT) Received: from topsns2.toshiba-tops.co.jp ([202.230.225.126]:12182 "EHLO topsns2.toshiba-tops.co.jp") by ftp.linux-mips.org with ESMTP id S20037868AbWLALMz (ORCPT ); Fri, 1 Dec 2006 11:12:55 +0000 Received: from topsms.toshiba-tops.co.jp by topsns2.toshiba-tops.co.jp via smtpd (for ftp.linux-mips.org [194.74.144.162]) with ESMTP; Fri, 1 Dec 2006 20:12:54 +0900 Received: from topsms.toshiba-tops.co.jp (localhost.localdomain [127.0.0.1]) by localhost.toshiba-tops.co.jp (Postfix) with ESMTP id B026940022; Fri, 1 Dec 2006 20:12:52 +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 A5DC63EEA7; Fri, 1 Dec 2006 20:12:52 +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 kB1BCqW0064892; Fri, 1 Dec 2006 20:12:52 +0900 (JST) (envelope-from anemo@mba.ocn.ne.jp) Date: Fri, 01 Dec 2006 20:12:52 +0900 (JST) Message-Id: <20061201.201252.18306502.nemoto@toshiba-tops.co.jp> To: vagabon.xyz@gmail.com Cc: linux-mips@linux-mips.org Subject: Re: Is _do_IRQ() not needed anymore ? From: Atsushi Nemoto In-Reply-To: References: <20061201.194102.89066483.nemoto@toshiba-tops.co.jp> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 13289 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, 1 Dec 2006 12:03:54 +0100, "Franck Bui-Huu" wrote: > > Also, if you selected GENERIC_HARDIRQS_NO__DO_IRQ, you can remove .end > > handler. But adding "#ifdef GENERIC_HARDIRQS_NO__DO_IRQ" for each > > .end might be slightly ugly... > > why not simply removing it since it won't be used anymore ? Indeed. If the irq chip was always used with flow handler we can remove it. --- Atsushi Nemoto From yoichi_yuasa@tripeaks.co.jp Fri Dec 1 13:21:07 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 13:21:12 +0000 (GMT) Received: from mo31.po.2iij.net ([210.128.50.54]:18500 "EHLO mo31.po.2iij.net") by ftp.linux-mips.org with ESMTP id S28573702AbWLANVH (ORCPT ); Fri, 1 Dec 2006 13:21:07 +0000 Received: by mo.po.2iij.net (mo31) id kB1DL5YY030730; Fri, 1 Dec 2006 22:21:05 +0900 (JST) Received: from localhost.localdomain (133.25.30.125.dy.iij4u.or.jp [125.30.25.133]) by mbox.po.2iij.net (mbox32) id kB1DL2aR027760 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 1 Dec 2006 22:21:03 +0900 (JST) Date: Fri, 1 Dec 2006 22:17:46 +0900 From: Yoichi Yuasa To: Ralf Baechle Cc: yoichi_yuasa@tripeaks.co.jp, linux-mips Subject: [PATCH 3/5] MIPS: separate cobalt PCI codes from setup.c Message-Id: <20061201221746.1f45d98c.yoichi_yuasa@tripeaks.co.jp> In-Reply-To: <20061201221601.3aa34024.yoichi_yuasa@tripeaks.co.jp> References: <20061201221242.261f57b0.yoichi_yuasa@tripeaks.co.jp> <20061201221601.3aa34024.yoichi_yuasa@tripeaks.co.jp> Organization: TriPeaks Corporation X-Mailer: Sylpheed version 1.0.6 (GTK+ 1.2.10; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 13290 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: yoichi_yuasa@tripeaks.co.jp Precedence: bulk X-list: linux-mips Hi Ralf, This patch has separated cobalt PCI codes from setup.c . It's removed #ifdef CONFIG_PCI/#endif from cobalt setup.c . Yoichi Signed-off-by: Yoichi Yuasa diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/Makefile mips/arch/mips/cobalt/Makefile --- mips-orig/arch/mips/cobalt/Makefile 2006-10-12 10:19:25.000465500 +0900 +++ mips/arch/mips/cobalt/Makefile 2006-10-12 10:19:58.502559250 +0900 @@ -4,6 +4,7 @@ obj-y := irq.o reset.o setup.o +obj-$(CONFIG_PCI) += pci.o obj-$(CONFIG_EARLY_PRINTK) += console.o EXTRA_AFLAGS := $(CFLAGS) diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/pci.c mips/arch/mips/cobalt/pci.c --- mips-orig/arch/mips/cobalt/pci.c 1970-01-01 09:00:00.000000000 +0900 +++ mips/arch/mips/cobalt/pci.c 2006-10-12 10:19:58.502559250 +0900 @@ -0,0 +1,47 @@ +/* + * Register PCI controller. + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * + * Copyright (C) 1996, 1997, 2004, 05 by Ralf Baechle (ralf@linux-mips.org) + * Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv) + * + */ +#include +#include + +#include + +extern struct pci_ops gt64111_pci_ops; + +static struct resource cobalt_mem_resource = { + .start = GT_DEF_PCI0_MEM0_BASE, + .end = GT_DEF_PCI0_MEM0_BASE + GT_DEF_PCI0_MEM0_SIZE - 1, + .name = "PCI memory", + .flags = IORESOURCE_MEM, +}; + +static struct resource cobalt_io_resource = { + .start = 0x1000, + .end = 0xffff, + .name = "PCI I/O", + .flags = IORESOURCE_IO, +}; + +static struct pci_controller cobalt_pci_controller = { + .pci_ops = >64111_pci_ops, + .mem_resource = &cobalt_mem_resource, + .io_resource = &cobalt_io_resource, + .io_offset = 0 - GT_DEF_PCI0_IO_BASE, +}; + +static int __init cobalt_pci_init(void) +{ + register_pci_controller(&cobalt_pci_controller); + + return 0; +} + +arch_initcall(cobalt_pci_init); diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/setup.c mips/arch/mips/cobalt/setup.c --- mips-orig/arch/mips/cobalt/setup.c 2006-10-12 10:20:53.049968250 +0900 +++ mips/arch/mips/cobalt/setup.c 2006-10-12 10:22:31.464118750 +0900 @@ -63,22 +63,6 @@ void __init plat_timer_setup(struct irqa GT_WRITE(GT_INTRMASK_OFS, GT_INTR_T0EXP_MSK | GT_READ(GT_INTRMASK_OFS)); } -extern struct pci_ops gt64111_pci_ops; - -static struct resource cobalt_mem_resource = { - .start = GT_DEF_PCI0_MEM0_BASE, - .end = GT_DEF_PCI0_MEM0_BASE + GT_DEF_PCI0_MEM0_SIZE - 1, - .name = "PCI memory", - .flags = IORESOURCE_MEM -}; - -static struct resource cobalt_io_resource = { - .start = 0x1000, - .end = 0xffff, - .name = "PCI I/O", - .flags = IORESOURCE_IO -}; - /* * Cobalt doesn't have PS/2 keyboard/mouse interfaces, * keyboard conntroller is never used. @@ -92,14 +76,6 @@ static struct resource cobalt_reserved_r }, }; -static struct pci_controller cobalt_pci_controller = { - .pci_ops = >64111_pci_ops, - .mem_resource = &cobalt_mem_resource, - .mem_offset = 0, - .io_resource = &cobalt_io_resource, - .io_offset = 0 - GT_DEF_PCI0_IO_BASE, -}; - void __init plat_mem_setup(void) { static struct uart_port uart; @@ -126,10 +102,6 @@ void __init plat_mem_setup(void) printk("Cobalt board ID: %d\n", cobalt_board_id); -#ifdef CONFIG_PCI - register_pci_controller(&cobalt_pci_controller); -#endif - if (cobalt_board_id > COBALT_BRD_ID_RAQ1) { #ifdef CONFIG_EARLY_PRINTK cobalt_early_console(); From yoichi_yuasa@tripeaks.co.jp Fri Dec 1 13:21:36 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 13:21:39 +0000 (GMT) Received: from mo32.po.2iij.net ([210.128.50.17]:41794 "EHLO mo32.po.2iij.net") by ftp.linux-mips.org with ESMTP id S28573729AbWLANVH (ORCPT ); Fri, 1 Dec 2006 13:21:07 +0000 Received: by mo.po.2iij.net (mo32) id kB1DL4YY000110; Fri, 1 Dec 2006 22:21:04 +0900 (JST) Received: from localhost.localdomain (133.25.30.125.dy.iij4u.or.jp [125.30.25.133]) by mbox.po.2iij.net (mbox32) id kB1DL03P027729 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 1 Dec 2006 22:21:00 +0900 (JST) Date: Fri, 1 Dec 2006 22:12:42 +0900 From: Yoichi Yuasa To: Ralf Baechle Cc: yoichi_yuasa@tripeaks.co.jp, linux-mips Subject: [PATCH 1/5] MIPS: fix cobalt I/O resource range Message-Id: <20061201221242.261f57b0.yoichi_yuasa@tripeaks.co.jp> Organization: TriPeaks Corporation X-Mailer: Sylpheed version 1.0.6 (GTK+ 1.2.10; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 13291 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: yoichi_yuasa@tripeaks.co.jp Precedence: bulk X-list: linux-mips Hi Ralf, This patch has fixed cobalt I/O reource range. The cobalt real I/O resource range from 0x0 to 0xffff. Yoichi Signed-off-by: Yoichi Yuasa diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/setup.c mips/arch/mips/cobalt/setup.c --- mips-orig/arch/mips/cobalt/setup.c 2006-10-12 01:03:18.055569000 +0900 +++ mips/arch/mips/cobalt/setup.c 2006-10-12 01:01:59.973744750 +0900 @@ -130,8 +130,7 @@ void __init plat_mem_setup(void) set_io_port_base(CKSEG1ADDR(GT_DEF_PCI0_IO_BASE)); - /* I/O port resource must include UART and LCD/buttons */ - ioport_resource.end = 0x0fffffff; + ioport_resource.end = 0xffff; /* request I/O space for devices used on all i[345]86 PCs */ for (i = 0; i < COBALT_IO_RESOURCES; i++) @@ -149,24 +148,24 @@ void __init plat_mem_setup(void) register_pci_controller(&cobalt_pci_controller); #endif -#ifdef CONFIG_SERIAL_8250 if (cobalt_board_id > COBALT_BRD_ID_RAQ1) { - #ifdef CONFIG_EARLY_PRINTK cobalt_early_console(); #endif +#ifdef CONFIG_SERIAL_8250 uart.line = 0; uart.type = PORT_UNKNOWN; uart.uartclk = 18432000; uart.irq = COBALT_SERIAL_IRQ; - uart.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; - uart.iobase = 0xc800000; - uart.iotype = UPIO_PORT; + uart.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF | + UPF_SKIP_TEST; + uart.iotype = UPIO_MEM; + uart.mapbase = 0x1c800000; early_serial_setup(&uart); - } #endif + } } /* From yoichi_yuasa@tripeaks.co.jp Fri Dec 1 13:22:03 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 13:22:08 +0000 (GMT) Received: from mo31.po.2iij.net ([210.128.50.54]:7468 "EHLO mo31.po.2iij.net") by ftp.linux-mips.org with ESMTP id S28573724AbWLANVH (ORCPT ); Fri, 1 Dec 2006 13:21:07 +0000 Received: by mo.po.2iij.net (mo31) id kB1DL46T030724; Fri, 1 Dec 2006 22:21:04 +0900 (JST) Received: from localhost.localdomain (133.25.30.125.dy.iij4u.or.jp [125.30.25.133]) by mbox.po.2iij.net (mbox32) id kB1DL16M027748 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 1 Dec 2006 22:21:01 +0900 (JST) Date: Fri, 1 Dec 2006 22:16:01 +0900 From: Yoichi Yuasa To: Ralf Baechle Cc: yoichi_yuasa@tripeaks.co.jp, linux-mips Subject: [PATCH 2/5] MIPS: remove unused resources for cobalt Message-Id: <20061201221601.3aa34024.yoichi_yuasa@tripeaks.co.jp> In-Reply-To: <20061201221242.261f57b0.yoichi_yuasa@tripeaks.co.jp> References: <20061201221242.261f57b0.yoichi_yuasa@tripeaks.co.jp> Organization: TriPeaks Corporation X-Mailer: Sylpheed version 1.0.6 (GTK+ 1.2.10; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 13292 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: yoichi_yuasa@tripeaks.co.jp Precedence: bulk X-list: linux-mips Hi Ralf, This patch has removed unused resources for cobalt. Yoichi Signed-off-by: Yoichi Yuasa diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/setup.c mips/arch/mips/cobalt/setup.c --- mips-orig/arch/mips/cobalt/setup.c 2006-10-12 01:03:59.401472250 +0900 +++ mips/arch/mips/cobalt/setup.c 2006-10-12 01:05:36.454992750 +0900 @@ -79,37 +79,19 @@ static struct resource cobalt_io_resourc .flags = IORESOURCE_IO }; -static struct resource cobalt_io_resources[] = { - { - .start = 0x00, - .end = 0x1f, - .name = "dma1", - .flags = IORESOURCE_BUSY - }, { - .start = 0x40, - .end = 0x5f, - .name = "timer", - .flags = IORESOURCE_BUSY - }, { +/* + * Cobalt doesn't have PS/2 keyboard/mouse interfaces, + * keyboard conntroller is never used. + */ +static struct resource cobalt_reserved_resources[] = { + { /* keyboard */ .start = 0x60, .end = 0x6f, - .name = "keyboard", - .flags = IORESOURCE_BUSY - }, { - .start = 0x80, - .end = 0x8f, - .name = "dma page reg", - .flags = IORESOURCE_BUSY - }, { - .start = 0xc0, - .end = 0xdf, - .name = "dma2", - .flags = IORESOURCE_BUSY + .name = "reserved", + .flags = IORESOURCE_BUSY, }, }; -#define COBALT_IO_RESOURCES (sizeof(cobalt_io_resources)/sizeof(struct resource)) - static struct pci_controller cobalt_pci_controller = { .pci_ops = >64111_pci_ops, .mem_resource = &cobalt_mem_resource, @@ -132,9 +114,9 @@ void __init plat_mem_setup(void) ioport_resource.end = 0xffff; - /* request I/O space for devices used on all i[345]86 PCs */ - for (i = 0; i < COBALT_IO_RESOURCES; i++) - request_resource(&ioport_resource, cobalt_io_resources + i); + /* These resources have been reserved by VIA SuperI/O chip. */ + for (i = 0; i < ARRAY_SIZE(cobalt_reserved_resources); i++) + request_resource(&ioport_resource, cobalt_reserved_resources + i); /* Read the cobalt id register out of the PCI config space */ PCI_CFG_SET(devfn, (VIA_COBALT_BRD_ID_REG & ~0x3)); From yoichi_yuasa@tripeaks.co.jp Fri Dec 1 13:22:31 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 13:22:34 +0000 (GMT) Received: from mo31.po.2iij.net ([210.128.50.54]:11808 "EHLO mo31.po.2iij.net") by ftp.linux-mips.org with ESMTP id S28573732AbWLANVQ (ORCPT ); Fri, 1 Dec 2006 13:21:16 +0000 Received: by mo.po.2iij.net (mo31) id kB1DLEu9030758; Fri, 1 Dec 2006 22:21:14 +0900 (JST) Received: from localhost.localdomain (133.25.30.125.dy.iij4u.or.jp [125.30.25.133]) by mbox.po.2iij.net (mbox32) id kB1DL9pe027845 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 1 Dec 2006 22:21:09 +0900 (JST) Date: Fri, 1 Dec 2006 22:19:10 +0900 From: Yoichi Yuasa To: Ralf Baechle Cc: yoichi_yuasa@tripeaks.co.jp, linux-mips Subject: [PATCH 4/5] MIPS: update reset operations for cobalt Message-Id: <20061201221910.56cde68c.yoichi_yuasa@tripeaks.co.jp> In-Reply-To: <20061201221746.1f45d98c.yoichi_yuasa@tripeaks.co.jp> References: <20061201221242.261f57b0.yoichi_yuasa@tripeaks.co.jp> <20061201221601.3aa34024.yoichi_yuasa@tripeaks.co.jp> <20061201221746.1f45d98c.yoichi_yuasa@tripeaks.co.jp> Organization: TriPeaks Corporation X-Mailer: Sylpheed version 1.0.6 (GTK+ 1.2.10; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 13293 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: yoichi_yuasa@tripeaks.co.jp Precedence: bulk X-list: linux-mips Hi Ralf, This patch has updated reset operations for cobalt. Yoichi Signed-off-by: Yoichi Yuasa diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/reset.c mips/arch/mips/cobalt/reset.c --- mips-orig/arch/mips/cobalt/reset.c 2006-10-12 10:28:55.612126500 +0900 +++ mips/arch/mips/cobalt/reset.c 2006-10-12 10:32:39.698131000 +0900 @@ -8,17 +8,33 @@ * Copyright (C) 1995, 1996, 1997 by Ralf Baechle * Copyright (C) 2001 by Liam Davies (ldavies@agile.tv) */ -#include -#include -#include +#include +#include +#include + #include -#include #include -#include -#include -#include -void cobalt_machine_halt(void) +#define COBALT_LED_PORT (void __iomem *)CKSEG1ADDR(0x1c000000) +# define COBALT_LED_BAR_LEFT (1 << 0) /* Qube */ +# define COBALT_LED_BAR_RIGHT (1 << 1) /* Qube */ +# define COBALT_LED_WEB (1 << 2) /* RaQ */ +# define COBALT_LED_POWER_OFF (1 << 3) /* RaQ */ +# define COBALT_LED_RESET 0x0f + +#define COBALT_KEY_PORT \ + ((~readl((void __iomem *)CKSEG1ADDR(0x1d000000)) >> 24) & \ + COBALT_KEY_MASK) +# define COBALT_KEY_CLEAR (1 << 1) +# define COBALT_KEY_LEFT (1 << 2) +# define COBALT_KEY_UP (1 << 3) +# define COBALT_KEY_DOWN (1 << 4) +# define COBALT_KEY_RIGHT (1 << 5) +# define COBALT_KEY_ENTER (1 << 6) +# define COBALT_KEY_SELECT (1 << 7) +# define COBALT_KEY_MASK 0xfe + +static void cobalt_machine_halt(void) { int state, last, diff; unsigned long mark; @@ -34,22 +50,23 @@ void cobalt_machine_halt(void) for (state = 0;;) { state ^= COBALT_LED_POWER_OFF; - COBALT_LED_PORT = state; + writeb(state, COBALT_LED_PORT); diff = COBALT_KEY_PORT ^ last; last ^= diff; - if((diff & (COBALT_KEY_ENTER | COBALT_KEY_SELECT)) && !(~last & (COBALT_KEY_ENTER | COBALT_KEY_SELECT))) - COBALT_LED_PORT = COBALT_LED_RESET; + if((diff & (COBALT_KEY_ENTER | COBALT_KEY_SELECT)) && + !(~last & (COBALT_KEY_ENTER | COBALT_KEY_SELECT))) + writeb(COBALT_LED_RESET, COBALT_LED_PORT); for (mark = jiffies; jiffies - mark < HZ;) ; } } -void cobalt_machine_restart(char *command) +static void cobalt_machine_restart(char *command) { - COBALT_LED_PORT = COBALT_LED_RESET; + writeb(COBALT_LED_RESET, COBALT_LED_PORT); /* we should never get here */ cobalt_machine_halt(); @@ -58,8 +75,19 @@ void cobalt_machine_restart(char *comman /* * This triggers the luser mode device driver for the power switch ;-) */ -void cobalt_machine_power_off(void) +static void cobalt_machine_power_off(void) { printk("You can switch the machine off now.\n"); cobalt_machine_halt(); } + +static int __init cobalt_reset_init(void) +{ + _machine_restart = cobalt_machine_restart; + _machine_halt = cobalt_machine_halt; + pm_power_off = cobalt_machine_power_off; + + return 0; +} + +arch_initcall(cobalt_reset_init); diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/setup.c mips/arch/mips/cobalt/setup.c --- mips-orig/arch/mips/cobalt/setup.c 2006-10-12 10:32:51.726882750 +0900 +++ mips/arch/mips/cobalt/setup.c 2006-10-12 10:34:09.171722750 +0900 @@ -12,7 +12,6 @@ #include #include #include -#include #include #include @@ -21,14 +20,10 @@ #include #include #include -#include #include #include -extern void cobalt_machine_restart(char *command); -extern void cobalt_machine_halt(void); -extern void cobalt_machine_power_off(void); extern void cobalt_early_console(void); int cobalt_board_id; @@ -82,10 +77,6 @@ void __init plat_mem_setup(void) unsigned int devfn = PCI_DEVFN(COBALT_PCICONF_VIA, 0); int i; - _machine_restart = cobalt_machine_restart; - _machine_halt = cobalt_machine_halt; - pm_power_off = cobalt_machine_power_off; - set_io_port_base(CKSEG1ADDR(GT_DEF_PCI0_IO_BASE)); ioport_resource.end = 0xffff; diff -pruN -X mips/Documentation/dontdiff mips-orig/include/asm-mips/mach-cobalt/cobalt.h mips/include/asm-mips/mach-cobalt/cobalt.h --- mips-orig/include/asm-mips/mach-cobalt/cobalt.h 2006-10-12 10:32:50.006775250 +0900 +++ mips/include/asm-mips/mach-cobalt/cobalt.h 2006-10-12 10:32:39.698131000 +0900 @@ -71,23 +71,6 @@ GT_WRITE(GT_PCI0_CFGADDR_OFS, (0x80000000 | (PCI_SLOT (devfn) << 11) | \ (PCI_FUNC (devfn) << 8) | (where))) -#define COBALT_LED_PORT (*(volatile unsigned char *) CKSEG1ADDR(0x1c000000)) -# define COBALT_LED_BAR_LEFT (1 << 0) /* Qube */ -# define COBALT_LED_BAR_RIGHT (1 << 1) /* Qube */ -# define COBALT_LED_WEB (1 << 2) /* RaQ */ -# define COBALT_LED_POWER_OFF (1 << 3) /* RaQ */ -# define COBALT_LED_RESET 0x0f - -#define COBALT_KEY_PORT ((~*(volatile unsigned int *) CKSEG1ADDR(0x1d000000) >> 24) & COBALT_KEY_MASK) -# define COBALT_KEY_CLEAR (1 << 1) -# define COBALT_KEY_LEFT (1 << 2) -# define COBALT_KEY_UP (1 << 3) -# define COBALT_KEY_DOWN (1 << 4) -# define COBALT_KEY_RIGHT (1 << 5) -# define COBALT_KEY_ENTER (1 << 6) -# define COBALT_KEY_SELECT (1 << 7) -# define COBALT_KEY_MASK 0xfe - #define COBALT_UART ((volatile unsigned char *) CKSEG1ADDR(0x1c800000)) #endif /* __ASM_COBALT_H */ From yoichi_yuasa@tripeaks.co.jp Fri Dec 1 13:22:58 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 13:23:04 +0000 (GMT) Received: from mo31.po.2iij.net ([210.128.50.54]:279 "EHLO mo31.po.2iij.net") by ftp.linux-mips.org with ESMTP id S28573733AbWLANVQ (ORCPT ); Fri, 1 Dec 2006 13:21:16 +0000 Received: by mo.po.2iij.net (mo31) id kB1DLEuB030758; Fri, 1 Dec 2006 22:21:14 +0900 (JST) Received: from localhost.localdomain (133.25.30.125.dy.iij4u.or.jp [125.30.25.133]) by mbox.po.2iij.net (mbox32) id kB1DLA84027868 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 1 Dec 2006 22:21:10 +0900 (JST) Date: Fri, 1 Dec 2006 22:20:21 +0900 From: Yoichi Yuasa To: Ralf Baechle Cc: yoichi_yuasa@tripeaks.co.jp, linux-mips Subject: [PATCH 5/5] MIPS: clean up include files for cobalt Message-Id: <20061201222021.7be0fae6.yoichi_yuasa@tripeaks.co.jp> In-Reply-To: <20061201221910.56cde68c.yoichi_yuasa@tripeaks.co.jp> References: <20061201221242.261f57b0.yoichi_yuasa@tripeaks.co.jp> <20061201221601.3aa34024.yoichi_yuasa@tripeaks.co.jp> <20061201221746.1f45d98c.yoichi_yuasa@tripeaks.co.jp> <20061201221910.56cde68c.yoichi_yuasa@tripeaks.co.jp> Organization: TriPeaks Corporation X-Mailer: Sylpheed version 1.0.6 (GTK+ 1.2.10; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 13294 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: yoichi_yuasa@tripeaks.co.jp Precedence: bulk X-list: linux-mips Hi Ralf, This patch has cleaned up include files for cobalt. Yoichi Signed-off-by: Yoichi Yuasa diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/console.c mips/arch/mips/cobalt/console.c --- mips-orig/arch/mips/cobalt/console.c 2006-10-12 11:44:59.727188000 +0900 +++ mips/arch/mips/cobalt/console.c 2006-10-12 11:53:43.203903250 +0900 @@ -7,7 +7,7 @@ #include #include #include -#include +#include static void putchar(int c) { diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/irq.c mips/arch/mips/cobalt/irq.c --- mips-orig/arch/mips/cobalt/irq.c 2006-10-12 11:49:45.137025000 +0900 +++ mips/arch/mips/cobalt/irq.c 2006-10-12 11:53:26.330848750 +0900 @@ -17,7 +17,7 @@ #include #include -#include +#include /* * We have two types of interrupts that we handle, ones that come in through diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/setup.c mips/arch/mips/cobalt/setup.c --- mips-orig/arch/mips/cobalt/setup.c 2006-10-12 11:49:54.681621500 +0900 +++ mips/arch/mips/cobalt/setup.c 2006-10-12 11:56:31.510421750 +0900 @@ -18,11 +18,9 @@ #include #include #include -#include -#include #include -#include +#include extern void cobalt_early_console(void); From vagabon.xyz@gmail.com Fri Dec 1 14:56:52 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 14:56:59 +0000 (GMT) Received: from nf-out-0910.google.com ([64.233.182.191]:43488 "EHLO nf-out-0910.google.com") by ftp.linux-mips.org with ESMTP id S20037960AbWLAO4w (ORCPT ); Fri, 1 Dec 2006 14:56:52 +0000 Received: by nf-out-0910.google.com with SMTP id l24so3447314nfc for ; Fri, 01 Dec 2006 06:56:51 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:reply-to:user-agent:mime-version:to:cc:subject:content-type:content-transfer-encoding:from; b=dpbPpppK9T26RtBnz/2xIIlfbGUGTCEB2jsnf2mXerwfkuclT+FyCkTYwQ2mCKRBNGrVuFbwperpmj72iZhhzczxmT0sEMqQrcBAePPB1MdZutElRXuP/1mG3kWffxmq9lE/nPN9dbsEfYPj7SDKPnKjlbylSDRdxYxUhv4FTvg= Received: by 10.48.202.19 with SMTP id z19mr9344267nff.1164985011258; Fri, 01 Dec 2006 06:56:51 -0800 (PST) Received: from ?192.168.0.24? ( [81.252.61.1]) by mx.google.com with ESMTP id d2sm37205612nfe.2006.12.01.06.56.49; Fri, 01 Dec 2006 06:56:50 -0800 (PST) Message-ID: <457042FF.2060908@innova-card.com> Date: Fri, 01 Dec 2006 15:58:07 +0100 Reply-To: Franck User-Agent: Thunderbird 1.5.0.4 (X11/20060614) MIME-Version: 1.0 To: Ralf Baechle CC: Atsushi Nemoto , linux-mips Subject: [PATCH] Compile __do_IRQ() when really needed 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: 13295 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 __do_IRQ() is needed only by irq handlers that can't use default handler defined in kernel/irq/chip.c. For others platforms there's no need to compile this function since it won't be used. For those platforms this patch defines GENERIC_HARDIRQS_NO__DO_IRQ symbol which is used exactly for this purpose. Futhermore for platforms which do not use __do_IRQ(), end() method which is part of the 'irq_chip' structure is not used. This patch simply removes this method in this case. Signed-off-by: Franck Bui-Huu --- Eyeballs from people impacted by this patch are greatly appreciated. Thanks. arch/mips/Kconfig | 16 +++++++++++ arch/mips/dec/ioasic-irq.c | 15 ---------- arch/mips/dec/kn02-irq.c | 7 ----- arch/mips/emma2rh/common/irq_emma2rh.c | 7 ----- arch/mips/emma2rh/markeins/irq_markeins.c | 7 ----- arch/mips/jazz/irq.c | 7 ----- arch/mips/kernel/irq-mv6434x.c | 10 ------- arch/mips/kernel/irq-rm7000.c | 7 ----- arch/mips/kernel/irq-rm9000.c | 8 ----- arch/mips/kernel/irq_cpu.c | 7 ----- arch/mips/lasat/interrupt.c | 7 ----- arch/mips/momentum/ocelot_c/cpci-irq.c | 10 ------- arch/mips/momentum/ocelot_c/uart-irq.c | 10 ------- arch/mips/philips/pnx8550/common/int.c | 8 ----- arch/mips/sgi-ip22/ip22-int.c | 28 -------------------- arch/mips/sgi-ip27/ip27-irq.c | 8 ----- arch/mips/sgi-ip27/ip27-timer.c | 5 --- arch/mips/tx4927/common/tx4927_irq.c | 22 --------------- .../tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | 19 ------------- arch/mips/tx4938/common/irq.c | 20 -------------- arch/mips/tx4938/toshiba_rbtx4938/irq.c | 10 ------- arch/mips/vr41xx/common/icu.c | 14 ---------- 22 files changed, 16 insertions(+), 236 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 5ff94e5..249660a 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -171,6 +171,7 @@ config MACH_DECSTATION select SYS_SUPPORTS_128HZ select SYS_SUPPORTS_256HZ select SYS_SUPPORTS_1024HZ + select GENERIC_HARDIRQS_NO__DO_IRQ help This enables support for DEC's MIPS based workstations. For details see the Linux/MIPS FAQ on and the @@ -216,6 +217,7 @@ config MACH_JAZZ select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL select SYS_SUPPORTS_100HZ + select GENERIC_HARDIRQS_NO__DO_IRQ help This a family of machines based on the MIPS R4030 chipset which was used by several vendors to build RISC/os and Windows NT workstations. @@ -233,6 +235,7 @@ config LASAT select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL select SYS_SUPPORTS_LITTLE_ENDIAN + select GENERIC_HARDIRQS_NO__DO_IRQ config MIPS_ATLAS bool "MIPS Atlas board" @@ -256,6 +259,7 @@ config MIPS_ATLAS select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_MULTITHREADING if EXPERIMENTAL + select GENERIC_HARDIRQS_NO__DO_IRQ help This enables support for the MIPS Technologies Atlas evaluation board. @@ -410,6 +414,7 @@ config MOMENCO_OCELOT_C select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_BIG_ENDIAN + select GENERIC_HARDIRQS_NO__DO_IRQ help The Ocelot is a MIPS-based Single Board Computer (SBC) made by Momentum Computer . @@ -468,6 +473,7 @@ config DDB5477 config MACH_VR41XX bool "NEC VR41XX-based machines" select SYS_HAS_CPU_VR41XX + select GENERIC_HARDIRQS_NO__DO_IRQ config PMC_YOSEMITE bool "PMC-Sierra Yosemite eval board" @@ -519,6 +525,7 @@ config MARKEINS select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_HAS_CPU_R5000 + select GENERIC_HARDIRQS_NO__DO_IRQ help This enables support for the R5432-based NEC Mark-eins boards with R5500 CPU. @@ -539,6 +546,7 @@ config SGI_IP22 select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_BIG_ENDIAN + select GENERIC_HARDIRQS_NO__DO_IRQ help This are the SGI Indy, Challenge S and Indigo2, as well as certain OEM variants like the Tandem CMN B006S. To compile a Linux kernel @@ -558,6 +566,7 @@ config SGI_IP27 select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_NUMA select SYS_SUPPORTS_SMP + select GENERIC_HARDIRQS_NO__DO_IRQ help This are the SGI Origin 200, Origin 2000 and Onyx 2 Graphics workstations. To compile a Linux kernel that runs on these, say Y @@ -739,6 +748,7 @@ config TOSHIBA_RBTX4927 select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_BIG_ENDIAN select TOSHIBA_BOARDS + select GENERIC_HARDIRQS_NO__DO_IRQ help This Toshiba board is based on the TX4927 processor. Say Y here to support this machine type @@ -758,6 +768,7 @@ config TOSHIBA_RBTX4938 select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_BIG_ENDIAN select TOSHIBA_BOARDS + select GENERIC_HARDIRQS_NO__DO_IRQ help This Toshiba board is based on the TX4938 processor. Say Y here to support this machine type @@ -824,6 +835,10 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER bool default y +config GENERIC_HARDIRQS_NO__DO_IRQ + bool + default n + # # Select some configuration options automatically based on user selections. # @@ -985,6 +1000,7 @@ config SOC_PNX8550 select HW_HAS_PCI select SYS_HAS_CPU_MIPS32_R1 select SYS_SUPPORTS_32BIT_KERNEL + select GENERIC_HARDIRQS_NO__DO_IRQ config SWAP_IO_SPACE bool diff --git a/arch/mips/dec/ioasic-irq.c b/arch/mips/dec/ioasic-irq.c index 269b22b..c5248a1 100644 --- a/arch/mips/dec/ioasic-irq.c +++ b/arch/mips/dec/ioasic-irq.c @@ -55,19 +55,12 @@ static inline void ack_ioasic_irq(unsign fast_iob(); } -static inline void end_ioasic_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - unmask_ioasic_irq(irq); -} - static struct irq_chip ioasic_irq_type = { .typename = "IO-ASIC", .ack = ack_ioasic_irq, .mask = mask_ioasic_irq, .mask_ack = ack_ioasic_irq, .unmask = unmask_ioasic_irq, - .end = end_ioasic_irq, }; @@ -77,20 +70,12 @@ static struct irq_chip ioasic_irq_type = #define ack_ioasic_dma_irq ack_ioasic_irq -static inline void end_ioasic_dma_irq(unsigned int irq) -{ - clear_ioasic_irq(irq); - fast_iob(); - end_ioasic_irq(irq); -} - static struct irq_chip ioasic_dma_irq_type = { .typename = "IO-ASIC-DMA", .ack = ack_ioasic_dma_irq, .mask = mask_ioasic_dma_irq, .mask_ack = ack_ioasic_dma_irq, .unmask = unmask_ioasic_dma_irq, - .end = end_ioasic_dma_irq, }; diff --git a/arch/mips/dec/kn02-irq.c b/arch/mips/dec/kn02-irq.c index 5a9be4c..916e46b 100644 --- a/arch/mips/dec/kn02-irq.c +++ b/arch/mips/dec/kn02-irq.c @@ -57,19 +57,12 @@ static void ack_kn02_irq(unsigned int ir iob(); } -static void end_kn02_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - unmask_kn02_irq(irq); -} - static struct irq_chip kn02_irq_type = { .typename = "KN02-CSR", .ack = ack_kn02_irq, .mask = mask_kn02_irq, .mask_ack = ack_kn02_irq, .unmask = unmask_kn02_irq, - .end = end_kn02_irq, }; diff --git a/arch/mips/emma2rh/common/irq_emma2rh.c b/arch/mips/emma2rh/common/irq_emma2rh.c index 59b9829..8d880f0 100644 --- a/arch/mips/emma2rh/common/irq_emma2rh.c +++ b/arch/mips/emma2rh/common/irq_emma2rh.c @@ -56,19 +56,12 @@ static void emma2rh_irq_disable(unsigned ll_emma2rh_irq_disable(irq - emma2rh_irq_base); } -static void emma2rh_irq_end(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - ll_emma2rh_irq_enable(irq - emma2rh_irq_base); -} - struct irq_chip emma2rh_irq_controller = { .typename = "emma2rh_irq", .ack = emma2rh_irq_disable, .mask = emma2rh_irq_disable, .mask_ack = emma2rh_irq_disable, .unmask = emma2rh_irq_enable, - .end = emma2rh_irq_end, }; void emma2rh_irq_init(u32 irq_base) diff --git a/arch/mips/emma2rh/markeins/irq_markeins.c b/arch/mips/emma2rh/markeins/irq_markeins.c index 3ac4e40..2116d9b 100644 --- a/arch/mips/emma2rh/markeins/irq_markeins.c +++ b/arch/mips/emma2rh/markeins/irq_markeins.c @@ -48,19 +48,12 @@ static void emma2rh_sw_irq_disable(unsig ll_emma2rh_sw_irq_disable(irq - emma2rh_sw_irq_base); } -static void emma2rh_sw_irq_end(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - ll_emma2rh_sw_irq_enable(irq - emma2rh_sw_irq_base); -} - struct irq_chip emma2rh_sw_irq_controller = { .typename = "emma2rh_sw_irq", .ack = emma2rh_sw_irq_disable, .mask = emma2rh_sw_irq_disable, .mask_ack = emma2rh_sw_irq_disable, .unmask = emma2rh_sw_irq_enable, - .end = emma2rh_sw_irq_end, }; void emma2rh_sw_irq_init(u32 irq_base) diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c index 5c4f50c..f8d417b 100644 --- a/arch/mips/jazz/irq.c +++ b/arch/mips/jazz/irq.c @@ -39,19 +39,12 @@ void disable_r4030_irq(unsigned int irq) spin_unlock_irqrestore(&r4030_lock, flags); } -static void end_r4030_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - enable_r4030_irq(irq); -} - static struct irq_chip r4030_irq_type = { .typename = "R4030", .ack = disable_r4030_irq, .mask = disable_r4030_irq, .mask_ack = disable_r4030_irq, .unmask = enable_r4030_irq, - .end = end_r4030_irq, }; void __init init_r4030_ints(void) diff --git a/arch/mips/kernel/irq-mv6434x.c b/arch/mips/kernel/irq-mv6434x.c index 6cfb31c..efbd219 100644 --- a/arch/mips/kernel/irq-mv6434x.c +++ b/arch/mips/kernel/irq-mv6434x.c @@ -67,15 +67,6 @@ static inline void unmask_mv64340_irq(un } /* - * End IRQ processing - */ -static void end_mv64340_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - unmask_mv64340_irq(irq); -} - -/* * Interrupt handler for interrupts coming from the Marvell chip. * It could be built in ethernet ports etc... */ @@ -106,7 +97,6 @@ struct irq_chip mv64340_irq_type = { .mask = mask_mv64340_irq, .mask_ack = mask_mv64340_irq, .unmask = unmask_mv64340_irq, - .end = end_mv64340_irq, }; void __init mv64340_irq_init(unsigned int base) diff --git a/arch/mips/kernel/irq-rm7000.c b/arch/mips/kernel/irq-rm7000.c index ddcc2a5..123324b 100644 --- a/arch/mips/kernel/irq-rm7000.c +++ b/arch/mips/kernel/irq-rm7000.c @@ -29,19 +29,12 @@ static inline void mask_rm7k_irq(unsigne clear_c0_intcontrol(0x100 << (irq - irq_base)); } -static void rm7k_cpu_irq_end(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - unmask_rm7k_irq(irq); -} - static struct irq_chip rm7k_irq_controller = { .typename = "RM7000", .ack = mask_rm7k_irq, .mask = mask_rm7k_irq, .mask_ack = mask_rm7k_irq, .unmask = unmask_rm7k_irq, - .end = rm7k_cpu_irq_end, }; void __init rm7k_cpu_irq_init(int base) diff --git a/arch/mips/kernel/irq-rm9000.c b/arch/mips/kernel/irq-rm9000.c index ba6440c..0e6f4c5 100644 --- a/arch/mips/kernel/irq-rm9000.c +++ b/arch/mips/kernel/irq-rm9000.c @@ -80,19 +80,12 @@ static void rm9k_perfcounter_irq_shutdow on_each_cpu(local_rm9k_perfcounter_irq_shutdown, (void *) irq, 0, 1); } -static void rm9k_cpu_irq_end(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - unmask_rm9k_irq(irq); -} - static struct irq_chip rm9k_irq_controller = { .typename = "RM9000", .ack = mask_rm9k_irq, .mask = mask_rm9k_irq, .mask_ack = mask_rm9k_irq, .unmask = unmask_rm9k_irq, - .end = rm9k_cpu_irq_end, }; static struct irq_chip rm9k_perfcounter_irq = { @@ -103,7 +96,6 @@ static struct irq_chip rm9k_perfcounter_ .mask = mask_rm9k_irq, .mask_ack = mask_rm9k_irq, .unmask = unmask_rm9k_irq, - .end = rm9k_cpu_irq_end, }; unsigned int rm9000_perfcount_irq; diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c index be5ac23..7634a66 100644 --- a/arch/mips/kernel/irq_cpu.c +++ b/arch/mips/kernel/irq_cpu.c @@ -50,12 +50,6 @@ static inline void mask_mips_irq(unsigne irq_disable_hazard(); } -static void mips_cpu_irq_end(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - unmask_mips_irq(irq); -} - static struct irq_chip mips_cpu_irq_controller = { .typename = "MIPS", .ack = mask_mips_irq, @@ -63,7 +57,6 @@ static struct irq_chip mips_cpu_irq_cont .mask_ack = mask_mips_irq, .unmask = unmask_mips_irq, .eoi = unmask_mips_irq, - .end = mips_cpu_irq_end, }; /* diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c index 4a84a7b..2affa5f 100644 --- a/arch/mips/lasat/interrupt.c +++ b/arch/mips/lasat/interrupt.c @@ -44,19 +44,12 @@ void enable_lasat_irq(unsigned int irq_n *lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift; } -static void end_lasat_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - enable_lasat_irq(irq); -} - static struct irq_chip lasat_irq_type = { .typename = "Lasat", .ack = disable_lasat_irq, .mask = disable_lasat_irq, .mask_ack = disable_lasat_irq, .unmask = enable_lasat_irq, - .end = end_lasat_irq, }; static inline int ls1bit32(unsigned int x) diff --git a/arch/mips/momentum/ocelot_c/cpci-irq.c b/arch/mips/momentum/ocelot_c/cpci-irq.c index e5a4a0a..bb11fef 100644 --- a/arch/mips/momentum/ocelot_c/cpci-irq.c +++ b/arch/mips/momentum/ocelot_c/cpci-irq.c @@ -66,15 +66,6 @@ static inline void unmask_cpci_irq(unsig } /* - * End IRQ processing - */ -static void end_cpci_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - unmask_cpci_irq(irq); -} - -/* * Interrupt handler for interrupts coming from the FPGA chip. * It could be built in ethernet ports etc... */ @@ -98,7 +89,6 @@ struct irq_chip cpci_irq_type = { .mask = mask_cpci_irq, .mask_ack = mask_cpci_irq, .unmask = unmask_cpci_irq, - .end = end_cpci_irq, }; void cpci_irq_init(void) diff --git a/arch/mips/momentum/ocelot_c/uart-irq.c b/arch/mips/momentum/ocelot_c/uart-irq.c index 0029f00..a7a80c0 100644 --- a/arch/mips/momentum/ocelot_c/uart-irq.c +++ b/arch/mips/momentum/ocelot_c/uart-irq.c @@ -60,15 +60,6 @@ static inline void unmask_uart_irq(unsig } /* - * End IRQ processing - */ -static void end_uart_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - unmask_uart_irq(irq); -} - -/* * Interrupt handler for interrupts coming from the FPGA chip. */ void ll_uart_irq(void) @@ -91,7 +82,6 @@ struct irq_chip uart_irq_type = { .mask = mask_uart_irq, .mask_ack = mask_uart_irq, .unmask = unmask_uart_irq, - .end = end_uart_irq, }; void uart_irq_init(void) diff --git a/arch/mips/philips/pnx8550/common/int.c b/arch/mips/philips/pnx8550/common/int.c index 0dc2393..2c36c10 100644 --- a/arch/mips/philips/pnx8550/common/int.c +++ b/arch/mips/philips/pnx8550/common/int.c @@ -158,20 +158,12 @@ int pnx8550_set_gic_priority(int irq, in return prev_priority; } -static void end_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) { - unmask_irq(irq); - } -} - static struct irq_chip level_irq_type = { .typename = "PNX Level IRQ", .ack = mask_irq, .mask = mask_irq, .mask_ack = mask_irq, .unmask = unmask_irq, - .end = end_irq, }; static struct irqaction gic_action = { diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c index c7b1380..c44f8be 100644 --- a/arch/mips/sgi-ip22/ip22-int.c +++ b/arch/mips/sgi-ip22/ip22-int.c @@ -51,19 +51,12 @@ static void disable_local0_irq(unsigned sgint->imask0 &= ~(1 << (irq - SGINT_LOCAL0)); } -static void end_local0_irq (unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - enable_local0_irq(irq); -} - static struct irq_chip ip22_local0_irq_type = { .typename = "IP22 local 0", .ack = disable_local0_irq, .mask = disable_local0_irq, .mask_ack = disable_local0_irq, .unmask = enable_local0_irq, - .end = end_local0_irq, }; static void enable_local1_irq(unsigned int irq) @@ -79,19 +72,12 @@ void disable_local1_irq(unsigned int irq sgint->imask1 &= ~(1 << (irq - SGINT_LOCAL1)); } -static void end_local1_irq (unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - enable_local1_irq(irq); -} - static struct irq_chip ip22_local1_irq_type = { .typename = "IP22 local 1", .ack = disable_local1_irq, .mask = disable_local1_irq, .mask_ack = disable_local1_irq, .unmask = enable_local1_irq, - .end = end_local1_irq, }; static void enable_local2_irq(unsigned int irq) @@ -107,19 +93,12 @@ void disable_local2_irq(unsigned int irq sgint->imask0 &= ~(1 << (SGI_MAP_0_IRQ - SGINT_LOCAL0)); } -static void end_local2_irq (unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - enable_local2_irq(irq); -} - static struct irq_chip ip22_local2_irq_type = { .typename = "IP22 local 2", .ack = disable_local2_irq, .mask = disable_local2_irq, .mask_ack = disable_local2_irq, .unmask = enable_local2_irq, - .end = end_local2_irq, }; static void enable_local3_irq(unsigned int irq) @@ -135,19 +114,12 @@ void disable_local3_irq(unsigned int irq sgint->imask1 &= ~(1 << (SGI_MAP_1_IRQ - SGINT_LOCAL1)); } -static void end_local3_irq (unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - enable_local3_irq(irq); -} - static struct irq_chip ip22_local3_irq_type = { .typename = "IP22 local 3", .ack = disable_local3_irq, .mask = disable_local3_irq, .mask_ack = disable_local3_irq, .unmask = enable_local3_irq, - .end = end_local3_irq, }; static void indy_local0_irqdispatch(void) diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c index 5f8835b..319f880 100644 --- a/arch/mips/sgi-ip27/ip27-irq.c +++ b/arch/mips/sgi-ip27/ip27-irq.c @@ -332,13 +332,6 @@ static inline void disable_bridge_irq(un intr_disconnect_level(cpu, swlevel); } -static void end_bridge_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)) && - irq_desc[irq].action) - enable_bridge_irq(irq); -} - static struct irq_chip bridge_irq_type = { .typename = "bridge", .startup = startup_bridge_irq, @@ -347,7 +340,6 @@ static struct irq_chip bridge_irq_type = .mask = disable_bridge_irq, .mask_ack = disable_bridge_irq, .unmask = enable_bridge_irq, - .end = end_bridge_irq, }; void __devinit register_bridge_irq(unsigned int irq) diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c index 7d36172..c20e989 100644 --- a/arch/mips/sgi-ip27/ip27-timer.c +++ b/arch/mips/sgi-ip27/ip27-timer.c @@ -180,10 +180,6 @@ static void disable_rt_irq(unsigned int { } -static void end_rt_irq(unsigned int irq) -{ -} - static struct irq_chip rt_irq_type = { .typename = "SN HUB RT timer", .ack = disable_rt_irq, @@ -191,7 +187,6 @@ static struct irq_chip rt_irq_type = { .mask_ack = disable_rt_irq, .unmask = enable_rt_irq, .eoi = enable_rt_irq, - .end = end_rt_irq, }; static struct irqaction rt_irqaction = { diff --git a/arch/mips/tx4927/common/tx4927_irq.c b/arch/mips/tx4927/common/tx4927_irq.c index 21873de..bd64c16 100644 --- a/arch/mips/tx4927/common/tx4927_irq.c +++ b/arch/mips/tx4927/common/tx4927_irq.c @@ -114,11 +114,9 @@ static const u32 tx4927_irq_debug_flag = static void tx4927_irq_cp0_enable(unsigned int irq); static void tx4927_irq_cp0_disable(unsigned int irq); -static void tx4927_irq_cp0_end(unsigned int irq); static void tx4927_irq_pic_enable(unsigned int irq); static void tx4927_irq_pic_disable(unsigned int irq); -static void tx4927_irq_pic_end(unsigned int irq); /* * Kernel structs for all pic's @@ -131,7 +129,6 @@ static struct irq_chip tx4927_irq_cp0_ty .mask = tx4927_irq_cp0_disable, .mask_ack = tx4927_irq_cp0_disable, .unmask = tx4927_irq_cp0_enable, - .end = tx4927_irq_cp0_end, }; #define TX4927_PIC_NAME "TX4927-PIC" @@ -141,7 +138,6 @@ static struct irq_chip tx4927_irq_pic_ty .mask = tx4927_irq_pic_disable, .mask_ack = tx4927_irq_pic_disable, .unmask = tx4927_irq_pic_enable, - .end = tx4927_irq_pic_end, }; #define TX4927_PIC_ACTION(s) { no_action, 0, CPU_MASK_NONE, s, NULL, NULL } @@ -214,15 +210,6 @@ static void tx4927_irq_cp0_disable(unsig tx4927_irq_cp0_modify(CCP0_STATUS, tx4927_irq_cp0_mask(irq), 0); } -static void tx4927_irq_cp0_end(unsigned int irq) -{ - TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_ENDIRQ, "irq=%d \n", irq); - - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) { - tx4927_irq_cp0_enable(irq); - } -} - /* * Functions for pic */ @@ -376,15 +363,6 @@ static void tx4927_irq_pic_disable(unsig tx4927_irq_pic_mask(irq), 0); } -static void tx4927_irq_pic_end(unsigned int irq) -{ - TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_ENDIRQ, "irq=%d\n", irq); - - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) { - tx4927_irq_pic_enable(irq); - } -} - /* * Main init functions */ diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c index 34cdb2a..ce4ef10 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c @@ -223,7 +223,6 @@ extern void mask_and_ack_8259A(unsigned static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq); static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq); -static void toshiba_rbtx4927_irq_ioc_end(unsigned int irq); #ifdef CONFIG_TOSHIBA_FPCIB0 static void toshiba_rbtx4927_irq_isa_enable(unsigned int irq); @@ -239,7 +238,6 @@ static struct irq_chip toshiba_rbtx4927_ .mask = toshiba_rbtx4927_irq_ioc_disable, .mask_ack = toshiba_rbtx4927_irq_ioc_disable, .unmask = toshiba_rbtx4927_irq_ioc_enable, - .end = toshiba_rbtx4927_irq_ioc_end, }; #define TOSHIBA_RBTX4927_IOC_INTR_ENAB 0xbc002000 #define TOSHIBA_RBTX4927_IOC_INTR_STAT 0xbc002006 @@ -388,23 +386,6 @@ static void toshiba_rbtx4927_irq_ioc_dis TOSHIBA_RBTX4927_WR08(TOSHIBA_RBTX4927_IOC_INTR_ENAB, v); } -static void toshiba_rbtx4927_irq_ioc_end(unsigned int irq) -{ - TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_IOC_ENDIRQ, - "irq=%d\n", irq); - - if (irq < TOSHIBA_RBTX4927_IRQ_IOC_BEG - || irq > TOSHIBA_RBTX4927_IRQ_IOC_END) { - TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR, - "bad irq=%d\n", irq); - panic("\n"); - } - - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) { - toshiba_rbtx4927_irq_ioc_enable(irq); - } -} - /**********************************************************************************/ /* Functions for isa */ diff --git a/arch/mips/tx4938/common/irq.c b/arch/mips/tx4938/common/irq.c index 42e1276..a347b42 100644 --- a/arch/mips/tx4938/common/irq.c +++ b/arch/mips/tx4938/common/irq.c @@ -39,11 +39,9 @@ static void tx4938_irq_cp0_enable(unsigned int irq); static void tx4938_irq_cp0_disable(unsigned int irq); -static void tx4938_irq_cp0_end(unsigned int irq); static void tx4938_irq_pic_enable(unsigned int irq); static void tx4938_irq_pic_disable(unsigned int irq); -static void tx4938_irq_pic_end(unsigned int irq); /**********************************************************************************/ /* Kernel structs for all pic's */ @@ -56,7 +54,6 @@ static struct irq_chip tx4938_irq_cp0_ty .mask = tx4938_irq_cp0_disable, .mask_ack = tx4938_irq_cp0_disable, .unmask = tx4938_irq_cp0_enable, - .end = tx4938_irq_cp0_end, }; #define TX4938_PIC_NAME "TX4938-PIC" @@ -66,7 +63,6 @@ static struct irq_chip tx4938_irq_pic_ty .mask = tx4938_irq_pic_disable, .mask_ack = tx4938_irq_pic_disable, .unmask = tx4938_irq_pic_enable, - .end = tx4938_irq_pic_end, }; static struct irqaction tx4938_irq_pic_action = { @@ -104,14 +100,6 @@ tx4938_irq_cp0_disable(unsigned int irq) clear_c0_status(tx4938_irq_cp0_mask(irq)); } -static void -tx4938_irq_cp0_end(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) { - tx4938_irq_cp0_enable(irq); - } -} - /**********************************************************************************/ /* Functions for pic */ /**********************************************************************************/ @@ -269,14 +257,6 @@ tx4938_irq_pic_disable(unsigned int irq) tx4938_irq_pic_mask(irq), 0); } -static void -tx4938_irq_pic_end(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) { - tx4938_irq_pic_enable(irq); - } -} - /**********************************************************************************/ /* Main init functions */ /**********************************************************************************/ diff --git a/arch/mips/tx4938/toshiba_rbtx4938/irq.c b/arch/mips/tx4938/toshiba_rbtx4938/irq.c index 8c87a35..b6f363d 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/irq.c +++ b/arch/mips/tx4938/toshiba_rbtx4938/irq.c @@ -89,7 +89,6 @@ IRQ Device static void toshiba_rbtx4938_irq_ioc_enable(unsigned int irq); static void toshiba_rbtx4938_irq_ioc_disable(unsigned int irq); -static void toshiba_rbtx4938_irq_ioc_end(unsigned int irq); #define TOSHIBA_RBTX4938_IOC_NAME "RBTX4938-IOC" static struct irq_chip toshiba_rbtx4938_irq_ioc_type = { @@ -98,7 +97,6 @@ static struct irq_chip toshiba_rbtx4938_ .mask = toshiba_rbtx4938_irq_ioc_disable, .mask_ack = toshiba_rbtx4938_irq_ioc_disable, .unmask = toshiba_rbtx4938_irq_ioc_enable, - .end = toshiba_rbtx4938_irq_ioc_end, }; #define TOSHIBA_RBTX4938_IOC_INTR_ENAB 0xb7f02000 @@ -167,14 +165,6 @@ toshiba_rbtx4938_irq_ioc_disable(unsigne TX4938_RD08(TOSHIBA_RBTX4938_IOC_INTR_ENAB); } -static void -toshiba_rbtx4938_irq_ioc_end(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) { - toshiba_rbtx4938_irq_ioc_enable(irq); - } -} - extern void __init txx9_spi_irqinit(int irc_irq); void __init arch_init_irq(void) diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c index 54b92a7..c075261 100644 --- a/arch/mips/vr41xx/common/icu.c +++ b/arch/mips/vr41xx/common/icu.c @@ -427,19 +427,12 @@ static void enable_sysint1_irq(unsigned icu1_set(MSYSINT1REG, 1 << SYSINT1_IRQ_TO_PIN(irq)); } -static void end_sysint1_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - icu1_set(MSYSINT1REG, 1 << SYSINT1_IRQ_TO_PIN(irq)); -} - static struct irq_chip sysint1_irq_type = { .typename = "SYSINT1", .ack = disable_sysint1_irq, .mask = disable_sysint1_irq, .mask_ack = disable_sysint1_irq, .unmask = enable_sysint1_irq, - .end = end_sysint1_irq, }; static void disable_sysint2_irq(unsigned int irq) @@ -452,19 +445,12 @@ static void enable_sysint2_irq(unsigned icu2_set(MSYSINT2REG, 1 << SYSINT2_IRQ_TO_PIN(irq)); } -static void end_sysint2_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - icu2_set(MSYSINT2REG, 1 << SYSINT2_IRQ_TO_PIN(irq)); -} - static struct irq_chip sysint2_irq_type = { .typename = "SYSINT2", .ack = disable_sysint2_irq, .mask = disable_sysint2_irq, .mask_ack = disable_sysint2_irq, .unmask = enable_sysint2_irq, - .end = end_sysint2_irq, }; static inline int set_sysint1_assign(unsigned int irq, unsigned char assign) -- 1.4.4.1 From sshtylyov@ru.mvista.com Fri Dec 1 15:07:07 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 15:07:11 +0000 (GMT) Received: from h155.mvista.com ([63.81.120.155]:28640 "EHLO imap.sh.mvista.com") by ftp.linux-mips.org with ESMTP id S20037897AbWLAPHH (ORCPT ); Fri, 1 Dec 2006 15:07:07 +0000 Received: from [192.168.1.248] (unknown [10.150.0.9]) by imap.sh.mvista.com (Postfix) with ESMTP id 0510C3ECA; Fri, 1 Dec 2006 07:06:48 -0800 (PST) Message-ID: <45704569.8000807@ru.mvista.com> Date: Fri, 01 Dec 2006 18:08:25 +0300 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: Atsushi Nemoto Cc: vagabon.xyz@gmail.com, linux-mips@linux-mips.org Subject: Re: Is _do_IRQ() not needed anymore ? References: <20061201.185740.03976990.nemoto@toshiba-tops.co.jp> <20061201.191049.63741937.nemoto@toshiba-tops.co.jp> In-Reply-To: <20061201.191049.63741937.nemoto@toshiba-tops.co.jp> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 13296 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips Hello. Atsushi Nemoto wrote: >>>If _all_ irq chip were converted to use flow handler, >>>GENERIC_HARDIRQS_NO__DO_IRQ will be good. But we have i8259... >>That's why in my example I made GENERIC_HARDIRQS_NO__DO_IRQ config >>default to 'n' and selected by a irq chip that doens't use __do_IRQ() >>anymore, well I think... > You can use both irq_cpu and i8259 same time. :) What's wrong with 8259 I wonder? It's happily converted to genirq by other arches... > --- > Atsushi Nemoto WBR, Sergei From anemo@mba.ocn.ne.jp Fri Dec 1 15:08:09 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 15:08:15 +0000 (GMT) Received: from mba.ocn.ne.jp ([210.190.142.172]:47586 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S20038324AbWLAPIJ (ORCPT ); Fri, 1 Dec 2006 15:08:09 +0000 Received: from localhost (p7250-ipad213funabasi.chiba.ocn.ne.jp [124.85.72.250]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 4DC4AC15F; Sat, 2 Dec 2006 00:08:04 +0900 (JST) Date: Sat, 02 Dec 2006 00:08:03 +0900 (JST) Message-Id: <20061202.000803.05599975.anemo@mba.ocn.ne.jp> To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org Subject: Re: [PATCH] use generic_handle_irq, handle_level_irq, handle_percpu_irq From: Atsushi Nemoto In-Reply-To: <20061114.011318.99611303.anemo@mba.ocn.ne.jp> References: <20061114.011318.99611303.anemo@mba.ocn.ne.jp> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.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: 13297 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, 14 Nov 2006 01:13:18 +0900 (JST), Atsushi Nemoto wrote: > Further incorporation of generic irq framework. Replacing __do_IRQ() > by proper flow handler would make the irq handling path a bit simpler > and faster. > > * use generic_handle_irq() instead of __do_IRQ(). > * use handle_level_irq for obvious level-type irq chips. > * use handle_percpu_irq for irqs marked as IRQ_PER_CPU. > * setup .eoi routine for irq chips possibly used with handle_percpu_irq. > > Signed-off-by: Atsushi Nemoto > > arch/mips/dec/ioasic-irq.c | 6 ++++-- Does somebody tried this patch on decstation? I'm afraid this patch broke it. While ioasic_dma_irq_type's .end routine end_ioasic_dma_irq() is doing something special, it should not be handled correctly by handle_level_irq. Here is a patch revert that part. Subject: do not use handle_level_irq for ioasic_dma_irq_type. Signed-off-by: Atsushi Nemoto diff --git a/arch/mips/dec/ioasic-irq.c b/arch/mips/dec/ioasic-irq.c index 269b22b..e21476d 100644 --- a/arch/mips/dec/ioasic-irq.c +++ b/arch/mips/dec/ioasic-irq.c @@ -106,8 +106,7 @@ void __init init_ioasic_irqs(int base) set_irq_chip_and_handler(i, &ioasic_irq_type, handle_level_irq); for (; i < base + IO_IRQ_LINES; i++) - set_irq_chip_and_handler(i, &ioasic_dma_irq_type, - handle_level_irq); + set_irq_chip(i, &ioasic_dma_irq_type); ioasic_irq_base = base; } From anemo@mba.ocn.ne.jp Fri Dec 1 15:12:22 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 15:12:27 +0000 (GMT) Received: from mba.ocn.ne.jp ([210.190.142.172]:59118 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S20037960AbWLAPMW (ORCPT ); Fri, 1 Dec 2006 15:12:22 +0000 Received: from localhost (p7250-ipad213funabasi.chiba.ocn.ne.jp [124.85.72.250]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id CCEA1BFB3; Sat, 2 Dec 2006 00:12:17 +0900 (JST) Date: Sat, 02 Dec 2006 00:12:17 +0900 (JST) Message-Id: <20061202.001217.108120576.anemo@mba.ocn.ne.jp> To: vagabon.xyz@gmail.com Cc: ralf@linux-mips.org, linux-mips@linux-mips.org Subject: Re: [PATCH] Compile __do_IRQ() when really needed From: Atsushi Nemoto In-Reply-To: <457042FF.2060908@innova-card.com> References: <457042FF.2060908@innova-card.com> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 13298 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, 01 Dec 2006 15:58:07 +0100, Franck Bui-Huu wrote: > __do_IRQ() is needed only by irq handlers that can't use > default handler defined in kernel/irq/chip.c. > > For others platforms there's no need to compile this function > since it won't be used. For those platforms this patch defines > GENERIC_HARDIRQS_NO__DO_IRQ symbol which is used exactly for > this purpose. > > Futhermore for platforms which do not use __do_IRQ(), end() > method which is part of the 'irq_chip' structure is not used. > This patch simply removes this method in this case. As I wrote in separate mail, I think I had fault on ioasic_dma_irq_type. So please drop some part from your patch. > @@ -171,6 +171,7 @@ config MACH_DECSTATION > select SYS_SUPPORTS_128HZ > select SYS_SUPPORTS_256HZ > select SYS_SUPPORTS_1024HZ > + select GENERIC_HARDIRQS_NO__DO_IRQ > help > This enables support for DEC's MIPS based workstations. For details > see the Linux/MIPS FAQ on and the and > @@ -77,20 +70,12 @@ static struct irq_chip ioasic_irq_type = > > #define ack_ioasic_dma_irq ack_ioasic_irq > > -static inline void end_ioasic_dma_irq(unsigned int irq) > -{ > - clear_ioasic_irq(irq); > - fast_iob(); > - end_ioasic_irq(irq); > -} > - > static struct irq_chip ioasic_dma_irq_type = { > .typename = "IO-ASIC-DMA", > .ack = ack_ioasic_dma_irq, > .mask = mask_ioasic_dma_irq, > .mask_ack = ack_ioasic_dma_irq, > .unmask = unmask_ioasic_dma_irq, > - .end = end_ioasic_dma_irq, > }; > > Sorry for confusion... --- Atsushi Nemoto From macro@linux-mips.org Fri Dec 1 15:14:13 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 15:14:18 +0000 (GMT) Received: from pollux.ds.pg.gda.pl ([153.19.208.7]:9477 "EHLO pollux.ds.pg.gda.pl") by ftp.linux-mips.org with ESMTP id S20038324AbWLAPON (ORCPT ); Fri, 1 Dec 2006 15:14:13 +0000 Received: from localhost (localhost [127.0.0.1]) by pollux.ds.pg.gda.pl (Postfix) with ESMTP id 23E5EE1CAE; Fri, 1 Dec 2006 16:14:01 +0100 (CET) X-Virus-Scanned: by amavisd-new at pollux.ds.pg.gda.pl Received: from pollux.ds.pg.gda.pl ([127.0.0.1]) by localhost (pollux.ds.pg.gda.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U0fJsd1e4NwV; Fri, 1 Dec 2006 16:14:00 +0100 (CET) Received: from piorun.ds.pg.gda.pl (piorun.ds.pg.gda.pl [153.19.208.8]) by pollux.ds.pg.gda.pl (Postfix) with ESMTP id C0A62E1CAC; Fri, 1 Dec 2006 16:14:00 +0100 (CET) Received: from blysk.ds.pg.gda.pl (macro@blysk.ds.pg.gda.pl [153.19.208.6]) by piorun.ds.pg.gda.pl (8.13.8/8.13.8) with ESMTP id kB1FEB1L013274; Fri, 1 Dec 2006 16:14:11 +0100 Date: Fri, 1 Dec 2006 15:14:07 +0000 (GMT) From: "Maciej W. Rozycki" To: Franck Bui-Huu cc: Ralf Baechle , Atsushi Nemoto , linux-mips Subject: Re: [PATCH] Compile __do_IRQ() when really needed In-Reply-To: <457042FF.2060908@innova-card.com> Message-ID: References: <457042FF.2060908@innova-card.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Virus-Scanned: ClamAV 0.88.6/2267/Fri Dec 1 05:29:21 2006 on piorun.ds.pg.gda.pl X-Virus-Status: Clean Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 13299 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: macro@linux-mips.org Precedence: bulk X-list: linux-mips On Fri, 1 Dec 2006, Franck Bui-Huu wrote: > diff --git a/arch/mips/dec/ioasic-irq.c b/arch/mips/dec/ioasic-irq.c > index 269b22b..c5248a1 100644 > --- a/arch/mips/dec/ioasic-irq.c > +++ b/arch/mips/dec/ioasic-irq.c > @@ -55,19 +55,12 @@ static inline void ack_ioasic_irq(unsign > fast_iob(); > } > > -static inline void end_ioasic_irq(unsigned int irq) > -{ > - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) > - unmask_ioasic_irq(irq); > -} > - > static struct irq_chip ioasic_irq_type = { > .typename = "IO-ASIC", > .ack = ack_ioasic_irq, > .mask = mask_ioasic_irq, > .mask_ack = ack_ioasic_irq, > .unmask = unmask_ioasic_irq, > - .end = end_ioasic_irq, > }; > > > @@ -77,20 +70,12 @@ static struct irq_chip ioasic_irq_type = > > #define ack_ioasic_dma_irq ack_ioasic_irq > > -static inline void end_ioasic_dma_irq(unsigned int irq) > -{ > - clear_ioasic_irq(irq); > - fast_iob(); > - end_ioasic_irq(irq); > -} > - > static struct irq_chip ioasic_dma_irq_type = { > .typename = "IO-ASIC-DMA", > .ack = ack_ioasic_dma_irq, > .mask = mask_ioasic_dma_irq, > .mask_ack = ack_ioasic_dma_irq, > .unmask = unmask_ioasic_dma_irq, > - .end = end_ioasic_dma_irq, > }; > > You have removed a call to clear_ioasic_irq() -- I/O ASIC DMA engines will cease to work as a result. Maciej From vagabon.xyz@gmail.com Fri Dec 1 15:18:17 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 15:18:21 +0000 (GMT) Received: from ug-out-1314.google.com ([66.249.92.168]:4822 "EHLO ug-out-1314.google.com") by ftp.linux-mips.org with ESMTP id S20038405AbWLAPSR (ORCPT ); Fri, 1 Dec 2006 15:18:17 +0000 Received: by ug-out-1314.google.com with SMTP id 40so2648187uga for ; Fri, 01 Dec 2006 07:18:16 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=F9490MT6fG8tJ30xxewsn+EDtTrlZgsw2MEmkowPbkZMOgMnWn4NwlvHw8GvOzBV4Ul3Mb247fT3GV/oM7LOXf6I6EU420zLp4mdo+Yj0PeGgQ1Ta9c5F9296ZPFiSzzWHVeZ66t6O6cgiXi4VREOZ+/3/5gx1dVJ6gto6YKIU8= Received: by 10.78.138.6 with SMTP id l6mr4884934hud.1164986296194; Fri, 01 Dec 2006 07:18:16 -0800 (PST) Received: by 10.78.124.19 with HTTP; Fri, 1 Dec 2006 07:18:15 -0800 (PST) Message-ID: Date: Fri, 1 Dec 2006 16:18:15 +0100 From: "Franck Bui-Huu" To: "Atsushi Nemoto" Subject: Re: [PATCH] Compile __do_IRQ() when really needed Cc: ralf@linux-mips.org, linux-mips@linux-mips.org In-Reply-To: <20061202.001217.108120576.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: <457042FF.2060908@innova-card.com> <20061202.001217.108120576.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: 13300 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 12/1/06, Atsushi Nemoto wrote: > On Fri, 01 Dec 2006 15:58:07 +0100, Franck Bui-Huu wrote: > > __do_IRQ() is needed only by irq handlers that can't use > > default handler defined in kernel/irq/chip.c. > > > > For others platforms there's no need to compile this function > > since it won't be used. For those platforms this patch defines > > GENERIC_HARDIRQS_NO__DO_IRQ symbol which is used exactly for > > this purpose. > > > > Futhermore for platforms which do not use __do_IRQ(), end() > > method which is part of the 'irq_chip' structure is not used. > > This patch simply removes this method in this case. > > As I wrote in separate mail, I think I had fault on > ioasic_dma_irq_type. So please drop some part from your patch. > Yes, I just noticed your latest patch which makes this one obsolete and wrong. I'm going to drop DEC's part. thanks -- Franck From anemo@mba.ocn.ne.jp Fri Dec 1 15:22:18 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 15:22:23 +0000 (GMT) Received: from mba.ocn.ne.jp ([210.190.142.172]:58589 "HELO smtp.mba.ocn.ne.jp") by ftp.linux-mips.org with SMTP id S20038329AbWLAPWS (ORCPT ); Fri, 1 Dec 2006 15:22:18 +0000 Received: from localhost (p7250-ipad213funabasi.chiba.ocn.ne.jp [124.85.72.250]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 4C9B6BFBB; Sat, 2 Dec 2006 00:22:14 +0900 (JST) Date: Sat, 02 Dec 2006 00:22:14 +0900 (JST) Message-Id: <20061202.002214.51866784.anemo@mba.ocn.ne.jp> To: sshtylyov@ru.mvista.com Cc: vagabon.xyz@gmail.com, linux-mips@linux-mips.org Subject: Re: Is _do_IRQ() not needed anymore ? From: Atsushi Nemoto In-Reply-To: <45704569.8000807@ru.mvista.com> References: <20061201.191049.63741937.nemoto@toshiba-tops.co.jp> <45704569.8000807@ru.mvista.com> X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A B746 CA77 FE94 2874 D52F X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F X-Mailer: Mew version 3.3 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 13301 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, 01 Dec 2006 18:08:25 +0300, Sergei Shtylyov wrote: > > You can use both irq_cpu and i8259 same time. :) > > What's wrong with 8259 I wonder? It's happily converted to genirq by other > arches... Indeed. I missed other arch's i8259.c had changed. Maybe we should update i8259.c entirely. --- Atsushi Nemoto From sshtylyov@ru.mvista.com Fri Dec 1 15:27:45 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 15:27:49 +0000 (GMT) Received: from h155.mvista.com ([63.81.120.155]:46560 "EHLO imap.sh.mvista.com") by ftp.linux-mips.org with ESMTP id S20038324AbWLAP1p (ORCPT ); Fri, 1 Dec 2006 15:27:45 +0000 Received: from [192.168.1.248] (unknown [10.150.0.9]) by imap.sh.mvista.com (Postfix) with ESMTP id 7D5B33ECA; Fri, 1 Dec 2006 07:27:40 -0800 (PST) Message-ID: <45704A4D.9050303@ru.mvista.com> Date: Fri, 01 Dec 2006 18:29:17 +0300 From: Sergei Shtylyov Organization: MontaVista Software Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803 X-Accept-Language: ru, en-us, en-gb MIME-Version: 1.0 To: Atsushi Nemoto Cc: vagabon.xyz@gmail.com, linux-mips@linux-mips.org Subject: Re: Is _do_IRQ() not needed anymore ? References: <20061201.191049.63741937.nemoto@toshiba-tops.co.jp> <45704569.8000807@ru.mvista.com> <20061202.002214.51866784.anemo@mba.ocn.ne.jp> In-Reply-To: <20061202.002214.51866784.anemo@mba.ocn.ne.jp> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 13302 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: sshtylyov@ru.mvista.com Precedence: bulk X-list: linux-mips Hello. Atsushi Nemoto wrote: >>>You can use both irq_cpu and i8259 same time. :) >> What's wrong with 8259 I wonder? It's happily converted to genirq by other >>arches... > Indeed. I missed other arch's i8259.c had changed. Maybe we should > update i8259.c entirely. The question is what flow to use: level/edge ones used in x86 code and actually intended for simplistic controllers, not the likes of 8259 OR the "fasteoi" one used in PowerPC code and (as it turned out in my earlier discussion in linuxppc-dev) intended for the controllers that are smart enough to mask off the lower-priority IRQs when getting the top level one acknowledged and unmask them upon EOI command... > --- > Atsushi Nemoto WBR, Sergei From yoichi_yuasa@tripeaks.co.jp Fri Dec 1 15:29:52 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 15:29:57 +0000 (GMT) Received: from mo32.po.2iij.net ([210.128.50.17]:46894 "EHLO mo32.po.2iij.net") by ftp.linux-mips.org with ESMTP id S20038324AbWLAP3w (ORCPT ); Fri, 1 Dec 2006 15:29:52 +0000 Received: by mo.po.2iij.net (mo32) id kB1FTkir023411; Sat, 2 Dec 2006 00:29:46 +0900 (JST) Received: from localhost.localdomain (133.25.30.125.dy.iij4u.or.jp [125.30.25.133]) by mbox.po.2iij.net (mbox32) id kB1FTbdF080366 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sat, 2 Dec 2006 00:29:38 +0900 (JST) Date: Sat, 2 Dec 2006 00:29:37 +0900 From: Yoichi Yuasa To: Franck Cc: yoichi_yuasa@tripeaks.co.jp, ralf@linux-mips.org, anemo@mba.ocn.ne.jp, linux-mips@linux-mips.org Subject: Re: [PATCH] Compile __do_IRQ() when really needed Message-Id: <20061202002937.7b4cb749.yoichi_yuasa@tripeaks.co.jp> In-Reply-To: <457042FF.2060908@innova-card.com> References: <457042FF.2060908@innova-card.com> Organization: TriPeaks Corporation X-Mailer: Sylpheed version 1.0.6 (GTK+ 1.2.10; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 13303 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: yoichi_yuasa@tripeaks.co.jp Precedence: bulk X-list: linux-mips Hi, On Fri, 01 Dec 2006 15:58:07 +0100 Franck Bui-Huu wrote: > config MACH_VR41XX > bool "NEC VR41XX-based machines" > select SYS_HAS_CPU_VR41XX > + select GENERIC_HARDIRQS_NO__DO_IRQ NEC CMBVR4133 has i8259. The other vr41xx boards have no problem. Thanks, Yoichi From vagabon.xyz@gmail.com Fri Dec 1 15:31:40 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 15:31:46 +0000 (GMT) Received: from nf-out-0910.google.com ([64.233.182.184]:18026 "EHLO nf-out-0910.google.com") by ftp.linux-mips.org with ESMTP id S20038416AbWLAPbk (ORCPT ); Fri, 1 Dec 2006 15:31:40 +0000 Received: by nf-out-0910.google.com with SMTP id l24so3455611nfc for ; Fri, 01 Dec 2006 07:31:39 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:reply-to:user-agent:mime-version:to:cc:subject:content-type:content-transfer-encoding:from; b=WbfsuoStQlV1M2JnWO96MwmhXnr/6neajbNFN6Eo882xw1kGwsK04Ac+9oCQsxh4X8ITILyB2+0DHQYSCFkapSwenRlUOYxQNGkzpdgqHJ1BdBZ8RW4q7xEoSRiEotwtbpSNKNG1fwfNFqJaXGA+/oYPhR8ngSjsbYFkGpQvcBY= Received: by 10.49.21.8 with SMTP id y8mr9385280nfi.1164987098127; Fri, 01 Dec 2006 07:31:38 -0800 (PST) Received: from ?192.168.0.24? ( [81.252.61.1]) by mx.google.com with ESMTP id x27sm16017566nfb.2006.12.01.07.31.37; Fri, 01 Dec 2006 07:31:37 -0800 (PST) Message-ID: <45704B26.9040202@innova-card.com> Date: Fri, 01 Dec 2006 16:32:54 +0100 Reply-To: Franck User-Agent: Thunderbird 1.5.0.4 (X11/20060614) MIME-Version: 1.0 To: Ralf Baechle CC: Atsushi Nemoto , macro@linux-mips.org, linux-mips Subject: [PATCH] Compile __do_IRQ() when really needed [take #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: 13304 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 __do_IRQ() is needed only by irq handlers that can't use default handler defined in kernel/irq/chip.c. For others platforms there's no need to compile this function since it won't be used. For those platforms this patch defines GENERIC_HARDIRQS_NO__DO_IRQ symbol which is used exactly for this purpose. Futhermore for platforms which do not use __do_IRQ(), end() method which is part of the 'irq_chip' structure is not used. This patch simply removes this method in this case. Signed-off-by: Franck Bui-Huu --- With DEC's part updated. arch/mips/Kconfig | 15 ++++++++++ arch/mips/dec/ioasic-irq.c | 7 ----- arch/mips/dec/kn02-irq.c | 7 ----- arch/mips/emma2rh/common/irq_emma2rh.c | 7 ----- arch/mips/emma2rh/markeins/irq_markeins.c | 7 ----- arch/mips/jazz/irq.c | 7 ----- arch/mips/kernel/irq-mv6434x.c | 10 ------- arch/mips/kernel/irq-rm7000.c | 7 ----- arch/mips/kernel/irq-rm9000.c | 8 ----- arch/mips/kernel/irq_cpu.c | 7 ----- arch/mips/lasat/interrupt.c | 7 ----- arch/mips/momentum/ocelot_c/cpci-irq.c | 10 ------- arch/mips/momentum/ocelot_c/uart-irq.c | 10 ------- arch/mips/philips/pnx8550/common/int.c | 8 ----- arch/mips/sgi-ip22/ip22-int.c | 28 -------------------- arch/mips/sgi-ip27/ip27-irq.c | 8 ----- arch/mips/sgi-ip27/ip27-timer.c | 5 --- arch/mips/tx4927/common/tx4927_irq.c | 22 --------------- .../tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | 19 ------------- arch/mips/tx4938/common/irq.c | 20 -------------- arch/mips/tx4938/toshiba_rbtx4938/irq.c | 10 ------- arch/mips/vr41xx/common/icu.c | 14 ---------- 22 files changed, 15 insertions(+), 228 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 5ff94e5..08a64a8 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -216,6 +216,7 @@ config MACH_JAZZ select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL select SYS_SUPPORTS_100HZ + select GENERIC_HARDIRQS_NO__DO_IRQ help This a family of machines based on the MIPS R4030 chipset which was used by several vendors to build RISC/os and Windows NT workstations. @@ -233,6 +234,7 @@ config LASAT select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL select SYS_SUPPORTS_LITTLE_ENDIAN + select GENERIC_HARDIRQS_NO__DO_IRQ config MIPS_ATLAS bool "MIPS Atlas board" @@ -256,6 +258,7 @@ config MIPS_ATLAS select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_MULTITHREADING if EXPERIMENTAL + select GENERIC_HARDIRQS_NO__DO_IRQ help This enables support for the MIPS Technologies Atlas evaluation board. @@ -410,6 +413,7 @@ config MOMENCO_OCELOT_C select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_BIG_ENDIAN + select GENERIC_HARDIRQS_NO__DO_IRQ help The Ocelot is a MIPS-based Single Board Computer (SBC) made by Momentum Computer . @@ -468,6 +472,7 @@ config DDB5477 config MACH_VR41XX bool "NEC VR41XX-based machines" select SYS_HAS_CPU_VR41XX + select GENERIC_HARDIRQS_NO__DO_IRQ config PMC_YOSEMITE bool "PMC-Sierra Yosemite eval board" @@ -519,6 +524,7 @@ config MARKEINS select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_HAS_CPU_R5000 + select GENERIC_HARDIRQS_NO__DO_IRQ help This enables support for the R5432-based NEC Mark-eins boards with R5500 CPU. @@ -539,6 +545,7 @@ config SGI_IP22 select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_BIG_ENDIAN + select GENERIC_HARDIRQS_NO__DO_IRQ help This are the SGI Indy, Challenge S and Indigo2, as well as certain OEM variants like the Tandem CMN B006S. To compile a Linux kernel @@ -558,6 +565,7 @@ config SGI_IP27 select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_NUMA select SYS_SUPPORTS_SMP + select GENERIC_HARDIRQS_NO__DO_IRQ help This are the SGI Origin 200, Origin 2000 and Onyx 2 Graphics workstations. To compile a Linux kernel that runs on these, say Y @@ -739,6 +747,7 @@ config TOSHIBA_RBTX4927 select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_BIG_ENDIAN select TOSHIBA_BOARDS + select GENERIC_HARDIRQS_NO__DO_IRQ help This Toshiba board is based on the TX4927 processor. Say Y here to support this machine type @@ -758,6 +767,7 @@ config TOSHIBA_RBTX4938 select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_BIG_ENDIAN select TOSHIBA_BOARDS + select GENERIC_HARDIRQS_NO__DO_IRQ help This Toshiba board is based on the TX4938 processor. Say Y here to support this machine type @@ -824,6 +834,10 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER bool default y +config GENERIC_HARDIRQS_NO__DO_IRQ + bool + default n + # # Select some configuration options automatically based on user selections. # @@ -985,6 +999,7 @@ config SOC_PNX8550 select HW_HAS_PCI select SYS_HAS_CPU_MIPS32_R1 select SYS_SUPPORTS_32BIT_KERNEL + select GENERIC_HARDIRQS_NO__DO_IRQ config SWAP_IO_SPACE bool diff --git a/arch/mips/dec/ioasic-irq.c b/arch/mips/dec/ioasic-irq.c index 269b22b..880ef88 100644 --- a/arch/mips/dec/ioasic-irq.c +++ b/arch/mips/dec/ioasic-irq.c @@ -55,19 +55,12 @@ static inline void ack_ioasic_irq(unsign fast_iob(); } -static inline void end_ioasic_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - unmask_ioasic_irq(irq); -} - static struct irq_chip ioasic_irq_type = { .typename = "IO-ASIC", .ack = ack_ioasic_irq, .mask = mask_ioasic_irq, .mask_ack = ack_ioasic_irq, .unmask = unmask_ioasic_irq, - .end = end_ioasic_irq, }; diff --git a/arch/mips/dec/kn02-irq.c b/arch/mips/dec/kn02-irq.c index 5a9be4c..916e46b 100644 --- a/arch/mips/dec/kn02-irq.c +++ b/arch/mips/dec/kn02-irq.c @@ -57,19 +57,12 @@ static void ack_kn02_irq(unsigned int ir iob(); } -static void end_kn02_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - unmask_kn02_irq(irq); -} - static struct irq_chip kn02_irq_type = { .typename = "KN02-CSR", .ack = ack_kn02_irq, .mask = mask_kn02_irq, .mask_ack = ack_kn02_irq, .unmask = unmask_kn02_irq, - .end = end_kn02_irq, }; diff --git a/arch/mips/emma2rh/common/irq_emma2rh.c b/arch/mips/emma2rh/common/irq_emma2rh.c index 59b9829..8d880f0 100644 --- a/arch/mips/emma2rh/common/irq_emma2rh.c +++ b/arch/mips/emma2rh/common/irq_emma2rh.c @@ -56,19 +56,12 @@ static void emma2rh_irq_disable(unsigned ll_emma2rh_irq_disable(irq - emma2rh_irq_base); } -static void emma2rh_irq_end(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - ll_emma2rh_irq_enable(irq - emma2rh_irq_base); -} - struct irq_chip emma2rh_irq_controller = { .typename = "emma2rh_irq", .ack = emma2rh_irq_disable, .mask = emma2rh_irq_disable, .mask_ack = emma2rh_irq_disable, .unmask = emma2rh_irq_enable, - .end = emma2rh_irq_end, }; void emma2rh_irq_init(u32 irq_base) diff --git a/arch/mips/emma2rh/markeins/irq_markeins.c b/arch/mips/emma2rh/markeins/irq_markeins.c index 3ac4e40..2116d9b 100644 --- a/arch/mips/emma2rh/markeins/irq_markeins.c +++ b/arch/mips/emma2rh/markeins/irq_markeins.c @@ -48,19 +48,12 @@ static void emma2rh_sw_irq_disable(unsig ll_emma2rh_sw_irq_disable(irq - emma2rh_sw_irq_base); } -static void emma2rh_sw_irq_end(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - ll_emma2rh_sw_irq_enable(irq - emma2rh_sw_irq_base); -} - struct irq_chip emma2rh_sw_irq_controller = { .typename = "emma2rh_sw_irq", .ack = emma2rh_sw_irq_disable, .mask = emma2rh_sw_irq_disable, .mask_ack = emma2rh_sw_irq_disable, .unmask = emma2rh_sw_irq_enable, - .end = emma2rh_sw_irq_end, }; void emma2rh_sw_irq_init(u32 irq_base) diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c index 5c4f50c..f8d417b 100644 --- a/arch/mips/jazz/irq.c +++ b/arch/mips/jazz/irq.c @@ -39,19 +39,12 @@ void disable_r4030_irq(unsigned int irq) spin_unlock_irqrestore(&r4030_lock, flags); } -static void end_r4030_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - enable_r4030_irq(irq); -} - static struct irq_chip r4030_irq_type = { .typename = "R4030", .ack = disable_r4030_irq, .mask = disable_r4030_irq, .mask_ack = disable_r4030_irq, .unmask = enable_r4030_irq, - .end = end_r4030_irq, }; void __init init_r4030_ints(void) diff --git a/arch/mips/kernel/irq-mv6434x.c b/arch/mips/kernel/irq-mv6434x.c index 6cfb31c..efbd219 100644 --- a/arch/mips/kernel/irq-mv6434x.c +++ b/arch/mips/kernel/irq-mv6434x.c @@ -67,15 +67,6 @@ static inline void unmask_mv64340_irq(un } /* - * End IRQ processing - */ -static void end_mv64340_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - unmask_mv64340_irq(irq); -} - -/* * Interrupt handler for interrupts coming from the Marvell chip. * It could be built in ethernet ports etc... */ @@ -106,7 +97,6 @@ struct irq_chip mv64340_irq_type = { .mask = mask_mv64340_irq, .mask_ack = mask_mv64340_irq, .unmask = unmask_mv64340_irq, - .end = end_mv64340_irq, }; void __init mv64340_irq_init(unsigned int base) diff --git a/arch/mips/kernel/irq-rm7000.c b/arch/mips/kernel/irq-rm7000.c index ddcc2a5..123324b 100644 --- a/arch/mips/kernel/irq-rm7000.c +++ b/arch/mips/kernel/irq-rm7000.c @@ -29,19 +29,12 @@ static inline void mask_rm7k_irq(unsigne clear_c0_intcontrol(0x100 << (irq - irq_base)); } -static void rm7k_cpu_irq_end(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - unmask_rm7k_irq(irq); -} - static struct irq_chip rm7k_irq_controller = { .typename = "RM7000", .ack = mask_rm7k_irq, .mask = mask_rm7k_irq, .mask_ack = mask_rm7k_irq, .unmask = unmask_rm7k_irq, - .end = rm7k_cpu_irq_end, }; void __init rm7k_cpu_irq_init(int base) diff --git a/arch/mips/kernel/irq-rm9000.c b/arch/mips/kernel/irq-rm9000.c index ba6440c..0e6f4c5 100644 --- a/arch/mips/kernel/irq-rm9000.c +++ b/arch/mips/kernel/irq-rm9000.c @@ -80,19 +80,12 @@ static void rm9k_perfcounter_irq_shutdow on_each_cpu(local_rm9k_perfcounter_irq_shutdown, (void *) irq, 0, 1); } -static void rm9k_cpu_irq_end(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - unmask_rm9k_irq(irq); -} - static struct irq_chip rm9k_irq_controller = { .typename = "RM9000", .ack = mask_rm9k_irq, .mask = mask_rm9k_irq, .mask_ack = mask_rm9k_irq, .unmask = unmask_rm9k_irq, - .end = rm9k_cpu_irq_end, }; static struct irq_chip rm9k_perfcounter_irq = { @@ -103,7 +96,6 @@ static struct irq_chip rm9k_perfcounter_ .mask = mask_rm9k_irq, .mask_ack = mask_rm9k_irq, .unmask = unmask_rm9k_irq, - .end = rm9k_cpu_irq_end, }; unsigned int rm9000_perfcount_irq; diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c index be5ac23..7634a66 100644 --- a/arch/mips/kernel/irq_cpu.c +++ b/arch/mips/kernel/irq_cpu.c @@ -50,12 +50,6 @@ static inline void mask_mips_irq(unsigne irq_disable_hazard(); } -static void mips_cpu_irq_end(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - unmask_mips_irq(irq); -} - static struct irq_chip mips_cpu_irq_controller = { .typename = "MIPS", .ack = mask_mips_irq, @@ -63,7 +57,6 @@ static struct irq_chip mips_cpu_irq_cont .mask_ack = mask_mips_irq, .unmask = unmask_mips_irq, .eoi = unmask_mips_irq, - .end = mips_cpu_irq_end, }; /* diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c index 4a84a7b..2affa5f 100644 --- a/arch/mips/lasat/interrupt.c +++ b/arch/mips/lasat/interrupt.c @@ -44,19 +44,12 @@ void enable_lasat_irq(unsigned int irq_n *lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift; } -static void end_lasat_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - enable_lasat_irq(irq); -} - static struct irq_chip lasat_irq_type = { .typename = "Lasat", .ack = disable_lasat_irq, .mask = disable_lasat_irq, .mask_ack = disable_lasat_irq, .unmask = enable_lasat_irq, - .end = end_lasat_irq, }; static inline int ls1bit32(unsigned int x) diff --git a/arch/mips/momentum/ocelot_c/cpci-irq.c b/arch/mips/momentum/ocelot_c/cpci-irq.c index e5a4a0a..bb11fef 100644 --- a/arch/mips/momentum/ocelot_c/cpci-irq.c +++ b/arch/mips/momentum/ocelot_c/cpci-irq.c @@ -66,15 +66,6 @@ static inline void unmask_cpci_irq(unsig } /* - * End IRQ processing - */ -static void end_cpci_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - unmask_cpci_irq(irq); -} - -/* * Interrupt handler for interrupts coming from the FPGA chip. * It could be built in ethernet ports etc... */ @@ -98,7 +89,6 @@ struct irq_chip cpci_irq_type = { .mask = mask_cpci_irq, .mask_ack = mask_cpci_irq, .unmask = unmask_cpci_irq, - .end = end_cpci_irq, }; void cpci_irq_init(void) diff --git a/arch/mips/momentum/ocelot_c/uart-irq.c b/arch/mips/momentum/ocelot_c/uart-irq.c index 0029f00..a7a80c0 100644 --- a/arch/mips/momentum/ocelot_c/uart-irq.c +++ b/arch/mips/momentum/ocelot_c/uart-irq.c @@ -60,15 +60,6 @@ static inline void unmask_uart_irq(unsig } /* - * End IRQ processing - */ -static void end_uart_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - unmask_uart_irq(irq); -} - -/* * Interrupt handler for interrupts coming from the FPGA chip. */ void ll_uart_irq(void) @@ -91,7 +82,6 @@ struct irq_chip uart_irq_type = { .mask = mask_uart_irq, .mask_ack = mask_uart_irq, .unmask = unmask_uart_irq, - .end = end_uart_irq, }; void uart_irq_init(void) diff --git a/arch/mips/philips/pnx8550/common/int.c b/arch/mips/philips/pnx8550/common/int.c index 0dc2393..2c36c10 100644 --- a/arch/mips/philips/pnx8550/common/int.c +++ b/arch/mips/philips/pnx8550/common/int.c @@ -158,20 +158,12 @@ int pnx8550_set_gic_priority(int irq, in return prev_priority; } -static void end_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) { - unmask_irq(irq); - } -} - static struct irq_chip level_irq_type = { .typename = "PNX Level IRQ", .ack = mask_irq, .mask = mask_irq, .mask_ack = mask_irq, .unmask = unmask_irq, - .end = end_irq, }; static struct irqaction gic_action = { diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c index c7b1380..c44f8be 100644 --- a/arch/mips/sgi-ip22/ip22-int.c +++ b/arch/mips/sgi-ip22/ip22-int.c @@ -51,19 +51,12 @@ static void disable_local0_irq(unsigned sgint->imask0 &= ~(1 << (irq - SGINT_LOCAL0)); } -static void end_local0_irq (unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - enable_local0_irq(irq); -} - static struct irq_chip ip22_local0_irq_type = { .typename = "IP22 local 0", .ack = disable_local0_irq, .mask = disable_local0_irq, .mask_ack = disable_local0_irq, .unmask = enable_local0_irq, - .end = end_local0_irq, }; static void enable_local1_irq(unsigned int irq) @@ -79,19 +72,12 @@ void disable_local1_irq(unsigned int irq sgint->imask1 &= ~(1 << (irq - SGINT_LOCAL1)); } -static void end_local1_irq (unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - enable_local1_irq(irq); -} - static struct irq_chip ip22_local1_irq_type = { .typename = "IP22 local 1", .ack = disable_local1_irq, .mask = disable_local1_irq, .mask_ack = disable_local1_irq, .unmask = enable_local1_irq, - .end = end_local1_irq, }; static void enable_local2_irq(unsigned int irq) @@ -107,19 +93,12 @@ void disable_local2_irq(unsigned int irq sgint->imask0 &= ~(1 << (SGI_MAP_0_IRQ - SGINT_LOCAL0)); } -static void end_local2_irq (unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - enable_local2_irq(irq); -} - static struct irq_chip ip22_local2_irq_type = { .typename = "IP22 local 2", .ack = disable_local2_irq, .mask = disable_local2_irq, .mask_ack = disable_local2_irq, .unmask = enable_local2_irq, - .end = end_local2_irq, }; static void enable_local3_irq(unsigned int irq) @@ -135,19 +114,12 @@ void disable_local3_irq(unsigned int irq sgint->imask1 &= ~(1 << (SGI_MAP_1_IRQ - SGINT_LOCAL1)); } -static void end_local3_irq (unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) - enable_local3_irq(irq); -} - static struct irq_chip ip22_local3_irq_type = { .typename = "IP22 local 3", .ack = disable_local3_irq, .mask = disable_local3_irq, .mask_ack = disable_local3_irq, .unmask = enable_local3_irq, - .end = end_local3_irq, }; static void indy_local0_irqdispatch(void) diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c index 5f8835b..319f880 100644 --- a/arch/mips/sgi-ip27/ip27-irq.c +++ b/arch/mips/sgi-ip27/ip27-irq.c @@ -332,13 +332,6 @@ static inline void disable_bridge_irq(un intr_disconnect_level(cpu, swlevel); } -static void end_bridge_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)) && - irq_desc[irq].action) - enable_bridge_irq(irq); -} - static struct irq_chip bridge_irq_type = { .typename = "bridge", .startup = startup_bridge_irq, @@ -347,7 +340,6 @@ static struct irq_chip bridge_irq_type = .mask = disable_bridge_irq, .mask_ack = disable_bridge_irq, .unmask = enable_bridge_irq, - .end = end_bridge_irq, }; void __devinit register_bridge_irq(unsigned int irq) diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c index 7d36172..c20e989 100644 --- a/arch/mips/sgi-ip27/ip27-timer.c +++ b/arch/mips/sgi-ip27/ip27-timer.c @@ -180,10 +180,6 @@ static void disable_rt_irq(unsigned int { } -static void end_rt_irq(unsigned int irq) -{ -} - static struct irq_chip rt_irq_type = { .typename = "SN HUB RT timer", .ack = disable_rt_irq, @@ -191,7 +187,6 @@ static struct irq_chip rt_irq_type = { .mask_ack = disable_rt_irq, .unmask = enable_rt_irq, .eoi = enable_rt_irq, - .end = end_rt_irq, }; static struct irqaction rt_irqaction = { diff --git a/arch/mips/tx4927/common/tx4927_irq.c b/arch/mips/tx4927/common/tx4927_irq.c index 21873de..bd64c16 100644 --- a/arch/mips/tx4927/common/tx4927_irq.c +++ b/arch/mips/tx4927/common/tx4927_irq.c @@ -114,11 +114,9 @@ static const u32 tx4927_irq_debug_flag = static void tx4927_irq_cp0_enable(unsigned int irq); static void tx4927_irq_cp0_disable(unsigned int irq); -static void tx4927_irq_cp0_end(unsigned int irq); static void tx4927_irq_pic_enable(unsigned int irq); static void tx4927_irq_pic_disable(unsigned int irq); -static void tx4927_irq_pic_end(unsigned int irq); /* * Kernel structs for all pic's @@ -131,7 +129,6 @@ static struct irq_chip tx4927_irq_cp0_ty .mask = tx4927_irq_cp0_disable, .mask_ack = tx4927_irq_cp0_disable, .unmask = tx4927_irq_cp0_enable, - .end = tx4927_irq_cp0_end, }; #define TX4927_PIC_NAME "TX4927-PIC" @@ -141,7 +138,6 @@ static struct irq_chip tx4927_irq_pic_ty .mask = tx4927_irq_pic_disable, .mask_ack = tx4927_irq_pic_disable, .unmask = tx4927_irq_pic_enable, - .end = tx4927_irq_pic_end, }; #define TX4927_PIC_ACTION(s) { no_action, 0, CPU_MASK_NONE, s, NULL, NULL } @@ -214,15 +210,6 @@ static void tx4927_irq_cp0_disable(unsig tx4927_irq_cp0_modify(CCP0_STATUS, tx4927_irq_cp0_mask(irq), 0); } -static void tx4927_irq_cp0_end(unsigned int irq) -{ - TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_ENDIRQ, "irq=%d \n", irq); - - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) { - tx4927_irq_cp0_enable(irq); - } -} - /* * Functions for pic */ @@ -376,15 +363,6 @@ static void tx4927_irq_pic_disable(unsig tx4927_irq_pic_mask(irq), 0); } -static void tx4927_irq_pic_end(unsigned int irq) -{ - TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_ENDIRQ, "irq=%d\n", irq); - - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) { - tx4927_irq_pic_enable(irq); - } -} - /* * Main init functions */ diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c index 34cdb2a..ce4ef10 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c @@ -223,7 +223,6 @@ extern void mask_and_ack_8259A(unsigned static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq); static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq); -static void toshiba_rbtx4927_irq_ioc_end(unsigned int irq); #ifdef CONFIG_TOSHIBA_FPCIB0 static void toshiba_rbtx4927_irq_isa_enable(unsigned int irq); @@ -239,7 +238,6 @@ static struct irq_chip toshiba_rbtx4927_ .mask = toshiba_rbtx4927_irq_ioc_disable, .mask_ack = toshiba_rbtx4927_irq_ioc_disable, .unmask = toshiba_rbtx4927_irq_ioc_enable, - .end = toshiba_rbtx4927_irq_ioc_end, }; #define TOSHIBA_RBTX4927_IOC_INTR_ENAB 0xbc002000 #define TOSHIBA_RBTX4927_IOC_INTR_STAT 0xbc002006 @@ -388,23 +386,6 @@ static void toshiba_rbtx4927_irq_ioc_dis TOSHIBA_RBTX4927_WR08(TOSHIBA_RBTX4927_IOC_INTR_ENAB, v); } -static void toshiba_rbtx4927_irq_ioc_end(unsigned int irq) -{ - TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_IOC_ENDIRQ, - "irq=%d\n", irq); - - if (irq < TOSHIBA_RBTX4927_IRQ_IOC_BEG - || irq > TOSHIBA_RBTX4927_IRQ_IOC_END) { - TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR, - "bad irq=%d\n", irq); - panic("\n"); - } - - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) { - toshiba_rbtx4927_irq_ioc_enable(irq); - } -} - /**********************************************************************************/ /* Functions for isa */ diff --git a/arch/mips/tx4938/common/irq.c b/arch/mips/tx4938/common/irq.c index 42e1276..a347b42 100644 --- a/arch/mips/tx4938/common/irq.c +++ b/arch/mips/tx4938/common/irq.c @@ -39,11 +39,9 @@ static void tx4938_irq_cp0_enable(unsigned int irq); static void tx4938_irq_cp0_disable(unsigned int irq); -static void tx4938_irq_cp0_end(unsigned int irq); static void tx4938_irq_pic_enable(unsigned int irq); static void tx4938_irq_pic_disable(unsigned int irq); -static void tx4938_irq_pic_end(unsigned int irq); /**********************************************************************************/ /* Kernel structs for all pic's */ @@ -56,7 +54,6 @@ static struct irq_chip tx4938_irq_cp0_ty .mask = tx4938_irq_cp0_disable, .mask_ack = tx4938_irq_cp0_disable, .unmask = tx4938_irq_cp0_enable, - .end = tx4938_irq_cp0_end, }; #define TX4938_PIC_NAME "TX4938-PIC" @@ -66,7 +63,6 @@ static struct irq_chip tx4938_irq_pic_ty .mask = tx4938_irq_pic_disable, .mask_ack = tx4938_irq_pic_disable, .unmask = tx4938_irq_pic_enable, - .end = tx4938_irq_pic_end, }; static struct irqaction tx4938_irq_pic_action = { @@ -104,14 +100,6 @@ tx4938_irq_cp0_disable(unsigned int irq) clear_c0_status(tx4938_irq_cp0_mask(irq)); } -static void -tx4938_irq_cp0_end(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) { - tx4938_irq_cp0_enable(irq); - } -} - /**********************************************************************************/ /* Functions for pic */ /**********************************************************************************/ @@ -269,14 +257,6 @@ tx4938_irq_pic_disable(unsigned int irq) tx4938_irq_pic_mask(irq), 0); } -static void -tx4938_irq_pic_end(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) { - tx4938_irq_pic_enable(irq); - } -} - /**********************************************************************************/ /* Main init functions */ /**********************************************************************************/ diff --git a/arch/mips/tx4938/toshiba_rbtx4938/irq.c b/arch/mips/tx4938/toshiba_rbtx4938/irq.c index 8c87a35..b6f363d 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/irq.c +++ b/arch/mips/tx4938/toshiba_rbtx4938/irq.c @@ -89,7 +89,6 @@ IRQ Device static void toshiba_rbtx4938_irq_ioc_enable(unsigned int irq); static void toshiba_rbtx4938_irq_ioc_disable(unsigned int irq); -static void toshiba_rbtx4938_irq_ioc_end(unsigned int irq); #define TOSHIBA_RBTX4938_IOC_NAME "RBTX4938-IOC" static struct irq_chip toshiba_rbtx4938_irq_ioc_type = { @@ -98,7 +97,6 @@ static struct irq_chip toshiba_rbtx4938_ .mask = toshiba_rbtx4938_irq_ioc_disable, .mask_ack = toshiba_rbtx4938_irq_ioc_disable, .unmask = toshiba_rbtx4938_irq_ioc_enable, - .end = toshiba_rbtx4938_irq_ioc_end, }; #define TOSHIBA_RBTX4938_IOC_INTR_ENAB 0xb7f02000 @@ -167,14 +165,6 @@ toshiba_rbtx4938_irq_ioc_disable(unsigne TX4938_RD08(TOSHIBA_RBTX4938_IOC_INTR_ENAB); } -static void -toshiba_rbtx4938_irq_ioc_end(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) { - toshiba_rbtx4938_irq_ioc_enable(irq); - } -} - extern void __init txx9_spi_irqinit(int irc_irq); void __init arch_init_irq(void) diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c index 54b92a7..c075261 100644 --- a/arch/mips/vr41xx/common/icu.c +++ b/arch/mips/vr41xx/common/icu.c @@ -427,19 +427,12 @@ static void enable_sysint1_irq(unsigned icu1_set(MSYSINT1REG, 1 << SYSINT1_IRQ_TO_PIN(irq)); } -static void end_sysint1_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - icu1_set(MSYSINT1REG, 1 << SYSINT1_IRQ_TO_PIN(irq)); -} - static struct irq_chip sysint1_irq_type = { .typename = "SYSINT1", .ack = disable_sysint1_irq, .mask = disable_sysint1_irq, .mask_ack = disable_sysint1_irq, .unmask = enable_sysint1_irq, - .end = end_sysint1_irq, }; static void disable_sysint2_irq(unsigned int irq) @@ -452,19 +445,12 @@ static void enable_sysint2_irq(unsigned icu2_set(MSYSINT2REG, 1 << SYSINT2_IRQ_TO_PIN(irq)); } -static void end_sysint2_irq(unsigned int irq) -{ - if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) - icu2_set(MSYSINT2REG, 1 << SYSINT2_IRQ_TO_PIN(irq)); -} - static struct irq_chip sysint2_irq_type = { .typename = "SYSINT2", .ack = disable_sysint2_irq, .mask = disable_sysint2_irq, .mask_ack = disable_sysint2_irq, .unmask = enable_sysint2_irq, - .end = end_sysint2_irq, }; static inline int set_sysint1_assign(unsigned int irq, unsigned char assign) -- 1.4.4.1 From sshtylyov@ru.mvista.com Fri Dec 1 15:33:21 2006 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 Dec 2006 15:33:25 +0000 (GMT) Received: from h155.mvista.com ([63.81.120.155]:57568 "EHLO imap.sh.mvista.com") by ftp.linux-mips.org with ESMTP id S20038419AbWLAPdV (ORCPT ); Fri, 1 Dec 2006 15:33:21 +0000 Received: from [192.168.1.248] (unknown [10.150.0.9]) by imap.sh.mvista.com (Postfix) with ESMTP id 9D8C43ECA; Fri, 1 Dec 2006 07:33:17 -08