ath9k: adjust duty cycle for FTP profile for AR9565

[~andy/linux] / drivers / scsi / virtio_scsi.c

diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index 7554d78564348cee5127a1b05a209d3f9895aea1..595af1ae4421937ba1b157d79b84d081866e8355 100644 (file)
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -279,6 +279,31 @@ static void virtscsi_handle_transport_reset(struct virtio_scsi *vscsi,
        }
 }
 
+static void virtscsi_handle_param_change(struct virtio_scsi *vscsi,
+                                        struct virtio_scsi_event *event)
+{
+       struct scsi_device *sdev;
+       struct Scsi_Host *shost = virtio_scsi_host(vscsi->vdev);
+       unsigned int target = event->lun[1];
+       unsigned int lun = (event->lun[2] << 8) | event->lun[3];
+       u8 asc = event->reason & 255;
+       u8 ascq = event->reason >> 8;
+
+       sdev = scsi_device_lookup(shost, 0, target, lun);
+       if (!sdev) {
+               pr_err("SCSI device %d 0 %d %d not found\n",
+                       shost->host_no, target, lun);
+               return;
+       }
+
+       /* Handle "Parameters changed", "Mode parameters changed", and
+          "Capacity data has changed".  */
+       if (asc == 0x2a && (ascq == 0x00 || ascq == 0x01 || ascq == 0x09))
+               scsi_rescan_device(&sdev->sdev_gendev);
+
+       scsi_device_put(sdev);
+}
+
 static void virtscsi_handle_event(struct work_struct *work)
 {
        struct virtio_scsi_event_node *event_node =
@@ -297,6 +322,9 @@ static void virtscsi_handle_event(struct work_struct *work)
        case VIRTIO_SCSI_T_TRANSPORT_RESET:
                virtscsi_handle_transport_reset(vscsi, event);
                break;
+       case VIRTIO_SCSI_T_PARAM_CHANGE:
+               virtscsi_handle_param_change(vscsi, event);
+               break;
        default:
                pr_err("Unsupport virtio scsi event %x\n", event->event);
        }
@@ -677,7 +705,11 @@ static int __devinit virtscsi_probe(struct virtio_device *vdev)
        cmd_per_lun = virtscsi_config_get(vdev, cmd_per_lun) ?: 1;
        shost->cmd_per_lun = min_t(u32, cmd_per_lun, shost->can_queue);
        shost->max_sectors = virtscsi_config_get(vdev, max_sectors) ?: 0xFFFF;
-       shost->max_lun = virtscsi_config_get(vdev, max_lun) + 1;
+
+       /* LUNs > 256 are reported with format 1, so they go in the range
+        * 16640-32767.
+        */
+       shost->max_lun = virtscsi_config_get(vdev, max_lun) + 1 + 0x4000;
        shost->max_id = num_targets;
        shost->max_channel = 0;
        shost->max_cmd_len = VIRTIO_SCSI_CDB_SIZE;
@@ -733,7 +765,8 @@ static struct virtio_device_id id_table[] = {
 };
 
 static unsigned int features[] = {
-       VIRTIO_SCSI_F_HOTPLUG
+       VIRTIO_SCSI_F_HOTPLUG,
+       VIRTIO_SCSI_F_CHANGE,
 };
 
 static struct virtio_driver virtio_scsi_driver = {