From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: ACJfBoslORwemNszHaQW2CfrBhZcJB4FByJy6Bdb7ZfYQCTAbWEjmYu6EfxVhPdDYrrPYaQRGAdR ARC-Seal: i=1; a=rsa-sha256; t=1516326753; cv=none; d=google.com; s=arc-20160816; b=Ncnz1sJu7t1kEhpHgValJOcHZU2clEMJfWdXUfEl7AsgZD9an8dgrwy6HyLkwUud0f VOLxMdnBd4/3ceYKmi0s544cUPXEzUrJy6Q2BpZyNVoBKYZKCOC+xEsvv2otKND12+R5 1wXYEax3+eDpNd62HcGtOFVexjj97fuqmd+NXgI32RYJQOQqdJdQXvrYwRgMMzSDJuul aYnRjEGYFTxwtRL8qNK50fU7W1rkVl8hUi7at7s+hm0C8A90q5oFBOfxRv/40xfJ2LKM eG+C21vO7AjwoJq05ijrYFQsPbTiVwmSBLfYvqrdKjU9e6+jwn0hYOoala1gdd/iiG+Q XhyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=HksKmJ7qCTswdBw2VIQVWeOOorUKhHjJGSmFCrgPjT8=; b=K+d6BkMsP3w/awKKl9WOcYgYaGJK1Gl5kC1NCT/IogNFpl37Z1VHRJBgojQbW7GoS/ UZcrpZJxpdQ0HpKMU8Bx1YTZQVw050zYow/IsZqgwuFVOuclzQw9vrXUXrqxaou9LG2c oSa7V/ftBGE25TclXE9srE89GZyXquUiqHNN+eE8vLl1dSwWyq2o9wZ7yAlHImxB/sMD +TLfzG87mDSY+/6pPxK/RAaNc5yA5d8YxAxSBF/utGGRVhQSHMFlRYw3hJs+2Lg1POpF 2tsr5hKmlhYT1KFDKSEH3ORtxY4eAeIvqOlF0D8nTxLxOR5PrnBb30CwDQv+DK0LuMCx Ig3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=slEfgeAq; spf=pass (google.com: best guess record for domain of linux-kselftest-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kselftest-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=slEfgeAq; spf=pass (google.com: best guess record for domain of linux-kselftest-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kselftest-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755710AbeASBwd (ORCPT ); Thu, 18 Jan 2018 20:52:33 -0500 Received: from mail-qt0-f196.google.com ([209.85.216.196]:40129 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755490AbeASBv5 (ORCPT ); Thu, 18 Jan 2018 20:51:57 -0500 From: Ram Pai To: mpe@ellerman.id.au, mingo@redhat.com, akpm@linux-foundation.org, corbet@lwn.net, arnd@arndb.de Cc: linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org, x86@kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, dave.hansen@intel.com, benh@kernel.crashing.org, paulus@samba.org, khandual@linux.vnet.ibm.com, aneesh.kumar@linux.vnet.ibm.com, bsingharora@gmail.com, hbabu@us.ibm.com, mhocko@kernel.org, bauerman@linux.vnet.ibm.com, ebiederm@xmission.com, linuxram@us.ibm.com Subject: [PATCH v10 06/27] powerpc: helper functions to initialize AMR, IAMR and UAMOR registers Date: Thu, 18 Jan 2018 17:50:27 -0800 Message-Id: <1516326648-22775-7-git-send-email-linuxram@us.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1516326648-22775-1-git-send-email-linuxram@us.ibm.com> References: <1516326648-22775-1-git-send-email-linuxram@us.ibm.com> Sender: linux-kselftest-owner@vger.kernel.org X-Mailing-List: linux-kselftest@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1589983841925448940?= X-GMAIL-MSGID: =?utf-8?q?1589983841925448940?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Introduce helper functions that can initialize the bits in the AMR, IAMR and UAMOR register; the bits that correspond to the given pkey. Reviewed-by: Thiago Jung Bauermann Signed-off-by: Ram Pai --- arch/powerpc/mm/pkeys.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/mm/pkeys.c b/arch/powerpc/mm/pkeys.c index 6e8df6e..e1dc45b 100644 --- a/arch/powerpc/mm/pkeys.c +++ b/arch/powerpc/mm/pkeys.c @@ -16,6 +16,10 @@ int pkeys_total; /* Total pkeys as per device tree */ u32 initial_allocation_mask; /* Bits set for reserved keys */ +#define AMR_BITS_PER_PKEY 2 +#define PKEY_REG_BITS (sizeof(u64)*8) +#define pkeyshift(pkey) (PKEY_REG_BITS - ((pkey+1) * AMR_BITS_PER_PKEY)) + int pkey_initialize(void) { int os_reserved, i; @@ -107,3 +111,46 @@ static inline void write_uamor(u64 value) { mtspr(SPRN_UAMOR, value); } + +static inline void init_amr(int pkey, u8 init_bits) +{ + u64 new_amr_bits = (((u64)init_bits & 0x3UL) << pkeyshift(pkey)); + u64 old_amr = read_amr() & ~((u64)(0x3ul) << pkeyshift(pkey)); + + write_amr(old_amr | new_amr_bits); +} + +static inline void init_iamr(int pkey, u8 init_bits) +{ + u64 new_iamr_bits = (((u64)init_bits & 0x1UL) << pkeyshift(pkey)); + u64 old_iamr = read_iamr() & ~((u64)(0x1ul) << pkeyshift(pkey)); + + write_iamr(old_iamr | new_iamr_bits); +} + +static void pkey_status_change(int pkey, bool enable) +{ + u64 old_uamor; + + /* Reset the AMR and IAMR bits for this key */ + init_amr(pkey, 0x0); + init_iamr(pkey, 0x0); + + /* Enable/disable key */ + old_uamor = read_uamor(); + if (enable) + old_uamor |= (0x3ul << pkeyshift(pkey)); + else + old_uamor &= ~(0x3ul << pkeyshift(pkey)); + write_uamor(old_uamor); +} + +void __arch_activate_pkey(int pkey) +{ + pkey_status_change(pkey, true); +} + +void __arch_deactivate_pkey(int pkey) +{ + pkey_status_change(pkey, false); +} -- 1.7.1