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=-5.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, 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 3EB71C433E1 for ; Sat, 23 May 2020 07:23:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1E0852073B for ; Sat, 23 May 2020 07:23:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="b98PVWiN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387707AbgEWHX0 (ORCPT ); Sat, 23 May 2020 03:23:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387705AbgEWHXZ (ORCPT ); Sat, 23 May 2020 03:23:25 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC69FC05BD43 for ; Sat, 23 May 2020 00:23:24 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id p30so6042722pgl.11 for ; Sat, 23 May 2020 00:23:24 -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:content-transfer-encoding:in-reply-to :user-agent; bh=rkQjo00JjFI2fAC/o/2WCC1p0oPD9CQpCRaJecUJgjw=; b=b98PVWiNaivm9ZiyZan+DVPHGPcXBj6ewOabjJD+9e81ibdAoRXx4l1oTj7FbChlUo 4vPZhqxfy3UFwAkN8iNMTU7mFc+4fqlw8LHjxRBRdJdZFHnf7zqxGgFEi2T5SBcbb9AM iAyhRHC8v2NHCBOlf79Ml00dVLBUmD7oBCb7hrXdBea8jfX+T2jJLOi+5pdD2raTJR+2 t7u09a29UrI7myl6xPmDuhz3VyNhSXP3TYJRsYgsM28p76SyQLE3Pm4A+K2XJ5kI6/OK fPvX3fMuFpy9kYRIupb4Y7HO/CUxtfxZ6+SKnOhjUiAHsuUyiDudOxjjns4AT8Yd9yex UHPQ== 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:content-transfer-encoding :in-reply-to:user-agent; bh=rkQjo00JjFI2fAC/o/2WCC1p0oPD9CQpCRaJecUJgjw=; b=MYpeQ9hDAhRY+NXr2hDjpgrIfhFXiF3yKlJ1n2dbcO0FjXsh+qp/9o4EWjVJT0ndwQ v/ywSLYvyIKDu6Bsd/HF4zxUWlw+aCAkFVDiJyYpGMR/QvsscinhLi6bhTIe2Y0yFA1I S7k6gpG4wrPymNtVwUX67Y2tmCLUWGrEjZbix0uhJ07MgnFy/qwutOEb8K0KjAsdSbhF cOQpoOgReLJRe80+thZ6SidiuOwIO5jzOWHNuHetdyVRbFnOvujrN/9dK4hVQ8ucJGzA vRHIcoUEIiD89EIfIAjKtFH/PhCcsOzgOgzBtuI4gaLpcmNQZZ8jGVY5iPxX03GX/d+G FfPA== X-Gm-Message-State: AOAM531xxNEh3QBC0ZtIEuZGmMnESdZQMR9pjWcKekfTh92XpYKr1MWJ t94crSegOHWMTlMT51N4pWTcsqZ8Bb4= X-Google-Smtp-Source: ABdhPJwBXAYthcc94MlJNYar0cK8NQ0m6fDRrV1047IEGn1lJ7oVpxn+yl5bbg5BfOkLu2OAiW8nvA== X-Received: by 2002:a65:51c1:: with SMTP id i1mr17010704pgq.272.1590218604234; Sat, 23 May 2020 00:23:24 -0700 (PDT) Received: from dragon ([80.251.214.228]) by smtp.gmail.com with ESMTPSA id h4sm9368364pje.29.2020.05.23.00.23.11 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 23 May 2020 00:23:23 -0700 (PDT) Date: Sat, 23 May 2020 15:23:02 +0800 From: Shawn Guo To: Jordan Crouse Cc: linux-arm-msm@vger.kernel.org, AngeloGioacchino Del Regno , Daniel Vetter , David Airlie , Drew Davenport , Georgi Djakov , Greg Kroah-Hartman , Jeffrey Hugo , Kalyan Thota , Rob Clark , Sam Ravnborg , Sean Paul , Thomas Gleixner , Thomas Zimmermann , Wambui Karuga , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, tongtiangen Subject: Re: [PATCH v1 1/3] drm/msm: Attach the IOMMU device during initialization Message-ID: <20200523072300.GB28198@dragon> References: <20200522220316.23772-1-jcrouse@codeaurora.org> <20200522220316.23772-2-jcrouse@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20200522220316.23772-2-jcrouse@codeaurora.org> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Fri, May 22, 2020 at 04:03:14PM -0600, Jordan Crouse wrote: > diff --git a/drivers/gpu/drm/msm/msm_gpummu.c b/drivers/gpu/drm/msm/msm_gpummu.c > index 34980d8eb7ad..0ad0f848560a 100644 > --- a/drivers/gpu/drm/msm/msm_gpummu.c > +++ b/drivers/gpu/drm/msm/msm_gpummu.c > @@ -21,11 +21,6 @@ struct msm_gpummu { > #define GPUMMU_PAGE_SIZE SZ_4K > #define TABLE_SIZE (sizeof(uint32_t) * GPUMMU_VA_RANGE / GPUMMU_PAGE_SIZE) > > -static int msm_gpummu_attach(struct msm_mmu *mmu) > -{ > - return 0; > -} > - > static void msm_gpummu_detach(struct msm_mmu *mmu) > { > } > @@ -85,7 +80,6 @@ static void msm_gpummu_destroy(struct msm_mmu *mmu) > } > > static const struct msm_mmu_funcs funcs = { > - .attach = msm_gpummu_attach, > .detach = msm_gpummu_detach, > .map = msm_gpummu_map, > .unmap = msm_gpummu_unmap, > diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c > index ad58cfe5998e..e35dab5792cf 100644 > --- a/drivers/gpu/drm/msm/msm_iommu.c > +++ b/drivers/gpu/drm/msm/msm_iommu.c > @@ -66,7 +66,6 @@ static void msm_iommu_destroy(struct msm_mmu *mmu) > } > > static const struct msm_mmu_funcs funcs = { > - .attach = msm_iommu_attach, It causes an unused function warning as below. drivers/gpu/drm/msm/msm_iommu.c:26:12: warning: ‘msm_iommu_attach’ defined but not used [-Wunused-function] static int msm_iommu_attach(struct msm_mmu *mmu) ^~~~~~~~~~~~~~~~ Not sure if you will use it again in future patches though. Shawn > .detach = msm_iommu_detach, > .map = msm_iommu_map, > .unmap = msm_iommu_unmap, > @@ -76,6 +75,7 @@ static const struct msm_mmu_funcs funcs = { > struct msm_mmu *msm_iommu_new(struct device *dev, struct iommu_domain *domain) > { > struct msm_iommu *iommu; > + int ret; > > iommu = kzalloc(sizeof(*iommu), GFP_KERNEL); > if (!iommu) > @@ -85,5 +85,11 @@ struct msm_mmu *msm_iommu_new(struct device *dev, struct iommu_domain *domain) > msm_mmu_init(&iommu->base, dev, &funcs); > iommu_set_fault_handler(domain, msm_fault_handler, iommu); > > + ret = iommu_attach_device(iommu->domain, dev); > + if (ret) { > + kfree(iommu); > + return ERR_PTR(ret); > + } > + > return &iommu->base; > } > diff --git a/drivers/gpu/drm/msm/msm_mmu.h b/drivers/gpu/drm/msm/msm_mmu.h > index 67a623f14319..bae9e8e67ec1 100644 > --- a/drivers/gpu/drm/msm/msm_mmu.h > +++ b/drivers/gpu/drm/msm/msm_mmu.h > @@ -10,7 +10,6 @@ > #include > > struct msm_mmu_funcs { > - int (*attach)(struct msm_mmu *mmu); > void (*detach)(struct msm_mmu *mmu); > int (*map)(struct msm_mmu *mmu, uint64_t iova, struct sg_table *sgt, > unsigned len, int prot); > -- > 2.17.1 >