From nobody Tue Apr 08 10:49:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZX2rZ6hwcz5sCK0; Tue, 08 Apr 2025 10:49:18 +0000 (UTC) (envelope-from git@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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZX2rZ2HKJz3kPY; Tue, 08 Apr 2025 10:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744109358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DDhJN3gCwDbPUaiqYb2riiNeL68vqFH3yfNYccDfJZ0=; b=jAmQnEOaLSd/kulfQIC7+d6dplqDoj/aJJ35i2bgwi70LKi4CC16FqBGxhpVitXZR8pomA qctMIZB82Ea52iUVVBRktk5vEDHeKllEOERm5dIGr835UWXYypsfSj3DpFtng9IdldEBy/ tqB5zjhenqvbC7ZSnpOx/59u7g0h+s7j91UrVmfj1sUlBsPso3brw1HqmZt7YtJcQi9PRh GKkzZFKRCb3rLt4tJWI3QOxH+8jygTmf5s+PMyOVBZMxpKJsiuT/RpiOKkg+y7zFm5V5uo MXr4kB1YBQmaJaEV4hdQGr/ZzwN3IpfaFShhrxIX94JD74KqH1i73U6cQ5Oo+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744109358; a=rsa-sha256; cv=none; b=sVFSw8m/FSt8CzZfwKB+wnXj5F/WCj2EFOIk+13BBPXAwJFJ18gMjze7drW7lDTMCHyF3z 6r7xTBhDp7sBeDAzBCpePDntkD/RFBxpRdacrh4X65uZ0cfXS9T/G/moxy34sTV2fp8iQz TtrYAEnF1qVhWwnnryh/1sf6Lnjx8kp+81iwdkA38I88BOtrKUPMcAT3hboEoQVBcmJC7a kjnfAZ7NDPbiFErJ9tubhcCbrh6DHU+Ff2URm4oX3ciN+GMUPTmQR2nnwT44++ly0clMcN EhvhBv/e9nJ3TcDgb+Kbnbe6FVmCQcq8jPEFwYME/vFxkcBCifFhTlSfH2WTGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744109358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DDhJN3gCwDbPUaiqYb2riiNeL68vqFH3yfNYccDfJZ0=; b=jt0dz9aGm/DSbsFlclf3WgcrDPjEsiKd8OeKi7zYcp0X4ZcmxCyctgfrad7TPUDslcfE15 AN1V4stBX8/WFP6xlY7R5em2DIT51A6iOb+BVCQhIGcP0vigM7ngSyZ7qmdJOe6P7hJkTm ej1YDqx8KOOKvWV61EAqTn/AoUmgnHCZB3dbt0OpsV7vHVxEYl6ZN8wDi/lPZXyZImILzy 0N8Gi/LX/BAV6tG6a6YybGjvSqsj2PzjqlAoY9NnkyfVPGcN1bf7TesQnS4kQmCHtXr+d9 VPnFF9zr3RgHtuR6uOQCXa8e5w8yiNUbDL8E2OXeRU1GEECmyzp2qsptn0u4eQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZX2rZ1p1dzD1v; Tue, 08 Apr 2025 10:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 538AnIO6002258; Tue, 8 Apr 2025 10:49:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538AnITe002255; Tue, 8 Apr 2025 10:49:18 GMT (envelope-from git) Date: Tue, 8 Apr 2025 10:49:18 GMT Message-Id: <202504081049.538AnITe002255@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: bb6a069c595a - main - arm/mv: Remove the unused get_l2clk List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb6a069c595ad49ad59b3eb2d98d074b4cc006f9 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=bb6a069c595ad49ad59b3eb2d98d074b4cc006f9 commit bb6a069c595ad49ad59b3eb2d98d074b4cc006f9 Author: Andrew Turner AuthorDate: 2025-04-08 10:46:38 +0000 Commit: Andrew Turner CommitDate: 2025-04-08 10:48:28 +0000 arm/mv: Remove the unused get_l2clk Reviewed by: cognet Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D49534 --- sys/arm/mv/armadaxp/armadaxp.c | 95 ------------------------------------------ sys/arm/mv/mvvar.h | 1 - 2 files changed, 96 deletions(-) diff --git a/sys/arm/mv/armadaxp/armadaxp.c b/sys/arm/mv/armadaxp/armadaxp.c index 2835a0d6b637..17a4b082d686 100644 --- a/sys/arm/mv/armadaxp/armadaxp.c +++ b/sys/arm/mv/armadaxp/armadaxp.c @@ -49,11 +49,9 @@ #define FAB_FREQ_FIELD(sar) (((0x01 & (sar >> 51)) << 4) | \ (0x0F & (sar >> 24))) -static uint32_t count_l2clk(void); void armadaxp_l2_init(void); void armadaxp_init_coher_fabric(void); int platform_get_ncpus(void); -static uint64_t get_sar_value_armadaxp(void); #define ARMADAXP_L2_BASE (MV_BASE + 0x8000) #define ARMADAXP_L2_CTRL 0x100 @@ -93,48 +91,6 @@ struct vco_freq_ratio { uint8_t vco_ddr; /* VCO to DR(DDR memory) clock ratio */ }; -static struct vco_freq_ratio freq_conf_table[] = { -/*00*/ { 1, 1, 4, 2 }, -/*01*/ { 1, 2, 2, 2 }, -/*02*/ { 2, 2, 6, 3 }, -/*03*/ { 2, 2, 3, 3 }, -/*04*/ { 1, 2, 3, 3 }, -/*05*/ { 1, 2, 4, 2 }, -/*06*/ { 1, 1, 2, 2 }, -/*07*/ { 2, 3, 6, 6 }, -/*08*/ { 2, 3, 5, 5 }, -/*09*/ { 1, 2, 6, 3 }, -/*10*/ { 2, 4, 10, 5 }, -/*11*/ { 1, 3, 6, 6 }, -/*12*/ { 1, 2, 5, 5 }, -/*13*/ { 1, 3, 6, 3 }, -/*14*/ { 1, 2, 5, 5 }, -/*15*/ { 2, 2, 5, 5 }, -/*16*/ { 1, 1, 3, 3 }, -/*17*/ { 2, 5, 10, 10 }, -/*18*/ { 1, 3, 8, 4 }, -/*19*/ { 1, 1, 2, 1 }, -/*20*/ { 2, 3, 6, 3 }, -/*21*/ { 1, 2, 8, 4 }, -/*22*/ { 2, 5, 10, 5 } -}; - -static uint16_t cpu_clock_table[] = { - 1000, 1066, 1200, 1333, 1500, 1666, 1800, 2000, 600, 667, 800, 1600, - 2133, 2200, 2400 }; - -static uint64_t -get_sar_value_armadaxp(void) -{ - uint32_t sar_low, sar_high; - - sar_high = bus_space_read_4(fdtbus_bs_tag, MV_MISC_BASE, - SAMPLE_AT_RESET_HI); - sar_low = bus_space_read_4(fdtbus_bs_tag, MV_MISC_BASE, - SAMPLE_AT_RESET_LO); - return (((uint64_t)sar_high << 32) | sar_low); -} - uint32_t get_tclk_armadaxp(void) { @@ -156,57 +112,6 @@ get_cpu_freq_armadaxp(void) return (0); } -static uint32_t -count_l2clk(void) -{ - uint64_t sar_reg; - uint32_t freq_vco, freq_l2clk; - uint8_t sar_cpu_freq, sar_fab_freq, array_size; - - /* Get value of the SAR register and process it */ - sar_reg = get_sar_value_armadaxp(); - sar_cpu_freq = CPU_FREQ_FIELD(sar_reg); - sar_fab_freq = FAB_FREQ_FIELD(sar_reg); - - /* Check if CPU frequency field has correct value */ - array_size = nitems(cpu_clock_table); - if (sar_cpu_freq >= array_size) - panic("Reserved value in cpu frequency configuration field: " - "%d", sar_cpu_freq); - - /* Check if fabric frequency field has correct value */ - array_size = nitems(freq_conf_table); - if (sar_fab_freq >= array_size) - panic("Reserved value in fabric frequency configuration field: " - "%d", sar_fab_freq); - - /* Get CPU clock frequency */ - freq_vco = cpu_clock_table[sar_cpu_freq] * - freq_conf_table[sar_fab_freq].vco_cpu; - - /* Get L2CLK clock frequency */ - freq_l2clk = freq_vco / freq_conf_table[sar_fab_freq].vco_l2c; - - /* Round L2CLK value to integer MHz */ - if (((freq_vco % freq_conf_table[sar_fab_freq].vco_l2c) * 10 / - freq_conf_table[sar_fab_freq].vco_l2c) >= 5) - freq_l2clk++; - - return (freq_l2clk * 1000000); -} - -uint32_t -get_l2clk(void) -{ - static uint32_t l2clk_freq = 0; - - /* If get_l2clk is called first time get L2CLK value from register */ - if (l2clk_freq == 0) - l2clk_freq = count_l2clk(); - - return (l2clk_freq); -} - static uint32_t read_coher_fabric(uint32_t reg) { diff --git a/sys/arm/mv/mvvar.h b/sys/arm/mv/mvvar.h index fe0867860e6a..733cde06667e 100644 --- a/sys/arm/mv/mvvar.h +++ b/sys/arm/mv/mvvar.h @@ -99,7 +99,6 @@ uint32_t ddr_attr(int i); uint32_t get_tclk(void); uint32_t get_cpu_freq(void); -uint32_t get_l2clk(void); uint32_t read_cpu_ctrl(uint32_t); void write_cpu_ctrl(uint32_t, uint32_t);