From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95C7DC433E1 for ; Wed, 26 Aug 2020 02:53:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7478920737 for ; Wed, 26 Aug 2020 02:53:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726779AbgHZCxu (ORCPT ); Tue, 25 Aug 2020 22:53:50 -0400 Received: from mga05.intel.com ([192.55.52.43]:43725 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726793AbgHZCxt (ORCPT ); Tue, 25 Aug 2020 22:53:49 -0400 IronPort-SDR: ZWSpoXqefCkNCqaIOIFdmIgf8mF4XCYiKcr8i1yAYe9p6+C4j3++73BLdy0i56Vy6t/XOhaBWk jW+v9cJxL1NA== X-IronPort-AV: E=McAfee;i="6000,8403,9724"; a="241042622" X-IronPort-AV: E=Sophos;i="5.76,354,1592895600"; d="scan'208";a="241042622" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Aug 2020 19:53:42 -0700 IronPort-SDR: 3jHNgUz/QtngVIFtUyejaI2JwGGqvmSLiE81xtG4juH9HB0EVbULMEy6+CoSS5E4jNaKDAK7uJ CBcTpkXNiFOg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,354,1592895600"; d="scan'208";a="323019916" Received: from allen-box.sh.intel.com (HELO [10.239.159.139]) ([10.239.159.139]) by fmsmga004.fm.intel.com with ESMTP; 25 Aug 2020 19:53:39 -0700 Cc: baolu.lu@linux.intel.com, CobeChen-oc@zhaoxin.com, RaymondPang-oc@zhaoxin.com Subject: Re: [PATCH] iommu/vt-d:Add support for detecting ACPI device in RMRR To: FelixCuioc , Joerg Roedel , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, David Woodhouse References: <20200818024441.2317-1-FelixCui-oc@zhaoxin.com> From: Lu Baolu Message-ID: <1d0d696a-8459-24f9-355d-63dc114dc008@linux.intel.com> Date: Wed, 26 Aug 2020 10:48:11 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200818024441.2317-1-FelixCui-oc@zhaoxin.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Felix, On 8/18/20 10:44 AM, FelixCuioc wrote: > Some ACPI devices need to issue dma requests to access > the reserved memory area.BIOS uses the device scope type > ACPI_NAMESPACE_DEVICE in RMRR to report these ACPI devices. > This patch add support for detecting ACPI devices in RMRR. > If you are willing to submit a new version of this series, can you please add the version tag (commit title) and a change log (under the tear line)? Best regards, baolu > Signed-off-by: FelixCuioc > --- > drivers/iommu/intel/dmar.c | 74 ++++++++++++++++++++----------------- > drivers/iommu/intel/iommu.c | 22 ++++++++++- > include/linux/dmar.h | 12 +++++- > 3 files changed, 72 insertions(+), 36 deletions(-) > > diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c > index 93e6345f3414..024ca38dba12 100644 > --- a/drivers/iommu/intel/dmar.c > +++ b/drivers/iommu/intel/dmar.c > @@ -215,7 +215,7 @@ static bool dmar_match_pci_path(struct dmar_pci_notify_info *info, int bus, > } > > /* Return: > 0 if match found, 0 if no match found, < 0 if error happens */ > -int dmar_insert_dev_scope(struct dmar_pci_notify_info *info, > +int dmar_pci_insert_dev_scope(struct dmar_pci_notify_info *info, > void *start, void*end, u16 segment, > struct dmar_dev_scope *devices, > int devices_cnt) > @@ -304,7 +304,7 @@ static int dmar_pci_bus_add_dev(struct dmar_pci_notify_info *info) > > drhd = container_of(dmaru->hdr, > struct acpi_dmar_hardware_unit, header); > - ret = dmar_insert_dev_scope(info, (void *)(drhd + 1), > + ret = dmar_pci_insert_dev_scope(info, (void *)(drhd + 1), > ((void *)drhd) + drhd->header.length, > dmaru->segment, > dmaru->devices, dmaru->devices_cnt); > @@ -696,48 +696,56 @@ dmar_find_matched_drhd_unit(struct pci_dev *dev) > > return dmaru; > } > - > -static void __init dmar_acpi_insert_dev_scope(u8 device_number, > - struct acpi_device *adev) > +int dmar_acpi_insert_dev_scope(u8 device_number, > + struct acpi_device *adev, > + void *start, void *end, > + struct dmar_dev_scope *devices, > + int devices_cnt) > { > - struct dmar_drhd_unit *dmaru; > - struct acpi_dmar_hardware_unit *drhd; > struct acpi_dmar_device_scope *scope; > struct device *tmp; > int i; > struct acpi_dmar_pci_path *path; > > + for (; start < end; start += scope->length) { > + scope = start; > + if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_NAMESPACE) > + continue; > + if (scope->enumeration_id != device_number) > + continue; > + path = (void *)(scope + 1); > + for_each_dev_scope(devices, devices_cnt, i, tmp) > + if (tmp == NULL) { > + devices[i].bus = scope->bus; > + devices[i].devfn = PCI_DEVFN(path->device, path->function); > + rcu_assign_pointer(devices[i].dev, > + get_device(&adev->dev)); > + return 1; > + } > + WARN_ON(i >= devices_cnt); > + } > + return 0; > +} > +static int dmar_acpi_bus_add_dev(u8 device_number, struct acpi_device *adev) > +{ > + struct dmar_drhd_unit *dmaru; > + struct acpi_dmar_hardware_unit *drhd; > + int ret = 0; > + > for_each_drhd_unit(dmaru) { > drhd = container_of(dmaru->hdr, > struct acpi_dmar_hardware_unit, > header); > + ret = dmar_acpi_insert_dev_scope(device_number, adev, (void *)(drhd+1), > + ((void *)drhd)+drhd->header.length, > + dmaru->devices, dmaru->devices_cnt); > + if (ret) > + break; > + } > + ret = dmar_rmrr_add_acpi_dev(device_number, adev); > > - for (scope = (void *)(drhd + 1); > - (unsigned long)scope < ((unsigned long)drhd) + drhd->header.length; > - scope = ((void *)scope) + scope->length) { > - if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_NAMESPACE) > - continue; > - if (scope->enumeration_id != device_number) > - continue; > + return ret; > > - path = (void *)(scope + 1); > - pr_info("ACPI device \"%s\" under DMAR at %llx as %02x:%02x.%d\n", > - dev_name(&adev->dev), dmaru->reg_base_addr, > - scope->bus, path->device, path->function); > - for_each_dev_scope(dmaru->devices, dmaru->devices_cnt, i, tmp) > - if (tmp == NULL) { > - dmaru->devices[i].bus = scope->bus; > - dmaru->devices[i].devfn = PCI_DEVFN(path->device, > - path->function); > - rcu_assign_pointer(dmaru->devices[i].dev, > - get_device(&adev->dev)); > - return; > - } > - BUG_ON(i >= dmaru->devices_cnt); > - } > - } > - pr_warn("No IOMMU scope found for ANDD enumeration ID %d (%s)\n", > - device_number, dev_name(&adev->dev)); > } > > static int __init dmar_acpi_dev_scope_init(void) > @@ -766,7 +774,7 @@ static int __init dmar_acpi_dev_scope_init(void) > andd->device_name); > continue; > } > - dmar_acpi_insert_dev_scope(andd->device_number, adev); > + dmar_acpi_bus_add_dev(andd->device_number, adev); > } > } > return 0; > diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c > index ca557d351518..f774ef63d473 100644 > --- a/drivers/iommu/intel/iommu.c > +++ b/drivers/iommu/intel/iommu.c > @@ -4507,6 +4507,24 @@ int dmar_find_matched_atsr_unit(struct pci_dev *dev) > > return ret; > } > +int dmar_rmrr_add_acpi_dev(u8 device_number, struct acpi_device *adev) > +{ > + int ret; > + struct dmar_rmrr_unit *rmrru; > + struct acpi_dmar_reserved_memory *rmrr; > + > + list_for_each_entry(rmrru, &dmar_rmrr_units, list) { > + rmrr = container_of(rmrru->hdr, > + struct acpi_dmar_reserved_memory, > + header); > + ret = dmar_acpi_insert_dev_scope(device_number, adev, (void *)(rmrr + 1), > + ((void *)rmrr) + rmrr->header.length, > + rmrru->devices, rmrru->devices_cnt); > + if (ret) > + break; > + } > + return 0; > +} > > int dmar_iommu_notify_scope_dev(struct dmar_pci_notify_info *info) > { > @@ -4523,7 +4541,7 @@ int dmar_iommu_notify_scope_dev(struct dmar_pci_notify_info *info) > rmrr = container_of(rmrru->hdr, > struct acpi_dmar_reserved_memory, header); > if (info->event == BUS_NOTIFY_ADD_DEVICE) { > - ret = dmar_insert_dev_scope(info, (void *)(rmrr + 1), > + ret = dmar_pci_insert_dev_scope(info, (void *)(rmrr + 1), > ((void *)rmrr) + rmrr->header.length, > rmrr->segment, rmrru->devices, > rmrru->devices_cnt); > @@ -4541,7 +4559,7 @@ int dmar_iommu_notify_scope_dev(struct dmar_pci_notify_info *info) > > atsr = container_of(atsru->hdr, struct acpi_dmar_atsr, header); > if (info->event == BUS_NOTIFY_ADD_DEVICE) { > - ret = dmar_insert_dev_scope(info, (void *)(atsr + 1), > + ret = dmar_pci_insert_dev_scope(info, (void *)(atsr + 1), > (void *)atsr + atsr->header.length, > atsr->segment, atsru->devices, > atsru->devices_cnt); > diff --git a/include/linux/dmar.h b/include/linux/dmar.h > index 65565820328a..881ac61a4336 100644 > --- a/include/linux/dmar.h > +++ b/include/linux/dmar.h > @@ -113,10 +113,14 @@ extern int dmar_parse_dev_scope(void *start, void *end, int *cnt, > struct dmar_dev_scope **devices, u16 segment); > extern void *dmar_alloc_dev_scope(void *start, void *end, int *cnt); > extern void dmar_free_dev_scope(struct dmar_dev_scope **devices, int *cnt); > -extern int dmar_insert_dev_scope(struct dmar_pci_notify_info *info, > +extern int dmar_pci_insert_dev_scope(struct dmar_pci_notify_info *info, > void *start, void*end, u16 segment, > struct dmar_dev_scope *devices, > int devices_cnt); > +extern int dmar_acpi_insert_dev_scope(u8 device_number, > + struct acpi_device *adev, void *start, void *end, > + struct dmar_dev_scope *devices, int devices_cnt); > + > extern int dmar_remove_dev_scope(struct dmar_pci_notify_info *info, > u16 segment, struct dmar_dev_scope *devices, > int count); > @@ -140,6 +144,7 @@ extern int dmar_parse_one_atsr(struct acpi_dmar_header *header, void *arg); > extern int dmar_check_one_atsr(struct acpi_dmar_header *hdr, void *arg); > extern int dmar_release_one_atsr(struct acpi_dmar_header *hdr, void *arg); > extern int dmar_iommu_hotplug(struct dmar_drhd_unit *dmaru, bool insert); > +extern int dmar_rmrr_add_acpi_dev(u8 device_number, struct acpi_device *adev); > extern int dmar_iommu_notify_scope_dev(struct dmar_pci_notify_info *info); > #else /* !CONFIG_INTEL_IOMMU: */ > static inline int intel_iommu_init(void) { return -ENODEV; } > @@ -150,6 +155,11 @@ static inline void intel_iommu_shutdown(void) { } > #define dmar_check_one_atsr dmar_res_noop > #define dmar_release_one_atsr dmar_res_noop > > +static inline int dmar_rmrr_add_acpi_dev(u8 device_number, struct acpi_device *adev) > +{ > + return 0; > +} > + > static inline int dmar_iommu_notify_scope_dev(struct dmar_pci_notify_info *info) > { > return 0; >