UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/pseries/dlpar: use RTAS work area API 

Hold a work area object for the duration of the RTAS
ibm,configure-connector sequence, eliminating locking and copying
around each RTAS call.

Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20230125-b4-powerpc-rtas-queue-v3-13-26929c8cce78@linux.ibm.com
This commit is contained in:
Nathan Lynch 2023-02-10 12:42:01 -06:00 committed by Michael Ellerman
parent 43033bc62d
commit e27e14231e
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arch/powerpc/platforms/pseries/dlpar.c
View File

@ -22,6 +22,7 @@
#include <asm/machdep.h> #include <asm/machdep.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/rtas.h> #include <asm/rtas.h>
#include <asm/rtas-work-area.h>
static struct workqueue_struct *pseries_hp_wq; static struct workqueue_struct *pseries_hp_wq;
@ -137,6 +138,7 @@ struct device_node *dlpar_configure_connector(__be32 drc_index,
struct property *property; struct property *property;
struct property *last_property = NULL; struct property *last_property = NULL;
struct cc_workarea *ccwa; struct cc_workarea *ccwa;
struct rtas_work_area *work_area;
char *data_buf; char *data_buf;
int cc_token; int cc_token;
int rc = -1; int rc = -1;
@ -145,29 +147,18 @@ struct device_node *dlpar_configure_connector(__be32 drc_index,
if (cc_token == RTAS_UNKNOWN_SERVICE) if (cc_token == RTAS_UNKNOWN_SERVICE)
return NULL; return NULL;
data_buf = kzalloc(RTAS_DATA_BUF_SIZE, GFP_KERNEL); work_area = rtas_work_area_alloc(SZ_4K);
if (!data_buf) data_buf = rtas_work_area_raw_buf(work_area);
return NULL;
ccwa = (struct cc_workarea *)&data_buf[0]; ccwa = (struct cc_workarea *)&data_buf[0];
ccwa->drc_index = drc_index; ccwa->drc_index = drc_index;
ccwa->zero = 0; ccwa->zero = 0;
do { do {
/* Since we release the rtas_data_buf lock between configure do {
* connector calls we want to re-populate the rtas_data_buffer rc = rtas_call(cc_token, 2, 1, NULL,
* with the contents of the previous call. rtas_work_area_phys(work_area), NULL);
*/ } while (rtas_busy_delay(rc));
spin_lock(&rtas_data_buf_lock);
memcpy(rtas_data_buf, data_buf, RTAS_DATA_BUF_SIZE);
rc = rtas_call(cc_token, 2, 1, NULL, rtas_data_buf, NULL);
memcpy(data_buf, rtas_data_buf, RTAS_DATA_BUF_SIZE);
spin_unlock(&rtas_data_buf_lock);
if (rtas_busy_delay(rc))
continue;
switch (rc) { switch (rc) {
case COMPLETE: case COMPLETE:
@ -227,7 +218,7 @@ struct device_node *dlpar_configure_connector(__be32 drc_index,
} while (rc); } while (rc);
cc_error: cc_error:
kfree(data_buf); rtas_work_area_free(work_area);
if (rc) { if (rc) {
if (first_dn) if (first_dn)