[PATCH 0/6] MIPS: OCTEON: cleanups, part II

[PATCH 0/6] MIPS: OCTEON: cleanups, part II

[Aaro Koskinen]

Hi,

Continuing OCTEON cleanups:

- Enable all drivers in defconfig to get the full build coverage.

- Some small adjustements to platform code to allow mechanical deletion of
  a huge amount of unneeded union fields.

Boot tested on OCTEON+ (EdgeRouter Lite) and OCTEON 2 (EdgeRouter Pro).

Build tested with cavium_octeon_defconfig.

A.

Aaro Koskinen (6):
  MIPS: OCTEON: enable all OCTEON drivers in defconfig
  MIPS: OCTEON: octeon-usb: use common gpio_bit definition
  MIPS: OCTEON: cvmx_pko_mem_debug8: use oldest forward compatible
    definition
  MIPS: OCTEON: cvmx_mio_fus_dat3: use oldest forward compatible
    definition
  MIPS: OCTEON: cvmx_gmxx_inf_mode: use oldest forward compatible
    definition
  MIPS: OCTEON: delete redundant register definitions

 .../cavium-octeon/executive/cvmx-cmd-queue.c  |    2 +-
 .../cavium-octeon/executive/cvmx-helper.c     |    4 +-
 .../executive/cvmx-interrupt-rsl.c            |    2 +-
 .../cavium-octeon/executive/octeon-model.c    |   12 +-
 arch/mips/cavium-octeon/octeon-usb.c          |    6 +-
 arch/mips/configs/cavium_octeon_defconfig     |    2 +-
 arch/mips/include/asm/octeon/cvmx-agl-defs.h  |  699 ----------
 arch/mips/include/asm/octeon/cvmx-asxx-defs.h |  105 --
 arch/mips/include/asm/octeon/cvmx-dbg-defs.h  |    4 -
 arch/mips/include/asm/octeon/cvmx-dpi-defs.h  |  178 ---
 arch/mips/include/asm/octeon/cvmx-fpa-defs.h  |  247 ----
 arch/mips/include/asm/octeon/cvmx-gmxx-defs.h |  118 --
 arch/mips/include/asm/octeon/cvmx-gpio-defs.h |  116 --
 arch/mips/include/asm/octeon/cvmx-iob-defs.h  |  375 ------
 arch/mips/include/asm/octeon/cvmx-ipd-defs.h  |  538 --------
 arch/mips/include/asm/octeon/cvmx-l2t-defs.h  |    6 -
 arch/mips/include/asm/octeon/cvmx-led-defs.h  |   78 --
 arch/mips/include/asm/octeon/cvmx-lmcx-defs.h |  514 -------
 arch/mips/include/asm/octeon/cvmx-mio-defs.h  | 1197 -----------------
 arch/mips/include/asm/octeon/cvmx-mixx-defs.h |  136 --
 arch/mips/include/asm/octeon/cvmx-npei-defs.h |  295 ----
 arch/mips/include/asm/octeon/cvmx-npi-defs.h  |  235 ----
 arch/mips/include/asm/octeon/cvmx-pci-defs.h  |  392 ------
 arch/mips/include/asm/octeon/cvmx-pcsx-defs.h |  185 ---
 .../mips/include/asm/octeon/cvmx-pcsxx-defs.h |  146 --
 arch/mips/include/asm/octeon/cvmx-pemx-defs.h |  144 --
 .../mips/include/asm/octeon/cvmx-pescx-defs.h |   59 -
 arch/mips/include/asm/octeon/cvmx-pip-defs.h  |  688 ----------
 arch/mips/include/asm/octeon/cvmx-pko-defs.h  |  619 ---------
 arch/mips/include/asm/octeon/cvmx-pko.h       |    2 +-
 arch/mips/include/asm/octeon/cvmx-pow-defs.h  |  317 -----
 arch/mips/include/asm/octeon/cvmx-rnm-defs.h  |   53 -
 arch/mips/include/asm/octeon/cvmx-rst-defs.h  |   28 -
 arch/mips/include/asm/octeon/cvmx-smix-defs.h |   88 --
 arch/mips/include/asm/octeon/cvmx-spxx-defs.h |   62 -
 .../mips/include/asm/octeon/cvmx-sriox-defs.h |  123 --
 arch/mips/include/asm/octeon/cvmx-srxx-defs.h |   22 -
 arch/mips/include/asm/octeon/cvmx-stxx-defs.h |   64 -
 .../mips/include/asm/octeon/cvmx-uctlx-defs.h |   89 --
 39 files changed, 15 insertions(+), 7935 deletions(-)

