From owner-dev-commits-src-all@freebsd.org Fri May 28 20:36:09 2021 Return-Path: Delivered-To: dev-commits-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 030E96314D0; Fri, 28 May 2021 20:36:09 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FsGfw628Tz4jpD; Fri, 28 May 2021 20:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B71261DAAC; Fri, 28 May 2021 20:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14SKa8GE092733; Fri, 28 May 2021 20:36:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14SKa8fi092732; Fri, 28 May 2021 20:36:08 GMT (envelope-from git) Date: Fri, 28 May 2021 20:36:08 GMT Message-Id: <202105282036.14SKa8fi092732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Zhilin Subject: git: 91abbc4993a5 - main - [mips/broadcom] set sysctl "hw.model" by SoC ChipCommon ID MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mizhka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91abbc4993a5964badd21bc691ae273a1a2d9c20 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 May 2021 20:36:09 -0000 The branch main has been updated by mizhka: URL: https://cgit.FreeBSD.org/src/commit/?id=91abbc4993a5964badd21bc691ae273a1a2d9c20 commit 91abbc4993a5964badd21bc691ae273a1a2d9c20 Author: Michael Zhilin AuthorDate: 2021-05-28 20:32:30 +0000 Commit: Michael Zhilin CommitDate: 2021-05-28 20:35:37 +0000 [mips/broadcom] set sysctl "hw.model" by SoC ChipCommon ID Small patch to set "hw.model" by SoC ChipCommon ID. On BCM4718 it will be BCM4716, because 4716 is core for 4716,4717 & 4718. Tested on Netgear WNR3500L (BCM4718) and Asus RT-N53 (BCM5357). Reviewed by: landonf, yamori813@yahoo.co.jp Sponsored by: Postgres Professional Differential revision: https://reviews.freebsd.org/D12737 --- sys/mips/broadcom/bcm_machdep.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/mips/broadcom/bcm_machdep.c b/sys/mips/broadcom/bcm_machdep.c index 20ae22f2e9b0..581fffdd899d 100644 --- a/sys/mips/broadcom/bcm_machdep.c +++ b/sys/mips/broadcom/bcm_machdep.c @@ -116,6 +116,9 @@ static int bcm_erom_probe_and_attach(bhnd_erom_class_t **erom_cls, extern int *edata; extern int *end; +/* from sys/mips/mips/machdep.c */ +extern char cpu_model[]; + static struct bcm_platform bcm_platform_data; static bool bcm_platform_data_avail = false; @@ -399,6 +402,12 @@ bcm_init_platform_data(struct bcm_platform *bp) return (error); } + /* All hex formatted IDs are within the range of 0x4000-0x9C3F (40000-1) */ + if (bp->cid.chip_id >= 0x4000 && bp->cid.chip_id <= 0x9C3F) + snprintf(cpu_model, 10, "BCM%hX", bp->cid.chip_id); + else + snprintf(cpu_model, 10, "BCM%hu", bp->cid.chip_id); + /* Fetch chipc capability flags */ bp->cc_caps = BCM_SOC_READ_4(bp->cc_addr, CHIPC_CAPABILITIES); bp->cc_caps_ext = 0x0;