From nobody Thu Feb 1 20:54:10 2024 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 4TQrvq63d7z58fBR; Thu, 1 Feb 2024 21:02:47 +0000 (UTC) (envelope-from dsl@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQrvq5Vpkz4StB; Thu, 1 Feb 2024 21:02:47 +0000 (UTC) (envelope-from dsl@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706821367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Fhf6UpJuy9K8ygu9a/L1LuAxH88mZrR9/MQJAX5TaFs=; b=x97RisxqoJhmR1JqiRy2ZKcOBNuDNcM3Hhooolrp8jpx1fzZuIghHss7927kClrH21vM0M dddHn+sUpj/s2f7j+zYJF8xzA/hyglsQ1RjhA0WeeOMj1yD18wkYvi86soDQYqTq7Ws3fh mlf/EnGAjrvqTpU4yHBzned4B43SoIUKDvOUJrFD5PhWxZzF8A+9tw65xVMebMuEFsUSci 50+r72QTPZtfB3WRJ9D+pznudNyoSwpR6jGO8fEI+uMBoH9v8Dl9Di6joinTwFVDTbdqWc eI9xZeTuNZErhzTV9FKbhFXWRQQj01EVSHS2ykP5QL4ETIWf6RgHDCySYT6A6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706821367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Fhf6UpJuy9K8ygu9a/L1LuAxH88mZrR9/MQJAX5TaFs=; b=namW16syQ6NmvHUX7L1cgJdr8h0+R4MuuHKs85R3S2C1/GyP6e1JBe8WnBZhcvB8KftNPD TEC0eovylptHLZohU0HMjrQgDoLjWp0Lb4vHkiGT4L1bp66oSLGBgAQRFsHKYPDzDGv1X/ SaZvxPmz4VBOiK8D5lup1zZBxtKGvUuFsZQeOx6HPE3fkBC6yM/U1kjed+PaF9LVJouvfW /xyMu8eIr406Kn2sh8mte6uFY07iVJoC+epY3+fV7JI7+k+KWheAGGXp3O5T45dVMIoD3M lp6QYGQ+zZZuW/NDhf775o0rnVGkVczaIN4ZR1UCeytTbRtKBmqdo8oknoiscw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706821367; a=rsa-sha256; cv=none; b=pWN8mW/aghkYwxk0BrAi8NvPIZKy5PENFEMsDzsHNaHk7myC3nRLvTBPAawz+3tXGKx0xF pI81qRJDq0hjzo4dwTQrX+fAB/X9oZxeP1mLt0CJsblsumFcSh0IDIUe4pDP9kV5Tv/BIc r+Guv4dhTxl43SXpzUVnWtDjSkVYz4e0YNT3jubM0ClENgmKgnA+LumnT5myPc0KJz/rpJ fHDD3CP4SGLi4roanEEkTsNpWtbh+EfFx1P6MfoJYY5UWJW2eOAxCSx7v8kisJN9nVUb94 u61zqBQG6kqPx/Z2f9Flp5zEoiCIb/DoeLiqlmt7qji6nG7OtVHGdEE5PLMWyg== Received: from localhost (unknown [91.226.51.235]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: dsl) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TQrvq2V2hzJ3H; Thu, 1 Feb 2024 21:02:47 +0000 (UTC) (envelope-from dsl@FreeBSD.org) References: <202401310406.40V46B9a000876@gitrepo.freebsd.org> <04c4a0e1-aa79-4d25-a1f7-2196cfa65578@FreeBSD.org> User-agent: mu4e 1.8.13; emacs 29.1 From: Dmitry Salychev To: Jung-uk Kim Cc: Baptiste Daroussin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 07c64d74917e - main - acpica: Import ACPICA 20230628 Date: Thu, 01 Feb 2024 21:54:10 +0100 In-reply-to: <04c4a0e1-aa79-4d25-a1f7-2196cfa65578@FreeBSD.org> Message-ID: <86o7cz99u6.fsf@peasant.tower.home> 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: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hi, Jung-uk Kim writes: > On 24. 1. 31., Baptiste Daroussin wrote: >> Hello, >> Either this one or the previous import is breaking arm64 build >> --- acpi_iort.o --- >> /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:103:4: error: field >> 'data' with variable sized type 'union (unnamed union at >> /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:98:2 >> )' not at the end of a struct or class is a GNU extension >> [-Werror,-Wgnu-variable-sized-type-not-at-end] >> 103 | } data; >> | ^ > > Sorry for the breakage. I will fix it soon. > > BTW, this code was added by this: > > https://reviews.freebsd.org/D31267 > > It seems struct iort_named_component was a hack, which duplicated > ACPI_IORT_NAMED_COMPONENT but with a fixed length field > DeviceName[32]. Is it really necessary? > > Jung-uk Kim I'm struggling to understand (a) how the entire anonymous "data" union was added by https://reviews.freebsd.org/D31267 as was "named_comp" only and (b) what the problem with the "struct iort_named_component" really is as ACPI_IORT_ROOT_COMPLEX and ACPI_IORT_SMMU were re-defined as incomplete types in the new version of ACPICA. Everything is compilable as it used to be with the attached patch. Regards, Dmitry -- https://wiki.freebsd.org/DmitrySalychev --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-acpica-Revert-declarations-back-to-complete-types.patch >From 0b4210943fab59ff985953408ec7e11b1f90e90e Mon Sep 17 00:00:00 2001 From: Dmitry Salychev Date: Thu, 1 Feb 2024 21:47:48 +0100 Subject: [PATCH] acpica: Revert declarations back to complete types --- sys/contrib/dev/acpica/include/actbl2.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/acpica/include/actbl2.h b/sys/contrib/dev/acpica/include/actbl2.h index 140b386f802f..3e87844cc682 100644 --- a/sys/contrib/dev/acpica/include/actbl2.h +++ b/sys/contrib/dev/acpica/include/actbl2.h @@ -664,7 +664,7 @@ typedef struct acpi_iort_root_complex UINT32 PciSegmentNumber; UINT8 MemoryAddressLimit; /* Memory address size limit */ UINT16 PasidCapabilities; /* PASID Capabilities */ - UINT8 Reserved[]; /* Reserved, must be zero */ + UINT8 Reserved[1]; /* Reserved, must be zero */ } ACPI_IORT_ROOT_COMPLEX; @@ -688,7 +688,7 @@ typedef struct acpi_iort_smmu UINT32 ContextInterruptOffset; UINT32 PmuInterruptCount; UINT32 PmuInterruptOffset; - UINT64 Interrupts[]; /* Interrupt array */ + UINT64 Interrupts[1]; /* Interrupt array */ } ACPI_IORT_SMMU; -- 2.43.0 --=-=-=--