From patchwork Wed Apr 4 07:46:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?=C5=81ukasz_Stelmach?= X-Patchwork-Id: 894876 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=samsung.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="PoEoF5kB"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="PgrKHXMg"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40GJ2z29rYz9s0m for ; Wed, 4 Apr 2018 17:47:39 +1000 (AEST) 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=wm9CCpXuSopAPKr4qFm/VZiDaaKgYWSpbtvom+jAWvA=; b=PoEoF5kBlqU4io TCb++gxUvQhhtHOgnApFyYgcnnTB9TOPA/Ueu3XmLgNod3OUAmINc6GylC8q5/Y3smyH0WcT7xJBu 1li73nuYMy4vh2Wk5MmXx+QNxop+4FUuEG5kn/9FxNKjx05NEMYWCUcAmIl0fLaXKJq+cwqcsUKaP Qtz0x5rSNZH/5eLeWJGKT1dNJTVxWlBidHaToKfTTdrOBVKP3f4K10pfDImnVl8h3dlbwrfB7JxJw 4yUYgyAAD3/WM5yuig8AsPWXHqy1czNpFEuECB0pRbKvpmh2L+TnmTolYs5VZz/aYN4+RYmuggE0c 9Cvu3vZzMGK+NJqmDBtg==; 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 1f3d8k-0000D9-JZ; Wed, 04 Apr 2018 07:47:30 +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 1f3d8f-0000BT-5A for linux-arm-kernel@lists.infradead.org; Wed, 04 Apr 2018 07:47:27 +0000 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20180404074702euoutp012f973f62c5b8c7495b8365434c728a30~iLASmr7sq0960709607euoutp01R; Wed, 4 Apr 2018 07:47:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20180404074702euoutp012f973f62c5b8c7495b8365434c728a30~iLASmr7sq0960709607euoutp01R DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1522828022; bh=wg7LP8dpzwW/cfNrahqyseIDMEeeZw68827VPpuWbT4=; h=From:To:Cc:Subject:Date:References:From; b=PgrKHXMg0MdyKaufZ6l1Ts8fUBaZwm8dRKjRdN1UA+S0nmFgcwGvDENNRwsJIqGcD t66x5Q9gjX/bfwTpixAai/yELbWn3kdOzcMXT2SqP6KixnbyGh6E5D6ukvwmyADdYT YCCkgeAzzZKhbRhCvx9Z7Sg6kzGtKxsB7mRgi8BQ= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180404074701eucas1p1899acf8aa0d195d4999964e71922f6dd~iLARfBw_b2356323563eucas1p1G; Wed, 4 Apr 2018 07:47:01 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 8E.B5.10409.4F284CA5; Wed, 4 Apr 2018 08:47:00 +0100 (BST) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180404074700eucas1p12cdb8b0de3da46c433e505555129c7e6~iLAQmundb2427224272eucas1p1B; Wed, 4 Apr 2018 07:47:00 +0000 (GMT) X-AuditID: cbfec7f5-b5fff700000028a9-dc-5ac482f428f8 Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 69.82.04178.4F284CA5; Wed, 4 Apr 2018 08:47:00 +0100 (BST) 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 <0P6N00EZ5HMC4160@eusync1.samsung.com>; Wed, 04 Apr 2018 08:47:00 +0100 (BST) From: =?utf-8?q?=C5=81ukasz_Stelmach?= To: Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: decompressor: restore r1 and r2 just before jumping to the kernel Date: Wed, 04 Apr 2018 09:46:58 +0200 Message-id: <20180404074658.28288-1-l.stelmach@samsung.com> X-Mailer: git-send-email 2.11.0 Organization: Samsung R&D Institute Poland X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrKIsWRmVeSWpSXmKPExsWy7djP87pfmo5EGXzpNLPYOGM9q0Xjp7nM FjcPrWC02PT4GqvF5V1z2CwOTd3LaLH2yF12B3aPy9cuMntsXlLv0bdlFaPH501yASxRXDYp qTmZZalF+nYJXBkdVy8zFzznqDjXuZS9gfEHWxcjJ4eEgInE9xVXGLsYuTiEBFYwSpyfPJEJ wvnMKPF16SlmmKrLpy+yQiSWMUpsbFsL1s4rICjxY/I9li5GDg5mAXmJI5eyQcLMApoSW3ev Z4eo/8IoMfPEGVaQBJuAo0T/0hNgtohAgMTpYz/AhjKDFO14/w5sqLBApMTSj4/BilgEVCVO 3ZkBtcxaYtqFZhaIi+QldrVdBKvhF9CSWNN0nQVkkITAEjaJg3MfskMUuUic/bgN6gVhiVfH t0DFZSQ6Ow4yQdjlEu/m7IeKNzBKfP6lB2FbS/xZNZEN4h0+iUnbpjODfCkhwCvR0SYEUeIB ZO5ihLAdJa5+fAx2m5BArMSkRxNYJzDKzkIKo1mIMJqFFEYLGJlXMYqnlhbnpqcWG+ellusV J+YWl+al6yXn525iBCaG0/+Of93BuO9P0iFGAQ5GJR7egAWHo4RYE8uKK3MPMUpwMCuJ8O5Q OhIlxJuSWFmVWpQfX1Sak1p8iFGag0VJnDdOoy5KSCA9sSQ1OzW1ILUIJsvEwSnVwOjXxiEU cFTD+L7gYwcVtpWLPeoOHteYX6Vmpeb1oPTP9Z/GcTHq353d+HZu7bn75sy/5+IvsisunSzv OtiZkOZbL1I8rWZC0ZfcPFU7Pgk1Pf5HTM9rzHoDPi0x3SsQ0S4pNcF1wsFdesERqxwLcxPW 5n1iZzN3NchadPVcz3ZFBVX5C6tvKrEUZyQaajEXFScCADi7RggIAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrFLMWRmVeSWpSXmKPExsVy+t/xy7pfmo5EGTzeJ2SxccZ6VovGT3OZ LW4eWsFosenxNVaLy7vmsFkcmrqX0WLtkbvsDuwel69dZPbYvKTeo2/LKkaPz5vkAliiuGxS UnMyy1KL9O0SuDI6rl5mLnjOUXGucyl7A+MPti5GTg4JAROJy6cvsoLYQgJLGCUm3KsHsXkF BCV+TL7H0sXIwcEsIC9x5FI2SJhZQF1i0rxFzF2MXEDl3xglVnzdwwiSYBNwlOhfegJsjoiA n8TdPweYIBq+MEp8XukHYgsLREos/fgYrIZFQFXi1J0ZbBC7rCWmXWhmgbhHXmJXG8Q9/AJa EmuarrNMYOSbheSkWQgnzUJy0gJG5lWMIqmlxbnpucWGesWJucWleel6yfm5mxiBIbrt2M/N OxgvbQw+xCjAwajEw7ti0eEoIdbEsuLK3EOMEhzMSiK8O5SORAnxpiRWVqUW5ccXleakFh9i lOZgURLnPW9QGSUkkJ5YkpqdmlqQWgSTZeLglGpgdPoetn/RJb4qtekd7y4eTp6md+C8UuSx Hwc0brv0PGex3McsU6G06sl7hvD3Tj2TA5z/pf9fm9S5bf5b05V29hbewet0E494fLlbW7/u Xda6hiC7jLppcUc3c/peKnuSu4Oh62uAAJu3zIMH5wNU+c4I3VJIzP6htPtg67MO3ocb11/Y NrHQTomlOCPRUIu5qDgRAE1KiHZNAgAA X-CMS-MailID: 20180404074700eucas1p12cdb8b0de3da46c433e505555129c7e6 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180404074700eucas1p12cdb8b0de3da46c433e505555129c7e6 X-RootMTR: 20180404074700eucas1p12cdb8b0de3da46c433e505555129c7e6 References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180404_004725_337914_6595466F X-CRM114-Status: GOOD ( 14.04 ) X-Spam-Score: -5.1 (-----) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-5.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [210.118.77.11 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [210.118.77.11 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Karol Lewandowski , Bartlomiej Zolnierkiewicz , =?utf-8?q?=C5=81ukasz_Stelmach?= , linux-kernel@vger.kernel.org, Marek Szyprowski 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 Hypervisor setup before __enter_kernel destroys the value sotred in r1. The value needs to be restored just before the jump. Signed-off-by: Łukasz Stelmach --- arch/arm/boot/compressed/head.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 182bf6add0b9..517e0e18f0b8 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -561,8 +561,6 @@ not_relocated: mov r0, #0 bl decompress_kernel bl cache_clean_flush bl cache_off - mov r1, r7 @ restore architecture number - mov r2, r8 @ restore atags pointer #ifdef CONFIG_ARM_VIRT_EXT mrs r0, spsr @ Get saved CPU boot mode @@ -1365,6 +1363,8 @@ __hyp_reentry_vectors: __enter_kernel: mov r0, #0 @ must be 0 + mov r1, r7 @ restore architecture number + mov r2, r8 @ restore atags pointer ARM( mov pc, r4 ) @ call kernel M_CLASS( add r4, r4, #1 ) @ enter in Thumb mode for M class THUMB( bx r4 ) @ entry point is always ARM for A/R classes