From patchwork Mon May 21 04:09:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Guo X-Patchwork-Id: 917336 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=kvm-ppc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NvE8jml5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40q5nB6sPwz9s3c for ; Mon, 21 May 2018 14:45:34 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751730AbeEUEpe (ORCPT ); Mon, 21 May 2018 00:45:34 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:43893 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751039AbeEUEpa (ORCPT ); Mon, 21 May 2018 00:45:30 -0400 Received: by mail-pf0-f196.google.com with SMTP id j20-v6so6457905pff.10; Sun, 20 May 2018 21:45:30 -0700 (PDT) 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=OcCTrJlYrkmbeHXaZ316asCl+w1XeFls7UY79hpl59k=; b=NvE8jml5UHtYMjLhDei5nDHUN6UeYfJCKXGRVnljLQi2vhjJVAr7bgQs9PLZnWRI3i hItMaCbtESEiRbEKrz/I886DUP836vW3T+Gv0c/eQVuYrTIVgYKd/GopFpmNrBTyA/ob BHEGNQEhkI/vIM+xprQTPzHmmbjNotdCu4IU3NXerofm3GGfSeeLtHAA2rK4SuH5uX7a 697qpADxTcWPMz5N5212Rs7TS5niQpg2QookLC9c+NQHhpItJPphtKBSHuvnlEDYTbDC DSXVwLEyCHfJUNmkrwvRD5Oegt22fKKGnA5uJ/yBWMdyePBWrTbegfH9kK/Kyc+hh8ON VH0Q== 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=OcCTrJlYrkmbeHXaZ316asCl+w1XeFls7UY79hpl59k=; b=SZ4fs5CAc/vuCq/p8l8CDC/FQ5AZUITzlf3m7xSiMmw1vLLAAwsS/Spmwxp0jXuNQA ugjIcxMiyAtLZkj3XHuVRq/ldsUayCatDGL+PYaKjUL1fubKmuKE66bLsYOx9Hl48AC5 6VT/wz2rWzfS4lp4uk0yAiKctgi+JKHJMjWaoy8SbpfWASKuNzfwVT//30MqFWyKQbM6 Qupa0cjQsEUQ17EEnSbns7FvG8Ch4MNdxGWAZiBjKPSR+RDaNuSCimPNZGZ5vJR8uH8I Sc76AP08BawwnVnwip7shXGIqzrFXduHZleyL41vl5IqdHjquXPhtb8FFQVMyx5nM2NI knnA== X-Gm-Message-State: ALKqPwcT3FJUzOIAqvBfdZ5de4qL8w4TwvR1YIFOQABLRwQkTgMj0vvm Dg38kpXEOJ7YhIc5LLVZH1k= X-Google-Smtp-Source: AB8JxZr45L1d8Vxox34mYMpzp+yz235HaATCRsppjzKPHTnI1HbcDKcQ3Z8chpslsOysM8dNGxWz4Q== X-Received: by 2002:a63:7b10:: with SMTP id w16-v6mr10715256pgc.55.1526877930025; Sun, 20 May 2018 21:45:30 -0700 (PDT) Received: from simonLocalRHEL7.cn.ibm.com ([112.73.0.89]) by smtp.gmail.com with ESMTPSA id t14-v6sm24575514pfa.31.2018.05.20.21.45.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 May 2018 21:45:29 -0700 (PDT) From: wei.guo.simon@gmail.com To: linuxppc-dev@lists.ozlabs.org Cc: Paul Mackerras , kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, Simon Guo Subject: [PATCH v3 03/29] powerpc: export tm_enable()/tm_disable/tm_abort() APIs Date: Mon, 21 May 2018 12:09:20 +0800 Message-Id: <1526875786-10372-4-git-send-email-wei.guo.simon@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1526875786-10372-1-git-send-email-wei.guo.simon@gmail.com> References: <1526875786-10372-1-git-send-email-wei.guo.simon@gmail.com> Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org From: Simon Guo This patch exports tm_enable()/tm_disable/tm_abort() APIs, which will be used for PR KVM transaction memory logic. Signed-off-by: Simon Guo Reviewed-by: Paul Mackerras --- arch/powerpc/include/asm/asm-prototypes.h | 3 +++ arch/powerpc/include/asm/tm.h | 2 -- arch/powerpc/kernel/tm.S | 12 ++++++++++++ arch/powerpc/mm/hash_utils_64.c | 1 + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/asm-prototypes.h b/arch/powerpc/include/asm/asm-prototypes.h index d9713ad..dfdcb23 100644 --- a/arch/powerpc/include/asm/asm-prototypes.h +++ b/arch/powerpc/include/asm/asm-prototypes.h @@ -141,4 +141,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, void pnv_power9_force_smt4_catch(void); void pnv_power9_force_smt4_release(void); +void tm_enable(void); +void tm_disable(void); +void tm_abort(uint8_t cause); #endif /* _ASM_POWERPC_ASM_PROTOTYPES_H */ diff --git a/arch/powerpc/include/asm/tm.h b/arch/powerpc/include/asm/tm.h index b1658c9..e94f6db 100644 --- a/arch/powerpc/include/asm/tm.h +++ b/arch/powerpc/include/asm/tm.h @@ -10,12 +10,10 @@ #ifndef __ASSEMBLY__ -extern void tm_enable(void); extern void tm_reclaim(struct thread_struct *thread, uint8_t cause); extern void tm_reclaim_current(uint8_t cause); extern void tm_recheckpoint(struct thread_struct *thread); -extern void tm_abort(uint8_t cause); extern void tm_save_sprs(struct thread_struct *thread); extern void tm_restore_sprs(struct thread_struct *thread); diff --git a/arch/powerpc/kernel/tm.S b/arch/powerpc/kernel/tm.S index b92ac8e..ff12f47 100644 --- a/arch/powerpc/kernel/tm.S +++ b/arch/powerpc/kernel/tm.S @@ -12,6 +12,7 @@ #include #include #include +#include #ifdef CONFIG_VSX /* See fpu.S, this is borrowed from there */ @@ -55,6 +56,16 @@ _GLOBAL(tm_enable) or r4, r4, r3 mtmsrd r4 1: blr +EXPORT_SYMBOL_GPL(tm_enable); + +_GLOBAL(tm_disable) + mfmsr r4 + li r3, MSR_TM >> 32 + sldi r3, r3, 32 + andc r4, r4, r3 + mtmsrd r4 + blr +EXPORT_SYMBOL_GPL(tm_disable); _GLOBAL(tm_save_sprs) mfspr r0, SPRN_TFHAR @@ -78,6 +89,7 @@ _GLOBAL(tm_restore_sprs) _GLOBAL(tm_abort) TABORT(R3) blr +EXPORT_SYMBOL_GPL(tm_abort); /* void tm_reclaim(struct thread_struct *thread, * uint8_t cause) diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index 0bd3790..1bd8b4c1 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c @@ -64,6 +64,7 @@ #include #include #include +#include #ifdef DEBUG #define DBG(fmt...) udbg_printf(fmt)