From nobody Mon Sep 15 21:18:19 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BAC1BC678DA for ; Tue, 10 Jan 2023 18:05:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238785AbjAJSFk (ORCPT ); Tue, 10 Jan 2023 13:05:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238763AbjAJSEt (ORCPT ); Tue, 10 Jan 2023 13:04:49 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37A8085C89; Tue, 10 Jan 2023 10:02:57 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E340AB81903; Tue, 10 Jan 2023 18:02:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E8EAC433EF; Tue, 10 Jan 2023 18:02:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673373774; bh=YIJe4Sbi90ZM5MZspqHWq3/zFAVIJE3Xh1CUKfmBVlA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JU9RwYbn8DPJol5KQGf8epu5BTm/Kx3sREhzcYfXoT/QNOm2kNElrMgQKTRQq9BFA uC/u812UPJlCmqPUGWctbVQFdRgZOwHn59pEQYeln4Ho8WbFBLu+L0j+NRHJ7JbgoH 5NIIJ0Vpe7YV6HXXh16JW/F/QBg82oZwcCpNguxPm7i/yrvu1o4mJteZ7E8nNrdr8b BeeIBTpq5a+VM0F3Dv79z+MEMGOnHWQkqbVhexd8NdtqsFN1d/vl6n/9aCVpsmfcod BKoQc3gXUIMJt7P0fbVPJkw0XibgNsdSiaAyR6lOCk37K08fs2YmYXjJgvM2QC0Wg1 9kYi8sKlrbYug== From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: Dan J Williams , Kan Liang , Tony Luck , David E Box , Yunying Sun , Dave Jiang , Mika Westerberg , Giovanni Cabiddu , Herbert Xu , Hans de Goede , Florent DELAHAYE , Konrad J Hambrick , Matt Hansen <2lprbe78@duck.com>, Nicholas Johnson , =?UTF-8?q?Benoit=20Gr=C3=A9goire?= , Werner Sembach , mumblingdrunkard@protonmail.com, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 1/2] x86/pci: Simplify is_mmconf_reserved() messages Date: Tue, 10 Jan 2023 12:02:42 -0600 Message-Id: <20230110180243.1590045-2-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230110180243.1590045-1-helgaas@kernel.org> References: <20230110180243.1590045-1-helgaas@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bjorn Helgaas is_mmconf_reserved() takes a "with_e820" parameter that only determines the message logged if it finds the MMCONFIG region is reserved. Pass the message directly, which will simplify a future patch that adds a new way of looking for that reservation. No functional change intended. Signed-off-by: Bjorn Helgaas Reviewed-by: Dan Williams --- arch/x86/pci/mmconfig-shared.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index 758cbfe55daa..cd16bef5f2d9 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c @@ -446,13 +446,12 @@ typedef bool (*check_reserved_t)(u64 start, u64 end, = enum e820_type type); =20 static bool __ref is_mmconf_reserved(check_reserved_t is_reserved, struct pci_mmcfg_region *cfg, - struct device *dev, int with_e820) + struct device *dev, char *method) { u64 addr =3D cfg->res.start; u64 size =3D resource_size(&cfg->res); u64 old_size =3D size; int num_buses; - char *method =3D with_e820 ? "E820" : "ACPI motherboard resources"; =20 while (!is_reserved(addr, addr + size, E820_TYPE_RESERVED)) { size >>=3D 1; @@ -464,10 +463,10 @@ static bool __ref is_mmconf_reserved(check_reserved_t= is_reserved, return false; =20 if (dev) - dev_info(dev, "MMCONFIG at %pR reserved in %s\n", + dev_info(dev, "MMCONFIG at %pR reserved as %s\n", &cfg->res, method); else - pr_info(PREFIX "MMCONFIG at %pR reserved in %s\n", + pr_info(PREFIX "MMCONFIG at %pR reserved as %s\n", &cfg->res, method); =20 if (old_size !=3D size) { @@ -500,7 +499,8 @@ static bool __ref pci_mmcfg_check_reserved(struct device *dev, struct pci_mmcfg_region *cfg,= int early) { if (!early && !acpi_disabled) { - if (is_mmconf_reserved(is_acpi_reserved, cfg, dev, 0)) + if (is_mmconf_reserved(is_acpi_reserved, cfg, dev, + "ACPI motherboard resource")) return true; =20 if (dev) @@ -527,7 +527,8 @@ pci_mmcfg_check_reserved(struct device *dev, struct pci= _mmcfg_region *cfg, int e /* Don't try to do this check unless configuration type 1 is available. how about type 2 ?*/ if (raw_pci_ops) - return is_mmconf_reserved(e820__mapped_all, cfg, dev, 1); + return is_mmconf_reserved(e820__mapped_all, cfg, dev, + "E820 entry"); =20 return false; } --=20 2.25.1