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: <1a52cedc-ca72-4237-b038-f0cfd0db8b29@intel.com>
Date:   Wed, 22 Nov 2023 08:29:21 -0700
User-Agent: Betterbird (Linux)
Subject: Re: [PATCH v2] acpi: Fix ARM32 platforms compile issue introduced by
 fw_table changes
To:     "Rafael J. Wysocki" <rafael@kernel.org>
CC:     <linus.walleij@linaro.org>,
        "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
        <lenb@kernel.org>, <robert.moore@intel.com>,
        <Jonathan.Cameron@huawei.com>, <dan.j.williams@intel.com>,
        <guohanjun@huawei.com>, <arnd@arndb.de>,
        <linux-acpi@vger.kernel.org>, <acpica-devel@lists.linux.dev>,
        <linux-kernel@vger.kernel.org>,
        <linux-arm-kernel@lists.infradead.org>, <cfsworks@gmail.com>
References: <170060515641.2447486.11798332619205301829.stgit@djiang5-mobl3>
 <CAJZ5v0hkGfqzHwmhBKqwhcEchncM6kEgx_TJgJGgjiR5yMZkLg@mail.gmail.com>
Content-Language: en-US
From:   Dave Jiang <dave.jiang@intel.com>
In-Reply-To: <CAJZ5v0hkGfqzHwmhBKqwhcEchncM6kEgx_TJgJGgjiR5yMZkLg@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?Sm93L2xrYWEzWlNadUY3WU5SY21HQTFOWXFSWlBFeFpTUnllYzZycE9SQlYy?=
 =?utf-8?B?V01WQmxiSjlkVUZsT1BuazA0cUtyY3NaeWRvRTZRd1d5WEZHODRXQWhrM1or?=
 =?utf-8?B?MzdISWF5dzd6ZmlIbjkzd2JVK1FLakowK1M0VU1QUExlREJHN1JISFdBVnU2?=
 =?utf-8?B?UlNmMG9uUXZ0amxLMnlEbzJIYjJGb0JsalZPTE1wcEg2T3RHWUR5aXU2RStS?=
 =?utf-8?B?eHJiaTcrYWdjRk9aYWYwbGdaWkdmSGhEN0E4VDl4U1dZRk5XeW9GL0MvRWR3?=
 =?utf-8?B?THFVR0VXUWVIRlNQdEllZ0tiZVBkMFQzV0lFTVhHV2tOd2k5UkU4U1daZkJ0?=
 =?utf-8?B?ZllpVUQ3U2Q2SEhtZHllSW1FeEtPVHMxNFdtT29xRXlMK21ZaVV6dzhYbWNy?=
 =?utf-8?B?WmpKdGhLRXpQb1JOa3J4a1d3ajB2S3NXZWNsYWNCaXEzN2JJR3FUM0V5SWp5?=
 =?utf-8?B?MlI4UVc1TU1jcG9KUEI4bHdWajNSanMrZE10OENtN0VYVlBBektuOVVMVUVS?=
 =?utf-8?B?aGxZRXpwMTFScmVJTTZSaGxleGZOWFBtQk43Qm1QcFdiZ2E4T2Q2TjlheDB2?=
 =?utf-8?B?ZGhNVjdmdWFOb2puQlRnWXYzenF3WFY0UnR3c2Zwd3pkVlFsK2w5c1pXS0Vh?=
 =?utf-8?B?MEllMW9XWUZRNWlNUXVLQ2puT1JlVVZGbzJDZjk5WncyTzFBMzhIY0ovV3dr?=
 =?utf-8?B?QVkrdXV3T243TS9aTFAxUm1xSDF2TldKUlJ6LzdPS0VrTlE5TUpSME1HRm1U?=
 =?utf-8?B?MDRReEZ0YTNTcjJ1a1hobHJOOSs1TjUxeWROV0RxVWs2RS91SERYWXJJMTdD?=
 =?utf-8?B?VVNFQXJHTEJmZ2p1cUJwZmV6c0RJQlZOYWJ4YlEreTRoRDFTQW96MC82OFR5?=
 =?utf-8?B?RVRIblh3UGIrSVpCRXJQSTE3S0lBRzJMUjlwbExrRkhvTENjaFp4WnN2a2Mv?=
 =?utf-8?B?TS8xMVpsaFR1cmF3THZXQU54dzVhMmxHN0J6WkxIbFRtcTUzdkFmTWpHZnFU?=
 =?utf-8?B?VUlEYnM0YTRvL0piMWo4cUNUbkh4bmxlWWtTbzlFWWlwQXFDem02ck01b1Ji?=
 =?utf-8?B?OGZNbzVJd0p0d3BlVGljNzBTd21vdjkvc1ZSQ3IzNCtrTkFoaFlLdzNvZkxV?=
 =?utf-8?B?VG45dXF3U2tjLzZYbXp1aGhpMU5UeWdJc1JrZ2FhQVRTSkt4cFBWYmRlcWxl?=
 =?utf-8?B?RUF0a2xWd3AwazFCWS81alRCcFlBa3dWaEppWnliUzI4RlhnYk9YNTM4U2Na?=
 =?utf-8?B?TEMzb2FPNkw0ZmFSYmYybTYrSVhCVFZoYzFjckZ6Y1ZTOTMzbHdiWDBiU2ZP?=
 =?utf-8?B?dTI2eVJtSnQ1VkNTSm4wT2QvdWxuNm5KeXNNSk9ReDVvTklkQ2szS1VQSktC?=
 =?utf-8?B?b1ZEWndEa3RSUWd4V1V5QkcxTjlwWitvOFNEdVd3M0lFZVhzaXRFMzNLY1dm?=
 =?utf-8?B?Vlp2aHQ2bU5KQVMvZWtNbmYwenp0TDVhSGlEN3VGdXBZQS9BWXR1V2Nndzdy?=
 =?utf-8?B?L2RsaGwxdDNvU3hrcFJ4ajE0bm1YbmVvbmtjSXE2WkV3NzhscDYrYjhCK1VX?=
 =?utf-8?B?R1JsYjF4QVE4RE5HV2VJVUNuTE0yQVBQN2FrM3MvSTdVelFEdjQrU29lM1Rx?=
 =?utf-8?B?Tm55QVU0ak5yMFlQSFFFT1p4VGVIVVFvcjF2MWMyd1FaTEN1eTRIeHgwSTUz?=
 =?utf-8?B?dHkrVWpEa2hLQkdQTyt6TmhwWloxSTlxWmQwaEpScTgxbkhMek5odnJzNnZP?=
 =?utf-8?B?QndnaUxFWTFvRHVXMTgrYW5QTjYzdTJqaUhLRHN4djYrRktwa1JxVUxrOVJE?=
 =?utf-8?B?QkJlOHpmUWVSbmIxTTkwellxdTdmMnlGdEtOQnRZb3BxR3JnVGtTSXg0K05H?=
 =?utf-8?B?M0xJYSt6bU1kUU1JbmszNW9VWHpETi80S3M2UW96T3dEM1Q4b045RlpESlRZ?=
 =?utf-8?B?WjNtS2dGeVRWWnZhRTJ6Q1g3VERXYzRkL1pwamxCMFpjQWV4ZzFiK2N1cFBa?=
 =?utf-8?B?alpKTWFURnA0VEdiU2MzWjJyVjVSQkx6L1ZQQ1dVRVk1SkNzNWVwTkE5NFFQ?=
 =?utf-8?B?NHp2T29oenBxVk9VdE8vemlBYlZUTnBNeE5Ydktwd2VxMnFOZDlkb2JMRzBn?=
 =?utf-8?Q?mbZTWNO82LC1gHUCoff1FjAP/?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 79440ab2-7320-455e-3741-08dbeb6fcf21
