From nobody Mon Jun 27 01:37:22 2022 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 51A4C87F485; Mon, 27 Jun 2022 01:37:23 +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 4LWVhg1kdgz4nqW; Mon, 27 Jun 2022 01:37:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656293843; 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=NoJqaKO0k+6NrYmpMiFkAWIwgL6XTaT35vM2GYTiOC8=; b=rAj2XHcck3kmO+yQe7oIUaH2vrBPli9ReY+TSFkhYCVrxgL3aj6CYmPLlbJXz40Z7GFyT5 sjMeDZtqGB7754f6uwQiKL+TOjJEhpkNfX9Brpg3Lf5x7nSdnjOQxL1wt9RINTl7WzbhkY eKrGW2/ist4UkncOQDXB0AhV2BTaFEN4yBm65sYA7zJSmyQ9Q+dJijWkFwUY2l0LiN1RlK 2VpAQ5Zselmpo6DYBdiajJQXSLkZqtPa/DI3tSud4TGh8id++vON0CJeGBZBrtcKIuYA05 LZMjcXDZBDLzewvWqcPADz2ofDYwhi8OgB7AqtN1e8yubkuAwMlJlbsZXD0Nkg== 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 0D0071F02C; Mon, 27 Jun 2022 01:37:23 +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 25R1bMsp047424; Mon, 27 Jun 2022 01:37:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25R1bMRf047423; Mon, 27 Jun 2022 01:37:22 GMT (envelope-from git) Date: Mon, 27 Jun 2022 01:37:22 GMT Message-Id: <202206270137.25R1bMRf047423@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: d78bef0ebefd - main - hwpmc: further fix build (__diagused/debug/missing files entries) 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d78bef0ebefdcd231f6583b6fafc03d4dda39525 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656293843; 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=NoJqaKO0k+6NrYmpMiFkAWIwgL6XTaT35vM2GYTiOC8=; b=fTVgJymhmVUgkLWzjedaUGgrqshYzkWrNRAXLfo48fNG4VD0bQQzXkxCP8Sa6VnT7JFVRh Hdx2syl3ShErr/GgrBJN8/cFQ+u+wW2TeVqdpgNAx25BRNoNNkEFUWayOS82qOf6TJ6bX9 f8jmMGeapHaKj8JANbibaJm3Nf7kvH5Cq1JyAUSqjq3IQfq8E1+miCBd+ijG22bsLa578Z v4fVAL2fctycSN+OtS0WZqbRzG9xf5Gg8C4EqTVXYWjDlk2YcK7y1LemL2+rVNvDBjZz5A Sxw4qFctLDdzKb9ngy456a/UzmWJXwtlO3WMmc+wzQvTd5INz8Ke4hDosyzQWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656293843; a=rsa-sha256; cv=none; b=fx65e47VR657X16pgxKjQJIblv4HuBmF+F6KD6c0y/+I0r6J4sJgvIds4499zEOXMU/P0H 4YWqqRjuNFP4Wy1JJuogKIFHGPXpbuQ+efZDpIH5Pw5jadv0QfmFg5/MkaGDveeFcFt2Zb +W4FN9tlej5HQrcd+zaRJoDy/7ejFPg9O0JOruBOZUCsmGvTAKUesLU9DDJjC0tLtQmPB5 hbU8NA/tVuQ8cNQ7cNulX7BZ3wF5kMU/91S7nQckcV+rBHIIShtAjXqqc8S5L+INd4dnB/ xahlz7YmnE2jIkZXEgymz9dgbmO0PZbf+WXVxtuX0uenL/RPOKYcUtksyu5YRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d78bef0ebefdcd231f6583b6fafc03d4dda39525 commit d78bef0ebefdcd231f6583b6fafc03d4dda39525 Author: Bjoern A. Zeeb AuthorDate: 2022-06-27 01:23:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-06-27 01:36:52 +0000 hwpmc: further fix build (__diagused/debug/missing files entries) Fix builds after 1459a22787ea16e3798694067c8dcb20325dca4b and 59191f3573f6cb2ea055ac319cbcb68823ca8e17 by using __diagused for variables only used in KASSERT(). In addition remove two debug lines that look like a copy and paste error from dmc620 to cmn600. Further add the newly introduced files to sys/confg/files.arm64 as well so that LINT compiles without missing symbols. --- sys/conf/files.arm64 | 4 ++++ sys/dev/hwpmc/hwpmc_cmn600.c | 8 ++------ sys/dev/hwpmc/hwpmc_dmc620.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 256b67975092..26b9c8ae2215 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -198,6 +198,10 @@ dev/gpio/qoriq_gpio.c optional SOC_NXP_LS gpio fdt dev/hwpmc/hwpmc_arm64.c optional hwpmc dev/hwpmc/hwpmc_arm64_md.c optional hwpmc +dev/hwpmc/hwpmc_cmn600.c optional hwpmc +arm64/arm64/cmn600.c optional hwpmc +dev/hwpmc/hwpmc_dmc620.c optional hwpmc +dev/hwpmc/pmu_dmc620.c optional hwpmc dev/ice/if_ice_iflib.c optional ice pci \ compile-with "${NORMAL_C} -I$S/dev/ice" diff --git a/sys/dev/hwpmc/hwpmc_cmn600.c b/sys/dev/hwpmc/hwpmc_cmn600.c index b33dd2693b25..2e6ea41abff8 100644 --- a/sys/dev/hwpmc/hwpmc_cmn600.c +++ b/sys/dev/hwpmc/hwpmc_cmn600.c @@ -375,8 +375,6 @@ cmn600_allocate_pmc(int cpu, int ri, struct pmc *pm, desc->pd_local_counter = pm->pm_md.pm_cmn600.pm_cmn600_local_counter = local_counter; - PMCDBG3(MDP, ALL, 2, "%s ri=%d -> control=0x%x", __func__, ri, control); - return (0); } @@ -387,7 +385,7 @@ cmn600_release_pmc(int cpu, int ri, struct pmc *pmc) { struct cmn600_descr *desc; struct pmc_hw *phw; - struct pmc *pm; + struct pmc *pm __diagused; int err; (void) pmc; @@ -535,8 +533,6 @@ cmn600_start_pmc(int cpu, int ri) pmu_cmn600_set8(arg, nodeid, NODE_TYPE_DTC, POR_DT_PMCR, POR_DT_PMCR_PMU_EN); - PMCDBG2(MDP, STA, 2, "%s control=0x%x", __func__, control); - return (0); } @@ -674,7 +670,7 @@ cmn600_pcpu_fini(struct pmc_mdep *md, int cpu) static int cmn600_pmu_intr(struct trapframe *tf, int unit, int i) { - struct pmc_cpu *pc; + struct pmc_cpu *pc __diagused; struct pmc_hw *phw; struct pmc *pm; int error, cpu, ri; diff --git a/sys/dev/hwpmc/hwpmc_dmc620.c b/sys/dev/hwpmc/hwpmc_dmc620.c index bd17d8a78093..653013e3f2ab 100644 --- a/sys/dev/hwpmc/hwpmc_dmc620.c +++ b/sys/dev/hwpmc/hwpmc_dmc620.c @@ -232,7 +232,7 @@ CLASSDEP_FN3(dmc620_read_pmc, int, cpu, int, ri, pmc_value_t *, v) CLASSDEP_FN3(dmc620_write_pmc, int, cpu, int, ri, pmc_value_t, v) { struct dmc620_descr *desc; - struct pmc *pm; + struct pmc *pm __diagused; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[dmc620,%d] illegal CPU value %d", __LINE__, cpu)); @@ -353,7 +353,7 @@ CLASSDEP_FN4(dmc620_allocate_pmc, int, cpu, int, ri, struct pmc *,pm, /* ARGSUSED0 */ CLASSDEP_FN3(dmc620_release_pmc, int, cpu, int, ri, struct pmc *, pmc) { - struct pmc_hw *phw; + struct pmc_hw *phw __diagused; (void) pmc; @@ -537,7 +537,7 @@ CLASSDEP_FN2(dmc620_pcpu_fini, struct pmc_mdep *, md, int, cpu) int dmc620_intr(struct trapframe *tf, int class, int unit, int i) { - struct pmc_cpu *pc; + struct pmc_cpu *pc __diagused; struct pmc_hw *phw; struct pmc *pm; int error, cpu, ri;