Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Pull powerpc updates from Benjamin Herrenschmidt:
 "The bulk of this is LE updates.  One should now be able to build an LE
  kernel and even run some things in it.

  I'm still sitting on a handful of patches to enable the new ABI that I
  *might* still send this merge window around, but due to the
  incertainty (they are pretty fresh) I want to keep them separate.

  Other notable changes are some infrastructure bits to better handle
  PCI pass-through under KVM, some bits and pieces added to the new
  PowerNV platform support such as access to the CPU SCOM bus via sysfs,
  and support for EEH error handling on PHB3 (Power8 PCIe).

  We also grew arch_get_random_long() for both pseries and powernv when
  running on P7+ and P8, exploiting the HW rng.

  And finally various embedded updates from freescale"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (154 commits)
  powerpc: Fix fatal SLB miss when restoring PPR
  powerpc/powernv: Reserve the correct PE number
  powerpc/powernv: Add PE to its own PELTV
  powerpc/powernv: Add support for indirect XSCOM via debugfs
  powerpc/scom: Improve debugfs interface
  powerpc/scom: Enable 64-bit addresses
  powerpc/boot: Properly handle the base "of" boot wrapper
  powerpc/bpf: Support MOD operation
  powerpc/bpf: Fix DIVWU instruction opcode
  of: Move definition of of_find_next_cache_node into common code.
  powerpc: Remove big endianness assumption in of_find_next_cache_node
  powerpc/tm: Remove interrupt disable in __switch_to()
  powerpc: word-at-a-time optimization for 64-bit Little Endian
  powerpc/bpf: BPF JIT compiler for 64-bit Little Endian
  powerpc: Only save/restore SDR1 if in hypervisor mode
  powerpc/pmu: Fix ADB_PMU_LED_IDE dependencies
  powerpc/nvram: Fix endian issue when using the partition length
  powerpc/nvram: Fix endian issue when reading the NVRAM size
  powerpc/nvram: Scan partitions only once
  powerpc/mpc512x: remove unnecessary #if
  ...

2 files changed, 14 insertions, 15 deletions

diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
index cd69b48f6dfd..6496872e2e47 100644
--- a/drivers/tty/hvc/hvc_opal.c
+++ b/drivers/tty/hvc/hvc_opal.c
@@ -329,7 +329,7 @@ static void udbg_init_opal_common(void)
 void __init hvc_opal_init_early(void)
 {
         struct device_node *stdout_node = NULL;
-        const u32 *termno;
+        const __be32 *termno;
         const char *name = NULL;
         const struct hv_ops *ops;
         u32 index;
@@ -371,7 +371,7 @@ void __init hvc_opal_init_early(void)
         if (!stdout_node)
                 return;
         termno = of_get_property(stdout_node, "reg", NULL);
-        index = termno ? *termno : 0;
+        index = termno ? be32_to_cpup(termno) : 0;
         if (index >= MAX_NR_HVC_CONSOLES)
                 return;
         hvc_opal_privs[index] = &hvc_opal_boot_priv;
diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
index ac2767100df5..347050ea414a 100644
--- a/drivers/tty/hvc/hvsi_lib.c
+++ b/drivers/tty/hvc/hvsi_lib.c
@@ -9,7 +9,7 @@
 
 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
 {
-        packet->seqno = atomic_inc_return(&pv->seqno);
+        packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
 
         /* Assumes that always succeeds, works in practice */
         return pv->put_chars(pv->termno, (char *)packet, packet->len);
@@ -28,7 +28,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
         /* Send version query */
         q.hdr.type = VS_QUERY_PACKET_HEADER;
         q.hdr.len = sizeof(struct hvsi_query);
-        q.verb = VSV_SEND_VERSION_NUMBER;
+        q.verb = cpu_to_be16(VSV_SEND_VERSION_NUMBER);
         hvsi_send_packet(pv, &q.hdr);
 }
 
@@ -40,7 +40,7 @@ static int hvsi_send_close(struct hvsi_priv *pv)
 
         ctrl.hdr.type = VS_CONTROL_PACKET_HEADER;
         ctrl.hdr.len = sizeof(struct hvsi_control);
-        ctrl.verb = VSV_CLOSE_PROTOCOL;
+        ctrl.verb = cpu_to_be16(VSV_CLOSE_PROTOCOL);
         return hvsi_send_packet(pv, &ctrl.hdr);
 }
 
