Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
Message-ID: <b2142a10-ba84-4a5e-aaae-a8b8cb036d7a@amd.com>
Date:   Thu, 5 Oct 2023 20:23:44 -0500
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: build failure after merge of the pci tree
Content-Language: en-US
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Bjorn Helgaas <bhelgaas@google.com>,
        Lorenzo Pieralisi <lpieralisi@kernel.org>,
        =?UTF-8?Q?Krzysztof_Wilczy=C5=84ski?= <kw@linux.com>,
        Lukas Wunner <lukas@wunner.de>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20231006115604.42971aa0@canb.auug.org.au>
From:   Mario Limonciello <mario.limonciello@amd.com>
In-Reply-To: <20231006115604.42971aa0@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?M0RhL3dnNHIwSW94VGRhenQ2NE83cHZwdVAzNG1aR0JnQ210SUY4U3FaNmNL?=
 =?utf-8?B?eHdCUVVrWWpucWxEWWxxU1M5RU1NSGtCNHE2d2NCV1JvdmxVSTh4NUNLZDZv?=
 =?utf-8?B?b2x4OHQ5ZU85d0x0dEJUTDJLUkh3ZUUyVHdIbW9nQ1hzdEFrUGRwYk9nNGpu?=
 =?utf-8?B?NVgrYXpzR3o3RVBrRzdLOHpQVFRrdFVmUitFRWEwMXNYdmR0Z2tkdVhySTll?=
 =?utf-8?B?RC81RWZVZzFhcEZjTWMyUGhnYUVva0FvRkQ0QkpVeGVqTlY0ZzNFRXBjb05E?=
 =?utf-8?B?S2s4VXpwT08rUllVMVIxQ3cvc3lpMUthVzVMcUo0NWFLMUU4WHJQbFF6QzJh?=
 =?utf-8?B?aW9XT3hmTWJYU2o4c3NETnRPT2doa3VnRWkwVnRFa0F1cDVtNExCQmFkS01L?=
 =?utf-8?B?ekZxRzZDYUZnT0FDM2NnSHhYZ250YWRXdXVjRjRXenZZZ2NseWxVUFVrOVhs?=
 =?utf-8?B?amVVODBWd2JvUDhZZy9oZ20wMEFJREMwclBqeVlVQmhTRko2bGlrN01yWmw5?=
 =?utf-8?B?S2krelhFR1FXR0xlV09HaHp4UEs4d2FoRzlnK2RpNnRTWTZaVjFzUWU0YVli?=
 =?utf-8?B?ejBKL2ZWcUQ0SWpGY3dIakxyOHhzczdqT1I0REFRcTMrdHlJK21rTFRUcCt4?=
 =?utf-8?B?Q2x6eklRamgzL1FmRzgwUFZMQ2p4SkhUYkdmdDd2a2dRdWJIRkJZdEdubFZN?=
 =?utf-8?B?RDBTYUtwV09lWVBYL2xodHBubXZoM3g2NDAwc210dEoyT0ZiQjJEZFdjNnlj?=
 =?utf-8?B?UkNzbEVXNXJQK1lIOXlCRGthbU9hNHRGUVIvMTZYNi9ZMGlySGhJUnMvSlFF?=
 =?utf-8?B?Y1VsZ0hKMkxoTnY2Wk45cm5WVWd6K3VuN3V0WmFyTURXb21Hb3lMUU1OSmxv?=
 =?utf-8?B?cVpMVVNweFlDMkl2NWdGRzJrcW1waStDQnlHK1RLdVlaQ3NSdzNXVU5naFoy?=
 =?utf-8?B?aE9mR3oxQ1hQSThpM3NCZkgzVUFnYUNxeVRGcGV1MHNaaVBPQmxOb05tUEdj?=
 =?utf-8?B?S3VZYWYxRnF0c1NjTnh3d21WZTVscTI0dDU1WTlGUUxqUDRtU0J0Z21DeGhu?=
 =?utf-8?B?RnU4aUdEblQ1V1dQMVhObDZ4ZGxzR3JlaEcyQXMrWVN0YlJWTm5zaVc4eEhK?=
 =?utf-8?B?R2Q0VnRGVWJ1ejFDN1Y5cXlkUnE2MUtaWEpxeHo4aW1pRnFhaDhrWlNWbnpp?=
 =?utf-8?B?T3RQMDBwaGNyUVBmN211bTd6UjIvamJGRGlTZHR5WElpaUp3U2Yxb0NLeTVj?=
 =?utf-8?B?Tnl6RU1kTkIwdmMvK2diK2ZYNUVIdklUSGxNWWFmb3dLbGREVU9rYmlySHU4?=
 =?utf-8?B?alpRZUFHL0VOOVp3dFpjS1RXU1c5ck5tLzhyR3c4czk3V1JGdjl2UlYyNEtw?=
 =?utf-8?B?T3ZMZWNLS1ZKOU8xNUV2QWxuOWZzeHdQeEtXTlV0M2R1cGY2Z1EvbUlDdFhZ?=
 =?utf-8?B?N2ZyNnE5NDNaWHBlWEVoRlBwNGtwVWFUdW8xRVVYMzNKMDZzVnZQVXZyaVpx?=
 =?utf-8?B?UGREcDkrK0VSck9SbXcrRnY3N3JiTlBpNDMvQThUTE9ZMHM0Q3RZY0pRcDJn?=
 =?utf-8?B?amNBR24xMC9jems1MVlZdU1iZnJQVHhQNStURkhmNWRoMk9rMU9leGFwVlRG?=
 =?utf-8?B?MW5CSjQyWGdkY3pycVVYRnA1M1g5ckpOS0NkV3hzL1VJaHA3MUZrdU9UblpJ?=
 =?utf-8?B?REZTdncyVDRHdWdqTkI3MGtIZlFzZmJnZzk5K0hyRVhGZFdDUHJ2MzVZQzhk?=
 =?utf-8?B?YzhQZThCZ2NWeEdLcTdxTGEzNmFveW1wMWpiWmM2eHFzOTBhRk9EOXhNUUN3?=
 =?utf-8?B?U292bUxNV2pwbWNialZ4SUJRMEZSMTRDdENZZzJxWUt0YktwRTN1bVliZmc4?=
 =?utf-8?B?NG9RMzdIR3VhLzJkRjZCRUR0cFIwdVBuTUtoekZsM1haNHBBbGJpcmQ2NHdY?=
 =?utf-8?B?blFsK2M4d1dIcWpZc05Dd2tVaDFkWmR2TjMvUzhOZFZ5M0V4cjFiemNPaTlE?=
 =?utf-8?B?YlZtZ0V5a3pNY1VRUE9UUXI4N2xlT1hsblJPU3pUc1BFSVpUTTZpeDNPVEh4?=
 =?utf-8?B?a0JBUlFwcmlab3FYeUppR0xnS3VDOXJYNktRZzl4d0tObG9sVGQ3dUpaUjdK?=
 =?utf-8?Q?G8vCVmhxipnKlKZrwMwbZIPHl?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 335c7e10-ec5d-49f3-dea7-08dbc60ae3d3
