Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp1571580ybk; Thu, 21 May 2020 09:57:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzWQY8BcAg4ch7yBSVWwlUJemgh7quZKSC5mNlmtR/hpjahB5kKrt+wwcG2zk2PGwKPtkR3 X-Received: by 2002:a17:906:4dd6:: with SMTP id f22mr4856024ejw.468.1590080270456; Thu, 21 May 2020 09:57:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590080270; cv=none; d=google.com; s=arc-20160816; b=YzMANx9xhl24SLhhRB4N/qKrQP1I6+edH5pAdHxfXjltPkyetRhHjGIK8A00J+aAyv PzIgAwnwW5/CcWW+5qB0+23Yzp0BbVSCUWciiX2q5FFYBuJxSiXLSUKvmriYEOlV00MZ S/7C4qfsxbnQ0yP+tcBczaIEIKCBV5HE4NLz6WoSGsj/RJ0kFIum1tdeeFhUeK2Mx7HE xcV7FjBIkcVoaGiAvqQhNMtYahy/XvEWbyCUs4RG5jzfCz9V9lwRWimiTQfWQOl5J+Wd p/hwpgqawuE9GTAwddARmwNCfY4x+4niZM6laVNAL5Lqg7pDCMrXIyFrSm9Jooslb/ub jvTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id; bh=wmwrQfhd1ZS/gztU+L9MpjnimhPZetM2G6MQU8ETKBE=; b=K23j+osGTussWhY+f0m/wAE8MsRr/0PeD++RlKIC/eU4dhNqoYcSG1Y7fH/Fv+Nwpp fDTn8ofF1txizLNR23/XAfkE/zPxBWSDTiDgKjGFXU4iitONUlPb3d11Z/4hAKYRQJ/m LvPCvk1Ny1a7HWc7M3q6TmHFqYY4wT/Rb+iSTbeQr6/T6VvGcDEiC1gvWuA2PeBYz39g 8n8DVIPavqoxtqODj5ysZYvHu/1e0/GPtXPKSLfvQq48WyHxvvsf9Q8YXC2S5E62HThN iKJGROX1gBYYmSKLSUFmUKkVoY8akq7XWfbUpO3GNmOVMQw+Tx2GREepiktA2Sd8eIEa 4dXA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j7si3650940eja.739.2020.05.21.09.57.27; Thu, 21 May 2020 09:57:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729720AbgEUQz6 (ORCPT + 99 others); Thu, 21 May 2020 12:55:58 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:26137 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728595AbgEUQz5 (ORCPT ); Thu, 21 May 2020 12:55:57 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 49SbNS2hs6z9v0mc; Thu, 21 May 2020 18:55:52 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id 9asdKbalNedn; Thu, 21 May 2020 18:55:52 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 49SbNS1x2rz9v0mG; Thu, 21 May 2020 18:55:52 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 90BA28B778; Thu, 21 May 2020 18:55:54 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id m5dFX4iWmFxT; Thu, 21 May 2020 18:55:54 +0200 (CEST) Received: from pc16570vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 5D9BD8B7DB; Thu, 21 May 2020 18:55:54 +0200 (CEST) Received: by pc16570vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 3EF3765A53; Thu, 21 May 2020 16:55:54 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v5 03/13] powerpc/pgtable: Drop PTE_ATOMIC_UPDATES To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , michal.simek@xilinx.com, arnd@arndb.de Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Thu, 21 May 2020 16:55:54 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe Leroy 40x was the last user of PTE_ATOMIC_UPDATES. Drop everything related to PTE_ATOMIC_UPDATES. Signed-off-by: Christophe Leroy --- v5: Rebased on top of the 8xx hugepage series Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/nohash/32/pgtable.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/arch/powerpc/include/asm/nohash/32/pgtable.h b/arch/powerpc/include/asm/nohash/32/pgtable.h index 717f995d21b8..46cd5428fc52 100644 --- a/arch/powerpc/include/asm/nohash/32/pgtable.h +++ b/arch/powerpc/include/asm/nohash/32/pgtable.h @@ -259,25 +259,10 @@ static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, p static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, pte_t *p, unsigned long clr, unsigned long set, int huge) { -#if defined(PTE_ATOMIC_UPDATES) && !defined(CONFIG_PTE_64BIT) - unsigned long old, tmp; - - __asm__ __volatile__("\ -1: lwarx %0,0,%3\n\ - andc %1,%0,%4\n\ - or %1,%1,%5\n" - PPC405_ERR77(0,%3) -" stwcx. %1,0,%3\n\ - bne- 1b" - : "=&r" (old), "=&r" (tmp), "=m" (*p) - : "r" (p), "r" (clr), "r" (set), "m" (*p) - : "cc" ); -#else /* PTE_ATOMIC_UPDATES */ pte_basic_t old = pte_val(*p); pte_basic_t new = (old & ~(pte_basic_t)clr) | set; *p = __pte(new); -#endif /* !PTE_ATOMIC_UPDATES */ #ifdef CONFIG_44x if ((old & _PAGE_USER) && (old & _PAGE_EXEC)) -- 2.25.0