From roel.kluin@gmail.com Tue Sep 1 20:26:31 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 01 Sep 2009 20:26:38 +0200 (CEST) Received: from mail-fx0-f220.google.com ([209.85.220.220]:44235 "EHLO mail-fx0-f220.google.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1494241AbZIAS0b (ORCPT ); Tue, 1 Sep 2009 20:26:31 +0200 Received: by fxm20 with SMTP id 20so277381fxm.0 for ; Tue, 01 Sep 2009 11:26:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:content-type :content-transfer-encoding; bh=TLtbBscmrNt5Kj+Q8MTHiMcYuBMg3m84JPERBIhSPxY=; b=k6bAl9QZoRKK4y3Kc9qOe1AvXgldSgxXhXN25Q/iU4hj5bmTRqR3TGFoobtsMsATrr GHg5OYWRyCU0QdXyOtHY/kUwcaS454roqzZwU5UU1CFWxRk2DBJFbIlMtOoQ+1bp1MxQ A3splH1HYbOB5a1FnsQHJ1GtzLnm+3OqERVFE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; b=GUG2Zt/dE1Rqcer8s79fS016eIYjYDHSuU4om5v4JYDu39tKMhtvffPhY0S9nHFPoq 5nzFH0vkZ0Gy4hEtnWN5zkdo1CRRFHQPRYXM06LwWTq2ekwf/m35hWmQYzS/kP35VUyR nqlRyUKlvaMMwejnHaI84LRGWpGgnOOQnfkj8= Received: by 10.204.163.5 with SMTP id y5mr5810288bkx.37.1251829583779; Tue, 01 Sep 2009 11:26:23 -0700 (PDT) Received: from zoinx.mars (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id 10sm91491eyd.15.2009.09.01.11.26.22 (version=SSLv3 cipher=RC4-MD5); Tue, 01 Sep 2009 11:26:23 -0700 (PDT) Message-ID: <4A9D68A7.9000902@gmail.com> Date: Tue, 01 Sep 2009 20:32:07 +0200 From: Roel Kluin User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.1) Gecko/20090814 Fedora/3.0-2.6.b3.fc11 Thunderbird/3.0b3 MIME-Version: 1.0 To: Ralf Baechle , linux-mips@linux-mips.org, Andrew Morton Subject: [PATCH] MSP71xx: request_irq() failure ignored in msp_pcibios_config_access() Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 23973 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: roel.kluin@gmail.com Precedence: bulk X-list: linux-mips Produce an error if request_irq() fails. Signed-off-by: Roel Kluin --- diff --git a/arch/mips/pci/ops-pmcmsp.c b/arch/mips/pci/ops-pmcmsp.c index 109c95c..223d822 100644 --- a/arch/mips/pci/ops-pmcmsp.c +++ b/arch/mips/pci/ops-pmcmsp.c @@ -402,11 +402,12 @@ int msp_pcibios_config_access(unsigned char access_type, * allocation assigns an interrupt handler to the interrupt. */ if (pciirqflag == 0) { - request_irq(MSP_INT_PCI,/* Hardcoded internal MSP7120 wiring */ + if ((request_irq(MSP_INT_PCI,/* Hardcoded internal MSP7120 wiring */ bpci_interrupt, IRQF_SHARED | IRQF_DISABLED, "PMC MSP PCI Host", - preg); + preg)) != 0) + return -1; pciirqflag = ~0; } From roel.kluin@gmail.com Tue Sep 1 22:17:54 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 01 Sep 2009 22:18:01 +0200 (CEST) Received: from mail-ew0-f225.google.com ([209.85.219.225]:54761 "EHLO mail-ew0-f225.google.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1494355AbZIAURy (ORCPT ); Tue, 1 Sep 2009 22:17:54 +0200 Received: by ewy25 with SMTP id 25so217506ewy.33 for ; Tue, 01 Sep 2009 13:17:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=6gAZe4DCuHdeHhPTuE1u511ES02hQXs5ODPcmSauaFg=; b=Uq56xg4N9y+6BTt5GMNhsIhH9khZ4bTw+iDh+sO+blfAQr3L5rS0KEWtaFAUv3a0Z2 +v210lMMo/jhxjQKIEVmm36lTKUYaLbrjTMW+pQFofHPoJcfuATGxDLKv5ryU9cC0waH 4jHRbvp4P/2YmlYCXfWXe0P35HSOEEsDxRGC8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=cz7QEOa8E4GiMAAfWXetEO+KdAxeSIpLQSoSquM98TAJxuSmGvZ9zgWq6eCnj/miEB fToB8rV4in5jBCumRGET7808+rmqJWvJHbVrOMC8YIGlGWQw4e1GHIIBEPej5p3IVYSg czfh9ii2UcVTfXw7xu6RRWAs2R5yZJ1CD6dIw= Received: by 10.210.127.13 with SMTP id z13mr6694280ebc.85.1251836264908; Tue, 01 Sep 2009 13:17:44 -0700 (PDT) Received: from zoinx.mars (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id 28sm82019eye.0.2009.09.01.13.17.43 (version=SSLv3 cipher=RC4-MD5); Tue, 01 Sep 2009 13:17:44 -0700 (PDT) Message-ID: <4A9D82C0.7070408@gmail.com> Date: Tue, 01 Sep 2009 22:23:28 +0200 From: Roel Kluin User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.1) Gecko/20090814 Fedora/3.0-2.6.b3.fc11 Thunderbird/3.0b3 MIME-Version: 1.0 To: "Ithamar R. Adema" CC: Ralf Baechle , linux-mips@linux-mips.org, Andrew Morton Subject: Re: [PATCH] MSP71xx: request_irq() failure ignored in msp_pcibios_config_access() References: <4A9D68A7.9000902@gmail.com> <4A9D6E37.1030704@team-embedded.nl> In-Reply-To: <4A9D6E37.1030704@team-embedded.nl> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 23974 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: roel.kluin@gmail.com Precedence: bulk X-list: linux-mips Produce an error if request_irq() fails. Signed-off-by: Roel Kluin --- >> + return -1; > I'd personally suggest to return the actual value returned by > request_irq, instead of returning -EPERM..... ;) > > Ithamar. The comments at the header states that it returns -1 on failure, and so do the callers as well, but if preferred, below is as you suggest. Thanks, diff --git a/arch/mips/pci/ops-pmcmsp.c b/arch/mips/pci/ops-pmcmsp.c index 109c95c..32548b5 100644 --- a/arch/mips/pci/ops-pmcmsp.c +++ b/arch/mips/pci/ops-pmcmsp.c @@ -385,6 +385,7 @@ int msp_pcibios_config_access(unsigned char access_type, unsigned long intr; unsigned long value; static char pciirqflag; + int ret; #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) unsigned int vpe_status; #endif @@ -402,11 +403,13 @@ int msp_pcibios_config_access(unsigned char access_type, * allocation assigns an interrupt handler to the interrupt. */ if (pciirqflag == 0) { - request_irq(MSP_INT_PCI,/* Hardcoded internal MSP7120 wiring */ + ret = request_irq(MSP_INT_PCI,/* Hardcoded internal MSP7120 wiring */ bpci_interrupt, IRQF_SHARED | IRQF_DISABLED, "PMC MSP PCI Host", preg); + if (ret != 0) + return ret; pciirqflag = ~0; } From David.Daney@caviumnetworks.com Thu Sep 3 00:48:11 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 03 Sep 2009 00:48:18 +0200 (CEST) Received: from mail3.caviumnetworks.com ([12.108.191.235]:13126 "EHLO mail3.caviumnetworks.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1492317AbZIBWsL (ORCPT ); Thu, 3 Sep 2009 00:48:11 +0200 Received: from caexch01.caveonetworks.com (Not Verified[192.168.16.9]) by mail3.caviumnetworks.com with MailMarshal (v6,2,2,3503) id ; Wed, 02 Sep 2009 18:47:40 -0400 Received: from caexch01.caveonetworks.com ([192.168.16.9]) by caexch01.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 2 Sep 2009 15:47:41 -0700 Received: from dd1.caveonetworks.com ([64.169.86.201]) by caexch01.caveonetworks.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 2 Sep 2009 15:47:41 -0700 Received: from dd1.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dd1.caveonetworks.com (8.14.2/8.14.2) with ESMTP id n82MlaoI021293; Wed, 2 Sep 2009 15:47:36 -0700 Received: (from ddaney@localhost) by dd1.caveonetworks.com (8.14.2/8.14.2/Submit) id n82MlZ0J021292; Wed, 2 Sep 2009 15:47:35 -0700 From: David Daney To: linux-mips@linux-mips.org, ralf@linux-mips.org Cc: David Daney Subject: [PATCH] MIPS: Don't corrupt page tables on vmalloc fault. Date: Wed, 2 Sep 2009 15:47:34 -0700 Message-Id: <1251931654-21268-1-git-send-email-ddaney@caviumnetworks.com> X-Mailer: git-send-email 1.6.0.6 X-OriginalArrivalTime: 02 Sep 2009 22:47:41.0243 (UTC) FILETIME=[60C238B0:01CA2C1F] Return-Path: X-Envelope-To: <"|/home/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: 23975 X-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 The code after the vmalloc_fault: label in do_page_fault() modifies user page tables, this is not correct for 64-bit kernels. For 64-bit kernels we should go straight to the no_context handler skipping vmalloc_fault. Signed-off-by: David Daney --- arch/mips/mm/fault.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c index f956ecb..e97a7a2 100644 --- a/arch/mips/mm/fault.c +++ b/arch/mips/mm/fault.c @@ -58,11 +58,17 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write, * only copy the information from the master page table, * nothing more. */ +#ifdef CONFIG_64BIT +# define VMALLOC_FAULT_TARGET no_context +#else +# define VMALLOC_FAULT_TARGET vmalloc_fault +#endif + if (unlikely(address >= VMALLOC_START && address <= VMALLOC_END)) - goto vmalloc_fault; + goto VMALLOC_FAULT_TARGET; #ifdef MODULE_START if (unlikely(address >= MODULE_START && address < MODULE_END)) - goto vmalloc_fault; + goto VMALLOC_FAULT_TARGET; #endif /* @@ -203,6 +209,7 @@ do_sigbus: force_sig_info(SIGBUS, &info, tsk); return; +#ifndef CONFIG_64BIT vmalloc_fault: { /* @@ -241,4 +248,5 @@ vmalloc_fault: goto no_context; return; } +#endif } -- 1.6.0.6 From crquan@gmail.com Thu Sep 3 05:49:06 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 03 Sep 2009 05:49:14 +0200 (CEST) Received: from mail-px0-f180.google.com ([209.85.216.180]:41891 "EHLO mail-px0-f180.google.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1491870AbZICDtG (ORCPT ); Thu, 3 Sep 2009 05:49:06 +0200 Received: by pxi10 with SMTP id 10so1259434pxi.24 for ; Wed, 02 Sep 2009 20:48:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type; bh=dDJFC9y6nTBskvboK2b2JNiC2P1h49rjgto6tohHado=; b=A36yBJBshKqqQl+Q9zS9ZKzAmVFULn0nm6ewfYgZDiPvfV4DcTko0vmYqqTrxR5HSZ 7b1VlJ6n0LSa3L4lqnWGSzwRcilRjQ5nNrjD7e3jEZjcOyXcrUPYFau4JuerHP0smILj u4gA7KUeMikO84bobqqXyKo+QCFdT4b6T8MII= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=cdSLC+MfnOb3pBBoDmDS3RTy3JKIhy+dQgz8D0Go4DT7w9Xt1VmT1hXSeMeGDqqo4J ck9P/2nlqwPl4+Vorr9iTLoKbvzRhOTHYNNZDd/cCwyXyaNqA0CJeJqfRwSkuiERUPTZ +EMMFATTeItTMa2kwy/XS4j35iIvEXYstV2h4= MIME-Version: 1.0 Received: by 10.142.75.16 with SMTP id x16mr204125wfa.155.1251949739619; Wed, 02 Sep 2009 20:48:59 -0700 (PDT) Date: Thu, 3 Sep 2009 11:48:59 +0800 Message-ID: <91b13c310909022048q467dff7cl90284b57132f4f14@mail.gmail.com> Subject: How to debug glibc-2.10.1 mips on linux multilib o32 ld or libc Segmentation fault? From: Cheng Renquan To: libc-help@sourceware.org, linux-mips@linux-mips.org, issues@eglibc.org Content-Type: text/plain; charset=UTF-8 Return-Path: X-Envelope-To: <"|/home/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: 23976 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: crquan@gmail.com Precedence: bulk X-list: linux-mips Hello, all, Recently I have cross compiled GCC-4.4.1 with eglibc-2.10.1, with a multilib configuration, o32/n32/n64, the result is that n32/n64 can work well, while o32 libs always Segmentation fault, I have read this but still have no good idea on how to debug, http://sources.redhat.com/glibc/wiki/Debugging/Development_Debugging then I run it like this, $ LD_DEBUG=all eglibc-install-root-o32/lib/ld.so.1 --library-path $PWD/eglibc-install-root-o32/lib eglibc-install-root-o32/usr/bin/locale it ends with: 30257: symbol=__stack_chk_guard; lookup in file=eglibc-install-root-o32/usr/bin/locale [0] 30257: symbol=__stack_chk_guard; lookup in file=/mnt/nas/yutech/homes/user/eglibc-install-root-o32/lib/libc.so.6 [0] 30257: symbol=__stack_chk_guard; lookup in file=eglibc-install-root-o32/lib/ld.so.1 [0] 30257: binding file eglibc-install-root-o32/lib/ld.so.1 [0] to eglibc-install-root-o32/lib/ld.so.1 [0]: normal symbol `__stack_chk_guard' [GLIBC_2.4] 30257: 30257: calling init: /mnt/nas/yutech/homes/user/eglibc-install-root-o32/lib/libc.so.6 30257: Segmentation fault So please give some inputs on how to resolve this? Thanks, -- Cheng Renquan From anemo@mba.ocn.ne.jp Thu Sep 3 15:59:10 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 03 Sep 2009 15:59:18 +0200 (CEST) Received: from mba.ocn.ne.jp ([122.28.14.163]:55869 "HELO smtp.mba.ocn.ne.jp" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with SMTP id S1492715AbZICN7K (ORCPT ); Thu, 3 Sep 2009 15:59:10 +0200 Received: from localhost.localdomain (p2046-ipad301funabasi.chiba.ocn.ne.jp [122.17.252.46]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id BA4AA6AE9; Thu, 3 Sep 2009 22:59:02 +0900 (JST) From: Atsushi Nemoto To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org, spi-devel-general@lists.sourceforge.net, david-b@pacbell.net Subject: [PATCH 1/2] txx9: Fix spi-baseclk value Date: Thu, 3 Sep 2009 22:59:00 +0900 Message-Id: <1251986341-16938-1-git-send-email-anemo@mba.ocn.ne.jp> X-Mailer: git-send-email 1.5.6.5 Return-Path: X-Envelope-To: <"|/home/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: 23977 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips TXx9 SPI bit rate is calculated by: fBR = fSPI / 2 / (n + 1) (fSPI is SPI master clock freq, i.e. imbusclk freq.) So use imbus_clk / 2 as a spi-baseclk. Signed-off-by: Atsushi Nemoto --- arch/mips/txx9/generic/setup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c index a205e2b..b2613c1 100644 --- a/arch/mips/txx9/generic/setup.c +++ b/arch/mips/txx9/generic/setup.c @@ -85,7 +85,7 @@ int txx9_ccfg_toeon __initdata = 1; struct clk *clk_get(struct device *dev, const char *id) { if (!strcmp(id, "spi-baseclk")) - return (struct clk *)((unsigned long)txx9_gbus_clock / 2 / 4); + return (struct clk *)((unsigned long)txx9_gbus_clock / 2 / 2); if (!strcmp(id, "imbus_clk")) return (struct clk *)((unsigned long)txx9_gbus_clock / 2); return ERR_PTR(-ENOENT); -- 1.5.6.5 From anemo@mba.ocn.ne.jp Thu Sep 3 15:59:35 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 03 Sep 2009 15:59:42 +0200 (CEST) Received: from mba.ocn.ne.jp ([122.28.14.163]:55870 "HELO smtp.mba.ocn.ne.jp" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with SMTP id S1492724AbZICN7L (ORCPT ); Thu, 3 Sep 2009 15:59:11 +0200 Received: from localhost.localdomain (p2046-ipad301funabasi.chiba.ocn.ne.jp [122.17.252.46]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 24EE46A7E; Thu, 3 Sep 2009 22:59:03 +0900 (JST) From: Atsushi Nemoto To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org, spi-devel-general@lists.sourceforge.net, david-b@pacbell.net Subject: [PATCH 2/2] spi_txx9: Fix bit rate calculation Date: Thu, 3 Sep 2009 22:59:01 +0900 Message-Id: <1251986341-16938-2-git-send-email-anemo@mba.ocn.ne.jp> X-Mailer: git-send-email 1.5.6.5 Return-Path: X-Envelope-To: <"|/home/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: 23978 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips TXx9 SPI bit rate is calculated by: fBR = (spi-baseclk) / (n + 1) Fix calculation of min_speed_hz, max_speed_hz and n. Signed-off-by: Atsushi Nemoto --- drivers/spi/spi_txx9.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/spi/spi_txx9.c b/drivers/spi/spi_txx9.c index 96057de..19f7562 100644 --- a/drivers/spi/spi_txx9.c +++ b/drivers/spi/spi_txx9.c @@ -29,6 +29,8 @@ #define SPI_FIFO_SIZE 4 +#define SPI_MAX_DIVIDER 0xff /* Max. value for SPCR1.SER */ +#define SPI_MIN_DIVIDER 1 /* Min. value for SPCR1.SER */ #define TXx9_SPMCR 0x00 #define TXx9_SPCR0 0x04 @@ -193,11 +195,8 @@ static void txx9spi_work_one(struct txx9spi *c, struct spi_message *m) if (prev_speed_hz != speed_hz || prev_bits_per_word != bits_per_word) { - u32 n = (c->baseclk + speed_hz - 1) / speed_hz; - if (n < 1) - n = 1; - else if (n > 0xff) - n = 0xff; + int n = DIV_ROUND_UP(c->baseclk, speed_hz) - 1; + n = clamp(n, SPI_MIN_DIVIDER, SPI_MAX_DIVIDER); /* enter config mode */ txx9spi_wr(c, mcr | TXx9_SPMCR_CONFIG | TXx9_SPMCR_BCLR, TXx9_SPMCR); @@ -370,8 +369,8 @@ static int __init txx9spi_probe(struct platform_device *dev) goto exit; } c->baseclk = clk_get_rate(c->clk); - c->min_speed_hz = (c->baseclk + 0xff - 1) / 0xff; - c->max_speed_hz = c->baseclk; + c->min_speed_hz = DIV_ROUND_UP(c->baseclk, SPI_MAX_DIVIDER + 1); + c->max_speed_hz = c->baseclk / (SPI_MIN_DIVIDER + 1); res = platform_get_resource(dev, IORESOURCE_MEM, 0); if (!res) -- 1.5.6.5 From at.wufei@gmail.com Thu Sep 3 16:28:05 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 03 Sep 2009 16:28:11 +0200 (CEST) Received: from fg-out-1718.google.com ([72.14.220.159]:31867 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1492730AbZICO2F (ORCPT ); Thu, 3 Sep 2009 16:28:05 +0200 Received: by fg-out-1718.google.com with SMTP id d23so713112fga.6 for ; Thu, 03 Sep 2009 07:28:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=2Mz1fNpKyOuCkvuXUpWr7MH4bQw4fBnydVsXOvmRxKE=; b=lF+ZVOkSf/l4coaJq2y2xU7P9bUCSnQ42ODZK14WTua3JAVew4aIGdAE2k4F+EWRM6 HCDBMPYBhxDlXY0p852cEt8nUsU0dbl76qFpp3VvKyHLKz0q0wDv0jJ/PJJPgYy5Y4xI sStgSd0CIyPbKYIXYIOJ8C5wdP/J45krn8qbo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=KqD4P4dC3SlUEkaRHFQbgLYaAOkf9QaE5wkhWSQiFOsqPnyIJVEPbMI9DXWGgMDBBR O4y2bXCTx6V9zRP+GpZuK8RvEJ2erJ+M4Ac8NmdKK+/Akg7/xlCU+nnED95/3snXs8RD fxQaVq7GmcUrE59ZsKGMGKrDMzLSTNiox9szg= Received: by 10.87.42.14 with SMTP id u14mr3949776fgj.28.1251988084206; Thu, 03 Sep 2009 07:28:04 -0700 (PDT) Received: from desktop ([58.31.9.46]) by mx.google.com with ESMTPS id l19sm62248fgb.1.2009.09.03.07.27.58 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 03 Sep 2009 07:27:59 -0700 (PDT) Date: Thu, 3 Sep 2009 22:27:53 +0800 From: Wu Fei To: linux-mips@linux-mips.org, Ralf Baechle Subject: Shrink the size of tlb handler and fix vmalloc() Message-ID: <20090903142753.GA6482@desktop> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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: 23979 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: at.wufei@gmail.com Precedence: bulk X-list: linux-mips This patch tries to shrink the size of the 64bit tlb handler and also fix an vmalloc bug at the same time. By combining the swapper_pg_dir and module_pg_dir, several checks in tlb handler, particularly build_get_pgd_vmalloc64, are not necessary. The reason they can be combined is that, the effective virtual address of vmalloc returned is at the bottom, and of module_alloc returned is at the top. In the normal case of 4KB page size: VMALLOC_START, VMALLOC_END 0xc0000000 00000000 - 0xc0000100 00000000 MODULE_START, MODULE_END 0xffffffff c0000000 - 0xffffffff +xxxxxxx Change it to: VMALLOC_START, VMALLOC_END 0xc0000000 00000000 - 0xc00000ff 00000000 MODULE_START, MODULE_END 0xffffffff c0000000 - 0xffffffff +xxxxxxx We use the least 40 bits to traverse the page table, the change makes it still one-to-one mapping without more checking. "+" is in the range of [c,d,e,f], so there even are big holes bewteen them. With this patch, the tlb refill handler only contains about 28 instructions, instead of the original 38. And this patch also fix a bug in vmalloc, which happens when its returned address is not covered by the first pgd. e.g. if we do two vmallocs, the first returned address is 0xc0000000 00000000, and the 2nd is 0xc0000000 40000000, vmalloc -> __vmalloc_node -> __vmalloc_area_node -> __vmalloc_area_node -> map_vm_area -> pgd_offset_k pgd_offset_k doesn't use the address to index the pgd, just return the first one: #define pgd_offset_k(address) \ ((address) >= MODULE_START ? module_pg_dir : pgd_offset(&init_mm, 0UL)) This is wrong, then the 2 addresses are mapped to the same pte. This bug doesn't happen because even in the 4KB page case, one pgd can cover 1GB size, and it looks like the system won't vmalloc so much area. From at.wufei@gmail.com Thu Sep 3 16:30:06 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 03 Sep 2009 16:30:12 +0200 (CEST) Received: from mail-fx0-f220.google.com ([209.85.220.220]:37375 "EHLO mail-fx0-f220.google.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1492730AbZICOaG (ORCPT ); Thu, 3 Sep 2009 16:30:06 +0200 Received: by fxm20 with SMTP id 20so1680982fxm.0 for ; Thu, 03 Sep 2009 07:30:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=FCl7MH4hu+t6mfKBCOeI1dQAVfEiLK79DD/hGM1IEoo=; b=ltogB3mtwoK0jES3WTmeG7qfXtBu89DSSsDdofJd/1Z/9d9ArFGZFXD9/gsjnFn25J g9HqnPDDyqAsQ7JMpG5FxQdenYxekEjbLBf4UujQwc66OZih42XBODYxa2jXUs9Ra+FT vqYEIh/yEc01+PZ5mOi/d9xbA3xO3lwGA8WIM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=PHM+ik3Xa54uFMRISvBRSFPibyFNBRgbzouwN6NwGiuy3zVI+HXdSP9uIlhy3DtqOx rF5atX6bTkl8aLYNeDf8/3pBvVKwK49WMNS30pbdVKldylRjplElExDT1OaJRKNSNv9c uRnHsrvEjDLyp2Cnk02A4LVkoj9ZSTaQ++9jc= Received: by 10.204.34.71 with SMTP id k7mr7908986bkd.206.1251988199927; Thu, 03 Sep 2009 07:29:59 -0700 (PDT) Received: from desktop ([58.31.9.46]) by mx.google.com with ESMTPS id y15sm1997182fkd.47.2009.09.03.07.29.57 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 03 Sep 2009 07:29:59 -0700 (PDT) Date: Thu, 3 Sep 2009 22:29:53 +0800 From: Wu Fei To: linux-mips@linux-mips.org, Ralf Baechle Subject: [PATCH] Shrink the size of tlb handler Message-ID: <20090903142953.GB6482@desktop> References: <20090903142753.GA6482@desktop> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090903142753.GA6482@desktop> 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: 23980 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: at.wufei@gmail.com Precedence: bulk X-list: linux-mips By combining swapper_pg_dir and module_pg_dir, several if conditions can be eliminated from the tlb exception handler. The reason they can be combined is that, the effective virtual address of vmalloc returned is at the bottom, and of module_alloc returned is at the top. It also fixes the bug in vmalloc(), which happens when its return address is not covered by the first pgd. Signed-off-by: Wu Fei --- arch/mips/include/asm/pgtable-64.h | 11 ++------ arch/mips/mm/init.c | 3 -- arch/mips/mm/pgtable-64.c | 3 -- arch/mips/mm/tlbex.c | 49 ------------------------------------ 4 files changed, 3 insertions(+), 63 deletions(-) diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h index 4ed9d1b..9cd5089 100644 --- a/arch/mips/include/asm/pgtable-64.h +++ b/arch/mips/include/asm/pgtable-64.h @@ -109,13 +109,13 @@ #define VMALLOC_START MAP_BASE #define VMALLOC_END \ - (VMALLOC_START + PTRS_PER_PGD * PTRS_PER_PMD * PTRS_PER_PTE * PAGE_SIZE) + (VMALLOC_START + \ + PTRS_PER_PGD * PTRS_PER_PMD * PTRS_PER_PTE * PAGE_SIZE - (1UL << 32)) #if defined(CONFIG_MODULES) && defined(KBUILD_64BIT_SYM32) && \ VMALLOC_START != CKSSEG /* Load modules into 32bit-compatible segment. */ #define MODULE_START CKSSEG #define MODULE_END (FIXADDR_START-2*PAGE_SIZE) -extern pgd_t module_pg_dir[PTRS_PER_PGD]; #endif #define pte_ERROR(e) \ @@ -188,12 +188,7 @@ static inline void pud_clear(pud_t *pudp) #define __pmd_offset(address) pmd_index(address) /* to find an entry in a kernel page-table-directory */ -#ifdef MODULE_START -#define pgd_offset_k(address) \ - ((address) >= MODULE_START ? module_pg_dir : pgd_offset(&init_mm, 0UL)) -#else -#define pgd_offset_k(address) pgd_offset(&init_mm, 0UL) -#endif +#define pgd_offset_k(address) pgd_offset(&init_mm, address) #define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) #define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 0e82050..38c79c5 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c @@ -475,9 +475,6 @@ unsigned long pgd_current[NR_CPUS]; */ pgd_t swapper_pg_dir[_PTRS_PER_PGD] __page_aligned(_PGD_ORDER); #ifdef CONFIG_64BIT -#ifdef MODULE_START -pgd_t module_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER); -#endif pmd_t invalid_pmd_table[PTRS_PER_PMD] __page_aligned(PMD_ORDER); #endif pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned(PTE_ORDER); diff --git a/arch/mips/mm/pgtable-64.c b/arch/mips/mm/pgtable-64.c index e4b565a..1121019 100644 --- a/arch/mips/mm/pgtable-64.c +++ b/arch/mips/mm/pgtable-64.c @@ -59,9 +59,6 @@ void __init pagetable_init(void) /* Initialize the entire pgd. */ pgd_init((unsigned long)swapper_pg_dir); -#ifdef MODULE_START - pgd_init((unsigned long)module_pg_dir); -#endif pmd_init((unsigned long)invalid_pmd_table, (unsigned long)invalid_pte_table); pgd_base = swapper_pg_dir; diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 9a17bf8..bc66f57 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c @@ -499,11 +499,7 @@ build_get_pmde64(u32 **p, struct uasm_label **l, struct uasm_reloc **r, * The vmalloc handling is not in the hotpath. */ uasm_i_dmfc0(p, tmp, C0_BADVADDR); -#ifdef MODULE_START - uasm_il_bltz(p, r, tmp, label_module_alloc); -#else uasm_il_bltz(p, r, tmp, label_vmalloc); -#endif /* No uasm_i_nop needed here, since the next insn doesn't touch TMP. */ #ifdef CONFIG_SMP @@ -556,52 +552,7 @@ build_get_pgd_vmalloc64(u32 **p, struct uasm_label **l, struct uasm_reloc **r, { long swpd = (long)swapper_pg_dir; -#ifdef MODULE_START - long modd = (long)module_pg_dir; - - uasm_l_module_alloc(l, *p); - /* - * Assumption: - * VMALLOC_START >= 0xc000000000000000UL - * MODULE_START >= 0xe000000000000000UL - */ - UASM_i_SLL(p, ptr, bvaddr, 2); - uasm_il_bgez(p, r, ptr, label_vmalloc); - - if (uasm_in_compat_space_p(MODULE_START) && - !uasm_rel_lo(MODULE_START)) { - uasm_i_lui(p, ptr, uasm_rel_hi(MODULE_START)); /* delay slot */ - } else { - /* unlikely configuration */ - uasm_i_nop(p); /* delay slot */ - UASM_i_LA(p, ptr, MODULE_START); - } - uasm_i_dsubu(p, bvaddr, bvaddr, ptr); - - if (uasm_in_compat_space_p(modd) && !uasm_rel_lo(modd)) { - uasm_il_b(p, r, label_vmalloc_done); - uasm_i_lui(p, ptr, uasm_rel_hi(modd)); - } else { - UASM_i_LA_mostly(p, ptr, modd); - uasm_il_b(p, r, label_vmalloc_done); - if (uasm_in_compat_space_p(modd)) - uasm_i_addiu(p, ptr, ptr, uasm_rel_lo(modd)); - else - uasm_i_daddiu(p, ptr, ptr, uasm_rel_lo(modd)); - } - uasm_l_vmalloc(l, *p); - if (uasm_in_compat_space_p(MODULE_START) && - !uasm_rel_lo(MODULE_START) && - MODULE_START << 32 == VMALLOC_START) - uasm_i_dsll32(p, ptr, ptr, 0); /* typical case */ - else - UASM_i_LA(p, ptr, VMALLOC_START); -#else - uasm_l_vmalloc(l, *p); - UASM_i_LA(p, ptr, VMALLOC_START); -#endif - uasm_i_dsubu(p, bvaddr, bvaddr, ptr); if (uasm_in_compat_space_p(swpd) && !uasm_rel_lo(swpd)) { uasm_il_b(p, r, label_vmalloc_done); -- 1.6.4.rc1 From at.wufei@gmail.com Thu Sep 3 16:32:17 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 03 Sep 2009 16:32:23 +0200 (CEST) Received: from mail-fx0-f220.google.com ([209.85.220.220]:56477 "EHLO mail-fx0-f220.google.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1492761AbZICOcR (ORCPT ); Thu, 3 Sep 2009 16:32:17 +0200 Received: by fxm20 with SMTP id 20so1683155fxm.0 for ; Thu, 03 Sep 2009 07:32:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=by8DackXTq6qUg8fh4aBGS8T7nzGF9vn2QxcMM7c1J0=; b=SgvZP8T3jq44GIvDkkJkBohSJWZE6InU+dOhojzdIh1zUX5/KFzV7ZpQeUqXv7hiNG bWACWRj4+R1OezZA8DbmxyCrek5+S4RRl3qzNXFfjPHvuiHYFkScK/DQZbeyZPSTtm8t Sc20Ao+O/9sUg+xjgAL7rcMmJcK2SEk/n/Bvc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=NkBommUmKREGVPZSMgdeUzttGpFj9LxIKdAM1MVFC+cV4qJTkCJEvthz+qxbTMvAiK QLmWhIkUOOeGCk2/neOrswk2ReKDisuv25h5S88F9ytv5x2wmyhCuTAD0VjDKrlNyfRv mkKBmtpxntKfa2OZSfc91n8tVC/ElfRRV6vbw= Received: by 10.204.29.22 with SMTP id o22mr8017326bkc.78.1251988330055; Thu, 03 Sep 2009 07:32:10 -0700 (PDT) Received: from desktop ([58.31.9.46]) by mx.google.com with ESMTPS id 22sm2012165fkq.23.2009.09.03.07.32.07 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 03 Sep 2009 07:32:09 -0700 (PDT) Date: Thu, 3 Sep 2009 22:32:02 +0800 From: Wu Fei To: linux-mips@linux-mips.org, Ralf Baechle Subject: Re: Shrink the size of tlb handler and fix vmalloc() Message-ID: <20090903143202.GC6482@desktop> References: <20090903142753.GA6482@desktop> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090903142753.GA6482@desktop> 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: 23981 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: at.wufei@gmail.com Precedence: bulk X-list: linux-mips On Thu, Sep 03, 2009 at 10:27:53PM +0800, Wu Fei wrote: > This patch tries to shrink the size of the 64bit tlb handler and also fix > an vmalloc bug at the same time. > Forgot to say, it's only tested on 2.6.27, not the master, I can't get the environment to run the latest kernel currently. Thanks, Wufei. > By combining the swapper_pg_dir and module_pg_dir, several checks in tlb > handler, particularly build_get_pgd_vmalloc64, are not necessary. The reason > they can be combined is that, the effective virtual address of vmalloc returned > is at the bottom, and of module_alloc returned is at the top. > > In the normal case of 4KB page size: > VMALLOC_START, VMALLOC_END 0xc0000000 00000000 - 0xc0000100 00000000 > MODULE_START, MODULE_END 0xffffffff c0000000 - 0xffffffff +xxxxxxx > Change it to: > VMALLOC_START, VMALLOC_END 0xc0000000 00000000 - 0xc00000ff 00000000 > MODULE_START, MODULE_END 0xffffffff c0000000 - 0xffffffff +xxxxxxx > We use the least 40 bits to traverse the page table, the change makes it still > one-to-one mapping without more checking. "+" is in the range of [c,d,e,f], > so there even are big holes bewteen them. > > With this patch, the tlb refill handler only contains about 28 instructions, > instead of the original 38. > > > And this patch also fix a bug in vmalloc, which happens when its returned > address is not covered by the first pgd. e.g. if we do two vmallocs, the first > returned address is 0xc0000000 00000000, and the 2nd is 0xc0000000 40000000, > > vmalloc -> __vmalloc_node -> __vmalloc_area_node -> __vmalloc_area_node > -> map_vm_area -> pgd_offset_k > > pgd_offset_k doesn't use the address to index the pgd, just return the first one: > > #define pgd_offset_k(address) \ > ((address) >= MODULE_START ? module_pg_dir : pgd_offset(&init_mm, 0UL)) > > This is wrong, then the 2 addresses are mapped to the same pte. This bug doesn't > happen because even in the 4KB page case, one pgd can cover 1GB size, and it looks > like the system won't vmalloc so much area. From f.fainelli@gmail.com Thu Sep 3 21:04:50 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 03 Sep 2009 21:04:56 +0200 (CEST) Received: from mail-bw0-f208.google.com ([209.85.218.208]:57925 "EHLO mail-bw0-f208.google.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1493126AbZICTEu (ORCPT ); Thu, 3 Sep 2009 21:04:50 +0200 Received: by bwz4 with SMTP id 4so185267bwz.0 for ; Thu, 03 Sep 2009 12:04:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:date:subject :mime-version:x-uid:x-length:to:cc:content-type :content-transfer-encoding:content-disposition:message-id; bh=ouPSqi+5PIrY53pETgu0BzDvs+nVf+xfdVnxyNesVeM=; b=PfQz3cnNQhrgSjI4MJITOJRti4BPlvG9XpY1OznbF5w/V4OlA2cchsYzx1DAuRY+18 PZwvYl1QGRrrQnajjiWCg/+xZwc9Bdny6ki31XseYo4MSxDTXAxX+3thXOZ/56jD9evW RrF5dL+3USkh5KXpYNFKEJ7QPkfQMtnYNJZgY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:date:subject:mime-version:x-uid:x-length:to:cc :content-type:content-transfer-encoding:content-disposition :message-id; b=nI/Xk4vsvC79a2kVYcn1Rp2XLrfruCvsytEiuQNwK4v1dlSdFsmeSl8NqHZ6JLNLZe zAFOQaAVl4Bo7utjV9unoOgL853IFMUQxGlB4XtlDvgWWDCwprmIUDPtiuCbjq3SWAdZ zol3R4vupAL/GQI5pGt1kFWwbnfarCsGFZSo4= Received: by 10.103.76.37 with SMTP id d37mr4405030mul.99.1252004684436; Thu, 03 Sep 2009 12:04:44 -0700 (PDT) Received: from lenovo.localnet (39.87.196-77.rev.gaoland.net [77.196.87.39]) by mx.google.com with ESMTPS id u26sm159704mug.53.2009.09.03.12.04.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 03 Sep 2009 12:04:43 -0700 (PDT) From: Florian Fainelli Date: Thu, 3 Sep 2009 21:04:32 +0200 Subject: [PATCH] bcm63xx: set the correct BCM3302 CPU name when built for BCM47xx or BCM63xx MIME-Version: 1.0 X-UID: 1374 X-Length: 1694 To: ralf@linux-mips.org Cc: linux-mips@linux-mips.org, Maxime Bizon Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200909032104.34135.florian@openwrt.org> Return-Path: X-Envelope-To: <"|/home/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: 23982 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: florian@openwrt.org Precedence: bulk X-list: linux-mips The Broadcom BCM3302 core is present in both the BCM47xx and the BCM6338 SoC. If people want to report a kernel oops it might be convenient to know about the real system they are running Linux on at first glance. Set the CPU name to be 3302 on BCM47xx and 6338 on BCM63xx. Signed-off-by: Florian Fainelli --- diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 251a268..405e9d4 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -862,7 +862,11 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu) case PRID_IMP_BCM3302: /* same as PRID_IMP_BCM6338 */ c->cputype = CPU_BCM3302; +#ifdef CONFIG_BCM47XX __cpu_name[cpu] = "Broadcom BCM3302"; +#else + __cpu_name[cpu] = "Broadcom BCM6338"; +#endif break; case PRID_IMP_BCM4710: c->cputype = CPU_BCM4710; From David.Daney@caviumnetworks.com Fri Sep 4 01:11:16 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 04 Sep 2009 01:11:22 +0200 (CEST) Received: from mail3.caviumnetworks.com ([12.108.191.235]:41292 "EHLO mail3.caviumnetworks.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1493207AbZICXLQ (ORCPT ); Fri, 4 Sep 2009 01:11:16 +0200 Received: from caexch01.caveonetworks.com (Not Verified[192.168.16.9]) by mail3.caviumnetworks.com with MailMarshal (v6,2,2,3503) id ; Thu, 03 Sep 2009 19:10:51 -0400 Received: from caexch01.caveonetworks.com ([192.168.16.9]) by caexch01.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 3 Sep 2009 16:10:54 -0700 Received: from dd1.caveonetworks.com ([64.169.86.201]) by caexch01.caveonetworks.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Thu, 3 Sep 2009 16:10:54 -0700 Received: from dd1.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dd1.caveonetworks.com (8.14.2/8.14.2) with ESMTP id n83NAnp4003116; Thu, 3 Sep 2009 16:10:50 -0700 Received: (from ddaney@localhost) by dd1.caveonetworks.com (8.14.2/8.14.2/Submit) id n83NAls8003115; Thu, 3 Sep 2009 16:10:47 -0700 From: David Daney To: linux-mips@linux-mips.org, ralf@linux-mips.org, gregkh@suse.de Cc: David Daney Subject: [PATCH] Staging: Octeon: Use symbolic values for irq numbers. Date: Thu, 3 Sep 2009 16:10:47 -0700 Message-Id: <1252019447-3090-1-git-send-email-ddaney@caviumnetworks.com> X-Mailer: git-send-email 1.6.0.6 X-OriginalArrivalTime: 03 Sep 2009 23:10:54.0871 (UTC) FILETIME=[C9D6BA70:01CA2CEB] Return-Path: X-Envelope-To: <"|/home/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: 23983 X-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 In addition to being magic numbers, the irq number passed to free_irq is incorrect. We need to use the correct symbolic value instead. Signed-off-by: David Daney --- Octeon being a member of the mips archecture, this could merge via Ralf's linux-mips.org tree. drivers/staging/octeon/ethernet-spi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/staging/octeon/ethernet-spi.c b/drivers/staging/octeon/ethernet-spi.c index 66190b0..00dc0f4 100644 --- a/drivers/staging/octeon/ethernet-spi.c +++ b/drivers/staging/octeon/ethernet-spi.c @@ -317,6 +317,6 @@ void cvm_oct_spi_uninit(struct net_device *dev) cvmx_write_csr(CVMX_SPXX_INT_MSK(interface), 0); cvmx_write_csr(CVMX_STXX_INT_MSK(interface), 0); } - free_irq(8 + 46, &number_spi_ports); + free_irq(OCTEON_IRQ_RML, &number_spi_ports); } } -- 1.6.0.6 From anemo@mba.ocn.ne.jp Fri Sep 4 15:09:14 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 04 Sep 2009 15:09:21 +0200 (CEST) Received: from mba.ocn.ne.jp ([122.28.14.163]:57580 "HELO smtp.mba.ocn.ne.jp" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with SMTP id S1492122AbZIDNJO (ORCPT ); Fri, 4 Sep 2009 15:09:14 +0200 Received: from localhost.localdomain (p5218-ipad313funabasi.chiba.ocn.ne.jp [123.217.231.218]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 1820E6918; Fri, 4 Sep 2009 22:09:05 +0900 (JST) From: Atsushi Nemoto To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org, davem@davemloft.net Subject: [PATCH] txx9: Disable PM capability of TX493[89] internal ether Date: Fri, 4 Sep 2009 22:09:04 +0900 Message-Id: <1252069744-4553-1-git-send-email-anemo@mba.ocn.ne.jp> X-Mailer: git-send-email 1.5.6.5 Return-Path: X-Envelope-To: <"|/home/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: 23984 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: anemo@mba.ocn.ne.jp Precedence: bulk X-list: linux-mips Some tc35815 variants (i.e. TX493[89] internal ether) report existance of PM registers though they are not supported. Disable PM features by clearing pdev->pm_cap. Signed-off-by: Atsushi Nemoto --- arch/mips/txx9/generic/pci.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c index 7b637a7..707cfa9 100644 --- a/arch/mips/txx9/generic/pci.c +++ b/arch/mips/txx9/generic/pci.c @@ -341,6 +341,15 @@ static void quirk_slc90e66_ide(struct pci_dev *dev) } #endif /* CONFIG_TOSHIBA_FPCIB0 */ +static void tc35815_fixup(struct pci_dev *dev) +{ + /* This device may have PM registers but not they are not suported. */ + if (dev->pm_cap) { + dev_info(&dev->dev, "PM disabled\n"); + dev->pm_cap = 0; + } +} + static void final_fixup(struct pci_dev *dev) { unsigned char bist; @@ -374,6 +383,10 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_1, DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_1, quirk_slc90e66_ide); #endif +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_TOSHIBA_2, + PCI_DEVICE_ID_TOSHIBA_TC35815_NWU, tc35815_fixup); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_TOSHIBA_2, + PCI_DEVICE_ID_TOSHIBA_TC35815_TX4939, tc35815_fixup); DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, final_fixup); DECLARE_PCI_FIXUP_RESUME(PCI_ANY_ID, PCI_ANY_ID, final_fixup); -- 1.5.6.5 From ralf@linux-mips.org Fri Sep 4 18:11:28 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 04 Sep 2009 18:11:35 +0200 (CEST) Received: from p549F7BBC.dip.t-dialin.net ([84.159.123.188]:47471 "EHLO h5.dl5rb.org.uk" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org with ESMTP id S1492859AbZIDQL2 (ORCPT ); Fri, 4 Sep 2009 18:11:28 +0200 Received: from h5.dl5rb.org.uk (localhost.localdomain [127.0.0.1]) by h5.dl5rb.org.uk (8.14.3/8.14.3) with ESMTP id n84GBmTe006881; Fri, 4 Sep 2009 17:11:52 +0100 Received: (from ralf@localhost) by h5.dl5rb.org.uk (8.14.3/8.14.3/Submit) id n84GBYTe006877; Fri, 4 Sep 2009 17:11:34 +0100 Date: Fri, 4 Sep 2009 17:11:34 +0100 From: Ralf Baechle To: Atsushi Nemoto Cc: linux-mips@linux-mips.org, davem@davemloft.net Subject: Re: [PATCH] txx9: Disable PM capability of TX493[89] internal ether Message-ID: <20090904161134.GA6699@linux-mips.org> References: <1252069744-4553-1-git-send-email-anemo@mba.ocn.ne.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1252069744-4553-1-git-send-email-anemo@mba.ocn.ne.jp> User-Agent: Mutt/1.5.19 (2009-01-05) Return-Path: X-Envelope-To: <"|/home/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: 23985 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Fri, Sep 04, 2009 at 10:09:04PM +0900, Atsushi Nemoto wrote: > Some tc35815 variants (i.e. TX493[89] internal ether) report existance > of PM registers though they are not supported. Disable PM features by > clearing pdev->pm_cap. Thanks, applied. Ralf From ralf@linux-mips.org Fri Sep 4 18:31:40 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 04 Sep 2009 18:31:43 +0200 (CEST) Received: from localhost.localdomain ([127.0.0.1]:35999 "EHLO h5.dl5rb.org.uk" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org with ESMTP id S1492750AbZIDQbk (ORCPT ); Fri, 4 Sep 2009 18:31:40 +0200 Received: from h5.dl5rb.org.uk (localhost.localdomain [127.0.0.1]) by h5.dl5rb.org.uk (8.14.3/8.14.3) with ESMTP id n84GWT1h007643; Fri, 4 Sep 2009 17:32:30 +0100 Received: (from ralf@localhost) by h5.dl5rb.org.uk (8.14.3/8.14.3/Submit) id n84GWRmK007641; Fri, 4 Sep 2009 17:32:27 +0100 Date: Fri, 4 Sep 2009 17:32:27 +0100 From: Ralf Baechle To: Atsushi Nemoto Cc: linux-mips@linux-mips.org, spi-devel-general@lists.sourceforge.net, david-b@pacbell.net Subject: Re: [PATCH 2/2] spi_txx9: Fix bit rate calculation Message-ID: <20090904163227.GB6699@linux-mips.org> References: <1251986341-16938-2-git-send-email-anemo@mba.ocn.ne.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1251986341-16938-2-git-send-email-anemo@mba.ocn.ne.jp> User-Agent: Mutt/1.5.19 (2009-01-05) Return-Path: X-Envelope-To: <"|/home/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: 23986 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Thu, Sep 03, 2009 at 10:59:01PM +0900, Atsushi Nemoto wrote: Atsushi's patches should probably be merged together. I can take care of that if the SPI bit is acked by a maintainer. Thanks, Ralf From wuzhangjin@gmail.com Sat Sep 5 08:22:01 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 05 Sep 2009 08:22:08 +0200 (CEST) Received: from mail-pz0-f175.google.com ([209.85.222.175]:42054 "EHLO mail-pz0-f175.google.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1491851AbZIEGWB (ORCPT ); Sat, 5 Sep 2009 08:22:01 +0200 Received: by pzk5 with SMTP id 5so1297646pzk.10 for ; Fri, 04 Sep 2009 23:21:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=8+9KmVDvJ2rAQPBA4FihJPrCl/XrQKisFG4GgmwVtBQ=; b=sm3XkjjBcgSjndic93NxpohN3+UPzNPSreivNL1JkFk3DumE2CDl+RFTdmGVIkRzMz QR64bNTdZP4Dn9qI3ay4UyAavuWY14yeitSkc1JsclPD6NHQjwu8eYzVESfL4B2GofIO TzifJ/W5FKfiBZ+UF1yknWx2xMbmCOdb2rxqM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=SfFsu/P4kbqex5+0e07NrkZSaTqfKFttjBKuCGhObFs1DECLqlCHgkULFED0ip1/gM wEi7hSJ2ytzQwFlhne+LCyB6g+26zBJr8fwelzsV1pq6oydlQRJmVlILMMsptAflWd5+ 32WnsqKoHihueeY5ff5yUAefkIWwZohh1ZZdw= Received: by 10.115.113.9 with SMTP id q9mr11215090wam.224.1252131712619; Fri, 04 Sep 2009 23:21:52 -0700 (PDT) Received: from localhost.localdomain ([222.92.8.142]) by mx.google.com with ESMTPS id 22sm687173pzk.14.2009.09.04.23.21.45 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 04 Sep 2009 23:21:51 -0700 (PDT) From: Wu Zhangjin To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org, Jason Wessel , Zhang Le , Arnaud Patard , Atsushi Nemoto , Wu Zhangjin Subject: [PATCH 1/3] [loongson] eary_printk: Remove existing implementation Date: Sat, 5 Sep 2009 14:21:33 +0800 Message-Id: <1252131693-27424-1-git-send-email-wuzhangjin@gmail.com> X-Mailer: git-send-email 1.6.2.1 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 23987 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: wuzhangjin@gmail.com Precedence: bulk X-list: linux-mips From: Wu Zhangjin This patch will remove the existing implementation of early_printk in fulong. for this old implementation is based on the board-specific source code(dbg_io.c), but dbg_io.c is out-of-date: as the commit: 8d60a903d986ffa26c41f0092320a3b9da20bfaf shows, dbg_io.c is not needed. it will be removed in the next patch, and the new implementation of early_printk will be added later. Signed-off-by: Wu Zhangjin --- arch/mips/lemote/lm2e/prom.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/arch/mips/lemote/lm2e/prom.c b/arch/mips/lemote/lm2e/prom.c index 7edc15d..d78cedf 100644 --- a/arch/mips/lemote/lm2e/prom.c +++ b/arch/mips/lemote/lm2e/prom.c @@ -21,7 +21,6 @@ extern unsigned long bus_clock; extern unsigned long cpu_clock_freq; extern unsigned int memsize, highmemsize; -extern int putDebugChar(unsigned char byte); static int argc; /* pmon passes arguments in 32bit pointers */ @@ -90,8 +89,3 @@ do { \ void __init prom_free_prom_memory(void) { } - -void prom_putchar(char c) -{ - putDebugChar(c); -} -- 1.6.2.1 From wuzhangjin@gmail.com Sat Sep 5 08:23:09 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 05 Sep 2009 08:23:16 +0200 (CEST) Received: from mail-px0-f174.google.com ([209.85.216.174]:38723 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1491851AbZIEGXF (ORCPT ); Sat, 5 Sep 2009 08:23:05 +0200 Received: by pxi4 with SMTP id 4so1255344pxi.21 for ; Fri, 04 Sep 2009 23:22:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=PyW0Z6+IxnNDroMSkxheBj1Iqe8X/Ckmpd1okuMdPys=; b=h/0DxgEX4I37Nm78vwnop/MT2UEQAz6xb0Yp9XAQbJ1NoSVBpnyak78MVjQda4DdqI jIdPKoMriKOtcTQu9x3S6sExxEIjXMJHG7eIo2O5wvqnW0mSTwRLUnjAq1+LoVN4giEq PyO77v+8Mdg4lM5SOe0SFzaZEy49nYBdEXWjg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=gww4YloPnh/xAht3RlSE36iFuiL3KcklH3cMUr9OHnRZNgr+vKOEuabiej/4kNniF7 QGL3OymBXqacSugxojZea54JCSZUCcH48w8TXDgwycp4ICBalMGOmK0yJJG0PguU4aeN +LLWBiknmL1CuYjTzw9zlV0Or3fIij6Kh8Skk= Received: by 10.115.144.7 with SMTP id w7mr11217324wan.228.1252131777932; Fri, 04 Sep 2009 23:22:57 -0700 (PDT) Received: from localhost.localdomain ([222.92.8.142]) by mx.google.com with ESMTPS id 20sm755922pzk.1.2009.09.04.23.22.51 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 04 Sep 2009 23:22:57 -0700 (PDT) From: Wu Zhangjin To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org, Jason Wessel , Zhang Le , Arnaud Patard , Atsushi Nemoto , Wu Zhangjin Subject: [PATCH 2/3] [loongson] kgdb: Remove out-of-date board-specific source code Date: Sat, 5 Sep 2009 14:22:45 +0800 Message-Id: <1252131765-30075-1-git-send-email-wuzhangjin@gmail.com> X-Mailer: git-send-email 1.6.2.1 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 23988 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: wuzhangjin@gmail.com Precedence: bulk X-list: linux-mips From: Wu Zhangjin as the commit: 8854700115ecf8aa6f087aa915b7b6cf18090d39 shows, the new mips-specific kgdb implementation not need this board-specific source code, just remove it. Acked-by: Jason Wessel Signed-off-by: Wu Zhangjin --- arch/mips/lemote/lm2e/Makefile | 2 +- arch/mips/lemote/lm2e/dbg_io.c | 146 ---------------------------------------- 2 files changed, 1 insertions(+), 147 deletions(-) delete mode 100644 arch/mips/lemote/lm2e/dbg_io.c diff --git a/arch/mips/lemote/lm2e/Makefile b/arch/mips/lemote/lm2e/Makefile index d34671d..b0c0339 100644 --- a/arch/mips/lemote/lm2e/Makefile +++ b/arch/mips/lemote/lm2e/Makefile @@ -2,6 +2,6 @@ # Makefile for Lemote Fulong mini-PC board. # -obj-y += setup.o prom.o reset.o irq.o pci.o bonito-irq.o dbg_io.o mem.o +obj-y += setup.o prom.o reset.o irq.o pci.o bonito-irq.o mem.o EXTRA_CFLAGS += -Werror diff --git a/arch/mips/lemote/lm2e/dbg_io.c b/arch/mips/lemote/lm2e/dbg_io.c deleted file mode 100644 index 6c95da3..0000000 --- a/arch/mips/lemote/lm2e/dbg_io.c +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright 2001 MontaVista Software Inc. - * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net - * Copyright (C) 2000, 2001 Ralf Baechle (ralf@gnu.org) - * - * Copyright (C) 2007 Lemote Inc. & Insititute of Computing Technology - * Author: Fuxin Zhang, zhangfx@lemote.com - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#include -#include -#include - -#include - -#define UART16550_BAUD_2400 2400 -#define UART16550_BAUD_4800 4800 -#define UART16550_BAUD_9600 9600 -#define UART16550_BAUD_19200 19200 -#define UART16550_BAUD_38400 38400 -#define UART16550_BAUD_57600 57600 -#define UART16550_BAUD_115200 115200 - -#define UART16550_PARITY_NONE 0 -#define UART16550_PARITY_ODD 0x08 -#define UART16550_PARITY_EVEN 0x18 -#define UART16550_PARITY_MARK 0x28 -#define UART16550_PARITY_SPACE 0x38 - -#define UART16550_DATA_5BIT 0x0 -#define UART16550_DATA_6BIT 0x1 -#define UART16550_DATA_7BIT 0x2 -#define UART16550_DATA_8BIT 0x3 - -#define UART16550_STOP_1BIT 0x0 -#define UART16550_STOP_2BIT 0x4 - -/* ----------------------------------------------------- */ - -/* === CONFIG === */ -#ifdef CONFIG_64BIT -#define BASE (0xffffffffbfd003f8) -#else -#define BASE (0xbfd003f8) -#endif - -#define MAX_BAUD BASE_BAUD -/* === END OF CONFIG === */ - -#define REG_OFFSET 1 - -/* register offset */ -#define OFS_RCV_BUFFER 0 -#define OFS_TRANS_HOLD 0 -#define OFS_SEND_BUFFER 0 -#define OFS_INTR_ENABLE (1*REG_OFFSET) -#define OFS_INTR_ID (2*REG_OFFSET) -#define OFS_DATA_FORMAT (3*REG_OFFSET) -#define OFS_LINE_CONTROL (3*REG_OFFSET) -#define OFS_MODEM_CONTROL (4*REG_OFFSET) -#define OFS_RS232_OUTPUT (4*REG_OFFSET) -#define OFS_LINE_STATUS (5*REG_OFFSET) -#define OFS_MODEM_STATUS (6*REG_OFFSET) -#define OFS_RS232_INPUT (6*REG_OFFSET) -#define OFS_SCRATCH_PAD (7*REG_OFFSET) - -#define OFS_DIVISOR_LSB (0*REG_OFFSET) -#define OFS_DIVISOR_MSB (1*REG_OFFSET) - -/* memory-mapped read/write of the port */ -#define UART16550_READ(y) readb((char *)BASE + (y)) -#define UART16550_WRITE(y, z) writeb(z, (char *)BASE + (y)) - -void debugInit(u32 baud, u8 data, u8 parity, u8 stop) -{ - u32 divisor; - - /* disable interrupts */ - UART16550_WRITE(OFS_INTR_ENABLE, 0); - - /* set up buad rate */ - /* set DIAB bit */ - UART16550_WRITE(OFS_LINE_CONTROL, 0x80); - - /* set divisor */ - divisor = MAX_BAUD / baud; - UART16550_WRITE(OFS_DIVISOR_LSB, divisor & 0xff); - UART16550_WRITE(OFS_DIVISOR_MSB, (divisor & 0xff00) >> 8); - - /* clear DIAB bit */ - UART16550_WRITE(OFS_LINE_CONTROL, 0x0); - - /* set data format */ - UART16550_WRITE(OFS_DATA_FORMAT, data | parity | stop); -} - -static int remoteDebugInitialized; - -u8 getDebugChar(void) -{ - if (!remoteDebugInitialized) { - remoteDebugInitialized = 1; - debugInit(UART16550_BAUD_115200, - UART16550_DATA_8BIT, - UART16550_PARITY_NONE, UART16550_STOP_1BIT); - } - - while ((UART16550_READ(OFS_LINE_STATUS) & 0x1) == 0) ; - return UART16550_READ(OFS_RCV_BUFFER); -} - -int putDebugChar(u8 byte) -{ - if (!remoteDebugInitialized) { - remoteDebugInitialized = 1; - /* - debugInit(UART16550_BAUD_115200, - UART16550_DATA_8BIT, - UART16550_PARITY_NONE, UART16550_STOP_1BIT); */ - } - - while ((UART16550_READ(OFS_LINE_STATUS) & 0x20) == 0) ; - UART16550_WRITE(OFS_SEND_BUFFER, byte); - return 1; -} -- 1.6.2.1 From wuzhangjin@gmail.com Sat Sep 5 08:23:41 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Sat, 05 Sep 2009 08:23:48 +0200 (CEST) Received: from mail-pz0-f175.google.com ([209.85.222.175]:58907 "EHLO mail-pz0-f175.google.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1491990AbZIEGX3 (ORCPT ); Sat, 5 Sep 2009 08:23:29 +0200 Received: by pzk5 with SMTP id 5so1298489pzk.10 for ; Fri, 04 Sep 2009 23:23:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=ZX8Rv22A/CSV0BPT4cs57LWDWRAdZmMNuoRjYsQVJ48=; b=XkITSgdqO+NfP4JTQxz/Rm52izIJ7qj71qCXlMnNOQF5w8c2BbxyTvbnVbmm4O6se/ 2ZGhXhuJJODFstbpjdSE7zxBiTGF7HzlMCYS1dooobKHq0vu2gJYYjD8tTlczXrvhx6D A5C5dGmgf+69IkGA1E5bwt/iCEA8c5e0nVmt8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=d4fpaoNtkwgBYlIbC2/CL+suRhwdB+k+3Z4pseLKDuBXKBIRzQUa3aAmoD0KF/ZnQY wM/OLMkv8mrk3USBLEN8ddbHXkaiY7XXE1Xdc+YCjeWJ8bYfxvjxuPYq4S7PMhUMCd9o 8V3vdItfTrQvdXBJx7liND3SlsxSDGr81P/fM= Received: by 10.115.100.38 with SMTP id c38mr11289382wam.110.1252131800268; Fri, 04 Sep 2009 23:23:20 -0700 (PDT) Received: from localhost.localdomain ([222.92.8.142]) by mx.google.com with ESMTPS id 22sm95112pxi.10.2009.09.04.23.23.13 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 04 Sep 2009 23:23:19 -0700 (PDT) From: Wu Zhangjin To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org, Jason Wessel , Zhang Le , Arnaud Patard , Atsushi Nemoto , Wu Zhangjin Subject: [PATCH 3/3] [loongson] early_printk: add new implmentation Date: Sat, 5 Sep 2009 14:23:05 +0800 Message-Id: <1252131785-30112-1-git-send-email-wuzhangjin@gmail.com> X-Mailer: git-send-email 1.6.2.1 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 23989 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: wuzhangjin@gmail.com Precedence: bulk X-list: linux-mips From: Wu Zhangjin This patch is based on the implementation in the lm2e-fixes branch of Philippe's git://git.linux-cisco.org/linux-mips.git and the malta-specific early_printk implementation. Signed-off-by: Wu Zhangjin --- arch/mips/lemote/lm2e/Makefile | 5 ++++ arch/mips/lemote/lm2e/early_printk.c | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) create mode 100644 arch/mips/lemote/lm2e/early_printk.c diff --git a/arch/mips/lemote/lm2e/Makefile b/arch/mips/lemote/lm2e/Makefile index b0c0339..f191732 100644 --- a/arch/mips/lemote/lm2e/Makefile +++ b/arch/mips/lemote/lm2e/Makefile @@ -4,4 +4,9 @@ obj-y += setup.o prom.o reset.o irq.o pci.o bonito-irq.o mem.o +# +# Early printk support +# +obj-$(CONFIG_EARLY_PRINTK) += early_printk.o + EXTRA_CFLAGS += -Werror diff --git a/arch/mips/lemote/lm2e/early_printk.c b/arch/mips/lemote/lm2e/early_printk.c new file mode 100644 index 0000000..0644506 --- /dev/null +++ b/arch/mips/lemote/lm2e/early_printk.c @@ -0,0 +1,41 @@ +/* early printk support + * + * Copyright (c) 2009 Philippe Vachon + * Copyright (c) 2009 Lemote Inc. & Insititute of Computing Technology + * Author: Wu Zhangjin, wuzj@lemote.com + * + * 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 UART_BASE (BONITO_PCIIO_BASE + 0x3f8) + +#define PORT(base, offset) (u8 *)(base + offset) + +static inline unsigned int serial_in(unsigned char *base, int offset) +{ + return readb(PORT(base, offset)); +} + +static inline void serial_out(unsigned char *base, int offset, int value) +{ + writeb(value, PORT(base, offset)); +} + +void prom_putchar(char c) +{ + unsigned char *uart_base = + (unsigned char *) ioremap_nocache(UART_BASE, 8); + + while ((serial_in(uart_base, UART_LSR) & UART_LSR_THRE) == 0) + ; + + serial_out(uart_base, UART_TX, c); +} -- 1.6.2.1 From cernekee@gmail.com Sun Sep 6 00:11:19 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 06 Sep 2009 22:56:33 +0200 (CEST) Received: from [65.98.92.6] ([65.98.92.6]:4024 "EHLO b32.net" rhost-flags-FAIL-FAIL-OK-OK) by ftp.linux-mips.org with ESMTP id S1492979AbZIEWLT (ORCPT ); Sun, 6 Sep 2009 00:11:19 +0200 Received: (qmail 25897 invoked from network); 5 Sep 2009 22:11:13 -0000 Received: from unknown (HELO two) (127.0.0.1) by 127.0.0.1 with SMTP; 5 Sep 2009 22:11:13 -0000 Received: by two (sSMTP sendmail emulation); Sat, 05 Sep 2009 15:11:13 -0700 Message-Id: <197625223d8cb6ec3fc3e7da4501dd65@localhost> From: Kevin Cernekee To: ralf@linux-mips.org Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org Date: Sat, 5 Sep 2009 14:38:41 -0700 Subject: [PATCH] MIPS: Machine check exception in kmap_coherent() Return-Path: X-Envelope-To: <"|/home/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: 23990 X-Approved-By: ralf@linux-mips.org X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: cernekee@gmail.com Precedence: bulk X-list: linux-mips On an SMP MIPS32 2.6.30 system with cache aliases, I am seeing the following sequence of events: 1) copy_user_highpage() runs on CPU0, invoking kmap_coherent() to create a temporary mapping in the fixmap region 2) copy_page() starts on CPU0 3) CPU1 sends CPU0 an IPI asking CPU0 to run local_r4k_flush_cache_page() 4) CPU0 takes the interrupt, interrupting copy_page() 5) local_r4k_flush_cache_page() on CPU0 calls kmap_coherent() again 6) The second invocation of kmap_coherent() on CPU0 tries to use the same fixmap virtual address that was being used by copy_user_highpage() 7) CPU0 throws a machine check exception for the TLB address conflict Here is my proposed fix: a) kmap_coherent() will maintain a flag for each CPU indicating whether there is an active mapping (kmap_coherent_inuse) b) kmap_coherent() will return a NULL address in the unlikely case that it was called while another mapping was already outstanding c) local_r4k_flush_cache_page() will check for a NULL return value from kmap_coherent(), and compensate by using indexed cacheops instead of hit cacheops Signed-off-by: Kevin Cernekee --- arch/mips/mm/c-r4k.c | 25 +++++++++++++++++++------ arch/mips/mm/init.c | 17 +++++++++++++++-- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 6721ee2..572fe7e 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c @@ -459,7 +459,7 @@ static inline void local_r4k_flush_cache_page(void *args) struct page *page = pfn_to_page(fcp_args->pfn); int exec = vma->vm_flags & VM_EXEC; struct mm_struct *mm = vma->vm_mm; - int map_coherent = 0; + int map_coherent = 0, use_indexed = 0; pgd_t *pgdp; pud_t *pudp; pmd_t *pmdp; @@ -499,13 +499,23 @@ static inline void local_r4k_flush_cache_page(void *args) vaddr = kmap_coherent(page, addr); else vaddr = kmap_atomic(page, KM_USER0); - addr = (unsigned long)vaddr; + + if (unlikely(vaddr == NULL)) + use_indexed = 1; + else + addr = (unsigned long)vaddr; } if (cpu_has_dc_aliases || (exec && !cpu_has_ic_fills_f_dc)) { - r4k_blast_dcache_page(addr); - if (exec && !cpu_icache_snoops_remote_store) - r4k_blast_scache_page(addr); + if (use_indexed) { + r4k_blast_dcache_page_indexed(addr); + if (exec && !cpu_icache_snoops_remote_store) + r4k_blast_scache_page_indexed(addr); + } else { + r4k_blast_dcache_page(addr); + if (exec && !cpu_icache_snoops_remote_store) + r4k_blast_scache_page(addr); + } } if (exec) { if (vaddr && cpu_has_vtag_icache && mm == current->active_mm) { @@ -514,7 +524,10 @@ static inline void local_r4k_flush_cache_page(void *args) if (cpu_context(cpu, mm) != 0) drop_mmu_context(mm, cpu); } else - r4k_blast_icache_page(addr); + if (use_indexed) + r4k_blast_icache_page_indexed(addr); + else + r4k_blast_icache_page(addr); } if (vaddr) { diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 0e82050..87967cd 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -105,6 +106,8 @@ unsigned long setup_zero_pages(void) return 1UL << order; } +static int kmap_coherent_inuse[NR_CPUS] ____cacheline_aligned_in_smp; + #ifdef CONFIG_MIPS_MT_SMTC static pte_t *kmap_coherent_pte; static void __init kmap_coherent_init(void) @@ -125,14 +128,15 @@ void *kmap_coherent(struct page *page, unsigned long addr) unsigned long vaddr, flags, entrylo; unsigned long old_ctx; pte_t pte; - int tlbidx; + int tlbidx, cpu; BUG_ON(Page_dcache_dirty(page)); inc_preempt_count(); + cpu = smp_processor_id(); idx = (addr >> PAGE_SHIFT) & (FIX_N_COLOURS - 1); #ifdef CONFIG_MIPS_MT_SMTC - idx += FIX_N_COLOURS * smp_processor_id(); + idx += FIX_N_COLOURS * cpu; #endif vaddr = __fix_to_virt(FIX_CMAP_END - idx); pte = mk_pte(page, PAGE_KERNEL); @@ -143,6 +147,13 @@ void *kmap_coherent(struct page *page, unsigned long addr) #endif ENTER_CRITICAL(flags); + if (unlikely(kmap_coherent_inuse[cpu] != 0)) { + vaddr = 0; + dec_preempt_count(); + goto out; + } + kmap_coherent_inuse[cpu] = 1; + old_ctx = read_c0_entryhi(); write_c0_entryhi(vaddr & (PAGE_MASK << 1)); write_c0_entrylo0(entrylo); @@ -168,6 +179,7 @@ void *kmap_coherent(struct page *page, unsigned long addr) #endif tlbw_use_hazard(); write_c0_entryhi(old_ctx); +out: EXIT_CRITICAL(flags); return (void*) vaddr; @@ -195,6 +207,7 @@ void kunmap_coherent(void) write_c0_entryhi(old_ctx); EXIT_CRITICAL(flags); #endif + kmap_coherent_inuse[smp_processor_id()] = 0; dec_preempt_count(); preempt_check_resched(); } -- 1.6.3.1 From ralf@linux-mips.org Mon Sep 7 12:25:22 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 07 Sep 2009 12:25:26 +0200 (CEST) Received: from localhost.localdomain ([127.0.0.1]:59865 "EHLO h5.dl5rb.org.uk" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org with ESMTP id S1492648AbZIGKZW (ORCPT ); Mon, 7 Sep 2009 12:25:22 +0200 Received: from h5.dl5rb.org.uk (localhost.localdomain [127.0.0.1]) by h5.dl5rb.org.uk (8.14.3/8.14.3) with ESMTP id n87AQERK005136; Mon, 7 Sep 2009 12:26:15 +0200 Received: (from ralf@localhost) by h5.dl5rb.org.uk (8.14.3/8.14.3/Submit) id n87AQDBV005134; Mon, 7 Sep 2009 12:26:13 +0200 Date: Mon, 7 Sep 2009 12:26:13 +0200 From: Ralf Baechle To: Kevin Cernekee Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] MIPS: Machine check exception in kmap_coherent() Message-ID: <20090907102613.GA25295@linux-mips.org> References: <197625223d8cb6ec3fc3e7da4501dd65@localhost> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <197625223d8cb6ec3fc3e7da4501dd65@localhost> User-Agent: Mutt/1.5.19 (2009-01-05) Return-Path: X-Envelope-To: <"|/home/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: 23991 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Sat, Sep 05, 2009 at 02:38:41PM -0700, Kevin Cernekee wrote: > On an SMP MIPS32 2.6.30 system with cache aliases, I am seeing the > following sequence of events: > > 1) copy_user_highpage() runs on CPU0, invoking kmap_coherent() to create > a temporary mapping in the fixmap region > > 2) copy_page() starts on CPU0 > > 3) CPU1 sends CPU0 an IPI asking CPU0 to run > local_r4k_flush_cache_page() > > 4) CPU0 takes the interrupt, interrupting copy_page() > > 5) local_r4k_flush_cache_page() on CPU0 calls kmap_coherent() again > > 6) The second invocation of kmap_coherent() on CPU0 tries to use the > same fixmap virtual address that was being used by copy_user_highpage() > > 7) CPU0 throws a machine check exception for the TLB address conflict Nice analysis! > Here is my proposed fix: > > a) kmap_coherent() will maintain a flag for each CPU indicating whether > there is an active mapping (kmap_coherent_inuse) > > b) kmap_coherent() will return a NULL address in the unlikely case that > it was called while another mapping was already outstanding > > c) local_r4k_flush_cache_page() will check for a NULL return value from > kmap_coherent(), and compensate by using indexed cacheops instead of hit > cacheops Too complicated. The fault is happening because the non-SMTC code is trying to be terribly clever and pre-loading the TLB with a new wired entry. On SMTC where multiple processors are sharing a single TLB are more careful approach is needed so the code does a TLB probe and carefully and re-uses an existing entry, if any. Which happens to be just what we need. So how about below - only compile tested - patch? Signed-off-by: Ralf Baechle arch/mips/mm/init.c | 35 +---------------------------------- 1 files changed, 1 insertions(+), 34 deletions(-) diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 0e82050..ab11582 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c @@ -105,8 +105,8 @@ unsigned long setup_zero_pages(void) return 1UL << order; } -#ifdef CONFIG_MIPS_MT_SMTC static pte_t *kmap_coherent_pte; + static void __init kmap_coherent_init(void) { unsigned long vaddr; @@ -115,9 +115,6 @@ static void __init kmap_coherent_init(void) vaddr = __fix_to_virt(FIX_CMAP_BEGIN); kmap_coherent_pte = kmap_get_fixmap_pte(vaddr); } -#else -static inline void kmap_coherent_init(void) {} -#endif void *kmap_coherent(struct page *page, unsigned long addr) { @@ -131,9 +128,7 @@ void *kmap_coherent(struct page *page, unsigned long addr) inc_preempt_count(); idx = (addr >> PAGE_SHIFT) & (FIX_N_COLOURS - 1); -#ifdef CONFIG_MIPS_MT_SMTC idx += FIX_N_COLOURS * smp_processor_id(); -#endif vaddr = __fix_to_virt(FIX_CMAP_END - idx); pte = mk_pte(page, PAGE_KERNEL); #if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) @@ -147,7 +142,6 @@ void *kmap_coherent(struct page *page, unsigned long addr) write_c0_entryhi(vaddr & (PAGE_MASK << 1)); write_c0_entrylo0(entrylo); write_c0_entrylo1(entrylo); -#ifdef CONFIG_MIPS_MT_SMTC set_pte(kmap_coherent_pte - (FIX_CMAP_END - idx), pte); /* preload TLB instead of local_flush_tlb_one() */ mtc0_tlbw_hazard(); @@ -159,13 +153,6 @@ void *kmap_coherent(struct page *page, unsigned long addr) tlb_write_random(); else tlb_write_indexed(); -#else - tlbidx = read_c0_wired(); - write_c0_wired(tlbidx + 1); - write_c0_index(tlbidx); - mtc0_tlbw_hazard(); - tlb_write_indexed(); -#endif tlbw_use_hazard(); write_c0_entryhi(old_ctx); EXIT_CRITICAL(flags); @@ -177,24 +164,6 @@ void *kmap_coherent(struct page *page, unsigned long addr) void kunmap_coherent(void) { -#ifndef CONFIG_MIPS_MT_SMTC - unsigned int wired; - unsigned long flags, old_ctx; - - ENTER_CRITICAL(flags); - old_ctx = read_c0_entryhi(); - wired = read_c0_wired() - 1; - write_c0_wired(wired); - write_c0_index(wired); - write_c0_entryhi(UNIQUE_ENTRYHI(wired)); - write_c0_entrylo0(0); - write_c0_entrylo1(0); - mtc0_tlbw_hazard(); - tlb_write_indexed(); - tlbw_use_hazard(); - write_c0_entryhi(old_ctx); - EXIT_CRITICAL(flags); -#endif dec_preempt_count(); preempt_check_resched(); } @@ -260,7 +229,6 @@ void copy_from_user_page(struct vm_area_struct *vma, void __init fixrange_init(unsigned long start, unsigned long end, pgd_t *pgd_base) { -#if defined(CONFIG_HIGHMEM) || defined(CONFIG_MIPS_MT_SMTC) pgd_t *pgd; pud_t *pud; pmd_t *pmd; @@ -290,7 +258,6 @@ void __init fixrange_init(unsigned long start, unsigned long end, } j = 0; } -#endif } #ifndef CONFIG_NEED_MULTIPLE_NODES From cernekee@gmail.com Mon Sep 7 20:24:38 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 07 Sep 2009 20:24:46 +0200 (CEST) Received: from [65.98.92.6] ([65.98.92.6]:4175 "EHLO b32.net" rhost-flags-FAIL-FAIL-OK-OK) by ftp.linux-mips.org with ESMTP id S1493455AbZIGSYi (ORCPT ); Mon, 7 Sep 2009 20:24:38 +0200 Received: (qmail 30898 invoked from network); 7 Sep 2009 18:24:35 -0000 Received: from unknown (HELO two) (127.0.0.1) by 127.0.0.1 with SMTP; 7 Sep 2009 18:24:35 -0000 Received: by two (sSMTP sendmail emulation); Mon, 07 Sep 2009 11:24:35 -0700 From: Kevin Cernekee To: ralf@linux-mips.org Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org Date: Mon, 7 Sep 2009 11:11:31 -0700 Subject: [PATCHv2] MIPS: Machine check exception in kmap_coherent() Message-Id: <2c228c5e48509b7c8296a6c50af3ad73@localhost> In-Reply-To: <20090907102613.GA25295@linux-mips.org> References: <20090907102613.GA25295@linux-mips.org> User-Agent: vim 7.1 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 23992 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: cernekee@gmail.com Precedence: bulk X-list: linux-mips Create an extra set of fixmap entries for use in interrupt handlers. This prevents fixmap VA conflicts between copy_user_highpage() running in user context, and local_r4k_flush_cache_page() invoked from an SMP IPI. Signed-off-by: Kevin Cernekee --- arch/mips/include/asm/fixmap.h | 4 ++-- arch/mips/mm/init.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/mips/include/asm/fixmap.h b/arch/mips/include/asm/fixmap.h index 0f5caa1..dd924b9 100644 --- a/arch/mips/include/asm/fixmap.h +++ b/arch/mips/include/asm/fixmap.h @@ -48,9 +48,9 @@ enum fixed_addresses { #define FIX_N_COLOURS 8 FIX_CMAP_BEGIN, #ifdef CONFIG_MIPS_MT_SMTC - FIX_CMAP_END = FIX_CMAP_BEGIN + (FIX_N_COLOURS * NR_CPUS), + FIX_CMAP_END = FIX_CMAP_BEGIN + (FIX_N_COLOURS * NR_CPUS * 2), #else - FIX_CMAP_END = FIX_CMAP_BEGIN + FIX_N_COLOURS, + FIX_CMAP_END = FIX_CMAP_BEGIN + (FIX_N_COLOURS * 2), #endif #ifdef CONFIG_HIGHMEM /* reserved pte's for temporary kernel mappings */ diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 0e82050..43ebe65 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -132,7 +133,10 @@ void *kmap_coherent(struct page *page, unsigned long addr) inc_preempt_count(); idx = (addr >> PAGE_SHIFT) & (FIX_N_COLOURS - 1); #ifdef CONFIG_MIPS_MT_SMTC - idx += FIX_N_COLOURS * smp_processor_id(); + idx += FIX_N_COLOURS * smp_processor_id() + + (in_interrupt() ? (FIX_N_COLOURS * NR_CPUS) : 0); +#else + idx += in_interrupt() ? FIX_N_COLOURS : 0; #endif vaddr = __fix_to_virt(FIX_CMAP_END - idx); pte = mk_pte(page, PAGE_KERNEL); -- 1.6.3.1 From cernekee@gmail.com Mon Sep 7 20:28:16 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 07 Sep 2009 20:28:24 +0200 (CEST) Received: from mail-yx0-f176.google.com ([209.85.210.176]:58680 "EHLO mail-yx0-f176.google.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1493451AbZIGS2Q convert rfc822-to-8bit (ORCPT ); Mon, 7 Sep 2009 20:28:16 +0200 Received: by yxe6 with SMTP id 6so3284579yxe.22 for ; Mon, 07 Sep 2009 11:28:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=sozatdNewOWwECRibP9qaU47jH3DVLRnapILv5bPyv4=; b=JMMUxiduwuyIP/xXZWqjj36JXj5j9u4XcFTFxRlFeiqVibjDmOzL+j7vYl8t6Kxtvk KQwvmiBYtoFLmWit32XBQemKd+Te78IIBxCnQaStZlJscZspk1vsKdoHffhptwV02RD3 zpAQBLrJSTAuif6z70p7A8idPcI/40NmRA++0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=vjXXJMpY7DYcGb4oowmgSY6+bKBfMm2b8oXi8w/QWS+EK4a/8Re99/C5Xy/JC0214r q1P3jjxPCvNn16PjDFROluRT0ETnqthRKEDsm0nObSDRhz0RiFZ6xT//lGyPxZr9fXMb kO0W7kX+KZXCACC5dMq1zg6mi0iaM3ZCYTqo0= MIME-Version: 1.0 Received: by 10.150.1.12 with SMTP id 12mr23205352yba.148.1252348088601; Mon, 07 Sep 2009 11:28:08 -0700 (PDT) In-Reply-To: <20090907102613.GA25295@linux-mips.org> References: <197625223d8cb6ec3fc3e7da4501dd65@localhost> <20090907102613.GA25295@linux-mips.org> Date: Mon, 7 Sep 2009 11:28:05 -0700 Message-ID: <347733d50909071128v63b2d8a1hd6a87a361c14017e@mail.gmail.com> Subject: Re: [PATCH] MIPS: Machine check exception in kmap_coherent() From: Kevin Cernekee To: Ralf Baechle Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 23993 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: cernekee@gmail.com Precedence: bulk X-list: linux-mips On Mon, Sep 7, 2009 at 3:26 AM, Ralf Baechle wrote: > Too complicated. The fault is happening because the non-SMTC code is trying > to be terribly clever and pre-loading the TLB with a new wired entry. On > SMTC where multiple processors are sharing a single TLB are more careful > approach is needed so the code does a TLB probe and carefully and re-uses > an existing entry, if any. Which happens to be just what we need. > > So how about below - only compile tested - patch? That is an interesting idea. However, I am not sure we want the IPI ISR to overwrite copy_user_highpage()'s TLB entry. That means that when the interrupt returns, our coherent mapping will likely point to a different page. It will avoid the machine check exception, but it will potentially cause silent, intermittent data corruption instead. Taking another cue from the SMTC implementation, though - my v2 patch adds an extra set of fixmap addresses for the in_interrupt() case, avoiding the VA conflict entirely. What do you think? I tested this scheme on non-SMTC. I suspect that the same change is required for MT + MP cores like the 1004K, but probably not MT only cores like 34K which don't use cacheop IPIs. From muvarov@ru.mvista.com Tue Sep 8 18:17:06 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 08 Sep 2009 18:17:14 +0200 (CEST) Received: from ru.mvista.com ([213.79.90.228]:22052 "EHLO buildserver.ru.mvista.com" rhost-flags-OK-FAIL-OK-FAIL) by ftp.linux-mips.org with ESMTP id S1492691AbZIHQRG (ORCPT ); Tue, 8 Sep 2009 18:17:06 +0200 Received: from [192.168.11.243] (unknown [10.150.0.9]) by buildserver.ru.mvista.com (Postfix) with ESMTP id 11D568814; Tue, 8 Sep 2009 18:06:33 +0500 (SAMST) Message-ID: <4AA656D8.9040608@ru.mvista.com> Date: Tue, 08 Sep 2009 17:06:32 +0400 From: Maxim Uvarov User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: linux-mips@linux-mips.org Cc: ralf@linux-mips.org Subject: [MIPS] TLB handler fix for vmalloc'ed addresses Content-Type: multipart/mixed; boundary="------------060200050905030006090904" Return-Path: X-Envelope-To: <"|/home/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: 23994 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: muvarov@ru.mvista.com Precedence: bulk X-list: linux-mips This is a multi-part message in MIME format. --------------060200050905030006090904 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Patch is attached. Best regards, Maxim Uvarov. --------------060200050905030006090904 Content-Type: text/x-patch; name="mips_tlb_fixup.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="mips_tlb_fixup.patch" TLB exception handler incorrecly handles situation with wrong vmalloc'ed addresses. This patch adds verifications for vmalloc'ed addresses (similar to x86_64 implementation). So the code now traps inside do_page_fault() on access to the wrong area. Signed-off-by: Maxim Uvarov Test case: #include #include #include #include #include static struct task_struct *ts; static int example_thread(void *dummy) { void *ptr; ptr = vmalloc(16*1024*1024); for(;;) { msleep(100); } } static void run_vmalloc(void *unused) { ts=kthread_run(example_thread,NULL,"vtest"); } int init_module (void) { run_vmalloc(NULL); return 0; } void cleanup_module (void) { /*Nothing*/} Originally kernel trapped on BUG() inside exit_mmap() and it was impossible to see what has happened. After this patch applied, nice back trace will be generated: CPU 0 Unable to handle kernel paging request at virtual address c00000000036a148 Oops[#1]: Cpu 0 $ 0 : 0000000000000000 ffffffff81940000 0000000000000000 00000000ffff05a7 $ 4 : 0000000000000000 ffffffffffffffff ffffffff81a0b7d0 ffffffff811983e4 $ 8 : ffffffff817407b0 0000000000000000 0000000000000000 0000000000000000 $12 : a80000003374bfe0 0000000000008c00 ffffffff811e9df8 0000000000000000 $16 : ffffffff81164a68 a8000000352a3c50 c00000000036a0e8 0000000000000000 $20 : 0000000000000000 0000000000000000 0000000000000000 0000000000000000 $24 : 0000000000000002 a8000000337bb1a0 $28 : a800000033748000 a80000003374bf70 a80000003374bf70 c00000000036a148 Hi : 0000000000000000 Lo : 000000000000a311 epc : c00000000036a148 0xc00000000036a148 Tainted: P ra : c00000000036a148 0xc00000000036a148 <-- dead in kernel module vtest Status: 10008ce3 KX SX UX KERNEL EXL IE Cause : 00000008 BadVA : c00000000036a148 PrId : 000d0408 Modules linked in: Process vtest (pid: 723, threadinfo=a800000033748000, task=a800000034530340) Stack : 0000000000000000 a80000003374bf90 ffffffff81176530 ffffffff81176488 ffffffffffffffff ffffffffffffffff 0000000000000000 0000000000000000 0000000000000000 a80000003374bfd0 ffffffff81125024 0000000000000000 0000000000000000 0000000000000000 5a5a5a5a5a5a5a5a 5a5a5a5a5a5a5a5a 5a5a5a5a5a5a5a5a 5a5a5a5a5a5a5aa5 Call Trace: [] kthread+0x198/0x1f0 [] kthread+0xf0/0x1f0 [] kernel_thread_helper+0x14/0x20 Code: (Bad address in epc) Index: linux-2.6.21/arch/mips/mm/fault.c =================================================================== --- linux-2.6.21.orig/arch/mips/mm/fault.c +++ linux-2.6.21/arch/mips/mm/fault.c @@ -282,22 +282,32 @@ vmalloc_fault: pte_t *pte_k; pgd = (pgd_t *) pgd_current[raw_smp_processor_id()] + offset; - pgd_k = init_mm.pgd + offset; + pgd_k = pgd_offset_k(address); if (!pgd_present(*pgd_k)) goto no_context; - set_pgd(pgd, *pgd_k); + if (unlikely(!pgd_present(*pgd))) + set_pgd(pgd, *pgd_k); + else if (pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_k)) + goto no_context; pud = pud_offset(pgd, address); pud_k = pud_offset(pgd_k, address); if (!pud_present(*pud_k)) goto no_context; + if (pud_none(*pud) || + pud_page_vaddr(*pud) != pud_page_vaddr(*pud_k)) + goto no_context; pmd = pmd_offset(pud, address); pmd_k = pmd_offset(pud_k, address); if (!pmd_present(*pmd_k)) goto no_context; - set_pmd(pmd, *pmd_k); + if (!pmd_present(*pmd)) + set_pmd(pmd, *pmd_k); + else + if (pmd_page(*pmd) != pmd_page(*pmd_k)) + goto no_context; pte_k = pte_offset_kernel(pmd_k, address); if (!pte_present(*pte_k)) --------------060200050905030006090904-- From David.Daney@caviumnetworks.com Wed Sep 9 17:36:41 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 09 Sep 2009 17:36:47 +0200 (CEST) Received: from mail3.caviumnetworks.com ([12.108.191.235]:16297 "EHLO mail3.caviumnetworks.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1493128AbZIIPgl (ORCPT ); Wed, 9 Sep 2009 17:36:41 +0200 Received: from caexch01.caveonetworks.com (Not Verified[192.168.16.9]) by mail3.caviumnetworks.com with MailMarshal (v6,2,2,3503) id ; Wed, 09 Sep 2009 11:35:25 -0400 Received: from caexch01.caveonetworks.com ([192.168.16.9]) by caexch01.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 9 Sep 2009 08:35:26 -0700 Received: from dd1.caveonetworks.com ([12.108.191.236]) by caexch01.caveonetworks.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 9 Sep 2009 08:35:26 -0700 Message-ID: <4AA7CB3E.1080807@caviumnetworks.com> Date: Wed, 09 Sep 2009 08:35:26 -0700 From: David Daney User-Agent: Thunderbird 2.0.0.21 (X11/20090320) MIME-Version: 1.0 To: Wu Fei CC: Ralf Baechle , linux-mips@linux-mips.org Subject: Re: [PATCH] cleanup vmalloc_fault for 64bit kernel References: <20090831132811.GA6924@desktop> In-Reply-To: <20090831132811.GA6924@desktop> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 09 Sep 2009 15:35:26.0743 (UTC) FILETIME=[277BD270:01CA3163] Return-Path: X-Envelope-To: <"|/home/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: 23995 X-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 Wu Fei wrote: > 64bit kernel won't arrive vmalloc_fault, it's not necessary or possible > to copy the page table from init_mm.pgd. swapper_pg_dir, module_pg_dir > and the process's pgd represent the different virtual address area, and > the tlb exception handler accesses the suitable one directly. > > Signed-off-by: Wu Fei > --- > arch/mips/mm/fault.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c > index f956ecb..e769789 100644 > --- a/arch/mips/mm/fault.c > +++ b/arch/mips/mm/fault.c > @@ -58,11 +58,9 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write, > * only copy the information from the master page table, > * nothing more. > */ > +#ifdef CONFIG_32BIT > if (unlikely(address >= VMALLOC_START && address <= VMALLOC_END)) > goto vmalloc_fault; > -#ifdef MODULE_START > - if (unlikely(address >= MODULE_START && address < MODULE_END)) > - goto vmalloc_fault; > #endif > That is not correct. You can still arrive at do_page_fault() from faults in the vmalloc range. We need to go directly to the panic code as I did in my patch: Message-Id: <1251931654-21268-1-git-send-email-ddaney@caviumnetworks.com> AKA: [PATCH] MIPS: Don't corrupt page tables on vmalloc fault. > /* > @@ -203,6 +201,7 @@ do_sigbus: > force_sig_info(SIGBUS, &info, tsk); > > return; > +#ifdef CONFIG_32BIT > vmalloc_fault: > { > /* > @@ -241,4 +240,5 @@ vmalloc_fault: > goto no_context; > return; > } > +#endif > } From David.Daney@caviumnetworks.com Wed Sep 9 20:18:18 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 09 Sep 2009 20:18:25 +0200 (CEST) Received: from mail3.caviumnetworks.com ([12.108.191.235]:2857 "EHLO mail3.caviumnetworks.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1492698AbZIISSR (ORCPT ); Wed, 9 Sep 2009 20:18:17 +0200 Received: from caexch01.caveonetworks.com (Not Verified[192.168.16.9]) by mail3.caviumnetworks.com with MailMarshal (v6,2,2,3503) id ; Wed, 09 Sep 2009 14:17:19 -0400 Received: from caexch01.caveonetworks.com ([192.168.16.9]) by caexch01.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 9 Sep 2009 11:17:23 -0700 Received: from dd1.caveonetworks.com ([12.108.191.236]) by caexch01.caveonetworks.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 9 Sep 2009 11:17:23 -0700 Message-ID: <4AA7F133.20104@caviumnetworks.com> Date: Wed, 09 Sep 2009 11:17:23 -0700 From: David Daney User-Agent: Thunderbird 2.0.0.21 (X11/20090320) MIME-Version: 1.0 To: Dok Sander CC: linux-kernel@vger.kernel.org, linux-mips Subject: Re: io.h doesn't get installed by target "headers_install" for mips References: <806810.23677.qm@web59313.mail.re1.yahoo.com> In-Reply-To: <806810.23677.qm@web59313.mail.re1.yahoo.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 09 Sep 2009 18:17:23.0636 (UTC) FILETIME=[C7340740:01CA3179] Return-Path: X-Envelope-To: <"|/home/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: 23996 X-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 Dok Sander wrote: > Hi, > > I noticed the absence of the header io.h while trying to build(cross-compile, host i686-pc-linux-gnu) a software(lm-sensors-3.1.1, wants io.h in /sys) for mips. I can find io.h for mips in arch/mips/asm/include/{,sn/} However, io.h doesn't get installed when i do "make ARCH=mips headers_install" on linux 2.6.30.6 > > According to someone on the eglibc mailing list, linux should provide io.h for mips. Is this true? > I don't think so (for two reasons): 1) The things in /usr/include/sys are provided by libc not the kernel. 2) MIPS doesn't have I/O ports, so all the functions in sys/io.h on an x86 are undefined for MIPS. David Daney From w.sang@pengutronix.de Wed Sep 9 23:23:53 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 09 Sep 2009 23:23:59 +0200 (CEST) Received: from metis.ext.pengutronix.de ([92.198.50.35]:41251 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1493463AbZIIVXx (ORCPT ); Wed, 9 Sep 2009 23:23:53 +0200 Received: from themisto.ext.pengutronix.de ([92.198.50.58] helo=pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.63) (envelope-from ) id 1MlUdc-00008N-Bh; Wed, 09 Sep 2009 23:23:41 +0200 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: linuxppc-dev@ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org, uclinux-dist-devel@blackfin.uclinux.org Date: Wed, 9 Sep 2009 23:22:47 +0200 Message-Id: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> X-Mailer: git-send-email 1.6.3.3 X-SA-Exim-Connect-IP: 92.198.50.58 X-SA-Exim-Mail-From: w.sang@pengutronix.de Subject: Removing deprecated drivers from drivers/i2c/chips X-SA-Exim-Version: 4.2.1 (built Tue, 09 Jan 2007 17:23:22 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) X-PTX-Original-Recipient: linux-mips@linux-mips.org Return-Path: X-Envelope-To: <"|/home/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: 23997 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: w.sang@pengutronix.de Precedence: bulk X-list: linux-mips Hi, continuing the quest to clean up and ultimately remove the drivers/i2c/chips directory, this patch series removes three drivers for GPIO-expanders which are obsoleted and marked as deprecated for more than a year. The newer (and better) drivers can be found in drivers/gpio. As it is ensured that the newer drivers cover the same i2c_device_ids, all platform_devices will still match. Some defconfig updates may be necessary though, but according to [1] this is left to the arch|platform-maintainers (also as most defconfigs are quite outdated). For that reason, I put the relevant arch-mailing-lists to Cc. Comments are welcome. Regards, Wolfram [1] http://lkml.org/lkml/2009/5/7/34 From w.sang@pengutronix.de Wed Sep 9 23:24:17 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 09 Sep 2009 23:24:24 +0200 (CEST) Received: from metis.ext.pengutronix.de ([92.198.50.35]:41259 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1493465AbZIIVX4 (ORCPT ); Wed, 9 Sep 2009 23:23:56 +0200 Received: from themisto.ext.pengutronix.de ([92.198.50.58] helo=pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.63) (envelope-from ) id 1MlUdj-00008g-3r; Wed, 09 Sep 2009 23:23:46 +0200 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: linuxppc-dev@ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org, uclinux-dist-devel@blackfin.uclinux.org, Wolfram Sang , David Brownell , Jean Delvare Date: Wed, 9 Sep 2009 23:22:48 +0200 Message-Id: <1252531371-14866-2-git-send-email-w.sang@pengutronix.de> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> References: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> X-SA-Exim-Connect-IP: 92.198.50.58 X-SA-Exim-Mail-From: w.sang@pengutronix.de Subject: [PATCH 1/4] gpio/pcf857x: copy i2c_device_id from old pcf8574-driver X-SA-Exim-Version: 4.2.1 (built Tue, 09 Jan 2007 17:23:22 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) X-PTX-Original-Recipient: linux-mips@linux-mips.org Return-Path: X-Envelope-To: <"|/home/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: 23998 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: w.sang@pengutronix.de Precedence: bulk X-list: linux-mips The deprecated pcf8574 driver is going to be removed. Make sure this replacement-driver inherits all i2c_device_ids for a smooth transition. Signed-off-by: Wolfram Sang Cc: David Brownell Cc: Jean Delvare --- drivers/gpio/pcf857x.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/gpio/pcf857x.c b/drivers/gpio/pcf857x.c index 9525724..3f1ec1e 100644 --- a/drivers/gpio/pcf857x.c +++ b/drivers/gpio/pcf857x.c @@ -28,6 +28,7 @@ static const struct i2c_device_id pcf857x_id[] = { { "pcf8574", 8 }, + { "pcf8574a", 8 }, { "pca8574", 8 }, { "pca9670", 8 }, { "pca9672", 8 }, -- 1.6.3.3 From w.sang@pengutronix.de Wed Sep 9 23:24:41 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 09 Sep 2009 23:24:47 +0200 (CEST) Received: from metis.ext.pengutronix.de ([92.198.50.35]:41273 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1493470AbZIIVYE (ORCPT ); Wed, 9 Sep 2009 23:24:04 +0200 Received: from themisto.ext.pengutronix.de ([92.198.50.58] helo=pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.63) (envelope-from ) id 1MlUdn-00008w-CC; Wed, 09 Sep 2009 23:23:51 +0200 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: linuxppc-dev@ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org, uclinux-dist-devel@blackfin.uclinux.org, Wolfram Sang , Bart Van Assche , Jean Delvare Date: Wed, 9 Sep 2009 23:22:49 +0200 Message-Id: <1252531371-14866-3-git-send-email-w.sang@pengutronix.de> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> References: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> X-SA-Exim-Connect-IP: 92.198.50.58 X-SA-Exim-Mail-From: w.sang@pengutronix.de Subject: [PATCH 2/4] i2c/chips: Remove deprecated pcf8575-driver X-SA-Exim-Version: 4.2.1 (built Tue, 09 Jan 2007 17:23:22 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) X-PTX-Original-Recipient: linux-mips@linux-mips.org Return-Path: X-Envelope-To: <"|/home/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: 23999 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: w.sang@pengutronix.de Precedence: bulk X-list: linux-mips The pcf8575-driver in drivers/i2c/chips which just exports its register to sysfs is superseeded by drivers/gpio/pcf857x.c which properly uses the gpiolib. As this driver has been deprecated for more than a year, finally remove it. Signed-off-by: Wolfram Sang Cc: Bart Van Assche Cc: Jean Delvare --- Documentation/i2c/chips/pcf8575 | 69 -------------- drivers/i2c/chips/Kconfig | 18 ---- drivers/i2c/chips/Makefile | 1 - drivers/i2c/chips/pcf8575.c | 198 --------------------------------------- 4 files changed, 0 insertions(+), 286 deletions(-) delete mode 100644 Documentation/i2c/chips/pcf8575 delete mode 100644 drivers/i2c/chips/pcf8575.c diff --git a/Documentation/i2c/chips/pcf8575 b/Documentation/i2c/chips/pcf8575 deleted file mode 100644 index 40b268e..0000000 --- a/Documentation/i2c/chips/pcf8575 +++ /dev/null @@ -1,69 +0,0 @@ -About the PCF8575 chip and the pcf8575 kernel driver -==================================================== - -The PCF8575 chip is produced by the following manufacturers: - - * Philips NXP - http://www.nxp.com/#/pip/cb=[type=product,path=50807/41735/41850,final=PCF8575_3]|pip=[pip=PCF8575_3][0] - - * Texas Instruments - http://focus.ti.com/docs/prod/folders/print/pcf8575.html - - -Some vendors sell small PCB's with the PCF8575 mounted on it. You can connect -such a board to a Linux host via e.g. an USB to I2C interface. Examples of -PCB boards with a PCF8575: - - * SFE Breakout Board for PCF8575 I2C Expander by RobotShop - http://www.robotshop.ca/home/products/robot-parts/electronics/adapters-converters/sfe-pcf8575-i2c-expander-board.html - - * Breakout Board for PCF8575 I2C Expander by Spark Fun Electronics - http://www.sparkfun.com/commerce/product_info.php?products_id=8130 - - -Description ------------ -The PCF8575 chip is a 16-bit I/O expander for the I2C bus. Up to eight of -these chips can be connected to the same I2C bus. You can find this -chip on some custom designed hardware, but you won't find it on PC -motherboards. - -The PCF8575 chip consists of a 16-bit quasi-bidirectional port and an I2C-bus -interface. Each of the sixteen I/O's can be independently used as an input or -an output. To set up an I/O pin as an input, you have to write a 1 to the -corresponding output. - -For more information please see the datasheet. - - -Detection ---------- - -There is no method known to detect whether a chip on a given I2C address is -a PCF8575 or whether it is any other I2C device, so you have to pass the I2C -bus and address of the installed PCF8575 devices explicitly to the driver at -load time via the force=... parameter. - -/sys interface --------------- - -For each address on which a PCF8575 chip was found or forced the following -files will be created under /sys: -* /sys/bus/i2c/devices/-

/read -* /sys/bus/i2c/devices/-

/write -where bus is the I2C bus number (0, 1, ...) and address is the four-digit -hexadecimal representation of the 7-bit I2C address of the PCF8575 -(0020 .. 0027). - -The read file is read-only. Reading it will trigger an I2C read and will hence -report the current input state for the pins configured as inputs, and the -current output value for the pins configured as outputs. - -The write file is read-write. Writing a value to it will configure all pins -as output for which the corresponding bit is zero. Reading the write file will -return the value last written, or -EAGAIN if no value has yet been written to -the write file. - -On module initialization the configuration of the chip is not changed -- the -chip is left in the state it was already configured in through either power-up -or through previous I2C write actions. diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig index 02d746c..1b5455e 100644 --- a/drivers/i2c/chips/Kconfig +++ b/drivers/i2c/chips/Kconfig @@ -33,24 +33,6 @@ config SENSORS_PCF8574 These devices are hard to detect and rarely found on mainstream hardware. If unsure, say N. -config PCF8575 - tristate "Philips PCF8575 (DEPRECATED)" - default n - depends on GPIO_PCF857X = "n" - help - If you say yes here you get support for Philips PCF8575 chip. - This chip is a 16-bit I/O expander for the I2C bus. Several other - chip manufacturers sell equivalent chips, e.g. Texas Instruments. - - This driver can also be built as a module. If so, the module - will be called pcf8575. - - This driver is deprecated and will be dropped soon. Use - drivers/gpio/pcf857x.c instead. - - This device is hard to detect and is rarely found on mainstream - hardware. If unsure, say N. - config SENSORS_PCA9539 tristate "Philips PCA9539 16-bit I/O port (DEPRECATED)" depends on EXPERIMENTAL && GPIO_PCA953X = "n" diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile index f4680d1..fceb377 100644 --- a/drivers/i2c/chips/Makefile +++ b/drivers/i2c/chips/Makefile @@ -13,7 +13,6 @@ obj-$(CONFIG_DS1682) += ds1682.o obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o -obj-$(CONFIG_PCF8575) += pcf8575.o obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) diff --git a/drivers/i2c/chips/pcf8575.c b/drivers/i2c/chips/pcf8575.c deleted file mode 100644 index 07fd7cb..0000000 --- a/drivers/i2c/chips/pcf8575.c +++ /dev/null @@ -1,198 +0,0 @@ -/* - pcf8575.c - - About the PCF8575 chip: the PCF8575 is a 16-bit I/O expander for the I2C bus - produced by a.o. Philips Semiconductors. - - Copyright (C) 2006 Michael Hennerich, Analog Devices Inc. - - Based on pcf8574.c. - - Copyright (c) 2007 Bart Van Assche . - Ported this driver from ucLinux to the mainstream Linux kernel. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#include -#include -#include -#include /* kzalloc() */ -#include /* sysfs_create_group() */ - -/* Addresses to scan: none, device can't be detected */ -static const unsigned short normal_i2c[] = { I2C_CLIENT_END }; - -/* Insmod parameters */ -I2C_CLIENT_INSMOD; - - -/* Each client has this additional data */ -struct pcf8575_data { - int write; /* last written value, or error code */ -}; - -/* following are the sysfs callback functions */ -static ssize_t show_read(struct device *dev, struct device_attribute *attr, - char *buf) -{ - struct i2c_client *client = to_i2c_client(dev); - u16 val; - u8 iopin_state[2]; - - i2c_master_recv(client, iopin_state, 2); - - val = iopin_state[0]; - val |= iopin_state[1] << 8; - - return sprintf(buf, "%u\n", val); -} - -static DEVICE_ATTR(read, S_IRUGO, show_read, NULL); - -static ssize_t show_write(struct device *dev, struct device_attribute *attr, - char *buf) -{ - struct pcf8575_data *data = dev_get_drvdata(dev); - if (data->write < 0) - return data->write; - return sprintf(buf, "%d\n", data->write); -} - -static ssize_t set_write(struct device *dev, struct device_attribute *attr, - const char *buf, size_t count) -{ - struct i2c_client *client = to_i2c_client(dev); - struct pcf8575_data *data = i2c_get_clientdata(client); - unsigned long val = simple_strtoul(buf, NULL, 10); - u8 iopin_state[2]; - - if (val > 0xffff) - return -EINVAL; - - data->write = val; - - iopin_state[0] = val & 0xFF; - iopin_state[1] = val >> 8; - - i2c_master_send(client, iopin_state, 2); - - return count; -} - -static DEVICE_ATTR(write, S_IWUSR | S_IRUGO, show_write, set_write); - -static struct attribute *pcf8575_attributes[] = { - &dev_attr_read.attr, - &dev_attr_write.attr, - NULL -}; - -static const struct attribute_group pcf8575_attr_group = { - .attrs = pcf8575_attributes, -}; - -/* - * Real code - */ - -/* Return 0 if detection is successful, -ENODEV otherwise */ -static int pcf8575_detect(struct i2c_client *client, int kind, - struct i2c_board_info *info) -{ - struct i2c_adapter *adapter = client->adapter; - - if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) - return -ENODEV; - - /* This is the place to detect whether the chip at the specified - address really is a PCF8575 chip. However, there is no method known - to detect whether an I2C chip is a PCF8575 or any other I2C chip. */ - - strlcpy(info->type, "pcf8575", I2C_NAME_SIZE); - - return 0; -} - -static int pcf8575_probe(struct i2c_client *client, - const struct i2c_device_id *id) -{ - struct pcf8575_data *data; - int err; - - data = kzalloc(sizeof(struct pcf8575_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto exit; - } - - i2c_set_clientdata(client, data); - data->write = -EAGAIN; - - /* Register sysfs hooks */ - err = sysfs_create_group(&client->dev.kobj, &pcf8575_attr_group); - if (err) - goto exit_free; - - return 0; - -exit_free: - kfree(data); -exit: - return err; -} - -static int pcf8575_remove(struct i2c_client *client) -{ - sysfs_remove_group(&client->dev.kobj, &pcf8575_attr_group); - kfree(i2c_get_clientdata(client)); - return 0; -} - -static const struct i2c_device_id pcf8575_id[] = { - { "pcf8575", 0 }, - { } -}; - -static struct i2c_driver pcf8575_driver = { - .driver = { - .owner = THIS_MODULE, - .name = "pcf8575", - }, - .probe = pcf8575_probe, - .remove = pcf8575_remove, - .id_table = pcf8575_id, - - .detect = pcf8575_detect, - .address_data = &addr_data, -}; - -static int __init pcf8575_init(void) -{ - return i2c_add_driver(&pcf8575_driver); -} - -static void __exit pcf8575_exit(void) -{ - i2c_del_driver(&pcf8575_driver); -} - -MODULE_AUTHOR("Michael Hennerich , " - "Bart Van Assche "); -MODULE_DESCRIPTION("pcf8575 driver"); -MODULE_LICENSE("GPL"); - -module_init(pcf8575_init); -module_exit(pcf8575_exit); -- 1.6.3.3 From w.sang@pengutronix.de Wed Sep 9 23:25:05 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 09 Sep 2009 23:25:11 +0200 (CEST) Received: from metis.ext.pengutronix.de ([92.198.50.35]:41293 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1493471AbZIIVYK (ORCPT ); Wed, 9 Sep 2009 23:24:10 +0200 Received: from themisto.ext.pengutronix.de ([92.198.50.58] helo=pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.63) (envelope-from ) id 1MlUds-00009L-Gw; Wed, 09 Sep 2009 23:23:58 +0200 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: linuxppc-dev@ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org, uclinux-dist-devel@blackfin.uclinux.org, Wolfram Sang , Ben Gardner , Jean Delvare Date: Wed, 9 Sep 2009 23:22:50 +0200 Message-Id: <1252531371-14866-4-git-send-email-w.sang@pengutronix.de> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> References: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> X-SA-Exim-Connect-IP: 92.198.50.58 X-SA-Exim-Mail-From: w.sang@pengutronix.de Subject: [PATCH 3/4] i2c/chips: Remove deprecated pca9539-driver X-SA-Exim-Version: 4.2.1 (built Tue, 09 Jan 2007 17:23:22 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) X-PTX-Original-Recipient: linux-mips@linux-mips.org Return-Path: X-Envelope-To: <"|/home/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: 24000 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: w.sang@pengutronix.de Precedence: bulk X-list: linux-mips The pca9539-driver in drivers/i2c/chips which just exports its registers to sysfs is superseeded by drivers/gpio/pca953x.c which properly uses the gpiolib. As this driver has been deprecated for more than a year, finally remove it. Signed-off-by: Wolfram Sang Cc: Ben Gardner Cc: Jean Delvare --- Documentation/i2c/chips/pca9539 | 58 --------------- drivers/i2c/chips/Kconfig | 13 ---- drivers/i2c/chips/Makefile | 1 - drivers/i2c/chips/pca9539.c | 152 --------------------------------------- 4 files changed, 0 insertions(+), 224 deletions(-) delete mode 100644 Documentation/i2c/chips/pca9539 delete mode 100644 drivers/i2c/chips/pca9539.c diff --git a/Documentation/i2c/chips/pca9539 b/Documentation/i2c/chips/pca9539 deleted file mode 100644 index 6aff890..0000000 --- a/Documentation/i2c/chips/pca9539 +++ /dev/null @@ -1,58 +0,0 @@ -Kernel driver pca9539 -===================== - -NOTE: this driver is deprecated and will be dropped soon, use -drivers/gpio/pca9539.c instead. - -Supported chips: - * Philips PCA9539 - Prefix: 'pca9539' - Addresses scanned: none - Datasheet: - http://www.semiconductors.philips.com/acrobat/datasheets/PCA9539_2.pdf - -Author: Ben Gardner - - -Description ------------ - -The Philips PCA9539 is a 16 bit low power I/O device. -All 16 lines can be individually configured as an input or output. -The input sense can also be inverted. -The 16 lines are split between two bytes. - - -Detection ---------- - -The PCA9539 is difficult to detect and not commonly found in PC machines, -so you have to pass the I2C bus and address of the installed PCA9539 -devices explicitly to the driver at load time via the force=... parameter. - - -Sysfs entries -------------- - -Each is a byte that maps to the 8 I/O bits. -A '0' suffix is for bits 0-7, while '1' is for bits 8-15. - -input[01] - read the current value -output[01] - sets the output value -direction[01] - direction of each bit: 1=input, 0=output -invert[01] - toggle the input bit sense - -input reads the actual state of the line and is always available. -The direction defaults to input for all channels. - - -General Remarks ---------------- - -Note that each output, direction, and invert entry controls 8 lines. -You should use the read, modify, write sequence. -For example. to set output bit 0 of 1. - val=$(cat output0) - val=$(( $val | 1 )) - echo $val > output0 - diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig index 1b5455e..8cd1a7f 100644 --- a/drivers/i2c/chips/Kconfig +++ b/drivers/i2c/chips/Kconfig @@ -33,19 +33,6 @@ config SENSORS_PCF8574 These devices are hard to detect and rarely found on mainstream hardware. If unsure, say N. -config SENSORS_PCA9539 - tristate "Philips PCA9539 16-bit I/O port (DEPRECATED)" - depends on EXPERIMENTAL && GPIO_PCA953X = "n" - help - If you say yes here you get support for the Philips PCA9539 - 16-bit I/O port. - - This driver can also be built as a module. If so, the module - will be called pca9539. - - This driver is deprecated and will be dropped soon. Use - drivers/gpio/pca953x.c instead. - config SENSORS_TSL2550 tristate "Taos TSL2550 ambient light sensor" depends on EXPERIMENTAL diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile index fceb377..8cd778d 100644 --- a/drivers/i2c/chips/Makefile +++ b/drivers/i2c/chips/Makefile @@ -11,7 +11,6 @@ # obj-$(CONFIG_DS1682) += ds1682.o -obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o diff --git a/drivers/i2c/chips/pca9539.c b/drivers/i2c/chips/pca9539.c deleted file mode 100644 index 270de4e..0000000 --- a/drivers/i2c/chips/pca9539.c +++ /dev/null @@ -1,152 +0,0 @@ -/* - pca9539.c - 16-bit I/O port with interrupt and reset - - Copyright (C) 2005 Ben Gardner - - 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; version 2 of the License. -*/ - -#include -#include -#include -#include -#include - -/* Addresses to scan: none, device is not autodetected */ -static const unsigned short normal_i2c[] = { I2C_CLIENT_END }; - -/* Insmod parameters */ -I2C_CLIENT_INSMOD_1(pca9539); - -enum pca9539_cmd -{ - PCA9539_INPUT_0 = 0, - PCA9539_INPUT_1 = 1, - PCA9539_OUTPUT_0 = 2, - PCA9539_OUTPUT_1 = 3, - PCA9539_INVERT_0 = 4, - PCA9539_INVERT_1 = 5, - PCA9539_DIRECTION_0 = 6, - PCA9539_DIRECTION_1 = 7, -}; - -/* following are the sysfs callback functions */ -static ssize_t pca9539_show(struct device *dev, struct device_attribute *attr, - char *buf) -{ - struct sensor_device_attribute *psa = to_sensor_dev_attr(attr); - struct i2c_client *client = to_i2c_client(dev); - return sprintf(buf, "%d\n", i2c_smbus_read_byte_data(client, - psa->index)); -} - -static ssize_t pca9539_store(struct device *dev, struct device_attribute *attr, - const char *buf, size_t count) -{ - struct sensor_device_attribute *psa = to_sensor_dev_attr(attr); - struct i2c_client *client = to_i2c_client(dev); - unsigned long val = simple_strtoul(buf, NULL, 0); - if (val > 0xff) - return -EINVAL; - i2c_smbus_write_byte_data(client, psa->index, val); - return count; -} - -/* Define the device attributes */ - -#define PCA9539_ENTRY_RO(name, cmd_idx) \ - static SENSOR_DEVICE_ATTR(name, S_IRUGO, pca9539_show, NULL, cmd_idx) - -#define PCA9539_ENTRY_RW(name, cmd_idx) \ - static SENSOR_DEVICE_ATTR(name, S_IRUGO | S_IWUSR, pca9539_show, \ - pca9539_store, cmd_idx) - -PCA9539_ENTRY_RO(input0, PCA9539_INPUT_0); -PCA9539_ENTRY_RO(input1, PCA9539_INPUT_1); -PCA9539_ENTRY_RW(output0, PCA9539_OUTPUT_0); -PCA9539_ENTRY_RW(output1, PCA9539_OUTPUT_1); -PCA9539_ENTRY_RW(invert0, PCA9539_INVERT_0); -PCA9539_ENTRY_RW(invert1, PCA9539_INVERT_1); -PCA9539_ENTRY_RW(direction0, PCA9539_DIRECTION_0); -PCA9539_ENTRY_RW(direction1, PCA9539_DIRECTION_1); - -static struct attribute *pca9539_attributes[] = { - &sensor_dev_attr_input0.dev_attr.attr, - &sensor_dev_attr_input1.dev_attr.attr, - &sensor_dev_attr_output0.dev_attr.attr, - &sensor_dev_attr_output1.dev_attr.attr, - &sensor_dev_attr_invert0.dev_attr.attr, - &sensor_dev_attr_invert1.dev_attr.attr, - &sensor_dev_attr_direction0.dev_attr.attr, - &sensor_dev_attr_direction1.dev_attr.attr, - NULL -}; - -static struct attribute_group pca9539_defattr_group = { - .attrs = pca9539_attributes, -}; - -/* Return 0 if detection is successful, -ENODEV otherwise */ -static int pca9539_detect(struct i2c_client *client, int kind, - struct i2c_board_info *info) -{ - struct i2c_adapter *adapter = client->adapter; - - if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) - return -ENODEV; - - strlcpy(info->type, "pca9539", I2C_NAME_SIZE); - - return 0; -} - -static int pca9539_probe(struct i2c_client *client, - const struct i2c_device_id *id) -{ - /* Register sysfs hooks */ - return sysfs_create_group(&client->dev.kobj, - &pca9539_defattr_group); -} - -static int pca9539_remove(struct i2c_client *client) -{ - sysfs_remove_group(&client->dev.kobj, &pca9539_defattr_group); - return 0; -} - -static const struct i2c_device_id pca9539_id[] = { - { "pca9539", 0 }, - { } -}; - -static struct i2c_driver pca9539_driver = { - .driver = { - .name = "pca9539", - }, - .probe = pca9539_probe, - .remove = pca9539_remove, - .id_table = pca9539_id, - - .detect = pca9539_detect, - .address_data = &addr_data, -}; - -static int __init pca9539_init(void) -{ - return i2c_add_driver(&pca9539_driver); -} - -static void __exit pca9539_exit(void) -{ - i2c_del_driver(&pca9539_driver); -} - -MODULE_AUTHOR("Ben Gardner "); -MODULE_DESCRIPTION("PCA9539 driver"); -MODULE_LICENSE("GPL"); - -module_init(pca9539_init); -module_exit(pca9539_exit); - -- 1.6.3.3 From w.sang@pengutronix.de Wed Sep 9 23:25:29 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 09 Sep 2009 23:25:36 +0200 (CEST) Received: from metis.ext.pengutronix.de ([92.198.50.35]:41307 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1493472AbZIIVYO (ORCPT ); Wed, 9 Sep 2009 23:24:14 +0200 Received: from themisto.ext.pengutronix.de ([92.198.50.58] helo=pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.63) (envelope-from ) id 1MlUdz-00009p-RC; Wed, 09 Sep 2009 23:24:03 +0200 From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: linuxppc-dev@ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org, uclinux-dist-devel@blackfin.uclinux.org, Wolfram Sang , Aurelien Jarno , Jean Delvare Date: Wed, 9 Sep 2009 23:22:51 +0200 Message-Id: <1252531371-14866-5-git-send-email-w.sang@pengutronix.de> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> References: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> X-SA-Exim-Connect-IP: 92.198.50.58 X-SA-Exim-Mail-From: w.sang@pengutronix.de Subject: [PATCH 4/4] i2c/chips: Remove deprecated pcf8574-driver X-SA-Exim-Version: 4.2.1 (built Tue, 09 Jan 2007 17:23:22 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) X-PTX-Original-Recipient: linux-mips@linux-mips.org Return-Path: X-Envelope-To: <"|/home/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: 24001 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: w.sang@pengutronix.de Precedence: bulk X-list: linux-mips The pcf8574-driver in drivers/i2c/chips which just exports its register to sysfs is superseeded by drivers/gpio/pcf857x.c which properly uses the gpiolib. As this driver has been deprecated for more than a year, finally remove it. Signed-off-by: Wolfram Sang Cc: Aurelien Jarno Cc: Jean Delvare --- Documentation/i2c/chips/pcf8574 | 65 ------------ drivers/i2c/chips/Kconfig | 17 --- drivers/i2c/chips/Makefile | 1 - drivers/i2c/chips/pcf8574.c | 215 --------------------------------------- 4 files changed, 0 insertions(+), 298 deletions(-) delete mode 100644 Documentation/i2c/chips/pcf8574 delete mode 100644 drivers/i2c/chips/pcf8574.c diff --git a/Documentation/i2c/chips/pcf8574 b/Documentation/i2c/chips/pcf8574 deleted file mode 100644 index 235815c..0000000 --- a/Documentation/i2c/chips/pcf8574 +++ /dev/null @@ -1,65 +0,0 @@ -Kernel driver pcf8574 -===================== - -Supported chips: - * Philips PCF8574 - Prefix: 'pcf8574' - Addresses scanned: none - Datasheet: Publicly available at the Philips Semiconductors website - http://www.semiconductors.philips.com/pip/PCF8574P.html - - * Philips PCF8574A - Prefix: 'pcf8574a' - Addresses scanned: none - Datasheet: Publicly available at the Philips Semiconductors website - http://www.semiconductors.philips.com/pip/PCF8574P.html - -Authors: - Frodo Looijaard , - Philip Edelbrock , - Dan Eaton , - Aurelien Jarno , - Jean Delvare , - - -Description ------------ -The PCF8574(A) is an 8-bit I/O expander for the I2C bus produced by Philips -Semiconductors. It is designed to provide a byte I2C interface to up to 16 -separate devices (8 x PCF8574 and 8 x PCF8574A). - -This device consists of a quasi-bidirectional port. Each of the eight I/Os -can be independently used as an input or output. To setup an I/O as an -input, you have to write a 1 to the corresponding output. - -For more informations see the datasheet. - - -Accessing PCF8574(A) via /sys interface -------------------------------------- - -The PCF8574(A) is plainly impossible to detect ! Stupid chip. -So, you have to pass the I2C bus and address of the installed PCF857A -and PCF8574A devices explicitly to the driver at load time via the -force=... parameter. - -On detection (i.e. insmod, modprobe et al.), directories are being -created for each detected PCF8574(A): - -/sys/bus/i2c/devices/<0>-<1>/ -where <0> is the bus the chip was detected on (e. g. i2c-0) -and <1> the chip address ([20..27] or [38..3f]): - -(example: /sys/bus/i2c/devices/1-0020/) - -Inside these directories, there are two files each: -read and write (and one file with chip name). - -The read file is read-only. Reading gives you the current I/O input -if the corresponding output is set as 1, otherwise the current output -value, that is to say 0. - -The write file is read/write. Writing a value outputs it on the I/O -port. Reading returns the last written value. As it is not possible -to read this value from the chip, you need to write at least once to -this file before you can read back from it. diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig index 8cd1a7f..f9618f4 100644 --- a/drivers/i2c/chips/Kconfig +++ b/drivers/i2c/chips/Kconfig @@ -16,23 +16,6 @@ config DS1682 This driver can also be built as a module. If so, the module will be called ds1682. -config SENSORS_PCF8574 - tristate "Philips PCF8574 and PCF8574A (DEPRECATED)" - depends on EXPERIMENTAL && GPIO_PCF857X = "n" - default n - help - If you say yes here you get support for Philips PCF8574 and - PCF8574A chips. These chips are 8-bit I/O expanders for the I2C bus. - - This driver can also be built as a module. If so, the module - will be called pcf8574. - - This driver is deprecated and will be dropped soon. Use - drivers/gpio/pcf857x.c instead. - - These devices are hard to detect and rarely found on mainstream - hardware. If unsure, say N. - config SENSORS_TSL2550 tristate "Taos TSL2550 ambient light sensor" depends on EXPERIMENTAL diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile index 8cd778d..749cf36 100644 --- a/drivers/i2c/chips/Makefile +++ b/drivers/i2c/chips/Makefile @@ -11,7 +11,6 @@ # obj-$(CONFIG_DS1682) += ds1682.o -obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) diff --git a/drivers/i2c/chips/pcf8574.c b/drivers/i2c/chips/pcf8574.c deleted file mode 100644 index 6ec3098..0000000 --- a/drivers/i2c/chips/pcf8574.c +++ /dev/null @@ -1,215 +0,0 @@ -/* - Copyright (c) 2000 Frodo Looijaard , - Philip Edelbrock , - Dan Eaton - Ported to Linux 2.6 by Aurelien Jarno with - the help of Jean Delvare - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -/* A few notes about the PCF8574: - -* The PCF8574 is an 8-bit I/O expander for the I2C bus produced by - Philips Semiconductors. It is designed to provide a byte I2C - interface to up to 8 separate devices. - -* The PCF8574 appears as a very simple SMBus device which can be - read from or written to with SMBUS byte read/write accesses. - - --Dan - -*/ - -#include -#include -#include -#include - -/* Addresses to scan: none, device can't be detected */ -static const unsigned short normal_i2c[] = { I2C_CLIENT_END }; - -/* Insmod parameters */ -I2C_CLIENT_INSMOD_2(pcf8574, pcf8574a); - -/* Each client has this additional data */ -struct pcf8574_data { - int write; /* Remember last written value */ -}; - -static void pcf8574_init_client(struct i2c_client *client); - -/* following are the sysfs callback functions */ -static ssize_t show_read(struct device *dev, struct device_attribute *attr, char *buf) -{ - struct i2c_client *client = to_i2c_client(dev); - return sprintf(buf, "%u\n", i2c_smbus_read_byte(client)); -} - -static DEVICE_ATTR(read, S_IRUGO, show_read, NULL); - -static ssize_t show_write(struct device *dev, struct device_attribute *attr, char *buf) -{ - struct pcf8574_data *data = i2c_get_clientdata(to_i2c_client(dev)); - - if (data->write < 0) - return data->write; - - return sprintf(buf, "%d\n", data->write); -} - -static ssize_t set_write(struct device *dev, struct device_attribute *attr, const char *buf, - size_t count) -{ - struct i2c_client *client = to_i2c_client(dev); - struct pcf8574_data *data = i2c_get_clientdata(client); - unsigned long val = simple_strtoul(buf, NULL, 10); - - if (val > 0xff) - return -EINVAL; - - data->write = val; - i2c_smbus_write_byte(client, data->write); - return count; -} - -static DEVICE_ATTR(write, S_IWUSR | S_IRUGO, show_write, set_write); - -static struct attribute *pcf8574_attributes[] = { - &dev_attr_read.attr, - &dev_attr_write.attr, - NULL -}; - -static const struct attribute_group pcf8574_attr_group = { - .attrs = pcf8574_attributes, -}; - -/* - * Real code - */ - -/* Return 0 if detection is successful, -ENODEV otherwise */ -static int pcf8574_detect(struct i2c_client *client, int kind, - struct i2c_board_info *info) -{ - struct i2c_adapter *adapter = client->adapter; - const char *client_name; - - if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE)) - return -ENODEV; - - /* Now, we would do the remaining detection. But the PCF8574 is plainly - impossible to detect! Stupid chip. */ - - /* Determine the chip type */ - if (kind <= 0) { - if (client->addr >= 0x38 && client->addr <= 0x3f) - kind = pcf8574a; - else - kind = pcf8574; - } - - if (kind == pcf8574a) - client_name = "pcf8574a"; - else - client_name = "pcf8574"; - strlcpy(info->type, client_name, I2C_NAME_SIZE); - - return 0; -} - -static int pcf8574_probe(struct i2c_client *client, - const struct i2c_device_id *id) -{ - struct pcf8574_data *data; - int err; - - data = kzalloc(sizeof(struct pcf8574_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto exit; - } - - i2c_set_clientdata(client, data); - - /* Initialize the PCF8574 chip */ - pcf8574_init_client(client); - - /* Register sysfs hooks */ - err = sysfs_create_group(&client->dev.kobj, &pcf8574_attr_group); - if (err) - goto exit_free; - return 0; - - exit_free: - kfree(data); - exit: - return err; -} - -static int pcf8574_remove(struct i2c_client *client) -{ - sysfs_remove_group(&client->dev.kobj, &pcf8574_attr_group); - kfree(i2c_get_clientdata(client)); - return 0; -} - -/* Called when we have found a new PCF8574. */ -static void pcf8574_init_client(struct i2c_client *client) -{ - struct pcf8574_data *data = i2c_get_clientdata(client); - data->write = -EAGAIN; -} - -static const struct i2c_device_id pcf8574_id[] = { - { "pcf8574", 0 }, - { "pcf8574a", 0 }, - { } -}; - -static struct i2c_driver pcf8574_driver = { - .driver = { - .name = "pcf8574", - }, - .probe = pcf8574_probe, - .remove = pcf8574_remove, - .id_table = pcf8574_id, - - .detect = pcf8574_detect, - .address_data = &addr_data, -}; - -static int __init pcf8574_init(void) -{ - return i2c_add_driver(&pcf8574_driver); -} - -static void __exit pcf8574_exit(void) -{ - i2c_del_driver(&pcf8574_driver); -} - - -MODULE_AUTHOR - ("Frodo Looijaard , " - "Philip Edelbrock , " - "Dan Eaton " - "and Aurelien Jarno "); -MODULE_DESCRIPTION("PCF8574 driver"); -MODULE_LICENSE("GPL"); - -module_init(pcf8574_init); -module_exit(pcf8574_exit); -- 1.6.3.3 From David.Daney@caviumnetworks.com Thu Sep 10 00:36:56 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 10 Sep 2009 00:37:03 +0200 (CEST) Received: from mail3.caviumnetworks.com ([12.108.191.235]:3016 "EHLO smtp3" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org with ESMTP id S1493122AbZIIWg4 (ORCPT ); Thu, 10 Sep 2009 00:36:56 +0200 Received: from caexch01.caveonetworks.com (Not Verified[192.168.16.9]) by smtp3 with MailMarshal (v6,5,4,7535) id ; Wed, 09 Sep 2009 15:36:39 -0700 Received: from caexch01.caveonetworks.com ([192.168.16.9]) by caexch01.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 9 Sep 2009 15:36:35 -0700 Received: from dd1.caveonetworks.com ([12.108.191.236]) by caexch01.caveonetworks.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 9 Sep 2009 15:36:35 -0700 Message-ID: <4AA82DF3.5070805@caviumnetworks.com> Date: Wed, 09 Sep 2009 15:36:35 -0700 From: David Daney User-Agent: Thunderbird 2.0.0.21 (X11/20090320) MIME-Version: 1.0 To: Wu Fei , Ralf Baechle CC: linux-mips@linux-mips.org Subject: Re: [PATCH] Shrink the size of tlb handler References: <20090903142753.GA6482@desktop> <20090903142953.GB6482@desktop> In-Reply-To: <20090903142953.GB6482@desktop> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 09 Sep 2009 22:36:35.0616 (UTC) FILETIME=[FCE7DA00:01CA319D] Return-Path: X-Envelope-To: <"|/home/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: 24002 X-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 Wu Fei wrote: > By combining swapper_pg_dir and module_pg_dir, several if conditions > can be eliminated from the tlb exception handler. The reason they > can be combined is that, the effective virtual address of vmalloc > returned is at the bottom, and of module_alloc returned is at the > top. It also fixes the bug in vmalloc(), which happens when its > return address is not covered by the first pgd. > > Signed-off-by: Wu Fei I like this patch. I ported it to my 2.6.27 kernel and it seems to work well. One thing you are missing is that that label_module_alloc should now no longer be needed in tlbex.c It should be removed. David Daney > --- > arch/mips/include/asm/pgtable-64.h | 11 ++------ > arch/mips/mm/init.c | 3 -- > arch/mips/mm/pgtable-64.c | 3 -- > arch/mips/mm/tlbex.c | 49 ------------------------------------ > 4 files changed, 3 insertions(+), 63 deletions(-) > > diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h > index 4ed9d1b..9cd5089 100644 > --- a/arch/mips/include/asm/pgtable-64.h > +++ b/arch/mips/include/asm/pgtable-64.h > @@ -109,13 +109,13 @@ > > #define VMALLOC_START MAP_BASE > #define VMALLOC_END \ > - (VMALLOC_START + PTRS_PER_PGD * PTRS_PER_PMD * PTRS_PER_PTE * PAGE_SIZE) > + (VMALLOC_START + \ > + PTRS_PER_PGD * PTRS_PER_PMD * PTRS_PER_PTE * PAGE_SIZE - (1UL << 32)) > #if defined(CONFIG_MODULES) && defined(KBUILD_64BIT_SYM32) && \ > VMALLOC_START != CKSSEG > /* Load modules into 32bit-compatible segment. */ > #define MODULE_START CKSSEG > #define MODULE_END (FIXADDR_START-2*PAGE_SIZE) > -extern pgd_t module_pg_dir[PTRS_PER_PGD]; > #endif > > #define pte_ERROR(e) \ > @@ -188,12 +188,7 @@ static inline void pud_clear(pud_t *pudp) > #define __pmd_offset(address) pmd_index(address) > > /* to find an entry in a kernel page-table-directory */ > -#ifdef MODULE_START > -#define pgd_offset_k(address) \ > - ((address) >= MODULE_START ? module_pg_dir : pgd_offset(&init_mm, 0UL)) > -#else > -#define pgd_offset_k(address) pgd_offset(&init_mm, 0UL) > -#endif > +#define pgd_offset_k(address) pgd_offset(&init_mm, address) > > #define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) > #define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) > diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c > index 0e82050..38c79c5 100644 > --- a/arch/mips/mm/init.c > +++ b/arch/mips/mm/init.c > @@ -475,9 +475,6 @@ unsigned long pgd_current[NR_CPUS]; > */ > pgd_t swapper_pg_dir[_PTRS_PER_PGD] __page_aligned(_PGD_ORDER); > #ifdef CONFIG_64BIT > -#ifdef MODULE_START > -pgd_t module_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER); > -#endif > pmd_t invalid_pmd_table[PTRS_PER_PMD] __page_aligned(PMD_ORDER); > #endif > pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned(PTE_ORDER); > diff --git a/arch/mips/mm/pgtable-64.c b/arch/mips/mm/pgtable-64.c > index e4b565a..1121019 100644 > --- a/arch/mips/mm/pgtable-64.c > +++ b/arch/mips/mm/pgtable-64.c > @@ -59,9 +59,6 @@ void __init pagetable_init(void) > > /* Initialize the entire pgd. */ > pgd_init((unsigned long)swapper_pg_dir); > -#ifdef MODULE_START > - pgd_init((unsigned long)module_pg_dir); > -#endif > pmd_init((unsigned long)invalid_pmd_table, (unsigned long)invalid_pte_table); > > pgd_base = swapper_pg_dir; > diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c > index 9a17bf8..bc66f57 100644 > --- a/arch/mips/mm/tlbex.c > +++ b/arch/mips/mm/tlbex.c > @@ -499,11 +499,7 @@ build_get_pmde64(u32 **p, struct uasm_label **l, struct uasm_reloc **r, > * The vmalloc handling is not in the hotpath. > */ > uasm_i_dmfc0(p, tmp, C0_BADVADDR); > -#ifdef MODULE_START > - uasm_il_bltz(p, r, tmp, label_module_alloc); > -#else > uasm_il_bltz(p, r, tmp, label_vmalloc); > -#endif > /* No uasm_i_nop needed here, since the next insn doesn't touch TMP. */ > > #ifdef CONFIG_SMP > @@ -556,52 +552,7 @@ build_get_pgd_vmalloc64(u32 **p, struct uasm_label **l, struct uasm_reloc **r, > { > long swpd = (long)swapper_pg_dir; > > -#ifdef MODULE_START > - long modd = (long)module_pg_dir; > - > - uasm_l_module_alloc(l, *p); > - /* > - * Assumption: > - * VMALLOC_START >= 0xc000000000000000UL > - * MODULE_START >= 0xe000000000000000UL > - */ > - UASM_i_SLL(p, ptr, bvaddr, 2); > - uasm_il_bgez(p, r, ptr, label_vmalloc); > - > - if (uasm_in_compat_space_p(MODULE_START) && > - !uasm_rel_lo(MODULE_START)) { > - uasm_i_lui(p, ptr, uasm_rel_hi(MODULE_START)); /* delay slot */ > - } else { > - /* unlikely configuration */ > - uasm_i_nop(p); /* delay slot */ > - UASM_i_LA(p, ptr, MODULE_START); > - } > - uasm_i_dsubu(p, bvaddr, bvaddr, ptr); > - > - if (uasm_in_compat_space_p(modd) && !uasm_rel_lo(modd)) { > - uasm_il_b(p, r, label_vmalloc_done); > - uasm_i_lui(p, ptr, uasm_rel_hi(modd)); > - } else { > - UASM_i_LA_mostly(p, ptr, modd); > - uasm_il_b(p, r, label_vmalloc_done); > - if (uasm_in_compat_space_p(modd)) > - uasm_i_addiu(p, ptr, ptr, uasm_rel_lo(modd)); > - else > - uasm_i_daddiu(p, ptr, ptr, uasm_rel_lo(modd)); > - } > - > uasm_l_vmalloc(l, *p); > - if (uasm_in_compat_space_p(MODULE_START) && > - !uasm_rel_lo(MODULE_START) && > - MODULE_START << 32 == VMALLOC_START) > - uasm_i_dsll32(p, ptr, ptr, 0); /* typical case */ > - else > - UASM_i_LA(p, ptr, VMALLOC_START); > -#else > - uasm_l_vmalloc(l, *p); > - UASM_i_LA(p, ptr, VMALLOC_START); > -#endif > - uasm_i_dsubu(p, bvaddr, bvaddr, ptr); > > if (uasm_in_compat_space_p(swpd) && !uasm_rel_lo(swpd)) { > uasm_il_b(p, r, label_vmalloc_done); From gardner.ben@gmail.com Thu Sep 10 01:28:48 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 10 Sep 2009 01:28:55 +0200 (CEST) Received: from mail-ew0-f225.google.com ([209.85.219.225]:38841 "EHLO mail-ew0-f225.google.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1493189AbZIIX2s (ORCPT ); Thu, 10 Sep 2009 01:28:48 +0200 Received: by ewy25 with SMTP id 25so4363071ewy.33 for ; Wed, 09 Sep 2009 16:28:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=K4JpS9mGrP+JUUt40SmWWJaX27kt0wRummwlgmrXSEQ=; b=ave5Fe7ddls7c80i54qCZPhTxFIEJa10TO6dMkb308a9CbK+z7oDXw7Fql9kGXSjJQ KUL2bGQXXdlkf8v8oreYsz8pA5C42FfNOBC9Lz8NsyeHqL+RfZS1q1akixU/fUM27Di0 8z3F95Ni+oyvhaNtLq2Qu+EOxK0pOlA61R2dg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=i5907mrgCcjMl62aazUCkmAla/3pmElaU40W9R1DnDaA2c6oLj2PtoLLWIawqIHM3J 1jpTTi08oc7NqLMEZerM0xCL5ddDknk+Xl0IhZT6aTuVgR0OxPy8CGbGVDuVUZLV0DEz odOKwMEd2TJf0LV3D36hfJh1H2eo4+oyb+lDQ= MIME-Version: 1.0 Received: by 10.216.36.196 with SMTP id w46mr232293wea.76.1252538922053; Wed, 09 Sep 2009 16:28:42 -0700 (PDT) In-Reply-To: <1252531371-14866-4-git-send-email-w.sang@pengutronix.de> References: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> <1252531371-14866-4-git-send-email-w.sang@pengutronix.de> Date: Wed, 9 Sep 2009 18:28:42 -0500 Message-ID: <808c8e9d0909091628v3681c0cch50759d24393e570a@mail.gmail.com> Subject: Re: [PATCH 3/4] i2c/chips: Remove deprecated pca9539-driver From: Ben Gardner To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linuxppc-dev@ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org, uclinux-dist-devel@blackfin.uclinux.org, Jean Delvare Content-Type: text/plain; charset=ISO-8859-1 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 24003 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: gardner.ben@gmail.com Precedence: bulk X-list: linux-mips On Wed, Sep 9, 2009 at 4:22 PM, Wolfram Sang wrote: > The pca9539-driver in drivers/i2c/chips which just exports its registers to > sysfs is superseeded by drivers/gpio/pca953x.c which properly uses the gpiolib. > As this driver has been deprecated for more than a year, finally remove it. > > Signed-off-by: Wolfram Sang > Cc: Ben Gardner > Cc: Jean Delvare Acked-by: Ben Gardner Thanks for taking care of this. Ben From vapier.adi@gmail.com Thu Sep 10 01:55:01 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 10 Sep 2009 01:55:08 +0200 (CEST) Received: from mail-yw0-f177.google.com ([209.85.211.177]:50216 "EHLO mail-yw0-f177.google.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1493229AbZIIXzB (ORCPT ); Thu, 10 Sep 2009 01:55:01 +0200 Received: by ywh7 with SMTP id 7so7092692ywh.21 for ; Wed, 09 Sep 2009 16:54:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:cc:content-type; bh=CV9xEng5q+g1urucTVU4sRWTnKldUp3SexzByDrVINA=; b=cLBCk0DEj8ENdxVlD2M61MLE9zMwnU3/iGbeX4FdWteI/97L/fd1ELS6aJV2x3nUm4 qBmEOoxSPgilya6XSz9r/RBo678t6K7XTNZPWhyuImIrUpKGXtRCSxzW/oIKCZyPXf8X gMMYq7dJRzFU6w+ElpY8CD0DP4WzywvldPrZs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; b=XHg++irwmOeAqGZBRYojCqCa+uyzIbHTW3OxX2WwZ1YPHeSH8aG06CY/ZaijPdi9y2 gLzkvUdS5Ed3vHGWoW3cLhAV3auF1Arbj5OrgZzPQlnoUl3KLIugDVHD6wNqBZmKkdZn BywA6TFfw8Gh08l2WWswMl9DKMX/amYPZ1z3w= MIME-Version: 1.0 Received: by 10.150.239.15 with SMTP id m15mr1548890ybh.109.1252540495121; Wed, 09 Sep 2009 16:54:55 -0700 (PDT) In-Reply-To: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> References: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> From: Mike Frysinger Date: Wed, 9 Sep 2009 19:54:34 -0400 Message-ID: <8bd0f97a0909091654h290180e5ob79178583aca143f@mail.gmail.com> Subject: Re: [Uclinux-dist-devel] Removing deprecated drivers from drivers/i2c/chips To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linuxppc-dev@ozlabs.org, uclinux-dist-devel@blackfin.uclinux.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org Content-Type: text/plain; charset=UTF-8 Return-Path: X-Envelope-To: <"|/home/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: 24004 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: vapier.adi@gmail.com Precedence: bulk X-list: linux-mips On Wed, Sep 9, 2009 at 17:22, Wolfram Sang wrote: > continuing the quest to clean up and ultimately remove the drivers/i2c/chips > directory, this patch series removes three drivers for GPIO-expanders which are > obsoleted and marked as deprecated for more than a year. The newer (and better) > drivers can be found in drivers/gpio. > > As it is ensured that the newer drivers cover the same i2c_device_ids, all > platform_devices will still match. Some defconfig updates may be necessary > though, but according to [1] this is left to the arch|platform-maintainers > (also as most defconfigs are quite outdated). For that reason, I put the > relevant arch-mailing-lists to Cc. Comments are welcome. the Blackfin defconfigs refer to an input driver for the PCF8574, not the I2C client driver -mike From wsa@pengutronix.de Thu Sep 10 08:26:31 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 10 Sep 2009 08:26:38 +0200 (CEST) Received: from metis.ext.pengutronix.de ([92.198.50.35]:42449 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1492256AbZIJG0b (ORCPT ); Thu, 10 Sep 2009 08:26:31 +0200 Received: from octopus.hi.pengutronix.de ([2001:6f8:1178:2:215:17ff:fe12:23b0]) by metis.ext.pengutronix.de with esmtp (Exim 4.63) (envelope-from ) id 1Mld6i-0007NT-MG; Thu, 10 Sep 2009 08:26:12 +0200 Received: from wsa by octopus.hi.pengutronix.de with local (Exim 4.69) (envelope-from ) id 1Mld6f-0001aX-FW; Thu, 10 Sep 2009 08:26:09 +0200 Date: Thu, 10 Sep 2009 08:26:09 +0200 From: Wolfram Sang To: Mike Frysinger Cc: linux-i2c@vger.kernel.org, linuxppc-dev@ozlabs.org, uclinux-dist-devel@blackfin.uclinux.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org Subject: Re: [Uclinux-dist-devel] Removing deprecated drivers from drivers/i2c/chips Message-ID: <20090910062609.GA26454@pengutronix.de> References: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> <8bd0f97a0909091654h290180e5ob79178583aca143f@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="n8g4imXOkfNTN/H1" Content-Disposition: inline In-Reply-To: <8bd0f97a0909091654h290180e5ob79178583aca143f@mail.gmail.com> User-Agent: Mutt/1.5.18 (2008-05-17) X-SA-Exim-Connect-IP: 2001:6f8:1178:2:215:17ff:fe12:23b0 X-SA-Exim-Mail-From: wsa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-mips@linux-mips.org Return-Path: X-Envelope-To: <"|/home/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: 24005 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: w.sang@pengutronix.de Precedence: bulk X-list: linux-mips --n8g4imXOkfNTN/H1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > the Blackfin defconfigs refer to an input driver for the PCF8574, not > the I2C client driver Yup, I am aware of that. With the exception of: blackfin/configs/PNAV-10_defconfig:773:CONFIG_SENSORS_PCF8574=3Dm Regards, Wolfram --=20 Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | --n8g4imXOkfNTN/H1 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkqonAEACgkQD27XaX1/VRsuggCgvHIQBK0PDoMqr0mqllZhomK8 ym8An2/4gTJoai3W+CzOM659DgzCeQuK =yoJc -----END PGP SIGNATURE----- --n8g4imXOkfNTN/H1-- From vapier.adi@gmail.com Thu Sep 10 09:56:03 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 10 Sep 2009 09:56:10 +0200 (CEST) Received: from mail-yw0-f177.google.com ([209.85.211.177]:36113 "EHLO mail-yw0-f177.google.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1492355AbZIJH4D (ORCPT ); Thu, 10 Sep 2009 09:56:03 +0200 Received: by ywh7 with SMTP id 7so7443847ywh.21 for ; Thu, 10 Sep 2009 00:55:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:cc:content-type; bh=Og2JRVvwtRisyohaZFGF/YuNxmaJs7dAXTImFJc7UMI=; b=AKgij8dFi6D1XKc3kP06SS6h+jGKFG7pnQKtJ6vlMmoE53J/fDIPspGawtGE2XBPuf RVHodoe+P6+dP4JpJYJ97iTtkr0p4kmWiqSO0+2l/uCuZAA8kU2moPGzA3j1+R01gCt8 izf6RQNj7tPeE6AvDG8vExVSLY13xcCDMVdds= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; b=L09ygWZf1DS+OMJRNc/Lo5GyP/s+jL/F8GHuAEX852RE81b7wVSeVCVBS7IT5T3o8q kQZKRKuDqi2qAZ/zY4k3GPbnjBsQuBiEH4pVMA4jNXN86niw97TmvGDRKiwvA1cpS77o Ptr5WRmkmLIixkeIIkr+eQyK0faUFZ2B/EsWo= MIME-Version: 1.0 Received: by 10.150.164.4 with SMTP id m4mr2188920ybe.140.1252569356120; Thu, 10 Sep 2009 00:55:56 -0700 (PDT) In-Reply-To: <20090910062609.GA26454@pengutronix.de> References: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> <8bd0f97a0909091654h290180e5ob79178583aca143f@mail.gmail.com> <20090910062609.GA26454@pengutronix.de> From: Mike Frysinger Date: Thu, 10 Sep 2009 03:55:36 -0400 Message-ID: <8bd0f97a0909100055n3192deeka93dc853f0139bfc@mail.gmail.com> Subject: Re: [Uclinux-dist-devel] Removing deprecated drivers from drivers/i2c/chips To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linuxppc-dev@ozlabs.org, uclinux-dist-devel@blackfin.uclinux.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org Content-Type: text/plain; charset=UTF-8 Return-Path: X-Envelope-To: <"|/home/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: 24006 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: vapier.adi@gmail.com Precedence: bulk X-list: linux-mips On Thu, Sep 10, 2009 at 02:26, Wolfram Sang wrote: >> the Blackfin defconfigs refer to an input driver for the PCF8574, not >> the I2C client driver > > Yup, I am aware of that. With the exception of: > > blackfin/configs/PNAV-10_defconfig:773:CONFIG_SENSORS_PCF8574=m thanks for double checking. i'm not sure this board even has this device. i'll review the hardware. -mike From khali@linux-fr.org Thu Sep 10 12:49:40 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 10 Sep 2009 12:49:47 +0200 (CEST) Received: from bamako.nerim.net ([62.4.17.28]:58852 "EHLO bamako.nerim.net" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1492244AbZIJKtk (ORCPT ); Thu, 10 Sep 2009 12:49:40 +0200 Received: from localhost (localhost [127.0.0.1]) by bamako.nerim.net (Postfix) with ESMTP id E09B639DCB0; Thu, 10 Sep 2009 12:49:37 +0200 (CEST) X-Virus-Scanned: amavisd-new at nerim.net Received: from bamako.nerim.net ([127.0.0.1]) by localhost (bamako.nerim.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 04+egjYJ86w8; Thu, 10 Sep 2009 12:49:36 +0200 (CEST) Received: from hyperion.delvare (jdelvare.pck.nerim.net [62.212.121.182]) by bamako.nerim.net (Postfix) with ESMTP id 96A1839DCA1; Thu, 10 Sep 2009 12:49:36 +0200 (CEST) Date: Thu, 10 Sep 2009 12:49:37 +0200 From: Jean Delvare To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linuxppc-dev@ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org, uclinux-dist-devel@blackfin.uclinux.org Subject: Re: Removing deprecated drivers from drivers/i2c/chips Message-ID: <20090910124937.7b3df062@hyperion.delvare> In-Reply-To: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> References: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.14.4; i586-suse-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 24007 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: khali@linux-fr.org Precedence: bulk X-list: linux-mips Hi Wolfram, On Wed, 9 Sep 2009 23:22:47 +0200, Wolfram Sang wrote: > continuing the quest to clean up and ultimately remove the drivers/i2c/chips > directory, this patch series removes three drivers for GPIO-expanders which are > obsoleted and marked as deprecated for more than a year. The newer (and better) > drivers can be found in drivers/gpio. > > As it is ensured that the newer drivers cover the same i2c_device_ids, all > platform_devices will still match. Some defconfig updates may be necessary > though, but according to [1] this is left to the arch|platform-maintainers > (also as most defconfigs are quite outdated). For that reason, I put the > relevant arch-mailing-lists to Cc. Comments are welcome. Looks very good, I'll apply the 3 patches removing the legacy drivers. Not sure about the patch to drivers/gpio/pcf857x.c, as there is no gpio tree and no maintainer either AFAIK, I guess I shall pick it too? Thanks, -- Jean Delvare From bart.vanassche@gmail.com Thu Sep 10 12:52:24 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 10 Sep 2009 12:52:31 +0200 (CEST) Received: from mail-ew0-f225.google.com ([209.85.219.225]:55162 "EHLO mail-ew0-f225.google.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S2097287AbZIJKwY convert rfc822-to-8bit (ORCPT ); Thu, 10 Sep 2009 12:52:24 +0200 Received: by ewy25 with SMTP id 25so4707068ewy.33 for ; Thu, 10 Sep 2009 03:52:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=emeznUvZiGdhx1GHKHvOoEXLykryPQxOUIw8NC9+YAs=; b=S9GPxziooGQYM9NBnVnZDXm82BZ0+s5lTBStJTm8orD8O78I2GfkW4IOiEZlVyrkpj 2TDeiOjUkwZ8PFHzImavYKLW4RpKe2IgerTfFxQtdxzs6lZ3ZWxUqY3yulKElephYkrV bx/Ly58qQLCjuoAqfPKqEKAA7gW/IE3kUxpuU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=ugbaooNQrck06s5hbDluf7cYh6uwVSEg8tvKBgsXQibE0RygMT4XNFEHUOIPZLhr5c F1tlQRS0roB2o/9hs7Z63h+HqGZnIfLwvDfkl1sT0JyyiVyHpKpGAjQIAbP8x83gCpKj yst0xf8GjES+3ukJeFGl4LsL/iE/cbbHFt+hg= MIME-Version: 1.0 Received: by 10.210.101.1 with SMTP id y1mr743830ebb.60.1252579937789; Thu, 10 Sep 2009 03:52:17 -0700 (PDT) In-Reply-To: <1252531371-14866-3-git-send-email-w.sang@pengutronix.de> References: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> <1252531371-14866-3-git-send-email-w.sang@pengutronix.de> Date: Thu, 10 Sep 2009 12:52:17 +0200 Message-ID: Subject: Re: [PATCH 2/4] i2c/chips: Remove deprecated pcf8575-driver From: Bart Van Assche To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linuxppc-dev@ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org, uclinux-dist-devel@blackfin.uclinux.org, Jean Delvare Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 24008 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: bart.vanassche@gmail.com Precedence: bulk X-list: linux-mips On Wed, Sep 9, 2009 at 11:22 PM, Wolfram Sang wrote: > > The pcf8575-driver in drivers/i2c/chips which just exports its register to > sysfs is superseeded by drivers/gpio/pcf857x.c which properly uses the gpiolib. > As this driver has been deprecated for more than a year, finally remove it. > > Signed-off-by: Wolfram Sang > Cc: Bart Van Assche > Cc: Jean Delvare > --- > �Documentation/i2c/chips/pcf8575 | � 69 -------------- > �drivers/i2c/chips/Kconfig � � � | � 18 ---- > �drivers/i2c/chips/Makefile � � �| � �1 - > �drivers/i2c/chips/pcf8575.c � � | �198 --------------------------------------- > �4 files changed, 0 insertions(+), 286 deletions(-) > �delete mode 100644 Documentation/i2c/chips/pcf8575 > �delete mode 100644 drivers/i2c/chips/pcf8575.c This patch removes the documentation file Documentation/i2c/chips/pcf8575 while there is no documentation under Documentation/ for the drivers/gpio/pcf857x.c driver. Shouldn't proper documentation for the pcf857x driver be added to the kernel tree before the pcf8575 driver is removed ? Bart. From w.sang@pengutronix.de Thu Sep 10 13:04:34 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 10 Sep 2009 13:04:40 +0200 (CEST) Received: from metis.ext.pengutronix.de ([92.198.50.35]:45416 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1492233AbZIJLEe (ORCPT ); Thu, 10 Sep 2009 13:04:34 +0200 Received: from [2001:6f8:1178:2:221:70ff:fe71:1890] (helo=pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.63) (envelope-from ) id 1MlhRu-0000Fw-Kf; Thu, 10 Sep 2009 13:04:22 +0200 Date: Thu, 10 Sep 2009 13:04:19 +0200 From: Wolfram Sang To: Bart Van Assche Cc: linux-i2c@vger.kernel.org, linuxppc-dev@ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org, uclinux-dist-devel@blackfin.uclinux.org, Jean Delvare Subject: Re: [PATCH 2/4] i2c/chips: Remove deprecated pcf8575-driver Message-ID: <20090910110419.GA3266@pengutronix.de> References: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> <1252531371-14866-3-git-send-email-w.sang@pengutronix.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="xHFwDpU9dbj6ez1V" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.18 (2008-05-17) X-SA-Exim-Connect-IP: 2001:6f8:1178:2:221:70ff:fe71:1890 X-SA-Exim-Mail-From: w.sang@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-mips@linux-mips.org Return-Path: X-Envelope-To: <"|/home/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: 24009 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: w.sang@pengutronix.de Precedence: bulk X-list: linux-mips --xHFwDpU9dbj6ez1V Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > This patch removes the documentation file > Documentation/i2c/chips/pcf8575 while there is no documentation under > Documentation/ for the drivers/gpio/pcf857x.c driver. Shouldn't proper > documentation for the pcf857x driver be added to the kernel tree > before the pcf8575 driver is removed ? I considered moving the documentation, but realized: 1st part is URLs for datasheets. Well, URLs easily grow outdated and those datasheets are easily to find using your favourite search engine. 2nd part is a short description of the chips which is IMHO sufficently cove= red in drivers/gpio/Kconfig. 3rd part (Detection) and 4th part (sysfs-interface) are obsolete for the new drivers. The gpiolib interface again is covered in Documentation/gpio.txt So I concluded to simply drop the documentation. Regards, Wolfram --=20 Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | --xHFwDpU9dbj6ez1V Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkqo3TMACgkQD27XaX1/VRvFjQCgo1FvA+7ru2LhEIdbNdz63gq+ qZgAoKZE9Vl9Ut69l9xYkFnYk5zyLUA5 =pc+E -----END PGP SIGNATURE----- --xHFwDpU9dbj6ez1V-- From w.sang@pengutronix.de Thu Sep 10 13:07:56 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 10 Sep 2009 13:08:02 +0200 (CEST) Received: from metis.ext.pengutronix.de ([92.198.50.35]:52623 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1492223AbZIJLH4 (ORCPT ); Thu, 10 Sep 2009 13:07:56 +0200 Received: from [2001:6f8:1178:2:221:70ff:fe71:1890] (helo=pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.63) (envelope-from ) id 1MlhV6-0000Kj-NT; Thu, 10 Sep 2009 13:07:40 +0200 Date: Thu, 10 Sep 2009 13:07:40 +0200 From: Wolfram Sang To: Jean Delvare Cc: linux-i2c@vger.kernel.org, linuxppc-dev@ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org, uclinux-dist-devel@blackfin.uclinux.org Subject: Re: Removing deprecated drivers from drivers/i2c/chips Message-ID: <20090910110740.GB3266@pengutronix.de> References: <1252531371-14866-1-git-send-email-w.sang@pengutronix.de> <20090910124937.7b3df062@hyperion.delvare> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="GID0FwUMdk1T2AWN" Content-Disposition: inline In-Reply-To: <20090910124937.7b3df062@hyperion.delvare> User-Agent: Mutt/1.5.18 (2008-05-17) X-SA-Exim-Connect-IP: 2001:6f8:1178:2:221:70ff:fe71:1890 X-SA-Exim-Mail-From: w.sang@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-mips@linux-mips.org Return-Path: X-Envelope-To: <"|/home/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: 24010 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: w.sang@pengutronix.de Precedence: bulk X-list: linux-mips --GID0FwUMdk1T2AWN Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > Not sure about the patch to drivers/gpio/pcf857x.c, as there is no gpio > tree and no maintainer either AFAIK, I guess I shall pick it too? I'd say so. An Ack from David Brownell would be nice, though. Regards, Wolfram --=20 Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | --GID0FwUMdk1T2AWN Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkqo3fwACgkQD27XaX1/VRubLQCfSgZNsCLqCMUHSTodsb+ADje7 8moAniKaGGL+YvVPQzmKGQiBL3LugOtg =92rb -----END PGP SIGNATURE----- --GID0FwUMdk1T2AWN-- From at.wufei@gmail.com Thu Sep 10 13:42:52 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 10 Sep 2009 13:42:59 +0200 (CEST) Received: from mail-yx0-f195.google.com ([209.85.210.195]:62072 "EHLO mail-yx0-f195.google.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1493506AbZIJLmw (ORCPT ); Thu, 10 Sep 2009 13:42:52 +0200 Received: by yxe33 with SMTP id 33so26734yxe.0 for ; Thu, 10 Sep 2009 04:42:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=7R73+dcNZ/iprMyGpWrEPNSFWKJHTc5OpIXVRr/VIAw=; b=jcC4iqr8fOv2Y59ZtviP0K/SyHXnTG9f+xd+dy8atcWCl+jAKsk95048HNFRSNHr2y Q8uhdSxC02cyWwCGg0s8D/gNpO+BY7RlJT8lC2OFxe7If/ScmUTS3NTiE1qB+iBML3qW H4pZqBeZe45UzBQPiMyp0G1kCBqElXUqYWNcM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=O5RqNRfVzPblBVq+wWPERO89Nj+4ykCQ+Itjrym69Dk5YeEwKiPWGL9vmndC9Etn48 M1TxVfBA6pDxaS4rmF912ubS9UvQ6NViGm/qCYX/T4q3OigKKhha0HnmuJInypNnyZE6 PImtm/Scj1qKfdUxE0J689fvGW2fS5xniM3z8= Received: by 10.90.225.5 with SMTP id x5mr848773agg.87.1252582966072; Thu, 10 Sep 2009 04:42:46 -0700 (PDT) Received: from desktop ([58.31.9.46]) by mx.google.com with ESMTPS id 39sm187805aga.71.2009.09.10.04.42.41 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 10 Sep 2009 04:42:45 -0700 (PDT) Date: Thu, 10 Sep 2009 19:42:38 +0800 From: Wu Fei To: David Daney Cc: Ralf Baechle , linux-mips@linux-mips.org Subject: Re: [PATCH] cleanup vmalloc_fault for 64bit kernel Message-ID: <20090910114238.GA7014@desktop> References: <20090831132811.GA6924@desktop> <4AA7CB3E.1080807@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4AA7CB3E.1080807@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: 24011 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: at.wufei@gmail.com Precedence: bulk X-list: linux-mips On Wed, Sep 09, 2009 at 08:35:26AM -0700, David Daney wrote: > Wu Fei wrote: >> 64bit kernel won't arrive vmalloc_fault, it's not necessary or possible >> to copy the page table from init_mm.pgd. swapper_pg_dir, module_pg_dir >> and the process's pgd represent the different virtual address area, and >> the tlb exception handler accesses the suitable one directly. >> >> Signed-off-by: Wu Fei >> --- >> arch/mips/mm/fault.c | 6 +++--- >> 1 files changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c >> index f956ecb..e769789 100644 >> --- a/arch/mips/mm/fault.c >> +++ b/arch/mips/mm/fault.c >> @@ -58,11 +58,9 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write, >> * only copy the information from the master page table, >> * nothing more. >> */ >> +#ifdef CONFIG_32BIT >> if (unlikely(address >= VMALLOC_START && address <= VMALLOC_END)) >> goto vmalloc_fault; >> -#ifdef MODULE_START >> - if (unlikely(address >= MODULE_START && address < MODULE_END)) >> - goto vmalloc_fault; >> #endif >> > > That is not correct. You can still arrive at do_page_fault() from > faults in the vmalloc range. We need to go directly to the panic code That's not a real problem, if do_page_fault() from faults in the vmalloc range, find_vma() returns NULL and eventually it will arrive no_context. But anyway, I think your patch is better and readable. Thanks, Wufei. > as I did in my patch: Message-Id: > <1251931654-21268-1-git-send-email-ddaney@caviumnetworks.com> > > AKA: [PATCH] MIPS: Don't corrupt page tables on vmalloc fault. > > > >> /* >> @@ -203,6 +201,7 @@ do_sigbus: >> force_sig_info(SIGBUS, &info, tsk); >> return; >> +#ifdef CONFIG_32BIT >> vmalloc_fault: >> { >> /* >> @@ -241,4 +240,5 @@ vmalloc_fault: >> goto no_context; >> return; >> } >> +#endif >> } > From ralf@linux-mips.org Thu Sep 10 16:14:35 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 10 Sep 2009 16:14:38 +0200 (CEST) Received: from localhost.localdomain ([127.0.0.1]:36042 "EHLO h5.dl5rb.org.uk" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org with ESMTP id S1493558AbZIJOOf (ORCPT ); Thu, 10 Sep 2009 16:14:35 +0200 Received: from h5.dl5rb.org.uk (localhost.localdomain [127.0.0.1]) by h5.dl5rb.org.uk (8.14.3/8.14.3) with ESMTP id n8AEFO5q010661; Thu, 10 Sep 2009 16:15:27 +0200 Received: (from ralf@localhost) by h5.dl5rb.org.uk (8.14.3/8.14.3/Submit) id n8AEFICU010659; Thu, 10 Sep 2009 16:15:18 +0200 Date: Thu, 10 Sep 2009 16:15:18 +0200 From: Ralf Baechle To: Maxim Uvarov Cc: linux-mips@linux-mips.org Subject: Re: [MIPS] TLB handler fix for vmalloc'ed addresses Message-ID: <20090910141518.GA10547@linux-mips.org> References: <4AA656D8.9040608@ru.mvista.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4AA656D8.9040608@ru.mvista.com> User-Agent: Mutt/1.5.19 (2009-01-05) Return-Path: X-Envelope-To: <"|/home/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: 24012 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Tue, Sep 08, 2009 at 05:06:32PM +0400, Maxim Uvarov wrote: > Patch is attached. Please send patches inline. > TLB exception handler incorrecly handles situation > with wrong vmalloc'ed addresses. This patch adds > verifications for vmalloc'ed addresses (similar to > x86_64 implementation). So the code now traps inside > do_page_fault() on access to the wrong area. > > Signed-off-by: Maxim Uvarov > > Test case: > > #include > #include > #include > #include > #include > > static struct task_struct *ts; > static int example_thread(void *dummy) > { > void *ptr; > ptr = vmalloc(16*1024*1024); > for(;;) > { > msleep(100); > } > } So your test case allocates vmalloc memory but never touches it. > > static void run_vmalloc(void *unused) > { > ts=kthread_run(example_thread,NULL,"vtest"); > } > int init_module (void) > { > run_vmalloc(NULL); > return 0; > } > > void cleanup_module (void) > { /*Nothing*/} > > > Originally kernel trapped on BUG() inside exit_mmap() and it was impossible > to see what has happened. After this patch applied, nice back trace will be > generated: > > CPU 0 Unable to handle kernel paging request at virtual address c00000000036a148 > Oops[#1]: > Cpu 0 > $ 0 : 0000000000000000 ffffffff81940000 0000000000000000 00000000ffff05a7 > $ 4 : 0000000000000000 ffffffffffffffff ffffffff81a0b7d0 ffffffff811983e4 > $ 8 : ffffffff817407b0 0000000000000000 0000000000000000 0000000000000000 > $12 : a80000003374bfe0 0000000000008c00 ffffffff811e9df8 0000000000000000 > $16 : ffffffff81164a68 a8000000352a3c50 c00000000036a0e8 0000000000000000 > $20 : 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > $24 : 0000000000000002 a8000000337bb1a0 > $28 : a800000033748000 a80000003374bf70 a80000003374bf70 c00000000036a148 > Hi : 0000000000000000 > Lo : 000000000000a311 > epc : c00000000036a148 0xc00000000036a148 Tainted: P > ra : c00000000036a148 0xc00000000036a148 <-- dead in kernel module vtest > Status: 10008ce3 KX SX UX KERNEL EXL IE > Cause : 00000008 > BadVA : c00000000036a148 > PrId : 000d0408 > Modules linked in: > Process vtest (pid: 723, threadinfo=a800000033748000, task=a800000034530340) > Stack : 0000000000000000 a80000003374bf90 ffffffff81176530 ffffffff81176488 > ffffffffffffffff ffffffffffffffff 0000000000000000 0000000000000000 > 0000000000000000 a80000003374bfd0 ffffffff81125024 0000000000000000 > 0000000000000000 0000000000000000 5a5a5a5a5a5a5a5a 5a5a5a5a5a5a5a5a > 5a5a5a5a5a5a5a5a 5a5a5a5a5a5a5aa5 > Call Trace: > [] kthread+0x198/0x1f0 > [] kthread+0xf0/0x1f0 > [] kernel_thread_helper+0x14/0x20 > > > Code: (Bad address in epc) This is a 64-bit kernel crash ... > Index: linux-2.6.21/arch/mips/mm/fault.c > =================================================================== > --- linux-2.6.21.orig/arch/mips/mm/fault.c > +++ linux-2.6.21/arch/mips/mm/fault.c > @@ -282,22 +282,32 @@ vmalloc_fault: > pte_t *pte_k; > > pgd = (pgd_t *) pgd_current[raw_smp_processor_id()] + offset; > - pgd_k = init_mm.pgd + offset; > + pgd_k = pgd_offset_k(address); > > if (!pgd_present(*pgd_k)) > goto no_context; > - set_pgd(pgd, *pgd_k); > + if (unlikely(!pgd_present(*pgd))) > + set_pgd(pgd, *pgd_k); > + else if (pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_k)) > + goto no_context; > > pud = pud_offset(pgd, address); > pud_k = pud_offset(pgd_k, address); > if (!pud_present(*pud_k)) > goto no_context; > + if (pud_none(*pud) || > + pud_page_vaddr(*pud) != pud_page_vaddr(*pud_k)) > + goto no_context; > > pmd = pmd_offset(pud, address); > pmd_k = pmd_offset(pud_k, address); > if (!pmd_present(*pmd_k)) > goto no_context; > - set_pmd(pmd, *pmd_k); > + if (!pmd_present(*pmd)) > + set_pmd(pmd, *pmd_k); > + else > + if (pmd_page(*pmd) != pmd_page(*pmd_k)) > + goto no_context; > > pte_k = pte_offset_kernel(pmd_k, address); > if (!pte_present(*pte_k)) ... but on 64-bit kernels vmalloc_fault: should not be reached ever. Ralf From muvarov@ru.mvista.com Thu Sep 10 16:37:52 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 10 Sep 2009 16:37:59 +0200 (CEST) Received: from ru.mvista.com ([213.79.90.228]:1055 "EHLO buildserver.ru.mvista.com" rhost-flags-OK-FAIL-OK-FAIL) by ftp.linux-mips.org with ESMTP id S1493558AbZIJOhw (ORCPT ); Thu, 10 Sep 2009 16:37:52 +0200 Received: from [192.168.11.243] (unknown [10.150.0.9]) by buildserver.ru.mvista.com (Postfix) with ESMTP id E0829881D; Thu, 10 Sep 2009 19:37:48 +0500 (SAMST) Message-ID: <4AA90F3B.6000204@ru.mvista.com> Date: Thu, 10 Sep 2009 18:37:47 +0400 From: Maxim Uvarov User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Ralf Baechle Cc: linux-mips@linux-mips.org Subject: Re: [MIPS] TLB handler fix for vmalloc'ed addresses References: <4AA656D8.9040608@ru.mvista.com> <20090910141518.GA10547@linux-mips.org> In-Reply-To: <20090910141518.GA10547@linux-mips.org> 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: 24013 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: muvarov@ru.mvista.com Precedence: bulk X-list: linux-mips Ralf Baechle wrote: > On Tue, Sep 08, 2009 at 05:06:32PM +0400, Maxim Uvarov wrote: > >> Patch is attached. > > Please send patches inline. > >> TLB exception handler incorrecly handles situation >> with wrong vmalloc'ed addresses. This patch adds >> verifications for vmalloc'ed addresses (similar to >> x86_64 implementation). So the code now traps inside >> do_page_fault() on access to the wrong area. >> >> Signed-off-by: Maxim Uvarov >> >> Test case: >> >> #include >> #include >> #include >> #include >> #include >> >> static struct task_struct *ts; >> static int example_thread(void *dummy) >> { >> void *ptr; >> ptr = vmalloc(16*1024*1024); >> for(;;) >> { >> msleep(100); >> } >> } > > So your test case allocates vmalloc memory but never touches it. Yes, it is so. Bug occurs on rmmod this module. (Module does not free memory allocated with vmalloc(). > >> static void run_vmalloc(void *unused) >> { >> ts=kthread_run(example_thread,NULL,"vtest"); >> } >> int init_module (void) >> { >> run_vmalloc(NULL); >> return 0; >> } >> >> void cleanup_module (void) >> { /*Nothing*/} >> >> >> Originally kernel trapped on BUG() inside exit_mmap() and it was impossible >> to see what has happened. After this patch applied, nice back trace will be >> generated: >> >> CPU 0 Unable to handle kernel paging request at virtual address c00000000036a148 >> Oops[#1]: >> Cpu 0 >> $ 0 : 0000000000000000 ffffffff81940000 0000000000000000 00000000ffff05a7 >> $ 4 : 0000000000000000 ffffffffffffffff ffffffff81a0b7d0 ffffffff811983e4 >> $ 8 : ffffffff817407b0 0000000000000000 0000000000000000 0000000000000000 >> $12 : a80000003374bfe0 0000000000008c00 ffffffff811e9df8 0000000000000000 >> $16 : ffffffff81164a68 a8000000352a3c50 c00000000036a0e8 0000000000000000 >> $20 : 0000000000000000 0000000000000000 0000000000000000 0000000000000000 >> $24 : 0000000000000002 a8000000337bb1a0 >> $28 : a800000033748000 a80000003374bf70 a80000003374bf70 c00000000036a148 >> Hi : 0000000000000000 >> Lo : 000000000000a311 >> epc : c00000000036a148 0xc00000000036a148 Tainted: P >> ra : c00000000036a148 0xc00000000036a148 <-- dead in kernel module vtest >> Status: 10008ce3 KX SX UX KERNEL EXL IE >> Cause : 00000008 >> BadVA : c00000000036a148 >> PrId : 000d0408 >> Modules linked in: >> Process vtest (pid: 723, threadinfo=a800000033748000, task=a800000034530340) >> Stack : 0000000000000000 a80000003374bf90 ffffffff81176530 ffffffff81176488 >> ffffffffffffffff ffffffffffffffff 0000000000000000 0000000000000000 >> 0000000000000000 a80000003374bfd0 ffffffff81125024 0000000000000000 >> 0000000000000000 0000000000000000 5a5a5a5a5a5a5a5a 5a5a5a5a5a5a5a5a >> 5a5a5a5a5a5a5a5a 5a5a5a5a5a5a5aa5 >> Call Trace: >> [] kthread+0x198/0x1f0 >> [] kthread+0xf0/0x1f0 >> [] kernel_thread_helper+0x14/0x20 >> >> >> Code: (Bad address in epc) > > This is a 64-bit kernel crash ... > >> Index: linux-2.6.21/arch/mips/mm/fault.c >> =================================================================== >> --- linux-2.6.21.orig/arch/mips/mm/fault.c >> +++ linux-2.6.21/arch/mips/mm/fault.c >> @@ -282,22 +282,32 @@ vmalloc_fault: >> pte_t *pte_k; >> >> pgd = (pgd_t *) pgd_current[raw_smp_processor_id()] + offset; >> - pgd_k = init_mm.pgd + offset; >> + pgd_k = pgd_offset_k(address); >> >> if (!pgd_present(*pgd_k)) >> goto no_context; >> - set_pgd(pgd, *pgd_k); >> + if (unlikely(!pgd_present(*pgd))) >> + set_pgd(pgd, *pgd_k); >> + else if (pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_k)) >> + goto no_context; >> >> pud = pud_offset(pgd, address); >> pud_k = pud_offset(pgd_k, address); >> if (!pud_present(*pud_k)) >> goto no_context; >> + if (pud_none(*pud) || >> + pud_page_vaddr(*pud) != pud_page_vaddr(*pud_k)) >> + goto no_context; >> >> pmd = pmd_offset(pud, address); >> pmd_k = pmd_offset(pud_k, address); >> if (!pmd_present(*pmd_k)) >> goto no_context; >> - set_pmd(pmd, *pmd_k); >> + if (!pmd_present(*pmd)) >> + set_pmd(pmd, *pmd_k); >> + else >> + if (pmd_page(*pmd) != pmd_page(*pmd_k)) >> + goto no_context; >> >> pte_k = pte_offset_kernel(pmd_k, address); >> if (!pte_present(*pte_k)) > > ... but on 64-bit kernels vmalloc_fault: should not be reached ever. > Ah. OK. > Ralf From ralf@linux-mips.org Thu Sep 10 17:36:53 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 10 Sep 2009 17:36:56 +0200 (CEST) Received: from localhost.localdomain ([127.0.0.1]:47727 "EHLO h5.dl5rb.org.uk" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org with ESMTP id S1492378AbZIJPgx (ORCPT ); Thu, 10 Sep 2009 17:36:53 +0200 Received: from h5.dl5rb.org.uk (localhost.localdomain [127.0.0.1]) by h5.dl5rb.org.uk (8.14.3/8.14.3) with ESMTP id n8AFbmEh012042; Thu, 10 Sep 2009 17:37:51 +0200 Received: (from ralf@localhost) by h5.dl5rb.org.uk (8.14.3/8.14.3/Submit) id n8AFbjxe012039; Thu, 10 Sep 2009 17:37:45 +0200 Date: Thu, 10 Sep 2009 17:37:44 +0200 From: Ralf Baechle To: Maxim Uvarov Cc: linux-mips@linux-mips.org Subject: Re: [MIPS] TLB handler fix for vmalloc'ed addresses Message-ID: <20090910153744.GA10998@linux-mips.org> References: <4AA656D8.9040608@ru.mvista.com> <20090910141518.GA10547@linux-mips.org> <4AA90F3B.6000204@ru.mvista.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4AA90F3B.6000204@ru.mvista.com> User-Agent: Mutt/1.5.19 (2009-01-05) Return-Path: X-Envelope-To: <"|/home/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: 24014 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Thu, Sep 10, 2009 at 06:37:47PM +0400, Maxim Uvarov wrote: >>> TLB exception handler incorrecly handles situation >>> with wrong vmalloc'ed addresses. This patch adds >>> verifications for vmalloc'ed addresses (similar to >>> x86_64 implementation). So the code now traps inside >>> do_page_fault() on access to the wrong area. >>> >>> Signed-off-by: Maxim Uvarov >>> >>> Test case: >>> >>> #include >>> #include >>> #include >>> #include >>> #include >>> >>> static struct task_struct *ts; >>> static int example_thread(void *dummy) >>> { >>> void *ptr; >>> ptr = vmalloc(16*1024*1024); >>> for(;;) >>> { >>> msleep(100); >>> } >>> } >> >> So your test case allocates vmalloc memory but never touches it. > > Yes, it is so. Bug occurs on rmmod this module. (Module does not free memory > allocated with vmalloc(). Nor does it stop the thread on exit or avoid unloading. So panicing is expected. Ralf From muvarov@ru.mvista.com Thu Sep 10 17:48:11 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 10 Sep 2009 17:48:18 +0200 (CEST) Received: from ru.mvista.com ([213.79.90.228]:1265 "EHLO buildserver.ru.mvista.com" rhost-flags-OK-FAIL-OK-FAIL) by ftp.linux-mips.org with ESMTP id S1493561AbZIJPsL (ORCPT ); Thu, 10 Sep 2009 17:48:11 +0200 Received: from [192.168.11.243] (unknown [10.150.0.9]) by buildserver.ru.mvista.com (Postfix) with ESMTP id CC388881D; Thu, 10 Sep 2009 20:48:09 +0500 (SAMST) Message-ID: <4AA91FB9.205@ru.mvista.com> Date: Thu, 10 Sep 2009 19:48:09 +0400 From: Maxim Uvarov User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Ralf Baechle Cc: linux-mips@linux-mips.org Subject: Re: [MIPS] TLB handler fix for vmalloc'ed addresses References: <4AA656D8.9040608@ru.mvista.com> <20090910141518.GA10547@linux-mips.org> <4AA90F3B.6000204@ru.mvista.com> <20090910153744.GA10998@linux-mips.org> In-Reply-To: <20090910153744.GA10998@linux-mips.org> 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: 24015 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: muvarov@ru.mvista.com Precedence: bulk X-list: linux-mips >>>> } >>> So your test case allocates vmalloc memory but never touches it. >> Yes, it is so. Bug occurs on rmmod this module. (Module does not free memory >> allocated with vmalloc(). > > Nor does it stop the thread on exit or avoid unloading. So panicing is > expected. Ralf, I'm sorry for misunderstanding. Original kernel does panic in this situation. In my patch it went to panic with + else if (pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_k)) + goto no_context; Actually it was the reason of this patch. But looks like we need go immediately to no_context for 64 bit and do not do this checks. Maxim. From muvarov@ru.mvista.com Thu Sep 10 18:00:08 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 10 Sep 2009 18:00:16 +0200 (CEST) Received: from ru.mvista.com ([213.79.90.228]:1303 "EHLO buildserver.ru.mvista.com" rhost-flags-OK-FAIL-OK-FAIL) by ftp.linux-mips.org with ESMTP id S1492433AbZIJQAI (ORCPT ); Thu, 10 Sep 2009 18:00:08 +0200 Received: from [192.168.11.243] (unknown [10.150.0.9]) by buildserver.ru.mvista.com (Postfix) with ESMTP id 2896E881D; Thu, 10 Sep 2009 21:00:08 +0500 (SAMST) Message-ID: <4AA92287.3090608@ru.mvista.com> Date: Thu, 10 Sep 2009 20:00:07 +0400 From: Maxim Uvarov User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Ralf Baechle Cc: linux-mips@linux-mips.org Subject: Re: [MIPS] TLB handler fix for vmalloc'ed addresses References: <4AA656D8.9040608@ru.mvista.com> <20090910141518.GA10547@linux-mips.org> <4AA90F3B.6000204@ru.mvista.com> <20090910153744.GA10998@linux-mips.org> <4AA91FB9.205@ru.mvista.com> In-Reply-To: <4AA91FB9.205@ru.mvista.com> 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: 24016 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: muvarov@ru.mvista.com Precedence: bulk X-list: linux-mips Maxim Uvarov wrote: >>>>> } >>>> So your test case allocates vmalloc memory but never touches it. >>> Yes, it is so. Bug occurs on rmmod this module. (Module does not free >>> memory >>> allocated with vmalloc(). >> >> Nor does it stop the thread on exit or avoid unloading. So panicing is >> expected. > > Ralf, I'm sorry for misunderstanding. Original kernel does panic in > this situation. In my patch it went to panic with Original kernel does _NOT_ panic. > + else if (pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_k)) > + goto no_context; > > Actually it was the reason of this patch. > > But looks like we need go immediately to no_context for 64 bit and do > not do this checks. > > Maxim. > From David.Daney@caviumnetworks.com Fri Sep 11 01:55:50 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 11 Sep 2009 01:55:58 +0200 (CEST) Received: from mail3.caviumnetworks.com ([12.108.191.235]:16039 "EHLO mail3.caviumnetworks.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1493567AbZIJXzu (ORCPT ); Fri, 11 Sep 2009 01:55:50 +0200 Received: from caexch01.caveonetworks.com (Not Verified[192.168.16.9]) by mail3.caviumnetworks.com with MailMarshal (v6,5,4,7535) id ; Thu, 10 Sep 2009 16:55:32 -0700 Received: from caexch01.caveonetworks.com ([192.168.16.9]) by caexch01.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 10 Sep 2009 16:54:44 -0700 Received: from dd1.caveonetworks.com ([12.108.191.236]) by caexch01.caveonetworks.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Thu, 10 Sep 2009 16:54:44 -0700 Message-ID: <4AA991C1.1050800@caviumnetworks.com> Date: Thu, 10 Sep 2009 16:54:41 -0700 From: David Daney User-Agent: Thunderbird 2.0.0.21 (X11/20090320) MIME-Version: 1.0 To: Linus Torvalds , Andrew Morton CC: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, ralf@linux-mips.org, linux-mips@linux-mips.org, Martin Schwidefsky , Heiko Carstens , linux390@de.ibm.com, linux-s390@vger.kernel.org, David Howells , Koichi Yasutake , linux-am33-list@redhat.com, Kyle McMartin , Helge Deller , linux-parisc@vger.kernel.org, Benjamin Herrenschmidt , Paul Mackerras , linuxppc-dev@ozlabs.org, Richard Henderson , Ivan Kokshaysky , linux-alpha@vger.kernel.org, Haavard Skinnemoen , Mike Frysinger , uclinux-dist-devel@blackfin.uclinux.org Subject: [PATCH 00/10] Add support for GCC's __builtin_unreachable() and use it in BUG. Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 10 Sep 2009 23:54:44.0061 (UTC) FILETIME=[11D988D0:01CA3272] Return-Path: X-Envelope-To: <"|/home/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: 24017 X-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 Starting with version 4.5, GCC has a new built-in function called __builtin_unreachable(). The function tells the compiler that control flow will never reach that point. Currently we trick the compiler by putting in for(;;); but this has the disadvantage that extra code is emitted for an endless loop. For an i386 kernel using __builtin_unreachable() results in an allyesconfig that is nearly 4000 bytes smaller. This patch set adds support to compiler.h creating a new macro usable in the kernel called unreachable(). If the compiler lacks __builtin_unreachable(), it just expands to for(;;). The x86 and MIPS patches I actually tested with a GCC-4.5 snapshot. Lacking the ability to test the rest of the architectures, I just did what seemed right without even trying to compile the kernel. 01/10 adds the compiler.h support, the rest of the patches retrofit the various architecture BUG macros to use it instead of for(;;) or while(1) loops. I will reply with the 10 patches. The architecture specific patches I will send to a smaller set of people. David Daney (10): Add support for GCC-4.5's __builtin_unreachable() to compiler.h x86: Convert BUG() to use unreachable() MIPS: Convert BUG() to use unreachable() s390: Convert BUG() to use unreachable() mn10300: Convert BUG() to use unreachable() parisc: Convert BUG() to use unreachable() powerpc: Convert BUG() to use unreachable() alpha: Convert BUG() to use unreachable() avr32: Convert BUG() to use unreachable() blackfin: Convert BUG() to use unreachable() arch/alpha/include/asm/bug.h | 2 +- arch/avr32/include/asm/bug.h | 2 +- arch/blackfin/include/asm/bug.h | 2 +- arch/mips/include/asm/bug.h | 4 +--- arch/mn10300/include/asm/bug.h | 3 ++- arch/parisc/include/asm/bug.h | 4 ++-- arch/powerpc/include/asm/bug.h | 2 +- arch/s390/include/asm/bug.h | 2 +- arch/x86/include/asm/bug.h | 4 ++-- include/linux/compiler-gcc4.h | 14 ++++++++++++++ include/linux/compiler.h | 5 +++++ 11 files changed, 31 insertions(+), 13 deletions(-) From David.Daney@caviumnetworks.com Fri Sep 11 01:57:39 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 11 Sep 2009 01:57:45 +0200 (CEST) Received: from mail3.caviumnetworks.com ([12.108.191.235]:16091 "EHLO mail3.caviumnetworks.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1493567AbZIJX5j (ORCPT ); Fri, 11 Sep 2009 01:57:39 +0200 Received: from caexch01.caveonetworks.com (Not Verified[192.168.16.9]) by mail3.caviumnetworks.com with MailMarshal (v6,5,4,7535) id ; Thu, 10 Sep 2009 16:57:32 -0700 Received: from caexch01.caveonetworks.com ([192.168.16.9]) by caexch01.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 10 Sep 2009 16:57:04 -0700 Received: from dd1.caveonetworks.com ([12.108.191.236]) by caexch01.caveonetworks.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Thu, 10 Sep 2009 16:57:04 -0700 Received: from dd1.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dd1.caveonetworks.com (8.14.2/8.14.2) with ESMTP id n8ANv03a002967; Thu, 10 Sep 2009 16:57:00 -0700 Received: (from ddaney@localhost) by dd1.caveonetworks.com (8.14.2/8.14.2/Submit) id n8ANv0xN002966; Thu, 10 Sep 2009 16:57:00 -0700 From: David Daney To: torvalds@linux-foundation.org, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, David Daney , ralf@linux-mips.org, linux-mips@linux-mips.org Subject: [PATCH 03/10] MIPS: Convert BUG() to use unreachable() Date: Thu, 10 Sep 2009 16:56:44 -0700 Message-Id: <1252627011-2933-3-git-send-email-ddaney@caviumnetworks.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <4AA991C1.1050800@caviumnetworks.com> References: <4AA991C1.1050800@caviumnetworks.com> X-OriginalArrivalTime: 10 Sep 2009 23:57:04.0813 (UTC) FILETIME=[65BE95D0:01CA3272] Return-Path: X-Envelope-To: <"|/home/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: 24018 X-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 Use the new unreachable() macro instead of while(1); Signed-off-by: David Daney CC: ralf@linux-mips.org CC: linux-mips@linux-mips.org --- arch/mips/include/asm/bug.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/arch/mips/include/asm/bug.h b/arch/mips/include/asm/bug.h index 6cf29c2..540c98a 100644 --- a/arch/mips/include/asm/bug.h +++ b/arch/mips/include/asm/bug.h @@ -11,9 +11,7 @@ static inline void __noreturn BUG(void) { __asm__ __volatile__("break %0" : : "i" (BRK_BUG)); - /* Fool GCC into thinking the function doesn't return. */ - while (1) - ; + unreachable(); } #define HAVE_ARCH_BUG -- 1.6.2.5 From David.Daney@caviumnetworks.com Fri Sep 11 01:58:03 2009 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 11 Sep 2009 01:58:10 +0200 (CEST) Received: from mail3.caviumnetworks.com ([12.108.191.235]:16136 "EHLO mail3.caviumnetworks.com" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1493610AbZIJX5r (ORCPT ); Fri, 11 Sep 2009 01:57:47 +0200 Received: from caexch01.caveonetworks.com (Not Verified[192.168.16.9]) by mail3.caviumnetworks.com with MailMarshal (v6,5,4,7535) id ; Thu, 10 Sep 2009 16:57:33 -0700 Received: from caexch01.caveonetworks.com ([192.168.16.9]) by caexch01.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 10 Sep 2009 16:57:05 -0700 Received: from dd1.caveonetworks.com ([12.108.191.236]) by caexch01.caveonetworks.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Thu, 10 Sep 2009 16:57:04 -0700 Received: from dd1.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dd1.caveonetworks.com (8.14.2/8.14.2) with ESMTP id n8ANuvpw002959; Thu, 10 Sep 2009 16:56:57 -0700 Received: (from ddaney@localhost) by dd1.caveonetworks.com (8.14.2/8.14.2/Submit) id n8ANupK1002957; Thu, 10 Sep 2009 16:56:51 -0700 From: David Daney To: torvalds@linux-foundation.org, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, David Daney , Thomas Gleixner