Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 10 Jan 2023 10:29:06 -0800
From:   Dan Williams <dan.j.williams@intel.com>
To:     Bjorn Helgaas <helgaas@kernel.org>, <linux-pci@vger.kernel.org>
CC:     Dan J Williams <dan.j.williams@intel.com>,
        Kan Liang <kan.liang@linux.intel.com>,
        Tony Luck <tony.luck@intel.com>,
        David E Box <david.e.box@intel.com>,
        Yunying Sun <yunying.sun@intel.com>,
        Dave Jiang <dave.jiang@intel.com>,
        Mika Westerberg <mika.westerberg@linux.intel.com>,
        Giovanni Cabiddu <giovanni.cabiddu@intel.com>,
        Herbert Xu <herbert@gondor.apana.org.au>,
        Hans de Goede <hdegoede@redhat.com>,
        "Florent DELAHAYE" <linuxkernelml@undead.fr>,
        Konrad J Hambrick <kjhambrick@gmail.com>,
        Matt Hansen <2lprbe78@duck.com>,
        Nicholas Johnson <nicholas.johnson-opensource@outlook.com.au>,
        Benoit =?iso-8859-1?Q?Gr=E9goire?= <benoitg@coeus.ca>,
        Werner Sembach <wse@tuxedocomputers.com>,
        <mumblingdrunkard@protonmail.com>, <linux-kernel@vger.kernel.org>,
        Bjorn Helgaas <bhelgaas@google.com>
Subject: RE: [PATCH 2/2] x86/pci: Treat EfiMemoryMappedIO as reservation of
 ECAM space
