sunvdc: add cdrom and v1.1 protocol support

Interpret the media type from v1.1 protocol to support CDROM/DVD.

For v1.0 protocol, a disk's size continues to be calculated from the
geometry returned by the vdisk server. The geometry returned by the server
can be less than the actual number of sectors available in the backing
image/device due to the rounding in the division used to compute the
geometry in the vdisk server.

In v1.1 protocol a disk's actual size in sectors is returned during the
handshake. Use this size when v1.1 protocol is negotiated. Since this size
will always be larger than the former geometry computed size, disks created
under v1.0 will be forwards compatible to v1.1, but not vice versa.

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 3 deletions

diff --git a/arch/sparc/include/asm/vio.h b/arch/sparc/include/asm/vio.h
index 6b135a8ab07b..94a02dbbac41 100644
--- a/arch/sparc/include/asm/vio.h
+++ b/arch/sparc/include/asm/vio.h
@@ -121,12 +121,18 @@ struct vio_disk_attr_info {
         u8                      vdisk_type;
 #define VD_DISK_TYPE_SLICE      0x01 /* Slice in block device   */
 #define VD_DISK_TYPE_DISK       0x02 /* Entire block device     */
-        u16                     resv1;
+        u8                      vdisk_mtype;            /* v1.1 */
+#define VD_MEDIA_TYPE_FIXED     0x01 /* Fixed device */
+#define VD_MEDIA_TYPE_CD        0x02 /* CD Device    */
+#define VD_MEDIA_TYPE_DVD       0x03 /* DVD Device   */
+        u8                      resv1;
         u32                     vdisk_block_size;
         u64                     operations;
-        u64                     vdisk_size;
+        u64                     vdisk_size;             /* v1.1 */
         u64                     max_xfer_size;
-        u64                     resv2[2];
+        u32                     phys_block_size;        /* v1.2 */
+        u32                     resv2;
+        u64                     resv3[1];
 };
 
 struct vio_disk_desc {