Re: [1/5] powerpc/embedded6xx: Remove C2K board support

2018-06-04 Thread Mark Greer 
On Tue, Jun 05, 2018 at 12:10:31AM +1000, Michael Ellerman wrote:
> On Fri, 2018-04-06 at 01:17:16 UTC, Mark Greer wrote:
> > The C2K platform appears to be orphaned so remove code supporting it.
> > 
> > CC: Remi Machet 
> > Signed-off-by: Mark Greer 
> > Acked-by: Remi Machet 
> > Signed-off-by: Mark Greer 
> 
> Series applied to powerpc next, thanks.
> 
> https://git.kernel.org/powerpc/c/92c8c16f345759e87c5d5b771d438f

Thanks Michael.

Mark
--

Re: [1/5] powerpc/embedded6xx: Remove C2K board support

2018-06-04 Thread Michael Ellerman 
On Fri, 2018-04-06 at 01:17:16 UTC, Mark Greer wrote:
> The C2K platform appears to be orphaned so remove code supporting it.
> 
> CC: Remi Machet 
> Signed-off-by: Mark Greer 
> Acked-by: Remi Machet 
> Signed-off-by: Mark Greer 

Series applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/92c8c16f345759e87c5d5b771d438f

cheers

Re: [PATCH 1/5] powerpc/embedded6xx: Remove C2K board support

2018-04-07 Thread kbuild test robot 
Hi Mark,

I love your patch! Perhaps something to improve:

[auto build test WARNING on powerpc/next]
[cannot apply to v4.16 next-20180406]
[if your patch is applied to the wrong git tree, please drop us a note to help 
improve the system]

url:
https://github.com/0day-ci/linux/commits/Mark-Greer/powerpc-Remove-support-for-Marvell-mv64x60-hostbridges/20180406-204320
base:   https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next
config: powerpc-amigaone_defconfig (attached as .config)
compiler: powerpc-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0
reproduce:
wget 
https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O 
~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=powerpc 

All warnings (new ones prefixed by >>):

warning: (AMIGAONE) selects NOT_COHERENT_CACHE which has unmet direct 
dependencies (4xx || PPC_8xx || E200 || PPC_MPC512x || GAMECUBE_COMMON)

---
0-DAY kernel test infrastructureOpen Source Technology Center
https://lists.01.org/pipermail/kbuild-all   Intel Corporation


.config.gz
Description: application/gzip

RE: [PATCH 1/5] powerpc/embedded6xx: Remove C2K board support

2018-04-06 Thread remi 
Acked-by: Remi Machet <r...@machet.us>

-Original Message-
From: Mark Greer <mgr...@animalcreek.com> 
Sent: Thursday, April 5, 2018 9:17 PM
To: Benjamin Herrenschmidt <b...@kernel.crashing.org>; Paul Mackerras
<pau...@samba.org>; Michael Ellerman <m...@ellerman.id.au>
Cc: Remi Machet <rmac...@nvidia.com>; Dale Farnsworth <d...@farnsworth.org>;
linuxppc-dev@lists.ozlabs.org; linux-ker...@vger.kernel.org; Mark Greer
<mgr...@animalcreek.com>
Subject: [PATCH 1/5] powerpc/embedded6xx: Remove C2K board support

The C2K platform appears to be orphaned so remove code supporting it.

CC: Remi Machet <rmac...@nvidia.com>
Signed-off-by: Mark Greer <mgr...@animalcreek.com>
---
 arch/powerpc/boot/Makefile  |   5 +-
 arch/powerpc/boot/cuboot-c2k.c  | 189 --
 arch/powerpc/boot/dts/c2k.dts   | 366
--
 arch/powerpc/configs/c2k_defconfig  | 390

 arch/powerpc/platforms/embedded6xx/Kconfig  |  10 -
 arch/powerpc/platforms/embedded6xx/Makefile |   1 -
 arch/powerpc/platforms/embedded6xx/c2k.c| 148 ---
 7 files changed, 2 insertions(+), 1107 deletions(-)  delete mode 100644
arch/powerpc/boot/cuboot-c2k.c  delete mode 100644
arch/powerpc/boot/dts/c2k.dts  delete mode 100644
arch/powerpc/configs/c2k_defconfig
 delete mode 100644 arch/powerpc/platforms/embedded6xx/c2k.c

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index
26d5d2a5b8e9..70bf9b409fae 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -143,8 +143,8 @@ src-plat-$(CONFIG_PPC_82xx) += cuboot-pq2.c fixed-head.S
ep8248e.c cuboot-824x.c
 src-plat-$(CONFIG_PPC_83xx) += cuboot-83xx.c fixed-head.S redboot-83xx.c
 src-plat-$(CONFIG_FSL_SOC_BOOKE) += cuboot-85xx.c cuboot-85xx-cpm2.c
 src-plat-$(CONFIG_EMBEDDED6xx) += cuboot-pq2.c cuboot-mpc7448hpc2.c \
