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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (103 commits)
  powerpc: Fix bug in move of altivec code to vector.S
  powerpc: Add support for swiotlb on 32-bit
  powerpc/spufs: Remove unused error path
  powerpc: Fix warning when printing a resource_size_t
  powerpc/xmon: Remove unused variable in xmon.c
  powerpc/pseries: Fix warnings when printing resource_size_t
  powerpc: Shield code specific to 64-bit server processors
  powerpc: Separate PACA fields for server CPUs
  powerpc: Split exception handling out of head_64.S
  powerpc: Introduce CONFIG_PPC_BOOK3S
  powerpc: Move VMX and VSX asm code to vector.S
  powerpc: Set init_bootmem_done on NUMA platforms as well
  powerpc/mm: Fix a AB->BA deadlock scenario with nohash MMU context lock
  powerpc/mm: Fix some SMP issues with MMU context handling
  powerpc: Add PTRACE_SINGLEBLOCK support
  fbdev: Add PLB support and cleanup DCR in xilinxfb driver.
  powerpc/virtex: Add ml510 reference design device tree
  powerpc/virtex: Add Xilinx ML510 reference design support
  powerpc/virtex: refactor intc driver and add support for i8259 cascading
  powerpc/virtex: Add support for Xilinx PCI host bridge
  ...

1 files changed, 20 insertions, 4 deletions

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 44f8392da117..9dd16c9b1a10 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -270,7 +270,7 @@ static int fill_init_enet_entries(struct ucc_geth_private *ugeth,
                                   u8 num_entries,
                                   u32 thread_size,
                                   u32 thread_alignment,
-                                  enum qe_risc_allocation risc,
+                                  unsigned int risc,
                                   int skip_page_for_first_entry)
 {
         u32 init_enet_offset;
@@ -307,7 +307,7 @@ static int fill_init_enet_entries(struct ucc_geth_private *ugeth,
 static int return_init_enet_entries(struct ucc_geth_private *ugeth,
                                     u32 *p_start,
                                     u8 num_entries,
-                                    enum qe_risc_allocation risc,
+                                    unsigned int risc,
                                     int skip_page_for_first_entry)
 {
         u32 init_enet_offset;
@@ -342,7 +342,7 @@ static int dump_init_enet_entries(struct ucc_geth_private *ugeth,
                                   u32 __iomem *p_start,
                                   u8 num_entries,
                                   u32 thread_size,
-                                  enum qe_risc_allocation risc,
+                                  unsigned int risc,
                                   int skip_page_for_first_entry)
 {
         u32 init_enet_offset;
@@ -2135,6 +2135,14 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
                 return -ENOMEM;
         }
 
+        /* read the number of risc engines, update the riscTx and riscRx
+         * if there are 4 riscs in QE
+         */
+        if (qe_get_num_of_risc() == 4) {
+                ug_info->riscTx = QE_RISC_ALLOCATION_FOUR_RISCS;
+                ug_info->riscRx = QE_RISC_ALLOCATION_FOUR_RISCS;
+        }
+
         ugeth->ug_regs = ioremap(uf_info->regs, sizeof(*ugeth->ug_regs));
         if (!ugeth->ug_regs) {
                 if (netif_msg_probe(ugeth))
@@ -3702,7 +3710,15 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
                 ug_info->uf_info.utfet = UCC_GETH_UTFET_GIGA_INIT;
                 ug_info->uf_info.utftt = UCC_GETH_UTFTT_GIGA_INIT;
                 ug_info->numThreadsTx = UCC_GETH_NUM_OF_THREADS_4;
-                ug_info->numThreadsRx = UCC_GETH_NUM_OF_THREADS_4;
+
+                /* If QE's snum number is 46 which means we need to support
+                 * 4 UECs at 1000Base-T simultaneously, we need to allocate
+                 * more Threads to Rx.
+                 */
+                if (qe_get_num_of_snums() == 46)
+                        ug_info->numThreadsRx = UCC_GETH_NUM_OF_THREADS_6;
+                else
+                        ug_info->numThreadsRx = UCC_GETH_NUM_OF_THREADS_4;
         }
 
         if (netif_msg_probe(&debug))