From nobody Fri Sep 23 14:47:12 2022 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 4MYw3P07rMz4d9Ms; Fri, 23 Sep 2022 14:47:13 +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 4MYw3N6VJ0z4CgG; Fri, 23 Sep 2022 14:47:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663944432; 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=y1yyRJe1xFpLi3itH7TN71VFh7SrJrkeCYx2K8HjWtI=; b=LkRLtVdD4nMSQzdMbKkGJLSHYHofmAlfg9CcNGLKnx1W+ui6wgWnoMQt2oGyhxLf/8M+PU JCS7UdshGbr16ySJ0THUiDTrKNl7eEKbkjAnnYFIDMDkSNTLcZAwKUPFtIi+OOhHn0+1EO kQ5nF2UKq1xBvFcGkeFv3nCzaeuKIeVG+OWk+fauVBfCulltrpTa34zMkYUziDRunVaaO2 0toFAUvF59Nd9iySC0Rvtp4PJZoELxpKb8ApZRdvCFmWom5em0WYpZ5DpmIi4B6wj6JkbT Xg2eo+jzo1foZAbd6D8j987mLZj2XxkTtOtjc1LkDrMP7CieFrVymxEpDn4Wvw== 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 4MYw3N5W0rzmZx; Fri, 23 Sep 2022 14:47:12 +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 28NElC0i022489; Fri, 23 Sep 2022 14:47:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28NElC7B022488; Fri, 23 Sep 2022 14:47:12 GMT (envelope-from git) Date: Fri, 23 Sep 2022 14:47:12 GMT Message-Id: <202209231447.28NElC7B022488@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 7a5d47de9728 - main - Make adding children consistant in the GICv3 drivers 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a5d47de9728400ad2d8a5a12a5928fe6d250fc3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663944432; 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=y1yyRJe1xFpLi3itH7TN71VFh7SrJrkeCYx2K8HjWtI=; b=AqZs9M5WVONsj+HctL9wmR/hwGZ2T6Jsq0HqzclLZX4oStHIYGSuE2Brd5UatnQ3GuwyiW jBhr5MP9TgDVsRSP3vnnkrM0T+jcCRRlamJsKJ39OEqQJXzavwQZRHcjl/dw7DPW/FMBov X7/p5I9q3oYQNSVGuYLs+sOJ6day7G1+TW7jjN0r3Glh1zomxR+HLx67ksteDEjOXzAQct +OlKz6rxvbkG5ANLgmoM3f5XtLdSbId6H4WN85ICiI/Fdzgqv2h34j1c3SS/G9TBbnFZuw pnwqhKUH/PmQBAHeMeQQ995JEoevQfAJOQjiwd2V0OPnPL/za98/jKKRQlQTfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663944432; a=rsa-sha256; cv=none; b=qSdKvpn+YwEdnK6ehqXUGHa9KOL9fg20jwI5AkyIkPtqLfhsCLJ1FeKKBH64SvbJ2OVboq vuTHtECp3YEtxdksrTqfiVK6YcVxEePzBBnudd778QG1nvObW+q4+bxdcPLXnb1bv4RkRB EUY6ow1eewz28GWqz5mnd9J98K0Nq/fgEzY+9pN1Hvdc6y5/eStdbDnTvAntnUaG72lms9 a2gdTryiG6OMwmA6lu+yNT+O7merZW2c5pok0kdEqVuundtPvYzIdwdDecdSBrVpMLWm1b KrQDSCMtFaKACchsnFsUsTbmEb/p2usIec9O9PYHhbAZIe1IsSTP70PaR5QMNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7a5d47de9728400ad2d8a5a12a5928fe6d250fc3 commit 7a5d47de9728400ad2d8a5a12a5928fe6d250fc3 Author: Andrew Turner AuthorDate: 2022-09-23 11:05:10 +0000 Commit: Andrew Turner CommitDate: 2022-09-23 14:28:45 +0000 Make adding children consistant in the GICv3 drivers Reorder statements to make them consistant between the ACPI and FDT GICv3 attachments. Reported by: jrtc27 Sponsored by: Innovate UK --- 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 3d3cd3ba9ccd..d6d5640f9daa 100644 --- a/sys/arm64/arm64/gic_v3_acpi.c +++ b/sys/arm64/arm64/gic_v3_acpi.c @@ -432,8 +432,8 @@ gic_v3_acpi_bus_attach(device_t dev) resource_list_init(&di->di_rl); di->di_gic_dinfo.gic_domain = -1; di->di_gic_dinfo.is_vgic = 1; - sc->gic_nchildren++; device_set_ivars(child, di); + sc->gic_nchildren++; } }