From patchwork Tue Jan 14 15:41:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Cooper X-Patchwork-Id: 310767 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0F5312C0091 for ; Wed, 15 Jan 2014 02:42:41 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W3687-00035v-Br; Tue, 14 Jan 2014 15:42:15 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W3685-0007mp-14; Tue, 14 Jan 2014 15:42:13 +0000 Received: from mho-03-ewr.mailhop.org ([204.13.248.66] helo=mho-01-ewr.mailhop.org) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W3682-0007l0-9b for linux-arm-kernel@lists.infradead.org; Tue, 14 Jan 2014 15:42:11 +0000 Received: from pool-108-39-110-144.nrflva.fios.verizon.net ([108.39.110.144] helo=titan) by mho-01-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1W367e-000Hy6-4x; Tue, 14 Jan 2014 15:41:46 +0000 Received: from titan.lakedaemon.net (localhost [127.0.0.1]) by titan (Postfix) with ESMTP id B35C9509AB0; Tue, 14 Jan 2014 10:41:41 -0500 (EST) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 108.39.110.144 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX182i9dhr5DQuUAx9pzNdryeiqQlUBPb3OQ= X-DKIM: OpenDKIM Filter v2.0.1 titan B35C9509AB0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lakedaemon.net; s=mail; t=1389714101; bh=hg6ijzQ6AOPTN+DANi03vnhHLF/HnzGo/qeSTGSdmn0=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=YsC67H4uGZ2A2XFOmT/cGwC/igsW0JbqAgcAl+lauRGHm5FdY6byJ8pmBJB3/+l4d FR0VeZrwo14F5oQ1GWLi409NQ3eJelqBFStL2DHea4gZCu2wFMZONekkRoMDD8QiMh xc9+iKmOJ2qKDqS7XCGvGS4iLcASM/1wpGFiaPu16nKA8ajbKFYiYTIq3lN2FmhhRO HAYHtKNrX9jkkNy71zj7prt1Vg+T5/uT/rK+9ET0CMag4J99LXioXlEOUz3TmGH3Z2 87AlL/GX1G/drBmn/1HG0GaeGUlgQtCS4aeQ6DhdD4Bts1aNUHVuRFdMK6tMH0UtLs QOGY0JhMAgOAw== Date: Tue, 14 Jan 2014 10:41:41 -0500 From: Jason Cooper To: Arnd Bergmann , Olof Johansson , Kevin Hilman , arm@kernel.org, Greg KH Subject: [GIT PULL] ARM: mvebu: stable fix for v3.13 Message-ID: <20140114154141.GO19878@titan.lakedaemon.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140114_104210_374418_E21C1109 X-CRM114-Status: GOOD ( 15.67 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.66 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Gregory CLEMENT , Andrew Lunn , linux-stable@vger.kernel.org, Sebastian Hesselbarth , Linux ARM Kernel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org arm-soc folks, Sorry for the lateness in the window on this one. I'd like to see it get into v3.13 if possible, but if it doesn't get there till v3.13.1, I understand. This fixes a boot hang experienced on some Openblocks AX3-4 boards. Once i2c transaction support was added, it was discovered that the A0 revision of the Armada XP had broken offload support which causes the kernel to hang at boot. The only way to detect this situation is to read the PCI config register to get the SoC revision, then disable offload if we are on an A0 SoC. Unfortunately, this makes for a rather large patch series against stable. Doing the fix in a smaller patch would create a runtime dependency between i2c and PCI which we prefer to avoid. I'm Cc'ing Greg and linux-stable as a heads-up, and so they can comment or ask questions. thx, Jason. The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae: Linux 3.13-rc1 (2013-11-22 11:30:55 -0800) are available in the git repository at: git://git.infradead.org/linux-mvebu.git tags/mvebu-fixes-3.13 for you to fetch changes up to f8b94beb7e6a374cb0de531b72377c49857b35ca: i2c: mv64xxx: Document the newly introduced Armada XP A0 compatible (2014-01-14 02:09:17 +0000) ---------------------------------------------------------------- mvebu late fixes for v3.13 - mvebu - fix boot hang on Armada XP due to broken i2c offloading in A0 SoC revision (specifically experienced on some early OpenBlocks AX3-4 boards) ---------------------------------------------------------------- Gregory CLEMENT (4): ARM: mvebu: Add support to get the ID and the revision of a SoC ARM: mvebu: Add quirk for i2c for the OpenBlocks AX3-4 board i2c: mv64xxx: Fix bus hang on A0 version of the Armada XP SoCs i2c: mv64xxx: Document the newly introduced Armada XP A0 compatible .../devicetree/bindings/i2c/i2c-mv64xxx.txt | 6 +- arch/arm/mach-mvebu/Makefile | 2 +- arch/arm/mach-mvebu/armada-370-xp.c | 32 ++++++ arch/arm/mach-mvebu/mvebu-soc-id.c | 119 +++++++++++++++++++++ arch/arm/mach-mvebu/mvebu-soc-id.h | 32 ++++++ drivers/i2c/busses/i2c-mv64xxx.c | 5 + 6 files changed, 194 insertions(+), 2 deletions(-) create mode 100644 arch/arm/mach-mvebu/mvebu-soc-id.c create mode 100644 arch/arm/mach-mvebu/mvebu-soc-id.h