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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 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 F07ECC4332D for ; Tue, 19 Jan 2021 14:26:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D750E205ED for ; Tue, 19 Jan 2021 14:26:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403837AbhASOTM (ORCPT ); Tue, 19 Jan 2021 09:19:12 -0500 Received: from frasgout.his.huawei.com ([185.176.79.56]:2374 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391271AbhASLYL (ORCPT ); Tue, 19 Jan 2021 06:24:11 -0500 Received: from fraeml735-chm.china.huawei.com (unknown [172.18.147.206]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4DKmQ14h6wz67dHr; Tue, 19 Jan 2021 19:19:21 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml735-chm.china.huawei.com (10.206.15.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 19 Jan 2021 12:23:28 +0100 Received: from localhost (10.47.77.36) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 19 Jan 2021 11:23:27 +0000 Date: Tue, 19 Jan 2021 11:22:47 +0000 From: Jonathan Cameron To: Jean-Philippe Brucker CC: , , , , , , , , , , , , , , , , , , , Subject: Re: [PATCH v9 02/10] iommu/arm-smmu-v3: Use device properties for pasid-num-bits Message-ID: <20210119112247.00003846@Huawei.com> In-Reply-To: <20210108145217.2254447-3-jean-philippe@linaro.org> References: <20210108145217.2254447-1-jean-philippe@linaro.org> <20210108145217.2254447-3-jean-philippe@linaro.org> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; i686-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.47.77.36] X-ClientProxiedBy: lhreml735-chm.china.huawei.com (10.201.108.86) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org On Fri, 8 Jan 2021 15:52:10 +0100 Jean-Philippe Brucker wrote: > The pasid-num-bits property shouldn't need a dedicated fwspec field, > it's a job for device properties. Add properties for IORT, and access > the number of PASID bits using device_property_read_u32(). > > Suggested-by: Robin Murphy > Signed-off-by: Jean-Philippe Brucker Nice Acked-by: Jonathan Cameron Looks like we are fine not checking for missing properties because ssid_bits == 0 corresponds to pasid off anyway. > --- > include/linux/iommu.h | 2 -- > drivers/acpi/arm64/iort.c | 13 +++++++------ > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 3 ++- > drivers/iommu/of_iommu.c | 5 ----- > 4 files changed, 9 insertions(+), 14 deletions(-) > > diff --git a/include/linux/iommu.h b/include/linux/iommu.h > index 26bcde5e7746..583c734b2e87 100644 > --- a/include/linux/iommu.h > +++ b/include/linux/iommu.h > @@ -570,7 +570,6 @@ struct iommu_group *fsl_mc_device_group(struct device *dev); > * struct iommu_fwspec - per-device IOMMU instance data > * @ops: ops for this device's IOMMU > * @iommu_fwnode: firmware handle for this device's IOMMU > - * @num_pasid_bits: number of PASID bits supported by this device > * @num_ids: number of associated device IDs > * @ids: IDs which this device may present to the IOMMU > */ > @@ -578,7 +577,6 @@ struct iommu_fwspec { > const struct iommu_ops *ops; > struct fwnode_handle *iommu_fwnode; > u32 flags; > - u32 num_pasid_bits; > unsigned int num_ids; > u32 ids[]; > }; > diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c > index d4eac6d7e9fb..c9a8bbb74b09 100644 > --- a/drivers/acpi/arm64/iort.c > +++ b/drivers/acpi/arm64/iort.c > @@ -968,15 +968,16 @@ static int iort_pci_iommu_init(struct pci_dev *pdev, u16 alias, void *data) > static void iort_named_component_init(struct device *dev, > struct acpi_iort_node *node) > { > + struct property_entry props[2] = {}; > struct acpi_iort_named_component *nc; > - struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); > - > - if (!fwspec) > - return; > > nc = (struct acpi_iort_named_component *)node->node_data; > - fwspec->num_pasid_bits = FIELD_GET(ACPI_IORT_NC_PASID_BITS, > - nc->node_flags); > + props[0] = PROPERTY_ENTRY_U32("pasid-num-bits", > + FIELD_GET(ACPI_IORT_NC_PASID_BITS, > + nc->node_flags)); > + > + if (device_add_properties(dev, props)) > + dev_warn(dev, "Could not add device properties\n"); > } > > static int iort_nc_iommu_map(struct device *dev, struct acpi_iort_node *node) > diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > index 8ca7415d785d..6a53b4edf054 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > @@ -2366,7 +2366,8 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev) > } > } > > - master->ssid_bits = min(smmu->ssid_bits, fwspec->num_pasid_bits); > + device_property_read_u32(dev, "pasid-num-bits", &master->ssid_bits); > + master->ssid_bits = min(smmu->ssid_bits, master->ssid_bits); > > /* > * Note that PASID must be enabled before, and disabled after ATS: > diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c > index e505b9130a1c..a9d2df001149 100644 > --- a/drivers/iommu/of_iommu.c > +++ b/drivers/iommu/of_iommu.c > @@ -210,11 +210,6 @@ const struct iommu_ops *of_iommu_configure(struct device *dev, > of_pci_iommu_init, &info); > } else { > err = of_iommu_configure_device(master_np, dev, id); > - > - fwspec = dev_iommu_fwspec_get(dev); > - if (!err && fwspec) > - of_property_read_u32(master_np, "pasid-num-bits", > - &fwspec->num_pasid_bits); > } > > /* 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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_RED,USER_AGENT_SANE_2 autolearn=ham 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 4C50FC433E6 for ; Tue, 19 Jan 2021 11:23:38 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9B51F2250E for ; Tue, 19 Jan 2021 11:23:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B51F2250E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=Huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 24FBB2044B; Tue, 19 Jan 2021 11:23:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zOp2T+hurRpQ; Tue, 19 Jan 2021 11:23:35 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id B128D20430; Tue, 19 Jan 2021 11:23:35 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9392DC088B; Tue, 19 Jan 2021 11:23:35 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 61522C013A for ; Tue, 19 Jan 2021 11:23:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5A18E84F90 for ; Tue, 19 Jan 2021 11:23:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VVGTU7yafm1U for ; Tue, 19 Jan 2021 11:23:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 8AC6D84F7A for ; Tue, 19 Jan 2021 11:23:31 +0000 (UTC) Received: from fraeml735-chm.china.huawei.com (unknown [172.18.147.206]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4DKmQ14h6wz67dHr; Tue, 19 Jan 2021 19:19:21 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml735-chm.china.huawei.com (10.206.15.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 19 Jan 2021 12:23:28 +0100 Received: from localhost (10.47.77.36) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 19 Jan 2021 11:23:27 +0000 Date: Tue, 19 Jan 2021 11:22:47 +0000 From: Jonathan Cameron To: Jean-Philippe Brucker Subject: Re: [PATCH v9 02/10] iommu/arm-smmu-v3: Use device properties for pasid-num-bits Message-ID: <20210119112247.00003846@Huawei.com> In-Reply-To: <20210108145217.2254447-3-jean-philippe@linaro.org> References: <20210108145217.2254447-1-jean-philippe@linaro.org> <20210108145217.2254447-3-jean-philippe@linaro.org> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; i686-w64-mingw32) MIME-Version: 1.0 X-Originating-IP: [10.47.77.36] X-ClientProxiedBy: lhreml735-chm.china.huawei.com (10.201.108.86) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected Cc: devicetree@vger.kernel.org, linux-acpi@vger.kernel.org, robin.murphy@arm.com, guohanjun@huawei.com, rjw@rjwysocki.net, iommu@lists.linux-foundation.org, robh+dt@kernel.org, linux-accelerators@lists.ozlabs.org, sudeep.holla@arm.com, vivek.gautam@arm.com, zhangfei.gao@linaro.org, will@kernel.org, linux-arm-kernel@lists.infradead.org, lenb@kernel.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On Fri, 8 Jan 2021 15:52:10 +0100 Jean-Philippe Brucker wrote: > The pasid-num-bits property shouldn't need a dedicated fwspec field, > it's a job for device properties. Add properties for IORT, and access > the number of PASID bits using device_property_read_u32(). > > Suggested-by: Robin Murphy > Signed-off-by: Jean-Philippe Brucker Nice Acked-by: Jonathan Cameron Looks like we are fine not checking for missing properties because ssid_bits == 0 corresponds to pasid off anyway. > --- > include/linux/iommu.h | 2 -- > drivers/acpi/arm64/iort.c | 13 +++++++------ > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 3 ++- > drivers/iommu/of_iommu.c | 5 ----- > 4 files changed, 9 insertions(+), 14 deletions(-) > > diff --git a/include/linux/iommu.h b/include/linux/iommu.h > index 26bcde5e7746..583c734b2e87 100644 > --- a/include/linux/iommu.h > +++ b/include/linux/iommu.h > @@ -570,7 +570,6 @@ struct iommu_group *fsl_mc_device_group(struct device *dev); > * struct iommu_fwspec - per-device IOMMU instance data > * @ops: ops for this device's IOMMU > * @iommu_fwnode: firmware handle for this device's IOMMU > - * @num_pasid_bits: number of PASID bits supported by this device > * @num_ids: number of associated device IDs > * @ids: IDs which this device may present to the IOMMU > */ > @@ -578,7 +577,6 @@ struct iommu_fwspec { > const struct iommu_ops *ops; > struct fwnode_handle *iommu_fwnode; > u32 flags; > - u32 num_pasid_bits; > unsigned int num_ids; > u32 ids[]; > }; > diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c > index d4eac6d7e9fb..c9a8bbb74b09 100644 > --- a/drivers/acpi/arm64/iort.c > +++ b/drivers/acpi/arm64/iort.c > @@ -968,15 +968,16 @@ static int iort_pci_iommu_init(struct pci_dev *pdev, u16 alias, void *data) > static void iort_named_component_init(struct device *dev, > struct acpi_iort_node *node) > { > + struct property_entry props[2] = {}; > struct acpi_iort_named_component *nc; > - struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); > - > - if (!fwspec) > - return; > > nc = (struct acpi_iort_named_component *)node->node_data; > - fwspec->num_pasid_bits = FIELD_GET(ACPI_IORT_NC_PASID_BITS, > - nc->node_flags); > + props[0] = PROPERTY_ENTRY_U32("pasid-num-bits", > + FIELD_GET(ACPI_IORT_NC_PASID_BITS, > + nc->node_flags)); > + > + if (device_add_properties(dev, props)) > + dev_warn(dev, "Could not add device properties\n"); > } > > static int iort_nc_iommu_map(struct device *dev, struct acpi_iort_node *node) > diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > index 8ca7415d785d..6a53b4edf054 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > @@ -2366,7 +2366,8 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev) > } > } > > - master->ssid_bits = min(smmu->ssid_bits, fwspec->num_pasid_bits); > + device_property_read_u32(dev, "pasid-num-bits", &master->ssid_bits); > + master->ssid_bits = min(smmu->ssid_bits, master->ssid_bits); > > /* > * Note that PASID must be enabled before, and disabled after ATS: > diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c > index e505b9130a1c..a9d2df001149 100644 > --- a/drivers/iommu/of_iommu.c > +++ b/drivers/iommu/of_iommu.c > @@ -210,11 +210,6 @@ const struct iommu_ops *of_iommu_configure(struct device *dev, > of_pci_iommu_init, &info); > } else { > err = of_iommu_configure_device(master_np, dev, id); > - > - fwspec = dev_iommu_fwspec_get(dev); > - if (!err && fwspec) > - of_property_read_u32(master_np, "pasid-num-bits", > - &fwspec->num_pasid_bits); > } > > /* _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu 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=-15.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 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 976E1C433DB for ; Tue, 19 Jan 2021 11:25:08 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 23AD520757 for ; Tue, 19 Jan 2021 11:25:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 23AD520757 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=Huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kMofMHSIvK1SInB/nts1jQl6wWSo3uIVbD+CiJiXVXQ=; b=2CFyYBVWYPNMHCslHuUsEwTEj KFNGnNwiFV3Yyf0SPV6tKvTVwiyU2CrH262jSLzVCa0Vypi5KOVXmryuHqgfttpCXfoilwjvbK7Fv oMPo0ek4NXFSlHbXp21hXuPDQo3T3y3g+zPIDyKnw2rjMVL40rPTNzDATYKtf1w4jslI9H32+MF39 GDCRybtYKeDu5fxxW8A/8QpK3LaoIlssEuzyiJuIhLZclG09M3KdurioGtiUJ2MeAehtOGQojqIFi sB9tEW9RJRJmQJTS5rO1WGGJvDWrbDV/DD7GiO7LnQmW6sdFqqqXa/PpsP44q2Ace7/R4LV1O7OcN WYEaF6koA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1p6k-0003Sp-Ho; Tue, 19 Jan 2021 11:23:34 +0000 Received: from frasgout.his.huawei.com ([185.176.79.56]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1p6h-0003SN-CM for linux-arm-kernel@lists.infradead.org; Tue, 19 Jan 2021 11:23:32 +0000 Received: from fraeml735-chm.china.huawei.com (unknown [172.18.147.206]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4DKmQ14h6wz67dHr; Tue, 19 Jan 2021 19:19:21 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml735-chm.china.huawei.com (10.206.15.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 19 Jan 2021 12:23:28 +0100 Received: from localhost (10.47.77.36) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 19 Jan 2021 11:23:27 +0000 Date: Tue, 19 Jan 2021 11:22:47 +0000 From: Jonathan Cameron To: Jean-Philippe Brucker Subject: Re: [PATCH v9 02/10] iommu/arm-smmu-v3: Use device properties for pasid-num-bits Message-ID: <20210119112247.00003846@Huawei.com> In-Reply-To: <20210108145217.2254447-3-jean-philippe@linaro.org> References: <20210108145217.2254447-1-jean-philippe@linaro.org> <20210108145217.2254447-3-jean-philippe@linaro.org> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; i686-w64-mingw32) MIME-Version: 1.0 X-Originating-IP: [10.47.77.36] X-ClientProxiedBy: lhreml735-chm.china.huawei.com (10.201.108.86) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210119_062331_635479_58326586 X-CRM114-Status: GOOD ( 19.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, lorenzo.pieralisi@arm.com, linux-acpi@vger.kernel.org, robin.murphy@arm.com, joro@8bytes.org, guohanjun@huawei.com, rjw@rjwysocki.net, shameerali.kolothum.thodi@huawei.com, eric.auger@redhat.com, iommu@lists.linux-foundation.org, robh+dt@kernel.org, linux-accelerators@lists.ozlabs.org, sudeep.holla@arm.com, vivek.gautam@arm.com, zhangfei.gao@linaro.org, baolu.lu@linux.intel.com, will@kernel.org, linux-arm-kernel@lists.infradead.org, lenb@kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, 8 Jan 2021 15:52:10 +0100 Jean-Philippe Brucker wrote: > The pasid-num-bits property shouldn't need a dedicated fwspec field, > it's a job for device properties. Add properties for IORT, and access > the number of PASID bits using device_property_read_u32(). > > Suggested-by: Robin Murphy > Signed-off-by: Jean-Philippe Brucker Nice Acked-by: Jonathan Cameron Looks like we are fine not checking for missing properties because ssid_bits == 0 corresponds to pasid off anyway. > --- > include/linux/iommu.h | 2 -- > drivers/acpi/arm64/iort.c | 13 +++++++------ > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 3 ++- > drivers/iommu/of_iommu.c | 5 ----- > 4 files changed, 9 insertions(+), 14 deletions(-) > > diff --git a/include/linux/iommu.h b/include/linux/iommu.h > index 26bcde5e7746..583c734b2e87 100644 > --- a/include/linux/iommu.h > +++ b/include/linux/iommu.h > @@ -570,7 +570,6 @@ struct iommu_group *fsl_mc_device_group(struct device *dev); > * struct iommu_fwspec - per-device IOMMU instance data > * @ops: ops for this device's IOMMU > * @iommu_fwnode: firmware handle for this device's IOMMU > - * @num_pasid_bits: number of PASID bits supported by this device > * @num_ids: number of associated device IDs > * @ids: IDs which this device may present to the IOMMU > */ > @@ -578,7 +577,6 @@ struct iommu_fwspec { > const struct iommu_ops *ops; > struct fwnode_handle *iommu_fwnode; > u32 flags; > - u32 num_pasid_bits; > unsigned int num_ids; > u32 ids[]; > }; > diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c > index d4eac6d7e9fb..c9a8bbb74b09 100644 > --- a/drivers/acpi/arm64/iort.c > +++ b/drivers/acpi/arm64/iort.c > @@ -968,15 +968,16 @@ static int iort_pci_iommu_init(struct pci_dev *pdev, u16 alias, void *data) > static void iort_named_component_init(struct device *dev, > struct acpi_iort_node *node) > { > + struct property_entry props[2] = {}; > struct acpi_iort_named_component *nc; > - struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); > - > - if (!fwspec) > - return; > > nc = (struct acpi_iort_named_component *)node->node_data; > - fwspec->num_pasid_bits = FIELD_GET(ACPI_IORT_NC_PASID_BITS, > - nc->node_flags); > + props[0] = PROPERTY_ENTRY_U32("pasid-num-bits", > + FIELD_GET(ACPI_IORT_NC_PASID_BITS, > + nc->node_flags)); > + > + if (device_add_properties(dev, props)) > + dev_warn(dev, "Could not add device properties\n"); > } > > static int iort_nc_iommu_map(struct device *dev, struct acpi_iort_node *node) > diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > index 8ca7415d785d..6a53b4edf054 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > @@ -2366,7 +2366,8 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev) > } > } > > - master->ssid_bits = min(smmu->ssid_bits, fwspec->num_pasid_bits); > + device_property_read_u32(dev, "pasid-num-bits", &master->ssid_bits); > + master->ssid_bits = min(smmu->ssid_bits, master->ssid_bits); > > /* > * Note that PASID must be enabled before, and disabled after ATS: > diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c > index e505b9130a1c..a9d2df001149 100644 > --- a/drivers/iommu/of_iommu.c > +++ b/drivers/iommu/of_iommu.c > @@ -210,11 +210,6 @@ const struct iommu_ops *of_iommu_configure(struct device *dev, > of_pci_iommu_init, &info); > } else { > err = of_iommu_configure_device(master_np, dev, id); > - > - fwspec = dev_iommu_fwspec_get(dev); > - if (!err && fwspec) > - of_property_read_u32(master_np, "pasid-num-bits", > - &fwspec->num_pasid_bits); > } > > /* _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel