Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5;
Message-ID: <736fcad7-f440-4bcd-86fb-4cc73d1b8f37@intel.com>
Date:   Mon, 20 Nov 2023 09:53:22 -0700
User-Agent: Betterbird (Linux)
Subject: Re: [PATCH] ACPI: acenv: Permit compilation from within the kernel
To:     "Rafael J. Wysocki" <rafael@kernel.org>
CC:     Sam Edwards <cfsworks@gmail.com>,
        Linus Walleij <linus.walleij@linaro.org>,
        Len Brown <lenb@kernel.org>,
        Robert Moore <robert.moore@intel.com>,
        Jonathan Cameron <Jonathan.Cameron@huawei.com>,
        Dan Williams <dan.j.williams@intel.com>,
        Hanjun Guo <guohanjun@huawei.com>,
        Arnd Bergmann <arnd@arndb.de>,
        "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
        <linux-acpi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <linux-arm-kernel@lists.infradead.org>
References: <20231114-arm-build-bug-v1-1-458745fe32a4@linaro.org>
 <b2354c21-3a1a-c446-fee0-db0c78d05c71@gmail.com>
 <CAJZ5v0idWdJq3JSqQWLG5q+b+b=zkEdWR55rGYEoxh7R6N8kFQ@mail.gmail.com>
 <41160dbf-d8c8-4dc0-9fda-42cc97df5b77@intel.com>
 <CAJZ5v0jNOXKv2fHNGUDjDvvg6FGbXuahhH9dBhWiAwiPv3fH8A@mail.gmail.com>
