Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 1c6121c3 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Paul Burton
Browse files

MIPS: OCTEON: cvmx_pko_mem_debug8: use oldest forward compatible definition 



cn58xx is compatible with cn50xx, so use the latter.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
[paul.burton@mips.com: s/cn52xx/cn50xx/ in commit message.]
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
parent 8b5c4eb1

arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c

+1 −1
Original line number Diff line number Diff line
@@ -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:

arch/mips/include/asm/octeon/cvmx-pko.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

}