From patchwork Thu Oct 3 15:51:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 175177 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp611393ill; Thu, 3 Oct 2019 10:13:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqxK/H0gSa6zkrpm9qxJi877pQ8czucb3GAm7mSijfnnXnwBrNPK5ZLxTWF0ZsdrpcuMzfzw X-Received: by 2002:a17:906:d0d2:: with SMTP id bq18mr8661560ejb.233.1570122818942; Thu, 03 Oct 2019 10:13:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570122818; cv=none; d=google.com; s=arc-20160816; b=uEIM8fsgmmgJTz5mqG3YuwsKNb+iVlEcqcFoY9Nw+IxQwUumIuT3Ffnl/da6rnKB2g sk7zWE5CRv/6yZwMr6FmYsnLylvAZ97yQ2OoX25zUrgw43J8VFVcwP7sArzUI4bdpnUG S1BbLpIwVzlTVi2jTo1F+PBr51XHvGZX/hl3egdPmoZVCeaO5g3elcZyjV1KlK5SkJEy 7HwKxMGldMRpxiGp+Q+RuniP/A51V1zVyWxRKUEdA4Ukflw9YK4Sz68V5NsSa0Ke0ISM rkpeduqjI5hqx0sIvkbrYyM+Is/pRXnDZ4EomU+VXNahKMbO7dFo033xicwxXCgpCLo2 DwmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=m6I3xn6EKZt4rJcOF1XQQjGGJ6TiIyyFBwU5bD4MkHg=; b=qz/YKm2iNrF/EZEi7XQ4Ps4YSSL3xB4AtF0CcVjg0YATNWLulTQpOtvwmFRLI780lL NT8+z/slX53bLSIXkxH3aEESz1lmLqWnBoC3hjEN2NVWkOc7t3shw/DfkL0h/8nfu1K8 CW16GPeM41HHa/G5XR3JXszEMJx9NEi653yNLtMBBzCRgdhrzKxvIPJ3Sis1E7+yV/eD iAfdYohXFizNTzttYpyx3VuuAlc4m1q2HOOLgc2ceXkU8UbpV6wTzTMKZM53oxOAbFYA iP2dWjWageXhBRMa8Jh78+BRpkhSXGCUReqgLRj0bpnBSzlqAJ6kcPkUYiHxkZBGB+si 9laA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NT6i6wtN; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z19si1666374ejr.244.2019.10.03.10.13.38; Thu, 03 Oct 2019 10:13:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NT6i6wtN; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730116AbfJCQ2e (ORCPT + 14 others); Thu, 3 Oct 2019 12:28:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:33026 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389346AbfJCQ2d (ORCPT ); Thu, 3 Oct 2019 12:28:33 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 67B822133F; Thu, 3 Oct 2019 16:28:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120111; bh=R84mSIxpEX1AcPIuhZJU0uwLWQyn3K4b+Mpvg9kxH0k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NT6i6wtNm8SCLOgQduDjP8S0Uk7yLmvHyr1eGkSE1y8Kt0L3vdS3rq8b7ctiHE4ZC xLfysMGmm7oz9+A4NPFEIu/Ymkr+z01KIHme+jqYa7iUdSDpHYVfLbSRs64EqKimWk OLrV/h9DYSt6a5ApRxWtzSaUTm1+10AbZF+dBa/8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Sasha Levin Subject: [PATCH 5.2 101/313] ARM: xscale: fix multi-cpu compilation Date: Thu, 3 Oct 2019 17:51:19 +0200 Message-Id: <20191003154542.856795646@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154533.590915454@linuxfoundation.org> References: <20191003154533.590915454@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit c7b68049943079550d4e6af0f10aa3aabd64131a ] Building a combined ARMv4+XScale kernel produces these and other build failures: /tmp/copypage-xscale-3aa821.s: Assembler messages: /tmp/copypage-xscale-3aa821.s:167: Error: selected processor does not support `pld [r7,#0]' in ARM mode /tmp/copypage-xscale-3aa821.s:168: Error: selected processor does not support `pld [r7,#32]' in ARM mode /tmp/copypage-xscale-3aa821.s:169: Error: selected processor does not support `pld [r1,#0]' in ARM mode /tmp/copypage-xscale-3aa821.s:170: Error: selected processor does not support `pld [r1,#32]' in ARM mode /tmp/copypage-xscale-3aa821.s:171: Error: selected processor does not support `pld [r7,#64]' in ARM mode /tmp/copypage-xscale-3aa821.s:176: Error: selected processor does not support `ldrd r4,r5,[r7],#8' in ARM mode /tmp/copypage-xscale-3aa821.s:180: Error: selected processor does not support `strd r4,r5,[r1],#8' in ARM mode Add an explict .arch armv5 in the inline assembly to allow the ARMv5 specific instructions regardless of the compiler -march= target. Link: https://lore.kernel.org/r/20190809163334.489360-5-arnd@arndb.de Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- arch/arm/mm/copypage-xscale.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/arch/arm/mm/copypage-xscale.c b/arch/arm/mm/copypage-xscale.c index 61d834157bc05..382e1c2855e85 100644 --- a/arch/arm/mm/copypage-xscale.c +++ b/arch/arm/mm/copypage-xscale.c @@ -42,6 +42,7 @@ static void mc_copy_user_page(void *from, void *to) * when prefetching destination as well. (NP) */ asm volatile ("\ +.arch xscale \n\ pld [%0, #0] \n\ pld [%0, #32] \n\ pld [%1, #0] \n\ @@ -106,8 +107,9 @@ void xscale_mc_clear_user_highpage(struct page *page, unsigned long vaddr) { void *ptr, *kaddr = kmap_atomic(page); - asm volatile( - "mov r1, %2 \n\ + asm volatile("\ +.arch xscale \n\ + mov r1, %2 \n\ mov r2, #0 \n\ mov r3, #0 \n\ 1: mov ip, %0 \n\