From owner-svn-src-all@freebsd.org Thu Nov 26 17:19:14 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0BA104697E5; Thu, 26 Nov 2020 17:19:14 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Chky96tWnz4lj4; Thu, 26 Nov 2020 17:19:13 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DCDF726E41; Thu, 26 Nov 2020 17:19:13 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AQHJDaj000252; Thu, 26 Nov 2020 17:19:13 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AQHJDCv000251; Thu, 26 Nov 2020 17:19:13 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202011261719.0AQHJDCv000251@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Thu, 26 Nov 2020 17:19:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368065 - head/sys/arm/mv X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/sys/arm/mv X-SVN-Commit-Revision: 368065 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Nov 2020 17:19:14 -0000 Author: manu Date: Thu Nov 26 17:19:13 2020 New Revision: 368065 URL: https://svnweb.freebsd.org/changeset/base/368065 Log: arm: mv: Remove unused code Modified: head/sys/arm/mv/mv_common.c Modified: head/sys/arm/mv/mv_common.c ============================================================================== --- head/sys/arm/mv/mv_common.c Thu Nov 26 17:18:54 2020 (r368064) +++ head/sys/arm/mv/mv_common.c Thu Nov 26 17:19:13 2020 (r368065) @@ -79,7 +79,6 @@ struct soc_node_spec; static enum soc_family soc_family; -static int mv_win_cesa_attr(int wng_sel); static int mv_win_cesa_attr_armv5(int eng_sel); static int mv_win_cesa_attr_armada38x(int eng_sel); static int mv_win_cesa_attr_armadaxp(int eng_sel); @@ -93,7 +92,6 @@ void write_cpu_ctrl_armv7(uint32_t reg, uint32_t val); static int win_eth_can_remap(int i); static int decode_win_cesa_valid(void); -static int decode_win_cpu_valid(void); static int decode_win_usb_valid(void); static int decode_win_usb3_valid(void); static int decode_win_eth_valid(void); @@ -402,15 +400,6 @@ pm_is_disabled(uint32_t mask) * machines. */ -static int mv_win_cesa_attr(int eng_sel) -{ - - if (soc_decode_win_spec->win_cesa_attr != NULL) - return (soc_decode_win_spec->win_cesa_attr(eng_sel)); - - return (-1); -} - static int mv_win_cesa_attr_armv5(int eng_sel) { @@ -987,15 +976,6 @@ WIN_REG_BASE_IDX_WR(win_eth, br, MV_WIN_ETH_BASE) WIN_REG_BASE_IDX_WR(win_eth, sz, MV_WIN_ETH_SIZE) WIN_REG_BASE_IDX_WR(win_eth, har, MV_WIN_ETH_REMAP) -WIN_REG_BASE_IDX_RD2(win_xor, br, MV_WIN_XOR_BASE) -WIN_REG_BASE_IDX_RD2(win_xor, sz, MV_WIN_XOR_SIZE) -WIN_REG_BASE_IDX_RD2(win_xor, har, MV_WIN_XOR_REMAP) -WIN_REG_BASE_IDX_RD2(win_xor, ctrl, MV_WIN_XOR_CTRL) -WIN_REG_BASE_IDX_WR2(win_xor, br, MV_WIN_XOR_BASE) -WIN_REG_BASE_IDX_WR2(win_xor, sz, MV_WIN_XOR_SIZE) -WIN_REG_BASE_IDX_WR2(win_xor, har, MV_WIN_XOR_REMAP) -WIN_REG_BASE_IDX_WR2(win_xor, ctrl, MV_WIN_XOR_CTRL) - WIN_REG_BASE_RD(win_eth, bare, 0x290) WIN_REG_BASE_RD(win_eth, epap, 0x294) WIN_REG_BASE_WR(win_eth, bare, 0x290) @@ -1014,17 +994,6 @@ WIN_REG_BASE_IDX_WR(pcie_bar, br, MV_PCIE_BAR_BASE); WIN_REG_BASE_IDX_WR(pcie_bar, brh, MV_PCIE_BAR_BASE_H); WIN_REG_BASE_IDX_WR(pcie_bar, cr, MV_PCIE_BAR_CTRL); -WIN_REG_BASE_IDX_RD(win_idma, br, MV_WIN_IDMA_BASE) -WIN_REG_BASE_IDX_RD(win_idma, sz, MV_WIN_IDMA_SIZE) -WIN_REG_BASE_IDX_RD(win_idma, har, MV_WIN_IDMA_REMAP) -WIN_REG_BASE_IDX_RD(win_idma, cap, MV_WIN_IDMA_CAP) -WIN_REG_BASE_IDX_WR(win_idma, br, MV_WIN_IDMA_BASE) -WIN_REG_BASE_IDX_WR(win_idma, sz, MV_WIN_IDMA_SIZE) -WIN_REG_BASE_IDX_WR(win_idma, har, MV_WIN_IDMA_REMAP) -WIN_REG_BASE_IDX_WR(win_idma, cap, MV_WIN_IDMA_CAP) -WIN_REG_BASE_RD(win_idma, bare, 0xa80) -WIN_REG_BASE_WR(win_idma, bare, 0xa80) - WIN_REG_BASE_IDX_RD(win_sata, cr, MV_WIN_SATA_CTRL); WIN_REG_BASE_IDX_RD(win_sata, br, MV_WIN_SATA_BASE); WIN_REG_BASE_IDX_WR(win_sata, cr, MV_WIN_SATA_CTRL); @@ -1033,7 +1002,6 @@ WIN_REG_BASE_IDX_WR(win_sata, br, MV_WIN_SATA_BASE); WIN_REG_BASE_IDX_RD(win_sata_armada38x, sz, MV_WIN_SATA_SIZE_ARMADA38X); WIN_REG_BASE_IDX_WR(win_sata_armada38x, sz, MV_WIN_SATA_SIZE_ARMADA38X); WIN_REG_BASE_IDX_RD(win_sata_armada38x, cr, MV_WIN_SATA_CTRL_ARMADA38X); -WIN_REG_BASE_IDX_RD(win_sata_armada38x, br, MV_WIN_SATA_BASE_ARMADA38X); WIN_REG_BASE_IDX_WR(win_sata_armada38x, cr, MV_WIN_SATA_CTRL_ARMADA38X); WIN_REG_BASE_IDX_WR(win_sata_armada38x, br, MV_WIN_SATA_BASE_ARMADA38X); @@ -1200,65 +1168,6 @@ decode_win_overlap(int win, int win_no, const struct d } return (-1); -} - -static int -decode_win_cpu_valid(void) -{ - int i, j, rv; - uint32_t b, e, s; - - if (cpu_wins_no > soc_decode_win_spec->mv_win_cpu_max) { - printf("CPU windows: too many entries: %d\n", cpu_wins_no); - return (0); - } - - rv = 1; - for (i = 0; i < cpu_wins_no; i++) { - if (cpu_wins[i].target == 0) { - printf("CPU window#%d: DDR target window is not " - "supposed to be reprogrammed!\n", i); - rv = 0; - } - - if (cpu_wins[i].remap != ~0 && win_cpu_can_remap(i) != 1) { - printf("CPU window#%d: not capable of remapping, but " - "val 0x%08x defined\n", i, cpu_wins[i].remap); - rv = 0; - } - - s = cpu_wins[i].size; - b = cpu_wins[i].base; - e = b + s - 1; - if (s > (0xFFFFFFFF - b + 1)) { - /* - * XXX this boundary check should account for 64bit - * and remapping.. - */ - printf("CPU window#%d: no space for size 0x%08x at " - "0x%08x\n", i, s, b); - rv = 0; - continue; - } - - if (b != rounddown2(b, s)) { - printf("CPU window#%d: address 0x%08x is not aligned " - "to 0x%08x\n", i, b, s); - rv = 0; - continue; - } - - j = decode_win_overlap(i, cpu_wins_no, &cpu_wins[0]); - if (j >= 0) { - printf("CPU window#%d: (0x%08x - 0x%08x) overlaps " - "with #%d (0x%08x - 0x%08x)\n", i, b, e, j, - cpu_wins[j].base, - cpu_wins[j].base + cpu_wins[j].size - 1); - rv = 0; - } - } - - return (rv); } int