linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Frederic Barrat <fbarrat@linux.vnet.ibm.com>
To: imunsie@au1.ibm.com, michael.neuling@au1.ibm.com,
	manoj@linux.vnet.ibm.com, mrochs@linux.vnet.ibm.com,
	linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v6 06/20] cxl: Isolate a few bare-metal-specific calls
Date: Fri,  4 Mar 2016 12:26:30 +0100	[thread overview]
Message-ID: <1457090804-9719-7-git-send-email-fbarrat@linux.vnet.ibm.com> (raw)
In-Reply-To: <1457090804-9719-1-git-send-email-fbarrat@linux.vnet.ibm.com>

A few functions are mostly common between bare-metal and guest and
just need minor tuning. To avoid crowding the backend API, introduce a
few 'if' based on the CPU being in HV mode.

Co-authored-by: Christophe Lombard <clombard@linux.vnet.ibm.com>
Signed-off-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com>
Signed-off-by: Christophe Lombard <clombard@linux.vnet.ibm.com>
Reviewed-by: Manoj Kumar <manoj@linux.vnet.ibm.com>
Acked-by: Ian Munsie <imunsie@au1.ibm.com>
---
 drivers/misc/cxl/context.c |  3 ++-
 drivers/misc/cxl/cxl.h     |  7 +++++--
 drivers/misc/cxl/debugfs.c |  4 ++++
 drivers/misc/cxl/fault.c   | 19 +++++++++++--------
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/drivers/misc/cxl/context.c b/drivers/misc/cxl/context.c
index aa65262..46f9844 100644
--- a/drivers/misc/cxl/context.c
+++ b/drivers/misc/cxl/context.c
@@ -95,7 +95,8 @@ int cxl_context_init(struct cxl_context *ctx, struct cxl_afu *afu, bool master,
 		return i;
 
 	ctx->pe = i;
-	ctx->elem = &ctx->afu->spa[i];
+	if (cpu_has_feature(CPU_FTR_HVMODE))
+		ctx->elem = &ctx->afu->spa[i];
 	ctx->pe_inserted = false;
 
 	/*
diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h
index 02065b4..40f6783 100644
--- a/drivers/misc/cxl/cxl.h
+++ b/drivers/misc/cxl/cxl.h
@@ -560,8 +560,11 @@ static inline bool cxl_adapter_link_ok(struct cxl *cxl)
 {
 	struct pci_dev *pdev;
 
-	pdev = to_pci_dev(cxl->dev.parent);
-	return !pci_channel_offline(pdev);
+	if (cpu_has_feature(CPU_FTR_HVMODE)) {
+		pdev = to_pci_dev(cxl->dev.parent);
+		return !pci_channel_offline(pdev);
+	}
+	return true;
 }
 
 static inline void __iomem *_cxl_p1_addr(struct cxl *cxl, cxl_p1_reg_t reg)
diff --git a/drivers/misc/cxl/debugfs.c b/drivers/misc/cxl/debugfs.c
index 18df6f4..5751899 100644
--- a/drivers/misc/cxl/debugfs.c
+++ b/drivers/misc/cxl/debugfs.c
@@ -118,6 +118,10 @@ void cxl_debugfs_afu_remove(struct cxl_afu *afu)
 int __init cxl_debugfs_init(void)
 {
 	struct dentry *ent;
+
+	if (!cpu_has_feature(CPU_FTR_HVMODE))
+		return 0;
+
 	ent = debugfs_create_dir("cxl", NULL);
 	if (IS_ERR(ent))
 		return PTR_ERR(ent);
diff --git a/drivers/misc/cxl/fault.c b/drivers/misc/cxl/fault.c
index ab740a1..9a8650b 100644
--- a/drivers/misc/cxl/fault.c
+++ b/drivers/misc/cxl/fault.c
@@ -254,14 +254,17 @@ void cxl_handle_fault(struct work_struct *fault_work)
 	u64 dar = ctx->dar;
 	struct mm_struct *mm = NULL;
 
-	if (cxl_p2n_read(ctx->afu, CXL_PSL_DSISR_An) != dsisr ||
-	    cxl_p2n_read(ctx->afu, CXL_PSL_DAR_An) != dar ||
-	    cxl_p2n_read(ctx->afu, CXL_PSL_PEHandle_An) != ctx->pe) {
-		/* Most likely explanation is harmless - a dedicated process
-		 * has detached and these were cleared by the PSL purge, but
-		 * warn about it just in case */
-		dev_notice(&ctx->afu->dev, "cxl_handle_fault: Translation fault regs changed\n");
-		return;
+	if (cpu_has_feature(CPU_FTR_HVMODE)) {
+		if (cxl_p2n_read(ctx->afu, CXL_PSL_DSISR_An) != dsisr ||
+		    cxl_p2n_read(ctx->afu, CXL_PSL_DAR_An) != dar ||
+		    cxl_p2n_read(ctx->afu, CXL_PSL_PEHandle_An) != ctx->pe) {
+			/* Most likely explanation is harmless - a dedicated
+			 * process has detached and these were cleared by the
+			 * PSL purge, but warn about it just in case
+			 */
+			dev_notice(&ctx->afu->dev, "cxl_handle_fault: Translation fault regs changed\n");
+			return;
+		}
 	}
 
 	/* Early return if the context is being / has been detached */
-- 
1.9.1

  parent reply	other threads:[~2016-03-04 11:26 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-04 11:26 [PATCH v6 00/20] cxl: Add support for powerVM guest Frederic Barrat
2016-03-04 11:26 ` [PATCH v6 01/20] cxl: Move common code away from bare-metal-specific files Frederic Barrat
2016-03-10  2:03   ` [v6, " Michael Ellerman
2016-03-04 11:26 ` [PATCH v6 02/20] cxl: Move bare-metal specific code to specialized files Frederic Barrat
2016-03-04 11:26 ` [PATCH v6 03/20] cxl: Define process problem state area at attach time only Frederic Barrat
2016-03-04 11:26 ` [PATCH v6 04/20] cxl: Introduce implementation-specific API Frederic Barrat
2016-03-04 11:26 ` [PATCH v6 05/20] cxl: Rename some bare-metal specific functions Frederic Barrat
2016-03-04 11:26 ` Frederic Barrat [this message]
2016-03-04 11:26 ` [PATCH v6 07/20] cxl: Update cxl_irq() prototype Frederic Barrat
2016-03-04 11:26 ` [PATCH v6 08/20] cxl: IRQ allocation for guests Frederic Barrat
2016-03-04 11:26 ` [PATCH v6 09/20] powerpc: New possible return value from hcall Frederic Barrat
2016-03-04 11:26 ` [PATCH v6 10/20] cxl: New hcalls to support cxl adapters Frederic Barrat
2016-03-04 11:26 ` [PATCH v6 11/20] cxl: Separate bare-metal fields in adapter and AFU data structures Frederic Barrat
2016-03-04 11:26 ` [PATCH v6 12/20] cxl: Add guest-specific code Frederic Barrat
2016-03-09  5:55   ` [v6,12/20] " Michael Ellerman
2016-03-09  9:14     ` Frederic Barrat
2016-03-09 10:31       ` Michael Ellerman
2016-03-09 12:42   ` Michael Ellerman
2016-03-09 12:57     ` Michael Ellerman
2016-03-09 14:20     ` Frederic Barrat
2016-03-04 11:26 ` [PATCH v6 13/20] cxl: sysfs support for guests Frederic Barrat
2016-03-07  5:21   ` Ian Munsie
2016-03-04 11:26 ` [PATCH v6 14/20] cxl: Support to flash a new image on the adapter from a guest Frederic Barrat
2016-03-07  5:23   ` Ian Munsie
2016-03-04 11:26 ` [PATCH v6 15/20] cxl: Parse device tree and create cxl device(s) at boot Frederic Barrat
2016-03-04 11:26 ` [PATCH v6 16/20] cxl: Support the cxl kernel API from a guest Frederic Barrat
2016-03-04 11:26 ` [PATCH v6 17/20] cxl: Adapter failure handling Frederic Barrat
2016-03-04 11:26 ` [PATCH v6 18/20] cxl: Add tracepoints around the cxl hcall Frederic Barrat
2016-03-04 11:26 ` [PATCH v6 19/20] cxlflash: Use new cxl_pci_read_adapter_vpd() API Frederic Barrat
2016-03-04 14:41   ` Uma Krishnan
2016-03-04 16:32   ` Matthew R. Ochs
2016-03-04 17:41   ` Manoj Kumar
2016-03-04 11:26 ` [PATCH v6 20/20] cxl: Remove cxl_get_phys_dev() kernel API Frederic Barrat
2016-03-07  5:25   ` Ian Munsie
2016-03-09 11:09   ` [v6,20/20] " Michael Ellerman
2016-03-09 11:35     ` Frederic Barrat
2016-03-07  5:28 ` [PATCH v6 00/20] cxl: Add support for powerVM guest Ian Munsie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1457090804-9719-7-git-send-email-fbarrat@linux.vnet.ibm.com \
    --to=fbarrat@linux.vnet.ibm.com \
    --cc=imunsie@au1.ibm.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=manoj@linux.vnet.ibm.com \
    --cc=michael.neuling@au1.ibm.com \
    --cc=mrochs@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).