Skip to content

Commit

Permalink
Revert "hwrng: virtio - ensure reads happen after successful probe"
Browse files Browse the repository at this point in the history
This reverts commit e052dbf.

Now that we use the virtio ->scan() function to register with the hwrng
core, we will not get read requests till probe is successfully finished.

So revert the workaround we had in place to refuse read requests while
we were not yet setup completely.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  • Loading branch information
Amit Shah authored and Rusty Russell committed Jul 27, 2014
1 parent 5c06273 commit eeec626
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 15 deletions.
6 changes: 0 additions & 6 deletions drivers/char/hw_random/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,6 @@ static void add_early_randomness(struct hwrng *rng)
unsigned char bytes[16];
int bytes_read;

/*
* Currently only virtio-rng cannot return data during device
* probe, and that's handled in virtio-rng.c itself. If there
* are more such devices, this call to rng_get_data can be
* made conditional here instead of doing it per-device.
*/
bytes_read = rng_get_data(rng, bytes, sizeof(bytes), 1);
if (bytes_read > 0)
add_device_randomness(bytes, bytes_read);
Expand Down
9 changes: 0 additions & 9 deletions drivers/char/hw_random/virtio-rng.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ struct virtrng_info {
bool hwrng_register_done;
};

static bool probe_done;

static void random_recv_done(struct virtqueue *vq)
{
Expand Down Expand Up @@ -69,13 +68,6 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)
int ret;
struct virtrng_info *vi = (struct virtrng_info *)rng->priv;

/*
* Don't ask host for data till we're setup. This call can
* happen during hwrng_register(), after commit d9e7972619.
*/
if (unlikely(!probe_done))
return 0;

if (!vi->busy) {
vi->busy = true;
init_completion(&vi->have_data);
Expand Down Expand Up @@ -137,7 +129,6 @@ static int probe_common(struct virtio_device *vdev)
return err;
}

probe_done = true;
return 0;
}

Expand Down

0 comments on commit eeec626

Please sign in to comment.