Skip to content

L
linux
Commit 08093c8f authored by Jan-Bernd Themann's avatar Jan-Bernd Themann Committed by Jeff Garzik
Browse files
Options

[PATCH] ehea: firmware (hvcall) interface changes 

This eHEA patch covers required changes related to Anton Blanchard's new hvcall interface.
Signed-off-by: default avatarJan-Bernd Themann <themann@de.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 5f77113c
Hide whitespace changes
Inline Side-by-side
Showing with 238 additions and 335 deletions
drivers/net/ehea/ehea_phyp.c
View file @ 08093c8f
...@@ -44,71 +44,99 @@ static inline u16 get_order_of_qentries(u16 queue_entries) ...@@ -44,71 +44,99 @@ static inline u16 get_order_of_qentries(u16 queue_entries)
#define H_ALL_RES_TYPE_MR 5 #define H_ALL_RES_TYPE_MR 5
#define H_ALL_RES_TYPE_MW 6 #define H_ALL_RES_TYPE_MW 6
static long ehea_hcall_9arg_9ret(unsigned long opcode, static long ehea_plpar_hcall_norets(unsigned long opcode,
unsigned long arg1, unsigned long arg2, unsigned long arg1,
unsigned long arg3, unsigned long arg4, unsigned long arg2,
unsigned long arg5, unsigned long arg6, unsigned long arg3,
unsigned long arg7, unsigned long arg8, unsigned long arg4,
unsigned long arg9, unsigned long *out1, unsigned long arg5,
unsigned long *out2,unsigned long *out3, unsigned long arg6,
unsigned long *out4,unsigned long *out5, unsigned long arg7)
unsigned long *out6,unsigned long *out7,
unsigned long *out8,unsigned long *out9)
{ {
long hret; long ret;
int i, sleep_msecs; int i, sleep_msecs;
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
hret = plpar_hcall_9arg_9ret(opcode,arg1, arg2, arg3, arg4, ret = plpar_hcall_norets(opcode, arg1, arg2, arg3, arg4,
arg5, arg6, arg7, arg8, arg9, out1, arg5, arg6, arg7);
out2, out3, out4, out5, out6, out7,
out8, out9); if (H_IS_LONG_BUSY(ret)) {
if (H_IS_LONG_BUSY(hret)) { sleep_msecs = get_longbusy_msecs(ret);
sleep_msecs = get_longbusy_msecs(hret);
msleep_interruptible(sleep_msecs); msleep_interruptible(sleep_msecs);
continue; continue;
} }
if (hret < H_SUCCESS) if (ret < H_SUCCESS)
ehea_error("op=%lx hret=%lx " ehea_error("opcode=%lx ret=%lx"
"i1=%lx i2=%lx i3=%lx i4=%lx i5=%lx i6=%lx " " arg1=%lx arg2=%lx arg3=%lx arg4=%lx"
"i7=%lx i8=%lx i9=%lx " " arg5=%lx arg6=%lx arg7=%lx ",
"o1=%lx o2=%lx o3=%lx o4=%lx o5=%lx o6=%lx " opcode, ret,
"o7=%lx o8=%lx o9=%lx", arg1, arg2, arg3, arg4, arg5,
opcode, hret, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
arg6, arg7, arg8, arg9, *out1, *out2, *out3,
*out4, *out5, *out6, *out7, *out8, *out9); return ret;
return hret;
} }
return H_BUSY; return H_BUSY;
} }
u64 ehea_h_query_ehea_qp(const u64 adapter_handle, const u8 qp_category, static long ehea_plpar_hcall9(unsigned long opcode,
const u64 qp_handle, const u64 sel_mask, void *cb_addr) unsigned long *outs, /* array of 9 outputs */
unsigned long arg1,
unsigned long arg2,
unsigned long arg3,
unsigned long arg4,
unsigned long arg5,
unsigned long arg6,
unsigned long arg7,
unsigned long arg8,
unsigned long arg9)
{ {
u64 dummy; long ret;
int i, sleep_msecs;
if ((((u64)cb_addr) & (PAGE_SIZE - 1)) != 0) { for (i = 0; i < 5; i++) {
ehea_error("not on pageboundary"); ret = plpar_hcall9(opcode, outs,
return H_PARAMETER; arg1, arg2, arg3, arg4, arg5,
arg6, arg7, arg8, arg9);
if (H_IS_LONG_BUSY(ret)) {
sleep_msecs = get_longbusy_msecs(ret);
msleep_interruptible(sleep_msecs);
continue;
}
if (ret < H_SUCCESS)
ehea_error("opcode=%lx ret=%lx"
" arg1=%lx arg2=%lx arg3=%lx arg4=%lx"
" arg5=%lx arg6=%lx arg7=%lx arg8=%lx"
" arg9=%lx"
" out1=%lx out2=%lx out3=%lx out4=%lx"
" out5=%lx out6=%lx out7=%lx out8=%lx"
" out9=%lx",
opcode, ret,
arg1, arg2, arg3, arg4, arg5,
arg6, arg7, arg8, arg9,
outs[0], outs[1], outs[2], outs[3],
outs[4], outs[5], outs[6], outs[7],
outs[8]);
return ret;
} }
return ehea_hcall_9arg_9ret(H_QUERY_HEA_QP, return H_BUSY;
adapter_handle, /* R4 */ }
qp_category, /* R5 */
qp_handle, /* R6 */ u64 ehea_h_query_ehea_qp(const u64 adapter_handle, const u8 qp_category,
sel_mask, /* R7 */ const u64 qp_handle, const u64 sel_mask, void *cb_addr)
virt_to_abs(cb_addr), /* R8 */ {
0, 0, 0, 0, /* R9-R12 */ return ehea_plpar_hcall_norets(H_QUERY_HEA_QP,
&dummy, /* R4 */ adapter_handle, /* R4 */
&dummy, /* R5 */ qp_category, /* R5 */
&dummy, /* R6 */ qp_handle, /* R6 */
&dummy, /* R7 */ sel_mask, /* R7 */
&dummy, /* R8 */ virt_to_abs(cb_addr), /* R8 */
&dummy, /* R9 */ 0, 0);
&dummy, /* R10 */
&dummy, /* R11 */
&dummy); /* R12 */
} }
/* input param R5 */ /* input param R5 */
...@@ -180,6 +208,7 @@ u64 ehea_h_alloc_resource_qp(const u64 adapter_handle, ...@@ -180,6 +208,7 @@ u64 ehea_h_alloc_resource_qp(const u64 adapter_handle,
u64 *qp_handle, struct h_epas *h_epas) u64 *qp_handle, struct h_epas *h_epas)
{ {
u64 hret; u64 hret;
u64 outs[PLPAR_HCALL9_BUFSIZE];
u64 allocate_controls = u64 allocate_controls =
EHEA_BMASK_SET(H_ALL_RES_QP_EQPO, init_attr->low_lat_rq1 ? 1 : 0) EHEA_BMASK_SET(H_ALL_RES_QP_EQPO, init_attr->low_lat_rq1 ? 1 : 0)
...@@ -219,45 +248,29 @@ u64 ehea_h_alloc_resource_qp(const u64 adapter_handle, ...@@ -219,45 +248,29 @@ u64 ehea_h_alloc_resource_qp(const u64 adapter_handle,
EHEA_BMASK_SET(H_ALL_RES_QP_TH_RQ2, init_attr->rq2_threshold) EHEA_BMASK_SET(H_ALL_RES_QP_TH_RQ2, init_attr->rq2_threshold)
| EHEA_BMASK_SET(H_ALL_RES_QP_TH_RQ3, init_attr->rq3_threshold); | EHEA_BMASK_SET(H_ALL_RES_QP_TH_RQ3, init_attr->rq3_threshold);
u64 r5_out = 0; hret = ehea_plpar_hcall9(H_ALLOC_HEA_RESOURCE,
u64 r6_out = 0; outs,
u64 r7_out = 0; adapter_handle, /* R4 */
u64 r8_out = 0; allocate_controls, /* R5 */
u64 r9_out = 0; init_attr->send_cq_handle, /* R6 */
u64 g_la_user_out = 0; init_attr->recv_cq_handle, /* R7 */
u64 r11_out = 0; init_attr->aff_eq_handle, /* R8 */
u64 r12_out = 0; r9_reg, /* R9 */
max_r10_reg, /* R10 */
hret = ehea_hcall_9arg_9ret(H_ALLOC_HEA_RESOURCE, r11_in, /* R11 */
adapter_handle, /* R4 */ threshold); /* R12 */
allocate_controls, /* R5 */
init_attr->send_cq_handle, /* R6 */ *qp_handle = outs[0];
init_attr->recv_cq_handle, /* R7 */ init_attr->qp_nr = (u32)outs[1];
init_attr->aff_eq_handle, /* R8 */
r9_reg, /* R9 */
max_r10_reg, /* R10 */
r11_in, /* R11 */
threshold, /* R12 */
qp_handle, /* R4 */
&r5_out, /* R5 */
&r6_out, /* R6 */
&r7_out, /* R7 */
&r8_out, /* R8 */
&r9_out, /* R9 */
&g_la_user_out, /* R10 */
&r11_out, /* R11 */
&r12_out); /* R12 */
init_attr->qp_nr = (u32)r5_out;
init_attr->act_nr_send_wqes = init_attr->act_nr_send_wqes =
(u16)EHEA_BMASK_GET(H_ALL_RES_QP_ACT_SWQE, r6_out); (u16)EHEA_BMASK_GET(H_ALL_RES_QP_ACT_SWQE, outs[2]);
init_attr->act_nr_rwqes_rq1 = init_attr->act_nr_rwqes_rq1 =
(u16)EHEA_BMASK_GET(H_ALL_RES_QP_ACT_R1WQE, r6_out); (u16)EHEA_BMASK_GET(H_ALL_RES_QP_ACT_R1WQE, outs[2]);
init_attr->act_nr_rwqes_rq2 = init_attr->act_nr_rwqes_rq2 =
(u16)EHEA_BMASK_GET(H_ALL_RES_QP_ACT_R2WQE, r6_out); (u16)EHEA_BMASK_GET(H_ALL_RES_QP_ACT_R2WQE, outs[2]);
init_attr->act_nr_rwqes_rq3 = init_attr->act_nr_rwqes_rq3 =
(u16)EHEA_BMASK_GET(H_ALL_RES_QP_ACT_R3WQE, r6_out); (u16)EHEA_BMASK_GET(H_ALL_RES_QP_ACT_R3WQE, outs[2]);
init_attr->act_wqe_size_enc_sq = init_attr->wqe_size_enc_sq; init_attr->act_wqe_size_enc_sq = init_attr->wqe_size_enc_sq;
init_attr->act_wqe_size_enc_rq1 = init_attr->wqe_size_enc_rq1; init_attr->act_wqe_size_enc_rq1 = init_attr->wqe_size_enc_rq1;
...@@ -265,25 +278,25 @@ u64 ehea_h_alloc_resource_qp(const u64 adapter_handle, ...@@ -265,25 +278,25 @@ u64 ehea_h_alloc_resource_qp(const u64 adapter_handle,
init_attr->act_wqe_size_enc_rq3 = init_attr->wqe_size_enc_rq3; init_attr->act_wqe_size_enc_rq3 = init_attr->wqe_size_enc_rq3;
init_attr->nr_sq_pages = init_attr->nr_sq_pages =
(u32)EHEA_BMASK_GET(H_ALL_RES_QP_SIZE_SQ, r8_out); (u32)EHEA_BMASK_GET(H_ALL_RES_QP_SIZE_SQ, outs[4]);
init_attr->nr_rq1_pages = init_attr->nr_rq1_pages =
(u32)EHEA_BMASK_GET(H_ALL_RES_QP_SIZE_RQ1, r8_out); (u32)EHEA_BMASK_GET(H_ALL_RES_QP_SIZE_RQ1, outs[4]);
init_attr->nr_rq2_pages = init_attr->nr_rq2_pages =
(u32)EHEA_BMASK_GET(H_ALL_RES_QP_SIZE_RQ2, r9_out); (u32)EHEA_BMASK_GET(H_ALL_RES_QP_SIZE_RQ2, outs[5]);
init_attr->nr_rq3_pages = init_attr->nr_rq3_pages =
(u32)EHEA_BMASK_GET(H_ALL_RES_QP_SIZE_RQ3, r9_out); (u32)EHEA_BMASK_GET(H_ALL_RES_QP_SIZE_RQ3, outs[5]);
init_attr->liobn_sq = init_attr->liobn_sq =
(u32)EHEA_BMASK_GET(H_ALL_RES_QP_LIOBN_SQ, r11_out); (u32)EHEA_BMASK_GET(H_ALL_RES_QP_LIOBN_SQ, outs[7]);
init_attr->liobn_rq1 = init_attr->liobn_rq1 =
(u32)EHEA_BMASK_GET(H_ALL_RES_QP_LIOBN_RQ1, r11_out); (u32)EHEA_BMASK_GET(H_ALL_RES_QP_LIOBN_RQ1, outs[7]);
init_attr->liobn_rq2 = init_attr->liobn_rq2 =
(u32)EHEA_BMASK_GET(H_ALL_RES_QP_LIOBN_RQ2, r12_out); (u32)EHEA_BMASK_GET(H_ALL_RES_QP_LIOBN_RQ2, outs[8]);
init_attr->liobn_rq3 = init_attr->liobn_rq3 =
(u32)EHEA_BMASK_GET(H_ALL_RES_QP_LIOBN_RQ3, r12_out); (u32)EHEA_BMASK_GET(H_ALL_RES_QP_LIOBN_RQ3, outs[8]);
if (!hret) if (!hret)
hcp_epas_ctor(h_epas, g_la_user_out, g_la_user_out); hcp_epas_ctor(h_epas, outs[6], outs[6]);
return hret; return hret;
} }
...@@ -292,31 +305,24 @@ u64 ehea_h_alloc_resource_cq(const u64 adapter_handle, ...@@ -292,31 +305,24 @@ u64 ehea_h_alloc_resource_cq(const u64 adapter_handle,
struct ehea_cq_attr *cq_attr, struct ehea_cq_attr *cq_attr,
u64 *cq_handle, struct h_epas *epas) u64 *cq_handle, struct h_epas *epas)
{ {
u64 hret, dummy, act_nr_of_cqes_out, act_pages_out; u64 hret;
u64 g_la_privileged_out, g_la_user_out; u64 outs[PLPAR_HCALL9_BUFSIZE];
hret = ehea_hcall_9arg_9ret(H_ALLOC_HEA_RESOURCE, hret = ehea_plpar_hcall9(H_ALLOC_HEA_RESOURCE,
adapter_handle, /* R4 */ outs,
H_ALL_RES_TYPE_CQ, /* R5 */ adapter_handle, /* R4 */
cq_attr->eq_handle, /* R6 */ H_ALL_RES_TYPE_CQ, /* R5 */
cq_attr->cq_token, /* R7 */ cq_attr->eq_handle, /* R6 */
cq_attr->max_nr_of_cqes, /* R8 */ cq_attr->cq_token, /* R7 */
0, 0, 0, 0, /* R9-R12 */ cq_attr->max_nr_of_cqes, /* R8 */
cq_handle, /* R4 */ 0, 0, 0, 0); /* R9-R12 */
&dummy, /* R5 */
&dummy, /* R6 */ *cq_handle = outs[0];
&act_nr_of_cqes_out, /* R7 */ cq_attr->act_nr_of_cqes = outs[3];
&act_pages_out, /* R8 */ cq_attr->nr_pages = outs[4];
&g_la_privileged_out, /* R9 */
&g_la_user_out, /* R10 */
&dummy, /* R11 */
&dummy); /* R12 */
cq_attr->act_nr_of_cqes = act_nr_of_cqes_out;
cq_attr->nr_pages = act_pages_out;
if (!hret) if (!hret)
hcp_epas_ctor(epas, g_la_privileged_out, g_la_user_out); hcp_epas_ctor(epas, outs[5], outs[6]);
return hret; return hret;
} }
...@@ -361,9 +367,8 @@ u64 ehea_h_alloc_resource_cq(const u64 adapter_handle, ...@@ -361,9 +367,8 @@ u64 ehea_h_alloc_resource_cq(const u64 adapter_handle,
u64 ehea_h_alloc_resource_eq(const u64 adapter_handle, u64 ehea_h_alloc_resource_eq(const u64 adapter_handle,
struct ehea_eq_attr *eq_attr, u64 *eq_handle) struct ehea_eq_attr *eq_attr, u64 *eq_handle)
{ {
u64 hret, dummy, eq_liobn, allocate_controls; u64 hret, allocate_controls;
u64 ist1_out, ist2_out, ist3_out, ist4_out; u64 outs[PLPAR_HCALL9_BUFSIZE];
u64 act_nr_of_eqes_out, act_pages_out;
/* resource type */ /* resource type */
allocate_controls = allocate_controls =
...@@ -372,27 +377,20 @@ u64 ehea_h_alloc_resource_eq(const u64 adapter_handle, ...@@ -372,27 +377,20 @@ u64 ehea_h_alloc_resource_eq(const u64 adapter_handle,
| EHEA_BMASK_SET(H_ALL_RES_EQ_INH_EQE_GEN, !eq_attr->eqe_gen) | EHEA_BMASK_SET(H_ALL_RES_EQ_INH_EQE_GEN, !eq_attr->eqe_gen)
| EHEA_BMASK_SET(H_ALL_RES_EQ_NON_NEQ_ISN, 1); | EHEA_BMASK_SET(H_ALL_RES_EQ_NON_NEQ_ISN, 1);
hret = ehea_hcall_9arg_9ret(H_ALLOC_HEA_RESOURCE, hret = ehea_plpar_hcall9(H_ALLOC_HEA_RESOURCE,
adapter_handle, /* R4 */ outs,
allocate_controls, /* R5 */ adapter_handle, /* R4 */
eq_attr->max_nr_of_eqes, /* R6 */ allocate_controls, /* R5 */
0, 0, 0, 0, 0, 0, /* R7-R10 */ eq_attr->max_nr_of_eqes, /* R6 */
eq_handle, /* R4 */ 0, 0, 0, 0, 0, 0); /* R7-R10 */
&dummy, /* R5 */
&eq_liobn, /* R6 */ *eq_handle = outs[0];
&act_nr_of_eqes_out, /* R7 */ eq_attr->act_nr_of_eqes = outs[3];
&act_pages_out, /* R8 */ eq_attr->nr_pages = outs[4];
&ist1_out, /* R9 */ eq_attr->ist1 = outs[5];
&ist2_out, /* R10 */ eq_attr->ist2 = outs[6];
&ist3_out, /* R11 */ eq_attr->ist3 = outs[7];
&ist4_out); /* R12 */ eq_attr->ist4 = outs[8];
eq_attr->act_nr_of_eqes = act_nr_of_eqes_out;
eq_attr->nr_pages = act_pages_out;
eq_attr->ist1 = ist1_out;
eq_attr->ist2 = ist2_out;
eq_attr->ist3 = ist3_out;
eq_attr->ist4 = ist4_out;
return hret; return hret;
} }
...@@ -402,31 +400,22 @@ u64 ehea_h_modify_ehea_qp(const u64 adapter_handle, const u8 cat, ...@@ -402,31 +400,22 @@ u64 ehea_h_modify_ehea_qp(const u64 adapter_handle, const u8 cat,
void *cb_addr, u64 *inv_attr_id, u64 *proc_mask, void *cb_addr, u64 *inv_attr_id, u64 *proc_mask,
u16 *out_swr, u16 *out_rwr) u16 *out_swr, u16 *out_rwr)
{ {
u64 hret, dummy, act_out_swr, act_out_rwr; u64 hret;
u64 outs[PLPAR_HCALL9_BUFSIZE];
if ((((u64)cb_addr) & (PAGE_SIZE - 1)) != 0) {
ehea_error("not on page boundary"); hret = ehea_plpar_hcall9(H_MODIFY_HEA_QP,
return H_PARAMETER; outs,
} adapter_handle, /* R4 */
(u64) cat, /* R5 */
hret = ehea_hcall_9arg_9ret(H_MODIFY_HEA_QP, qp_handle, /* R6 */
adapter_handle, /* R4 */ sel_mask, /* R7 */
(u64) cat, /* R5 */ virt_to_abs(cb_addr), /* R8 */
qp_handle, /* R6 */ 0, 0, 0, 0); /* R9-R12 */
sel_mask, /* R7 */
virt_to_abs(cb_addr), /* R8 */ *inv_attr_id = outs[0];
0, 0, 0, 0, /* R9-R12 */ *out_swr = outs[3];
inv_attr_id, /* R4 */ *out_rwr = outs[4];
&dummy, /* R5 */ *proc_mask = outs[5];
&dummy, /* R6 */
&act_out_swr, /* R7 */
&act_out_rwr, /* R8 */
proc_mask, /* R9 */
&dummy, /* R10 */
&dummy, /* R11 */
&dummy); /* R12 */
*out_swr = act_out_swr;
*out_rwr = act_out_rwr;
return hret; return hret;
} }
...@@ -435,122 +424,81 @@ u64 ehea_h_register_rpage(const u64 adapter_handle, const u8 pagesize, ...@@ -435,122 +424,81 @@ u64 ehea_h_register_rpage(const u64 adapter_handle, const u8 pagesize,
const u8 queue_type, const u64 resource_handle, const u8 queue_type, const u64 resource_handle,
const u64 log_pageaddr, u64 count) const u64 log_pageaddr, u64 count)
{ {
u64 dummy, reg_control; u64 reg_control;
reg_control = EHEA_BMASK_SET(H_REG_RPAGE_PAGE_SIZE, pagesize) reg_control = EHEA_BMASK_SET(H_REG_RPAGE_PAGE_SIZE, pagesize)
| EHEA_BMASK_SET(H_REG_RPAGE_QT, queue_type); | EHEA_BMASK_SET(H_REG_RPAGE_QT, queue_type);
return ehea_hcall_9arg_9ret(H_REGISTER_HEA_RPAGES, return ehea_plpar_hcall_norets(H_REGISTER_HEA_RPAGES,
adapter_handle, /* R4 */ adapter_handle, /* R4 */
reg_control, /* R5 */ reg_control, /* R5 */
resource_handle, /* R6 */ resource_handle, /* R6 */
log_pageaddr, /* R7 */ log_pageaddr, /* R7 */
count, /* R8 */ count, /* R8 */
0, 0, 0, 0, /* R9-R12 */ 0, 0); /* R9-R10 */
&dummy, /* R4 */
&dummy, /* R5 */
&dummy, /* R6 */
&dummy, /* R7 */
&dummy, /* R8 */
&dummy, /* R9 */
&dummy, /* R10 */
&dummy, /* R11 */
&dummy); /* R12 */
} }
u64 ehea_h_register_smr(const u64 adapter_handle, const u64 orig_mr_handle, u64 ehea_h_register_smr(const u64 adapter_handle, const u64 orig_mr_handle,
const u64 vaddr_in, const u32 access_ctrl, const u32 pd, const u64 vaddr_in, const u32 access_ctrl, const u32 pd,
struct ehea_mr *mr) struct ehea_mr *mr)
{ {
u64 hret, dummy, lkey_out; u64 hret;
u64 outs[PLPAR_HCALL9_BUFSIZE];
hret = ehea_hcall_9arg_9ret(H_REGISTER_SMR,
adapter_handle , /* R4 */ hret = ehea_plpar_hcall9(H_REGISTER_SMR,
orig_mr_handle, /* R5 */ outs,
vaddr_in, /* R6 */ adapter_handle , /* R4 */
(((u64)access_ctrl) << 32ULL), /* R7 */ orig_mr_handle, /* R5 */
pd, /* R8 */ vaddr_in, /* R6 */
0, 0, 0, 0, /* R9-R12 */ (((u64)access_ctrl) << 32ULL), /* R7 */
&mr->handle, /* R4 */ pd, /* R8 */
&dummy, /* R5 */ 0, 0, 0, 0); /* R9-R12 */
&lkey_out, /* R6 */
&dummy, /* R7 */ mr->handle = outs[0];
&dummy, /* R8 */ mr->lkey = (u32)outs[2];
&dummy, /* R9 */
&dummy, /* R10 */
&dummy, /* R11 */
&dummy); /* R12 */
mr->lkey = (u32)lkey_out;
return hret; return hret;
} }
u64 ehea_h_disable_and_get_hea(const u64 adapter_handle, const u64 qp_handle) u64 ehea_h_disable_and_get_hea(const u64 adapter_handle, const u64 qp_handle)
{ {
u64 hret, dummy, ladr_next_sq_wqe_out; u64 outs[PLPAR_HCALL9_BUFSIZE];
u64 ladr_next_rq1_wqe_out, ladr_next_rq2_wqe_out, ladr_next_rq3_wqe_out;
return ehea_plpar_hcall9(H_DISABLE_AND_GET_HEA,
hret = ehea_hcall_9arg_9ret(H_DISABLE_AND_GET_HEA, outs,
adapter_handle, /* R4 */ adapter_handle, /* R4 */
H_DISABLE_GET_EHEA_WQE_P, /* R5 */ H_DISABLE_GET_EHEA_WQE_P, /* R5 */
qp_handle, /* R6 */ qp_handle, /* R6 */
0, 0, 0, 0, 0, 0, /* R7-R12 */ 0, 0, 0, 0, 0, 0); /* R7-R12 */
&ladr_next_sq_wqe_out, /* R4 */
&ladr_next_rq1_wqe_out, /* R5 */
&ladr_next_rq2_wqe_out, /* R6 */
&ladr_next_rq3_wqe_out, /* R7 */
&dummy, /* R8 */
&dummy, /* R9 */
&dummy, /* R10 */
&dummy, /* R11 */
&dummy); /* R12 */
return hret;
} }
u64 ehea_h_free_resource(const u64 adapter_handle, const u64 res_handle) u64 ehea_h_free_resource(const u64 adapter_handle, const u64 res_handle)
{ {
u64 dummy; return ehea_plpar_hcall_norets(H_FREE_RESOURCE,
adapter_handle, /* R4 */
return ehea_hcall_9arg_9ret(H_FREE_RESOURCE, res_handle, /* R5 */
adapter_handle, /* R4 */ 0, 0, 0, 0, 0); /* R6-R10 */
res_handle, /* R5 */
0, 0, 0, 0, 0, 0, 0, /* R6-R12 */
&dummy, /* R4 */
&dummy, /* R5 */
&dummy, /* R6 */
&dummy, /* R7 */
&dummy, /* R8 */
&dummy, /* R9 */
&dummy, /* R10 */
&dummy, /* R11 */
&dummy); /* R12 */
} }
u64 ehea_h_alloc_resource_mr(const u64 adapter_handle, const u64 vaddr, u64 ehea_h_alloc_resource_mr(const u64 adapter_handle, const u64 vaddr,
const u64 length, const u32 access_ctrl, const u64 length, const u32 access_ctrl,
const u32 pd, u64 *mr_handle, u32 *lkey) const u32 pd, u64 *mr_handle, u32 *lkey)
{ {
u64 hret, dummy, lkey_out; u64 hret;
u64 outs[PLPAR_HCALL9_BUFSIZE];
hret = ehea_hcall_9arg_9ret(H_ALLOC_HEA_RESOURCE,
adapter_handle, /* R4 */ hret = ehea_plpar_hcall9(H_ALLOC_HEA_RESOURCE,
5, /* R5 */ outs,
vaddr, /* R6 */ adapter_handle, /* R4 */
length, /* R7 */ 5, /* R5 */
(((u64) access_ctrl) << 32ULL),/* R8 */ vaddr, /* R6 */
pd, /* R9 */ length, /* R7 */
0, 0, 0, /* R10-R12 */ (((u64) access_ctrl) << 32ULL), /* R8 */
mr_handle, /* R4 */ pd, /* R9 */
&dummy, /* R5 */ 0, 0, 0); /* R10-R12 */
&lkey_out, /* R6 */
&dummy, /* R7 */ *mr_handle = outs[0];
&dummy, /* R8 */ *lkey = (u32)outs[2];
&dummy, /* R9 */
&dummy, /* R10 */
&dummy, /* R11 */
&dummy); /* R12 */
*lkey = (u32) lkey_out;
return hret; return hret;
} }
...@@ -570,23 +518,14 @@ u64 ehea_h_register_rpage_mr(const u64 adapter_handle, const u64 mr_handle, ...@@ -570,23 +518,14 @@ u64 ehea_h_register_rpage_mr(const u64 adapter_handle, const u64 mr_handle,
u64 ehea_h_query_ehea(const u64 adapter_handle, void *cb_addr) u64 ehea_h_query_ehea(const u64 adapter_handle, void *cb_addr)
{ {
u64 hret, dummy, cb_logaddr; u64 hret, cb_logaddr;
cb_logaddr = virt_to_abs(cb_addr); cb_logaddr = virt_to_abs(cb_addr);
hret = ehea_hcall_9arg_9ret(H_QUERY_HEA, hret = ehea_plpar_hcall_norets(H_QUERY_HEA,
adapter_handle, /* R4 */ adapter_handle, /* R4 */
cb_logaddr, /* R5 */ cb_logaddr, /* R5 */
0, 0, 0, 0, 0, 0, 0, /* R6-R12 */ 0, 0, 0, 0, 0); /* R6-R10 */
&dummy, /* R4 */
&dummy, /* R5 */
&dummy, /* R6 */
&dummy, /* R7 */
&dummy, /* R8 */
&dummy, /* R9 */
&dummy, /* R10 */
&dummy, /* R11 */
&dummy); /* R12 */
#ifdef DEBUG #ifdef DEBUG
ehea_dmp(cb_addr, sizeof(struct hcp_query_ehea), "hcp_query_ehea"); ehea_dmp(cb_addr, sizeof(struct hcp_query_ehea), "hcp_query_ehea");
#endif #endif
...@@ -597,36 +536,28 @@ u64 ehea_h_query_ehea_port(const u64 adapter_handle, const u16 port_num, ...@@ -597,36 +536,28 @@ u64 ehea_h_query_ehea_port(const u64 adapter_handle, const u16 port_num,
const u8 cb_cat, const u64 select_mask, const u8 cb_cat, const u64 select_mask,
void *cb_addr) void *cb_addr)
{ {
u64 port_info, dummy; u64 port_info;
u64 cb_logaddr = virt_to_abs(cb_addr); u64 cb_logaddr = virt_to_abs(cb_addr);
u64 arr_index = 0; u64 arr_index = 0;
port_info = EHEA_BMASK_SET(H_MEHEAPORT_CAT, cb_cat) port_info = EHEA_BMASK_SET(H_MEHEAPORT_CAT, cb_cat)
| EHEA_BMASK_SET(H_MEHEAPORT_PN, port_num); | EHEA_BMASK_SET(H_MEHEAPORT_PN, port_num);
return ehea_hcall_9arg_9ret(H_QUERY_HEA_PORT, return ehea_plpar_hcall_norets(H_QUERY_HEA_PORT,
adapter_handle, /* R4 */ adapter_handle, /* R4 */
port_info, /* R5 */ port_info, /* R5 */
select_mask, /* R6 */ select_mask, /* R6 */
arr_index, /* R7 */ arr_index, /* R7 */
cb_logaddr, /* R8 */ cb_logaddr, /* R8 */
0, 0, 0, 0, /* R9-R12 */ 0, 0); /* R9-R10 */
&dummy, /* R4 */
&dummy, /* R5 */
&dummy, /* R6 */
&dummy, /* R7 */
&dummy, /* R8 */
&dummy, /* R9 */
&dummy, /* R10 */
&dummy, /* R11 */
&dummy); /* R12 */
} }
u64 ehea_h_modify_ehea_port(const u64 adapter_handle, const u16 port_num, u64 ehea_h_modify_ehea_port(const u64 adapter_handle, const u16 port_num,
const u8 cb_cat, const u64 select_mask, const u8 cb_cat, const u64 select_mask,
void *cb_addr) void *cb_addr)
{ {
u64 port_info, dummy, inv_attr_ident, proc_mask; u64 outs[PLPAR_HCALL9_BUFSIZE];
u64 port_info;
u64 arr_index = 0; u64 arr_index = 0;
u64 cb_logaddr = virt_to_abs(cb_addr); u64 cb_logaddr = virt_to_abs(cb_addr);
...@@ -635,29 +566,21 @@ u64 ehea_h_modify_ehea_port(const u64 adapter_handle, const u16 port_num, ...@@ -635,29 +566,21 @@ u64 ehea_h_modify_ehea_port(const u64 adapter_handle, const u16 port_num,
#ifdef DEBUG #ifdef DEBUG
ehea_dump(cb_addr, sizeof(struct hcp_ehea_port_cb0), "Before HCALL"); ehea_dump(cb_addr, sizeof(struct hcp_ehea_port_cb0), "Before HCALL");
#endif #endif
return ehea_hcall_9arg_9ret(H_MODIFY_HEA_PORT, return ehea_plpar_hcall9(H_MODIFY_HEA_PORT,
adapter_handle, /* R4 */ outs,
port_info, /* R5 */ adapter_handle, /* R4 */
select_mask, /* R6 */ port_info, /* R5 */
arr_index, /* R7 */ select_mask, /* R6 */
cb_logaddr, /* R8 */ arr_index, /* R7 */
0, 0, 0, 0, /* R9-R12 */ cb_logaddr, /* R8 */
&inv_attr_ident, /* R4 */ 0, 0, 0, 0); /* R9-R12 */
&proc_mask, /* R5 */
&dummy, /* R6 */
&dummy, /* R7 */
&dummy, /* R8 */
&dummy, /* R9 */
&dummy, /* R10 */
&dummy, /* R11 */
&dummy); /* R12 */
} }
u64 ehea_h_reg_dereg_bcmc(const u64 adapter_handle, const u16 port_num, u64 ehea_h_reg_dereg_bcmc(const u64 adapter_handle, const u16 port_num,
const u8 reg_type, const u64 mc_mac_addr, const u8 reg_type, const u64 mc_mac_addr,
const u16 vlan_id, const u32 hcall_id) const u16 vlan_id, const u32 hcall_id)
{ {
u64 r5_port_num, r6_reg_type, r7_mc_mac_addr, r8_vlan_id, dummy; u64 r5_port_num, r6_reg_type, r7_mc_mac_addr, r8_vlan_id;
u64 mac_addr = mc_mac_addr >> 16; u64 mac_addr = mc_mac_addr >> 16;
r5_port_num = EHEA_BMASK_SET(H_REGBCMC_PN, port_num); r5_port_num = EHEA_BMASK_SET(H_REGBCMC_PN, port_num);
...@@ -665,41 +588,21 @@ u64 ehea_h_reg_dereg_bcmc(const u64 adapter_handle, const u16 port_num, ...@@ -665,41 +588,21 @@ u64 ehea_h_reg_dereg_bcmc(const u64 adapter_handle, const u16 port_num,
r7_mc_mac_addr = EHEA_BMASK_SET(H_REGBCMC_MACADDR, mac_addr); r7_mc_mac_addr = EHEA_BMASK_SET(H_REGBCMC_MACADDR, mac_addr);
r8_vlan_id = EHEA_BMASK_SET(H_REGBCMC_VLANID, vlan_id); r8_vlan_id = EHEA_BMASK_SET(H_REGBCMC_VLANID, vlan_id);
return ehea_hcall_9arg_9ret(hcall_id, return ehea_plpar_hcall_norets(hcall_id,
adapter_handle, /* R4 */ adapter_handle, /* R4 */
r5_port_num, /* R5 */ r5_port_num, /* R5 */
r6_reg_type, /* R6 */ r6_reg_type, /* R6 */
r7_mc_mac_addr, /* R7 */ r7_mc_mac_addr, /* R7 */
r8_vlan_id, /* R8 */ r8_vlan_id, /* R8 */
0, 0, 0, 0, /* R9-R12 */ 0, 0); /* R9-R12 */
&dummy, /* R4 */
&dummy, /* R5 */
&dummy, /* R6 */
&dummy, /* R7 */
&dummy, /* R8 */
&dummy, /* R9 */
&dummy, /* R10 */
&dummy, /* R11 */
&dummy); /* R12 */
} }
u64 ehea_h_reset_events(const u64 adapter_handle, const u64 neq_handle, u64 ehea_h_reset_events(const u64 adapter_handle, const u64 neq_handle,
const u64 event_mask) const u64 event_mask)
{ {
u64 dummy; return ehea_plpar_hcall_norets(H_RESET_EVENTS,
adapter_handle, /* R4 */
return ehea_hcall_9arg_9ret(H_RESET_EVENTS, neq_handle, /* R5 */
adapter_handle, /* R4 */ event_mask, /* R6 */
neq_handle, /* R5 */ 0, 0, 0, 0); /* R7-R12 */
event_mask, /* R6 */
0, 0, 0, 0, 0, 0, /* R7-R12 */
&dummy, /* R4 */
&dummy, /* R5 */
&dummy, /* R6 */
&dummy, /* R7 */
&dummy, /* R8 */
&dummy, /* R9 */
&dummy, /* R10 */
&dummy, /* R11 */
&dummy); /* R12 */
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7