-- 
2.17.0

[PATCH 1/6] MIPS: OCTEON: enable all OCTEON drivers in defconfig

[Aaro Koskinen]

Enable all OCTEON drivers in defconfig. Currently oct_ilm and octeon-rng
are still missing; enable those to get them included in kernel builds.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
 arch/mips/configs/cavium_octeon_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/configs/cavium_octeon_defconfig b/arch/mips/configs/cavium_octeon_defconfig
index c3f6c3488559..b0e8e8f6284b 100644
--- a/arch/mips/configs/cavium_octeon_defconfig
+++ b/arch/mips/configs/cavium_octeon_defconfig
@@ -13,6 +13,7 @@ CONFIG_SLAB=y
 CONFIG_CAVIUM_OCTEON_SOC=y
 CONFIG_CAVIUM_CN63XXP1=y
 CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=2
+CONFIG_OCTEON_ILM=m
 CONFIG_SMP=y
 CONFIG_NR_CPUS=32
 CONFIG_HZ_100=y
@@ -106,7 +107,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_NR_UARTS=2
 CONFIG_SERIAL_8250_RUNTIME_UARTS=2
 CONFIG_SERIAL_8250_DW=y
-# CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 CONFIG_I2C_OCTEON=y
 CONFIG_SPI=y
-- 
2.17.0

[PATCH 2/6] MIPS: OCTEON: octeon-usb: use common gpio_bit definition

[Aaro Koskinen]

cvmx_gpio_bit_cfgx bitfields are indentical on cn70xx and cn73xx,
and also match the default definition. So use that instead.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
 arch/mips/cavium-octeon/octeon-usb.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/mips/cavium-octeon/octeon-usb.c b/arch/mips/cavium-octeon/octeon-usb.c
index bfdfaf32d2c4..1f730ded5224 100644
--- a/arch/mips/cavium-octeon/octeon-usb.c
+++ b/arch/mips/cavium-octeon/octeon-usb.c
@@ -253,17 +253,17 @@ static int dwc3_octeon_config_power(struct device *dev, u64 base)
 		    && gpio <= 31) {
 			gpio_bit.u64 = cvmx_read_csr(CVMX_GPIO_BIT_CFGX(gpio));
 			gpio_bit.s.tx_oe = 1;
-			gpio_bit.cn73xx.output_sel = (index == 0 ? 0x14 : 0x15);
+			gpio_bit.s.output_sel = (index == 0 ? 0x14 : 0x15);
 			cvmx_write_csr(CVMX_GPIO_BIT_CFGX(gpio), gpio_bit.u64);
 		} else if (gpio <= 15) {
 			gpio_bit.u64 = cvmx_read_csr(CVMX_GPIO_BIT_CFGX(gpio));
 			gpio_bit.s.tx_oe = 1;
-			gpio_bit.cn70xx.output_sel = (index == 0 ? 0x14 : 0x19);
+			gpio_bit.s.output_sel = (index == 0 ? 0x14 : 0x19);
 			cvmx_write_csr(CVMX_GPIO_BIT_CFGX(gpio), gpio_bit.u64);
 		} else {
 			gpio_bit.u64 = cvmx_read_csr(CVMX_GPIO_XBIT_CFGX(gpio));
 			gpio_bit.s.tx_oe = 1;
-			gpio_bit.cn70xx.output_sel = (index == 0 ? 0x14 : 0x19);
+			gpio_bit.s.output_sel = (index == 0 ? 0x14 : 0x19);
 			cvmx_write_csr(CVMX_GPIO_XBIT_CFGX(gpio), gpio_bit.u64);
 		}
 
-- 
2.17.0

[PATCH 3/6] MIPS: OCTEON: cvmx_pko_mem_debug8: use oldest forward compatible definition

[Aaro Koskinen]

cn58xx is compatible with cn52xx, so use the latter.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
 arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c | 2 +-
 arch/mips/include/asm/octeon/cvmx-pko.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c b/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c
