public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>,
	linux-scsi@vger.kernel.org
Subject: [PATCH 5/6] virtio/scsi: verify device has config space
Date: Tue, 13 Jan 2015 16:43:24 +0200	[thread overview]
Message-ID: <1421160167-18498-6-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1421160167-18498-1-git-send-email-mst@redhat.com>

Some devices might not implement config space access
(e.g. remoteproc used not to - before 3.9).
virtio/scsi needs config space access so make it
fail gracefully if not there.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 drivers/scsi/virtio_scsi.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index c52bb5d..f164f24 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -950,6 +950,12 @@ static int virtscsi_probe(struct virtio_device *vdev)
 	u32 num_queues;
 	struct scsi_host_template *hostt;
 
+	if (!vdev->config->get) {
+		dev_err(&vdev->dev, "%s failure: config access disabled\n",
+			__func__);
+		return -EINVAL;
+	}
+
 	/* We need to know how many queues before we allocate. */
 	num_queues = virtscsi_config_get(vdev, num_queues) ? : 1;
 
-- 
MST


  parent reply	other threads:[~2015-01-13 14:43 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-13 14:43 [PATCH 0/6] virtio: graceful failure with get == NULL Michael S. Tsirkin
2015-01-13 14:43 ` [PATCH 1/6] virtio/9p: verify device has config space Michael S. Tsirkin
2015-01-13 14:43 ` [PATCH 2/6] virtio/blk: " Michael S. Tsirkin
2015-01-13 14:43 ` [PATCH 3/6] virtio/console: " Michael S. Tsirkin
2015-01-13 14:43 ` [PATCH 4/6] virtio/net: " Michael S. Tsirkin
2015-01-13 14:43 ` Michael S. Tsirkin [this message]
2015-01-13 14:43 ` [PATCH 6/6] virtio/balloon: " Michael S. Tsirkin
2015-01-13 19:49 ` [PATCH 0/6] virtio: graceful failure with get == NULL Michael S. Tsirkin
2015-01-20  6:29   ` Rusty Russell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1421160167-18498-6-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=JBottomley@parallels.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox