2 Subject: implement forwarding of CD-ROM specific commands
3 Patch-mainline: obsolete
4 References: fate#300964
6 --- sle11-2009-06-04.orig/drivers/cdrom/Makefile 2009-06-04 10:17:48.000000000 +0200
7 +++ sle11-2009-06-04/drivers/cdrom/Makefile 2009-06-04 10:47:04.000000000 +0200
8 @@ -9,6 +9,7 @@ obj-$(CONFIG_BLK_DEV_IDECD) +=
9 obj-$(CONFIG_BLK_DEV_SR) += cdrom.o
10 obj-$(CONFIG_PARIDE_PCD) += cdrom.o
11 obj-$(CONFIG_CDROM_PKTCDVD) += cdrom.o
12 +obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += cdrom.o
14 obj-$(CONFIG_VIOCD) += viocd.o cdrom.o
15 obj-$(CONFIG_GDROM) += gdrom.o cdrom.o
16 --- sle11-2009-06-04.orig/drivers/xen/blkfront/Makefile 2009-06-04 10:17:48.000000000 +0200
17 +++ sle11-2009-06-04/drivers/xen/blkfront/Makefile 2009-06-04 10:47:04.000000000 +0200
20 obj-$(CONFIG_XEN_BLKDEV_FRONTEND) := xenblk.o
22 -xenblk-objs := blkfront.o vbd.o
23 +xenblk-objs := blkfront.o vbd.o vcd.o
25 --- sle11-2009-06-04.orig/drivers/xen/blkfront/blkfront.c 2009-06-04 10:46:54.000000000 +0200
26 +++ sle11-2009-06-04/drivers/xen/blkfront/blkfront.c 2009-06-04 10:47:04.000000000 +0200
27 @@ -377,6 +377,8 @@ static void connect(struct blkfront_info
36 @@ -407,6 +409,8 @@ static void blkfront_closing(struct xenb
38 xlvbd_sysfs_delif(info);
40 + unregister_vcd(info);
45 --- sle11-2009-06-04.orig/drivers/xen/blkfront/block.h 2009-06-04 10:21:09.000000000 +0200
46 +++ sle11-2009-06-04/drivers/xen/blkfront/block.h 2009-06-04 10:47:04.000000000 +0200
47 @@ -155,4 +155,8 @@ static inline void xlvbd_sysfs_delif(str
51 +/* Virtual cdrom block-device */
52 +extern void register_vcd(struct blkfront_info *info);
53 +extern void unregister_vcd(struct blkfront_info *info);
55 #endif /* __XEN_DRIVERS_BLOCK_H__ */
56 --- sle11-2009-06-04.orig/drivers/xen/blkfront/vbd.c 2009-06-04 10:21:09.000000000 +0200
57 +++ sle11-2009-06-04/drivers/xen/blkfront/vbd.c 2009-06-04 10:47:04.000000000 +0200
58 @@ -281,7 +281,8 @@ xlvbd_add(blkif_sector_t capacity, int v
62 - if ((minor & ((1 << mi->type->partn_shift) - 1)) == 0)
63 + if (!(vdisk_info & VDISK_CDROM) &&
64 + (minor & ((1 << mi->type->partn_shift) - 1)) == 0)
65 nr_minors = 1 << mi->type->partn_shift;
67 gd = alloc_disk(nr_minors);
68 @@ -290,7 +291,7 @@ xlvbd_add(blkif_sector_t capacity, int v
70 offset = mi->index * mi->type->disks_per_major +
71 (minor >> mi->type->partn_shift);
72 - if (nr_minors > 1) {
73 + if (nr_minors > 1 || (vdisk_info & VDISK_CDROM)) {
75 sprintf(gd->disk_name, "%s%c",
76 mi->type->diskname, 'a' + offset );
77 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
78 +++ sle11-2009-06-04/drivers/xen/blkfront/vcd.c 2009-06-04 10:47:04.000000000 +0200
80 +/*******************************************************************************
83 +* Implements CDROM cmd packet passing between frontend guest and backend driver.
85 +* Copyright (c) 2008, Pat Campell plc@novell.com
87 +* Permission is hereby granted, free of charge, to any person obtaining a copy
88 +* of this source file (the "Software"), to deal in the Software without
89 +* restriction, including without limitation the rights to use, copy, modify,
90 +* merge, publish, distribute, sublicense, and/or sell copies of the Software,
91 +* and to permit persons to whom the Software is furnished to do so, subject to
92 +* the following conditions:
94 +* The above copyright notice and this permission notice shall be included in
95 +* all copies or substantial portions of the Software.
97 +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
98 +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
99 +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
100 +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
101 +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
102 +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
106 +#define REVISION "$Revision: 1.0 $"
108 +#include <linux/module.h>
109 +#include <linux/blkdev.h>
110 +#include <linux/list.h>
111 +#include <linux/cdrom.h>
112 +#include <xen/interface/io/cdromif.h>
115 +/* List of cdrom_device_info, can have as many as blkfront supports */
117 + struct list_head vcd_entry;
118 + struct cdrom_device_info vcd_cdrom_info;
119 + spinlock_t vcd_cdrom_info_lock;
121 +static LIST_HEAD(vcd_disks);
122 +static DEFINE_SPINLOCK(vcd_disks_lock);
124 +static struct vcd_disk * xencdrom_get_list_entry(struct gendisk *disk)
126 + struct vcd_disk * ret_vcd = NULL;
127 + struct vcd_disk * vcd;
129 + spin_lock(&vcd_disks_lock);
130 + list_for_each_entry(vcd, &vcd_disks, vcd_entry) {
131 + if (vcd->vcd_cdrom_info.disk == disk) {
132 + spin_lock(&vcd->vcd_cdrom_info_lock);
137 + spin_unlock(&vcd_disks_lock);
141 +static void submit_message(struct blkfront_info *info, void * sp)
143 + struct request *req = NULL;
145 + req = blk_get_request(info->rq, READ, __GFP_WAIT);
146 + if (blk_rq_map_kern(info->rq, req, sp, PAGE_SIZE, __GFP_WAIT))
149 + req->rq_disk = info->gd;
150 +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)
151 + req->cmd_type = REQ_TYPE_BLOCK_PC;
152 + req->cmd_flags |= REQ_NOMERGE;
154 + req->flags |= REQ_BLOCK_PC;
157 + req->nr_sectors = 1;
158 + req->timeout = 60*HZ;
160 + blk_execute_rq(req->q, info->gd, req, 1);
163 + blk_put_request(req);
166 +static int submit_cdrom_cmd(struct blkfront_info *info,
167 + struct packet_command * cgc)
172 + union xen_block_packet *sp;
173 + struct xen_cdrom_packet *xcp;
174 + struct vcd_generic_command * vgc;
176 + if (cgc->buffer && cgc->buflen > MAX_PACKET_DATA) {
177 + printk(KERN_WARNING "%s() Packet buffer length is to large \n", __func__);
181 + page = alloc_page(GFP_NOIO);
183 + printk(KERN_CRIT "%s() Unable to allocate page\n", __func__);
188 + memset(page_address(page), 0, PAGE_SIZE);
189 + sp = page_address(page);
191 + xcp->type = XEN_TYPE_CDROM_PACKET;
192 + xcp->payload_offset = PACKET_PAYLOAD_OFFSET;
194 + vgc = (struct vcd_generic_command *)((char *)sp + xcp->payload_offset);
195 + memcpy(vgc->cmd, cgc->cmd, CDROM_PACKET_SIZE);
196 + vgc->stat = cgc->stat;
197 + vgc->data_direction = cgc->data_direction;
198 + vgc->quiet = cgc->quiet;
199 + vgc->timeout = cgc->timeout;
201 + vgc->sense_offset = PACKET_SENSE_OFFSET;
202 + memcpy((char *)sp + vgc->sense_offset, cgc->sense, sizeof(struct request_sense));
205 + vgc->buffer_offset = PACKET_BUFFER_OFFSET;
206 + memcpy((char *)sp + vgc->buffer_offset, cgc->buffer, cgc->buflen);
207 + vgc->buflen = cgc->buflen;
210 + submit_message(info,sp);
216 + memcpy(cgc->sense, (char *)sp + PACKET_SENSE_OFFSET, sizeof(struct request_sense));
218 + if (cgc->buffer && cgc->buflen) {
219 + memcpy(cgc->buffer, (char *)sp + PACKET_BUFFER_OFFSET, cgc->buflen);
227 +static int xencdrom_open(struct cdrom_device_info *cdi, int purpose)
231 + struct blkfront_info *info;
232 + union xen_block_packet *sp;
233 + struct xen_cdrom_open *xco;
235 + info = cdi->disk->private_data;
237 + if (strlen(info->xbdev->otherend) > MAX_PACKET_DATA) {
241 + page = alloc_page(GFP_NOIO);
243 + printk(KERN_CRIT "%s() Unable to allocate page\n", __func__);
247 + memset(page_address(page), 0, PAGE_SIZE);
248 + sp = page_address(page);
250 + xco->type = XEN_TYPE_CDROM_OPEN;
251 + xco->payload_offset = sizeof(struct xen_cdrom_open);
252 + strcpy((char *)sp + xco->payload_offset, info->xbdev->otherend);
254 + submit_message(info,sp);
261 + if (xco->media_present)
262 + set_capacity(cdi->disk, xco->sectors);
269 +static void xencdrom_release(struct cdrom_device_info *cdi)
273 +static int xencdrom_media_changed(struct cdrom_device_info *cdi, int disc_nr)
277 + struct blkfront_info *info;
278 + union xen_block_packet *sp;
279 + struct xen_cdrom_media_changed *xcmc;
281 + info = cdi->disk->private_data;
283 + page = alloc_page(GFP_NOIO);
285 + printk(KERN_CRIT "%s() Unable to allocate page\n", __func__);
289 + memset(page_address(page), 0, PAGE_SIZE);
290 + sp = page_address(page);
291 + xcmc = &(sp->xcmc);
292 + xcmc->type = XEN_TYPE_CDROM_MEDIA_CHANGED;
293 + submit_message(info,sp);
294 + ret = xcmc->media_changed;
301 +static int xencdrom_tray_move(struct cdrom_device_info *cdi, int position)
304 + struct packet_command cgc;
305 + struct blkfront_info *info;
307 + info = cdi->disk->private_data;
308 + init_cdrom_command(&cgc, NULL, 0, CGC_DATA_NONE);
309 + cgc.cmd[0] = GPCMD_START_STOP_UNIT;
314 + ret = submit_cdrom_cmd(info, &cgc);
318 +static int xencdrom_lock_door(struct cdrom_device_info *cdi, int lock)
321 + struct blkfront_info *info;
322 + struct packet_command cgc;
324 + info = cdi->disk->private_data;
325 + init_cdrom_command(&cgc, NULL, 0, CGC_DATA_NONE);
326 + cgc.cmd[0] = GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL;
328 + ret = submit_cdrom_cmd(info, &cgc);
332 +static int xencdrom_packet(struct cdrom_device_info *cdi,
333 + struct packet_command *cgc)
336 + struct blkfront_info *info;
338 + info = cdi->disk->private_data;
339 + ret = submit_cdrom_cmd(info, cgc);
344 +static int xencdrom_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,
350 +/* Query backend to see if CDROM packets are supported */
351 +static int xencdrom_supported(struct blkfront_info *info)
354 + union xen_block_packet *sp;
355 + struct xen_cdrom_support *xcs;
357 + page = alloc_page(GFP_NOIO);
359 + printk(KERN_CRIT "%s() Unable to allocate page\n", __func__);
363 + memset(page_address(page), 0, PAGE_SIZE);
364 + sp = page_address(page);
366 + xcs->type = XEN_TYPE_CDROM_SUPPORT;
367 + submit_message(info,sp);
368 + return xcs->supported;
371 +static struct cdrom_device_ops xencdrom_dops = {
372 + .open = xencdrom_open,
373 + .release = xencdrom_release,
374 + .media_changed = xencdrom_media_changed,
375 + .tray_move = xencdrom_tray_move,
376 + .lock_door = xencdrom_lock_door,
377 + .generic_packet = xencdrom_packet,
378 + .audio_ioctl = xencdrom_audio_ioctl,
379 + .capability = (CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | \
380 + CDC_MEDIA_CHANGED | CDC_GENERIC_PACKET | CDC_DVD | \
385 +static int xencdrom_block_open(struct inode *inode, struct file *file)
387 + struct blkfront_info *info = inode->i_bdev->bd_disk->private_data;
388 + struct vcd_disk * vcd;
391 + if ((vcd = xencdrom_get_list_entry(info->gd))) {
392 + ret = cdrom_open(&vcd->vcd_cdrom_info, inode, file);
393 + info->users = vcd->vcd_cdrom_info.use_count;
394 + spin_unlock(&vcd->vcd_cdrom_info_lock);
399 +static int xencdrom_block_release(struct inode *inode, struct file *file)
401 + struct blkfront_info *info = inode->i_bdev->bd_disk->private_data;
402 + struct vcd_disk * vcd;
405 + if ((vcd = xencdrom_get_list_entry(info->gd))) {
406 + ret = cdrom_release(&vcd->vcd_cdrom_info, file);
407 + spin_unlock(&vcd->vcd_cdrom_info_lock);
408 + if (vcd->vcd_cdrom_info.use_count == 0) {
410 + blkif_release(inode, file);
416 +static int xencdrom_block_ioctl(struct inode *inode, struct file *file,
417 + unsigned cmd, unsigned long arg)
419 + struct blkfront_info *info = inode->i_bdev->bd_disk->private_data;
420 + struct vcd_disk * vcd;
423 + if (!(vcd = xencdrom_get_list_entry(info->gd)))
427 + case 2285: /* SG_IO */
431 + ret = xencdrom_tray_move(&vcd->vcd_cdrom_info, 1);
433 + case CDROMCLOSETRAY:
434 + ret = xencdrom_tray_move(&vcd->vcd_cdrom_info, 0);
436 + case CDROM_GET_CAPABILITY:
437 + ret = vcd->vcd_cdrom_info.ops->capability & ~vcd->vcd_cdrom_info.mask;
439 + case CDROM_SET_OPTIONS:
440 + ret = vcd->vcd_cdrom_info.options;
442 + case CDROM_SEND_PACKET:
444 + struct packet_command * cgc = (struct packet_command *)arg;
445 + ret = submit_cdrom_cmd(info, cgc);
449 + /* Not supported, augment supported above if necessary */
450 + printk( "%s():%d Unsupported IOCTL:%x \n", __func__, __LINE__, cmd);
454 + spin_unlock(&vcd->vcd_cdrom_info_lock);
459 +/* Called as result of cdrom_open, vcd_cdrom_info_lock already held */
460 +static int xencdrom_block_media_changed(struct gendisk *disk)
462 + struct vcd_disk * vcd;
463 + struct vcd_disk * ret_vcd = NULL;
466 + spin_lock(&vcd_disks_lock);
467 + list_for_each_entry(vcd, &vcd_disks, vcd_entry) {
468 + if (vcd->vcd_cdrom_info.disk == disk) {
473 + spin_unlock(&vcd_disks_lock);
475 + ret = cdrom_media_changed(&ret_vcd->vcd_cdrom_info);
480 +static struct block_device_operations xencdrom_bdops =
482 + .owner = THIS_MODULE,
483 + .open = xencdrom_block_open,
484 + .release = xencdrom_block_release,
485 + .ioctl = xencdrom_block_ioctl,
486 + .media_changed = xencdrom_block_media_changed,
489 +void register_vcd(struct blkfront_info *info)
491 + struct gendisk * gd = info->gd;
492 + struct vcd_disk * vcd;
494 + /* Make sure this is for a CD device */
495 + if (!(gd->flags & GENHD_FL_CD))
498 + /* Make sure we have backend support */
499 + if (!xencdrom_supported(info)) {
503 + /* Create new vcd_disk and fill in cdrom_info */
504 + vcd = (struct vcd_disk *)kzalloc(sizeof(struct vcd_disk), GFP_KERNEL);
506 + printk(KERN_INFO "%s(): Unable to allocate vcd struct!\n", __func__);
509 + spin_lock_init(&vcd->vcd_cdrom_info_lock);
511 + vcd->vcd_cdrom_info.ops = &xencdrom_dops;
512 + vcd->vcd_cdrom_info.speed = 4;
513 + vcd->vcd_cdrom_info.capacity = 1;
514 + vcd->vcd_cdrom_info.options = 0;
515 + strcpy(vcd->vcd_cdrom_info.name, gd->disk_name);
516 + vcd->vcd_cdrom_info.mask = ( CDC_CD_RW | CDC_DVD_R | CDC_DVD_RAM |
517 + CDC_SELECT_DISC | CDC_SELECT_SPEED |
518 + CDC_MRW | CDC_MRW_W | CDC_RAM);
520 + if (register_cdrom(&(vcd->vcd_cdrom_info)) != 0) {
521 + printk(KERN_WARNING "%s() Cannot register blkdev as a cdrom %d!\n", __func__,
525 + xencdrom_bdops.owner = gd->fops->owner;
526 + gd->fops = &xencdrom_bdops;
527 + vcd->vcd_cdrom_info.disk = gd;
529 + spin_lock(&vcd_disks_lock);
530 + list_add(&(vcd->vcd_entry), &vcd_disks);
531 + spin_unlock(&vcd_disks_lock);
538 +void unregister_vcd(struct blkfront_info *info) {
539 + struct gendisk * gd = info->gd;
540 + struct vcd_disk * vcd;
542 + spin_lock(&vcd_disks_lock);
543 + list_for_each_entry(vcd, &vcd_disks, vcd_entry) {
544 + if (vcd->vcd_cdrom_info.disk == gd) {
545 + spin_lock(&vcd->vcd_cdrom_info_lock);
546 + unregister_cdrom(&vcd->vcd_cdrom_info);
547 + list_del(&vcd->vcd_entry);
548 + spin_unlock(&vcd->vcd_cdrom_info_lock);
553 + spin_unlock(&vcd_disks_lock);
556 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
557 +++ sle11-2009-06-04/include/xen/interface/io/cdromif.h 2009-06-04 10:47:04.000000000 +0200
559 +/******************************************************************************
562 + * Shared definitions between backend driver and Xen guest Virtual CDROM
565 + * Copyright (c) 2008, Pat Campell plc@novell.com
567 + * Permission is hereby granted, free of charge, to any person obtaining a copy
568 + * of this source file (the "Software"), to deal in the Software without
569 + * restriction, including without limitation the rights to use, copy, modify,
570 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
571 + * and to permit persons to whom the Software is furnished to do so, subject to
572 + * the following conditions:
574 + * The above copyright notice and this permission notice shall be included in
575 + * all copies or substantial portions of the Software.
577 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
578 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
579 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
580 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
581 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
582 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
586 +#ifndef __XEN_PUBLIC_IO_CDROMIF_H__
587 +#define __XEN_PUBLIC_IO_CDROMIF_H__
590 + * Queries backend for CDROM support
592 +#define XEN_TYPE_CDROM_SUPPORT _IO('c', 1)
594 +struct xen_cdrom_support
597 + int8_t ret; /* returned, 0 succeded, -1 error */
598 + int8_t err; /* returned, backend errno */
599 + int8_t supported; /* returned, 1 supported */
603 + * Opens backend device, returns drive geometry or
604 + * any encountered errors
606 +#define XEN_TYPE_CDROM_OPEN _IO('c', 2)
608 +struct xen_cdrom_open
614 + int8_t media_present; /* returned */
615 + uint32_t sectors; /* returned */
616 + uint32_t sector_size; /* returned */
617 + int32_t payload_offset; /* offset to backend node name payload */
621 + * Queries backend for media changed status
623 +#define XEN_TYPE_CDROM_MEDIA_CHANGED _IO('c', 3)
625 +struct xen_cdrom_media_changed
630 + int8_t media_changed; /* returned */
634 + * Sends vcd generic CDROM packet to backend, followed
635 + * immediately by the vcd_generic_command payload
637 +#define XEN_TYPE_CDROM_PACKET _IO('c', 4)
639 +struct xen_cdrom_packet
645 + int32_t payload_offset; /* offset to vcd_generic_command payload */
648 +/* CDROM_PACKET_COMMAND, payload for XEN_TYPE_CDROM_PACKET */
649 +struct vcd_generic_command
651 + uint8_t cmd[CDROM_PACKET_SIZE];
653 + uint32_t buffer_offset;
656 + uint32_t sense_offset;
657 + uint8_t data_direction;
663 +union xen_block_packet
666 + struct xen_cdrom_support xcs;
667 + struct xen_cdrom_open xco;
668 + struct xen_cdrom_media_changed xcmc;
669 + struct xen_cdrom_packet xcp;
672 +#define PACKET_PAYLOAD_OFFSET (sizeof(struct xen_cdrom_packet))
673 +#define PACKET_SENSE_OFFSET (PACKET_PAYLOAD_OFFSET + sizeof(struct vcd_generic_command))
674 +#define PACKET_BUFFER_OFFSET (PACKET_SENSE_OFFSET + sizeof(struct request_sense))
675 +#define MAX_PACKET_DATA (PAGE_SIZE - sizeof(struct xen_cdrom_packet) - \
676 + sizeof(struct vcd_generic_command) - sizeof(struct request_sense))