Merge tag 'signed-kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into kvm-master

Patch queue for ppc - 2015-04-21

This is the latest queue for KVM on PowerPC changes. Highlights this
time around:

  - Book3S HV: Debugging aids
  - Book3S HV: Minor performance improvements
  - Book3S HV: Cleanups

1 files changed, 29 insertions, 0 deletions

diff --git a/arch/powerpc/platforms/powernv/rng.c b/arch/powerpc/platforms/powernv/rng.c
index 80db43944afe..6eb808ff637e 100644
--- a/arch/powerpc/platforms/powernv/rng.c
+++ b/arch/powerpc/platforms/powernv/rng.c
@@ -24,12 +24,22 @@
 
 struct powernv_rng {
         void __iomem *regs;
+        void __iomem *regs_real;
         unsigned long mask;
 };
 
 static DEFINE_PER_CPU(struct powernv_rng *, powernv_rng);
 
 
+int powernv_hwrng_present(void)
+{
+        struct powernv_rng *rng;
+
+        rng = get_cpu_var(powernv_rng);
+        put_cpu_var(rng);
+        return rng != NULL;
+}
+
 static unsigned long rng_whiten(struct powernv_rng *rng, unsigned long val)
 {
         unsigned long parity;
@@ -46,6 +56,17 @@ static unsigned long rng_whiten(struct powernv_rng *rng, unsigned long val)
         return val;
 }
 
+int powernv_get_random_real_mode(unsigned long *v)
+{
+        struct powernv_rng *rng;
+
+        rng = raw_cpu_read(powernv_rng);
+
+        *v = rng_whiten(rng, in_rm64(rng->regs_real));
+
+        return 1;
+}
+
 int powernv_get_random_long(unsigned long *v)
 {
         struct powernv_rng *rng;
@@ -80,12 +101,20 @@ static __init void rng_init_per_cpu(struct powernv_rng *rng,
 static __init int rng_create(struct device_node *dn)
 {
         struct powernv_rng *rng;
+        struct resource res;
         unsigned long val;
 
         rng = kzalloc(sizeof(*rng), GFP_KERNEL);
         if (!rng)
                 return -ENOMEM;
 
+        if (of_address_to_resource(dn, 0, &res)) {
+                kfree(rng);
+                return -ENXIO;
+        }
+
+        rng->regs_real = (void __iomem *)res.start;
+
         rng->regs = of_iomap(dn, 0);
         if (!rng->regs) {
                 kfree(rng);