X-MS-Exchange-CrossTenant-AuthSource: MN0PR12MB6101.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2023 01:23:47.9006
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: UNTV0g/qpVoI07eAgF6EcaRnELgk3pEiNkZKzSyrEjw/SCuiLI7UAxGXrOLaPD26KpDyFxdjqW0hgLJ0RZFZUw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9408
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 autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.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 (lipwig.vger.email [0.0.0.0]); Thu, 05 Oct 2023 18:24:07 -0700 (PDT)

On 10/5/2023 19:56, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> arch/x86/pci/fixup.c: In function 'amd_rp_pme_suspend':
> arch/x86/pci/fixup.c:929:13: error: 'pm_suspend_target_state' undeclared (first use in this function)
>    929 |         if (pm_suspend_target_state == PM_SUSPEND_ON)
>        |             ^~~~~~~~~~~~~~~~~~~~~~~
> arch/x86/pci/fixup.c:929:13: note: each undeclared identifier is reported only once for each function it appears in
> arch/x86/pci/fixup.c:929:40: error: 'PM_SUSPEND_ON' undeclared (first use in this function); did you mean 'RPM_SUSPENDING'?
>    929 |         if (pm_suspend_target_state == PM_SUSPEND_ON)
>        |                                        ^~~~~~~~~~~~~
>        |                                        RPM_SUSPENDING
> arch/x86/pci/fixup.c: In function 'amd_rp_pme_resume':
> arch/x86/pci/fixup.c:951:27: error: implicit declaration of function 'FIELD_GET' [-Werror=implicit-function-declaration]
>    951 |         rp->pme_support = FIELD_GET(PCI_PM_CAP_PME_MASK, pmc);
>        |                           ^~~~~~~~~
> 
> Caused by commit
> 
>    624306d2c241 ("x86/PCI: Avoid PME from D3hot/D3cold for AMD Rembrandt and Phoenix USB4")
> 
> I have used the pci tree from next-20231005 for today.
> 

It happened because of a last minute decision to move to 
arch/x86/pci/fixup.c from drivers/pci/quirks.c when Bjorn committed it.

Here's the fix for it:

diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index ee0509eb8674..f347c20247d3 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -3,9 +3,11 @@
   * Exceptions for specific devices. Usually work-arounds for fatal 
design flaws.
   */

+#include <linux/bitfield.h>
  #include <linux/delay.h>
  #include <linux/dmi.h>
  #include <linux/pci.h>
+#include <linux/suspend.h>
  #include <linux/vgaarb.h>
  #include <asm/amd_nb.h>
  #include <asm/hpet.h>