From luigi.mantellini.ml@gmail.com Wed Oct 1 19:31:00 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 01 Oct 2008 19:31:02 +0100 (BST) Received: from ik-out-1112.google.com ([66.249.90.182]:5465 "EHLO ik-out-1112.google.com") by ftp.linux-mips.org with ESMTP id S20284711AbYJASbA (ORCPT ); Wed, 1 Oct 2008 19:31:00 +0100 Received: by ik-out-1112.google.com with SMTP id c30so654831ika.0 for ; Wed, 01 Oct 2008 11:30:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:reply-to:organization:to :subject:date:user-agent:x-face:mime-version:content-type :content-transfer-encoding:content-disposition:message-id; bh=zThGdXRlHndV1qOCktoG/1q18Bk7AmMDVHVewpWKVNk=; b=D/JM0Bs7MPRmIm7TEvLYqpFD2aqZFgMI4Vfj7yKqoj4IxR/WA5tPz8d9fuLGLeXOT1 Jm8wufRw0oYC4W8T7d0aA1UXgvb4m91SWAMqlKqGMAu18tRUnr0HIacKeRNSP0nQTXqE NnERFp4ApspgI7r3cuvVjEP7Uws08ha5EsmaU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:reply-to:organization:to:subject:date:user-agent:x-face :mime-version:content-type:content-transfer-encoding :content-disposition:message-id; b=Ddl9O213KSuemODZo/s1z099oEWvpoNZvW/397rg7BqLHkYKY+7CMr7bRU9KUvc/MU kfgv9cjIQVaK6Gr6PaAEINpcq3cs5SqkwQoVUUz+RRpiApOFJ3o9r+06JlfQDLCUzno8 OHQZ6Iz5JjUBRR4SXJrylnFY/JZMBxZ66stC4= Received: by 10.86.92.7 with SMTP id p7mr7645163fgb.8.1222885859365; Wed, 01 Oct 2008 11:30:59 -0700 (PDT) Received: from cartesio.localnet ( [85.46.108.250]) by mx.google.com with ESMTPS id l19sm6677564fgb.7.2008.10.01.11.30.57 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 01 Oct 2008 11:30:58 -0700 (PDT) From: "Luigi 'Comio' Mantellini" Reply-To: luigi.mantellini.ml@gmail.com Organization: Industrie Dial Face S.p.A. To: linux-mips@linux-mips.org Subject: Huge buffer allocation: best place Date: Wed, 1 Oct 2008 20:30:53 +0200 User-Agent: KMail/1.10.1 (Linux/2.6.24-21-generic; KDE/4.1.1; i686; ; ) X-Face: '6!%DGk.Oa/l`>tHr&^29|<`2s/|PIbM@0,\4g%@-F7xr9V,K@IuG-jQ\T_t@ZM5UC7 .l0\.nz[=$C9^`vJt;P=ZRBk2+x+pB)\8;"bA3>@5aI66l5Xfw*X8#+kcy1ybOBUNMnc;s UXb\&]+8*bloRi 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: 20670 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: luigi.mantellini.ml@gmail.com Precedence: bulk X-list: linux-mips --Boundary-00=_eH84Ihmvxn+0UD7 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Hi ml, I need to allocate a huge contiguous buffer (~6MByte) shared with a secondary cpu (a packet processor). Which is the best place and the best way to do this? The main problem is that using a simple kmalloc at module init time there isn't sufficient contiguous memory to cover the request. I should use (I suppose) the alloc_bootmem_* macros but I'm not sure where is the best place to reserve my memory. For now I defined a global bad huge vector... but I'm not happy for this solution... thanks in advance. luigi -- Luigi Mantellini R&D - Software Industrie Dial Face S.p.A. Via Canzo, 4 20068 Peschiera Borromeo (MI), Italy Tel.: +39 02 5167 2813 Fax: +39 02 5167 2459 Email: luigi.mantellini@idf-hit.com --Boundary-00=_eH84Ihmvxn+0UD7 Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: 7bit

Hi ml,

I need to allocate a huge contiguous buffer (~6MByte) shared with a secondary cpu (a packet processor). Which is the best place and the best way to do this?

The main problem is that using a simple kmalloc at module init time there isn't sufficient contiguous memory to cover the request. I should use (I suppose) the alloc_bootmem_* macros but I'm not sure where is the best place to reserve my memory.

For now I defined a global bad huge vector... but I'm not happy for this solution...

thanks in advance.

luigi

Luigi Mantellini

R&D - Software

Industrie Dial Face S.p.A.

Via Canzo, 4

20068 Peschiera Borromeo (MI), Italy

Tel.: +39 02 5167 2813

Fax: +39 02 5167 2459

Email: luigi.mantellini@idf-hit.com

