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 03/20] cxl: Define process problem state area at attach time only
Date: Fri, 4 Mar 2016 12:26:27 +0100 [thread overview]
Message-ID: <1457090804-9719-4-git-send-email-fbarrat@linux.vnet.ibm.com> (raw)
In-Reply-To: <1457090804-9719-1-git-send-email-fbarrat@linux.vnet.ibm.com>
CXL kernel API was defining the process problem state area during
context initialization, making it possible to map the problem state
area before attaching the context. This won't work on a powerVM
guest. So force the logical behavior, like in userspace: attach first,
then map the problem state area.
Remove calls to cxl_assign_psn_space during init. The function is
already called on the attach paths.
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/api.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/misc/cxl/api.c b/drivers/misc/cxl/api.c
index ea3eeb7..b45d857 100644
--- a/drivers/misc/cxl/api.c
+++ b/drivers/misc/cxl/api.c
@@ -51,8 +51,6 @@ struct cxl_context *cxl_dev_context_init(struct pci_dev *dev)
if (rc)
goto err_mapping;
- cxl_assign_psn_space(ctx);
-
return ctx;
err_mapping:
@@ -207,7 +205,6 @@ EXPORT_SYMBOL_GPL(cxl_stop_context);
void cxl_set_master(struct cxl_context *ctx)
{
ctx->master = true;
- cxl_assign_psn_space(ctx);
}
EXPORT_SYMBOL_GPL(cxl_set_master);
@@ -325,15 +322,11 @@ EXPORT_SYMBOL_GPL(cxl_start_work);
void __iomem *cxl_psa_map(struct cxl_context *ctx)
{
- struct cxl_afu *afu = ctx->afu;
- int rc;
-
- rc = cxl_afu_check_and_enable(afu);
- if (rc)
+ if (ctx->status != STARTED)
return NULL;
pr_devel("%s: psn_phys%llx size:%llx\n",
- __func__, afu->psn_phys, afu->adapter->ps_size);
+ __func__, ctx->psn_phys, ctx->psn_size);
return ioremap(ctx->psn_phys, ctx->psn_size);
}
EXPORT_SYMBOL_GPL(cxl_psa_map);
--
1.9.1
next prev 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 ` Frederic Barrat [this message]
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 ` [PATCH v6 06/20] cxl: Isolate a few bare-metal-specific calls Frederic Barrat
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-4-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).