Message-ID: <63bdae72740db_5178e294bd@dwillia2-xfh.jf.intel.com.notmuch>
References: <20230110180243.1590045-1-helgaas@kernel.org>
 <20230110180243.1590045-3-helgaas@kernel.org>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20230110180243.1590045-3-helgaas@kernel.org>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bzSyPGNN7FqEGdyO+vY+0l0Fzs9wb/QFpWAHlysVAQC1TZBt0VW2s0qSFPzT?=
 =?us-ascii?Q?iovChw3dgCWyQzMFS4Z5qoBDzdaaiijI2lHlDh9ePO3GQxBzGuA0x9FUbcYM?=
 =?us-ascii?Q?u0Q8KZ+6XjZrnuHS7MHB8KwCrOSvfTudy+aueaTeWaqiydV2ON05elu160h+?=
 =?us-ascii?Q?B7I2DpIHg1Y8ku8d/9AsJ0qv+md+y9neMExrm03l09LyKw+9iNbRlt5ioPlV?=
 =?us-ascii?Q?kUW23znNHe2791tlDzObFAoj8W7VpJ0itWPPUUWaLGjGciXSdR1Zfpt1XVsQ?=
 =?us-ascii?Q?Iigi4mbQDgHWef/8bjJScyBjER+kO4+qvBMGS3j6gBcRYIIZ3MEXEW+hWfqG?=
 =?us-ascii?Q?dR/zO5OJzIFI2oHzVyu3/dNSIcyLQwkPlifQqpW1IYEB4PG7M+pUD/K+2USK?=
 =?us-ascii?Q?YTlQoWGvgxS7u2edjPPz00WH7UfZBEcmm6IZimCSVvPxTsb9JybWj0yKk+yX?=
 =?us-ascii?Q?VeFlqwRkuvqhQ/dOrQl/2NXVi6n2IbExglILwKbDLT2VF6OcXvpU4qWzgQtC?=
 =?us-ascii?Q?XYSoahW882udz7V/mUmvvYHFX+Puc9on/+Jx3GaqG+GzFfRW+p8z5zkpQMD/?=
 =?us-ascii?Q?LL2VQYTr6fAjPm4vEseluN+Jeuv7/2NtP4MYjwstimE5gOwiCfX22N15L8RL?=
 =?us-ascii?Q?AUtgG+j4mC+l2U5dugcytT12ljx+7q11ITcg+2oCqeglAFiMdTQ4PJLlDZvS?=
 =?us-ascii?Q?+qY4JFeaipSdHmbwDEHLPqFP6UGfiVfKtxiHUuEClQTGRR6qnvSKDIb8sBr4?=
 =?us-ascii?Q?hYWnF1XU0YTfmiSstrbH+q/ij2UH5sp4mDqs6gMcVtcch4G6swFLmA1uIogA?=
 =?us-ascii?Q?WCZULYJHak11wy7X/2wNXlXSBM+Opk56b6xljmlj5xtRP8gKeBoYVhoWg+yl?=
 =?us-ascii?Q?6lx/s5W9W2e5SCjMXWI3JR2wn+iVBo6X9qK/pPp77UQCY1NkT19hCvgDtZKu?=
 =?us-ascii?Q?uCrJPKWCEqPt+sPZ1D7g8Zx5vCI8F2xL6dDvrq91kKZin1xf93pmdtPj9XkV?=
 =?us-ascii?Q?5TTiq1eaBERjdy9AO89YoFsSJcgoorsA+Bq4PQHAQ17TYTyes8x1TA8+gPCq?=
 =?us-ascii?Q?1DJHr2hYsyoPHnR3qXVI7SvF+CN7bW3lCcK9KDSJnLmgFBk8eN9XruoTy9On?=
 =?us-ascii?Q?jl/oz+x+tdmb2HB/dOve5Y6tvrnO9R98wOw9gySG7LK4I1Dd52NPBOLVuhJ8?=
 =?us-ascii?Q?oYZ/C03YQ0guyTHWkhRQyyumqg7XRjoqcxhVAHurXejyNGOJA+b01fd1W0S6?=
 =?us-ascii?Q?p2rFMt7WxbOlVCZETFUJNtAhQULgl2GCaZMjP47X1utmhT0HrCqkKN5CeGO2?=
 =?us-ascii?Q?rLfVHZodjCe7tQkuLpDtJ5uK5fswRJlegbBXgJ+JBxM1NpLt7ex2ara9L7IR?=
 =?us-ascii?Q?jYDwQ5a9bCXBmP4pfYjFC1QeyjHRzEly0HFYj1l1IkDmz2CkfhU5rbnDuOlV?=
 =?us-ascii?Q?vBDxhE2rDGY54X5rjND8zfa4Eb8VRMKY4/utbbqzK+vNgFgrNW3AUILxAw9w?=
 =?us-ascii?Q?zdEMNr8I0QZIBhNBx83rzJDDbR/RDVY+lVIQBMI89KP7NUxKI25XL9Uy3sUe?=
 =?us-ascii?Q?QMFmU38JyvFV/kU7qGdVFiupJH7ThTrXgiWVfa/VQEfW55+BDFepvo7f0sa/?=
 =?us-ascii?Q?Bg=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: d8456463-d7f9-4dda-ad00-08daf3389058
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2023 18:29:09.3982
 (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: NpDeB4B2Jrt4aHKLa07j5GZCjTGmY0o9rHULm9zrVvTM3vRokz9iyWfISfuOX4+Srlij/tmmI8MhCAA2Zudh0+b3ajtckagFhLtAHPdtSNs=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB6567
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
> 
> Normally we reject ECAM space unless it is reported as reserved in the E820
> table or via a PNP0C02 _CRS method (PCI Firmware, r3.3, sec 4.1.2).  This
> means PCI extended config space (offsets 0x100-0xfff) may not be accessible.
> 
> Some firmware doesn't report ECAM space via PNP0C02 _CRS methods, but does
> mention it as an EfiMemoryMappedIO region via EFI GetMemoryMap(), which is
> normally converted to an E820 entry by a bootloader or EFI stub.
> 
> 07eab0901ede ("efi/x86: Remove EfiMemoryMappedIO from E820 map"), removes
> E820 entries that correspond to EfiMemoryMappedIO regions because some
> other firmware uses EfiMemoryMappedIO for PCI host bridge windows, and the
> E820 entries prevent Linux from allocating BAR space for hot-added devices.
> 
> Allow use of ECAM for extended config space when the region is covered by
> an EfiMemoryMappedIO region, even if it's not included in E820 or PNP0C02
> _CRS.
> 
> Reported by Kan Liang, Tony Luck, and Giovanni Cabiddu.
> 
> Fixes: 07eab0901ede ("efi/x86: Remove EfiMemoryMappedIO from E820 map")
> Link: https://lore.kernel.org/r/ac2693d8-8ba3-72e0-5b66-b3ae008d539d@linux.intel.com
> Reported-by: Kan Liang <kan.liang@linux.intel.com>
> Reported-by: Tony Luck <tony.luck@intel.com>
> Reported-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
>  arch/x86/pci/mmconfig-shared.c | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
> 
> diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
> index cd16bef5f2d9..da4b6e8e9df0 100644
> --- a/arch/x86/pci/mmconfig-shared.c
> +++ b/arch/x86/pci/mmconfig-shared.c
> @@ -12,6 +12,7 @@
>   */
>  
>  #include <linux/acpi.h>
> +#include <linux/efi.h>
>  #include <linux/pci.h>
>  #include <linux/init.h>
>  #include <linux/bitmap.h>
> @@ -442,6 +443,32 @@ static bool is_acpi_reserved(u64 start, u64 end, enum e820_type not_used)
>  	return mcfg_res.flags;
>  }
>  
> +static bool is_efi_mmio(u64 start, u64 end, enum e820_type not_used)
> +{
> +#ifdef CONFIG_EFI
> +	efi_memory_desc_t *md;
> +	u64 size, mmio_start, mmio_end;
> +
> +	for_each_efi_memory_desc(md) {
> +		if (md->type == EFI_MEMORY_MAPPED_IO) {
> +			size = md->num_pages << EFI_PAGE_SHIFT;
> +			mmio_start = md->phys_addr;
> +			mmio_end = mmio_start + size;
> +
> +			/*
> +			 * N.B. Caller supplies (start, start + size),
> +			 * so to match, mmio_end is the first address
> +			 * *past* the EFI_MEMORY_MAPPED_IO area.
> +			 */
> +			if (mmio_start <= start && end <= mmio_end)
> +				return true;
> +		}
> +	}
> +#endif

Perhaps the following trick (compile tested), but either way:

Reviewed-by: Dan Williams <dan.j.williams@intel.com>


diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index da4b6e8e9df0..ae95d1b073c6 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -445,7 +445,6 @@ static bool is_acpi_reserved(u64 start, u64 end, enum e820_type not_used)
 
 static bool is_efi_mmio(u64 start, u64 end, enum e820_type not_used)
 {
-#ifdef CONFIG_EFI
 	efi_memory_desc_t *md;
 	u64 size, mmio_start, mmio_end;
 
@@ -464,7 +463,6 @@ static bool is_efi_mmio(u64 start, u64 end, enum e820_type not_used)
 				return true;
 		}
 	}
-#endif
 
 	return false;
 }
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 4b27519143f5..3ab0c255b791 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -790,8 +790,12 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
  *
  * Once the loop finishes @md must not be accessed.
  */
+#ifdef CONFIG_EFI
 #define for_each_efi_memory_desc(md) \
 	for_each_efi_memory_desc_in_map(&efi.memmap, md)
+#else
+#define for_each_efi_memory_desc(md) for (; 0;)
+#endif
 
 /*
  * Format an EFI memory descriptor's type and attributes to a user-provided