From nobody Mon Feb 21 16:30:00 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 EE01119DE7D1; Mon, 21 Feb 2022 16:30:01 +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 4K2SSn2SQKz4h3Q; Mon, 21 Feb 2022 16:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645461001; 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=u19Ev21tyQa2UikGDuMbhXgtBswy+gRZ00wgjam8JDo=; b=pjsuZmIR4ZdvdOXWZLyiBb+6U2Zko3DrAiZd20+9uB1VRhcQsfIxmXdFEGDwcnA1PeDZzy M8gWvdP86Im8/sVDZ2a2318t18Ydb3a9RBvHsYUBDNhg5aLmJ/eHJrIp0wBHE2mM7VjtgM FE/UYtpej6OuBuuhQwUGbizfkF1iPOmHiK7Vtd6cHCJp5m3y+tF5M0u3PZI6GT8CSgatwe 9Y8hvt7/ShBX5WZiPMEClReHdd7obyRKoNaaImCbAy4AxfWHJfLDDUZn1GoyV4cbAniaBA mct6lUdc0h23RuuWVUhX4eOntuvbrJSKmupisOVqMC+8rzDAkmUjoDdRnxAgZA== 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 CA944139A3; Mon, 21 Feb 2022 16:30:00 +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 21LGU0FN009391; Mon, 21 Feb 2022 16:30:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LGU0I2009380; Mon, 21 Feb 2022 16:30:00 GMT (envelope-from git) Date: Mon, 21 Feb 2022 16:30:00 GMT Message-Id: <202202211630.21LGU0I2009380@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 02398e581d45 - main - ofw_cpu: Make ext_resources non-optional for arm* and riscv 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02398e581d4511bd1c5e8ffad5155f9b9684b4b8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645461001; 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=u19Ev21tyQa2UikGDuMbhXgtBswy+gRZ00wgjam8JDo=; b=v4Q0wHQ0kDVX9QUf5pTaa31PfucOJB8ALNN/ve5VCHI2IVJcsR6vwoQXTzf0Bu0lHOO93i G2Rsn+KktCDpKDJnv3VPgbUWUwkUJVZzyO7Mfjg6eqwhQiklPi1Ami5/BxzruSJajTk2OO HNI1vfoQrwe8yjm6CJV0JYZYqHz2/vthr6S1+OnX0sR0VfKLPEzNrhhiWyojO6TrxczL2V M4ik4GYC26rmohlCoRMqPuM0Ju/IUVbztNKL48Zp0ZPUG8U3KBJeKd31EM4PLwnwv4mYjb k0tuguozbQVoUBdivnNerHC2dZC28mBCvLjWLwQUrkVYsNIMYbgPNL9jKSZPyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645461001; a=rsa-sha256; cv=none; b=xYTWNkAgl2KFCdGKV1kTE3ZFq5ZfoblCxEAa8WAo3lHLDcXrfgTj7DokCE22oBBagZqC3t axnQAVnfeMMDSFCMHK65UYu79az5OgOsJPQjksVIKLihsv/yVRgUQ2crG9KyAj/yiQpEDW ymeBGNBpatERxPPUXpXRdIU1dIvSjNEko8pmEMPwtib4j+/EtHOCChjZxR8PUne9oxYqvV Mm4lKFDFifyF3zTNbu7ZqiIJqXSODo2R6PFlKs4XjMQUEVDnTNWkbDRVEIiht6d/zIWzhu jMg04RQcEAogxW0c1Er/qH7Ewt+u2xGa0kkkJiUWEs3adjUQynCJ+Y5JPlvWxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=02398e581d4511bd1c5e8ffad5155f9b9684b4b8 commit 02398e581d4511bd1c5e8ffad5155f9b9684b4b8 Author: Emmanuel Vadot AuthorDate: 2022-01-11 10:08:18 +0000 Commit: Emmanuel Vadot CommitDate: 2022-02-21 16:29:07 +0000 ofw_cpu: Make ext_resources non-optional for arm* and riscv EXT_RESOURCES have been introduced in 12-CURRENT and all supported releases have it enabled in their kernel config. For RISC-V it was always enabled. MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D33835 --- sys/dev/ofw/ofw_cpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/ofw/ofw_cpu.c b/sys/dev/ofw/ofw_cpu.c index 5cbec1eb2ab1..c16973373acd 100644 --- a/sys/dev/ofw/ofw_cpu.c +++ b/sys/dev/ofw/ofw_cpu.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef EXT_RESOURCES +#if defined(__arm__) || defined(__arm64__) || defined(__riscv__) #include #endif @@ -207,7 +207,7 @@ ofw_cpu_attach(device_t dev) phandle_t node; pcell_t cell; int rv; -#ifdef EXT_RESOURCES +#if defined(__arm__) || defined(__arm64__) || defined(__riscv__) clk_t cpuclk; uint64_t freq; #endif @@ -277,7 +277,7 @@ ofw_cpu_attach(device_t dev) sc->sc_cpu_pcpu = pcpu_find(device_get_unit(dev)); if (OF_getencprop(node, "clock-frequency", &cell, sizeof(cell)) < 0) { -#ifdef EXT_RESOURCES +#if defined(__arm__) || defined(__arm64__) || defined(__riscv__) rv = clk_get_by_ofw_index(dev, 0, 0, &cpuclk); if (rv == 0) { rv = clk_get_freq(cpuclk, &freq);