index 8241fc6aa17d..3839feba68f2 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c
@@ -266,7 +266,7 @@ int cvmx_cmd_queue_length(cvmx_cmd_queue_id_t queue_id)
 		} else {
 			union cvmx_pko_mem_debug8 debug8;
 			debug8.u64 = cvmx_read_csr(CVMX_PKO_MEM_DEBUG8);
-			return debug8.cn58xx.doorbell;
+			return debug8.cn50xx.doorbell;
 		}
 	case CVMX_CMD_QUEUE_ZIP:
 	case CVMX_CMD_QUEUE_DFA:
diff --git a/arch/mips/include/asm/octeon/cvmx-pko.h b/arch/mips/include/asm/octeon/cvmx-pko.h
index 5f47f76ed510..20eb9c46a75a 100644
--- a/arch/mips/include/asm/octeon/cvmx-pko.h
+++ b/arch/mips/include/asm/octeon/cvmx-pko.h
@@ -611,7 +611,7 @@ static inline void cvmx_pko_get_port_status(uint64_t port_num, uint64_t clear,
 		pko_reg_read_idx.s.index = cvmx_pko_get_base_queue(port_num);
 		cvmx_write_csr(CVMX_PKO_REG_READ_IDX, pko_reg_read_idx.u64);
 		debug8.u64 = cvmx_read_csr(CVMX_PKO_MEM_DEBUG8);
-		status->doorbell = debug8.cn58xx.doorbell;
+		status->doorbell = debug8.cn50xx.doorbell;
 	}
 }
 
-- 
2.17.0

[PATCH 4/6] MIPS: OCTEON: cvmx_mio_fus_dat3: use oldest forward compatible definition

[Aaro Koskinen]

Chips up to cn5xxx are compatible with cn38xx. All cn6xxx chips, and also
cnf71xx, are compatible with cn61xx.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
 arch/mips/cavium-octeon/executive/octeon-model.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/mips/cavium-octeon/executive/octeon-model.c b/arch/mips/cavium-octeon/executive/octeon-model.c
index 341052387b49..657dbad9644e 100644
--- a/arch/mips/cavium-octeon/executive/octeon-model.c
+++ b/arch/mips/cavium-octeon/executive/octeon-model.c
@@ -305,7 +305,7 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id,
 				if (fus_dat3.s.nozip)
 					suffix = "SCP";
 
-				if (fus_dat3.cn56xx.bar2_en)
+				if (fus_dat3.cn38xx.bar2_en)
 					suffix = "NSPB2";
 			}
 			if (l2d_fus3)
@@ -344,7 +344,7 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id,
 			suffix = "CP";
 		else if (fus_dat2.cn63xx.dorm_crypto)
 			suffix = "DAP";
-		else if (fus_dat3.cn63xx.nozip)
+		else if (fus_dat3.cn61xx.nozip)
 			suffix = "SCP";
 		else
 			suffix = "AAP";
@@ -359,18 +359,18 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id,
 			suffix = "CP";
 		else if (fus_dat2.cn66xx.dorm_crypto)
 			suffix = "DAP";
-		else if (fus_dat3.cn66xx.nozip)
+		else if (fus_dat3.cn61xx.nozip)
 			suffix = "SCP";
 		else
 			suffix = "AAP";
 		break;
 	case 0x91:		/* CN68XX */
 		family = "68";
-		if (fus_dat2.cn68xx.nocrypto && fus_dat3.cn68xx.nozip)
+		if (fus_dat2.cn68xx.nocrypto && fus_dat3.cn61xx.nozip)
 			suffix = "CP";
 		else if (fus_dat2.cn68xx.dorm_crypto)
 			suffix = "DAP";
-		else if (fus_dat3.cn68xx.nozip)
+		else if (fus_dat3.cn61xx.nozip)
 			suffix = "SCP";
 		else if (fus_dat2.cn68xx.nocrypto)
 			suffix = "SP";
@@ -379,7 +379,7 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id,
 		break;
 	case 0x94:		/* CNF71XX */
 		family = "F71";
-		if (fus_dat3.cnf71xx.nozip)
+		if (fus_dat3.cn61xx.nozip)
 			suffix = "SCP";
 		else
 			suffix = "AAP";
-- 
2.17.0

[PATCH 5/6] MIPS: OCTEON: cvmx_gmxx_inf_mode: use oldest forward compatible definition

[Aaro Koskinen]

Use oldest forward compatible definition.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
 arch/mips/cavium-octeon/executive/cvmx-helper.c        | 4 ++--
 arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c
