@@ -139,14 +139,14 @@ struct fastrpc_mmap_rsp_msg {
139
139
};
140
140
141
141
struct fastrpc_mmap_req_msg {
142
- s32 pgid ;
142
+ s32 client_id ;
143
143
u32 flags ;
144
144
u64 vaddr ;
145
145
s32 num ;
146
146
};
147
147
148
148
struct fastrpc_mem_map_req_msg {
149
- s32 pgid ;
149
+ s32 client_id ;
150
150
s32 fd ;
151
151
s32 offset ;
152
152
u32 flags ;
@@ -156,20 +156,20 @@ struct fastrpc_mem_map_req_msg {
156
156
};
157
157
158
158
struct fastrpc_munmap_req_msg {
159
- s32 pgid ;
159
+ s32 client_id ;
160
160
u64 vaddr ;
161
161
u64 size ;
162
162
};
163
163
164
164
struct fastrpc_mem_unmap_req_msg {
165
- s32 pgid ;
165
+ s32 client_id ;
166
166
s32 fd ;
167
167
u64 vaddrin ;
168
168
u64 len ;
169
169
};
170
170
171
171
struct fastrpc_msg {
172
- int pid ; /* process group id */
172
+ int client_id ; /* process client id */
173
173
int tid ; /* thread id */
174
174
u64 ctx ; /* invoke caller context */
175
175
u32 handle ; /* handle to invoke */
@@ -234,7 +234,7 @@ struct fastrpc_invoke_ctx {
234
234
int nbufs ;
235
235
int retval ;
236
236
int pid ;
237
- int tgid ;
237
+ int client_id ;
238
238
u32 sc ;
239
239
u32 * crc ;
240
240
u64 ctxid ;
@@ -614,7 +614,7 @@ static struct fastrpc_invoke_ctx *fastrpc_context_alloc(
614
614
ctx -> sc = sc ;
615
615
ctx -> retval = -1 ;
616
616
ctx -> pid = current -> pid ;
617
- ctx -> tgid = user -> client_id ;
617
+ ctx -> client_id = user -> client_id ;
618
618
ctx -> cctx = cctx ;
619
619
init_completion (& ctx -> work );
620
620
INIT_WORK (& ctx -> put_work , fastrpc_context_put_wq );
@@ -1115,11 +1115,11 @@ static int fastrpc_invoke_send(struct fastrpc_session_ctx *sctx,
1115
1115
int ret ;
1116
1116
1117
1117
cctx = fl -> cctx ;
1118
- msg -> pid = fl -> client_id ;
1118
+ msg -> client_id = fl -> client_id ;
1119
1119
msg -> tid = current -> pid ;
1120
1120
1121
1121
if (kernel )
1122
- msg -> pid = 0 ;
1122
+ msg -> client_id = 0 ;
1123
1123
1124
1124
msg -> ctx = ctx -> ctxid | fl -> pd ;
1125
1125
msg -> handle = handle ;
@@ -1244,7 +1244,7 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl,
1244
1244
int err ;
1245
1245
bool scm_done = false;
1246
1246
struct {
1247
- int pgid ;
1247
+ int client_id ;
1248
1248
u32 namelen ;
1249
1249
u32 pageslen ;
1250
1250
} inbuf ;
@@ -1293,7 +1293,7 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl,
1293
1293
}
1294
1294
}
1295
1295
1296
- inbuf .pgid = fl -> client_id ;
1296
+ inbuf .client_id = fl -> client_id ;
1297
1297
inbuf .namelen = init .namelen ;
1298
1298
inbuf .pageslen = 0 ;
1299
1299
fl -> pd = USER_PD ;
@@ -1363,7 +1363,7 @@ static int fastrpc_init_create_process(struct fastrpc_user *fl,
1363
1363
int memlen ;
1364
1364
int err ;
1365
1365
struct {
1366
- int pgid ;
1366
+ int client_id ;
1367
1367
u32 namelen ;
1368
1368
u32 filelen ;
1369
1369
u32 pageslen ;
@@ -1395,7 +1395,7 @@ static int fastrpc_init_create_process(struct fastrpc_user *fl,
1395
1395
goto err ;
1396
1396
}
1397
1397
1398
- inbuf .pgid = fl -> client_id ;
1398
+ inbuf .client_id = fl -> client_id ;
1399
1399
inbuf .namelen = strlen (current -> comm ) + 1 ;
1400
1400
inbuf .filelen = init .filelen ;
1401
1401
inbuf .pageslen = 1 ;
@@ -1504,12 +1504,12 @@ static void fastrpc_session_free(struct fastrpc_channel_ctx *cctx,
1504
1504
static int fastrpc_release_current_dsp_process (struct fastrpc_user * fl )
1505
1505
{
1506
1506
struct fastrpc_invoke_args args [1 ];
1507
- int tgid = 0 ;
1507
+ int client_id = 0 ;
1508
1508
u32 sc ;
1509
1509
1510
- tgid = fl -> client_id ;
1511
- args [0 ].ptr = (u64 )(uintptr_t ) & tgid ;
1512
- args [0 ].length = sizeof (tgid );
1510
+ client_id = fl -> client_id ;
1511
+ args [0 ].ptr = (u64 )(uintptr_t ) & client_id ;
1512
+ args [0 ].length = sizeof (client_id );
1513
1513
args [0 ].fd = -1 ;
1514
1514
sc = FASTRPC_SCALARS (FASTRPC_RMID_INIT_RELEASE , 1 , 0 );
1515
1515
@@ -1649,11 +1649,11 @@ static int fastrpc_dmabuf_alloc(struct fastrpc_user *fl, char __user *argp)
1649
1649
static int fastrpc_init_attach (struct fastrpc_user * fl , int pd )
1650
1650
{
1651
1651
struct fastrpc_invoke_args args [1 ];
1652
- int tgid = fl -> client_id ;
1652
+ int client_id = fl -> client_id ;
1653
1653
u32 sc ;
1654
1654
1655
- args [0 ].ptr = (u64 )(uintptr_t ) & tgid ;
1656
- args [0 ].length = sizeof (tgid );
1655
+ args [0 ].ptr = (u64 )(uintptr_t ) & client_id ;
1656
+ args [0 ].length = sizeof (client_id );
1657
1657
args [0 ].fd = -1 ;
1658
1658
sc = FASTRPC_SCALARS (FASTRPC_RMID_INIT_ATTACH , 1 , 0 );
1659
1659
fl -> pd = pd ;
@@ -1805,7 +1805,7 @@ static int fastrpc_req_munmap_impl(struct fastrpc_user *fl, struct fastrpc_buf *
1805
1805
int err ;
1806
1806
u32 sc ;
1807
1807
1808
- req_msg .pgid = fl -> client_id ;
1808
+ req_msg .client_id = fl -> client_id ;
1809
1809
req_msg .size = buf -> size ;
1810
1810
req_msg .vaddr = buf -> raddr ;
1811
1811
@@ -1891,7 +1891,7 @@ static int fastrpc_req_mmap(struct fastrpc_user *fl, char __user *argp)
1891
1891
return err ;
1892
1892
}
1893
1893
1894
- req_msg .pgid = fl -> client_id ;
1894
+ req_msg .client_id = fl -> client_id ;
1895
1895
req_msg .flags = req .flags ;
1896
1896
req_msg .vaddr = req .vaddrin ;
1897
1897
req_msg .num = sizeof (pages );
@@ -1980,7 +1980,7 @@ static int fastrpc_req_mem_unmap_impl(struct fastrpc_user *fl, struct fastrpc_me
1980
1980
return - EINVAL ;
1981
1981
}
1982
1982
1983
- req_msg .pgid = fl -> client_id ;
1983
+ req_msg .client_id = fl -> client_id ;
1984
1984
req_msg .len = map -> len ;
1985
1985
req_msg .vaddrin = map -> raddr ;
1986
1986
req_msg .fd = map -> fd ;
@@ -2033,7 +2033,7 @@ static int fastrpc_req_mem_map(struct fastrpc_user *fl, char __user *argp)
2033
2033
return err ;
2034
2034
}
2035
2035
2036
- req_msg .pgid = fl -> client_id ;
2036
+ req_msg .client_id = fl -> client_id ;
2037
2037
req_msg .fd = req .fd ;
2038
2038
req_msg .offset = req .offset ;
2039
2039
req_msg .vaddrin = req .vaddrin ;
0 commit comments