From patchwork Mon Oct 15 22:16:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Agner X-Patchwork-Id: 10642511 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 830CD157A for ; Mon, 15 Oct 2018 22:17:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B5E4283A5 for ; Mon, 15 Oct 2018 22:17:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5CA4E299AA; Mon, 15 Oct 2018 22:17:03 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE 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 CDAC2283A5 for ; Mon, 15 Oct 2018 22:17:02 +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:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Nt5ZLzmFBQjcbBRyHljwDLKO6Wp7HNpQHf9Pk369J+U=; b=Lo3tKPLYh+W5nR xK2cEMDGKJWgzqoQ2+yBP6k54Eevq2Lugp/fxEeVb0jwE/MK8ZI2vWtnTmtcbzbcA+yxOJqDpuM5r 3t47P6fquSR4VwNp4RunCxOc2vaTrYWKdYKOPaCPxe+aep0MdH3B8ZeGqjTHKsKXv08j1o6D8WJnE DlDmbiLMnakQspnLtSQWWEmQ40fCa12YmeQrOZL4aEdf06d/qKmHfiq+4UZCvtw2Ljfa3mQMb4Idy P7Od2BeD9nlmBqtDaARB+r2ujd9ZnrFTGGmj3dk3ZW7IdehnEEwrNJpb16nqryNHYqDyn7LkNXs6R sM0dgE8nBe+5wXZ8zRfQ==; 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 1gCBAW-0005my-Qh; Mon, 15 Oct 2018 22:16:56 +0000 Received: from mail.kmu-office.ch ([2a02:418:6a02::a2]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gCBAS-0005kp-Md for linux-arm-kernel@lists.infradead.org; Mon, 15 Oct 2018 22:16:54 +0000 Received: from trochilidae.toradex.int (unknown [IPv6:2a02:169:3460::525]) by mail.kmu-office.ch (Postfix) with ESMTPSA id 9E3EB5C0106; Tue, 16 Oct 2018 00:16:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agner.ch; s=dkim; t=1539641798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=M6JmEVCtUnq7D+ti0w3NkBGcNYQiCg6j51cuvLvMpH8=; b=BYfuLSJy1GSO3z8/vmtk9X9mCacyD9ZRyQ+k+W5NRZUQDr009VRB8n9gldKj26RYA+JSx1 Wk4zkn3L79ZlSGYE4j1hWx9yiTOEwzWZT7RQT8eXUzkzJRPX/GoGevM4qO3SXWtO82mGMH cisISckofZSxqTTZrAGVJA0J+bBs53c= From: Stefan Agner To: linux@armlinux.org.uk, ulli.kroll@googlemail.com Subject: [PATCH 1/2] ARM: copypage-fa: add kto and kfrom to input operands list Date: Tue, 16 Oct 2018 00:16:29 +0200 Message-Id: <20181015221629.13924-1-stefan@agner.ch> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-Spam: Yes X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181015_151652_889684_5071FD89 X-CRM114-Status: GOOD ( 11.80 ) 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: arnd@arndb.de, nico@linaro.org, linus.walleij@linaro.org, linux-kernel@vger.kernel.org, Stefan Agner , joel@jms.id.au, linux-arm-kernel@lists.infradead.org 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 When functions incoming parameters are not in input operands list gcc 4.5 does not load the parameters into registers before calling this function but the inline assembly assumes valid addresses inside this function. This breaks the code because r0 and r1 are invalid when execution enters v4wb_copy_user_page () Also the constant needs to be used as third input operand so account for that as well. This fixes copypage-fa.c what has previously done before for the other copypage implementations in commit 9a40ac86152c ("ARM: 6164/1: Add kto and kfrom to input operands list."). Signed-off-by: Stefan Agner Signed-off-by: Nicolas Pitre Tested-by: Stefan Agner Signed-off-by: Nicolas Pitre Reviewed-by: Stefan Agner --- arch/arm/mm/copypage-fa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mm/copypage-fa.c b/arch/arm/mm/copypage-fa.c index d130a5ece5d5..ec6501308c60 100644 --- a/arch/arm/mm/copypage-fa.c +++ b/arch/arm/mm/copypage-fa.c @@ -22,7 +22,7 @@ fa_copy_user_page(void *kto, const void *kfrom) { asm("\ stmfd sp!, {r4, lr} @ 2\n\ - mov r2, %0 @ 1\n\ + mov r2, %2 @ 1\n\ 1: ldmia r1!, {r3, r4, ip, lr} @ 4\n\ stmia r0, {r3, r4, ip, lr} @ 4\n\ mcr p15, 0, r0, c7, c14, 1 @ 1 clean and invalidate D line\n\ @@ -36,7 +36,7 @@ fa_copy_user_page(void *kto, const void *kfrom) mcr p15, 0, r2, c7, c10, 4 @ 1 drain WB\n\ ldmfd sp!, {r4, pc} @ 3" : - : "I" (PAGE_SIZE / 32)); + : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 32)); } void fa_copy_user_highpage(struct page *to, struct page *from,