--Boundary-00=_eH84Ihmvxn+0UD7-- From luigi.mantellini.ml@gmail.com Wed Oct 1 19:37:02 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 01 Oct 2008 19:37:04 +0100 (BST) Received: from ey-out-1920.google.com ([74.125.78.146]:8900 "EHLO ey-out-1920.google.com") by ftp.linux-mips.org with ESMTP id S20285079AbYJAShC (ORCPT ); Wed, 1 Oct 2008 19:37:02 +0100 Received: by ey-out-1920.google.com with SMTP id 4so292674eyg.54 for ; Wed, 01 Oct 2008 11:37:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:reply-to:organization:to :subject:date:user-agent:references:in-reply-to:x-face:mime-version :content-type:content-transfer-encoding:content-disposition :message-id; bh=bpmTQv5z4OrhuZOyM53N/kaxKvTgeLut85Q5269TGXk=; b=LZ1CPICTBq8Et+gQ5pY/UAZPV5AHVCxxYQ93L4jPdw5cB6Gp+NLHqfzqV9lHV2kOHk MaGtul2v520jew1N2wQ7TPJu66nWwy4Qk3lLCTQNBO6Mu7IgXMf8g5H7UBW0cugwot/X lbcV4LCH/0rkrStv0jt5u36axrxjIacfWu/xs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:reply-to:organization:to:subject:date:user-agent:references :in-reply-to:x-face:mime-version:content-type :content-transfer-encoding:content-disposition:message-id; b=vqzzq+6+oWaf3jkNj6WNY6B1/T/E27u6R5gikp53QsQodjamYg/EDH9Z8KEIxAlcgR gLlEAaBOWO5IdKv8syrZQ6ju4TA7rNQLDNCcwEBX3ALRtPper4yI6uzktN4fOuo+NMcF 4M1wkBKqlPdk0rIBd0VhlsG0lc7bv4kzwa+qM= Received: by 10.86.72.3 with SMTP id u3mr7571827fga.62.1222886221549; Wed, 01 Oct 2008 11:37:01 -0700 (PDT) Received: from cartesio.localnet (host250-108-static.46-85-b.business.telecomitalia.it [85.46.108.250]) by mx.google.com with ESMTPS id l19sm441fgb.7.2008.10.01.11.36.29 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 01 Oct 2008 11:36:30 -0700 (PDT) From: "Luigi 'Comio' Mantellini" Reply-To: luigi.mantellini.ml@gmail.com Organization: Industrie Dial Face S.p.A. To: linux-mips@linux-mips.org Subject: Re: page_write_back infinite wait (porting to Mips 4kec SoC) Date: Wed, 1 Oct 2008 20:36:26 +0200 User-Agent: KMail/1.10.1 (Linux/2.6.24-21-generic; KDE/4.1.1; i686; ; ) References: <200809231409.44987.luigi.mantellini.ml@gmail.com> In-Reply-To: <200809231409.44987.luigi.mantellini.ml@gmail.com> X-Face: '6!%DGk.Oa/l`>tHr&^29|<`2s/|PIbM@0,\4g%@-F7xr9V,K@Iu G-jQ\T_t@ =?utf-8?q?ZM5UC7=0A=09=2El0=5C=2Enz=5B=3D=24C9=5E=60vJt=3BP=3DZRBk2+x+pB?=)\8;"bA3>@ =?utf-8?q?5aI66l5Xfw*X8=23+kcy1ybOBUNMnc=3Bs=0A=09UXb=5C=26=5D+8*bloRi?= 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: 20671 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: luigi.mantellini.ml@gmail.com Precedence: bulk X-list: linux-mips --Boundary-00=_rM84ISNcLG90xfy Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable I discovered the trouble... the bsp code (from my cpu vendor) wrongly writes out the irq_desc vector=20 overwriting some vital kernel structure... best regards, luigi =20 Il marted=EC 23 settembre 2008 14:09:44 Luigi 'Comio' Mantellini ha scritto: > Hi List, > > I'm working on a 4Kec SoC. I'm trying to port a recent kernel (2.6.26-rcX > from trunk) to my SoC but I have problem on timers (i think). > > The start sequence (start_kernel @init/main.c) freezes on the > page_writeback_init() call. The page_writeback_init function calls the > lock_timer_base function (by means the mod_timer/__mod_timer) that fails > always the test likely(base!=3DNULL) (source file kernel/timer.c). The ba= se > variable (ponter to tvec_base) is always NULL, resulting an infinite loop. > > I'm using the cevt-r4t and csrc-4k standard mips 4k timer (on irq #7). Wi= th > debugger I verified that the c0_compare_interrupt service routine is > correctly invoked. > > Kindly, can anyone help me to understand what I need to check to solve th= is > issue? If you need other information, please, ask me (This is my first mi= ps > port). > > Thanks in advance. > > best regards. > > luigi =2D-=20 Luigi Mantellini R&D - Software Industrie Dial Face S.p.A. Via Canzo, 4 20068 Peschiera Borromeo (MI), Italy Tel.: +39 02 5167 2813 =46ax: +39 02 5167 2459 Email: luigi.mantellini@idf-hit.com --Boundary-00=_rM84ISNcLG90xfy Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable

I discovere= d the trouble...

the bsp cod= e (from my cpu vendor) wrongly writes out the irq_desc vector overwriting s= ome vital kernel structure...

best regard= s,

luigi

Il marted= =EC 23 settembre 2008 14:09:44 Luigi 'Comio' Mantellini ha scritto:

> Hi Lis= t,

> I'm wo= rking on a 4Kec SoC. I'm trying to port a recent kernel (2.6.26-rcX

> from t= runk) to my SoC but I have problem on timers (i think).

> The st= art sequence (start_kernel @init/main.c) freezes on the

> page_w= riteback_init() call. The page_writeback_init function calls the

> lock_t= imer_base function (by means the mod_timer/__mod_timer) that fails

> always= the test likely(base!=3DNULL) (source file kernel/timer.c). The base

> variab= le (ponter to tvec_base) is always NULL, resulting an infinite loop.

> I'm us= ing the cevt-r4t and csrc-4k standard mips 4k timer (on irq #7). With

> debugg= er I verified that the c0_compare_interrupt service routine is

> correc= tly invoked.

> Kindly= , can anyone help me to understand what I need to check to solve this

> issue?= If you need other information, please, ask me (This is my first mips

> port).=

> Thanks= in advance.

> best r= egards.

> luigi<= /p>

Luigi Mante= llini

R&D - S= oftware

Industrie D= ial Face S.p.A.

Via Canzo, = 4

20068 Pesch= iera Borromeo (MI), Italy

Tel.: +39 = 02 5167 2813

Fax: +39 = 02 5167 2459

Email: luig= i.mantellini@idf-hit.com

Hello,

I am trying to port Microwindow on MIPS based Hardware.

While crosscompiling Microwindows (microwindows-src-snapshot.tar.gz) for
MIPS, i am getting linking error.

Linking /opt/stb/microwindows-0.90/src/bin/nano-X ...
/opt/stb/crosstools/bin/../lib/gcc/mipsel-linux-uclibc/3.4.6/../../../../mipsel-linux-uclibc/bin/ld:
warning: ld-uClibc.so.0, needed by
/opt/stb/crosstools/bin/../lib/gcc/mipsel-linux-uclibc/3.4.6/../../../../mipsel-linux-uclibc/lib/libc.so,
not found (try using -rpath or -rpath-link)
/opt/stb/crosstools/bin/../lib/gcc/mipsel-linux-uclibc/3.4.6/../../../../mipsel-linux-uclibc/lib/libc.so:
undefined reference to `__libc_stack_end'
collect2: ld returned 1 exit status
make[1]: *** [/opt/stb/microwindows-0.90/src/bin/nano-X] Error 1
make: *** [subdir-nanox] Error 2

i have no idea to fix this. can you help me please.

--
Cheers
Vijaya Chandran.M

I just noticed that in the current HEAD of the linux-mips.org git repository, all of the files in include/asm-mips have been moved to arch/mips/include/asm, with the exception of cevt-r4k.h. It looks so lonely sitting there all by itself, maybe we should put it with its friends. :-)

Shane McDonald

------=_Part_22668_9839462.1223758757428-- From bunk@kernel.org Sun Oct 12 13:19:08 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 12 Oct 2008 13:19:10 +0100 (BST) Received: from smtp4.pp.htv.fi ([213.243.153.38]:25288 "EHLO smtp4.pp.htv.fi") by ftp.linux-mips.org with ESMTP id S21281668AbYJLMTG (ORCPT ); Sun, 12 Oct 2008 13:19:06 +0100 Received: from cs181140183.pp.htv.fi (cs181140183.pp.htv.fi [82.181.140.183]) by smtp4.pp.htv.fi (Postfix) with ESMTP id 46C045BC027; Sun, 12 Oct 2008 15:19:01 +0300 (EEST) Date: Sun, 12 Oct 2008 15:18:05 +0300 From: Adrian Bunk To: Ralf Baechle Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org Subject: mips ip27_defconfig defconfig build error Message-ID: <20081012121805.GG31153@cs181140183.pp.htv.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20720 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: bunk@kernel.org Precedence: bulk X-list: linux-mips Content-Length: 662 Lines: 26 Commit 2a31b03335e570dce5fdd082e0d71d48b2cb4290 (MIPS: Rewrite spinlocks to ticket locks.) causes the following build error with ip27_defconfig: <-- snip --> ... CC arch/mips/kernel/module.o {standard input}: Assembler messages: {standard input}:1405: Error: local label `"2" (instance number 1 of a fb label)' is not defined make[2]: *** [arch/mips/kernel/module.o] Error 1 <-- snip --> cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed From bunk@kernel.org Sun Oct 12 13:50:32 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 12 Oct 2008 13:50:34 +0100 (BST) Received: from smtp4.pp.htv.fi ([213.243.153.38]:22989 "EHLO smtp4.pp.htv.fi") by ftp.linux-mips.org with ESMTP id S21283536AbYJLMuc (ORCPT ); Sun, 12 Oct 2008 13:50:32 +0100 Received: from cs181140183.pp.htv.fi (cs181140183.pp.htv.fi [82.181.140.183]) by smtp4.pp.htv.fi (Postfix) with ESMTP id C8D2F5BC02C; Sun, 12 Oct 2008 15:50:29 +0300 (EEST) Date: Sun, 12 Oct 2008 15:49:34 +0300 From: Adrian Bunk To: Lennert Buytenhek , "David S. Miller" , jgarzik@pobox.com, Ralf Baechle Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [2.6 patch] net/tc35815.c: fix compilation Message-ID: <20081012124934.GH31153@cs181140183.pp.htv.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20721 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: bunk@kernel.org Precedence: bulk X-list: linux-mips Content-Length: 1063 Lines: 36 Fix an obvious typo introduced by commit 298cf9beb9679522de995e249eccbd82f7c51999 (phylib: move to dynamic allocation of struct mii_bus). <-- snip --> ... CC drivers/net/tc35815.o drivers/net/tc35815.c: In function 'tc_mii_init': drivers/net/tc35815.c:799: error: 'err_out_free_mii_bus' undeclared (first use in this function) drivers/net/tc35815.c:799: error: (Each undeclared identifier is reported only once drivers/net/tc35815.c:799: error: for each function it appears in.) drivers/net/tc35815.c:781: error: label 'err_out_free_mii_bus' used but not defined make[3]: *** [drivers/net/tc35815.o] Error 1 <-- snip --> Signed-off-by: Adrian Bunk --- diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index 4980b12..df20caf 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c @@ -796,7 +796,7 @@ err_out_unregister_bus: mdiobus_unregister(lp->mii_bus); err_out_free_mdio_irq: kfree(lp->mii_bus->irq); -err_out_free_mii_bus; +err_out_free_mii_bus: mdiobus_free(lp->mii_bus); err_out: return err; From bunk@kernel.org Sun Oct 12 13:50:51 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 12 Oct 2008 13:50:54 +0100 (BST) Received: from smtp5.pp.htv.fi ([213.243.153.39]:25276 "EHLO smtp5.pp.htv.fi") by ftp.linux-mips.org with ESMTP id S21283540AbYJLMuf (ORCPT ); Sun, 12 Oct 2008 13:50:35 +0100 Received: from cs181140183.pp.htv.fi (cs181140183.pp.htv.fi [82.181.140.183]) by smtp5.pp.htv.fi (Postfix) with ESMTP id E8D665BC01C; Sun, 12 Oct 2008 15:50:34 +0300 (EEST) Date: Sun, 12 Oct 2008 15:49:39 +0300 From: Adrian Bunk To: Lennert Buytenhek , "David S. Miller" , jgarzik@pobox.com, Ralf Baechle Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [2.6 patch] net/au1000_eth.c MDIO namespace fixes Message-ID: <20081012124939.GI31153@cs181140183.pp.htv.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20722 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: bunk@kernel.org Precedence: bulk X-list: linux-mips Content-Length: 4200 Lines: 111 Commit 2e888103295f47b8fcbf7e9bb8c5da97dd2ecd76 (phylib: add mdiobus_{read,write}) causes the following compile error: <-- snip --> ... CC drivers/net/au1000_eth.o drivers/net/au1000_eth.c:252: error: conflicting types for 'mdiobus_read' include/linux/phy.h:130: error: previous declaration of 'mdiobus_read' was here drivers/net/au1000_eth.c:263: error: conflicting types for 'mdiobus_write' include/linux/phy.h:131: error: previous declaration of 'mdiobus_write' was here ... make[3]: *** [drivers/net/au1000_eth.o] Error 1 <-- snip --> This patch prefixes the driver functions with au1000_ Signed-off-by: Adrian Bunk --- drivers/net/au1000_eth.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index 7b92201..019b13c 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c @@ -94,8 +94,8 @@ static irqreturn_t au1000_interrupt(int, void *); static void au1000_tx_timeout(struct net_device *); static void set_rx_mode(struct net_device *); static int au1000_ioctl(struct net_device *, struct ifreq *, int); -static int mdio_read(struct net_device *, int, int); -static void mdio_write(struct net_device *, int, int, u16); +static int au1000_mdio_read(struct net_device *, int, int); +static void au1000_mdio_write(struct net_device *, int, int, u16); static void au1000_adjust_link(struct net_device *); static void enable_mac(struct net_device *, int); @@ -191,7 +191,7 @@ struct au1000_private *au_macs[NUM_ETH_INTERFACES]; /* * MII operations */ -static int mdio_read(struct net_device *dev, int phy_addr, int reg) +static int au1000_mdio_read(struct net_device *dev, int phy_addr, int reg) { struct au1000_private *aup = (struct au1000_private *) dev->priv; volatile u32 *const mii_control_reg = &aup->mac->mii_control; @@ -225,7 +225,8 @@ static int mdio_read(struct net_device *dev, int phy_addr, int reg) return (int)*mii_data_reg; } -static void mdio_write(struct net_device *dev, int phy_addr, int reg, u16 value) +static void au1000_mdio_write(struct net_device *dev, int phy_addr, + int reg, u16 value) { struct au1000_private *aup = (struct au1000_private *) dev->priv; volatile u32 *const mii_control_reg = &aup->mac->mii_control; @@ -249,7 +250,7 @@ static void mdio_write(struct net_device *dev, int phy_addr, int reg, u16 value) *mii_control_reg = mii_control; } -static int mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum) +static int au1000_mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum) { /* WARNING: bus->phy_map[phy_addr].attached_dev == dev does * _NOT_ hold (e.g. when PHY is accessed through other MAC's MII bus) */ @@ -257,21 +258,21 @@ static int mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum) enable_mac(dev, 0); /* make sure the MAC associated with this * mii_bus is enabled */ - return mdio_read(dev, phy_addr, regnum); + return au1000_mdio_read(dev, phy_addr, regnum); } -static int mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum, - u16 value) +static int au1000_mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum, + u16 value) { struct net_device *const dev = bus->priv; enable_mac(dev, 0); /* make sure the MAC associated with this * mii_bus is enabled */ - mdio_write(dev, phy_addr, regnum, value); + au1000_mdio_write(dev, phy_addr, regnum, value); return 0; } -static int mdiobus_reset(struct mii_bus *bus) +static int au1000_mdiobus_reset(struct mii_bus *bus) { struct net_device *const dev = bus->priv; @@ -703,9 +704,9 @@ static struct net_device * au1000_probe(int port_num) goto err_out; aup->mii_bus->priv = dev; - aup->mii_bus->read = mdiobus_read; - aup->mii_bus->write = mdiobus_write; - aup->mii_bus->reset = mdiobus_reset; + aup->mii_bus->read = au1000_mdiobus_read; + aup->mii_bus->write = au1000_mdiobus_write; + aup->mii_bus->reset = au1000_mdiobus_reset; aup->mii_bus->name = "au1000_eth_mii"; snprintf(aup->mii_bus->id, MII_BUS_ID_SIZE, "%x", aup->mac_id); aup->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL); From bunk@kernel.org Sun Oct 12 13:54:23 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 12 Oct 2008 13:54:25 +0100 (BST) Received: from smtp5.pp.htv.fi ([213.243.153.39]:58812 "EHLO smtp5.pp.htv.fi") by ftp.linux-mips.org with ESMTP id S21283729AbYJLMyX (ORCPT ); Sun, 12 Oct 2008 13:54:23 +0100 Received: from cs181140183.pp.htv.fi (cs181140183.pp.htv.fi [82.181.140.183]) by smtp5.pp.htv.fi (Postfix) with ESMTP id 8AB365BC00C; Sun, 12 Oct 2008 15:54:22 +0300 (EEST) Date: Sun, 12 Oct 2008 15:53:27 +0300 From: Adrian Bunk To: David Daney , Ralf Baechle Cc: linux-mips@linux-mips.org Subject: Re: [PATCH] Fix include paths in malta-amon.c Message-ID: <20081012125326.GJ31153@cs181140183.pp.htv.fi> References: <48D52FF4.2000905@avtrex.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <48D52FF4.2000905@avtrex.com> User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20723 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: bunk@kernel.org Precedence: bulk X-list: linux-mips Content-Length: 1073 Lines: 38 Ralf, can you apply David's patch? The build error is now in Linus' tree. TIA Adrian On Sat, Sep 20, 2008 at 10:16:36AM -0700, David Daney wrote: > > On linux-queue, malta doesn't build after the include file relocation. > This should fix it. > > There some occurrences of 'asm-mips' in the comments of quite a few > files, but this is the only place I found it in any code. > > Signed-off-by: David Daney > --- > arch/mips/mti-malta/malta-amon.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/mips/mti-malta/malta-amon.c b/arch/mips/mti-malta/malta-amon.c > index 96236bf..df9e526 100644 > --- a/arch/mips/mti-malta/malta-amon.c > +++ b/arch/mips/mti-malta/malta-amon.c > @@ -22,9 +22,9 @@ > #include > #include > > -#include > -#include > -#include > +#include > +#include > +#include > > int amon_cpu_avail(int cpu) > { From bunk@kernel.org Sun Oct 12 14:02:33 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 12 Oct 2008 14:02:35 +0100 (BST) Received: from smtp6.pp.htv.fi ([213.243.153.40]:47799 "EHLO smtp6.pp.htv.fi") by ftp.linux-mips.org with ESMTP id S21283832AbYJLNCd (ORCPT ); Sun, 12 Oct 2008 14:02:33 +0100 Received: from cs181140183.pp.htv.fi (cs181140183.pp.htv.fi [82.181.140.183]) by smtp6.pp.htv.fi (Postfix) with ESMTP id 165815BC024; Sun, 12 Oct 2008 16:02:31 +0300 (EEST) Date: Sun, 12 Oct 2008 16:01:35 +0300 From: Adrian Bunk To: Florian Fainelli , Ralf Baechle Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org Subject: [2.6 patch] mips/pci/fixup-rc32434.c must #include Message-ID: <20081012130135.GK31153@cs181140183.pp.htv.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20724 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: bunk@kernel.org Precedence: bulk X-list: linux-mips Content-Length: 1039 Lines: 34 This patch fixes the following compile error caused by commit 606a083b1e1a357cb66454e4581b80f1a67d8368 (MIPS: RB532: Cleanup the headers again): <-- snip --> ... CC arch/mips/pci/fixup-rc32434.o arch/mips/pci/fixup-rc32434.c: In function 'pcibios_map_irq': arch/mips/pci/fixup-rc32434.c:46: error: 'GROUP4_IRQ_BASE' undeclared (first use in this function) arch/mips/pci/fixup-rc32434.c:46: error: (Each undeclared identifier is reported only once arch/mips/pci/fixup-rc32434.c:46: error: for each function it appears in.) make[2]: *** [arch/mips/pci/fixup-rc32434.o] Error 1 <-- snip --> Signed-off-by: Adrian Bunk --- diff --git a/arch/mips/pci/fixup-rc32434.c b/arch/mips/pci/fixup-rc32434.c index 75b90dc..3d86823 100644 --- a/arch/mips/pci/fixup-rc32434.c +++ b/arch/mips/pci/fixup-rc32434.c @@ -30,6 +30,7 @@ #include #include +#include static int __devinitdata irq_map[2][12] = { {0, 0, 2, 3, 2, 3, 0, 0, 0, 0, 0, 1}, From skuribay@ruby.dti.ne.jp Sun Oct 12 14:56:18 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 12 Oct 2008 14:56:20 +0100 (BST) Received: from smtp15.dti.ne.jp ([202.216.231.190]:12990 "EHLO smtp15.dti.ne.jp") by ftp.linux-mips.org with ESMTP id S21286933AbYJLN4S (ORCPT ); Sun, 12 Oct 2008 14:56:18 +0100 Received: from [192.168.1.3] (PPPa2341.tokyo-ip.dti.ne.jp [61.195.18.91]) by smtp15.dti.ne.jp (3.11s) with ESMTP AUTH id m9CDuBrE002495 for ; Sun, 12 Oct 2008 22:56:15 +0900 (JST) Message-ID: <48F201FB.90303@ruby.dti.ne.jp> Date: Sun, 12 Oct 2008 22:56:11 +0900 From: Shinya Kuribayashi User-Agent: Thunderbird 2.0.0.17 (X11/20080925) MIME-Version: 1.0 To: linux-mips@linux-mips.org Subject: [PATCH][MIPS] Kill unused inclusions Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 20725 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: skuribay@ruby.dti.ne.jp Precedence: bulk X-list: linux-mips Content-Length: 2874 Lines: 105 Signed-off-by: Shinya Kuribayashi --- Hi, noticed while cleaning up the EMMA2RH port. Build tested wih emma2rh, rb532 and pnx8550-stb810. Thanks, Shinya arch/mips/emma2rh/common/irq.c | 1 - arch/mips/emma2rh/common/prom.c | 1 - arch/mips/emma2rh/markeins/platform.c | 1 - arch/mips/pci/fixup-emma2rh.c | 1 - arch/mips/pci/ops-pnx8550.c | 2 -- arch/mips/pci/pci-emma2rh.c | 1 - arch/mips/rb532/time.c | 1 - 7 files changed, 0 insertions(+), 8 deletions(-) diff --git a/arch/mips/emma2rh/common/irq.c b/arch/mips/emma2rh/common/irq.c index d956047..91cbd95 100644 --- a/arch/mips/emma2rh/common/irq.c +++ b/arch/mips/emma2rh/common/irq.c @@ -29,7 +29,6 @@ #include #include -#include #include #include diff --git a/arch/mips/emma2rh/common/prom.c b/arch/mips/emma2rh/common/prom.c index 5e92b3a..e14a2e3 100644 --- a/arch/mips/emma2rh/common/prom.c +++ b/arch/mips/emma2rh/common/prom.c @@ -30,7 +30,6 @@ #include #include #include -#include const char *get_system_type(void) { diff --git a/arch/mips/emma2rh/markeins/platform.c b/arch/mips/emma2rh/markeins/platform.c index d70627d..fb9cda2 100644 --- a/arch/mips/emma2rh/markeins/platform.c +++ b/arch/mips/emma2rh/markeins/platform.c @@ -35,7 +35,6 @@ #include #include #include -#include #include diff --git a/arch/mips/pci/fixup-emma2rh.c b/arch/mips/pci/fixup-emma2rh.c index a270589..846eae9 100644 --- a/arch/mips/pci/fixup-emma2rh.c +++ b/arch/mips/pci/fixup-emma2rh.c @@ -29,7 +29,6 @@ #include #include -#include #include diff --git a/arch/mips/pci/ops-pnx8550.c b/arch/mips/pci/ops-pnx8550.c index 0e160d9..1e6213f 100644 --- a/arch/mips/pci/ops-pnx8550.c +++ b/arch/mips/pci/ops-pnx8550.c @@ -29,8 +29,6 @@ #include #include -#include - static inline void clear_status(void) { diff --git a/arch/mips/pci/pci-emma2rh.c b/arch/mips/pci/pci-emma2rh.c index d99591a..772e283 100644 --- a/arch/mips/pci/pci-emma2rh.c +++ b/arch/mips/pci/pci-emma2rh.c @@ -29,7 +29,6 @@ #include #include -#include #include diff --git a/arch/mips/rb532/time.c b/arch/mips/rb532/time.c index 8e7a468..1377d59 100644 --- a/arch/mips/rb532/time.c +++ b/arch/mips/rb532/time.c @@ -28,7 +28,6 @@ #include #include -#include #include #include From davem@davemloft.net Mon Oct 13 05:03:13 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 13 Oct 2008 05:03:15 +0100 (BST) Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:57772 "EHLO sunset.davemloft.net") by ftp.linux-mips.org with ESMTP id S21324477AbYJMEDN (ORCPT ); Mon, 13 Oct 2008 05:03:13 +0100 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 91492C8C1A7; Sun, 12 Oct 2008 21:02:47 -0700 (PDT) Date: Sun, 12 Oct 2008 21:02:47 -0700 (PDT) Message-Id: <20081012.210247.06669920.davem@davemloft.net> To: bunk@kernel.org Cc: buytenh@marvell.com, jgarzik@pobox.com, ralf@linux-mips.org, linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: Re: [2.6 patch] net/tc35815.c: fix compilation From: David Miller In-Reply-To: <20081012124934.GH31153@cs181140183.pp.htv.fi> References: <20081012124934.GH31153@cs181140183.pp.htv.fi> X-Mailer: Mew version 6.1 on Emacs 22.1 / 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: 20726 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: davem@davemloft.net Precedence: bulk X-list: linux-mips Content-Length: 295 Lines: 10 From: Adrian Bunk Date: Sun, 12 Oct 2008 15:49:34 +0300 > Fix an obvious typo introduced by > commit 298cf9beb9679522de995e249eccbd82f7c51999 > (phylib: move to dynamic allocation of struct mii_bus). ... > Signed-off-by: Adrian Bunk Applied, thanks Adrian. From davem@davemloft.net Mon Oct 13 05:03:32 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 13 Oct 2008 05:03:35 +0100 (BST) Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:59308 "EHLO sunset.davemloft.net") by ftp.linux-mips.org with ESMTP id S21324483AbYJMEDc (ORCPT ); Mon, 13 Oct 2008 05:03:32 +0100 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 30FE6C8C196; Sun, 12 Oct 2008 21:03:07 -0700 (PDT) Date: Sun, 12 Oct 2008 21:03:06 -0700 (PDT) Message-Id: <20081012.210306.222286255.davem@davemloft.net> To: bunk@kernel.org Cc: buytenh@marvell.com, jgarzik@pobox.com, ralf@linux-mips.org, linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: Re: [2.6 patch] net/au1000_eth.c MDIO namespace fixes From: David Miller In-Reply-To: <20081012124939.GI31153@cs181140183.pp.htv.fi> References: <20081012124939.GI31153@cs181140183.pp.htv.fi> X-Mailer: Mew version 6.1 on Emacs 22.1 / 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: 20727 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: davem@davemloft.net Precedence: bulk X-list: linux-mips Content-Length: 344 Lines: 13 From: Adrian Bunk Date: Sun, 12 Oct 2008 15:49:39 +0300 > Commit 2e888103295f47b8fcbf7e9bb8c5da97dd2ecd76 > (phylib: add mdiobus_{read,write}) causes the > following compile error: ... > This patch prefixes the driver functions with au1000_ > > > Signed-off-by: Adrian Bunk Also applied, thanks a lot. From ralf@linux-mips.org Mon Oct 13 17:29:11 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 13 Oct 2008 17:29:14 +0100 (BST) Received: from h4.dl5rb.org.uk ([81.2.74.4]:24715 "EHLO ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk") by ftp.linux-mips.org with ESMTP id S21394774AbYJMQ3L (ORCPT ); Mon, 13 Oct 2008 17:29:11 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk (8.14.2/8.14.1) with ESMTP id m9DGT65Z008875; Mon, 13 Oct 2008 17:29:06 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.14.2/8.14.2/Submit) id m9DGT6Vi008873; Mon, 13 Oct 2008 17:29:06 +0100 Date: Mon, 13 Oct 2008 17:29:06 +0100 From: Ralf Baechle To: "Maciej W. Rozycki" Cc: weiwei wang , mason@broadcom.com, linux-mips@linux-mips.org Subject: Re: [Fwd: [bug report] 0xffffffffc0000000 can't be used on bcm1250] Message-ID: <20081013162906.GB7144@linux-mips.org> References: <48EC9894.4080201@gmail.com> <20081008115001.GA21596@linux-mips.org> <48ED5BA5.4070301@gmail.com> <20081009131554.GB22796@linux-mips.org> <48EEBFE8.1000501@gmail.com> <48F2BC15.70408@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20728 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips Content-Length: 978 Lines: 25 On Mon, Oct 13, 2008 at 04:18:04PM +0100, Maciej W. Rozycki wrote: > /* > + * To avoid the BCM1250 M3 erratum check whether EntryHi is consistent > + * with BadVAddr and return for the exception to retrigger if not. > + */ > +static void __cpuinit build_bcm1250_m3_war(u32 **p, struct uasm_reloc **r) > +{ > + uasm_i_dmfc0(p, K0, C0_BADVADDR); > + uasm_i_dmfc0(p, K1, C0_ENTRYHI); > + uasm_i_xor(p, K0, K0, K1); > + uasm_i_dsll(p, K1, K0, 24); > + uasm_i_dsrl32(p, K1, K1, (24 + PAGE_SHIFT + 1) - 32); > + uasm_i_dsrl32(p, K0, K0, 30); > + uasm_i_or(p, K0, K0, K1); > + uasm_il_bnez(p, r, K0, label_leave); The workaround is beginning to be relativly expensive. We're investing 8 instructions extra only to verify that the content of c0_entryhi is correct. I haven't tried yet but me seems by avoiding the use of c0_context entirely relying only on badvaddr we may be able to get away cheaper. Btw, adding linux-mips to the cc list. This really should be public. Ralf From tanzy@gmx.de Mon Oct 13 18:37:19 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 13 Oct 2008 18:37:21 +0100 (BST) Received: from mail.gmx.net ([213.165.64.20]:28893 "HELO mail.gmx.net") by ftp.linux-mips.org with SMTP id S21402561AbYJMRhT (ORCPT ); Mon, 13 Oct 2008 18:37:19 +0100 Received: (qmail invoked by alias); 13 Oct 2008 17:37:12 -0000 Received: from p548B3450.dip0.t-ipconnect.de (EHLO localhost.localdomain) [84.139.52.80] by mail.gmx.net (mp047) with SMTP; 13 Oct 2008 19:37:12 +0200 X-Authenticated: #16080105 X-Provags-ID: V01U2FsdGVkX1+zvIpJx62zIM5lqDupC1VALfZb+i8X5N/zI+iN42 CQoYIrB4Rqwq93 From: Johannes Dickgreber To: ralf@linux-mips.org Cc: linux-mips@linux-mips.org Subject: [PATCH 2/2] show_cpuinfo prints the name of the calling CPU, which i think is wrong. Date: Mon, 13 Oct 2008 19:36:21 +0200 Message-Id: <1223919381-24521-1-git-send-email-tanzy@gmx.de> X-Mailer: git-send-email 1.6.0.2 X-Y-GMX-Trusted: 0 X-FuHaFi: 0.53 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: 20729 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: tanzy@gmx.de Precedence: bulk X-list: linux-mips Content-Length: 811 Lines: 21 Signed-off-by: Johannes Dickgreber --- arch/mips/kernel/proc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c index 9d60679..8897c53 100644 --- a/arch/mips/kernel/proc.c +++ b/arch/mips/kernel/proc.c @@ -38,7 +38,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) seq_printf(m, "processor\t\t: %ld\n", n); sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n", cpu_data[n].options & MIPS_CPU_FPU ? " FPU V%d.%d" : ""); - seq_printf(m, fmt, __cpu_name[smp_processor_id()], + seq_printf(m, fmt, __cpu_name[n], (version >> 4) & 0x0f, version & 0x0f, (fp_vers >> 4) & 0x0f, fp_vers & 0x0f); seq_printf(m, "BogoMIPS\t\t: %lu.%02lu\n", -- 1.6.0.2 From David.Daney@caviumnetworks.com Mon Oct 13 19:00:51 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 13 Oct 2008 19:00:54 +0100 (BST) Received: from mail3.caviumnetworks.com ([12.108.191.235]:26066 "EHLO mail3.caviumnetworks.com") by ftp.linux-mips.org with ESMTP id S21405438AbYJMSAt (ORCPT ); Mon, 13 Oct 2008 19:00:49 +0100 Received: from exch4.caveonetworks.com (Not Verified[192.168.16.23]) by mail3.caviumnetworks.com with MailMarshal (v6,2,2,3503) id ; Mon, 13 Oct 2008 14:00:34 -0400 Received: from exch4.caveonetworks.com ([192.168.16.23]) by exch4.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 13 Oct 2008 11:00:31 -0700 Received: from dd1.caveonetworks.com ([64.169.86.201]) by exch4.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 13 Oct 2008 11:00:31 -0700 Message-ID: <48F38CBE.20303@caviumnetworks.com> Date: Mon, 13 Oct 2008 11:00:30 -0700 From: David Daney User-Agent: Thunderbird 2.0.0.16 (X11/20080723) MIME-Version: 1.0 To: linux-mips@linux-mips.org CC: "Paoletti, Tomaso" Subject: [PATCH] MIPS: Rewrite cpu_to_name so it has one statement per line. Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 13 Oct 2008 18:00:31.0048 (UTC) FILETIME=[94EC1C80:01C92D5D] 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: 20730 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: ddaney@caviumnetworks.com Precedence: bulk X-list: linux-mips Content-Length: 6734 Lines: 242 Rewrite cpu_to_name so it has one statement per line. Future changes can now pass checkpatch.pl Signed-off-by: David Daney --- arch/mips/kernel/cpu-probe.c | 217 +++++++++++++++++++++++++++-------------- 1 files changed, 143 insertions(+), 74 deletions(-) diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 0cf1545..1e57d04 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -822,85 +822,154 @@ const char *__cpu_name[NR_CPUS]; */ static __cpuinit const char *cpu_to_name(struct cpuinfo_mips *c) { - const char *name = NULL; - switch (c->cputype) { - case CPU_UNKNOWN: name = "unknown"; break; - case CPU_R2000: name = "R2000"; break; - case CPU_R3000: name = "R3000"; break; - case CPU_R3000A: name = "R3000A"; break; - case CPU_R3041: name = "R3041"; break; - case CPU_R3051: name = "R3051"; break; - case CPU_R3052: name = "R3052"; break; - case CPU_R3081: name = "R3081"; break; - case CPU_R3081E: name = "R3081E"; break; - case CPU_R4000PC: name = "R4000PC"; break; - case CPU_R4000SC: name = "R4000SC"; break; - case CPU_R4000MC: name = "R4000MC"; break; - case CPU_R4200: name = "R4200"; break; - case CPU_R4400PC: name = "R4400PC"; break; - case CPU_R4400SC: name = "R4400SC"; break; - case CPU_R4400MC: name = "R4400MC"; break; - case CPU_R4600: name = "R4600"; break; - case CPU_R6000: name = "R6000"; break; - case CPU_R6000A: name = "R6000A"; break; - case CPU_R8000: name = "R8000"; break; - case CPU_R10000: name = "R10000"; break; - case CPU_R12000: name = "R12000"; break; - case CPU_R14000: name = "R14000"; break; - case CPU_R4300: name = "R4300"; break; - case CPU_R4650: name = "R4650"; break; - case CPU_R4700: name = "R4700"; break; - case CPU_R5000: name = "R5000"; break; - case CPU_R5000A: name = "R5000A"; break; - case CPU_R4640: name = "R4640"; break; - case CPU_NEVADA: name = "Nevada"; break; - case CPU_RM7000: name = "RM7000"; break; - case CPU_RM9000: name = "RM9000"; break; - case CPU_R5432: name = "R5432"; break; - case CPU_4KC: name = "MIPS 4Kc"; break; - case CPU_5KC: name = "MIPS 5Kc"; break; - case CPU_R4310: name = "R4310"; break; - case CPU_SB1: name = "SiByte SB1"; break; - case CPU_SB1A: name = "SiByte SB1A"; break; - case CPU_TX3912: name = "TX3912"; break; - case CPU_TX3922: name = "TX3922"; break; - case CPU_TX3927: name = "TX3927"; break; - case CPU_AU1000: name = "Au1000"; break; - case CPU_AU1500: name = "Au1500"; break; - case CPU_AU1100: name = "Au1100"; break; - case CPU_AU1550: name = "Au1550"; break; - case CPU_AU1200: name = "Au1200"; break; - case CPU_AU1210: name = "Au1210"; break; - case CPU_AU1250: name = "Au1250"; break; - case CPU_4KEC: name = "MIPS 4KEc"; break; - case CPU_4KSC: name = "MIPS 4KSc"; break; - case CPU_VR41XX: name = "NEC Vr41xx"; break; - case CPU_R5500: name = "R5500"; break; - case CPU_TX49XX: name = "TX49xx"; break; - case CPU_20KC: name = "MIPS 20Kc"; break; - case CPU_24K: name = "MIPS 24K"; break; - case CPU_25KF: name = "MIPS 25Kf"; break; - case CPU_34K: name = "MIPS 34K"; break; - case CPU_1004K: name = "MIPS 1004K"; break; - case CPU_74K: name = "MIPS 74K"; break; - case CPU_VR4111: name = "NEC VR4111"; break; - case CPU_VR4121: name = "NEC VR4121"; break; - case CPU_VR4122: name = "NEC VR4122"; break; - case CPU_VR4131: name = "NEC VR4131"; break; - case CPU_VR4133: name = "NEC VR4133"; break; - case CPU_VR4181: name = "NEC VR4181"; break; - case CPU_VR4181A: name = "NEC VR4181A"; break; - case CPU_SR71000: name = "Sandcraft SR71000"; break; - case CPU_BCM3302: name = "Broadcom BCM3302"; break; - case CPU_BCM4710: name = "Broadcom BCM4710"; break; - case CPU_PR4450: name = "Philips PR4450"; break; - case CPU_LOONGSON2: name = "ICT Loongson-2"; break; + case CPU_UNKNOWN: + return "unknown"; + case CPU_R2000: + return "R2000"; + case CPU_R3000: + return "R3000"; + case CPU_R3000A: + return "R3000A"; + case CPU_R3041: + return "R3041"; + case CPU_R3051: + return "R3051"; + case CPU_R3052: + return "R3052"; + case CPU_R3081: + return "R3081"; + case CPU_R3081E: + return "R3081E"; + case CPU_R4000PC: + return "R4000PC"; + case CPU_R4000SC: + return "R4000SC"; + case CPU_R4000MC: + return "R4000MC"; + case CPU_R4200: + return "R4200"; + case CPU_R4400PC: + return "R4400PC"; + case CPU_R4400SC: + return "R4400SC"; + case CPU_R4400MC: + return "R4400MC"; + case CPU_R4600: + return "R4600"; + case CPU_R6000: + return "R6000"; + case CPU_R6000A: + return "R6000A"; + case CPU_R8000: + return "R8000"; + case CPU_R10000: + return "R10000"; + case CPU_R12000: + return "R12000"; + case CPU_R14000: + return "R14000"; + case CPU_R4300: + return "R4300"; + case CPU_R4650: + return "R4650"; + case CPU_R4700: + return "R4700"; + case CPU_R5000: + return "R5000"; + case CPU_R5000A: + return "R5000A"; + case CPU_R4640: + return "R4640"; + case CPU_NEVADA: + return "Nevada"; + case CPU_RM7000: + return "RM7000"; + case CPU_RM9000: + return "RM9000"; + case CPU_R5432: + return "R5432"; + case CPU_4KC: + return "MIPS 4Kc"; + case CPU_5KC: + return "MIPS 5Kc"; + case CPU_R4310: + return "R4310"; + case CPU_SB1: + return "SiByte SB1"; + case CPU_SB1A: + return "SiByte SB1A"; + case CPU_TX3912: + return "TX3912"; + case CPU_TX3922: + return "TX3922"; + case CPU_TX3927: + return "TX3927"; + case CPU_AU1000: + return "Au1000"; + case CPU_AU1500: + return "Au1500"; + case CPU_AU1100: + return "Au1100"; + case CPU_AU1550: + return "Au1550"; + case CPU_AU1200: + return "Au1200"; + case CPU_AU1210: + return "Au1210"; + case CPU_AU1250: + return "Au1250"; + case CPU_4KEC: + return "MIPS 4KEc"; + case CPU_4KSC: + return "MIPS 4KSc"; + case CPU_VR41XX: + return "NEC Vr41xx"; + case CPU_R5500: + return "R5500"; + case CPU_TX49XX: + return "TX49xx"; + case CPU_20KC: + return "MIPS 20Kc"; + case CPU_24K: + return "MIPS 24K"; + case CPU_25KF: + return "MIPS 25Kf"; + case CPU_34K: + return "MIPS 34K"; + case CPU_1004K: + return "MIPS 1004K"; + case CPU_74K: + return "MIPS 74K"; + case CPU_VR4111: + return "NEC VR4111"; + case CPU_VR4121: + return "NEC VR4121"; + case CPU_VR4122: + return "NEC VR4122"; + case CPU_VR4131: + return "NEC VR4131"; + case CPU_VR4133: + return "NEC VR4133"; + case CPU_VR4181: + return "NEC VR4181"; + case CPU_VR4181A: + return "NEC VR4181A"; + case CPU_SR71000: + return "Sandcraft SR71000"; + case CPU_BCM3302: + return "Broadcom BCM3302"; + case CPU_BCM4710: + return "Broadcom BCM4710"; + case CPU_PR4450: + return "Philips PR4450"; + case CPU_LOONGSON2: + return "ICT Loongson-2"; default: BUG(); } - return name; + return NULL; } __cpuinit void cpu_probe(void) From macro@linux-mips.org Mon Oct 13 19:06:05 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 13 Oct 2008 19:06:07 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:56482 "EHLO localhost.localdomain") by ftp.linux-mips.org with ESMTP id S21405742AbYJMSGF (ORCPT ); Mon, 13 Oct 2008 19:06:05 +0100 Date: Mon, 13 Oct 2008 19:06:05 +0100 (BST) From: "Maciej W. Rozycki" To: Ralf Baechle cc: weiwei wang , Mark Mason , linux-mips@linux-mips.org Subject: Re: [Fwd: [bug report] 0xffffffffc0000000 can't be used on bcm1250] In-Reply-To: <20081013162906.GB7144@linux-mips.org> Message-ID: References: <48EC9894.4080201@gmail.com> <20081008115001.GA21596@linux-mips.org> <48ED5BA5.4070301@gmail.com> <20081009131554.GB22796@linux-mips.org> <48EEBFE8.1000501@gmail.com> <48F2BC15.70408@gmail.com> <20081013162906.GB7144@linux-mips.org> User-Agent: Alpine 1.10 (LFD 962 2008-03-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 20731 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 Content-Length: 1878 Lines: 41 On Mon, 13 Oct 2008, Ralf Baechle wrote: > > +static void __cpuinit build_bcm1250_m3_war(u32 **p, struct uasm_reloc **r) > > +{ > > + uasm_i_dmfc0(p, K0, C0_BADVADDR); > > + uasm_i_dmfc0(p, K1, C0_ENTRYHI); > > + uasm_i_xor(p, K0, K0, K1); > > + uasm_i_dsll(p, K1, K0, 24); > > + uasm_i_dsrl32(p, K1, K1, (24 + PAGE_SHIFT + 1) - 32); > > + uasm_i_dsrl32(p, K0, K0, 30); > > + uasm_i_or(p, K0, K0, K1); > > + uasm_il_bnez(p, r, K0, label_leave); > > The workaround is beginning to be relativly expensive. We're investing 8 > instructions extra only to verify that the content of c0_entryhi is > correct. I haven't tried yet but me seems by avoiding the use of c0_context > entirely relying only on badvaddr we may be able to get away cheaper. Well, this is broken silicon, so we could well declare it unsupported. Workarounds should be as cheap maintenance-wise as possible. The run-time hit is secondary. Owing to how these bit fields are laid out I don't think we can get anywhere below the present instruction count with the current approach. In this case using BadVAddr might be possible, but it'd have to be masked as appropriate and possibly additionally transformed in some way and we are short on registers (k0 and k1 only), so that may be tough and prove no cheaper. Feel free to try though. At least with the synthesiser we can keep code for all the other good hardware intact. However as not all BCM1250 hardware suffers from this problem we should be more finegrained wrt choosing at the run time whether the workaround should be enabled or not in the first place and I'll see if I can find some time to address this. It's been on my todo list for a while now, so perhaps it's time to tick it off. > Btw, adding linux-mips to the cc list. This really should be public. Of course -- I haven't noticed the list was omitted. :( Maciej From tanzy@gmx.de Mon Oct 13 20:02:12 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 13 Oct 2008 20:02:14 +0100 (BST) Received: from mail.gmx.net ([213.165.64.20]:41369 "HELO mail.gmx.net") by ftp.linux-mips.org with SMTP id S21407998AbYJMTCM (ORCPT ); Mon, 13 Oct 2008 20:02:12 +0100 Received: (qmail invoked by alias); 13 Oct 2008 19:01:53 -0000 Received: from p548B3450.dip0.t-ipconnect.de (EHLO [192.168.120.26]) [84.139.52.80] by mail.gmx.net (mp058) with SMTP; 13 Oct 2008 21:01:53 +0200 X-Authenticated: #16080105 X-Provags-ID: V01U2FsdGVkX19K6D9YNBJKYKHuQdzs2gkBmnobrHXk7Z+GztPwbt V1sJHGmLwKNn9A Message-ID: <48F39B18.9030601@gmx.de> Date: Mon, 13 Oct 2008 21:01:44 +0200 From: Johannes Dickgreber User-Agent: Thunderbird 2.0.0.17 (X11/20080922) MIME-Version: 1.0 To: ralf Baechle , Linux MIPS List Subject: Questions for CONFIG_WEAK_ORDERING and CONFIG_WEAK_REORDERING_BEYOND_LLSC X-Enigmail-Version: 0.95.7 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Y-GMX-Trusted: 0 X-FuHaFi: 0.54 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: 20732 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: tanzy@gmx.de Precedence: bulk X-list: linux-mips Content-Length: 1084 Lines: 34 If a cpu is WEAK_ORDERING schouldn't it do a sync independent of CONFIG_SMP ? And if it is a SMP system schouldn't it do a sync independent of CONFIG_WEAK_ORDERING ? And if a cpu has no sync with LLSC schouldn't it do a sync independent of CONFIG_SMP ? All together, is the following the right thing to do ? --- arch/mips/include/asm/barrier.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h index 8e9ac31..46b2364 100644 --- a/arch/mips/include/asm/barrier.h +++ b/arch/mips/include/asm/barrier.h @@ -130,12 +130,13 @@ #endif /* !CONFIG_CPU_HAS_WB */ -#if defined(CONFIG_WEAK_ORDERING) && defined(CONFIG_SMP) +#if defined(CONFIG_WEAK_ORDERING) || defined(CONFIG_SMP) #define __WEAK_ORDERING_MB " sync \n" #else #define __WEAK_ORDERING_MB " \n" #endif -#if defined(CONFIG_WEAK_REORDERING_BEYOND_LLSC) && defined(CONFIG_SMP) + +#if defined(CONFIG_WEAK_REORDERING_BEYOND_LLSC) #define __WEAK_LLSC_MB " sync \n" #else #define __WEAK_LLSC_MB " \n" -- 1.6.0.2 From ralf@linux-mips.org Mon Oct 13 22:50:57 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 13 Oct 2008 22:50:59 +0100 (BST) Received: from h4.dl5rb.org.uk ([81.2.74.4]:29394 "EHLO ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk") by ftp.linux-mips.org with ESMTP id S21418436AbYJMVu5 (ORCPT ); Mon, 13 Oct 2008 22:50:57 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk (8.14.2/8.14.1) with ESMTP id m9DLos8A017519; Mon, 13 Oct 2008 22:50:54 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.14.2/8.14.2/Submit) id m9DLos0J017518; Mon, 13 Oct 2008 22:50:54 +0100 Date: Mon, 13 Oct 2008 22:50:54 +0100 From: Ralf Baechle To: Johannes Dickgreber Cc: Linux MIPS List Subject: Re: Questions for CONFIG_WEAK_ORDERING and CONFIG_WEAK_REORDERING_BEYOND_LLSC Message-ID: <20081013215054.GB8145@linux-mips.org> References: <48F39B18.9030601@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <48F39B18.9030601@gmx.de> User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20733 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips Content-Length: 855 Lines: 20 On Mon, Oct 13, 2008 at 09:01:44PM +0200, Johannes Dickgreber wrote: > If a cpu is WEAK_ORDERING schouldn't it do a sync independent of CONFIG_SMP ? > > And if it is a SMP system schouldn't it do a sync independent of CONFIG_WEAK_ORDERING ? > > And if a cpu has no sync with LLSC schouldn't it do a sync independent of CONFIG_SMP ? > > All together, is the following the right thing to do ? A processor is always consistently ordered wrt. to itself, so uniprocessor cores never need SYNCs even if that processor was weakly ordered in a multiprocessor systems. A while ago I walked through all mb(), rmb() and wmb() uses in the generic code. None of the ones I verified is actually needed on uniprocessor kernels. Ocasionally one of these functions is used to maintain I/O ordering but again other mechanisms are prefered for that purpose. Ralf From ralf@linux-mips.org Mon Oct 13 23:21:48 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 13 Oct 2008 23:21:50 +0100 (BST) Received: from h4.dl5rb.org.uk ([81.2.74.4]:64665 "EHLO ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk") by ftp.linux-mips.org with ESMTP id S21420077AbYJMWVs (ORCPT ); Mon, 13 Oct 2008 23:21:48 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk (8.14.2/8.14.1) with ESMTP id m9DMLkPH018662; Mon, 13 Oct 2008 23:21:46 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.14.2/8.14.2/Submit) id m9DMLkPZ018660; Mon, 13 Oct 2008 23:21:46 +0100 Date: Mon, 13 Oct 2008 23:21:46 +0100 From: Ralf Baechle To: Johannes Dickgreber Cc: linux-mips@linux-mips.org Subject: Re: [PATCH 2/2] show_cpuinfo prints the name of the calling CPU, which i think is wrong. Message-ID: <20081013222146.GD8145@linux-mips.org> References: <1223919381-24521-1-git-send-email-tanzy@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1223919381-24521-1-git-send-email-tanzy@gmx.de> User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20734 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips Content-Length: 428 Lines: 12 On Mon, Oct 13, 2008 at 07:36:21PM +0200, Johannes Dickgreber wrote: > Cc: linux-mips@linux-mips.org > Subject: [PATCH 2/2] show_cpuinfo prints the name of the calling CPU, which i > think is wrong. Patch is correct and so I applied it. Not a big issue though. There is only one system supported currently that supports a mix of different processor types (IP27) and those are very similar so it doesn't cause pain. Ralf From David.Daney@caviumnetworks.com Tue Oct 14 00:34:50 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 00:34:52 +0100 (BST) Received: from mail3.caviumnetworks.com ([12.108.191.235]:27696 "EHLO mail3.caviumnetworks.com") by ftp.linux-mips.org with ESMTP id S21423379AbYJMXeu (ORCPT ); Tue, 14 Oct 2008 00:34:50 +0100 Received: from exch4.caveonetworks.com (Not Verified[192.168.16.23]) by mail3.caviumnetworks.com with MailMarshal (v6,2,2,3503) id ; Mon, 13 Oct 2008 19:34:21 -0400 Received: from exch4.caveonetworks.com ([192.168.16.23]) by exch4.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 13 Oct 2008 16:34:18 -0700 Received: from dd1.caveonetworks.com ([64.169.86.201]) by exch4.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 13 Oct 2008 16:34:18 -0700 Message-ID: <48F3DAF9.5000603@caviumnetworks.com> Date: Mon, 13 Oct 2008 16:34:17 -0700 From: David Daney User-Agent: Thunderbird 2.0.0.16 (X11/20080723) MIME-Version: 1.0 To: Ralf Baechle CC: Johannes Dickgreber , linux-mips@linux-mips.org Subject: Re: [PATCH 2/2] show_cpuinfo prints the name of the calling CPU, which i think is wrong. References: <1223919381-24521-1-git-send-email-tanzy@gmx.de> <20081013222146.GD8145@linux-mips.org> In-Reply-To: <20081013222146.GD8145@linux-mips.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 13 Oct 2008 23:34:18.0197 (UTC) FILETIME=[36088850:01C92D8C] 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: 20735 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: ddaney@caviumnetworks.com Precedence: bulk X-list: linux-mips Content-Length: 1015 Lines: 30 Ralf Baechle wrote: > On Mon, Oct 13, 2008 at 07:36:21PM +0200, Johannes Dickgreber wrote: > >> Cc: linux-mips@linux-mips.org >> Subject: [PATCH 2/2] show_cpuinfo prints the name of the calling CPU, which i >> think is wrong. > > Patch is correct and so I applied it. Not a big issue though. There is > only one system supported currently that supports a mix of different > processor types (IP27) and those are very similar so it doesn't cause > pain. > > Ralf The patch is required on SMP systems as without it you get: BUG: using smp_processor_id() in preemptible [00000000] code: cat/687 caller is show_cpuinfo+0xc4/0x500 Call Trace: [] dump_stack+0x8/0x38 [] debug_smp_processor_id+0xec/0x100 [] show_cpuinfo+0xc4/0x500 [] seq_read+0x2f8/0x420 [] proc_reg_read+0x90/0xd8 [] vfs_read+0xbc/0x160 [] sys_read+0x50/0x98 [] handle_sysn32+0x44/0x84 David Daney From David.Daney@caviumnetworks.com Tue Oct 14 00:36:20 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 00:36:24 +0100 (BST) Received: from mail3.caviumnetworks.com ([12.108.191.235]:16435 "EHLO mail3.caviumnetworks.com") by ftp.linux-mips.org with ESMTP id S21423429AbYJMXgU (ORCPT ); Tue, 14 Oct 2008 00:36:20 +0100 Received: from exch4.caveonetworks.com (Not Verified[192.168.16.23]) by mail3.caviumnetworks.com with MailMarshal (v6,2,2,3503) id ; Mon, 13 Oct 2008 19:36:16 -0400 Received: from exch4.caveonetworks.com ([192.168.16.23]) by exch4.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 13 Oct 2008 16:36:13 -0700 Received: from dd1.caveonetworks.com ([64.169.86.201]) by exch4.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 13 Oct 2008 16:36:13 -0700 Message-ID: <48F3DB6D.9020108@caviumnetworks.com> Date: Mon, 13 Oct 2008 16:36:13 -0700 From: David Daney User-Agent: Thunderbird 2.0.0.16 (X11/20080723) MIME-Version: 1.0 To: linux-mips@linux-mips.org Subject: [PATCH] MIPS: Align .data.cacheline_aligned based on MIPS_L1_CACHE_SHIFT Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 13 Oct 2008 23:36:13.0460 (UTC) FILETIME=[7ABC4540:01C92D8C] 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: 20736 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: ddaney@caviumnetworks.com Precedence: bulk X-list: linux-mips Content-Length: 686 Lines: 22 Align .data.cacheline_aligned based on the MIPS_L1_CACHE_SHIFT configuration variable. Signed-off-by: David Daney Signed-off-by: Tomaso Paoletti --- arch/mips/kernel/vmlinux.lds.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S index afb119f..58738c8 100644 --- a/arch/mips/kernel/vmlinux.lds.S +++ b/arch/mips/kernel/vmlinux.lds.S @@ -104,7 +104,7 @@ SECTIONS . = ALIGN(_PAGE_SIZE); __nosave_end = .; - . = ALIGN(32); + . = ALIGN(1 << CONFIG_MIPS_L1_CACHE_SHIFT); .data.cacheline_aligned : { *(.data.cacheline_aligned) } From Weiwei.Wang@windriver.com Tue Oct 14 02:22:40 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 02:22:42 +0100 (BST) Received: from mail.windriver.com ([147.11.1.11]:27814 "EHLO mail.wrs.com") by ftp.linux-mips.org with ESMTP id S21425695AbYJNBWk (ORCPT ); Tue, 14 Oct 2008 02:22:40 +0100 Received: from ALA-MAIL03.corp.ad.wrs.com (ala-mail03 [147.11.57.144]) by mail.wrs.com (8.13.6/8.13.6) with ESMTP id m9E1MRdc027872; Mon, 13 Oct 2008 18:22:27 -0700 (PDT) Received: from [128.224.162.196] ([128.224.162.196]) by ALA-MAIL03.corp.ad.wrs.com with Microsoft SMTPSVC(6.0.3790.1830); Mon, 13 Oct 2008 18:22:26 -0700 Message-ID: <48F3F499.3010508@windriver.com> Date: Tue, 14 Oct 2008 09:23:37 +0800 From: Weiwei Wang User-Agent: Thunderbird 2.0.0.16 (X11/20080724) MIME-Version: 1.0 To: "Maciej W. Rozycki" CC: Ralf Baechle , weiwei wang , Mark Mason , linux-mips@linux-mips.org Subject: Re: [Fwd: [bug report] 0xffffffffc0000000 can't be used on bcm1250] References: <48EC9894.4080201@gmail.com> <20081008115001.GA21596@linux-mips.org> <48ED5BA5.4070301@gmail.com> <20081009131554.GB22796@linux-mips.org> <48EEBFE8.1000501@gmail.com> <48F2BC15.70408@gmail.com> <20081013162906.GB7144@linux-mips.org> In-Reply-To: X-Enigmail-Version: 0.95.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 14 Oct 2008 01:22:26.0768 (UTC) FILETIME=[5185E500:01C92D9B] 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: 20737 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: weiwei.wang@windriver.com Precedence: bulk X-list: linux-mips Content-Length: 7669 Lines: 203 Hi Maciej, I have tried your suggested patch, and it works well. And I am sorry to forget adding linux-mips to the cc list. Thanks Weiwei Maciej W. Rozycki wrote: > On Mon, 13 Oct 2008, weiwei wang wrote: > > >> your patch can't work. For the original code, I dump the memory mirror >> > > Yes, that's correct -- it wasn't the best idea indeed. > > >> And I think the key issue is the field Fill / VPN2 in EntryHi, normally >> this field will equal to corresponding field in BADVADDR. But for >> address 0xffffffffc0000000, it doesn't; In the book "see mips run", >> there is a description for register EntryHi: >> > > Good point! -- you are correct. This compatibility area is a special > case. Thanks a lot for the analysis. > > >> Below is my patch, and it works well in my side. >> >> Signed-off-by: Weiwei Wang >> diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c >> index 5a0835b..1b2ef20 100644 >> --- a/arch/mips/mm/tlbex.c >> +++ b/arch/mips/mm/tlbex.c >> @@ -674,6 +674,8 @@ static void __cpuinit >> build_r4000_tlb_refill_handler(void) >> UASM_i_MFC0(&p, K0, C0_BADVADDR); >> UASM_i_MFC0(&p, K1, C0_ENTRYHI); >> uasm_i_xor(&p, K0, K0, K1); >> + UASM_i_SLL(&p, K0, K0, 24); >> + UASM_i_SRL(&p, K0, K0, 24); >> UASM_i_SRL(&p, K0, K0, PAGE_SHIFT + 1); >> uasm_il_bnez(&p, &r, K0, label_leave); >> /* No need for uasm_i_nop */ >> > > This is a hack for a single core type, so hardcoding the width of the > virtual address space is fine. I am assuming you've got these right for > the SB-1. > > However preserving the check of the two most significant bits is > desirable. So I would suggest a patch as follows instead. > > >> Note: The bit-shift amount for dsrl in the range 0 to 31, so I split >> into 2 dsrl operations. >> > > That is actually not needed -- you can use DSRL32. > > Please try the following patch and see if it works for you. It boots > into the user mode for me with a 64-bit big-endian 16kB page > configuration, but I haven't checked it any further. > > Maciej > > Signed-off-by: Maciej W. Rozycki > --- > patch-mips-2.6.27-rc8-20081004-sb1250-m3-3 > diff -up --recursive --new-file linux-mips-2.6.27-rc8-20081004.macro/arch/mips/mm/tlbex.c linux-mips-2.6.27-rc8-20081004/arch/mips/mm/tlbex.c > --- linux-mips-2.6.27-rc8-20081004.macro/arch/mips/mm/tlbex.c 2008-10-13 14:45:55.000000000 +0000 > +++ linux-mips-2.6.27-rc8-20081004/arch/mips/mm/tlbex.c 2008-10-13 14:47:50.000000000 +0000 > @@ -6,7 +6,7 @@ > * Synthesize TLB refill handlers at runtime. > * > * Copyright (C) 2004, 2005, 2006, 2008 Thiemo Seufer > - * Copyright (C) 2005, 2007 Maciej W. Rozycki > + * Copyright (C) 2005, 2007, 2008 Maciej W. Rozycki > * Copyright (C) 2006 Ralf Baechle (ralf@linux-mips.org) > * > * ... and the days got worse and worse and now you see > @@ -200,6 +200,23 @@ static void __cpuinit build_r3000_tlb_re > static u32 final_handler[64] __cpuinitdata; > > /* > + * To avoid the BCM1250 M3 erratum check whether EntryHi is consistent > + * with BadVAddr and return for the exception to retrigger if not. > + */ > +static void __cpuinit build_bcm1250_m3_war(u32 **p, struct uasm_reloc **r) > +{ > + uasm_i_dmfc0(p, K0, C0_BADVADDR); > + uasm_i_dmfc0(p, K1, C0_ENTRYHI); > + uasm_i_xor(p, K0, K0, K1); > + uasm_i_dsll(p, K1, K0, 24); > + uasm_i_dsrl32(p, K1, K1, (24 + PAGE_SHIFT + 1) - 32); > + uasm_i_dsrl32(p, K0, K0, 30); > + uasm_i_or(p, K0, K0, K1); > + uasm_il_bnez(p, r, K0, label_leave); > + /* No need for uasm_i_nop */ > +} > + > +/* > * Hazards > * > * From the IDT errata for the QED RM5230 (Nevada), processor revision 1.0: > @@ -669,14 +686,8 @@ static void __cpuinit build_r4000_tlb_re > /* > * create the plain linear handler > */ > - if (bcm1250_m3_war()) { > - UASM_i_MFC0(&p, K0, C0_BADVADDR); > - UASM_i_MFC0(&p, K1, C0_ENTRYHI); > - uasm_i_xor(&p, K0, K0, K1); > - UASM_i_SRL(&p, K0, K0, PAGE_SHIFT + 1); > - uasm_il_bnez(&p, &r, K0, label_leave); > - /* No need for uasm_i_nop */ > - } > + if (bcm1250_m3_war()) > + build_bcm1250_m3_war(&p, &r); > > #ifdef CONFIG_64BIT > build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */ > @@ -1132,14 +1143,8 @@ static void __cpuinit build_r4000_tlb_lo > memset(labels, 0, sizeof(labels)); > memset(relocs, 0, sizeof(relocs)); > > - if (bcm1250_m3_war()) { > - UASM_i_MFC0(&p, K0, C0_BADVADDR); > - UASM_i_MFC0(&p, K1, C0_ENTRYHI); > - uasm_i_xor(&p, K0, K0, K1); > - UASM_i_SRL(&p, K0, K0, PAGE_SHIFT + 1); > - uasm_il_bnez(&p, &r, K0, label_leave); > - /* No need for uasm_i_nop */ > - } > + if (bcm1250_m3_war()) > + build_bcm1250_m3_war(&p, &r); > > build_r4000_tlbchange_handler_head(&p, &l, &r, K0, K1); > build_pte_present(&p, &l, &r, K0, K1, label_nopage_tlbl); > diff -up --recursive --new-file linux-mips-2.6.27-rc8-20081004.macro/arch/mips/mm/uasm.c linux-mips-2.6.27-rc8-20081004/arch/mips/mm/uasm.c > --- linux-mips-2.6.27-rc8-20081004.macro/arch/mips/mm/uasm.c 2008-10-13 14:45:55.000000000 +0000 > +++ linux-mips-2.6.27-rc8-20081004/arch/mips/mm/uasm.c 2008-10-13 14:50:42.000000000 +0000 > @@ -8,7 +8,7 @@ > * effects like branch delay slots. > * > * Copyright (C) 2004, 2005, 2006, 2008 Thiemo Seufer > - * Copyright (C) 2005, 2007 Maciej W. Rozycki > + * Copyright (C) 2005, 2007, 2008 Maciej W. Rozycki > * Copyright (C) 2006 Ralf Baechle (ralf@linux-mips.org) > */ > > @@ -62,9 +62,10 @@ enum opcode { > insn_dmtc0, insn_dsll, insn_dsll32, insn_dsra, insn_dsrl, > insn_dsrl32, insn_dsubu, insn_eret, insn_j, insn_jal, insn_jr, > insn_ld, insn_ll, insn_lld, insn_lui, insn_lw, insn_mfc0, > - insn_mtc0, insn_ori, insn_pref, insn_rfe, insn_sc, insn_scd, > - insn_sd, insn_sll, insn_sra, insn_srl, insn_subu, insn_sw, > - insn_tlbp, insn_tlbwi, insn_tlbwr, insn_xor, insn_xori > + insn_mtc0, insn_or, insn_ori, insn_pref, insn_rfe, insn_sc, > + insn_scd, insn_sd, insn_sll, insn_sra, insn_srl, insn_subu, > + insn_sw, insn_tlbp, insn_tlbwi, insn_tlbwr, insn_xor, > + insn_xori > }; > > struct insn { > @@ -116,6 +117,7 @@ static struct insn insn_table[] __cpuini > { insn_lw, M(lw_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, > { insn_mfc0, M(cop0_op, mfc_op, 0, 0, 0, 0), RT | RD | SET}, > { insn_mtc0, M(cop0_op, mtc_op, 0, 0, 0, 0), RT | RD | SET}, > + { insn_or, M(spec_op, 0, 0, 0, 0, or_op), RS | RT | RD }, > { insn_ori, M(ori_op, 0, 0, 0, 0, 0), RS | RT | UIMM }, > { insn_pref, M(pref_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, > { insn_rfe, M(cop0_op, cop_op, 0, 0, 0, rfe_op), 0 }, > @@ -361,6 +363,7 @@ I_u1s2(_lui) > I_u2s3u1(_lw) > I_u1u2u3(_mfc0) > I_u1u2u3(_mtc0) > +I_u3u1u2(_or) > I_u2u1u3(_ori) > I_u2s3u1(_pref) > I_0(_rfe) > diff -up --recursive --new-file linux-mips-2.6.27-rc8-20081004.macro/arch/mips/mm/uasm.h linux-mips-2.6.27-rc8-20081004/arch/mips/mm/uasm.h > --- linux-mips-2.6.27-rc8-20081004.macro/arch/mips/mm/uasm.h 2008-10-13 14:45:55.000000000 +0000 > +++ linux-mips-2.6.27-rc8-20081004/arch/mips/mm/uasm.h 2008-10-13 14:26:23.000000000 +0000 > @@ -4,7 +4,7 @@ > * for more details. > * > * Copyright (C) 2004, 2005, 2006, 2008 Thiemo Seufer > - * Copyright (C) 2005 Maciej W. Rozycki > + * Copyright (C) 2005, 2008 Maciej W. Rozycki > * Copyright (C) 2006 Ralf Baechle (ralf@linux-mips.org) > */ > > @@ -77,6 +77,7 @@ Ip_u1s2(_lui); > Ip_u2s3u1(_lw); > Ip_u1u2u3(_mfc0); > Ip_u1u2u3(_mtc0); > +Ip_u3u1u2(_or); > Ip_u2u1u3(_ori); > Ip_u2s3u1(_pref); > Ip_0(_rfe); From ralf@linux-mips.org Tue Oct 14 09:36:19 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 09:36:21 +0100 (BST) Received: from h4.dl5rb.org.uk ([81.2.74.4]:48042 "EHLO ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk") by ftp.linux-mips.org with ESMTP id S21451646AbYJNIgT (ORCPT ); Tue, 14 Oct 2008 09:36:19 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk (8.14.2/8.14.1) with ESMTP id m9E8aFtI031041; Tue, 14 Oct 2008 09:36:15 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.14.2/8.14.2/Submit) id m9E8aEOt031039; Tue, 14 Oct 2008 09:36:14 +0100 Date: Tue, 14 Oct 2008 09:36:14 +0100 From: Ralf Baechle To: David Daney Cc: Johannes Dickgreber , linux-mips@linux-mips.org Subject: Re: [PATCH 2/2] show_cpuinfo prints the name of the calling CPU, which i think is wrong. Message-ID: <20081014083614.GA30880@linux-mips.org> References: <1223919381-24521-1-git-send-email-tanzy@gmx.de> <20081013222146.GD8145@linux-mips.org> <48F3DAF9.5000603@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <48F3DAF9.5000603@caviumnetworks.com> User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20738 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips Content-Length: 654 Lines: 19 On Mon, Oct 13, 2008 at 04:34:17PM -0700, David Daney wrote: > The patch is required on SMP systems as without it you get: > > BUG: using smp_processor_id() in preemptible [00000000] code: cat/687 > caller is show_cpuinfo+0xc4/0x500 > Call Trace: > [] dump_stack+0x8/0x38 > [] debug_smp_processor_id+0xec/0x100 > [] show_cpuinfo+0xc4/0x500 > [] seq_read+0x2f8/0x420 > [] proc_reg_read+0x90/0xd8 > [] vfs_read+0xbc/0x160 > [] sys_read+0x50/0x98 > [] handle_sysn32+0x44/0x84 Uh indeed, makes sense ... Ralf From ralf@linux-mips.org Tue Oct 14 10:01:29 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 10:01:31 +0100 (BST) Received: from h4.dl5rb.org.uk ([81.2.74.4]:45466 "EHLO ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk") by ftp.linux-mips.org with ESMTP id S21453693AbYJNJB3 (ORCPT ); Tue, 14 Oct 2008 10:01:29 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk (8.14.2/8.14.1) with ESMTP id m9E919D7000810; Tue, 14 Oct 2008 10:01:09 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.14.2/8.14.2/Submit) id m9E919xQ000809; Tue, 14 Oct 2008 10:01:09 +0100 Date: Tue, 14 Oct 2008 10:01:09 +0100 From: Ralf Baechle To: David Daney Cc: linux-mips@linux-mips.org, "Paoletti, Tomaso" Subject: Re: [PATCH] MIPS: Rewrite cpu_to_name so it has one statement per line. Message-ID: <20081014090109.GB30880@linux-mips.org> References: <48F38CBE.20303@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <48F38CBE.20303@caviumnetworks.com> User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20739 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips Content-Length: 6051 Lines: 171 On Mon, Oct 13, 2008 at 11:00:30AM -0700, David Daney wrote: > Rewrite cpu_to_name so it has one statement per line. > > Future changes can now pass checkpatch.pl It's been one of those changes where I found the Linux coding style in my opinion at least, not to be optimal. My plan was to rewrite it like below incomplete patch for ages. What do you think? Ralf Signed-off-by: Ralf Baechle diff --git a/arch/mips/include/asm/cpu-info.h b/arch/mips/include/asm/cpu-info.h index 744cd8f..6d0f891 100644 --- a/arch/mips/include/asm/cpu-info.h +++ b/arch/mips/include/asm/cpu-info.h @@ -75,6 +75,7 @@ struct cpuinfo_mips { unsigned int watch_reg_use_cnt; /* Usable by ptrace */ #define NUM_WATCH_REGS 4 u16 watch_reg_masks[NUM_WATCH_REGS]; + const char *name; } __attribute__((aligned(SMP_CACHE_BYTES))); extern struct cpuinfo_mips cpu_data[]; diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 0cf1545..b05f9a3 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -291,6 +291,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c) switch (c->processor_id & 0xff00) { case PRID_IMP_R2000: c->cputype = CPU_R2000; + c->name = "R2000A"; c->isa_level = MIPS_CPU_ISA_I; c->options = MIPS_CPU_TLB | MIPS_CPU_3K_CACHE | MIPS_CPU_NOFPUEX; @@ -300,12 +301,17 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c) break; case PRID_IMP_R3000: if ((c->processor_id & 0xff) == PRID_REV_R3000A) - if (cpu_has_confreg()) + if (cpu_has_confreg()) { c->cputype = CPU_R3081E; - else + c->name = "R3081E"; + } else { c->cputype = CPU_R3000A; - else + c->name = "R3000A"; + } + else { c->cputype = CPU_R3000; + c->name = "R3000"; + } c->isa_level = MIPS_CPU_ISA_I; c->options = MIPS_CPU_TLB | MIPS_CPU_3K_CACHE | MIPS_CPU_NOFPUEX; @@ -315,15 +321,21 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c) break; case PRID_IMP_R4000: if (read_c0_config() & CONF_SC) { - if ((c->processor_id & 0xff) >= PRID_REV_R4400) + if ((c->processor_id & 0xff) >= PRID_REV_R4400) { c->cputype = CPU_R4400PC; - else + c->name = "R4400PC"; + } else { c->cputype = CPU_R4000PC; + c->name = "R4000PC"; + } } else { - if ((c->processor_id & 0xff) >= PRID_REV_R4400) + if ((c->processor_id & 0xff) >= PRID_REV_R4400) { c->cputype = CPU_R4400SC; - else + c->name = "R4400SC"; + } else { c->cputype = CPU_R4000SC; + c->name = "R4000SC"; + } } c->isa_level = MIPS_CPU_ISA_III; @@ -822,83 +834,9 @@ const char *__cpu_name[NR_CPUS]; */ static __cpuinit const char *cpu_to_name(struct cpuinfo_mips *c) { - const char *name = NULL; + const char *name = c->name; - switch (c->cputype) { - case CPU_UNKNOWN: name = "unknown"; break; - case CPU_R2000: name = "R2000"; break; - case CPU_R3000: name = "R3000"; break; - case CPU_R3000A: name = "R3000A"; break; - case CPU_R3041: name = "R3041"; break; - case CPU_R3051: name = "R3051"; break; - case CPU_R3052: name = "R3052"; break; - case CPU_R3081: name = "R3081"; break; - case CPU_R3081E: name = "R3081E"; break; - case CPU_R4000PC: name = "R4000PC"; break; - case CPU_R4000SC: name = "R4000SC"; break; - case CPU_R4000MC: name = "R4000MC"; break; - case CPU_R4200: name = "R4200"; break; - case CPU_R4400PC: name = "R4400PC"; break; - case CPU_R4400SC: name = "R4400SC"; break; - case CPU_R4400MC: name = "R4400MC"; break; - case CPU_R4600: name = "R4600"; break; - case CPU_R6000: name = "R6000"; break; - case CPU_R6000A: name = "R6000A"; break; - case CPU_R8000: name = "R8000"; break; - case CPU_R10000: name = "R10000"; break; - case CPU_R12000: name = "R12000"; break; - case CPU_R14000: name = "R14000"; break; - case CPU_R4300: name = "R4300"; break; - case CPU_R4650: name = "R4650"; break; - case CPU_R4700: name = "R4700"; break; - case CPU_R5000: name = "R5000"; break; - case CPU_R5000A: name = "R5000A"; break; - case CPU_R4640: name = "R4640"; break; - case CPU_NEVADA: name = "Nevada"; break; - case CPU_RM7000: name = "RM7000"; break; - case CPU_RM9000: name = "RM9000"; break; - case CPU_R5432: name = "R5432"; break; - case CPU_4KC: name = "MIPS 4Kc"; break; - case CPU_5KC: name = "MIPS 5Kc"; break; - case CPU_R4310: name = "R4310"; break; - case CPU_SB1: name = "SiByte SB1"; break; - case CPU_SB1A: name = "SiByte SB1A"; break; - case CPU_TX3912: name = "TX3912"; break; - case CPU_TX3922: name = "TX3922"; break; - case CPU_TX3927: name = "TX3927"; break; - case CPU_AU1000: name = "Au1000"; break; - case CPU_AU1500: name = "Au1500"; break; - case CPU_AU1100: name = "Au1100"; break; - case CPU_AU1550: name = "Au1550"; break; - case CPU_AU1200: name = "Au1200"; break; - case CPU_AU1210: name = "Au1210"; break; - case CPU_AU1250: name = "Au1250"; break; - case CPU_4KEC: name = "MIPS 4KEc"; break; - case CPU_4KSC: name = "MIPS 4KSc"; break; - case CPU_VR41XX: name = "NEC Vr41xx"; break; - case CPU_R5500: name = "R5500"; break; - case CPU_TX49XX: name = "TX49xx"; break; - case CPU_20KC: name = "MIPS 20Kc"; break; - case CPU_24K: name = "MIPS 24K"; break; - case CPU_25KF: name = "MIPS 25Kf"; break; - case CPU_34K: name = "MIPS 34K"; break; - case CPU_1004K: name = "MIPS 1004K"; break; - case CPU_74K: name = "MIPS 74K"; break; - case CPU_VR4111: name = "NEC VR4111"; break; - case CPU_VR4121: name = "NEC VR4121"; break; - case CPU_VR4122: name = "NEC VR4122"; break; - case CPU_VR4131: name = "NEC VR4131"; break; - case CPU_VR4133: name = "NEC VR4133"; break; - case CPU_VR4181: name = "NEC VR4181"; break; - case CPU_VR4181A: name = "NEC VR4181A"; break; - case CPU_SR71000: name = "Sandcraft SR71000"; break; - case CPU_BCM3302: name = "Broadcom BCM3302"; break; - case CPU_BCM4710: name = "Broadcom BCM4710"; break; - case CPU_PR4450: name = "Philips PR4450"; break; - case CPU_LOONGSON2: name = "ICT Loongson-2"; break; - default: - BUG(); - } + BUG_ON(!name); return name; } From ralf@linux-mips.org Tue Oct 14 10:08:00 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 10:08:02 +0100 (BST) Received: from h4.dl5rb.org.uk ([81.2.74.4]:59350 "EHLO ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk") by ftp.linux-mips.org with ESMTP id S21454423AbYJNJIA (ORCPT ); Tue, 14 Oct 2008 10:08:00 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk (8.14.2/8.14.1) with ESMTP id m9E97vKh001149; Tue, 14 Oct 2008 10:07:57 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.14.2/8.14.2/Submit) id m9E97vJx001147; Tue, 14 Oct 2008 10:07:57 +0100 Date: Tue, 14 Oct 2008 10:07:57 +0100 From: Ralf Baechle To: David Daney Cc: linux-mips@linux-mips.org Subject: Re: [PATCH] MIPS: Align .data.cacheline_aligned based on MIPS_L1_CACHE_SHIFT Message-ID: <20081014090757.GC30880@linux-mips.org> References: <48F3DB6D.9020108@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <48F3DB6D.9020108@caviumnetworks.com> User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20740 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips Content-Length: 344 Lines: 11 On Mon, Oct 13, 2008 at 04:36:13PM -0700, David Daney wrote: > Align .data.cacheline_aligned based on the MIPS_L1_CACHE_SHIFT > configuration variable. > > Signed-off-by: David Daney > Signed-off-by: Tomaso Paoletti Thanks, applied already yesterday as you may have noticed, Ralf From aurelien@aurel32.net Tue Oct 14 10:40:45 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 10:40:47 +0100 (BST) Received: from hall.aurel32.net ([88.191.82.174]:20103 "EHLO hall.aurel32.net") by ftp.linux-mips.org with ESMTP id S21457223AbYJNJkp (ORCPT ); Tue, 14 Oct 2008 10:40:45 +0100 Received: from volta.aurel32.net ([2002:52e8:2fb:1:21e:8cff:feb0:693b]) by hall.aurel32.net with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1KpgOS-0007hW-EC; Tue, 14 Oct 2008 11:40:44 +0200 Received: from aurel32 by volta.aurel32.net with local (Exim 4.69) (envelope-from ) id 1KpgOR-00070J-Su; Tue, 14 Oct 2008 11:40:43 +0200 Date: Tue, 14 Oct 2008 11:40:43 +0200 From: Aurelien Jarno To: Ralf Baechle Cc: linux-mips@linux-mips.org Subject: [PATCH 0/5] BCM47xx patches for 2.6.28 Message-ID: <20081014094043.GA26560@volta.aurel32.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline X-Mailer: Mutt 1.5.18 (2008-05-17) User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20741 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: aurelien@aurel32.net Precedence: bulk X-list: linux-mips Content-Length: 720 Lines: 19 The following patches are a resent of patches sent earlier in order to support the BCM47xx chips: [MIPS] WGT634U: Add machine detection message [MIPS] Remove references to BCM947XX [MIPS] BCM47xx: Use the new SSB GPIO API [MIPS] Add WGT634U reset button support [MIPS] Scan PCI busses when they are registered Compared to the previous version, one patch has been merged, and the second patch has been updated to reflect the new location of this file. -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32@debian.org | aurelien@aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net From aurelien@aurel32.net Tue Oct 14 10:42:11 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 10:42:13 +0100 (BST) Received: from hall.aurel32.net ([88.191.82.174]:30855 "EHLO hall.aurel32.net") by ftp.linux-mips.org with ESMTP id S21457530AbYJNJmL (ORCPT ); Tue, 14 Oct 2008 10:42:11 +0100 Received: from volta.aurel32.net ([2002:52e8:2fb:1:21e:8cff:feb0:693b]) by hall.aurel32.net with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1KpgPq-0007hi-MH; Tue, 14 Oct 2008 11:42:10 +0200 Received: from aurel32 by volta.aurel32.net with local (Exim 4.69) (envelope-from ) id 1KpgPq-000717-4x; Tue, 14 Oct 2008 11:42:10 +0200 Date: Tue, 14 Oct 2008 11:42:10 +0200 From: Aurelien Jarno To: Ralf Baechle Cc: linux-mips@linux-mips.org Subject: [PATCH 1/5] [MIPS] WGT634U: Add machine detection message Message-ID: <20081014094210.GB26560@volta.aurel32.net> References: <20081014094043.GA26560@volta.aurel32.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <20081014094043.GA26560@volta.aurel32.net> X-Mailer: Mutt 1.5.18 (2008-05-17) User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20742 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: aurelien@aurel32.net Precedence: bulk X-list: linux-mips Content-Length: 1058 Lines: 29 This adds a printk message when a WGT634U machine is detected. Signed-off-by: Aurelien Jarno --- arch/mips/bcm47xx/wgt634u.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/mips/bcm47xx/wgt634u.c b/arch/mips/bcm47xx/wgt634u.c index d1d90c9..f9e309a 100644 --- a/arch/mips/bcm47xx/wgt634u.c +++ b/arch/mips/bcm47xx/wgt634u.c @@ -112,6 +112,9 @@ static int __init wgt634u_init(void) ((et0mac[1] == 0x09 && et0mac[2] == 0x5b) || (et0mac[1] == 0x0f && et0mac[2] == 0xb5))) { struct ssb_mipscore *mcore = &ssb_bcm47xx.mipscore; + + printk(KERN_INFO "WGT634U machine detected.\n"); + wgt634u_flash_data.width = mcore->flash_buswidth; wgt634u_flash_resource.start = mcore->flash_window; wgt634u_flash_resource.end = mcore->flash_window -- 1.5.6.5 -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32@debian.org | aurelien@aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net From aurelien@aurel32.net Tue Oct 14 10:43:50 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 10:43:52 +0100 (BST) Received: from hall.aurel32.net ([88.191.82.174]:5513 "EHLO hall.aurel32.net") by ftp.linux-mips.org with ESMTP id S21457679AbYJNJnu (ORCPT ); Tue, 14 Oct 2008 10:43:50 +0100 Received: from volta.aurel32.net ([2002:52e8:2fb:1:21e:8cff:feb0:693b]) by hall.aurel32.net with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1KpgRP-0007kT-Lu; Tue, 14 Oct 2008 11:43:47 +0200 Received: from aurel32 by volta.aurel32.net with local (Exim 4.69) (envelope-from ) id 1KpgRP-000755-2H; Tue, 14 Oct 2008 11:43:47 +0200 Date: Tue, 14 Oct 2008 11:43:47 +0200 From: Aurelien Jarno To: Ralf Baechle Cc: linux-mips@linux-mips.org, Florian Fainelli Subject: [PATCH 2/5] [MIPS] Remove references to BCM947XX Message-ID: <20081014094347.GC26560@volta.aurel32.net> References: <20081014094043.GA26560@volta.aurel32.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <20081014094043.GA26560@volta.aurel32.net> X-Mailer: Mutt 1.5.18 (2008-05-17) User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20743 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: aurelien@aurel32.net Precedence: bulk X-list: linux-mips Content-Length: 1292 Lines: 39 This patch removes the remaining reference to the BCM947xx development board codename. Signed-off-by: Florian Fainelli Signed-off-by: Aurelien Jarno --- arch/mips/include/asm/mach-bcm47xx/war.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/mips/include/asm/mach-bcm47xx/war.h b/arch/mips/include/asm/mach-bcm47xx/war.h index 4a2b798..87cd465 100644 --- a/arch/mips/include/asm/mach-bcm47xx/war.h +++ b/arch/mips/include/asm/mach-bcm47xx/war.h @@ -5,8 +5,8 @@ * * Copyright (C) 2002, 2004, 2007 by Ralf Baechle */ -#ifndef __ASM_MIPS_MACH_BCM947XX_WAR_H -#define __ASM_MIPS_MACH_BCM947XX_WAR_H +#ifndef __ASM_MIPS_MACH_BCM47XX_WAR_H +#define __ASM_MIPS_MACH_BCM47XX_WAR_H #define R4600_V1_INDEX_ICACHEOP_WAR 0 #define R4600_V1_HIT_CACHEOP_WAR 0 @@ -22,4 +22,4 @@ #define R10000_LLSC_WAR 0 #define MIPS34K_MISSED_ITLB_WAR 0 -#endif /* __ASM_MIPS_MACH_BCM947XX_WAR_H */ +#endif /* __ASM_MIPS_MACH_BCM47XX_WAR_H */ -- 1.5.6.5 -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32@debian.org | aurelien@aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net From aurelien@aurel32.net Tue Oct 14 10:44:28 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 10:44:31 +0100 (BST) Received: from hall.aurel32.net ([88.191.82.174]:7305 "EHLO hall.aurel32.net") by ftp.linux-mips.org with ESMTP id S21457776AbYJNJo2 (ORCPT ); Tue, 14 Oct 2008 10:44:28 +0100 Received: from volta.aurel32.net ([2002:52e8:2fb:1:21e:8cff:feb0:693b]) by hall.aurel32.net with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1KpgS4-0007kd-6N; Tue, 14 Oct 2008 11:44:28 +0200 Received: from aurel32 by volta.aurel32.net with local (Exim 4.69) (envelope-from ) id 1KpgS2-00075k-5k; Tue, 14 Oct 2008 11:44:26 +0200 Date: Tue, 14 Oct 2008 11:44:26 +0200 From: Aurelien Jarno To: Ralf Baechle Cc: linux-mips@linux-mips.org Subject: [PATCH 3/5] [MIPS] BCM47xx: Use the new SSB GPIO API Message-ID: <20081014094426.GD26560@volta.aurel32.net> References: <20081014094043.GA26560@volta.aurel32.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <20081014094043.GA26560@volta.aurel32.net> X-Mailer: Mutt 1.5.18 (2008-05-17) User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20744 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: aurelien@aurel32.net Precedence: bulk X-list: linux-mips Content-Length: 7622 Lines: 241 This patch simplifies the BCM47xx GPIO code by using the new SSB GPIO API, which does a lot things that were implemented directly in the BCM47xx code. Signed-off-by: Aurelien Jarno --- arch/mips/Kconfig | 1 + arch/mips/bcm47xx/gpio.c | 85 ++++++++++++----------------- arch/mips/bcm47xx/setup.c | 5 +- arch/mips/include/asm/mach-bcm47xx/gpio.h | 41 +++++++------- 4 files changed, 58 insertions(+), 74 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index cd5fbf6..b905744 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -52,6 +52,7 @@ config BCM47XX select SSB select SSB_DRIVER_MIPS select SSB_DRIVER_EXTIF + select SSB_EMBEDDED select SSB_PCICORE_HOSTMODE if PCI select GENERIC_GPIO select SYS_HAS_EARLY_PRINTK diff --git a/arch/mips/bcm47xx/gpio.c b/arch/mips/bcm47xx/gpio.c index f5a53ac..9b79880 100644 --- a/arch/mips/bcm47xx/gpio.c +++ b/arch/mips/bcm47xx/gpio.c @@ -12,68 +12,51 @@ #include #include -int bcm47xx_gpio_to_irq(unsigned gpio) +#if (BCM47XX_CHIPCO_GPIO_LINES > BCM47XX_EXTIF_GPIO_LINES) +static DECLARE_BITMAP(gpio_in_use, BCM47XX_CHIPCO_GPIO_LINES); +#else +static DECLARE_BITMAP(gpio_in_use, BCM47XX_EXTIF_GPIO_LINES); +#endif + +int gpio_request(unsigned gpio, const char *tag) { - if (ssb_bcm47xx.chipco.dev) - return ssb_mips_irq(ssb_bcm47xx.chipco.dev) + 2; - else if (ssb_bcm47xx.extif.dev) - return ssb_mips_irq(ssb_bcm47xx.extif.dev) + 2; - else + if (ssb_chipco_available(&ssb_bcm47xx.chipco) && + ((unsigned)gpio >= BCM47XX_CHIPCO_GPIO_LINES)) return -EINVAL; -} -EXPORT_SYMBOL_GPL(bcm47xx_gpio_to_irq); -int bcm47xx_gpio_get_value(unsigned gpio) -{ - if (ssb_bcm47xx.chipco.dev) - return ssb_chipco_gpio_in(&ssb_bcm47xx.chipco, 1 << gpio); - else if (ssb_bcm47xx.extif.dev) - return ssb_extif_gpio_in(&ssb_bcm47xx.extif, 1 << gpio); - else - return 0; -} -EXPORT_SYMBOL_GPL(bcm47xx_gpio_get_value); + if (ssb_extif_available(&ssb_bcm47xx.extif) && + ((unsigned)gpio >= BCM47XX_EXTIF_GPIO_LINES)) + return -EINVAL; -void bcm47xx_gpio_set_value(unsigned gpio, int value) -{ - if (ssb_bcm47xx.chipco.dev) - ssb_chipco_gpio_out(&ssb_bcm47xx.chipco, - 1 << gpio, - value ? 1 << gpio : 0); - else if (ssb_bcm47xx.extif.dev) - ssb_extif_gpio_out(&ssb_bcm47xx.extif, - 1 << gpio, - value ? 1 << gpio : 0); -} -EXPORT_SYMBOL_GPL(bcm47xx_gpio_set_value); + if (test_and_set_bit(gpio, gpio_in_use)) + return -EBUSY; -int bcm47xx_gpio_direction_input(unsigned gpio) -{ - if (ssb_bcm47xx.chipco.dev && (gpio < BCM47XX_CHIPCO_GPIO_LINES)) - ssb_chipco_gpio_outen(&ssb_bcm47xx.chipco, - 1 << gpio, 0); - else if (ssb_bcm47xx.extif.dev && (gpio < BCM47XX_EXTIF_GPIO_LINES)) - ssb_extif_gpio_outen(&ssb_bcm47xx.extif, - 1 << gpio, 0); - else - return -EINVAL; return 0; } -EXPORT_SYMBOL_GPL(bcm47xx_gpio_direction_input); +EXPORT_SYMBOL(gpio_request); -int bcm47xx_gpio_direction_output(unsigned gpio, int value) +void gpio_free(unsigned gpio) { - bcm47xx_gpio_set_value(gpio, value); + if (ssb_chipco_available(&ssb_bcm47xx.chipco) && + ((unsigned)gpio >= BCM47XX_CHIPCO_GPIO_LINES)) + return; + + if (ssb_extif_available(&ssb_bcm47xx.extif) && + ((unsigned)gpio >= BCM47XX_EXTIF_GPIO_LINES)) + return; + + clear_bit(gpio, gpio_in_use); +} +EXPORT_SYMBOL(gpio_free); - if (ssb_bcm47xx.chipco.dev && (gpio < BCM47XX_CHIPCO_GPIO_LINES)) - ssb_chipco_gpio_outen(&ssb_bcm47xx.chipco, - 1 << gpio, 1 << gpio); - else if (ssb_bcm47xx.extif.dev && (gpio < BCM47XX_EXTIF_GPIO_LINES)) - ssb_extif_gpio_outen(&ssb_bcm47xx.extif, - 1 << gpio, 1 << gpio); +int gpio_to_irq(unsigned gpio) +{ + if (ssb_chipco_available(&ssb_bcm47xx.chipco)) + return ssb_mips_irq(ssb_bcm47xx.chipco.dev) + 2; + else if (ssb_extif_available(&ssb_bcm47xx.extif)) + return ssb_mips_irq(ssb_bcm47xx.extif.dev) + 2; else return -EINVAL; - return 0; } -EXPORT_SYMBOL_GPL(bcm47xx_gpio_direction_output); +EXPORT_SYMBOL_GPL(gpio_to_irq); diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c index 8d36f18..2f580fa 100644 --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -41,7 +42,7 @@ static void bcm47xx_machine_restart(char *command) printk(KERN_ALERT "Please stand by while rebooting the system...\n"); local_irq_disable(); /* Set the watchdog timer to reset immediately */ - ssb_chipco_watchdog_timer_set(&ssb_bcm47xx.chipco, 1); + ssb_watchdog_timer_set(&ssb_bcm47xx, 1); while (1) cpu_relax(); } @@ -50,7 +51,7 @@ static void bcm47xx_machine_halt(void) { /* Disable interrupts and watchdog and spin forever */ local_irq_disable(); - ssb_chipco_watchdog_timer_set(&ssb_bcm47xx.chipco, 0); + ssb_watchdog_timer_set(&ssb_bcm47xx, 0); while (1) cpu_relax(); } diff --git a/arch/mips/include/asm/mach-bcm47xx/gpio.h b/arch/mips/include/asm/mach-bcm47xx/gpio.h index cfc8f4d..d8ff4cd 100644 --- a/arch/mips/include/asm/mach-bcm47xx/gpio.h +++ b/arch/mips/include/asm/mach-bcm47xx/gpio.h @@ -9,47 +9,46 @@ #ifndef __BCM47XX_GPIO_H #define __BCM47XX_GPIO_H +#include +#include + #define BCM47XX_EXTIF_GPIO_LINES 5 #define BCM47XX_CHIPCO_GPIO_LINES 16 -extern int bcm47xx_gpio_to_irq(unsigned gpio); -extern int bcm47xx_gpio_get_value(unsigned gpio); -extern void bcm47xx_gpio_set_value(unsigned gpio, int value); -extern int bcm47xx_gpio_direction_input(unsigned gpio); -extern int bcm47xx_gpio_direction_output(unsigned gpio, int value); - -static inline int gpio_request(unsigned gpio, const char *label) -{ - return 0; -} +extern int gpio_request(unsigned gpio, const char *label); +extern void gpio_free(unsigned gpio); +extern int gpio_to_irq(unsigned gpio); -static inline void gpio_free(unsigned gpio) +static inline int gpio_get_value(unsigned gpio) { + return ssb_gpio_in(&ssb_bcm47xx, 1 << gpio); } -static inline int gpio_to_irq(unsigned gpio) +static inline void gpio_set_value(unsigned gpio, int value) { - return bcm47xx_gpio_to_irq(gpio); + ssb_gpio_out(&ssb_bcm47xx, 1 << gpio, value ? 1 << gpio : 0); } -static inline int gpio_get_value(unsigned gpio) +static inline int gpio_direction_input(unsigned gpio) { - return bcm47xx_gpio_get_value(gpio); + return ssb_gpio_outen(&ssb_bcm47xx, 1 << gpio, 0); } -static inline void gpio_set_value(unsigned gpio, int value) +static inline int gpio_direction_output(unsigned gpio, int value) { - bcm47xx_gpio_set_value(gpio, value); + return ssb_gpio_outen(&ssb_bcm47xx, 1 << gpio, 1 << gpio); } -static inline int gpio_direction_input(unsigned gpio) +static int gpio_intmask(unsigned gpio, int value) { - return bcm47xx_gpio_direction_input(gpio); + return ssb_gpio_intmask(&ssb_bcm47xx, 1 << gpio, + value ? 1 << gpio : 0); } -static inline int gpio_direction_output(unsigned gpio, int value) +static int gpio_polarity(unsigned gpio, int value) { - return bcm47xx_gpio_direction_output(gpio, value); + return ssb_gpio_polarity(&ssb_bcm47xx, 1 << gpio, + value ? 1 << gpio : 0); } -- 1.5.6.5 -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32@debian.org | aurelien@aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net From aurelien@aurel32.net Tue Oct 14 10:44:48 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 10:44:50 +0100 (BST) Received: from hall.aurel32.net ([88.191.82.174]:7561 "EHLO hall.aurel32.net") by ftp.linux-mips.org with ESMTP id S21457796AbYJNJop (ORCPT ); Tue, 14 Oct 2008 10:44:45 +0100 Received: from volta.aurel32.net ([2002:52e8:2fb:1:21e:8cff:feb0:693b]) by hall.aurel32.net with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1KpgSK-0007kg-GK; Tue, 14 Oct 2008 11:44:44 +0200 Received: from aurel32 by volta.aurel32.net with local (Exim 4.69) (envelope-from ) id 1KpgSJ-000761-VQ; Tue, 14 Oct 2008 11:44:43 +0200 Date: Tue, 14 Oct 2008 11:44:43 +0200 From: Aurelien Jarno To: Ralf Baechle Cc: linux-mips@linux-mips.org Subject: [PATCH 4/5] [MIPS] Add WGT634U reset button support Message-ID: <20081014094443.GE26560@volta.aurel32.net> References: <20081014094043.GA26560@volta.aurel32.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <20081014094043.GA26560@volta.aurel32.net> X-Mailer: Mutt 1.5.18 (2008-05-17) User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20745 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: aurelien@aurel32.net Precedence: bulk X-list: linux-mips Content-Length: 2391 Lines: 79 This patch adds support for the reset button of WGT634U machine, using GPIO interrupts. Based on a patch from Michel Lespinasse. Signed-off-by: Aurelien Jarno --- arch/mips/bcm47xx/wgt634u.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/arch/mips/bcm47xx/wgt634u.c b/arch/mips/bcm47xx/wgt634u.c index f9e309a..db1a72f 100644 --- a/arch/mips/bcm47xx/wgt634u.c +++ b/arch/mips/bcm47xx/wgt634u.c @@ -11,6 +11,9 @@ #include #include #include +#include +#include +#include #include /* GPIO definitions for the WGT634U */ @@ -99,6 +102,30 @@ static struct platform_device *wgt634u_devices[] __initdata = { &wgt634u_gpio_leds, }; +static irqreturn_t gpio_interrupt(int irq, void *ignored) +{ + int state; + + /* Interrupts are shared, check if the current one is + a GPIO interrupt. */ + if (!ssb_chipco_irq_status(&ssb_bcm47xx.chipco, + SSB_CHIPCO_IRQ_GPIO)) + return IRQ_NONE; + + state = gpio_get_value(WGT634U_GPIO_RESET); + + /* Interrupt are level triggered, revert the interrupt polarity + to clear the interrupt. */ + gpio_polarity(WGT634U_GPIO_RESET, state); + + if (!state) { + printk(KERN_INFO "Reset button pressed"); + ctrl_alt_del(); + } + + return IRQ_HANDLED; +} + static int __init wgt634u_init(void) { /* There is no easy way to detect that we are running on a WGT634U @@ -115,6 +142,16 @@ static int __init wgt634u_init(void) printk(KERN_INFO "WGT634U machine detected.\n"); + if (!request_irq(gpio_to_irq(WGT634U_GPIO_RESET), + gpio_interrupt, IRQF_SHARED, + "WGT634U GPIO", &ssb_bcm47xx.chipco)) { + gpio_direction_input(WGT634U_GPIO_RESET); + gpio_intmask(WGT634U_GPIO_RESET, 1); + ssb_chipco_irq_mask(&ssb_bcm47xx.chipco, + SSB_CHIPCO_IRQ_GPIO, + SSB_CHIPCO_IRQ_GPIO); + } + wgt634u_flash_data.width = mcore->flash_buswidth; wgt634u_flash_resource.start = mcore->flash_window; wgt634u_flash_resource.end = mcore->flash_window -- 1.5.6.5 -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32@debian.org | aurelien@aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net From aurelien@aurel32.net Tue Oct 14 10:45:13 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 10:45:15 +0100 (BST) Received: from hall.aurel32.net ([88.191.82.174]:41856 "EHLO hall.aurel32.net") by ftp.linux-mips.org with ESMTP id S21457813AbYJNJpK (ORCPT ); Tue, 14 Oct 2008 10:45:10 +0100 Received: from volta.aurel32.net ([2002:52e8:2fb:1:21e:8cff:feb0:693b]) by hall.aurel32.net with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1KpgSj-0007qd-UJ; Tue, 14 Oct 2008 11:45:10 +0200 Received: from aurel32 by volta.aurel32.net with local (Exim 4.69) (envelope-from ) id 1KpgSj-00076O-CY; Tue, 14 Oct 2008 11:45:09 +0200 Date: Tue, 14 Oct 2008 11:45:09 +0200 From: Aurelien Jarno To: Ralf Baechle Cc: linux-mips@linux-mips.org Subject: [PATCH 5/5] [MIPS] Scan PCI busses when they are registered Message-ID: <20081014094509.GF26560@volta.aurel32.net> References: <20081014094043.GA26560@volta.aurel32.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <20081014094043.GA26560@volta.aurel32.net> X-Mailer: Mutt 1.5.18 (2008-05-17) User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20746 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: aurelien@aurel32.net Precedence: bulk X-list: linux-mips Content-Length: 3838 Lines: 138 The patch below changes register_pci_controller() such that controllers being added after pcibios_init() has run are be scanned immediately. This is needed for example by the BCM47xx PCI controller, which is located on the SSB bus, which is now initialized after the PCI subsystem. Signed-off-by: Aurelien Jarno --- arch/mips/pci/pci.c | 80 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 53 insertions(+), 27 deletions(-) diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index c7fe6ec..a377e9d 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c @@ -34,6 +34,8 @@ static struct pci_controller *hose_head, **hose_tail = &hose_head; unsigned long PCIBIOS_MIN_IO = 0x0000; unsigned long PCIBIOS_MIN_MEM = 0; +static int pci_initialized; + /* * We need to avoid collisions with `mirrored' VGA ports * and other strange ISA hardware, so we always want the @@ -74,6 +76,42 @@ pcibios_align_resource(void *data, struct resource *res, res->start = start; } +static void __devinit pcibios_scanbus(struct pci_controller *hose) +{ + static int next_busno; + static int need_domain_info; + struct pci_bus *bus; + + if (!hose->iommu) + PCI_DMA_BUS_IS_PHYS = 1; + + if (hose->get_busno && pci_probe_only) + next_busno = (*hose->get_busno)(); + + bus = pci_scan_bus(next_busno, hose->pci_ops, hose); + hose->bus = bus; + + need_domain_info = need_domain_info || hose->index; + hose->need_domain_info = need_domain_info; + if (bus) { + next_busno = bus->subordinate + 1; + /* Don't allow 8-bit bus number overflow inside the hose - + reserve some space for bridges. */ + if (next_busno > 224) { + next_busno = 0; + need_domain_info = 1; + } + + if (!pci_probe_only) { + pci_bus_size_bridges(bus); + pci_bus_assign_resources(bus); + pci_enable_bridges(bus); + } + } +} + +static DEFINE_MUTEX(pci_scan_mutex); + void __devinit register_pci_controller(struct pci_controller *hose) { if (request_resource(&iomem_resource, hose->mem_resource) < 0) @@ -93,6 +131,17 @@ void __devinit register_pci_controller(struct pci_controller *hose) printk(KERN_WARNING "registering PCI controller with io_map_base unset\n"); } + + /* + * Scan the bus if it is register after the PCI subsystem + * initialization. + */ + if (pci_initialized) { + mutex_lock(&pci_scan_mutex); + pcibios_scanbus(hose); + mutex_unlock(&pci_scan_mutex); + } + return; out: @@ -125,38 +174,15 @@ static u8 __init common_swizzle(struct pci_dev *dev, u8 *pinp) static int __init pcibios_init(void) { struct pci_controller *hose; - struct pci_bus *bus; - int next_busno; - int need_domain_info = 0; /* Scan all of the recorded PCI controllers. */ - for (next_busno = 0, hose = hose_head; hose; hose = hose->next) { - - if (!hose->iommu) - PCI_DMA_BUS_IS_PHYS = 1; - - if (hose->get_busno && pci_probe_only) - next_busno = (*hose->get_busno)(); - - bus = pci_scan_bus(next_busno, hose->pci_ops, hose); - hose->bus = bus; - need_domain_info = need_domain_info || hose->index; - hose->need_domain_info = need_domain_info; - if (bus) { - next_busno = bus->subordinate + 1; - /* Don't allow 8-bit bus number overflow inside the hose - - reserve some space for bridges. */ - if (next_busno > 224) { - next_busno = 0; - need_domain_info = 1; - } - } - } + for (hose = hose_head; hose; hose = hose->next) + pcibios_scanbus(hose); - if (!pci_probe_only) - pci_assign_unassigned_resources(); pci_fixup_irqs(common_swizzle, pcibios_map_irq); + pci_initialized = 1; + return 0; } -- 1.5.6.5 -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32@debian.org | aurelien@aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net From Weiwei.Wang@windriver.com Tue Oct 14 11:10:53 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 11:10:56 +0100 (BST) Received: from mail.windriver.com ([147.11.1.11]:53383 "EHLO mail.wrs.com") by ftp.linux-mips.org with ESMTP id S21462585AbYJNKKx (ORCPT ); Tue, 14 Oct 2008 11:10:53 +0100 Received: from ALA-MAIL03.corp.ad.wrs.com (ala-mail03 [147.11.57.144]) by mail.wrs.com (8.13.6/8.13.6) with ESMTP id m9EAAim7022821; Tue, 14 Oct 2008 03:10:44 -0700 (PDT) Received: from [128.224.162.196] ([128.224.162.196]) by ALA-MAIL03.corp.ad.wrs.com with Microsoft SMTPSVC(6.0.3790.1830); Tue, 14 Oct 2008 03:10:43 -0700 Message-ID: <48F4706A.2010401@windriver.com> Date: Tue, 14 Oct 2008 18:11:54 +0800 From: Weiwei Wang User-Agent: Thunderbird 2.0.0.16 (X11/20080724) MIME-Version: 1.0 To: "Maciej W. Rozycki" CC: Ralf Baechle , weiwei wang , linux-mips@linux-mips.org Subject: Re: [Fwd: [bug report] 0xffffffffc0000000 can't be used on bcm1250] References: <48EC9894.4080201@gmail.com> <20081008115001.GA21596@linux-mips.org> <48ED5BA5.4070301@gmail.com> <20081009131554.GB22796@linux-mips.org> <48EEBFE8.1000501@gmail.com> <48F2BC15.70408@gmail.com> <20081013162906.GB7144@linux-mips.org> <48F3F499.3010508@windriver.com> In-Reply-To: <48F3F499.3010508@windriver.com> X-Enigmail-Version: 0.95.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 14 Oct 2008 10:10:43.0656 (UTC) FILETIME=[1E572C80:01C92DE5] 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: 20747 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: weiwei.wang@windriver.com Precedence: bulk X-list: linux-mips Content-Length: 8984 Lines: 248 Hi Maciej, I checked the sb-1 core user manual, and finally confirm the virtual address space is 44 bits wide, not 40 bits. so for function build_bcm1250_m3_war(), UASM_i_SLL(&p, K0, K0, 24); UASM_i_SRL(&p, K0, K0, 24); should be UASM_i_SLL(&p, K0, K0, 20); UASM_i_SRL(&p, K0, K0, 20); I have tested it in my side, it works. Besides I have done test when UASM_i_SLL(&p, K0, K0, 19); UASM_i_SRL(&p, K0, K0, 19); and it can't work, so it is sure that virtual address space is 44 bits wide. But another issue is confusing me right now. Since the bit 44-61 in entryhi is not valid, and are read as 0, so when issue command tlbwr, the cpu will copy the contents of EntryHi, EntryLo, and PageMask into the TLB entry, including the invalid bits in VPN2 of entryhi. Here I think tlb entry conflict may appear. Take address 0xc0000fffc0000000 and 0xffffffffc0000000 for example, the two address may get the same tlb entry. am i getting it wrong? can you give me your understanding. Thanks Weiwei Weiwei Wang wrote: > Hi Maciej, > > I have tried your suggested patch, and it works well. > > And I am sorry to forget adding linux-mips to the cc list. > > Thanks > Weiwei > > Maciej W. Rozycki wrote: > >> On Mon, 13 Oct 2008, weiwei wang wrote: >> >> >> >>> your patch can't work. For the original code, I dump the memory mirror >>> >>> >> Yes, that's correct -- it wasn't the best idea indeed. >> >> >> >>> And I think the key issue is the field Fill / VPN2 in EntryHi, normally >>> this field will equal to corresponding field in BADVADDR. But for >>> address 0xffffffffc0000000, it doesn't; In the book "see mips run", >>> there is a description for register EntryHi: >>> >>> >> Good point! -- you are correct. This compatibility area is a special >> case. Thanks a lot for the analysis. >> >> >> >>> Below is my patch, and it works well in my side. >>> >>> Signed-off-by: Weiwei Wang >>> diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c >>> index 5a0835b..1b2ef20 100644 >>> --- a/arch/mips/mm/tlbex.c >>> +++ b/arch/mips/mm/tlbex.c >>> @@ -674,6 +674,8 @@ static void __cpuinit >>> build_r4000_tlb_refill_handler(void) >>> UASM_i_MFC0(&p, K0, C0_BADVADDR); >>> UASM_i_MFC0(&p, K1, C0_ENTRYHI); >>> uasm_i_xor(&p, K0, K0, K1); >>> + UASM_i_SLL(&p, K0, K0, 24); >>> + UASM_i_SRL(&p, K0, K0, 24); >>> UASM_i_SRL(&p, K0, K0, PAGE_SHIFT + 1); >>> uasm_il_bnez(&p, &r, K0, label_leave); >>> /* No need for uasm_i_nop */ >>> >>> >> This is a hack for a single core type, so hardcoding the width of the >> virtual address space is fine. I am assuming you've got these right for >> the SB-1. >> >> However preserving the check of the two most significant bits is >> desirable. So I would suggest a patch as follows instead. >> >> >> >>> Note: The bit-shift amount for dsrl in the range 0 to 31, so I split >>> into 2 dsrl operations. >>> >>> >> That is actually not needed -- you can use DSRL32. >> >> Please try the following patch and see if it works for you. It boots >> into the user mode for me with a 64-bit big-endian 16kB page >> configuration, but I haven't checked it any further. >> >> Maciej >> >> Signed-off-by: Maciej W. Rozycki >> --- >> patch-mips-2.6.27-rc8-20081004-sb1250-m3-3 >> diff -up --recursive --new-file linux-mips-2.6.27-rc8-20081004.macro/arch/mips/mm/tlbex.c linux-mips-2.6.27-rc8-20081004/arch/mips/mm/tlbex.c >> --- linux-mips-2.6.27-rc8-20081004.macro/arch/mips/mm/tlbex.c 2008-10-13 14:45:55.000000000 +0000 >> +++ linux-mips-2.6.27-rc8-20081004/arch/mips/mm/tlbex.c 2008-10-13 14:47:50.000000000 +0000 >> @@ -6,7 +6,7 @@ >> * Synthesize TLB refill handlers at runtime. >> * >> * Copyright (C) 2004, 2005, 2006, 2008 Thiemo Seufer >> - * Copyright (C) 2005, 2007 Maciej W. Rozycki >> + * Copyright (C) 2005, 2007, 2008 Maciej W. Rozycki >> * Copyright (C) 2006 Ralf Baechle (ralf@linux-mips.org) >> * >> * ... and the days got worse and worse and now you see >> @@ -200,6 +200,23 @@ static void __cpuinit build_r3000_tlb_re >> static u32 final_handler[64] __cpuinitdata; >> >> /* >> + * To avoid the BCM1250 M3 erratum check whether EntryHi is consistent >> + * with BadVAddr and return for the exception to retrigger if not. >> + */ >> +static void __cpuinit build_bcm1250_m3_war(u32 **p, struct uasm_reloc **r) >> +{ >> + uasm_i_dmfc0(p, K0, C0_BADVADDR); >> + uasm_i_dmfc0(p, K1, C0_ENTRYHI); >> + uasm_i_xor(p, K0, K0, K1); >> + uasm_i_dsll(p, K1, K0, 24); >> + uasm_i_dsrl32(p, K1, K1, (24 + PAGE_SHIFT + 1) - 32); >> + uasm_i_dsrl32(p, K0, K0, 30); >> + uasm_i_or(p, K0, K0, K1); >> + uasm_il_bnez(p, r, K0, label_leave); >> + /* No need for uasm_i_nop */ >> +} >> + >> +/* >> * Hazards >> * >> * From the IDT errata for the QED RM5230 (Nevada), processor revision 1.0: >> @@ -669,14 +686,8 @@ static void __cpuinit build_r4000_tlb_re >> /* >> * create the plain linear handler >> */ >> - if (bcm1250_m3_war()) { >> - UASM_i_MFC0(&p, K0, C0_BADVADDR); >> - UASM_i_MFC0(&p, K1, C0_ENTRYHI); >> - uasm_i_xor(&p, K0, K0, K1); >> - UASM_i_SRL(&p, K0, K0, PAGE_SHIFT + 1); >> - uasm_il_bnez(&p, &r, K0, label_leave); >> - /* No need for uasm_i_nop */ >> - } >> + if (bcm1250_m3_war()) >> + build_bcm1250_m3_war(&p, &r); >> >> #ifdef CONFIG_64BIT >> build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */ >> @@ -1132,14 +1143,8 @@ static void __cpuinit build_r4000_tlb_lo >> memset(labels, 0, sizeof(labels)); >> memset(relocs, 0, sizeof(relocs)); >> >> - if (bcm1250_m3_war()) { >> - UASM_i_MFC0(&p, K0, C0_BADVADDR); >> - UASM_i_MFC0(&p, K1, C0_ENTRYHI); >> - uasm_i_xor(&p, K0, K0, K1); >> - UASM_i_SRL(&p, K0, K0, PAGE_SHIFT + 1); >> - uasm_il_bnez(&p, &r, K0, label_leave); >> - /* No need for uasm_i_nop */ >> - } >> + if (bcm1250_m3_war()) >> + build_bcm1250_m3_war(&p, &r); >> >> build_r4000_tlbchange_handler_head(&p, &l, &r, K0, K1); >> build_pte_present(&p, &l, &r, K0, K1, label_nopage_tlbl); >> diff -up --recursive --new-file linux-mips-2.6.27-rc8-20081004.macro/arch/mips/mm/uasm.c linux-mips-2.6.27-rc8-20081004/arch/mips/mm/uasm.c >> --- linux-mips-2.6.27-rc8-20081004.macro/arch/mips/mm/uasm.c 2008-10-13 14:45:55.000000000 +0000 >> +++ linux-mips-2.6.27-rc8-20081004/arch/mips/mm/uasm.c 2008-10-13 14:50:42.000000000 +0000 >> @@ -8,7 +8,7 @@ >> * effects like branch delay slots. >> * >> * Copyright (C) 2004, 2005, 2006, 2008 Thiemo Seufer >> - * Copyright (C) 2005, 2007 Maciej W. Rozycki >> + * Copyright (C) 2005, 2007, 2008 Maciej W. Rozycki >> * Copyright (C) 2006 Ralf Baechle (ralf@linux-mips.org) >> */ >> >> @@ -62,9 +62,10 @@ enum opcode { >> insn_dmtc0, insn_dsll, insn_dsll32, insn_dsra, insn_dsrl, >> insn_dsrl32, insn_dsubu, insn_eret, insn_j, insn_jal, insn_jr, >> insn_ld, insn_ll, insn_lld, insn_lui, insn_lw, insn_mfc0, >> - insn_mtc0, insn_ori, insn_pref, insn_rfe, insn_sc, insn_scd, >> - insn_sd, insn_sll, insn_sra, insn_srl, insn_subu, insn_sw, >> - insn_tlbp, insn_tlbwi, insn_tlbwr, insn_xor, insn_xori >> + insn_mtc0, insn_or, insn_ori, insn_pref, insn_rfe, insn_sc, >> + insn_scd, insn_sd, insn_sll, insn_sra, insn_srl, insn_subu, >> + insn_sw, insn_tlbp, insn_tlbwi, insn_tlbwr, insn_xor, >> + insn_xori >> }; >> >> struct insn { >> @@ -116,6 +117,7 @@ static struct insn insn_table[] __cpuini >> { insn_lw, M(lw_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, >> { insn_mfc0, M(cop0_op, mfc_op, 0, 0, 0, 0), RT | RD | SET}, >> { insn_mtc0, M(cop0_op, mtc_op, 0, 0, 0, 0), RT | RD | SET}, >> + { insn_or, M(spec_op, 0, 0, 0, 0, or_op), RS | RT | RD }, >> { insn_ori, M(ori_op, 0, 0, 0, 0, 0), RS | RT | UIMM }, >> { insn_pref, M(pref_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, >> { insn_rfe, M(cop0_op, cop_op, 0, 0, 0, rfe_op), 0 }, >> @@ -361,6 +363,7 @@ I_u1s2(_lui) >> I_u2s3u1(_lw) >> I_u1u2u3(_mfc0) >> I_u1u2u3(_mtc0) >> +I_u3u1u2(_or) >> I_u2u1u3(_ori) >> I_u2s3u1(_pref) >> I_0(_rfe) >> diff -up --recursive --new-file linux-mips-2.6.27-rc8-20081004.macro/arch/mips/mm/uasm.h linux-mips-2.6.27-rc8-20081004/arch/mips/mm/uasm.h >> --- linux-mips-2.6.27-rc8-20081004.macro/arch/mips/mm/uasm.h 2008-10-13 14:45:55.000000000 +0000 >> +++ linux-mips-2.6.27-rc8-20081004/arch/mips/mm/uasm.h 2008-10-13 14:26:23.000000000 +0000 >> @@ -4,7 +4,7 @@ >> * for more details. >> * >> * Copyright (C) 2004, 2005, 2006, 2008 Thiemo Seufer >> - * Copyright (C) 2005 Maciej W. Rozycki >> + * Copyright (C) 2005, 2008 Maciej W. Rozycki >> * Copyright (C) 2006 Ralf Baechle (ralf@linux-mips.org) >> */ >> >> @@ -77,6 +77,7 @@ Ip_u1s2(_lui); >> Ip_u2s3u1(_lw); >> Ip_u1u2u3(_mfc0); >> Ip_u1u2u3(_mtc0); >> +Ip_u3u1u2(_or); >> Ip_u2u1u3(_ori); >> Ip_u2s3u1(_pref); >> Ip_0(_rfe); >> > > > From macro@linux-mips.org Tue Oct 14 11:46:12 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 11:46:14 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:58798 "EHLO localhost.localdomain") by ftp.linux-mips.org with ESMTP id S21468867AbYJNKqM (ORCPT ); Tue, 14 Oct 2008 11:46:12 +0100 Date: Tue, 14 Oct 2008 11:46:12 +0100 (BST) From: "Maciej W. Rozycki" To: Weiwei Wang cc: Ralf Baechle , weiwei wang , linux-mips@linux-mips.org Subject: Re: [Fwd: [bug report] 0xffffffffc0000000 can't be used on bcm1250] In-Reply-To: <48F4706A.2010401@windriver.com> Message-ID: References: <48EC9894.4080201@gmail.com> <20081008115001.GA21596@linux-mips.org> <48ED5BA5.4070301@gmail.com> <20081009131554.GB22796@linux-mips.org> <48EEBFE8.1000501@gmail.com> <48F2BC15.70408@gmail.com> <20081013162906.GB7144@linux-mips.org> <48F3F499.3010508@windriver.com> <48F4706A.2010401@windriver.com> User-Agent: Alpine 1.10 (LFD 962 2008-03-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 20748 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 Content-Length: 1318 Lines: 26 On Tue, 14 Oct 2008, Weiwei Wang wrote: > I checked the sb-1 core user manual, and finally confirm the virtual > address space is 44 bits wide, not 40 bits. so for function Lucky you to have access to this thing! Anyway, Ralf has promised us a brand new wonderful alternative solution, so let's wait for that to happen first before fiddling with my proposal any further. Thanks for the note though. > But another issue is confusing me right now. Since the bit 44-61 in > entryhi is not valid, and are read as 0, so when issue command tlbwr, > the cpu will copy the contents of EntryHi, EntryLo, and PageMask into > the TLB entry, including the invalid bits in VPN2 of entryhi. Here I > think tlb entry conflict may appear. Take address 0xc0000fffc0000000 and > 0xffffffffc0000000 for example, the two address may get the same tlb > entry. am i getting it wrong? can you give me your understanding. If you have a close look at the MIPS64 architecture spec, then you'll notice that the last 2GB of the XKSEG space are reserved. This is exactly so that the clash you are concerned about does not happen. Any EntryHi value written with the value of R set to 0x3 and all the bits of VPN2 starting from the most significant one down to the bit #31 set to 1 refers to the compatibility segment. Maciej From tsbogend@alpha.franken.de Tue Oct 14 16:17:40 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 16:17:42 +0100 (BST) Received: from elvis.franken.de ([193.175.24.41]:61631 "EHLO elvis.franken.de") by ftp.linux-mips.org with ESMTP id S21487818AbYJNPRk (ORCPT ); Tue, 14 Oct 2008 16:17:40 +0100 Received: from uucp (helo=solo.franken.de) by elvis.franken.de with local-bsmtp (Exim 3.36 #1) id 1KpleS-0005UJ-00; Tue, 14 Oct 2008 17:17:36 +0200 Received: by solo.franken.de (Postfix, from userid 1000) id 355A7C3AE9; Tue, 14 Oct 2008 17:16:55 +0200 (CEST) From: Thomas Bogendoerfer Subject: [PATCH v3] IP22/28: Switch over to RTC class driver To: linux-mips@linux-mips.org cc: ralf@linux-mips.org Message-Id: <20081014151655.355A7C3AE9@solo.franken.de> Date: Tue, 14 Oct 2008 17:16:55 +0200 (CEST) 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: 20749 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: tsbogend@alpha.franken.de Precedence: bulk X-list: linux-mips Content-Length: 5596 Lines: 180 This patchset removes some dead code and creates a platform device for the RTC class driver. Signed-off-by: Thomas Bogendoerfer --- Please apply for 2.6.28 arch/mips/include/asm/mach-ip22/ds1286.h | 18 -------- arch/mips/include/asm/mach-ip28/ds1286.h | 4 -- arch/mips/sgi-ip22/ip22-platform.c | 15 +++++++ arch/mips/sgi-ip22/ip22-setup.c | 1 - arch/mips/sgi-ip22/ip22-time.c | 64 ------------------------------ include/linux/ds1286.h | 2 - 6 files changed, 15 insertions(+), 89 deletions(-) diff --git a/arch/mips/include/asm/mach-ip22/ds1286.h b/arch/mips/include/asm/mach-ip22/ds1286.h deleted file mode 100644 index f19f1ea..0000000 --- a/arch/mips/include/asm/mach-ip22/ds1286.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 1998, 2001, 03 by Ralf Baechle - * - * RTC routines for PC style attached Dallas chip. - */ -#ifndef __ASM_MACH_IP22_DS1286_H -#define __ASM_MACH_IP22_DS1286_H - -#include - -#define rtc_read(reg) (hpc3c0->rtcregs[(reg)] & 0xff) -#define rtc_write(data, reg) do { hpc3c0->rtcregs[(reg)] = (data); } while(0) - -#endif /* __ASM_MACH_IP22_DS1286_H */ diff --git a/arch/mips/include/asm/mach-ip28/ds1286.h b/arch/mips/include/asm/mach-ip28/ds1286.h deleted file mode 100644 index 471bb9a..0000000 --- a/arch/mips/include/asm/mach-ip28/ds1286.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef __ASM_MACH_IP28_DS1286_H -#define __ASM_MACH_IP28_DS1286_H -#include -#endif /* __ASM_MACH_IP28_DS1286_H */ diff --git a/arch/mips/sgi-ip22/ip22-platform.c b/arch/mips/sgi-ip22/ip22-platform.c index 52486c4..deddbf0 100644 --- a/arch/mips/sgi-ip22/ip22-platform.c +++ b/arch/mips/sgi-ip22/ip22-platform.c @@ -192,3 +192,18 @@ static int __init sgi_button_devinit(void) } device_initcall(sgi_button_devinit); + +static int __init sgi_ds1286_devinit(void) +{ + struct resource res; + + memset(&res, 0, sizeof(res)); + res.start = HPC3_CHIP0_BASE + offsetof(struct hpc3_regs, rtcregs); + res.end = res.start + sizeof(hpc3c0->rtcregs) - 1; + res.flags = IORESOURCE_MEM; + + return IS_ERR(platform_device_register_simple("rtc-ds1286", -1, + &res, 1)); +} + +device_initcall(sgi_ds1286_devinit); diff --git a/arch/mips/sgi-ip22/ip22-setup.c b/arch/mips/sgi-ip22/ip22-setup.c index 896a1ef..b9a9313 100644 --- a/arch/mips/sgi-ip22/ip22-setup.c +++ b/arch/mips/sgi-ip22/ip22-setup.c @@ -4,7 +4,6 @@ * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1997, 1998 Ralf Baechle (ralf@gnu.org) */ -#include #include #include #include diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c index 10e5054..3dcb27e 100644 --- a/arch/mips/sgi-ip22/ip22-time.c +++ b/arch/mips/sgi-ip22/ip22-time.c @@ -10,7 +10,6 @@ * Copyright (C) 2003, 06 Ralf Baechle (ralf@linux-mips.org) */ #include -#include #include #include #include @@ -29,69 +28,6 @@ #include #include -/* - * Note that mktime uses month from 1 to 12 while rtc_time_to_tm - * uses 0 to 11. - */ -unsigned long read_persistent_clock(void) -{ - unsigned int yrs, mon, day, hrs, min, sec; - unsigned int save_control; - unsigned long flags; - - spin_lock_irqsave(&rtc_lock, flags); - save_control = hpc3c0->rtcregs[RTC_CMD] & 0xff; - hpc3c0->rtcregs[RTC_CMD] = save_control | RTC_TE; - - sec = BCD2BIN(hpc3c0->rtcregs[RTC_SECONDS] & 0xff); - min = BCD2BIN(hpc3c0->rtcregs[RTC_MINUTES] & 0xff); - hrs = BCD2BIN(hpc3c0->rtcregs[RTC_HOURS] & 0x3f); - day = BCD2BIN(hpc3c0->rtcregs[RTC_DATE] & 0xff); - mon = BCD2BIN(hpc3c0->rtcregs[RTC_MONTH] & 0x1f); - yrs = BCD2BIN(hpc3c0->rtcregs[RTC_YEAR] & 0xff); - - hpc3c0->rtcregs[RTC_CMD] = save_control; - spin_unlock_irqrestore(&rtc_lock, flags); - - if (yrs < 45) - yrs += 30; - if ((yrs += 40) < 70) - yrs += 100; - - return mktime(yrs + 1900, mon, day, hrs, min, sec); -} - -int rtc_mips_set_time(unsigned long tim) -{ - struct rtc_time tm; - unsigned int save_control; - unsigned long flags; - - rtc_time_to_tm(tim, &tm); - - tm.tm_mon += 1; /* tm_mon starts at zero */ - tm.tm_year -= 40; - if (tm.tm_year >= 100) - tm.tm_year -= 100; - - spin_lock_irqsave(&rtc_lock, flags); - save_control = hpc3c0->rtcregs[RTC_CMD] & 0xff; - hpc3c0->rtcregs[RTC_CMD] = save_control | RTC_TE; - - hpc3c0->rtcregs[RTC_YEAR] = BIN2BCD(tm.tm_year); - hpc3c0->rtcregs[RTC_MONTH] = BIN2BCD(tm.tm_mon); - hpc3c0->rtcregs[RTC_DATE] = BIN2BCD(tm.tm_mday); - hpc3c0->rtcregs[RTC_HOURS] = BIN2BCD(tm.tm_hour); - hpc3c0->rtcregs[RTC_MINUTES] = BIN2BCD(tm.tm_min); - hpc3c0->rtcregs[RTC_SECONDS] = BIN2BCD(tm.tm_sec); - hpc3c0->rtcregs[RTC_HUNDREDTH_SECOND] = 0; - - hpc3c0->rtcregs[RTC_CMD] = save_control; - spin_unlock_irqrestore(&rtc_lock, flags); - - return 0; -} - static unsigned long dosample(void) { u32 ct0, ct1; diff --git a/include/linux/ds1286.h b/include/linux/ds1286.h index d898986..45ea0aa 100644 --- a/include/linux/ds1286.h +++ b/include/linux/ds1286.h @@ -8,8 +8,6 @@ #ifndef __LINUX_DS1286_H #define __LINUX_DS1286_H -#include - /********************************************************************** * register summary **********************************************************************/ From tsbogend@alpha.franken.de Tue Oct 14 16:17:59 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 16:18:02 +0100 (BST) Received: from elvis.franken.de ([193.175.24.41]:62399 "EHLO elvis.franken.de") by ftp.linux-mips.org with ESMTP id S21487819AbYJNPRk (ORCPT ); Tue, 14 Oct 2008 16:17:40 +0100 Received: from uucp (helo=solo.franken.de) by elvis.franken.de with local-bsmtp (Exim 3.36 #1) id 1KpleS-0005UJ-03; Tue, 14 Oct 2008 17:17:36 +0200 Received: by solo.franken.de (Postfix, from userid 1000) id DBFA3C3AEA; Tue, 14 Oct 2008 17:17:32 +0200 (CEST) From: Thomas Bogendoerfer Subject: [PATCH v4] M48T35: new RTC driver To: rtc-linux@googlegroups.com, linux-mips@linux-mips.org cc: a.zummo@towertech.it, ralf@linux-mips.org Message-Id: <20081014151732.DBFA3C3AEA@solo.franken.de> Date: Tue, 14 Oct 2008 17:17:32 +0200 (CEST) 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: 20750 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: tsbogend@alpha.franken.de Precedence: bulk X-list: linux-mips Content-Length: 7553 Lines: 290 This driver replaces the broken ip27-rtc driver in drivers/char and gives back RTC support for SGI IP27 machines. Acked-by: Alessandro Zummo Signed-off-by: Thomas Bogendoerfer --- Please apply for 2.6.28 Changes since v3: - removed superflous and wrong check in set_time drivers/rtc/Kconfig | 9 ++ drivers/rtc/Makefile | 1 + drivers/rtc/rtc-m48t35.c | 234 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 244 insertions(+), 0 deletions(-) diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index b57fba5..0ef68c2 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -405,6 +405,15 @@ config RTC_DRV_M48T86 This driver can also be built as a module. If so, the module will be called rtc-m48t86. +config RTC_DRV_M48T35 + tristate "ST M48T35" + help + If you say Y here you will get support for the + ST M48T35 RTC chip. + + This driver can also be built as a module, if so, the module + will be called "rtc-m48t35". + config RTC_DRV_M48T59 tristate "ST M48T59/M48T08/M48T02" help diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 10f41f8..cf53912 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -36,6 +36,7 @@ obj-$(CONFIG_RTC_DRV_FM3130) += rtc-fm3130.o obj-$(CONFIG_RTC_DRV_ISL1208) += rtc-isl1208.o obj-$(CONFIG_RTC_DRV_M41T80) += rtc-m41t80.o obj-$(CONFIG_RTC_DRV_M41T94) += rtc-m41t94.o +obj-$(CONFIG_RTC_DRV_M48T35) += rtc-m48t35.o obj-$(CONFIG_RTC_DRV_M48T59) += rtc-m48t59.o obj-$(CONFIG_RTC_DRV_M48T86) += rtc-m48t86.o obj-$(CONFIG_RTC_DRV_BQ4802) += rtc-bq4802.o diff --git a/drivers/rtc/rtc-m48t35.c b/drivers/rtc/rtc-m48t35.c new file mode 100644 index 0000000..b9c1fe4 --- /dev/null +++ b/drivers/rtc/rtc-m48t35.c @@ -0,0 +1,234 @@ +/* + * Driver for the SGS-Thomson M48T35 Timekeeper RAM chip + * + * Copyright (C) 2000 Silicon Graphics, Inc. + * Written by Ulf Carlsson (ulfc@engr.sgi.com) + * + * Copyright (C) 2008 Thomas Bogendoerfer + * + * Based on code written by Paul Gortmaker. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +#include +#include +#include +#include + +#define DRV_VERSION "1.0" + +struct m48t35_rtc { + u8 pad[0x7ff8]; /* starts at 0x7ff8 */ + u8 control; + u8 sec; + u8 min; + u8 hour; + u8 day; + u8 date; + u8 month; + u8 year; +}; + +#define M48T35_RTC_SET 0x80 +#define M48T35_RTC_READ 0x40 + +struct m48t35_priv { + struct rtc_device *rtc; + struct m48t35_rtc __iomem *reg; + size_t size; + unsigned long baseaddr; + spinlock_t lock; +}; + +static int m48t35_read_time(struct device *dev, struct rtc_time *tm) +{ + struct m48t35_priv *priv = dev_get_drvdata(dev); + u8 control; + + /* + * Only the values that we read from the RTC are set. We leave + * tm_wday, tm_yday and tm_isdst untouched. Even though the + * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated + * by the RTC when initially set to a non-zero value. + */ + spin_lock_irq(&priv->lock); + control = readb(&priv->reg->control); + writeb(control | M48T35_RTC_READ, &priv->reg->control); + tm->tm_sec = readb(&priv->reg->sec); + tm->tm_min = readb(&priv->reg->min); + tm->tm_hour = readb(&priv->reg->hour); + tm->tm_mday = readb(&priv->reg->date); + tm->tm_mon = readb(&priv->reg->month); + tm->tm_year = readb(&priv->reg->year); + writeb(control, &priv->reg->control); + spin_unlock_irq(&priv->lock); + + tm->tm_sec = bcd2bin(tm->tm_sec); + tm->tm_min = bcd2bin(tm->tm_min); + tm->tm_hour = bcd2bin(tm->tm_hour); + tm->tm_mday = bcd2bin(tm->tm_mday); + tm->tm_mon = bcd2bin(tm->tm_mon); + tm->tm_year = bcd2bin(tm->tm_year); + + /* + * Account for differences between how the RTC uses the values + * and how they are defined in a struct rtc_time; + */ + tm->tm_year += 70; + if (tm->tm_year <= 69) + tm->tm_year += 100; + + tm->tm_mon--; + return rtc_valid_tm(tm); +} + +static int m48t35_set_time(struct device *dev, struct rtc_time *tm) +{ + struct m48t35_priv *priv = dev_get_drvdata(dev); + unsigned char mon, day, hrs, min, sec; + unsigned int yrs; + u8 control; + + yrs = tm->tm_year + 1900; + mon = tm->tm_mon + 1; /* tm_mon starts at zero */ + day = tm->tm_mday; + hrs = tm->tm_hour; + min = tm->tm_min; + sec = tm->tm_sec; + + if (yrs < 1970) + return -EINVAL; + + yrs -= 1970; + if (yrs > 255) /* They are unsigned */ + return -EINVAL; + + if (yrs > 169) + return -EINVAL; + + if (yrs >= 100) + yrs -= 100; + + sec = bin2bcd(sec); + min = bin2bcd(min); + hrs = bin2bcd(hrs); + day = bin2bcd(day); + mon = bin2bcd(mon); + yrs = bin2bcd(yrs); + + spin_lock_irq(&priv->lock); + control = readb(&priv->reg->control); + writeb(control | M48T35_RTC_SET, &priv->reg->control); + writeb(yrs, &priv->reg->year); + writeb(mon, &priv->reg->month); + writeb(day, &priv->reg->date); + writeb(hrs, &priv->reg->hour); + writeb(min, &priv->reg->min); + writeb(sec, &priv->reg->sec); + writeb(control, &priv->reg->control); + spin_unlock_irq(&priv->lock); + return 0; +} + +static const struct rtc_class_ops m48t35_ops = { + .read_time = m48t35_read_time, + .set_time = m48t35_set_time, +}; + +static int __devinit m48t35_probe(struct platform_device *pdev) +{ + struct rtc_device *rtc; + struct resource *res; + struct m48t35_priv *priv; + int ret = 0; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return -ENODEV; + priv = kzalloc(sizeof(struct m48t35_priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->size = res->end - res->start + 1; + /* + * kludge: remove the #ifndef after ioc3 resource + * conflicts are resolved + */ +#ifndef CONFIG_SGI_IP27 + if (!request_mem_region(res->start, priv->size, pdev->name)) { + ret = -EBUSY; + goto out; + } +#endif + priv->baseaddr = res->start; + priv->reg = ioremap(priv->baseaddr, priv->size); + if (!priv->reg) { + ret = -ENOMEM; + goto out; + } + spin_lock_init(&priv->lock); + rtc = rtc_device_register("m48t35", &pdev->dev, + &m48t35_ops, THIS_MODULE); + if (IS_ERR(rtc)) { + ret = PTR_ERR(rtc); + goto out; + } + priv->rtc = rtc; + platform_set_drvdata(pdev, priv); + return 0; + +out: + if (priv->rtc) + rtc_device_unregister(priv->rtc); + if (priv->reg) + iounmap(priv->reg); + if (priv->baseaddr) + release_mem_region(priv->baseaddr, priv->size); + kfree(priv); + return ret; +} + +static int __devexit m48t35_remove(struct platform_device *pdev) +{ + struct m48t35_priv *priv = platform_get_drvdata(pdev); + + rtc_device_unregister(priv->rtc); + iounmap(priv->reg); +#ifndef CONFIG_SGI_IP27 + release_mem_region(priv->baseaddr, priv->size); +#endif + kfree(priv); + return 0; +} + +static struct platform_driver m48t35_platform_driver = { + .driver = { + .name = "rtc-m48t35", + .owner = THIS_MODULE, + }, + .probe = m48t35_probe, + .remove = __devexit_p(m48t35_remove), +}; + +static int __init m48t35_init(void) +{ + return platform_driver_register(&m48t35_platform_driver); +} + +static void __exit m48t35_exit(void) +{ + platform_driver_unregister(&m48t35_platform_driver); +} + +MODULE_AUTHOR("Thomas Bogendoerfer "); +MODULE_DESCRIPTION("M48T35 RTC driver"); +MODULE_LICENSE("GPL"); +MODULE_VERSION(DRV_VERSION); +MODULE_ALIAS("platform:rtc-m48t35"); + +module_init(m48t35_init); +module_exit(m48t35_exit); From tsbogend@alpha.franken.de Tue Oct 14 16:18:20 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 16:18:23 +0100 (BST) Received: from elvis.franken.de ([193.175.24.41]:62655 "EHLO elvis.franken.de") by ftp.linux-mips.org with ESMTP id S21487820AbYJNPRk (ORCPT ); Tue, 14 Oct 2008 16:17:40 +0100 Received: from uucp (helo=solo.franken.de) by elvis.franken.de with local-bsmtp (Exim 3.36 #1) id 1KpleS-0005UJ-01; Tue, 14 Oct 2008 17:17:36 +0200 Received: by solo.franken.de (Postfix, from userid 1000) id D67E3C3AEA; Tue, 14 Oct 2008 17:16:59 +0200 (CEST) From: Thomas Bogendoerfer Subject: [PATCH v3] DS1286: new RTC driver To: rtc-linux@googlegroups.com, linux-mips@linux-mips.org cc: a.zummo@towertech.it, ralf@linux-mips.org Message-Id: <20081014151659.D67E3C3AEA@solo.franken.de> Date: Tue, 14 Oct 2008 17:16:59 +0200 (CEST) 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: 20751 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: tsbogend@alpha.franken.de Precedence: bulk X-list: linux-mips Content-Length: 12686 Lines: 461 This driver replaces the broken DS1286 driver in drivers/char and gives back RTC support for SGI IP22 and IP28 machines. Acked-by: Alessandro Zummo Signed-off-by: Thomas Bogendoerfer --- Please apply for 2.6.28 Changes since v2: - removed superflous and wrong check in set_time drivers/rtc/Kconfig | 5 + drivers/rtc/Makefile | 1 + drivers/rtc/rtc-ds1286.c | 409 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 415 insertions(+), 0 deletions(-) diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index b57fba5..2421700 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -352,6 +352,11 @@ config RTC_DRV_DS1216 help If you say yes here you get support for the Dallas DS1216 RTC chips. +config RTC_DRV_DS1286 + tristate "Dallas DS1286" + help + If you say yes here you get support for the Dallas DS1286 RTC chips. + config RTC_DRV_DS1302 tristate "Dallas DS1302" depends on SH_SECUREEDGE5410 diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 10f41f8..a320808 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -23,6 +23,7 @@ obj-$(CONFIG_RTC_DRV_AT91SAM9) += rtc-at91sam9.o obj-$(CONFIG_RTC_DRV_BFIN) += rtc-bfin.o obj-$(CONFIG_RTC_DRV_CMOS) += rtc-cmos.o obj-$(CONFIG_RTC_DRV_DS1216) += rtc-ds1216.o +obj-$(CONFIG_RTC_DRV_DS1286) += rtc-ds1286.o obj-$(CONFIG_RTC_DRV_DS1302) += rtc-ds1302.o obj-$(CONFIG_RTC_DRV_DS1305) += rtc-ds1305.o obj-$(CONFIG_RTC_DRV_DS1307) += rtc-ds1307.o diff --git a/drivers/rtc/rtc-ds1286.c b/drivers/rtc/rtc-ds1286.c new file mode 100644 index 0000000..4b4c1b6 --- /dev/null +++ b/drivers/rtc/rtc-ds1286.c @@ -0,0 +1,409 @@ +/* + * DS1286 Real Time Clock interface for Linux + * + * Copyright (C) 1998, 1999, 2000 Ralf Baechle + * Copyright (C) 2008 Thomas Bogendoerfer + * + * Based on code written by Paul Gortmaker. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +#include +#include +#include +#include +#include + +#define DRV_VERSION "1.0" + +struct ds1286_priv { + struct rtc_device *rtc; + u32 __iomem *rtcregs; + size_t size; + unsigned long baseaddr; + spinlock_t lock; +}; + +static inline u8 ds1286_rtc_read(struct ds1286_priv *priv, int reg) +{ + return __raw_readl(&priv->rtcregs[reg]) & 0xff; +} + +static inline void ds1286_rtc_write(struct ds1286_priv *priv, u8 data, int reg) +{ + __raw_writel(data, &priv->rtcregs[reg]); +} + +#ifdef CONFIG_RTC_INTF_DEV + +static int ds1286_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) +{ + struct ds1286_priv *priv = dev_get_drvdata(dev); + unsigned long flags; + unsigned char val; + + switch (cmd) { + case RTC_AIE_OFF: + /* Mask alarm int. enab. bit */ + spin_lock_irqsave(&priv->lock, flags); + val = ds1286_rtc_read(priv, RTC_CMD); + val |= RTC_TDM; + ds1286_rtc_write(priv, val, RTC_CMD); + spin_unlock_irqrestore(&priv->lock, flags); + break; + case RTC_AIE_ON: + /* Allow alarm interrupts. */ + spin_lock_irqsave(&priv->lock, flags); + val = ds1286_rtc_read(priv, RTC_CMD); + val &= ~RTC_TDM; + ds1286_rtc_write(priv, val, RTC_CMD); + spin_unlock_irqrestore(&priv->lock, flags); + break; + case RTC_WIE_OFF: + /* Mask watchdog int. enab. bit */ + spin_lock_irqsave(&priv->lock, flags); + val = ds1286_rtc_read(priv, RTC_CMD); + val |= RTC_WAM; + ds1286_rtc_write(priv, val, RTC_CMD); + spin_unlock_irqrestore(&priv->lock, flags); + break; + case RTC_WIE_ON: + /* Allow watchdog interrupts. */ + spin_lock_irqsave(&priv->lock, flags); + val = ds1286_rtc_read(priv, RTC_CMD); + val &= ~RTC_WAM; + ds1286_rtc_write(priv, val, RTC_CMD); + spin_unlock_irqrestore(&priv->lock, flags); + break; + default: + return -ENOIOCTLCMD; + } + return 0; +} + +#else +#define ds1286_ioctl NULL +#endif + +#ifdef CONFIG_PROC_FS + +static int ds1286_proc(struct device *dev, struct seq_file *seq) +{ + struct ds1286_priv *priv = dev_get_drvdata(dev); + unsigned char month, cmd, amode; + const char *s; + + month = ds1286_rtc_read(priv, RTC_MONTH); + seq_printf(seq, + "oscillator\t: %s\n" + "square_wave\t: %s\n", + (month & RTC_EOSC) ? "disabled" : "enabled", + (month & RTC_ESQW) ? "disabled" : "enabled"); + + amode = ((ds1286_rtc_read(priv, RTC_MINUTES_ALARM) & 0x80) >> 5) | + ((ds1286_rtc_read(priv, RTC_HOURS_ALARM) & 0x80) >> 6) | + ((ds1286_rtc_read(priv, RTC_DAY_ALARM) & 0x80) >> 7); + switch (amode) { + case 7: + s = "each minute"; + break; + case 3: + s = "minutes match"; + break; + case 1: + s = "hours and minutes match"; + break; + case 0: + s = "days, hours and minutes match"; + break; + default: + s = "invalid"; + break; + } + seq_printf(seq, "alarm_mode\t: %s\n", s); + + cmd = ds1286_rtc_read(priv, RTC_CMD); + seq_printf(seq, + "alarm_enable\t: %s\n" + "wdog_alarm\t: %s\n" + "alarm_mask\t: %s\n" + "wdog_alarm_mask\t: %s\n" + "interrupt_mode\t: %s\n" + "INTB_mode\t: %s_active\n" + "interrupt_pins\t: %s\n", + (cmd & RTC_TDF) ? "yes" : "no", + (cmd & RTC_WAF) ? "yes" : "no", + (cmd & RTC_TDM) ? "disabled" : "enabled", + (cmd & RTC_WAM) ? "disabled" : "enabled", + (cmd & RTC_PU_LVL) ? "pulse" : "level", + (cmd & RTC_IBH_LO) ? "low" : "high", + (cmd & RTC_IPSW) ? "unswapped" : "swapped"); + return 0; +} + +#else +#define ds1286_proc NULL +#endif + +static int ds1286_read_time(struct device *dev, struct rtc_time *tm) +{ + struct ds1286_priv *priv = dev_get_drvdata(dev); + unsigned char save_control; + unsigned long flags; + unsigned long uip_watchdog = jiffies; + + /* + * read RTC once any update in progress is done. The update + * can take just over 2ms. We wait 10 to 20ms. There is no need to + * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP. + * If you need to know *exactly* when a second has started, enable + * periodic update complete interrupts, (via ioctl) and then + * immediately read /dev/rtc which will block until you get the IRQ. + * Once the read clears, read the RTC time (again via ioctl). Easy. + */ + + if (ds1286_rtc_read(priv, RTC_CMD) & RTC_TE) + while (time_before(jiffies, uip_watchdog + 2*HZ/100)) + barrier(); + + /* + * Only the values that we read from the RTC are set. We leave + * tm_wday, tm_yday and tm_isdst untouched. Even though the + * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated + * by the RTC when initially set to a non-zero value. + */ + spin_lock_irqsave(&priv->lock, flags); + save_control = ds1286_rtc_read(priv, RTC_CMD); + ds1286_rtc_write(priv, (save_control|RTC_TE), RTC_CMD); + + tm->tm_sec = ds1286_rtc_read(priv, RTC_SECONDS); + tm->tm_min = ds1286_rtc_read(priv, RTC_MINUTES); + tm->tm_hour = ds1286_rtc_read(priv, RTC_HOURS) & 0x3f; + tm->tm_mday = ds1286_rtc_read(priv, RTC_DATE); + tm->tm_mon = ds1286_rtc_read(priv, RTC_MONTH) & 0x1f; + tm->tm_year = ds1286_rtc_read(priv, RTC_YEAR); + + ds1286_rtc_write(priv, save_control, RTC_CMD); + spin_unlock_irqrestore(&priv->lock, flags); + + tm->tm_sec = bcd2bin(tm->tm_sec); + tm->tm_min = bcd2bin(tm->tm_min); + tm->tm_hour = bcd2bin(tm->tm_hour); + tm->tm_mday = bcd2bin(tm->tm_mday); + tm->tm_mon = bcd2bin(tm->tm_mon); + tm->tm_year = bcd2bin(tm->tm_year); + + /* + * Account for differences between how the RTC uses the values + * and how they are defined in a struct rtc_time; + */ + if (tm->tm_year < 45) + tm->tm_year += 30; + tm->tm_year += 40; + if (tm->tm_year < 70) + tm->tm_year += 100; + + tm->tm_mon--; + + return rtc_valid_tm(tm); +} + +static int ds1286_set_time(struct device *dev, struct rtc_time *tm) +{ + struct ds1286_priv *priv = dev_get_drvdata(dev); + unsigned char mon, day, hrs, min, sec; + unsigned char save_control; + unsigned int yrs; + unsigned long flags; + + yrs = tm->tm_year + 1900; + mon = tm->tm_mon + 1; /* tm_mon starts at zero */ + day = tm->tm_mday; + hrs = tm->tm_hour; + min = tm->tm_min; + sec = tm->tm_sec; + + if (yrs < 1970) + return -EINVAL; + + yrs -= 1940; + if (yrs > 255) /* They are unsigned */ + return -EINVAL; + + if (yrs >= 100) + yrs -= 100; + + sec = bin2bcd(sec); + min = bin2bcd(min); + hrs = bin2bcd(hrs); + day = bin2bcd(day); + mon = bin2bcd(mon); + yrs = bin2bcd(yrs); + + spin_lock_irqsave(&priv->lock, flags); + save_control = ds1286_rtc_read(priv, RTC_CMD); + ds1286_rtc_write(priv, (save_control|RTC_TE), RTC_CMD); + + ds1286_rtc_write(priv, yrs, RTC_YEAR); + ds1286_rtc_write(priv, mon, RTC_MONTH); + ds1286_rtc_write(priv, day, RTC_DATE); + ds1286_rtc_write(priv, hrs, RTC_HOURS); + ds1286_rtc_write(priv, min, RTC_MINUTES); + ds1286_rtc_write(priv, sec, RTC_SECONDS); + ds1286_rtc_write(priv, 0, RTC_HUNDREDTH_SECOND); + + ds1286_rtc_write(priv, save_control, RTC_CMD); + spin_unlock_irqrestore(&priv->lock, flags); + return 0; +} + +static int ds1286_read_alarm(struct device *dev, struct rtc_wkalrm *alm) +{ + struct ds1286_priv *priv = dev_get_drvdata(dev); + unsigned char cmd; + unsigned long flags; + + /* + * Only the values that we read from the RTC are set. That + * means only tm_wday, tm_hour, tm_min. + */ + spin_lock_irqsave(&priv->lock, flags); + alm->time.tm_min = ds1286_rtc_read(priv, RTC_MINUTES_ALARM) & 0x7f; + alm->time.tm_hour = ds1286_rtc_read(priv, RTC_HOURS_ALARM) & 0x1f; + alm->time.tm_wday = ds1286_rtc_read(priv, RTC_DAY_ALARM) & 0x07; + cmd = ds1286_rtc_read(priv, RTC_CMD); + spin_unlock_irqrestore(&priv->lock, flags); + + alm->time.tm_min = bcd2bin(alm->time.tm_min); + alm->time.tm_hour = bcd2bin(alm->time.tm_hour); + alm->time.tm_sec = 0; + return 0; +} + +static int ds1286_set_alarm(struct device *dev, struct rtc_wkalrm *alm) +{ + struct ds1286_priv *priv = dev_get_drvdata(dev); + unsigned char hrs, min, sec; + + hrs = alm->time.tm_hour; + min = alm->time.tm_min; + sec = alm->time.tm_sec; + + if (hrs >= 24) + hrs = 0xff; + + if (min >= 60) + min = 0xff; + + if (sec != 0) + return -EINVAL; + + min = bin2bcd(min); + hrs = bin2bcd(hrs); + + spin_lock(&priv->lock); + ds1286_rtc_write(priv, hrs, RTC_HOURS_ALARM); + ds1286_rtc_write(priv, min, RTC_MINUTES_ALARM); + spin_unlock(&priv->lock); + + return 0; +} + +static const struct rtc_class_ops ds1286_ops = { + .ioctl = ds1286_ioctl, + .proc = ds1286_proc, + .read_time = ds1286_read_time, + .set_time = ds1286_set_time, + .read_alarm = ds1286_read_alarm, + .set_alarm = ds1286_set_alarm, +}; + +static int __devinit ds1286_probe(struct platform_device *pdev) +{ + struct rtc_device *rtc; + struct resource *res; + struct ds1286_priv *priv; + int ret = 0; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return -ENODEV; + priv = kzalloc(sizeof(struct ds1286_priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->size = res->end - res->start + 1; + if (!request_mem_region(res->start, priv->size, pdev->name)) { + ret = -EBUSY; + goto out; + } + priv->baseaddr = res->start; + priv->rtcregs = ioremap(priv->baseaddr, priv->size); + if (!priv->rtcregs) { + ret = -ENOMEM; + goto out; + } + spin_lock_init(&priv->lock); + rtc = rtc_device_register("ds1286", &pdev->dev, + &ds1286_ops, THIS_MODULE); + if (IS_ERR(rtc)) { + ret = PTR_ERR(rtc); + goto out; + } + priv->rtc = rtc; + platform_set_drvdata(pdev, priv); + return 0; + +out: + if (priv->rtc) + rtc_device_unregister(priv->rtc); + if (priv->rtcregs) + iounmap(priv->rtcregs); + if (priv->baseaddr) + release_mem_region(priv->baseaddr, priv->size); + kfree(priv); + return ret; +} + +static int __devexit ds1286_remove(struct platform_device *pdev) +{ + struct ds1286_priv *priv = platform_get_drvdata(pdev); + + rtc_device_unregister(priv->rtc); + iounmap(priv->rtcregs); + release_mem_region(priv->baseaddr, priv->size); + kfree(priv); + return 0; +} + +static struct platform_driver ds1286_platform_driver = { + .driver = { + .name = "rtc-ds1286", + .owner = THIS_MODULE, + }, + .probe = ds1286_probe, + .remove = __devexit_p(ds1286_remove), +}; + +static int __init ds1286_init(void) +{ + return platform_driver_register(&ds1286_platform_driver); +} + +static void __exit ds1286_exit(void) +{ + platform_driver_unregister(&ds1286_platform_driver); +} + +MODULE_AUTHOR("Thomas Bogendoerfer "); +MODULE_DESCRIPTION("DS1286 RTC driver"); +MODULE_LICENSE("GPL"); +MODULE_VERSION(DRV_VERSION); +MODULE_ALIAS("platform:rtc-ds1286"); + +module_init(ds1286_init); +module_exit(ds1286_exit); From tsbogend@alpha.franken.de Tue Oct 14 16:18:40 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 16:18:43 +0100 (BST) Received: from elvis.franken.de ([193.175.24.41]:61375 "EHLO elvis.franken.de") by ftp.linux-mips.org with ESMTP id S21487821AbYJNPRk (ORCPT ); Tue, 14 Oct 2008 16:17:40 +0100 Received: from uucp (helo=solo.franken.de) by elvis.franken.de with local-bsmtp (Exim 3.36 #1) id 1KpleS-0005UJ-02; Tue, 14 Oct 2008 17:17:36 +0200 Received: by solo.franken.de (Postfix, from userid 1000) id CA36DC3AEA; Tue, 14 Oct 2008 17:17:28 +0200 (CEST) From: Thomas Bogendoerfer Subject: [PATCH v4] IP27: Switch over to RTC class driver To: linux-mips@linux-mips.org cc: ralf@linux-mips.org Message-Id: <20081014151728.CA36DC3AEA@solo.franken.de> Date: Tue, 14 Oct 2008 17:17:28 +0200 (CEST) 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: 20752 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: tsbogend@alpha.franken.de Precedence: bulk X-list: linux-mips Content-Length: 4000 Lines: 151 This patchset removes some dead code and creates a platform device for the RTC class driver. Signed-off-by: Thomas Bogendoerfer --- Please apply for 2.6.28 arch/mips/sgi-ip27/ip27-timer.c | 99 +++++++++------------------------------ 1 files changed, 22 insertions(+), 77 deletions(-) diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c index 8b4e854..1327c27 100644 --- a/arch/mips/sgi-ip27/ip27-timer.c +++ b/arch/mips/sgi-ip27/ip27-timer.c @@ -13,12 +13,12 @@ #include #include #include +#include #include #include #include #include -#include #include #include #include @@ -28,51 +28,6 @@ #define TICK_SIZE (tick_nsec / 1000) -#if 0 -static int set_rtc_mmss(unsigned long nowtime) -{ - int retval = 0; - int real_seconds, real_minutes, cmos_minutes; - struct m48t35_rtc *rtc; - nasid_t nid; - - nid = get_nasid(); - rtc = (struct m48t35_rtc *)(KL_CONFIG_CH_CONS_INFO(nid)->memory_base + - IOC3_BYTEBUS_DEV0); - - rtc->control |= M48T35_RTC_READ; - cmos_minutes = BCD2BIN(rtc->min); - rtc->control &= ~M48T35_RTC_READ; - - /* - * Since we're only adjusting minutes and seconds, don't interfere with - * hour overflow. This avoids messing with unknown time zones but - * requires your RTC not to be off by more than 15 minutes - */ - real_seconds = nowtime % 60; - real_minutes = nowtime / 60; - if (((abs(real_minutes - cmos_minutes) + 15)/30) & 1) - real_minutes += 30; /* correct for half hour time zone */ - real_minutes %= 60; - - if (abs(real_minutes - cmos_minutes) < 30) { - real_seconds = BIN2BCD(real_seconds); - real_minutes = BIN2BCD(real_minutes); - rtc->control |= M48T35_RTC_SET; - rtc->sec = real_seconds; - rtc->min = real_minutes; - rtc->control &= ~M48T35_RTC_SET; - } else { - printk(KERN_WARNING - "set_rtc_mmss: can't update from %d to %d\n", - cmos_minutes, real_minutes); - retval = -1; - } - - return retval; -} -#endif - /* Includes for ioc3_init(). */ #include #include @@ -80,37 +35,6 @@ static int set_rtc_mmss(unsigned long nowtime) #include #include -unsigned long read_persistent_clock(void) -{ - unsigned int year, month, date, hour, min, sec; - struct m48t35_rtc *rtc; - nasid_t nid; - - nid = get_nasid(); - rtc = (struct m48t35_rtc *)(KL_CONFIG_CH_CONS_INFO(nid)->memory_base + - IOC3_BYTEBUS_DEV0); - - rtc->control |= M48T35_RTC_READ; - sec = rtc->sec; - min = rtc->min; - hour = rtc->hour; - date = rtc->date; - month = rtc->month; - year = rtc->year; - rtc->control &= ~M48T35_RTC_READ; - - sec = BCD2BIN(sec); - min = BCD2BIN(min); - hour = BCD2BIN(hour); - date = BCD2BIN(date); - month = BCD2BIN(month); - year = BCD2BIN(year); - - year += 1970; - - return mktime(year, month, date, hour, min, sec); -} - static void enable_rt_irq(unsigned int irq) { } @@ -286,6 +210,7 @@ void __cpuinit cpu_time_init(void) void __cpuinit hub_rtc_init(cnodeid_t cnode) { + /* * We only need to initialize the current node. * If this is not the current node then it is a cpuless @@ -301,3 +226,23 @@ void __cpuinit hub_rtc_init(cnodeid_t cnode) LOCAL_HUB_S(PI_RT_PEND_B, 0); } } + +static int __init sgi_ip27_rtc_devinit(void) +{ + struct resource res; + + memset(&res, 0, sizeof(res)); + res.start = XPHYSADDR(KL_CONFIG_CH_CONS_INFO(master_nasid)->memory_base + + IOC3_BYTEBUS_DEV0); + res.end = res.start + 32767; + res.flags = IORESOURCE_MEM; + + return IS_ERR(platform_device_register_simple("rtc-m48t35", -1, + &res, 1)); +} + +/* + * kludge make this a device_initcall after ioc3 resource conflicts + * are resolved + */ +late_initcall(sgi_ip27_rtc_devinit); From David.Daney@caviumnetworks.com Tue Oct 14 17:15:15 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 17:15:18 +0100 (BST) Received: from mail3.caviumnetworks.com ([12.108.191.235]:6673 "EHLO mail3.caviumnetworks.com") by ftp.linux-mips.org with ESMTP id S21491996AbYJNQPP (ORCPT ); Tue, 14 Oct 2008 17:15:15 +0100 Received: from exch4.caveonetworks.com (Not Verified[192.168.16.23]) by mail3.caviumnetworks.com with MailMarshal (v6,2,2,3503) id ; Tue, 14 Oct 2008 12:14:59 -0400 Received: from exch4.caveonetworks.com ([192.168.16.23]) by exch4.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 14 Oct 2008 09:14:57 -0700 Received: from dd1.caveonetworks.com ([64.169.86.201]) by exch4.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 14 Oct 2008 09:14:57 -0700 Message-ID: <48F4C580.5030702@caviumnetworks.com> Date: Tue, 14 Oct 2008 09:14:56 -0700 From: David Daney User-Agent: Thunderbird 2.0.0.16 (X11/20080723) MIME-Version: 1.0 To: Ralf Baechle CC: linux-mips@linux-mips.org, "Paoletti, Tomaso" Subject: Re: [PATCH] MIPS: Rewrite cpu_to_name so it has one statement per line. References: <48F38CBE.20303@caviumnetworks.com> <20081014090109.GB30880@linux-mips.org> In-Reply-To: <20081014090109.GB30880@linux-mips.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 14 Oct 2008 16:14:57.0009 (UTC) FILETIME=[FFF43610:01C92E17] 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: 20753 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: ddaney@caviumnetworks.com Precedence: bulk X-list: linux-mips Content-Length: 1322 Lines: 37 Ralf Baechle wrote: > On Mon, Oct 13, 2008 at 11:00:30AM -0700, David Daney wrote: > >> Rewrite cpu_to_name so it has one statement per line. >> >> Future changes can now pass checkpatch.pl > > It's been one of those changes where I found the Linux coding style in my > opinion at least, not to be optimal. My plan was to rewrite it like below > incomplete patch for ages. What do you think? > > Ralf > > Signed-off-by: Ralf Baechle > > diff --git a/arch/mips/include/asm/cpu-info.h b/arch/mips/include/asm/cpu-info.h > index 744cd8f..6d0f891 100644 > --- a/arch/mips/include/asm/cpu-info.h > +++ b/arch/mips/include/asm/cpu-info.h > @@ -75,6 +75,7 @@ struct cpuinfo_mips { > unsigned int watch_reg_use_cnt; /* Usable by ptrace */ > #define NUM_WATCH_REGS 4 > u16 watch_reg_masks[NUM_WATCH_REGS]; > + const char *name; > } __attribute__((aligned(SMP_CACHE_BYTES))); > It increases the size of the cpuinfo_mips structure by sizeof(char *) for data that is only ever used in /proc/cpuinfo, also it goes against my sense of data normalization. So I think the current method of looking it up on demand is fine. I am not enamored with my patch as it doubles the number of lines in the function. So we will defer to you and follow which ever style you decide is best. David Daney From David.Daney@caviumnetworks.com Tue Oct 14 17:20:51 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 17:20:53 +0100 (BST) Received: from mail3.caviumnetworks.com ([12.108.191.235]:21528 "EHLO mail3.caviumnetworks.com") by ftp.linux-mips.org with ESMTP id S21492895AbYJNQUv (ORCPT ); Tue, 14 Oct 2008 17:20:51 +0100 Received: from exch4.caveonetworks.com (Not Verified[192.168.16.23]) by mail3.caviumnetworks.com with MailMarshal (v6,2,2,3503) id ; Tue, 14 Oct 2008 12:20:40 -0400 Received: from exch4.caveonetworks.com ([192.168.16.23]) by exch4.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 14 Oct 2008 09:20:38 -0700 Received: from dd1.caveonetworks.com ([64.169.86.201]) by exch4.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 14 Oct 2008 09:20:38 -0700 Message-ID: <48F4C6D5.3000100@caviumnetworks.com> Date: Tue, 14 Oct 2008 09:20:37 -0700 From: David Daney User-Agent: Thunderbird 2.0.0.16 (X11/20080723) MIME-Version: 1.0 To: Ralf Baechle CC: linux-mips@linux-mips.org Subject: Re: [PATCH] MIPS: Align .data.cacheline_aligned based on MIPS_L1_CACHE_SHIFT References: <48F3DB6D.9020108@caviumnetworks.com> <20081014090757.GC30880@linux-mips.org> In-Reply-To: <20081014090757.GC30880@linux-mips.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 14 Oct 2008 16:20:38.0038 (UTC) FILETIME=[CB391B60:01C92E18] 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: 20754 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: ddaney@caviumnetworks.com Precedence: bulk X-list: linux-mips Content-Length: 526 Lines: 19 Ralf Baechle wrote: > On Mon, Oct 13, 2008 at 04:36:13PM -0700, David Daney wrote: > >> Align .data.cacheline_aligned based on the MIPS_L1_CACHE_SHIFT >> configuration variable. >> >> Signed-off-by: David Daney >> Signed-off-by: Tomaso Paoletti > > Thanks, applied already yesterday as you may have noticed, > Actually I didn't. When I look at: http://www.linux-mips.org/git?p=linux.git;a=summary I don't see it. Am I looking in the wrong place? David Daney From ralf@linux-mips.org Tue Oct 14 17:32:06 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 17:32:09 +0100 (BST) Received: from h4.dl5rb.org.uk ([81.2.74.4]:26027 "EHLO ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk") by ftp.linux-mips.org with ESMTP id S21493483AbYJNQcG (ORCPT ); Tue, 14 Oct 2008 17:32:06 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk (8.14.2/8.14.1) with ESMTP id m9EGVxw5010346; Tue, 14 Oct 2008 17:31:59 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.14.2/8.14.2/Submit) id m9EGVwZP010344; Tue, 14 Oct 2008 17:31:58 +0100 Date: Tue, 14 Oct 2008 17:31:58 +0100 From: Ralf Baechle To: David Daney Cc: linux-mips@linux-mips.org Subject: Re: [PATCH] MIPS: Align .data.cacheline_aligned based on MIPS_L1_CACHE_SHIFT Message-ID: <20081014163158.GA10310@linux-mips.org> References: <48F3DB6D.9020108@caviumnetworks.com> <20081014090757.GC30880@linux-mips.org> <48F4C6D5.3000100@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <48F4C6D5.3000100@caviumnetworks.com> User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20755 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips Content-Length: 296 Lines: 11 On Tue, Oct 14, 2008 at 09:20:37AM -0700, David Daney wrote: > Actually I didn't. When I look at: > > http://www.linux-mips.org/git?p=linux.git;a=summary > > I don't see it. Am I looking in the wrong place? Commit edc05575a87f02e85417d2ccb1b1ad1df582658e. I just forgot to git push. Ralf From ralf@linux-mips.org Tue Oct 14 17:45:09 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 17:45:11 +0100 (BST) Received: from h4.dl5rb.org.uk ([81.2.74.4]:7661 "EHLO ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk") by ftp.linux-mips.org with ESMTP id S21493847AbYJNQpJ (ORCPT ); Tue, 14 Oct 2008 17:45:09 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk (8.14.2/8.14.1) with ESMTP id m9EGivMW010887; Tue, 14 Oct 2008 17:44:57 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.14.2/8.14.2/Submit) id m9EGivsu010885; Tue, 14 Oct 2008 17:44:57 +0100 Date: Tue, 14 Oct 2008 17:44:57 +0100 From: Ralf Baechle To: Aurelien Jarno Cc: linux-mips@linux-mips.org Subject: Re: [PATCH 0/5] BCM47xx patches for 2.6.28 Message-ID: <20081014164457.GB10310@linux-mips.org> References: <20081014094043.GA26560@volta.aurel32.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20081014094043.GA26560@volta.aurel32.net> User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20756 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips Content-Length: 576 Lines: 17 On Tue, Oct 14, 2008 at 11:40:43AM +0200, Aurelien Jarno wrote: > [MIPS] WGT634U: Add machine detection message > [MIPS] Remove references to BCM947XX > [MIPS] BCM47xx: Use the new SSB GPIO API > [MIPS] Add WGT634U reset button support > [MIPS] Scan PCI busses when they are registered > > Compared to the previous version, one patch has been merged, and the > second patch has been updated to reflect the new location of this file. Whole series applied with the changed of to as discussed on IRC. Thanks, Ralf From ralf@linux-mips.org Tue Oct 14 17:56:59 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 17:57:01 +0100 (BST) Received: from h4.dl5rb.org.uk ([81.2.74.4]:6042 "EHLO ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk") by ftp.linux-mips.org with ESMTP id S21494309AbYJNQ47 (ORCPT ); Tue, 14 Oct 2008 17:56:59 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk (8.14.2/8.14.1) with ESMTP id m9EGut2h011412; Tue, 14 Oct 2008 17:56:55 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.14.2/8.14.2/Submit) id m9EGutn5011410; Tue, 14 Oct 2008 17:56:55 +0100 Date: Tue, 14 Oct 2008 17:56:55 +0100 From: Ralf Baechle To: Thomas Bogendoerfer Cc: linux-mips@linux-mips.org Subject: Re: [PATCH v3] IP22/28: Switch over to RTC class driver Message-ID: <20081014165655.GA11407@linux-mips.org> References: <20081014151655.355A7C3AE9@solo.franken.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20081014151655.355A7C3AE9@solo.franken.de> User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20757 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips Content-Length: 296 Lines: 13 On Tue, Oct 14, 2008 at 05:16:55PM +0200, Thomas Bogendoerfer wrote: > This patchset removes some dead code and creates a platform device > for the RTC class driver. > > Signed-off-by: Thomas Bogendoerfer > --- > > Please apply for 2.6.28 Thanks, applied. Ralf From ralf@linux-mips.org Tue Oct 14 17:57:18 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 17:57:21 +0100 (BST) Received: from h4.dl5rb.org.uk ([81.2.74.4]:7322 "EHLO ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk") by ftp.linux-mips.org with ESMTP id S21493901AbYJNQ5P (ORCPT ); Tue, 14 Oct 2008 17:57:15 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk (8.14.2/8.14.1) with ESMTP id m9EGvBJq011418; Tue, 14 Oct 2008 17:57:11 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.14.2/8.14.2/Submit) id m9EGvAAx011417; Tue, 14 Oct 2008 17:57:10 +0100 Date: Tue, 14 Oct 2008 17:57:10 +0100 From: Ralf Baechle To: Thomas Bogendoerfer Cc: rtc-linux@googlegroups.com, linux-mips@linux-mips.org, a.zummo@towertech.it Subject: Re: [PATCH v3] DS1286: new RTC driver Message-ID: <20081014165710.GB11407@linux-mips.org> References: <20081014151659.D67E3C3AEA@solo.franken.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20081014151659.D67E3C3AEA@solo.franken.de> User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20758 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips Content-Length: 385 Lines: 14 On Tue, Oct 14, 2008 at 05:16:59PM +0200, Thomas Bogendoerfer wrote: > This driver replaces the broken DS1286 driver in drivers/char and > gives back RTC support for SGI IP22 and IP28 machines. > > Acked-by: Alessandro Zummo > Signed-off-by: Thomas Bogendoerfer > --- > > Please apply for 2.6.28 Thanks, applied. Ralf From ralf@linux-mips.org Tue Oct 14 17:57:39 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 17:57:41 +0100 (BST) Received: from h4.dl5rb.org.uk ([81.2.74.4]:8602 "EHLO ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk") by ftp.linux-mips.org with ESMTP id S21493901AbYJNQ5j (ORCPT ); Tue, 14 Oct 2008 17:57:39 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk (8.14.2/8.14.1) with ESMTP id m9EGvarZ011439; Tue, 14 Oct 2008 17:57:36 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.14.2/8.14.2/Submit) id m9EGvahW011438; Tue, 14 Oct 2008 17:57:36 +0100 Date: Tue, 14 Oct 2008 17:57:36 +0100 From: Ralf Baechle To: Thomas Bogendoerfer Cc: linux-mips@linux-mips.org Subject: Re: [PATCH v4] IP27: Switch over to RTC class driver Message-ID: <20081014165736.GC11407@linux-mips.org> References: <20081014151728.CA36DC3AEA@solo.franken.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20081014151728.CA36DC3AEA@solo.franken.de> User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20759 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips Content-Length: 296 Lines: 13 On Tue, Oct 14, 2008 at 05:17:28PM +0200, Thomas Bogendoerfer wrote: > This patchset removes some dead code and creates a platform device > for the RTC class driver. > > Signed-off-by: Thomas Bogendoerfer > --- > > Please apply for 2.6.28 Thanks, applied. Ralf From ralf@linux-mips.org Tue Oct 14 17:58:04 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 17:58:06 +0100 (BST) Received: from h4.dl5rb.org.uk ([81.2.74.4]:9626 "EHLO ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk") by ftp.linux-mips.org with ESMTP id S21494362AbYJNQ6D (ORCPT ); Tue, 14 Oct 2008 17:58:03 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk (8.14.2/8.14.1) with ESMTP id m9EGvvvN011445; Tue, 14 Oct 2008 17:57:57 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.14.2/8.14.2/Submit) id m9EGvv0a011444; Tue, 14 Oct 2008 17:57:57 +0100 Date: Tue, 14 Oct 2008 17:57:56 +0100 From: Ralf Baechle To: Thomas Bogendoerfer Cc: rtc-linux@googlegroups.com, linux-mips@linux-mips.org, a.zummo@towertech.it Subject: Re: [PATCH v4] M48T35: new RTC driver Message-ID: <20081014165756.GD11407@linux-mips.org> References: <20081014151732.DBFA3C3AEA@solo.franken.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20081014151732.DBFA3C3AEA@solo.franken.de> User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20760 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips Content-Length: 378 Lines: 14 On Tue, Oct 14, 2008 at 05:17:32PM +0200, Thomas Bogendoerfer wrote: > This driver replaces the broken ip27-rtc driver in drivers/char and > gives back RTC support for SGI IP27 machines. > > Acked-by: Alessandro Zummo > Signed-off-by: Thomas Bogendoerfer > --- > > Please apply for 2.6.28 Thanks, applied. Ralf From ralf@linux-mips.org Tue Oct 14 17:58:40 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 17:58:42 +0100 (BST) Received: from h4.dl5rb.org.uk ([81.2.74.4]:6824 "EHLO ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk") by ftp.linux-mips.org with ESMTP id S21494388AbYJNQ6k (ORCPT ); Tue, 14 Oct 2008 17:58:40 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk (8.14.2/8.14.1) with ESMTP id m9EGwbM7011477; Tue, 14 Oct 2008 17:58:37 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.14.2/8.14.2/Submit) id m9EGwbmi011476; Tue, 14 Oct 2008 17:58:37 +0100 Date: Tue, 14 Oct 2008 17:58:37 +0100 From: Ralf Baechle To: Thomas Bogendoerfer Cc: linux-mips@linux-mips.org Subject: Re: [PATCH] IP32: add platform device for cmos rtc; remove dead code Message-ID: <20081014165837.GC10310@linux-mips.org> References: <20080922225320.A66EDC2E71@solo.franken.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080922225320.A66EDC2E71@solo.franken.de> User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20761 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips Content-Length: 162 Lines: 7 On Tue, Sep 23, 2008 at 12:53:20AM +0200, Thomas Bogendoerfer wrote: > Signed-off-by: Thomas Bogendoerfer Thanks, applied. Ralf From ralf@linux-mips.org Tue Oct 14 18:06:21 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 18:06:23 +0100 (BST) Received: from h4.dl5rb.org.uk ([81.2.74.4]:11946 "EHLO ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk") by ftp.linux-mips.org with ESMTP id S21495543AbYJNRGV (ORCPT ); Tue, 14 Oct 2008 18:06:21 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by ditditdahdahdah-dahdahdahditdit.dl5rb.org.uk (8.14.2/8.14.1) with ESMTP id m9EH6K19011757; Tue, 14 Oct 2008 18:06:20 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.14.2/8.14.2/Submit) id m9EH6J6G011755; Tue, 14 Oct 2008 18:06:19 +0100 Date: Tue, 14 Oct 2008 18:06:19 +0100 From: Ralf Baechle To: Shinya Kuribayashi Cc: linux-mips@linux-mips.org Subject: Re: [PATCH][MIPS] Kill unused inclusions Message-ID: <20081014170619.GE11407@linux-mips.org> References: <48F201FB.90303@ruby.dti.ne.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <48F201FB.90303@ruby.dti.ne.jp> User-Agent: Mutt/1.5.18 (2008-05-17) 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: 20762 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips Content-Length: 94 Lines: 5 On Sun, Oct 12, 2008 at 10:56:11PM +0900, Shinya Kuribayashi wrote: Thanks, applied. Ralf From dvomlehn@cisco.com Tue Oct 14 19:25:46 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 19:25:48 +0100 (BST) Received: from sj-iport-2.cisco.com ([171.71.176.71]:6538 "EHLO sj-iport-2.cisco.com") by ftp.linux-mips.org with ESMTP id S21503436AbYJNSZp (ORCPT ); Tue, 14 Oct 2008 19:25:45 +0100 X-IronPort-AV: E=Sophos;i="4.33,410,1220227200"; d="scan'208";a="95103422" Received: from sj-dkim-2.cisco.com ([171.71.179.186]) by sj-iport-2.cisco.com with ESMTP; 14 Oct 2008 18:25:36 +0000 Received: from sj-core-5.cisco.com (sj-core-5.cisco.com [171.71.177.238]) by sj-dkim-2.cisco.com (8.12.11/8.12.11) with ESMTP id m9EIPaC6022092; Tue, 14 Oct 2008 11:25:36 -0700 Received: from sausatlsmtp2.sciatl.com ([192.133.217.159]) by sj-core-5.cisco.com (8.13.8/8.13.8) with ESMTP id m9EIPa9L012985; Tue, 14 Oct 2008 18:25:36 GMT Received: from default.com ([192.133.217.159]) by sausatlsmtp2.sciatl.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 14 Oct 2008 14:25:35 -0400 Received: from sausatlbhs02.corp.sa.net ([192.133.216.42]) by sausatlsmtp2.sciatl.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 14 Oct 2008 14:25:34 -0400 Received: from [127.0.0.1] ([64.101.20.200]) by sausatlbhs02.corp.sa.net with Microsoft SMTPSVC(6.0.3790.3959); Tue, 14 Oct 2008 14:25:33 -0400 Message-ID: <48F4E40F.1090808@cisco.com> Date: Tue, 14 Oct 2008 11:25:19 -0700 From: David VomLehn User-Agent: Thunderbird 2.0.0.16 (Windows/20080708) MIME-Version: 1.0 To: David Daney CC: Ralf Baechle , linux-mips@linux-mips.org, "Paoletti, Tomaso" Subject: Re: [PATCH] MIPS: Rewrite cpu_to_name so it has one statement per line. References: <48F38CBE.20303@caviumnetworks.com> <20081014090109.GB30880@linux-mips.org> <48F4C580.5030702@caviumnetworks.com> In-Reply-To: <48F4C580.5030702@caviumnetworks.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 14 Oct 2008 18:25:33.0254 (UTC) FILETIME=[3EB84E60:01C92E2A] X-ST-MF-Message-Resent: 10/14/2008 14:25 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; l=2727; t=1224008736; x=1224872736; c=relaxed/simple; s=sjdkim2002; h=Content-Type:From:Subject:Content-Transfer-Encoding:MIME-Version; d=cisco.com; i=dvomlehn@cisco.com; z=From:=20David=20VomLehn=20 |Subject:=20Re=3A=20[PATCH]=20MIPS=3A=20Rewrite=20cpu_to_na me=20so=20it=20has=20one=20statement=20per=0A=20line. |Sender:=20; bh=Hy6bNr9oItqRkK2yZ1YoS3Oom3uVDqJ3dC8Oo2Jl6Lc=; b=eQhx2fw3hA5onwAHASSWmoxRAB74qdYDFxZva0xegHAfu8mGFkOShALk7c I8bnBoiWx/0sSEPKxbqIIu4+PZFFLz7CuPZ7jwsvjfJmTOShjAK33J3BnZIQ osFU6FfkQK; Authentication-Results: sj-dkim-2; header.From=dvomlehn@cisco.com; dkim=pass ( sig from cisco.com/sjdkim2002 verified; ); 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: 20763 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: dvomlehn@cisco.com Precedence: bulk X-list: linux-mips Content-Length: 2662 Lines: 67 David Daney wrote: > Ralf Baechle wrote: >> On Mon, Oct 13, 2008 at 11:00:30AM -0700, David Daney wrote: >> >>> Rewrite cpu_to_name so it has one statement per line. >>> >>> Future changes can now pass checkpatch.pl >> >> It's been one of those changes where I found the Linux coding style in my >> opinion at least, not to be optimal. My plan was to rewrite it like >> below >> incomplete patch for ages. What do you think? >> >> Ralf >> >> Signed-off-by: Ralf Baechle >> >> diff --git a/arch/mips/include/asm/cpu-info.h >> b/arch/mips/include/asm/cpu-info.h >> index 744cd8f..6d0f891 100644 >> --- a/arch/mips/include/asm/cpu-info.h >> +++ b/arch/mips/include/asm/cpu-info.h >> @@ -75,6 +75,7 @@ struct cpuinfo_mips { >> unsigned int watch_reg_use_cnt; /* Usable by ptrace */ >> #define NUM_WATCH_REGS 4 >> u16 watch_reg_masks[NUM_WATCH_REGS]; >> + const char *name; >> } __attribute__((aligned(SMP_CACHE_BYTES))); >> > > It increases the size of the cpuinfo_mips structure by sizeof(char *) > for data that is only ever used in /proc/cpuinfo, also it goes against > my sense of data normalization. So I think the current method of > looking it up on demand is fine. > > I am not enamored with my patch as it doubles the number of lines in > the function. So we will defer to you and follow which ever style you > decide is best. > > David Daney This is a pretty trivial issue, but I would note that the /proc/cpuinfo code is not a performance critical path. Thus, adding redundant data isn't worth it. If we really care about checkpatch and, even in this case, I kinda do, we could shrink the code by doing a linear scan of a table that contains the CPU type and the name. If you really care about code and data size *and* want it fast you could demand that the CPU types be sequentially numbered values, possibly enums, that you use to index into a table of CPU names. Okay, I'm done beating this dead horse... David VomLehn - - - - - Cisco - - - - - This e-mail and any attachments may contain information which is confidential, proprietary, privileged or otherwise protected by law. The information is solely intended for the named addressee (or a person responsible for delivering it to the addressee). If you are not the intended recipient of this message, you are not authorized to read, print, retain, copy or disseminate this message or any part of it. If you have received this e-mail in error, please notify the sender immediately by return e-mail and delete it from your computer. From David.Daney@caviumnetworks.com Tue Oct 14 22:37:57 2008 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 14 Oct 2008 22:37:59 +0100 (BST) Received: from mail3.caviumnetworks.com ([12.108.191.235]:49399 "EHLO mail3.caviumnetworks.com") by ftp.linux-mips.org with ESMTP id S21513324AbYJNVh5 (ORCPT ); Tue, 14 Oct 2008 22:37:57 +0100 Received: from exch4.caveonetworks.com (Not Verified[192.168.16.23]) by mail3.caviumnetworks.com with MailMarshal (v6,2,2,3503) id ; Tue, 14 Oct 2008 17:37:27 -0400 Received: from exch4.caveonetworks.com ([192.168.16.23]) by exch4.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 14 Oct 2008 14:37:25 -0700 Received: from dd1.caveonetworks.com ([64.169.86.201]) by exch4.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 14 Oct 2008 14:37:25 -0700 Message-ID: <48F51114.2010105@caviumnetworks.com> Date: Tue, 14 Oct 2008 14:37:24 -0700 From: David Daney User-Agent: Thunderbird 2.0.0.16 (X11/20080723) MIME-Version: 1.0 To: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org CC: linux-mips@linux-mips.org, "Paoletti, Tomaso" Subject: [PATCH] serial: Initialize spinlocks in 8250 and don't clobber them. Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 14 Oct 2008 21:37:25.0150 (UTC) FILETIME=[0C583BE0:01C92E45] 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: 20764 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: ddaney@caviumnetworks.com Precedence: bulk X-list: linux-mips Content-Length: 1740 Lines: 55 Initialize spinlocks in 8250 and don't clobber them. Spinlock debugging fails in 8250.c because the lock fields in irq_lists are not initialized. Initialize them. In serial8250_isa_init_ports(), the port's lock is initialized. We should not overwrite it. Only copy in the fields we need. Signed-off-by: David Daney