Skip to content

Commit

Permalink
hwrng: Return errors to upper levels in pseries-rng.c
Browse files Browse the repository at this point in the history
We don't expect to get errors from the hypervisor when reading the rng,
but if we do we should pass the error up to the hwrng driver. Otherwise
the hwrng driver will continue calling us forever.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Michael Ellerman authored and Benjamin Herrenschmidt committed Oct 11, 2013
1 parent 41b93b2 commit f95dabe
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions drivers/char/hw_random/pseries-rng.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/hw_random.h>
#include <asm/vio.h>
Expand All @@ -25,10 +28,15 @@

static int pseries_rng_data_read(struct hwrng *rng, u32 *data)
{
if (plpar_hcall(H_RANDOM, (unsigned long *)data) != H_SUCCESS) {
printk(KERN_ERR "pseries rng hcall error\n");
return 0;
int rc;

rc = plpar_hcall(H_RANDOM, (unsigned long *)data);
if (rc != H_SUCCESS) {
pr_err_ratelimited("H_RANDOM call failed %d\n", rc);
return -EIO;
}

/* The hypervisor interface returns 64 bits */
return 8;
}

Expand Down

0 comments on commit f95dabe

Please sign in to comment.