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=-4.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY 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 D49FFC18E5B for ; Mon, 16 Mar 2020 15:51:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F9F820753 for ; Mon, 16 Mar 2020 15:51:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Ql9YUBVP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732132AbgCPPv2 (ORCPT ); Mon, 16 Mar 2020 11:51:28 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:51345 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731974AbgCPPv0 (ORCPT ); Mon, 16 Mar 2020 11:51:26 -0400 Received: by mail-wm1-f67.google.com with SMTP id a132so18236289wme.1 for ; Mon, 16 Mar 2020 08:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=KkyluvbCo1smPziuTMI1rpctD2ZygqnkeyljtuoXeEw=; b=Ql9YUBVPAc49FI42xu2eB/uVJuxhsY9YoQnZ0XtFjXM6HeXXOBU835hweTKfAEM9zr ot/OVovpdvovqb2hWye7+Dj/qnKTGEkRPtuI0NO5twoZx0/MwgjkoH50sjShfw/4xGDj q1qnW1Z1JfMLv111SRHS2M4QOxcIoR8jkUpSGfneogiiGz5Pr0uTllS+/TIx635iELsG u6YJoIDM7d3hVfVFSBh5x6kT2cHR+EaZwyTgm6kbxv7LY9h4Q+f0ytoQ41X42SgS4HLo Rq7GsvA0EhReqsXX/ReWo+oazsMqbZTNhtJUGHfm5pRqt+vWwkp5C2wusM4Pinn9EBm/ MsHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=KkyluvbCo1smPziuTMI1rpctD2ZygqnkeyljtuoXeEw=; b=Sc6yUigx/qD6MpD6oHNpLTN8bLnz0pvv/P3+LslM413g9TBjIEmxRiiobWfd86dTMg 5JOeDO8gMTjT58waEwwed3SMvUjOlvF74uHpXoDaOLOMzVkXOCZwgu7k2CWbfOzKcQFS 8YRt+gYesckVW1RPjXf7KL3ePCxfbvqZCSQ6sWMiDJwE2CAfs0d+RRonx0aoLz0zLjlU 9UC52PgQ1Wwty3u8RpBDLwqo6O+c9JLyRxXbWKs+9lyqu/+GYtz73AXlMXNbim/YP7ii Vzx3VbTRb3YaJ0y5dWtxgXMD2x33AKCDgljV/9Oj3SofA5T1gO/iifWMSWwg7sYtOo0p R3FA== X-Gm-Message-State: ANhLgQ1qqRXTmyLEenHQ4OsrEaWn6nRaWlpPW9Kvf1Gs+S1Zyg1QAZGE KBYQdGkuj2yvbXwy+PPFFGrzNQ== X-Google-Smtp-Source: ADFU+vsOzPwdH8tCDCurHNefcxT+FZBJmWj2HiUatr8Ym5ck83x1h29ClX9491yXix2EVw/gHBFPRA== X-Received: by 2002:a1c:ab04:: with SMTP id u4mr28315891wme.88.1584373884542; Mon, 16 Mar 2020 08:51:24 -0700 (PDT) Received: from myrica ([2001:171b:226b:54a0:116c:c27a:3e7f:5eaf]) by smtp.gmail.com with ESMTPSA id s22sm143823wmc.16.2020.03.16.08.51.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 08:51:23 -0700 (PDT) Date: Mon, 16 Mar 2020 16:51:16 +0100 From: Jean-Philippe Brucker To: Joerg Roedel Cc: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mediatek@lists.infradead.org, virtualization@lists.linux-foundation.org, Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , Rob Clark , Sean Paul , Will Deacon , Robin Murphy , Matthias Brugger , Thierry Reding , Andy Gross , Bjorn Andersson , Joerg Roedel Subject: Re: [PATCH 12/15] iommu/mediatek: Use accessor functions for iommu private data Message-ID: <20200316155116.GL304669@myrica> References: <20200310091229.29830-1-joro@8bytes.org> <20200310091229.29830-13-joro@8bytes.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200310091229.29830-13-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 10, 2020 at 10:12:26AM +0100, Joerg Roedel wrote: > From: Joerg Roedel > > Make use of dev_iommu_priv_set/get() functions. > > Signed-off-by: Joerg Roedel Reviewed-by: Jean-Philippe Brucker > --- > drivers/iommu/mtk_iommu.c | 13 ++++++------- > drivers/iommu/mtk_iommu_v1.c | 14 +++++++------- > 2 files changed, 13 insertions(+), 14 deletions(-) > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > index 95945f467c03..5f4d6df59cf6 100644 > --- a/drivers/iommu/mtk_iommu.c > +++ b/drivers/iommu/mtk_iommu.c > @@ -358,8 +358,8 @@ static void mtk_iommu_domain_free(struct iommu_domain *domain) > static int mtk_iommu_attach_device(struct iommu_domain *domain, > struct device *dev) > { > + struct mtk_iommu_data *data = dev_iommu_priv_get(dev); > struct mtk_iommu_domain *dom = to_mtk_domain(domain); > - struct mtk_iommu_data *data = dev_iommu_fwspec_get(dev)->iommu_priv; > > if (!data) > return -ENODEV; > @@ -378,7 +378,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, > static void mtk_iommu_detach_device(struct iommu_domain *domain, > struct device *dev) > { > - struct mtk_iommu_data *data = dev_iommu_fwspec_get(dev)->iommu_priv; > + struct mtk_iommu_data *data = dev_iommu_priv_get(dev); > > if (!data) > return; > @@ -450,7 +450,7 @@ static int mtk_iommu_add_device(struct device *dev) > if (!fwspec || fwspec->ops != &mtk_iommu_ops) > return -ENODEV; /* Not a iommu client device */ > > - data = fwspec->iommu_priv; > + data = dev_iommu_priv_get(dev); > iommu_device_link(&data->iommu, dev); > > group = iommu_group_get_for_dev(dev); > @@ -469,7 +469,7 @@ static void mtk_iommu_remove_device(struct device *dev) > if (!fwspec || fwspec->ops != &mtk_iommu_ops) > return; > > - data = fwspec->iommu_priv; > + data = dev_iommu_priv_get(dev); > iommu_device_unlink(&data->iommu, dev); > > iommu_group_remove_device(dev); > @@ -496,7 +496,6 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev) > > static int mtk_iommu_of_xlate(struct device *dev, struct of_phandle_args *args) > { > - struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); > struct platform_device *m4updev; > > if (args->args_count != 1) { > @@ -505,13 +504,13 @@ static int mtk_iommu_of_xlate(struct device *dev, struct of_phandle_args *args) > return -EINVAL; > } > > - if (!fwspec->iommu_priv) { > + if (!dev_iommu_priv_get(dev)) { > /* Get the m4u device */ > m4updev = of_find_device_by_node(args->np); > if (WARN_ON(!m4updev)) > return -EINVAL; > > - fwspec->iommu_priv = platform_get_drvdata(m4updev); > + dev_iommu_priv_set(dev, platform_get_drvdata(m4updev)); > } > > return iommu_fwspec_add_ids(dev, args->args, 1); > diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c > index e93b94ecac45..9930ac7413cc 100644 > --- a/drivers/iommu/mtk_iommu_v1.c > +++ b/drivers/iommu/mtk_iommu_v1.c > @@ -263,8 +263,8 @@ static void mtk_iommu_domain_free(struct iommu_domain *domain) > static int mtk_iommu_attach_device(struct iommu_domain *domain, > struct device *dev) > { > + struct mtk_iommu_data *data = dev_iommu_priv_get(dev); > struct mtk_iommu_domain *dom = to_mtk_domain(domain); > - struct mtk_iommu_data *data = dev_iommu_fwspec_get(dev)->iommu_priv; > int ret; > > if (!data) > @@ -286,7 +286,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, > static void mtk_iommu_detach_device(struct iommu_domain *domain, > struct device *dev) > { > - struct mtk_iommu_data *data = dev_iommu_fwspec_get(dev)->iommu_priv; > + struct mtk_iommu_data *data = dev_iommu_priv_get(dev); > > if (!data) > return; > @@ -387,20 +387,20 @@ static int mtk_iommu_create_mapping(struct device *dev, > return -EINVAL; > } > > - if (!fwspec->iommu_priv) { > + if (!dev_iommu_priv_get(dev)) { > /* Get the m4u device */ > m4updev = of_find_device_by_node(args->np); > if (WARN_ON(!m4updev)) > return -EINVAL; > > - fwspec->iommu_priv = platform_get_drvdata(m4updev); > + dev_iommu_priv_set(dev, platform_get_drvdata(m4updev)); > } > > ret = iommu_fwspec_add_ids(dev, args->args, 1); > if (ret) > return ret; > > - data = fwspec->iommu_priv; > + data = dev_iommu_priv_get(dev); > m4udev = data->dev; > mtk_mapping = m4udev->archdata.iommu; > if (!mtk_mapping) { > @@ -459,7 +459,7 @@ static int mtk_iommu_add_device(struct device *dev) > if (err) > return err; > > - data = fwspec->iommu_priv; > + data = dev_iommu_priv_get(dev) > mtk_mapping = data->dev->archdata.iommu; > err = arm_iommu_attach_device(dev, mtk_mapping); > if (err) { > @@ -478,7 +478,7 @@ static void mtk_iommu_remove_device(struct device *dev) > if (!fwspec || fwspec->ops != &mtk_iommu_ops) > return; > > - data = fwspec->iommu_priv; > + data = dev_iommu_priv_get(dev) > iommu_device_unlink(&data->iommu, dev); > > iommu_group_remove_device(dev); > -- > 2.17.1 >