From nobody Fri Mar 31 16:27:43 2023 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 4Pp5L80j21z42xqf; Fri, 31 Mar 2023 16:27:44 +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 4Pp5L80FJvz4MPv; Fri, 31 Mar 2023 16:27:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680280064; 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=zJiKs1hq90YrnAzGYvjT3t87GHWZbFGOLZOWfvMoMdA=; b=UEw3zaLmTbCVCfXbTeTKtyytJ2zara8M9N4Xgr5VQIkB+VlYbdctJdbEAOhpGwnTnULi+B qTtB197USPbcWd96Qfk5JUoEd7YnWpRCo5NnHc6wrBYAHbYvIihRF5wg/DNyVkynrG6ARm Ecvl4dxaNYyQkHoEL/JbMTAufD6RCfSWnqvdJ+JwECu37hBkubIzEn4fABorvoUY1WzlDH cSjDc5uLs3chSZrbjOHBriw9ZgDYqBr5AIF56RULJT3TfjE08KdIoyuF3g1Y1toipffype pFX2OT5M2f+OImkO+UsAvqMPQU3pTWIm/2zjt0FeeCl+04BlKHkZix60nAP3jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680280064; 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=zJiKs1hq90YrnAzGYvjT3t87GHWZbFGOLZOWfvMoMdA=; b=dwf73E63g3lzJ2bpGswLqOBmKyG6nUB3DCNRl7xIC2YZmJSVK5xWvw5AdmVyj/OZf6PE7r v9hGLALmXpczEMASae84nLmozwWFuaPklBddI+ijlHm4y6SYclyHvSavcibDZoYxZpJZH6 y46nrs4sAZQPIoznCDqsgQ1sypqXUHualudAwVyRAF/21ZqJCkBPbKF+/wZKtduSybd5kb CDcChhVrPf1gwhpEcM3/mcB8lwbvpAgSJ0PKXCJgjJ9hWAvDGydTek0kdtabECFDuUhZ5z iko49vVNDjFqrG02+Kk5ISN0dsC6FP60kZb8oVoLu8fmGLKPRuv/9FSvM1Q8kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680280064; a=rsa-sha256; cv=none; b=x4w+suywa2tmFy17WjR8LUnFHi6XUnNtWjBPC4qv4n9wEScnvg4EHE3HWAcHF5Zl+j6vvX 9Oh/hpAcRfvFXqj4x2Z/KzaeYTCtYvHt468wU8zODIhcHRImpsZwqQo/45WSRYkMAfUQo5 nSLmPy0XpHphlMk1mljSHsxFseXmYSQcU1o8ftZOCpq4G7uwr+rkboMMCiBRGufAQDVHRp LMX4lOKbVegmYcZiCgVmTNfGgDAkFuIgXyc/VaESmdM3orllbyJ4wWLbJWFTSF0fg1IGT/ 5hzAEQjfgaqJuaiv0//Jkh66FFpWFqys+gMadiKGidrjwrjFMI8xzqsGU068gQ== 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 4Pp5L76Ndlz117h; Fri, 31 Mar 2023 16:27:43 +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 32VGRhto030651; Fri, 31 Mar 2023 16:27:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VGRhXj030650; Fri, 31 Mar 2023 16:27:43 GMT (envelope-from git) Date: Fri, 31 Mar 2023 16:27:43 GMT Message-Id: <202303311627.32VGRhXj030650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 3462c371c256 - main - arm64/gicv3: correct the size of the distributor resource 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3462c371c2562a8144f4245f9967df99874e505f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3462c371c2562a8144f4245f9967df99874e505f commit 3462c371c2562a8144f4245f9967df99874e505f Author: Mitchell Horne AuthorDate: 2023-03-31 15:32:39 +0000 Commit: Mitchell Horne CommitDate: 2023-03-31 16:26:22 +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 --- 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 090c61429441..9c4e02c15706 100644 --- a/sys/arm64/arm64/gic_v3_acpi.c +++ b/sys/arm64/arm64/gic_v3_acpi.c @@ -215,7 +215,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;