From patchwork Thu Nov 29 14:32:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 202904 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9B2202C0093 for ; Fri, 30 Nov 2012 20:44:30 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TeN56-000409-0J; Fri, 30 Nov 2012 09:40:25 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Te5AG-0006eE-QH for linux-arm-kernel@lists.infradead.org; Thu, 29 Nov 2012 14:32:34 +0000 Received: from klappe2.localnet (HSI-KBW-46-223-46-140.hsi.kabel-badenwuerttemberg.de [46.223.46.140]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0LpzzH-1SygX81veB-00fKvy; Thu, 29 Nov 2012 15:32:25 +0100 From: Arnd Bergmann To: Linus Torvalds Subject: [GIT PULL] ARM: ixp4xx bug fixes Date: Thu, 29 Nov 2012 14:32:24 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) References: <201211291424.25711.arnd@arndb.de> In-Reply-To: <201211291424.25711.arnd@arndb.de> MIME-Version: 1.0 Message-Id: <201211291432.24480.arnd@arndb.de> X-Provags-ID: V02:K0:xqM4ydaHDDavE06p03XOS9PJZLmxpD3wKQjaCpLi83r 7bRL0T2n8lBIJJE7pOIRJ0oLRYQErGMmPMSwynQWTxbJf8xg1T EViv7rxj8dDxbJspJEVFRk8qNAYh11pNoYyu9GLnA370g55bJx VONfGLaIrp1eB+tD4KYgG8KHR3qNWumix1A+7nX+PyYxDH6pe/ tw0jqXpahnD/q5uUc7zdJmOZY1tN7hGqrN9v7wfLFK46vz068u f+WW8oHycpb+LKqGSKbm6kBBXtmW+omXhPTy2c9p6mG2JIs5BI tL97Ye+52t5Hmv/pIqnb6QSybNY9GxiiP2zBj0h2k9PSzG/qOg RUvRahaOg/jH8sS7JiRs= X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121129_093233_158686_44471851 X-CRM114-Status: GOOD ( 13.36 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Mailman-Approved-At: Fri, 30 Nov 2012 04:37:59 -0500 Cc: "arm@kernel.org" , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jason Cooper X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi Linus, These are the bug fixes originally sent as part of a longer patch series by Krzysztof Halasa. I've already queued them up for 3.8 now, since I think it's too much churn this late in the cycle. On the other hand they have been in Linux-next for ages and some of them look like they fix serious problems in ixp4xx, so if you don't mind messing up the diffstat for the post-rc7 patches, you can also decide to pick them up. Arnd --- The following changes since commit f4a75d2eb7b1e2206094b901be09adb31ba63681: Linux 3.7-rc6 (2012-11-16 17:42:40 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/ixp4xx-fixes for you to fetch changes up to 0d2c9f0517e915ce03a04e91d3207827e0d274a8: IXP4xx: use __iomem for MMIO (2012-11-22 03:36:45 +0000) ---------------------------------------------------------------- ARM: ixp4xx bug fixes These were originally prepared by Krzysztof Halasa but not submitted in time for v3.7 due to some confusion about how ixp4xx patches should be handled. Jason Cooper thankfully offered to help out sending the patches upstream through arm-soc now, but given the timing, we could as well delay them for 3.8. ---------------------------------------------------------------- Arnd Bergmann (1): IXP4xx: use __iomem for MMIO Krzysztof Hałasa (9): IXP4xx: Fix Goramo MultiLink platform compilation. IXP4xx: Fix off-by-one bug in Goramo MultiLink platform. IXP4xx: HW pseudo-random generator is available on IXP45x/46x only. IXP4xx: ixp4xx_crypto driver requires Queue Manager and NPE drivers. IXP4xx: Remove time limit for PCI TRDY to enable use of slow devices. WAN: Remove redundant HDLC info printed by IXP4xx HSS driver. IXP4xx crypto: MOD_AES{128,192,256} already include key size. IXP4xx: Always ioremap() Queue Manager MMIO region at boot. IXP4xx: map CPU config registers within VMALLOC region. Tim Gardner (1): ixp4xx: Declare MODULE_FIRMWARE usage arch/arm/mach-ixp4xx/common-pci.c | 1 + arch/arm/mach-ixp4xx/common.c | 13 +++++-------- arch/arm/mach-ixp4xx/goramo_mlr.c | 3 ++- arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 4 ++-- arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 46 +++++++++++++++++++--------------------------- arch/arm/mach-ixp4xx/include/mach/qmgr.h | 12 ++++++------ arch/arm/mach-ixp4xx/ixp4xx_npe.c | 9 ++++++++- arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 12 +----------- drivers/char/hw_random/Kconfig | 6 +++--- drivers/char/hw_random/ixp4xx-rng.c | 5 ++++- drivers/crypto/Kconfig | 2 +- drivers/crypto/ixp4xx_crypto.c | 12 ++++++------ drivers/net/wan/ixp4xx_hss.c | 2 +- 13 files changed, 59 insertions(+), 68 deletions(-)