-   cuboot-c2k.c gamecube-head.S \
-   gamecube.c wii-head.S wii.c holly.c
\
+   gamecube-head.S gamecube.c \
+   wii-head.S wii.c holly.c \
fixed-head.S mvme5100.c
 src-plat-$(CONFIG_AMIGAONE) += cuboot-amigaone.c
 src-plat-$(CONFIG_PPC_PS3) += ps3-head.S ps3-hvcall.S ps3.c
@@ -339,7 +339,6 @@ image-$(CONFIG_MVME7100)+=
dtbImage.mvme7100
 # Board ports in arch/powerpc/platform/embedded6xx/Kconfig
 image-$(CONFIG_STORCENTER) += cuImage.storcenter
 image-$(CONFIG_MPC7448HPC2)+= cuImage.mpc7448hpc2
-image-$(CONFIG_PPC_C2K)+= cuImage.c2k
 image-$(CONFIG_GAMECUBE)   += dtbImage.gamecube
 image-$(CONFIG_WII)+= dtbImage.wii
 image-$(CONFIG_MVME5100)   += dtbImage.mvme5100
diff --git a/arch/powerpc/boot/cuboot-c2k.c b/arch/powerpc/boot/cuboot-c2k.c
deleted file mode 100644 index 9309c51f1d65..
--- a/arch/powerpc/boot/cuboot-c2k.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GEFanuc C2K platform code.
- *
- * Author: Remi Machet <rmac...@slac.stanford.edu>
- *
- * Originated from prpmc2800.c
- *
- * 2008 (c) Stanford University
- * 2007 (c) MontaVista, Software, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-
-#include "types.h"
-#include "stdio.h"
-#include "io.h"
-#include "ops.h"
-#include "elf.h"
-#include "mv64x60.h"
-#include "cuboot.h"
-#include "ppcboot.h"
-
-static u8 *bridge_base;
-
-static void c2k_bridge_setup(u32 mem_size) -{
-   u32 i, v[30], enables, acc_bits;
-   u32 pci_base_hi, pci_base_lo, size, buf[2];
-   unsigned long cpu_base;
-   int rc;
-   void *devp, *mv64x60_devp;
-   u8 *bridge_pbase, is_coherent;
-   struct mv64x60_cpu2pci_win *tbl;
-   int bus;
-
-   bridge_pbase = mv64x60_get_bridge_pbase();
-   is_coherent = mv64x60_is_coherent();
-
-   if (is_coherent)
-   acc_bits = MV64x60_PCI_ACC_CNTL_SNOOP_WB
-   | MV64x60_PCI_ACC_CNTL_SWAP_NONE
-   | MV64x60_PCI_ACC_CNTL_MBURST_32_BYTES
-   | MV64x60_PCI_ACC_CNTL_RDSIZE_32_BYTES;
-   else
-   acc_bits = MV64x60_PCI_ACC_CNTL_SNOOP_NONE
-   | MV64x60_PCI_ACC_CNTL_SWAP_NONE
-   | MV64x60_PCI_ACC_CNTL_MBURST_128_BYTES
-   | MV64x60_PCI_ACC_CNTL_RDSIZE_256_BYTES;
-
-   mv64x60_config_ctlr_windows(bridge_base, bridge_pbase, is_coherent);
-   mv64x60_devp = find_node_by_compatible(NULL, "marvell,mv64360");
-   if (mv64x60_devp == NULL)
-   fatal("Error: Missing marvell,m

[PATCH 1/5] powerpc/embedded6xx: Remove C2K board support

2018-04-05 Thread Mark Greer 
The C2K platform appears to be orphaned so remove code supporting it.

CC: Remi Machet 
Signed-off-by: Mark Greer 
---
 arch/powerpc/boot/Makefile  |   5 +-
 arch/powerpc/boot/cuboot-c2k.c  | 189 --
 arch/powerpc/boot/dts/c2k.dts   | 366 --
 arch/powerpc/configs/c2k_defconfig  | 390 
 arch/powerpc/platforms/embedded6xx/Kconfig  |  10 -
 arch/powerpc/platforms/embedded6xx/Makefile |   1 -
 arch/powerpc/platforms/embedded6xx/c2k.c| 148 ---
 7 files changed, 2 insertions(+), 1107 deletions(-)
 delete mode 100644 arch/powerpc/boot/cuboot-c2k.c
 delete mode 100644 arch/powerpc/boot/dts/c2k.dts
 delete mode 100644 arch/powerpc/configs/c2k_defconfig
 delete mode 100644 arch/powerpc/platforms/embedded6xx/c2k.c

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 26d5d2a5b8e9..70bf9b409fae 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -143,8 +143,8 @@ src-plat-$(CONFIG_PPC_82xx) += cuboot-pq2.c fixed-head.S 
ep8248e.c cuboot-824x.c
 src-plat-$(CONFIG_PPC_83xx) += cuboot-83xx.c fixed-head.S redboot-83xx.c
 src-plat-$(CONFIG_FSL_SOC_BOOKE) += cuboot-85xx.c cuboot-85xx-cpm2.c
 src-plat-$(CONFIG_EMBEDDED6xx) += cuboot-pq2.c cuboot-mpc7448hpc2.c \
-   cuboot-c2k.c gamecube-head.S \
-   gamecube.c wii-head.S wii.c holly.c \
+   gamecube-head.S gamecube.c \
+   wii-head.S wii.c holly.c \
fixed-head.S mvme5100.c
 src-plat-$(CONFIG_AMIGAONE) += cuboot-amigaone.c
 src-plat-$(CONFIG_PPC_PS3) += ps3-head.S ps3-hvcall.S ps3.c
@@ -339,7 +339,6 @@ image-$(CONFIG_MVME7100)+= dtbImage.mvme7100
 # Board ports in arch/powerpc/platform/embedded6xx/Kconfig
 image-$(CONFIG_STORCENTER) += cuImage.storcenter
 image-$(CONFIG_MPC7448HPC2)+= cuImage.mpc7448hpc2
-image-$(CONFIG_PPC_C2K)+= cuImage.c2k
 image-$(CONFIG_GAMECUBE)   += dtbImage.gamecube
 image-$(CONFIG_WII)+= dtbImage.wii
 image-$(CONFIG_MVME5100)   += dtbImage.mvme5100
diff --git a/arch/powerpc/boot/cuboot-c2k.c b/arch/powerpc/boot/cuboot-c2k.c
deleted file mode 100644
index 9309c51f1d65..
--- a/arch/powerpc/boot/cuboot-c2k.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GEFanuc C2K platform code.
- *
- * Author: Remi Machet 
- *
- * Originated from prpmc2800.c
- *
- * 2008 (c) Stanford University
- * 2007 (c) MontaVista, Software, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-
-#include "types.h"
-#include "stdio.h"
-#include "io.h"
-#include "ops.h"
-#include "elf.h"
-#include "mv64x60.h"
-#include "cuboot.h"
-#include "ppcboot.h"
-
-static u8 *bridge_base;
-
-static void c2k_bridge_setup(u32 mem_size)
-{
-   u32 i, v[30], enables, acc_bits;
-   u32 pci_base_hi, pci_base_lo, size, buf[2];
-   unsigned long cpu_base;
-   int rc;
-   void *devp, *mv64x60_devp;
-   u8 *bridge_pbase, is_coherent;
-   struct mv64x60_cpu2pci_win *tbl;
-   int bus;
-
-   bridge_pbase = mv64x60_get_bridge_pbase();
-   is_coherent = mv64x60_is_coherent();
-
-   if (is_coherent)
-   acc_bits = MV64x60_PCI_ACC_CNTL_SNOOP_WB
-   | MV64x60_PCI_ACC_CNTL_SWAP_NONE
-   | MV64x60_PCI_ACC_CNTL_MBURST_32_BYTES
-   | MV64x60_PCI_ACC_CNTL_RDSIZE_32_BYTES;
-   else
-   acc_bits = MV64x60_PCI_ACC_CNTL_SNOOP_NONE
-   | MV64x60_PCI_ACC_CNTL_SWAP_NONE
-   | MV64x60_PCI_ACC_CNTL_MBURST_128_BYTES
-   | MV64x60_PCI_ACC_CNTL_RDSIZE_256_BYTES;
-
-   mv64x60_config_ctlr_windows(bridge_base, bridge_pbase, is_coherent);
-   mv64x60_devp = find_node_by_compatible(NULL, "marvell,mv64360");
-   if (mv64x60_devp == NULL)
-   fatal("Error: Missing marvell,mv64360 device tree node\n\r");
-
-   enables = in_le32((u32 *)(bridge_base + MV64x60_CPU_BAR_ENABLE));
-   enables |= 0x007ffe00; /* Disable all cpu->pci windows */
-   out_le32((u32 *)(bridge_base + MV64x60_CPU_BAR_ENABLE), enables);
-
-   /* Get the cpu -> pci i/o & mem mappings from the device tree */
-   devp = NULL;
-   for (bus = 0; ; bus++) {
-   char name[] = "pci ";
-
-   name[strlen(name)-1] = bus+'0';
-
-   devp = find_node_by_alias(name);
-   if (devp == NULL)
-   break;
-
-   if (bus >= 2)
-   fatal("Error: Only 2 PCI controllers are