Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
xen/drmfront: use xenbus_setup_ring() and xenbus_teardown_ring()
Simplify drmfront's ring creation and removal via xenbus_setup_ring()
and xenbus_teardown_ring().
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
Tested-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com> # Arm64 only
Signed-off-by: Juergen Gross <jgross@suse.com>
+11
-32
+11
-32
drivers/gpu/drm/xen/xen_drm_front_evtchnl.c
+11
-32
drivers/gpu/drm/xen/xen_drm_front_evtchnl.c
···
123
123
static void evtchnl_free(struct xen_drm_front_info *front_info,
124
124
struct xen_drm_front_evtchnl *evtchnl)
125
125
{
126
-
unsigned long page = 0;
126
+
void *page = NULL;
127
127
128
128
if (evtchnl->type == EVTCHNL_TYPE_REQ)
129
-
page = (unsigned long)evtchnl->u.req.ring.sring;
129
+
page = evtchnl->u.req.ring.sring;
130
130
else if (evtchnl->type == EVTCHNL_TYPE_EVT)
131
-
page = (unsigned long)evtchnl->u.evt.page;
131
+
page = evtchnl->u.evt.page;
132
132
if (!page)
133
133
return;
134
134
···
147
147
xenbus_free_evtchn(front_info->xb_dev, evtchnl->port);
148
148
149
149
/* end access and free the page */
150
-
if (evtchnl->gref != INVALID_GRANT_REF)
151
-
gnttab_end_foreign_access(evtchnl->gref, page);
150
+
xenbus_teardown_ring(&page, 1, &evtchnl->gref);
152
151
153
152
memset(evtchnl, 0, sizeof(*evtchnl));
154
153
}
···
157
158
enum xen_drm_front_evtchnl_type type)
158
159
{
159
160
struct xenbus_device *xb_dev = front_info->xb_dev;
160
-
unsigned long page;
161
-
grant_ref_t gref;
161
+
void *page;
162
162
irq_handler_t handler;
163
163
int ret;
164
164
···
166
168
evtchnl->index = index;
167
169
evtchnl->front_info = front_info;
168
170
evtchnl->state = EVTCHNL_STATE_DISCONNECTED;
169
-
evtchnl->gref = INVALID_GRANT_REF;
170
171
171
-
page = get_zeroed_page(GFP_NOIO | __GFP_HIGH);
172
-
if (!page) {
173
-
ret = -ENOMEM;
172
+
ret = xenbus_setup_ring(xb_dev, GFP_NOIO | __GFP_HIGH, &page,
173
+
1, &evtchnl->gref);
174
+
if (ret)
174
175
goto fail;
175
-
}
176
176
177
177
if (type == EVTCHNL_TYPE_REQ) {
178
178
struct xen_displif_sring *sring;
179
179
180
180
init_completion(&evtchnl->u.req.completion);
181
181
mutex_init(&evtchnl->u.req.req_io_lock);
182
-
sring = (struct xen_displif_sring *)page;
183
-
SHARED_RING_INIT(sring);
184
-
FRONT_RING_INIT(&evtchnl->u.req.ring, sring, XEN_PAGE_SIZE);
185
-
186
-
ret = xenbus_grant_ring(xb_dev, sring, 1, &gref);
187
-
if (ret < 0) {
188
-
evtchnl->u.req.ring.sring = NULL;
189
-
free_page(page);
190
-
goto fail;
191
-
}
182
+
sring = page;
183
+
XEN_FRONT_RING_INIT(&evtchnl->u.req.ring, sring, XEN_PAGE_SIZE);
192
184
193
185
handler = evtchnl_interrupt_ctrl;
194
186
} else {
195
-
ret = gnttab_grant_foreign_access(xb_dev->otherend_id,
196
-
virt_to_gfn((void *)page), 0);
197
-
if (ret < 0) {
198
-
free_page(page);
199
-
goto fail;
200
-
}
201
-
202
-
evtchnl->u.evt.page = (struct xendispl_event_page *)page;
203
-
gref = ret;
187
+
evtchnl->u.evt.page = page;
204
188
handler = evtchnl_interrupt_evt;
205
189
}
206
-
evtchnl->gref = gref;
207
190
208
191
ret = xenbus_alloc_evtchn(xb_dev, &evtchnl->port);
209
192
if (ret < 0)