From patchwork Mon Jan 22 19:41:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13526137 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B15B6C47DD9 for ; Mon, 22 Jan 2024 19:42:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 43DA58D0008; Mon, 22 Jan 2024 14:42:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3ED288D0001; Mon, 22 Jan 2024 14:42:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2B4928D0008; Mon, 22 Jan 2024 14:42:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 17D488D0001 for ; Mon, 22 Jan 2024 14:42:46 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id EF15F120681 for ; Mon, 22 Jan 2024 19:42:45 +0000 (UTC) X-FDA: 81707969490.02.B60D76F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf25.hostedemail.com (Postfix) with ESMTP id 41FC4A0014 for ; Mon, 22 Jan 2024 19:42:44 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MLNcA1SE; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf25.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705952564; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=vjWUYiHAoGZrNfW9Y2JrmbsG1L8Q45EKDO2/2fqZPoM=; b=v7564LiBNTtx9bRBmUueKjBiSGq3EpMygHP3eJx3UxIPa+MUTsZhdD3GCnrDj/iFtgV9Yu 4V787I66ktxze2lrnuABNZIGAQgRmUDq3Hdf8AnIlSSbrm2FW9PCGZG/alV1XWmQ6zk5vh HF4Z3q/bTAYNtoj3V+ws7/vdGUOqxRQ= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MLNcA1SE; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf25.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705952564; a=rsa-sha256; cv=none; b=DiUsrDwAGcFaG5mQ8KhS6NwSBjjgb99Ur8cJgnzRN7IUPEmuLXC07mYL3f7OnwmZ+3cONb wqCY1mY1buc7g8vm0H3qwu8e2le37AGmfvznEkjHOWzd2njXd9YnmTRVohr3w9GCgUE1Ok zE4YC7rMnG59Dhv+BzIKjprhAYklk84= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705952563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vjWUYiHAoGZrNfW9Y2JrmbsG1L8Q45EKDO2/2fqZPoM=; b=MLNcA1SE28TAlewxXojpcRQRVAShXCy+NSKKghUYLADHWwtTFLWhlysrFF00j3nHfAN1kH 3l18u+1uorYSEay/hCUJBBSj4GHdOGqnAZzMJhcide5HzCSJFz9N+WrpDIV5SzvK+UAtse BYtnh5HvcpzywAQLHB40Oq+oCIypMhc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-424-qOBFwd40M36O2u6x9q2y0A-1; Mon, 22 Jan 2024 14:42:38 -0500 X-MC-Unique: qOBFwd40M36O2u6x9q2y0A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B76F3106D1A8; Mon, 22 Jan 2024 19:42:36 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id D5C393C2E; Mon, 22 Jan 2024 19:42:31 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , Matthew Wilcox , Ryan Roberts , Russell King , Catalin Marinas , Will Deacon , Dinh Nguyen , Michael Ellerman , Nicholas Piggin , Christophe Leroy , "Aneesh Kumar K.V" , "Naveen N. Rao" , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexander Gordeev , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Sven Schnelle , "David S. Miller" , linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org Subject: [PATCH v1 05/11] s390/pgtable: define PFN_PTE_SHIFT Date: Mon, 22 Jan 2024 20:41:54 +0100 Message-ID: <20240122194200.381241-6-david@redhat.com> In-Reply-To: <20240122194200.381241-1-david@redhat.com> References: <20240122194200.381241-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Rspamd-Queue-Id: 41FC4A0014 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: qw9kcd9bm9tra8uhb6c4eqe3z957uf3g X-HE-Tag: 1705952564-144241 X-HE-Meta: U2FsdGVkX1+F7mwLR/mcZLUQIKj+yRS4OUdFFCy7CicnaxSIAHlMbdT/gHRNHbDgmvboAVJcDvYaZURDWhCtarQrVhu75kl2F/IJyB/DXo9wzWIzuSaCDxOnGMa8sJcLPAuAis4vXlkRTl6Tj/6QQe/gjYyubeWEz07Hf+Cs4+ykWf3Hn1lsy6MP+gcL8sY4BKIoVAjtPEo2Q5qqlWwQP2/65dRmTqzdas+jr0DvMCOI4A48t/FknKpcfSsZnp8Wirau+IZmdO3PhXCRb5j9MeD+6VLOor7vXWyZ/JG9Re3sseeZ/n50gFz3gx+9avWpLnBJ8JB7m4DPlXbKHBu7q9JsD9TPgfcJ7okOMgBTW3zrwSeR17hOqtf24+2u/Zjoc/2yj05DizaAjm11SDc6j2+wBrJ/S5Mtt+WeO4nCxIyoNUMK4nmrRHdE37nTVE8aUuMv8deEj+JtlG5m/b1nrAXDIYPTgzVVfmw6nCaYBDcamOuV+FTZ7FdWFfQIO1VSoxcCkmHB92OHqh/KGeqawo6wTmPei0me3F3exhtNpj8KPu320O7S8R1yipx0cdPzo+MLnVXcfJnDiLYiifyd6/rzRNdDS0RGL+//S3rQpJiYb0NB5cLovGMRNKOyb2pKc6vhIsa2N6HWPjreuuDc+ywkzQmEN1H9YBeQVcXIQse3+Ig21xktlQ+x8+5VunBGevVJSgBRI+EBWFnPqAqLkA/3nJdLqECqcgB2bRUIyXKn8RNr4O1QJ5STJOW5eFJWClSc/ln7emTl0B+Xbc378j1MzdJsaqtJYxbfX34ShoAaGL6Msv0f8Gm2RqrQnTodMo8ww39UOuoR2cWIggkYy/mhCr8g6HtBVZZbdGIgl8Mu/rViaJNQcoH5K6ZkQUeqst0HSQtYiuKtmZCw4DhURdkDH0CTHcNDYxCzDo+aitGEtyXdD5WTSRWBluLAUZaDX4ge3bYoUl9NmaIPKQQ jiyOUMyq 2DmK5uKiMtENxjuX2zUgiiigy6xvpUYcnrVjm+xYLZuq/7rnSoxs+8Qbwkgn8Wl6RDKDQ7Bb5/X2DrTdOaoqQZr7SK+7QmZxzIUtY5tcYuzJajQCXGsWtLbX69QHP8aZGBpxwj8T0/94RBjl96GRZgPlX9shcjSGu8fx5khcaJj7kk8mmUzW1RreKhVpuIMxaMxd/Oqe6tjshwhuMtQld1S64G3DlDJ0uHhxh X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: We want to make use of pte_next_pfn() outside of set_ptes(). Let's simpliy define PFN_PTE_SHIFT, required by pte_next_pfn(). Signed-off-by: David Hildenbrand --- arch/s390/include/asm/pgtable.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h index 1299b56e43f6f..4b91e65c85d97 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h @@ -1316,6 +1316,8 @@ pgprot_t pgprot_writecombine(pgprot_t prot); #define pgprot_writethrough pgprot_writethrough pgprot_t pgprot_writethrough(pgprot_t prot); +#define PFN_PTE_SHIFT PAGE_SHIFT + /* * Set multiple PTEs to consecutive pages with a single call. All PTEs * are within the same folio, PMD and VMA.