Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp752922ybn; Tue, 24 Sep 2019 09:00:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqz1kCWOqYxtdxSql9qoUXkbe1736laNvA6Vs279+QQP7XV11HpljrEPWf9MsBY424BzdbmK X-Received: by 2002:adf:84c6:: with SMTP id 64mr3319386wrg.287.1569340835109; Tue, 24 Sep 2019 09:00:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569340835; cv=none; d=google.com; s=arc-20160816; b=GctueqZWt3uPzTwNkvfSmHoUQwVMoMDMVGgCpDkjVKlXPCaUN5slLPLOMw+reOvM9Y 3YBUmTYXhL7L7JegF5cO+Qbiqyl9N3qUxdhSEWen/ZrovaaJOROaaMd7RU8Lto66Xisg 7/nbbgkZQSkmRUhbW5upD2WatnSIiQD1WM1ve0PkTbYeC8KduX9EHPYkB+0hJ4HsJByK 2+EiJAUgDcO+PAm9BNe/IG7sxOa5XsPAPaWuYKiW2sv88USGx55R99cSicFG0C+Rnqi0 TuU8kQCn3HhoKRDDP7fJg74Re9Gicrirtk+BUS7mBZt8UXeTKYAqlkJPP/IvJdv99Z55 Sw8A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=m6I3xn6EKZt4rJcOF1XQQjGGJ6TiIyyFBwU5bD4MkHg=; b=Bc7n6hrC77G7lWJMRjJkXSOesTAE4zAPTD/4hzwuddGMkhePOBeHpGthEDLjj5fdVl 9pr1BvFzSemXVlmXZ1/gpBvs1mJm5Esx3wQZLrnr9c8ZSSQ3mw8zzHmGvV7dWGq5+9Zl 2P35eJeZeyPHBib9A4MNLZZTYz1ZrMY08jlnEL7jq24r9jYg7ZiWXPrjmcned17U7ced sn5a7PwHTg6Z774fdSjKKVKu3jUw1tddW/01bNJiSd8Eh0OIY7IFueYdsGH/LuZAMKue G9Xs/Cz6NxFfKcf7PXa2OEHdccWIuHJ44pOafMjoIe1TniiCPdvB/1rbDr3+St/06Hut LGsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="FbTzc/5R"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 5si1537963edy.95.2019.09.24.09.00.10; Tue, 24 Sep 2019 09:00:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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="FbTzc/5R"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439212AbfIVTgU (ORCPT + 99 others); Sun, 22 Sep 2019 15:36:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:42502 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389900AbfIVSqY (ORCPT ); Sun, 22 Sep 2019 14:46:24 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3192D214AF; Sun, 22 Sep 2019 18:46:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177983; bh=R84mSIxpEX1AcPIuhZJU0uwLWQyn3K4b+Mpvg9kxH0k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FbTzc/5Rxu6WgeyJwUeBWcJrwUanXvUfO+4hV+LEQfGwr7hDJjz6RFm3pcK6lZ92j 1q6dXNvuL9v71IEW/aVG+4lxCUu++V1++uh4rJ59lQfBs6QiQm5L87Rz+U+enHkUYp BZgaQhPlCORYX5acMxtYlKAq35KTI8IpMsDiiF60= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Arnd Bergmann , Sasha Levin Subject: [PATCH AUTOSEL 5.3 078/203] ARM: xscale: fix multi-cpu compilation Date: Sun, 22 Sep 2019 14:41:44 -0400 Message-Id: <20190922184350.30563-78-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) 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\ -- 2.20.1