Content-Language: en-US
From:   Dave Jiang <dave.jiang@intel.com>
In-Reply-To: <CAJZ5v0jNOXKv2fHNGUDjDvvg6FGbXuahhH9dBhWiAwiPv3fH8A@mail.gmail.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?enkyTEpsaW5EdDJpVmJYME9lQ2YwdXlOV1Bvem1uRXRzNWxKU00xL3hDWXBs?=
 =?utf-8?B?Njk5c2pxVlQ5REgrbHVpNFBQVnIzc0Q1NUZBOFdYT3V5MU9xQWIyTGVsSTlO?=
 =?utf-8?B?MCtMQUJqRWt2dWZSQVdpQkRIMmlLSlFkaTdLelBSaWpPMVVVUzBvV0wva0M2?=
 =?utf-8?B?Mk5lSURsU0o5QWFhUzNoeDVWRzJGVitLNHk1eTNJNE1MaysxOUVaZVZHTU54?=
 =?utf-8?B?SWtDSEMyZUV3Q0E1dDVtV1dkOER5RzFyNnJWSzdBRThnQ3hFSzVGdGVHNlNB?=
 =?utf-8?B?Z3FyNmhkaHpPU2JlY0tjWFpoKytsd0VqYUhjRlFGb0lEa2h2UHdLUG5QVU02?=
 =?utf-8?B?NlVzUHYrcVdVTzhBWnA0Smh2dkkxb1Y4Z1ljSEZ1WWNGYjZWWFhMUW04bVE3?=
 =?utf-8?B?aUtjRXZZVk9HRHJxbFl4dERJcUVLZ3hBWWowV2JiYTR3djBlYUhJWW1YOEI2?=
 =?utf-8?B?MENUYm9PZTh1QlNFbzliT1prRUptWG0vVDFvVTUweUZZMndzTU1JbVJvbkMr?=
 =?utf-8?B?NlVycTFwWTllSitvalo4RmVOa1dQd095VStyaE9nTkpzQ2RzS0JQVThqK2pj?=
 =?utf-8?B?ZFdUQnJnTEZvVmtDSnRpSTBIWUVUc3VHTnlmMEc1WEhSdys4ZTU0b0FhcnMv?=
 =?utf-8?B?SDh6V0NrazJyL2dWQnN0N203WGp4RFNzbzJMZVIzY2xZYmVmOUlxZFI2Q3Qz?=
 =?utf-8?B?SEFyL1R5SmRuOVd3djBtQjl0ZzhDcEcrREpBUGQrRGVEZ1VsbjlNYUVHY2kv?=
 =?utf-8?B?Tm9jTktWUGlDanVhSGlWMldpWW1uUlA4Yk9JTzlWS3lUV3lkRElLZ0VjTlpJ?=
 =?utf-8?B?eFc5aUlvTE9YOTg4YWhtbVMyRlJYQk5JN2NKTER5bUV6bVFpdml4cWlXUUdz?=
 =?utf-8?B?SlUyZHIyQUJIR0x0ZDFieUZOOEhzRStRa1lCdnVtRXFBWkErOWd6VGNmMkZm?=
 =?utf-8?B?NnNjbWlzcDkwSGh3YXlNMjRvQ3ZiN2p3NENRREh5cVBnTThUMlAyaFFJS044?=
 =?utf-8?B?NkxYb3VvbEZBYm0rR2Fxa0R0TlZSRE9WazZWUnlWUDJnOHdhY2JCckFZYTFH?=
 =?utf-8?B?Z2gxTFlNVFh6RjM4THVHOE1Kb1JZRFJnWTdQTTVrT0hkTkplN292eTllckZr?=
 =?utf-8?B?SVlXUzhlS0N2VnVtTWErSHhKbDU3TmRZRUttSlVtVWJKUS9JVlRZWE9DdlAv?=
 =?utf-8?B?T0poUGIxM1RGQmdYbDdHTGlxb21HcFFlN1FnMzVyMmlDZFlaUWFLekNuUEow?=
 =?utf-8?B?NE03dXo1WWJ3R25KODAwUHJvczhVaWVQQkZTejlhbXV5NlNKeTkwVU9RTGJr?=
 =?utf-8?B?VU5xNytGRGpMVENpVG9rTTJLWUw4YUgvbENPcGtsUDRWdGFpMG43UmVSdzlJ?=
 =?utf-8?B?TjdjVU5DUmc2UlhZUnpFM21IRHhFbHBTMm1jbWY1WVRqNWdVSlVQSUZvcGYw?=
 =?utf-8?B?MTk1NHoycnNxcTl2L3lpL0hlTnlvcnlQM0ZWVDFmOXVXVzRUc1duSEU2Ui9W?=
 =?utf-8?B?bjhqWHpXTUVDaHdENFFjUzJQcHVwaGJ1UFcvdGlMWStCdVR4Y0JKcGFMYzBs?=
 =?utf-8?B?VGx2U25pNXZrRGl0NFhtQlIrMHNxeVQwOWNWUFVXSzFWMmFvZytsWWQ3M1pK?=
 =?utf-8?B?MWFTbTV1RkYxNVVSMjJTVkIwaFlTdEFWMVYwT2twZmFBb2U4enEyOC9GVjBW?=
 =?utf-8?B?Q3RITmpkZTBMUDFxSlB5bzlWMCtiSXBXY2ZhQmJaZVF5QjhsT2VZb0RTWUVQ?=
 =?utf-8?B?YU4zbnhnOW54Z2htMlh6ZHV6N2ZzekMzRVVWWnpMVXRoRENxdXdERmtSTFlZ?=
 =?utf-8?B?bHhtaFU3ZEw2V3lNUS9hNEk3bzd5RzliUnJ1L3ZjWEpxaVMzWEZ2L1JNcUQ4?=
 =?utf-8?B?cEdUNzBwSDdGY3VMR04zTDREelRwV2M2Vkg1cTNDYlhPNjkxWDBEdy9FdFNF?=
 =?utf-8?B?VVJNaXlma3kwYjZBQUZYQXk2Vzd0ZUN2QnpCYWNScGhBTk1mb0NLMmJpTSt2?=
 =?utf-8?B?TVJ5bWd4NUtYNGk0SDFLWUJjUGtVU3lZMnhUMzUwTzdWNnZ6VjRFSFhmNkJZ?=
 =?utf-8?B?SDNWaDkrRGtocGd2cHkzRkxxMXh1MEFzWGhwUTJ4ZnNoV2ZZSmYxVVozTlZB?=
 =?utf-8?Q?h93aN3V6LeoxKE8jjs4eD6TFP?=
