From nobody Mon May 16 12:09:51 2022 X-Original-To: dev-commits-src-branches@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 8B0251ADE2E7; Mon, 16 May 2022 12:09:53 +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 4L1yjr6f1Vz4cfj; Mon, 16 May 2022 12:09:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702993; 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=k1jdC/4G80BlnyBxk2vut9C/TnR5OUmaTKUl/qSjGUk=; b=yDP8+h2gAXXf87GQMl6HCX2w5+wpqcWjXjf3SBqfK9Rg22zpelC+97itpPw5Bdl+eN0EM2 TPR5Y2MIk0FFJS8Nz11Ri7u/7O+mKFICYZzEmBIi9WRqkRV7/RfRBZ0w/MFjsdLAvEDXsz dN6CyLYRmOW3U+O9sp0C5KJW+r0MUHZCnlmrQbPsFbBBnSEC8fHHrXEl+zJVlU7EIEAD4p xlYZEdcpXtnBhFQe8LCkUFSsv4p2rw64LIn0WfBBCwU3hkmujpNKWHKrM1g3OfjcQ4UcD8 gVcF/jdy4XmIlI98CobgmyOtRI3gvLjhHSqly/CSVdwf3TGv+1tjfWpYGf5S3w== 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 F32D61FB67; Mon, 16 May 2022 12:09:51 +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 24GC9pUn035427; Mon, 16 May 2022 12:09:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GC9pUD035426; Mon, 16 May 2022 12:09:51 GMT (envelope-from git) Date: Mon, 16 May 2022 12:09:51 GMT Message-Id: <202205161209.24GC9pUD035426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 8d672e8449c8 - stable/13 - ofw_cpu: Make ext_resources non-optional for arm* and riscv List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 8d672e8449c877b2772d5f7b0a3dc1b7123ad226 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702993; 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=k1jdC/4G80BlnyBxk2vut9C/TnR5OUmaTKUl/qSjGUk=; b=xXDvFWl0kDPUni7OKFsiudJp6Nx+Zc5yA/5UY4vn/r8tueNqawUW8EFH4kCEvOnOv5lPZ1 6cfHHJqX3kiOYahRizON/i+357Yufp81LZoNyKdtowvpslZeqAw0mU0en0WEtd1k1z7EbD R6SXVHJUtYkkizbAMTn4hmijMFyfqkPYv7OC2jk4KJMZ7cKn4MbZzAH/zjS7OrJg4OhnbU 9F0ZCror98Bm00YqOgzeW/gVt22ixggJZLUnbUjzEwsupZEM3OHXhNiJuwdEGYEvbtVLDM ptxtuUNLiigkyMS+r7cM26KsiTN6M5ZCuaTbs9i5qxiL6BK2kIB+GKDkxnCfLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652702993; a=rsa-sha256; cv=none; b=fmJLzlUi8bLtocLk6JP71Zg1LSUsyHQOJ5UZF0X2E/CD3KN2zohkKVdi6hT3p/YMWqiRwt KgYMUYCnv6LYiKiR4mRLP5TeLQaF16iocS60+mo8HhLAuIYKZCyR77FnBLmjeLc8+njWhl Mf6tViS92CWlBMlxYV7GYt0j+zxpblgRDZOyJYEJffoZUC7ZZkjVzdGbnusdyooPsA5Ba8 2G4/US8vPl07PDbCqMiuxHJMbJ5o2VLMMiMqnaxt/XfmH0wajxkYnTMbWTYlxlOHMOSurQ HT05S4K3PpLfby3HnbusoN/ibnMs6DbeUoBJnM7f+qp8jtA+Xdsd7iN8VU86ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=8d672e8449c877b2772d5f7b0a3dc1b7123ad226 commit 8d672e8449c877b2772d5f7b0a3dc1b7123ad226 Author: Emmanuel Vadot AuthorDate: 2022-01-11 10:08:18 +0000 Commit: Emmanuel Vadot CommitDate: 2022-05-16 11:45:38 +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 (cherry picked from commit 02398e581d4511bd1c5e8ffad5155f9b9684b4b8) --- 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 293d765e8cbd..a033c7ef8725 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);