From patchwork Fri Mar 23 10:36:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukasz Stelmach X-Patchwork-Id: 10303867 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7B43260384 for ; Fri, 23 Mar 2018 10:37:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C46B28CF8 for ; Fri, 23 Mar 2018 10:37:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60FDF28DB1; Fri, 23 Mar 2018 10:37:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 967C128CF8 for ; Fri, 23 Mar 2018 10:37:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:References:Message-id:Date:Subject:To: From:MIME-version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: List-Owner; bh=GBEwXsn4FwRyC0nMoOYJkJPoXaNqqFq/Jpw+ysnMfhA=; b=sTZKrIBAYaS/ZR N/Vf2Ofe69K1yC9yEd/Ex9CZyGIGEINQ8CI0sI5HXZ03FuI7LIZBzqk/PGRFjup1XzCX2QNkhKRNd B51BXiD9VPPoHDNbNCYJtv4EcFiCDJ15sJI/PBpZruGCAxTJXJ7e9hbMoqqFeSzNADINaYe9vwqhC vP955MGMVC62cUitdlH02Q/lSWQyuTIjepFcmhmHTPrzTQseuEekr3Y1NQ4+W3Mrvb/DdS+jaNIw7 gUvIV737emSNznqPDyGPoH+Cc0b5JJjiSFVvZblpZoGTZIBzcazRCFdIimZuQG0mfjz75UDnKp8Gq bpHpbYXo0MNaXlR+YFUQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ezK42-0007qK-BG; Fri, 23 Mar 2018 10:36:50 +0000 Received: from mailout1.w1.samsung.com ([210.118.77.11]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ezK3t-0007iK-FD for linux-arm-kernel@lists.infradead.org; Fri, 23 Mar 2018 10:36:47 +0000 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20180323103620euoutp01f96014e1ef3dc1e3ec28b7038410269e~ehkrzkWS-1597315973euoutp018; Fri, 23 Mar 2018 10:36:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20180323103620euoutp01f96014e1ef3dc1e3ec28b7038410269e~ehkrzkWS-1597315973euoutp018 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1521801380; bh=NpmBmyzQkVAUgobq8A+j38dmVyEzls3Idxu3Y53yYWQ=; h=From:To:Cc:Subject:Date:References:From; b=pp/vupMqn5EvQ9pZRx6V+eYoKXVM8mnvyn04EMcc9G0ZNjnlLz1q8mXCnYRHGW1+O Bdjb4CdZOUWM1KaSLSq4lEHx9bzxY5p6G+laBsfCWCprXpQXS9YQLXgU6MywSsK8Np 4qT76o8WtV21k/6yj4Z9ZG6ikn26jxBPz+gcuYaQ= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180323103619eucas1p1dccb1007c26355675fc65f590d175291~ehkqxlYBc0077800778eucas1p1S; Fri, 23 Mar 2018 10:36:19 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id DF.70.05700.2A8D4BA5; Fri, 23 Mar 2018 10:36:18 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180323103618eucas1p22b042fbfef32fb36d9723993ec749d1b~ehkpnBOtF1562015620eucas1p2e; Fri, 23 Mar 2018 10:36:18 +0000 (GMT) X-AuditID: cbfec7f2-1c1ff70000011644-8a-5ab4d8a28709 Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 8F.BE.04178.2A8D4BA5; Fri, 23 Mar 2018 10:36:18 +0000 (GMT) MIME-version: 1.0 Received: from localhost ([106.116.147.110]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0P61006UTHGH4B10@eusync1.samsung.com>; Fri, 23 Mar 2018 10:36:18 +0000 (GMT) From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= To: Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: decompressor: add a missing parameter to the addruart macro Date: Fri, 23 Mar 2018 11:36:16 +0100 Message-id: <20180323103616.24426-1-l.stelmach@samsung.com> X-Mailer: git-send-email 2.11.0 Organization: Samsung R&D Institute Poland X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrKIsWRmVeSWpSXmKPExsWy7djPc7qLbmyJMnhy2cxi44z1rBaNn+Yy W9w8tILRYtPja6wWl3fNYbM4NHUvo8XaI3fZHdg9Ll+7yOyxeUm9R9+WVYwenzfJBbBEcdmk pOZklqUW6dslcGU8PTOduWAtf8WxDT8ZGxhvcHcxcnJICJhI9GxoYu1i5OIQEljBKPH18mVG COczo8S7pi52mKr7v1azQySWMUr8ezOFFSTBKyAo8WPyPZYuRg4OZgF5iSOXskHCzAKaElt3 r4eq/8IoMWXuNBaQBJuAo0T/0hNgvSICARKnj/0AW80MUrTj/Ts2kISwQLDEhMWnwRpYBFQl etsfMkEss5Z4vPUiE8RF8hK72i6CDeIX0JJY03SdBWSQhMAKNokfOzdAFblI/Nv8gA3CFpZ4 dXwL1DsyEp0dB6FqyiXezdkPFW9glPj8Sw/Ctpb4s2oiG8Q7fBKTtk1nBvlSQoBXoqNNCKLE Q2L5rClQrY4SX78dAisXEoiV6LtzhH0Co+wspDCahQijWUhhtICReRWjeGppcW56arFhXmq5 XnFibnFpXrpecn7uJkZgYjj97/inHYxfLyUdYhTgYFTi4Z1xaHOUEGtiWXFl7iFGCQ5mJRHe 73O3RAnxpiRWVqUW5ccXleakFh9ilOZgURLnjdOoixISSE8sSc1OTS1ILYLJMnFwSjUwWgs/ 0FGXKRDYs23O/zOTXuQnbex7xrGL6e6rlF1xKa6cb0L11UX6Zl5XnyjQsmbqacGLsucFLhwQ 690TH5Z6Neizqn9Nk9EVBfXl8+tfPS42jnji+nqD7vz458Vn3lx/L+D644ukVIVe2l3pqe8v ZMnN/ruv/FCuzfw/AvejvbVWVHjXa3z9r8RSnJFoqMVcVJwIAFjLN2AIAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrNLMWRmVeSWpSXmKPExsVy+t/xy7qLbmyJMljXxW2xccZ6VovGT3OZ LW4eWsFosenxNVaLy7vmsFkcmrqX0WLtkbvsDuwel69dZPbYvKTeo2/LKkaPz5vkAliiuGxS UnMyy1KL9O0SuDKenpnOXLCWv+LYhp+MDYw3uLsYOTkkBEwk7v9azd7FyMUhJLCEUeL5maOM IAleAUGJH5PvsXQxcnAwC8hLHLmUDRJmFlCXmDRvETNE/TdGiaa5h8Hq2QQcJfqXnmAFsUUE /CTu/jnABNHwhVHi80o/EFtYIFhiwuLTLCA2i4CqRG/7QyaIXdYSj7deZII4SF5iV9tFsDn8 AloSa5qus0xg5JuF5KRZCCfNQnLSAkbmVYwiqaXFuem5xYZ6xYm5xaV56XrJ+bmbGIFBuu3Y z807GC9tDD7EKMDBqMTDO+PQ5igh1sSy4srcQ4wSHMxKIrzf526JEuJNSaysSi3Kjy8qzUkt PsQozcGiJM573qAySkggPbEkNTs1tSC1CCbLxMEp1cA4R1smd+LW/I/nvgUcNl8ddzdS54Wg 1dPs+xyaL0oZDM24/dyOBZ7MnJvy87jd9K/PXDYslbEWdj2yRiB2l9WOHYv6rOawlbVsepF+ T2lG1XvLpDb7hCe7F76VCHTcY/VLKGc6f2kXx7NI3m31n0X23t3/aKHnjZCJPjW/3C1EahJe Ps08KTpNiaU4I9FQi7moOBEAwL9ENU4CAAA= X-CMS-MailID: 20180323103618eucas1p22b042fbfef32fb36d9723993ec749d1b X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180323103618eucas1p22b042fbfef32fb36d9723993ec749d1b X-RootMTR: 20180323103618eucas1p22b042fbfef32fb36d9723993ec749d1b References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180323_033641_955058_374FC87C X-CRM114-Status: GOOD ( 12.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Karol Lewandowski , Bartlomiej Zolnierkiewicz , =?UTF-8?q?=C5=81ukasz=20Stelmach?= , linux-kernel@vger.kernel.org, Marek Szyprowski Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In commit 639da5ee374b an additional temporary register was added to the addruart macro, but the decompressor code wasn't updated. Signed-off-by: Łukasz Stelmach --- arch/arm/boot/compressed/head.S | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 45c8823c3750..182bf6add0b9 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -29,19 +29,19 @@ #if defined(CONFIG_DEBUG_ICEDCC) #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7) - .macro loadsp, rb, tmp + .macro loadsp, rb, tmp1, tmp2 .endm .macro writeb, ch, rb mcr p14, 0, \ch, c0, c5, 0 .endm #elif defined(CONFIG_CPU_XSCALE) - .macro loadsp, rb, tmp + .macro loadsp, rb, tmp1, tmp2 .endm .macro writeb, ch, rb mcr p14, 0, \ch, c8, c0, 0 .endm #else - .macro loadsp, rb, tmp + .macro loadsp, rb, tmp1, tmp2 .endm .macro writeb, ch, rb mcr p14, 0, \ch, c1, c0, 0 @@ -57,7 +57,7 @@ .endm #if defined(CONFIG_ARCH_SA1100) - .macro loadsp, rb, tmp + .macro loadsp, rb, tmp1, tmp2 mov \rb, #0x80000000 @ physical base address #ifdef CONFIG_DEBUG_LL_SER3 add \rb, \rb, #0x00050000 @ Ser3 @@ -66,8 +66,8 @@ #endif .endm #else - .macro loadsp, rb, tmp - addruart \rb, \tmp + .macro loadsp, rb, tmp1, tmp2 + addruart \rb, \tmp1, \tmp2 .endm #endif #endif @@ -1297,7 +1297,7 @@ phex: adr r3, phexbuf b 1b @ puts corrupts {r0, r1, r2, r3} -puts: loadsp r3, r1 +puts: loadsp r3, r2, r1 1: ldrb r2, [r0], #1 teq r2, #0 moveq pc, lr @@ -1314,8 +1314,8 @@ puts: loadsp r3, r1 @ putc corrupts {r0, r1, r2, r3} putc: mov r2, r0 + loadsp r3, r1, r0 mov r0, #0 - loadsp r3, r1 b 2b @ memdump corrupts {r0, r1, r2, r3, r10, r11, r12, lr}