index c635a5ace83b..d2251bb1f369 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c
@@ -218,7 +218,7 @@ static cvmx_helper_interface_mode_t __cvmx_get_mode_octeon2(int interface)
 	mode.u64 = cvmx_read_csr(CVMX_GMXX_INF_MODE(interface));
 
 	if (OCTEON_IS_MODEL(OCTEON_CN63XX)) {
-		switch (mode.cn63xx.mode) {
+		switch (mode.cn61xx.mode) {
 		case 0:
 			return CVMX_HELPER_INTERFACE_MODE_SGMII;
 		case 1:
@@ -342,7 +342,7 @@ cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(int interface)
 	mode.u64 = cvmx_read_csr(CVMX_GMXX_INF_MODE(interface));
 
 	if (OCTEON_IS_MODEL(OCTEON_CN56XX) || OCTEON_IS_MODEL(OCTEON_CN52XX)) {
-		switch (mode.cn56xx.mode) {
+		switch (mode.cn52xx.mode) {
 		case 0:
 			return CVMX_HELPER_INTERFACE_MODE_DISABLED;
 		case 1:
diff --git a/arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c b/arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c
index fa327ec891cd..d23f46736dd6 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c
@@ -84,7 +84,7 @@ void __cvmx_interrupt_gmxx_enable(int interface)
 
 	if (OCTEON_IS_MODEL(OCTEON_CN56XX) || OCTEON_IS_MODEL(OCTEON_CN52XX)) {
 		if (mode.s.en) {
-			switch (mode.cn56xx.mode) {
+			switch (mode.cn52xx.mode) {
 			case 1: /* XAUI */
 				num_ports = 1;
 				break;
-- 
2.17.0

Re: [PATCH 0/6] MIPS: OCTEON: cleanups, part II

[Aaro Koskinen]

Hi,

On Tue, Dec 04, 2018 at 10:12:14PM +0200, Aaro Koskinen wrote:
>   MIPS: OCTEON: delete redundant register definitions
[...]
>  39 files changed, 15 insertions(+), 7935 deletions(-)

Looks like the last patch didn't get through (around 500 KB, maybe hit
some limit). Please disregard this series for now, I'll rework the series
to do changes with smaller patches.

A.

Re: [PATCH 0/6] MIPS: OCTEON: cleanups, part II

[Paul Burton]

Hi Aaro,

On Thu, Dec 06, 2018 at 12:09:18AM +0200, Aaro Koskinen wrote:
> Hi,
> 
> On Tue, Dec 04, 2018 at 10:12:14PM +0200, Aaro Koskinen wrote:
> >   MIPS: OCTEON: delete redundant register definitions
> [...]
> >  39 files changed, 15 insertions(+), 7935 deletions(-)
> 
> Looks like the last patch didn't get through (around 500 KB, maybe hit
> some limit). Please disregard this series for now, I'll rework the series
> to do changes with smaller patches.

I actually applied this already - patch 6 didn't make it through the
mailing list but I did receive it personally.

Let me know ASAP if you'd prefer that I drop it.

Thanks,
    Paul

Re: [PATCH 0/6] MIPS: OCTEON: cleanups, part II

[Aaro Koskinen]

Hi,

On Wed, Dec 05, 2018 at 10:20:12PM +0000, Paul Burton wrote:
> On Thu, Dec 06, 2018 at 12:09:18AM +0200, Aaro Koskinen wrote:
> > Hi,
> > 
> > On Tue, Dec 04, 2018 at 10:12:14PM +0200, Aaro Koskinen wrote:
> > >   MIPS: OCTEON: delete redundant register definitions
> > [...]
> > >  39 files changed, 15 insertions(+), 7935 deletions(-)
> > 
> > Looks like the last patch didn't get through (around 500 KB, maybe hit
> > some limit). Please disregard this series for now, I'll rework the series
> > to do changes with smaller patches.
> 
> I actually applied this already - patch 6 didn't make it through the
> mailing list but I did receive it personally.

OK, that's fine then, thanks!

> Let me know ASAP if you'd prefer that I drop it.

No need to drop.

A.

Re: [PATCH 0/6] MIPS: OCTEON: cleanups, part II

[Paul Burton]

Hello,

Aaro Koskinen wrote:
> Hi,
> 
> Continuing OCTEON cleanups:
> 
> - Enable all drivers in defconfig to get the full build coverage.
> 
> - Some small adjustements to platform code to allow mechanical deletion of
> a huge amount of unneeded union fields.
> 
> Boot tested on OCTEON+ (EdgeRouter Lite) and OCTEON 2 (EdgeRouter Pro).
> 
> Build tested with cavium_octeon_defconfig.
> 
> A.
> 
> Aaro Koskinen (6):
> MIPS: OCTEON: enable all OCTEON drivers in defconfig
> MIPS: OCTEON: octeon-usb: use common gpio_bit definition
> MIPS: OCTEON: cvmx_pko_mem_debug8: use oldest forward compatible
> definition
> MIPS: OCTEON: cvmx_mio_fus_dat3: use oldest forward compatible
> definition
> MIPS: OCTEON: cvmx_gmxx_inf_mode: use oldest forward compatible
> definition
> MIPS: OCTEON: delete redundant register definitions
> 
> .../cavium-octeon/executive/cvmx-cmd-queue.c  |    2 +-
> .../cavium-octeon/executive/cvmx-helper.c     |    4 +-
> .../executive/cvmx-interrupt-rsl.c            |    2 +-
> .../cavium-octeon/executive/octeon-model.c    |   12 +-
> arch/mips/cavium-octeon/octeon-usb.c          |    6 +-
> arch/mips/configs/cavium_octeon_defconfig     |    2 +-
> arch/mips/include/asm/octeon/cvmx-agl-defs.h  |  699 ----------
> arch/mips/include/asm/octeon/cvmx-asxx-defs.h |  105 --
> arch/mips/include/asm/octeon/cvmx-dbg-defs.h  |    4 -
> arch/mips/include/asm/octeon/cvmx-dpi-defs.h  |  178 ---
> arch/mips/include/asm/octeon/cvmx-fpa-defs.h  |  247 ----
> arch/mips/include/asm/octeon/cvmx-gmxx-defs.h |  118 --
> arch/mips/include/asm/octeon/cvmx-gpio-defs.h |  116 --
> arch/mips/include/asm/octeon/cvmx-iob-defs.h  |  375 ------
> arch/mips/include/asm/octeon/cvmx-ipd-defs.h  |  538 --------
> arch/mips/include/asm/octeon/cvmx-l2t-defs.h  |    6 -
> arch/mips/include/asm/octeon/cvmx-led-defs.h  |   78 --
> arch/mips/include/asm/octeon/cvmx-lmcx-defs.h |  514 -------
> arch/mips/include/asm/octeon/cvmx-mio-defs.h  | 1197 -----------------
> arch/mips/include/asm/octeon/cvmx-mixx-defs.h |  136 --
> arch/mips/include/asm/octeon/cvmx-npei-defs.h |  295 ----
> arch/mips/include/asm/octeon/cvmx-npi-defs.h  |  235 ----
> arch/mips/include/asm/octeon/cvmx-pci-defs.h  |  392 ------
> arch/mips/include/asm/octeon/cvmx-pcsx-defs.h |  185 ---
> .../mips/include/asm/octeon/cvmx-pcsxx-defs.h |  146 --
> arch/mips/include/asm/octeon/cvmx-pemx-defs.h |  144 --
> .../mips/include/asm/octeon/cvmx-pescx-defs.h |   59 -
> arch/mips/include/asm/octeon/cvmx-pip-defs.h  |  688 ----------
> arch/mips/include/asm/octeon/cvmx-pko-defs.h  |  619 ---------
> arch/mips/include/asm/octeon/cvmx-pko.h       |    2 +-
> arch/mips/include/asm/octeon/cvmx-pow-defs.h  |  317 -----
> arch/mips/include/asm/octeon/cvmx-rnm-defs.h  |   53 -
> arch/mips/include/asm/octeon/cvmx-rst-defs.h  |   28 -
> arch/mips/include/asm/octeon/cvmx-smix-defs.h |   88 --
> arch/mips/include/asm/octeon/cvmx-spxx-defs.h |   62 -
> .../mips/include/asm/octeon/cvmx-sriox-defs.h |  123 --
> arch/mips/include/asm/octeon/cvmx-srxx-defs.h |   22 -
> arch/mips/include/asm/octeon/cvmx-stxx-defs.h |   64 -
> .../mips/include/asm/octeon/cvmx-uctlx-defs.h |   89 --
> 39 files changed, 15 insertions(+), 7935 deletions(-)

Series applied to mips-next.

Thanks,
    Paul

[ This message was auto-generated; if you believe anything is incorrect
  then please email paul.burton@mips.com to report it. ]