From nobody Wed Apr 12 17:10:40 2023 X-Original-To: dev-commits-src-all@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 4PxTk82Y0xz456ZD; Wed, 12 Apr 2023 17:10:40 +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 4PxTk827X8z3xtk; Wed, 12 Apr 2023 17:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681319440; 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=oCJTEkXP4C4jouiXVT3lCPfqPKT4DR/t3GTWi6sTEA0=; b=dBT/Zn7mGJMacch877rG1awE5IpPfDX7rteUI2/PEERvKiCSke56VfyJVIJ8W1Fs4SGQIw xrP/i7yI0xKOMZJVHp1eNy1IL1jnZCft69At466IqU/yIfCQlSEAAQKgCNt64MOquZxw2K jrRq/QvCgQ3pt6A4nPP8Zd5RwUIDn18x9U8HnwcxWZXBSHN2uyODRmGSN3urT80H/KC/+F W9tpjPorNgHU0BeIeTbAxoHaowF7uDckerHOMm083eMxaWrb5VEVS4Ay+TgazmQCA4ecvg Ll/mmZwQ6Ie4whpV4QiLEUm/n0Ez7zrtYvQrJ4Hv6k5Ca1hfCPPsc67aDWAqiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681319440; 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=oCJTEkXP4C4jouiXVT3lCPfqPKT4DR/t3GTWi6sTEA0=; b=qHrtUKHXuYWBb/8v5dJDidYW/jRdPwSzgPs5fJ4+Ina5DdktJv1lV7lsC4Pew/ZaF/SSHb HMdNzSG54PVzNmbImFlnMVaKP/XHjnHUqQ0qFVebE53BgMOwxYliS2cpPUDDc1E4tSSDJ7 Roz2V4Fm/hiTWIw9v8WoEkmyyjOReoqoB/yPTY8GwK1xAYBeXkkKhjzCU0dHonzrG5CDUi gdBiT2JCgbsobkLuBE+PvYWummOBztb2HsBgD4ZzoZX9siUYLpkoaYkCSniw0XYkQ2X/5K uyRftq3516IPVJLUW1+pzClG7Kmu3+4GGkVbtDbYDKPuFuB6PsMDpNd21oUIew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681319440; a=rsa-sha256; cv=none; b=A9AkR37+KKBn0d/mH+79VJHRx3Z1FCkuUixhMECN4SM7KbyGJGTauQqg2C0u7DQpr+0nqR xbyBRfjtpW9p3wA8rB1EcX4MBiOsJkFDe4RYOzN6znHtemsgz3uTctApfBynRi34Tkg+8T pP9QwWX59PZLW1EfkkhXRU15touq/qNsLFhtQPnVc0H6sMkwlK2qra4D8gGpSyNayM8f2t ApwbZQbj5WAvD9I2vzD7uPCOV34i6mxYZQxs5L70V/z1HYA9G8umZ3uELew64t6eUgf+hb nKm4fR2gZdrUUwNJUM/rGO5SF55qoMsuc7I0d7YryKciaAfIFA7RKE+oWh1DFQ== 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 4PxTk81BZNz17KH; Wed, 12 Apr 2023 17:10:40 +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 33CHAeFA058668; Wed, 12 Apr 2023 17:10:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CHAeiR058667; Wed, 12 Apr 2023 17:10:40 GMT (envelope-from git) Date: Wed, 12 Apr 2023 17:10:40 GMT Message-Id: <202304121710.33CHAeiR058667@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 98ee3bb87a7a - stable/13 - arm64/gicv3: correct the size of the distributor resource List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 98ee3bb87a7a46b2ecae96159258632b8f6f3520 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=98ee3bb87a7a46b2ecae96159258632b8f6f3520 commit 98ee3bb87a7a46b2ecae96159258632b8f6f3520 Author: Mitchell Horne AuthorDate: 2023-03-31 15:32:39 +0000 Commit: Mitchell Horne CommitDate: 2023-04-12 17:08:38 +0000 arm64/gicv3: correct the size of the distributor resource Use the GICD_SIZE macro (0x10000), which is half the size of the current fixed-sized mapping (128 * 1024 == 0x20000). In ARM64 Hyper-V instances, it seems the Distributor's registers are located immediately preceding a range of physical memory in the bus address space. Thus, when ram0 is attaching and attempts to reserve SYS_RES_MEMORY resources corresponding to its physmem ranges, it fails, because the first 0x10000 bytes of this range are already owned by gic0. PR: 270415 Reported by: whu Tested by: whu Differential Revision: https://reviews.freebsd.org/D39260 (cherry picked from commit 3462c371c2562a8144f4245f9967df99874e505f) --- sys/arm64/arm64/gic_v3_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/gic_v3_acpi.c b/sys/arm64/arm64/gic_v3_acpi.c index 9aaf9a783868..568e796a60cb 100644 --- a/sys/arm64/arm64/gic_v3_acpi.c +++ b/sys/arm64/arm64/gic_v3_acpi.c @@ -210,7 +210,7 @@ gic_v3_acpi_identify(driver_t *driver, device_t parent) /* Add the MADT data */ BUS_SET_RESOURCE(parent, dev, SYS_RES_MEMORY, 0, - madt_data.dist->BaseAddress, 128 * 1024); + madt_data.dist->BaseAddress, GICD_SIZE); madt_data.dev = dev; madt_data.rdist_use_gicc = false;