From patchwork Sat Jan 6 18:48:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 10147989 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 CAF2960153 for ; Sat, 6 Jan 2018 18:48:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF66228970 for ; Sat, 6 Jan 2018 18:48:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3BE628974; Sat, 6 Jan 2018 18:48:46 +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=-4.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 3597128970 for ; Sat, 6 Jan 2018 18:48:45 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To: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:List-Owner; bh=GR6P8qIQqko2QlX5mD5AExCiR0s9rDswXHv6/8WIaf0=; b=J9F+iVI4hwIY8dzUzPhdVWLWOo bVx/t3y5lo0xD3JY3z42eRP6Ia4MsPLihI57WMvnMW5PsEh1bGjX7zdpsn+SN4iW34zXmPnBM75Xd HBtXW5ZdXWRbUtMZ22kgWabiZ693E7NK/8t6PdDmPGFVZcR8tkfwrPNfISXKPmJQT0oEtaMo/qq2T J22xpxFG4VmOVVDQTK4az20QJ5B8rSDITHKXgPyokOOKKITrVmKVNNMpuQnPLwbyyDmlmPRQQEzQn ab4SmiiDefLd4hogw3qIguZsRvr7CTYp8u2t2TaAkU9AMj1LADoSSLfnC6asUvpMqc0LCFAsAoic+ NKw1h2NQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eXtWK-0001jM-FP; Sat, 06 Jan 2018 18:48:40 +0000 Received: from mail-oi0-x241.google.com ([2607:f8b0:4003:c06::241]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eXtWG-0001iR-RE for linux-arm-kernel@lists.infradead.org; Sat, 06 Jan 2018 18:48:38 +0000 Received: by mail-oi0-x241.google.com with SMTP id o64so5075399oia.9 for ; Sat, 06 Jan 2018 10:48:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ecqwmnwhImEwQjmcSafE7HNusdBFMepYrvZurzB7aGQ=; b=hq7Q/Sr1xBOLUMAV03R8PkB395d8CKAZd/exOQvhAtD3AOe9dpg7+BWmAgLP095mog MgEwCXuj9Q4WyLRWNGXgZ2wcXklAG2jVAb5pLRfVjTrFAB4PpP+WlR+pJbbX/NB3qsOY SDHJUde2ISzL1Vdpe6RTLRn8o8yk5DdHYlCWorO5ewS20rMjnPZsNxA9/6ViXHL5oB42 uKVg/JOq8s7A7qAGqCA3sMSpiVtIgtKFTXuMjYcgimEDF1VSCb9unYybrAT5RGmqpoJY DuxAp6zRlAya1yz/MzYJpZ6fRvHvvkNc06V5uSS/ZtvvuVTcZ8p7hET+socJVJB2eFQK QMTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ecqwmnwhImEwQjmcSafE7HNusdBFMepYrvZurzB7aGQ=; b=WBgjg+nBaYZj4OoRKBaygMdoaDaQlSygrwG8jt5n/1wtmCZtnn+qt3ASzpSNqYXLxK TJsFHFdkVH5lGa/ymKiUzpi1AdVEXHwckYcWAZ7uA70xa1cTZk/7SHV08K2b+riz26v0 5Owd2YLgij1Ed8LUxicree/NAYcq6zJxt+qAYjINn7SgYytTo+dU7K/q/pKiAC4TsG2W nB/cwUWu8R7ek6x7jTpjkPjgBtxIrNYxW7fdrw0IhfWVkfgV1AsMho/wzj3r/76wJ3Iu 4ugnKOyegMczmO+uAuqsCc7vuN8qus8MtDcDUjCElUBkxPZ4puQN3Et6VwMEnOMDT2RD hkuw== X-Gm-Message-State: AKGB3mIDf/jfhf8GNP1fhSKnyXHo1rQ9mVVyn9G/EXjVM/tUFbTNfjsw MTE60VSP+ioyMP5c6hO6R7lT2lKT X-Google-Smtp-Source: ACJfBoseoeZxNttM6JUJeuPuAeJbKA4BZHyaeyqT1foF9Ha8QSPYLWezdPjlasV7d/L3aCiujOMwaw== X-Received: by 10.202.81.195 with SMTP id f186mr3270582oib.338.1515264504884; Sat, 06 Jan 2018 10:48:24 -0800 (PST) Received: from bender.lan (ip68-109-195-31.pv.oc.cox.net. [68.109.195.31]) by smtp.gmail.com with ESMTPSA id o131sm3491430oih.43.2018.01.06.10.48.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Jan 2018 10:48:23 -0800 (PST) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org, marc.zyngier@arm.com Subject: [PATCH 1/2] ARM: Add BTB invalidation on switch_mm for Brahma-B15 Date: Sat, 6 Jan 2018 10:48:20 -0800 Message-Id: <20180106184820.11929-1-f.fainelli@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180106120907.26701-2-marc.zyngier@arm.com> References: <20180106120907.26701-2-marc.zyngier@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180106_104836_913507_B3523B59 X-CRM114-Status: GOOD ( 10.02 ) 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: linux@arm.linux.org.uk, Florian Fainelli , will.deacon@arm.com, christoffer.dall@linaro.org MIME-Version: 1.0 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 Signed-off-by: Florian Fainelli --- arch/arm/include/asm/cputype.h | 4 ++++ arch/arm/mm/proc-v7.S | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h index cb546425da8a..48bf5639214a 100644 --- a/arch/arm/include/asm/cputype.h +++ b/arch/arm/include/asm/cputype.h @@ -62,6 +62,7 @@ ((mpidr >> (MPIDR_LEVEL_BITS * level)) & MPIDR_LEVEL_MASK) #define ARM_CPU_IMP_ARM 0x41 +#define ARM_CPU_IMP_BRCM 0x42 #define ARM_CPU_IMP_DEC 0x44 #define ARM_CPU_IMP_INTEL 0x69 @@ -82,6 +83,9 @@ /* DEC implemented cores */ #define ARM_CPU_PART_SA1100 0x4400a110 +/* Broadcom implemented cores */ +#define ARM_CPU_PART_BRAHMA_B15 0x420000f0 + /* Intel implemented cores */ #define ARM_CPU_PART_SA1110 0x6900b110 #define ARM_CPU_REV_SA1110_A0 0 diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 47c1ae4e3041..0cf3e497f988 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -159,7 +159,7 @@ ENDPROC(cpu_v7_do_resume) #endif /* - * Cortex-A8/A12/A15/A17 that require a BTB invalidation on switch_mm + * Cortex-A8/A12/A15/A17, Brahma-B15 that require a BTB invalidation on switch_mm */ globl_equ cpu_v7_btbinv_proc_init, cpu_v7_proc_init globl_equ cpu_v7_btbinv_proc_fin, cpu_v7_proc_fin @@ -678,7 +678,7 @@ __v7_ca15mp_proc_info: __v7_b15mp_proc_info: .long 0x420f00f0 .long 0xff0ffff0 - __v7_proc __v7_b15mp_proc_info, __v7_b15mp_setup, cache_fns = b15_cache_fns + __v7_proc __v7_b15mp_proc_info, __v7_b15mp_setup, cache_fns = b15_cache_fns, proc_fns = v7_btbinv_processor_functions .size __v7_b15mp_proc_info, . - __v7_b15mp_proc_info /*