From patchwork Sat Dec 3 03:03:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 13063408 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 56209C4321E for ; Sat, 3 Dec 2022 03:08:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Cc:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fNBiGKB+ddDvWFGw8jfWD2PnjuGDfZ5UN3F5jBnAtME=; b=jZtzXo0/xAFtmP JfjIUWg0LS0f0o3acxqumB8yxwa1e1xvI/1N1BrWQNe1TxIxs1jLC4XEfLK7THt376/XyQJXogwvp Nu8CFXSeJRV8SjRgMrzBmN4wKzB2A3UlH3GksKrrk0mGqT3J1QO+Euv5mn7Pfp4BONMUwTZ9gh6M1 un+JAO5VEWi2eChrQ3zUXyRISep4gM00cyTn38VaRcgWje0K7KpcyeII4WilYX/bxfjSxx0jus1Kg YGQH0ReDn6bh8493F4hJD+u0f5H5CZhk6YGW47JeOoSz8knjMbug8qeyNDPlknoYk+JoprLEk8LPc Y8fA0zTgpMEMuIyFxUFA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p1Irj-002BDq-4q; Sat, 03 Dec 2022 03:06:59 +0000 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p1Iqb-002Aei-QT for linux-arm-kernel@lists.infradead.org; Sat, 03 Dec 2022 03:05:51 +0000 Received: by mail-pl1-x62a.google.com with SMTP id c7so2062777pls.4 for ; Fri, 02 Dec 2022 19:05:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:from:to:cc:subject:date :message-id:reply-to; bh=nXyyhDtl8c7AV1KDvPOaTLsEEraDYLnRgQTRKevMxLE=; b=J9nA5zFzEgIt8zsxxMPn+sGlIH86WVlgcK5M4y+MnARF9MADgB6h9QisIFpQgAX5Xc gT+JZZbSYIwNPr5lPusi+V73ZxiVkLhM81QZ6t8o4/bUs0p7dwivbSNGIto+U0W3vJje odd1RyOpgxE8uPgVe+OvIiemZQ8s/XdQJhhr+yDr90iN2d2hOZAsbJWqu8yYBosqrxer 9lITxlUrsZAUjRZJKcN0IbJ2m0ZjxM8c9gapj57wHECA6g4hNRl0vKRmp3L5kzuNEkTN fw8pU5isxRHsgpJlmPJcoUscGfiLE65hETmvjd9z7oAjQb+boL6+grwCz+iNw1swFZvZ utXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:from:cc:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nXyyhDtl8c7AV1KDvPOaTLsEEraDYLnRgQTRKevMxLE=; b=vSUQCw+IAygaxswjad5MLjprGKG6obXEmn/ZdP03Imc9x1e6PvlBjH8HaKOZZA1uc6 EU/wuuLCCmfWekAOpoOmXkliTIRIge69J5dNnkHC4QLflvKw/3g9rHwzB5u+SRQNIalJ Kar2yAeNBvAq1fUWYngWAzzUMc36FyQA8qi9BU09q2uZEKJqMcSTIgdc+lq41Zm3B9kU 6sjgITpn5UV+uzVVF9DeaVSekEBoak5sBmEJr7YqbEr2epw2I+LBXkNZ6s9+IyCYHr+Y Z8APUefnqupxwIepe7TFJZN3i7pFpeECMObYiNUMc90Ldj5tEDKscGpLKK5vGy0qIJ5R KDjg== X-Gm-Message-State: ANoB5pkMd5m6AbYzYwMRzlnIoXACGfMEGzGP0C2rLA0cce6+FO+F0cJf NpG2Q7LFTGk5mIPxnolstp9/NQ== X-Google-Smtp-Source: AA0mqf7g0g8qmEYMQvaaJVG+LEYazPjzCbvT60LuJ6AU8Q984Tt5DyiX5U2wTDFpAbMwx/ydl7UUTA== X-Received: by 2002:a17:902:ce8e:b0:174:b537:266d with SMTP id f14-20020a170902ce8e00b00174b537266dmr54845874plg.144.1670036746128; Fri, 02 Dec 2022 19:05:46 -0800 (PST) Received: from localhost ([50.221.140.188]) by smtp.gmail.com with ESMTPSA id b12-20020a1709027e0c00b001886ff822ffsm6147005plm.186.2022.12.02.19.05.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 19:05:45 -0800 (PST) Subject: [PATCH 4/5] s390: fault: Convert to VM_FAULT_ARCH_* codes Date: Fri, 2 Dec 2022 19:03:55 -0800 Message-Id: <20221203030356.3917-5-palmer@rivosinc.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221203030356.3917-1-palmer@rivosinc.com> References: <20221203030356.3917-1-palmer@rivosinc.com> MIME-Version: 1.0 Cc: Palmer Dabbelt From: Palmer Dabbelt To: linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221202_190549_875777_5B11078F X-CRM114-Status: GOOD ( 10.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org These conflict with VM_FAULT_HINDEX_MASK, so move to some designated arch-specific values. Signed-off-by: Palmer Dabbelt --- arch/s390/mm/fault.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 9649d9382e0a..464a74e52465 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -46,11 +46,11 @@ #define __SUBCODE_MASK 0x0600 #define __PF_RES_FIELD 0x8000000000000000ULL -#define VM_FAULT_BADCONTEXT ((__force vm_fault_t) 0x010000) -#define VM_FAULT_BADMAP ((__force vm_fault_t) 0x020000) -#define VM_FAULT_BADACCESS ((__force vm_fault_t) 0x040000) -#define VM_FAULT_SIGNAL ((__force vm_fault_t) 0x080000) -#define VM_FAULT_PFAULT ((__force vm_fault_t) 0x100000) +#define VM_FAULT_BADCONTEXT VM_FAULT_ARCH_0 +#define VM_FAULT_BADMAP VM_FAULT_ARCH_1 +#define VM_FAULT_BADACCESS VM_FAULT_ARCH_2 +#define VM_FAULT_SIGNAL VM_FAULT_ARCH_3 +#define VM_FAULT_PFAULT VM_FAULT_ARCH_4 enum fault_type { KERNEL_FAULT,