@@ -69,14 +69,14 @@ static void hvsi_got_control(struct hvsi_priv *pv)
 {
         struct hvsi_control *pkt = (struct hvsi_control *)pv->inbuf;
 
-        switch (pkt->verb) {
+        switch (be16_to_cpu(pkt->verb)) {
         case VSV_CLOSE_PROTOCOL:
                 /* We restart the handshaking */
                 hvsi_start_handshake(pv);
                 break;
         case VSV_MODEM_CTL_UPDATE:
                 /* Transition of carrier detect */
-                hvsi_cd_change(pv, pkt->word & HVSI_TSCD);
+                hvsi_cd_change(pv, be32_to_cpu(pkt->word) & HVSI_TSCD);
                 break;
         }
 }
@@ -87,7 +87,7 @@ static void hvsi_got_query(struct hvsi_priv *pv)
         struct hvsi_query_response r;
 
         /* We only handle version queries */
-        if (pkt->verb != VSV_SEND_VERSION_NUMBER)
+        if (be16_to_cpu(pkt->verb) != VSV_SEND_VERSION_NUMBER)
                 return;
 
         pr_devel("HVSI@%x: Got version query, sending response...\n",
@@ -96,7 +96,7 @@ static void hvsi_got_query(struct hvsi_priv *pv)
         /* Send version response */
         r.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
         r.hdr.len = sizeof(struct hvsi_query_response);
-        r.verb = VSV_SEND_VERSION_NUMBER;
+        r.verb = cpu_to_be16(VSV_SEND_VERSION_NUMBER);
         r.u.version = HVSI_VERSION;
         r.query_seqno = pkt->hdr.seqno;
         hvsi_send_packet(pv, &r.hdr);
@@ -112,7 +112,7 @@ static void hvsi_got_response(struct hvsi_priv *pv)
 
         switch(r->verb) {
         case VSV_SEND_MODEM_CTL_STATUS:
-                hvsi_cd_change(pv, r->u.mctrl_word & HVSI_TSCD);
+                hvsi_cd_change(pv, be32_to_cpu(r->u.mctrl_word) & HVSI_TSCD);
                 pv->mctrl_update = 1;
                 break;
         }
@@ -265,8 +265,7 @@ int hvsilib_read_mctrl(struct hvsi_priv *pv)
         pv->mctrl_update = 0;
         q.hdr.type = VS_QUERY_PACKET_HEADER;
         q.hdr.len = sizeof(struct hvsi_query);
-        q.hdr.seqno = atomic_inc_return(&pv->seqno);
-        q.verb = VSV_SEND_MODEM_CTL_STATUS;
+        q.verb = cpu_to_be16(VSV_SEND_MODEM_CTL_STATUS);
         rc = hvsi_send_packet(pv, &q.hdr);
         if (rc <= 0) {
                 pr_devel("HVSI@%x: Error %d...\n", pv->termno, rc);
@@ -304,9 +303,9 @@ int hvsilib_write_mctrl(struct hvsi_priv *pv, int dtr)
 
         ctrl.hdr.type = VS_CONTROL_PACKET_HEADER,
         ctrl.hdr.len = sizeof(struct hvsi_control);
-        ctrl.verb = VSV_SET_MODEM_CTL;
-        ctrl.mask = HVSI_TSDTR;
-        ctrl.word = dtr ? HVSI_TSDTR : 0;
+        ctrl.verb = cpu_to_be16(VSV_SET_MODEM_CTL);
+        ctrl.mask = cpu_to_be32(HVSI_TSDTR);
+        ctrl.word = cpu_to_be32(dtr ? HVSI_TSDTR : 0);
         return hvsi_send_packet(pv, &ctrl.hdr);
 }