X-MS-Exchange-CrossTenant-Network-Message-Id: af88345e-6e59-4f2f-ad19-08dbe9e936b2
X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB5984.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2023 16:53:25.9345
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: a35HG7c5MgJcYRTv/OsriR5qtk6tJ6hKO5qliGqdXjbyhXZKVkz1O5QiJDAEjIdY91uT7eseV7NYX+/pxqd0vQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6548
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 20 Nov 2023 08:53:52 -0800 (PST)


On 11/20/23 09:38, Rafael J. Wysocki wrote:
> On Mon, Nov 20, 2023 at 5:19 PM Dave Jiang <dave.jiang@intel.com> wrote:
>>
>>
>>
>> On 11/20/23 08:46, Rafael J. Wysocki wrote:
>>> On Tue, Nov 14, 2023 at 7:09 PM Sam Edwards <cfsworks@gmail.com> wrote:
>>>>
>>>> On 11/13/23 16:08, Linus Walleij wrote:
>>>>> After commit a103f46633fd the kernel stopped compiling for
>>>>> several ARM32 platforms that I am building with a bare metal
>>>>> compiler. Bare metal compilers (arm-none-eabi-) don't
>>>>> define __linux__.
>>>>
>>>> Hi Linus,
>>>>
>>>> I saw the same baremetal-compiler error here on the ARM64 side of the
>>>> fence, and narrowed the problem to the same commit as you.
>>>>
>>>>>
>>>>> This is because the header <acpi/platform/acenv.h> is now
>>>>> in the include path for <linux/irq.h>:
>>>>
>>>> More generally, I think it's because of this addition to linux/acpi.h:
>>>> +#include <linux/fw_table.h>
>>>>
>>>> linux/acpi.h is supposed to ensure _LINUX is defined (if it isn't
>>>> already done by a non-baremetal compiler) before we start pulling in
>>>> ACPICA includes, so that ACPICA knows the platform. But because
>>>> fw_table.h contains:
>>>> #include <linux/acpi.h>
>>>> #include <acpi/acpi.h>
>>>>
>>>> ...the circular include does nothing (linux/acpi.h's include guard stops
>>>> the include before _LINUX is defined) and we end up pulling in
>>>> acpi/acpi.h before we're ready.
>>
>> Not including either causes compile errors for me.
> 
> Interesting.  What errors do you get if you include linux/acpi.h only?
> 
> It should not be necessary to include acpi/acpi.h in addition to
> linux/acpi.h, because the latter is expected to include the former.
> If it doesn't do that, something is amiss.
> 


  CC      arch/x86/video/fbdev.o
In file included from ./include/linux/acpi.h:18,
                 from ./include/linux/tpm.h:21,
                 from ./include/keys/trusted-type.h:12,
                 from security/keys/encrypted-keys/encrypted.c:22:
./include/linux/fw_table.h:32:37: error: field ‘common’ has incomplete type
   32 |         struct acpi_subtable_header common;
      |                                     ^~~~~~
./include/linux/fw_table.h:33:36: error: field ‘hmat’ has incomplete type
   33 |         struct acpi_hmat_structure hmat;
      |                                    ^~~~
./include/linux/fw_table.h:34:40: error: field ‘prmt’ has incomplete type
   34 |         struct acpi_prmt_module_header prmt;
      |                                        ^~~~
./include/linux/fw_table.h:35:33: error: field ‘cedt’ has incomplete type
   35 |         struct acpi_cedt_header cedt;
      |                                 ^~~~


However, if I move fw_table.h in linux/acpi.h below include of asm/acpi.h, then we can build successfully w/o including acpi/acpi.h in fw_table.h.


diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 54189e0e5f41..2789beb26138 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -15,7 +15,6 @@
 #include <linux/mod_devicetable.h>
 #include <linux/property.h>
 #include <linux/uuid.h>
-#include <linux/fw_table.h>
 
 struct irq_domain;
 struct irq_domain_ops;
@@ -25,16 +24,6 @@ struct irq_domain_ops;
 #endif
 #include <acpi/acpi.h>
 
-#ifdef CONFIG_ACPI_TABLE_LIB
-#define EXPORT_SYMBOL_ACPI_LIB(x) EXPORT_SYMBOL_NS_GPL(x, ACPI)
-#define __init_or_acpilib
-#define __initdata_or_acpilib
-#else
-#define EXPORT_SYMBOL_ACPI_LIB(x)
-#define __init_or_acpilib __init
-#define __initdata_or_acpilib __initdata
-#endif
-
 #ifdef CONFIG_ACPI
 
 #include <linux/list.h>
@@ -48,6 +37,18 @@ struct irq_domain_ops;
 #include <acpi/acpi_io.h>
 #include <asm/acpi.h>
 
+#include <linux/fw_table.h>
+
+#ifdef CONFIG_ACPI_TABLE_LIB
+#define EXPORT_SYMBOL_ACPI_LIB(x) EXPORT_SYMBOL_NS_GPL(x, ACPI)
+#define __init_or_acpilib
+#define __initdata_or_acpilib
+#else
+#define EXPORT_SYMBOL_ACPI_LIB(x)
+#define __init_or_acpilib __init
+#define __initdata_or_acpilib __initdata
+#endif
+
 static inline acpi_handle acpi_device_handle(struct acpi_device *adev)
 {
        return adev ? adev->handle : NULL;
diff --git a/include/linux/fw_table.h b/include/linux/fw_table.h
index ff8fa58d5818..a722300c215b 100644
--- a/include/linux/fw_table.h
+++ b/include/linux/fw_table.h
@@ -26,7 +26,6 @@ struct acpi_subtable_proc {
 };
 
 #include <linux/acpi.h>
-#include <acpi/acpi.h>
 
 union acpi_subtable_headers {
        struct acpi_subtable_header common;


>> And directly including acpi/acpi.h w/o linux/acpi.h causes triggering the #error and some other stuff:
>>
>> ./include/acpi/platform/aclinux.h:18:2: error: #error "Please don't include <acpi/acpi.h> directly, include <linux/acpi.h> instead."
>>    18 | #error "Please don't include <acpi/acpi.h> directly, include <linux/acpi.h> instead."
>>       |  ^~~~~
>>
>>
>> Only including linux/acpi.h:
>> In file included from ./include/linux/acpi.h:18,
>>                  from init/main.c:30:
>> ./include/linux/fw_table.h:32:37: error: field ‘common’ has incomplete type
>>    32 |         struct acpi_subtable_header common;
>>       |                                     ^~~~~~
>> ./include/linux/fw_table.h:33:36: error: field ‘hmat’ has incomplete type
>>    33 |         struct acpi_hmat_structure hmat;
>>       |                                    ^~~~
>> ./include/linux/fw_table.h:34:40: error: field ‘prmt’ has incomplete type
>>    34 |         struct acpi_prmt_module_header prmt;
>>       |                                        ^~~~
>> ./include/linux/fw_table.h:35:33: error: field ‘cedt’ has incomplete type
>>    35 |         struct acpi_cedt_header cedt;
>>       |                                 ^~~~
>>
>>
>>>
>>> Yes, that's the problem AFAICS.  Dave?
>>>
>>> What about moving the fw_table.h include in linux/acpi.h below the
>>> mutex.h one, along with the EXPORT_SYMBOL_ACPI_LIB-related
>>> definitions?
>>
>> This builds cleanly for me.
> 
> OK, so I'm wondering if this also helps the other people in this thread.