X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB5984.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2023 15:29:25.3579
 (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: 8wZsQw3A9kQGwC8CfbARan73ZYG1Y8hDmygHLbp14aWGCvZswOBJicfdq4u6r4QXgX7AnX8uZiKzitarxeOBCg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB8472
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]); Wed, 22 Nov 2023 07:29:46 -0800 (PST)


On 11/22/23 06:14, Rafael J. Wysocki wrote:
> On Tue, Nov 21, 2023 at 11:19 PM Dave Jiang <dave.jiang@intel.com> wrote:
>>
>> Linus reported that:
>> 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__.
>>
>> This is because the header <acpi/platform/acenv.h> is now
>> in the include path for <linux/irq.h>:
>>
>>   CC      arch/arm/kernel/irq.o
>>   CC      kernel/sysctl.o
>>   CC      crypto/api.o
>> In file included from ../include/acpi/acpi.h:22,
>>                  from ../include/linux/fw_table.h:29,
>>                  from ../include/linux/acpi.h:18,
>>                  from ../include/linux/irqchip.h:14,
>>                  from ../arch/arm/kernel/irq.c:25:
>> ../include/acpi/platform/acenv.h:218:2: error: #error Unknown target environment
>>   218 | #error Unknown target environment
>>       |  ^~~~~
>>
>> The issue is caused by the introducing of splitting out the ACPI code to
>> support the new generic fw_table code.
>>
>> Rafael suggested [1] moving the fw_table.h include in linux/acpi.h to below
>> the linux/mutex.h. Remove the two includes in fw_table.h. Add include of
>> linux/acpi.h in fw_table.c before the fw_table.h include.
>>
>> Link: https://lore.kernel.org/linux-acpi/CAJZ5v0idWdJq3JSqQWLG5q+b+b=zkEdWR55rGYEoxh7R6N8kFQ@mail.gmail.com/
>> Fixes: a103f46633fd ("acpi: Move common tables helper functions to common lib")
>> Reported-by: Linus Walleij <linus.walleij@linaro.org>
>> Suggested-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>> Signed-off-by: Dave Jiang <dave.jiang@intel.com>
>> ---
>> v2:
>> - Remove linux/acpi.h include as well in fw_table.h. (Sam)
>> ---
>>  include/linux/acpi.h     |   22 +++++++++++-----------
>>  include/linux/fw_table.h |    3 ---
>>  lib/fw_table.c           |    1 +
>>  3 files changed, 12 insertions(+), 14 deletions(-)
>>
>> diff --git a/include/linux/acpi.h b/include/linux/acpi.h
>> index 54189e0e5f41..4db54e928b36 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,22 +24,13 @@ 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>
>>  #include <linux/dynamic_debug.h>
>>  #include <linux/module.h>
>>  #include <linux/mutex.h>
>> +#include <linux/fw_table.h>
>>
>>  #include <acpi/acpi_bus.h>
>>  #include <acpi/acpi_drivers.h>
>> @@ -48,6 +38,16 @@ struct irq_domain_ops;
>>  #include <acpi/acpi_io.h>
>>  #include <asm/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
>> +
>>  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..ca49947f0a77 100644
>> --- a/include/linux/fw_table.h
>> +++ b/include/linux/fw_table.h
>> @@ -25,9 +25,6 @@ struct acpi_subtable_proc {
>>         int count;
>>  };
>>
>> -#include <linux/acpi.h>
>> -#include <acpi/acpi.h>
>> -
>>  union acpi_subtable_headers {
>>         struct acpi_subtable_header common;
>>         struct acpi_hmat_structure hmat;
>> diff --git a/lib/fw_table.c b/lib/fw_table.c
>> index b51f30a28e47..c4831f3378be 100644
>> --- a/lib/fw_table.c
>> +++ b/lib/fw_table.c
>> @@ -7,6 +7,7 @@
>>   *  Copyright (C) 2023 Intel Corp.
>>   */
>>  #include <linux/errno.h>
>> +#include <linux/acpi.h>
>>  #include <linux/fw_table.h>
> 
> Because fw_table.h is included via acpi.h, do you still need to
> include it directly here?

No. I'll drop.

> 
>>  #include <linux/init.h>
>>  #include <linux/kernel.h>
>>
>>
>>