From owner-svn-src-head@freebsd.org Sat Jul 28 12:53:11 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EEA251050A96; Sat, 28 Jul 2018 12:53:10 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A2EF48D41B; Sat, 28 Jul 2018 12:53:10 +0000 (UTC) (envelope-from andrew@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 83BAF26EF8; Sat, 28 Jul 2018 12:53:10 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6SCrAUd095439; Sat, 28 Jul 2018 12:53:10 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6SCrA9C095438; Sat, 28 Jul 2018 12:53:10 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201807281253.w6SCrA9C095438@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Sat, 28 Jul 2018 12:53:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336831 - head/sys/arm/arm X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: head/sys/arm/arm X-SVN-Commit-Revision: 336831 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2018 12:53:11 -0000 Author: andrew Date: Sat Jul 28 12:53:10 2018 New Revision: 336831 URL: https://svnweb.freebsd.org/changeset/base/336831 Log: Remove some write only global values from the arm cpufunc code. Modified: head/sys/arm/arm/cpufunc.c Modified: head/sys/arm/arm/cpufunc.c ============================================================================== --- head/sys/arm/arm/cpufunc.c Sat Jul 28 12:52:03 2018 (r336830) +++ head/sys/arm/arm/cpufunc.c Sat Jul 28 12:53:10 2018 (r336831) @@ -268,11 +268,6 @@ u_int cpu_reset_needs_v4_MMU_disable; /* flag used in defined(CPU_MV_PJ4B) || \ defined(CPU_CORTEXA) || defined(CPU_KRAIT) -/* Global cache line sizes, use 32 as default */ -int arm_dcache_min_line_size = 32; -int arm_icache_min_line_size = 32; -int arm_idcache_min_line_size = 32; - static void get_cachetype_cp15(void); /* Additional cache information local to this file. Log2 of some of the @@ -304,12 +299,6 @@ get_cachetype_cp15(void) goto out; if (CPU_CT_FORMAT(ctype) == CPU_CT_ARMV7) { - /* Resolve minimal cache line sizes */ - arm_dcache_min_line_size = 1 << (CPU_CT_DMINLINE(ctype) + 2); - arm_icache_min_line_size = 1 << (CPU_CT_IMINLINE(ctype) + 2); - arm_idcache_min_line_size = - min(arm_icache_min_line_size, arm_dcache_min_line_size); - __asm __volatile("mrc p15, 1, %0, c0, c0, 1" : "=r" (clevel)); arm_cache_level = clevel;