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=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED 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 697DEC43216 for ; Thu, 22 Jul 2021 20:09:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4FB1860EBE for ; Thu, 22 Jul 2021 20:09:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230449AbhGVT2r (ORCPT ); Thu, 22 Jul 2021 15:28:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230439AbhGVT2q (ORCPT ); Thu, 22 Jul 2021 15:28:46 -0400 Received: from mail-oi1-x232.google.com (mail-oi1-x232.google.com [IPv6:2607:f8b0:4864:20::232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 691CCC061575 for ; Thu, 22 Jul 2021 13:09:21 -0700 (PDT) Received: by mail-oi1-x232.google.com with SMTP id e11so7894856oii.9 for ; Thu, 22 Jul 2021 13:09:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:in-reply-to:references:from:user-agent:date:message-id :subject:to:cc; bh=BcJKTAd+SXCAq4+hK48A80n6j+MuUYA2uIh6BPZjR1U=; b=XVta9Wlk5xmpjfpjS6T5NbLjP3uLbxw2D8WZfnnBKiRY+DboAIeHHwVOmWSalHNbyC vaoX7QNxDNK8fhyBBOCLbgeQJn3RlCAo6mhjnI7LFAITkc7tjyfbYjdbe/aGiO0EvPzZ 0TpyT9gbFRPBz8jRAUJoZTesVCz2w5sDTfLhg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from :user-agent:date:message-id:subject:to:cc; bh=BcJKTAd+SXCAq4+hK48A80n6j+MuUYA2uIh6BPZjR1U=; b=a2iPZ9Ct9yQOiqot+9snBSCQbVe5sRoRhNyyMqLCNDnDngLzJaMPkUq5apDOiCh6V/ UBJUlZQG+VoDhPj5dmBg/sBQPjYCLmPMJMMMYDPUjh4MjbDt5hxFaeVR+RnqaGioMaG7 R1aFnHV/uSfgYrCPi4gto4ueYY7vB+zySZ74Nml2ogaJBhBGvWiDpPTb7QlbNs+S26++ VVEjvpreu8R8ET6XL+N+/+bZLmW6Md1QSdsMmjtsmfgCYdwv9Pcv1yCpcnYJmYcg2X6f Pcg0Qn41mjCT/77jvJvqJXsvClSoy+bjD1pReHqy1XPaA62eAIvgCPO7y3oJqOLzyz8H Jjjg== X-Gm-Message-State: AOAM533Lnnr5tQkdbhL4CcrOlU4dV7GekAtnooYfPEvNZoRA2MoIn5K+ zCe0BatyRmQwJM8wnL6QYMoGOoALKATQ8nDnn3ohPA== X-Google-Smtp-Source: ABdhPJyQAOc9yd5za8sXc+wp9Ht2s4bknqPuzxNR8G6jAhR6yKwtH3h66wVrY3lRyd3R7fQIVIs1wnidXeQUJ7kSPmo= X-Received: by 2002:aca:4dc6:: with SMTP id a189mr7098582oib.166.1626984560867; Thu, 22 Jul 2021 13:09:20 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Thu, 22 Jul 2021 20:09:20 +0000 MIME-Version: 1.0 In-Reply-To: <20210722024227.3313096-4-bjorn.andersson@linaro.org> References: <20210722024227.3313096-1-bjorn.andersson@linaro.org> <20210722024227.3313096-4-bjorn.andersson@linaro.org> From: Stephen Boyd User-Agent: alot/0.9.1 Date: Thu, 22 Jul 2021 20:09:20 +0000 Message-ID: Subject: Re: [PATCH 3/5] drm/msm/dp: Refactor ioremap wrapper To: Abhinav Kumar , Bjorn Andersson , Daniel Vetter , David Airlie , Rob Clark , Rob Herring , Sean Paul Cc: Kuogee Hsieh , Tanmay Shah , Chandan Uddaraju , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Quoting Bjorn Andersson (2021-07-21 19:42:25) > In order to deal with multiple memory ranges in the following commit > change the ioremap wrapper to not poke directly into the dss_io_data > struct. > > Signed-off-by: Bjorn Andersson > --- > drivers/gpu/drm/msm/dp/dp_parser.c | 28 ++++++++++++++-------------- > drivers/gpu/drm/msm/dp/dp_parser.h | 2 +- > 2 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c b/drivers/gpu/drm/msm/dp/dp_parser.c > index c064ced78278..e68dacef547c 100644 > --- a/drivers/gpu/drm/msm/dp/dp_parser.c > +++ b/drivers/gpu/drm/msm/dp/dp_parser.c > @@ -19,39 +19,39 @@ static const struct dp_regulator_cfg sdm845_dp_reg_cfg = { > }, > }; > > -static int msm_dss_ioremap(struct platform_device *pdev, > - struct dss_io_data *io_data) > +static void __iomem *dp_ioremap(struct platform_device *pdev, int idx, size_t *len) > { > struct resource *res = NULL; Can we drop assignment to NULL too? > + void __iomem *base; > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + res = platform_get_resource(pdev, IORESOURCE_MEM, idx); > if (!res) { > DRM_ERROR("%pS->%s: msm_dss_get_res failed\n", > __builtin_return_address(0), __func__); > - return -ENODEV; > + return ERR_PTR(-ENODEV); > } > > - io_data->len = (u32)resource_size(res); > - io_data->base = devm_ioremap(&pdev->dev, res->start, io_data->len); > - if (!io_data->base) { > + base = devm_ioremap_resource(&pdev->dev, res); > + if (!base) { devm_ioremap_resource() returns an ERR_PTR on failure, not NULL. > DRM_ERROR("%pS->%s: ioremap failed\n", > __builtin_return_address(0), __func__); > - return -EIO; > + return ERR_PTR(-EIO); > } > > - return 0; > + *len = resource_size(res); > + return base; > } > > static int dp_parser_ctrl_res(struct dp_parser *parser) > { > - int rc = 0; > struct platform_device *pdev = parser->pdev; > struct dp_io *io = &parser->io; > + struct dss_io_data *dss = &io->dp_controller; > > - rc = msm_dss_ioremap(pdev, &io->dp_controller); > - if (rc) { > - DRM_ERROR("unable to remap dp io resources, rc=%d\n", rc); > - return rc; > + dss->base = dp_ioremap(pdev, 0, &dss->len); > + if (IS_ERR(dss->base)) { > + DRM_ERROR("unable to remap dp io region: %pe\n", dss->base); > + return PTR_ERR(dss->base); > } > > io->phy = devm_phy_get(&pdev->dev, "dp"); 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.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED 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 D48A0C4320A for ; Thu, 22 Jul 2021 20:09:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 A5A6F60EB2 for ; Thu, 22 Jul 2021 20:09:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A5A6F60EB2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 160096EAAB; Thu, 22 Jul 2021 20:09:22 +0000 (UTC) Received: from mail-oi1-x229.google.com (mail-oi1-x229.google.com [IPv6:2607:f8b0:4864:20::229]) by gabe.freedesktop.org (Postfix) with ESMTPS id 745406EAAB for ; Thu, 22 Jul 2021 20:09:21 +0000 (UTC) Received: by mail-oi1-x229.google.com with SMTP id c197so7860815oib.11 for ; Thu, 22 Jul 2021 13:09:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:in-reply-to:references:from:user-agent:date:message-id :subject:to:cc; bh=BcJKTAd+SXCAq4+hK48A80n6j+MuUYA2uIh6BPZjR1U=; b=XVta9Wlk5xmpjfpjS6T5NbLjP3uLbxw2D8WZfnnBKiRY+DboAIeHHwVOmWSalHNbyC vaoX7QNxDNK8fhyBBOCLbgeQJn3RlCAo6mhjnI7LFAITkc7tjyfbYjdbe/aGiO0EvPzZ 0TpyT9gbFRPBz8jRAUJoZTesVCz2w5sDTfLhg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from :user-agent:date:message-id:subject:to:cc; bh=BcJKTAd+SXCAq4+hK48A80n6j+MuUYA2uIh6BPZjR1U=; b=QQaRCJxoNa0F/uK5BzGYvjTaZ8pdLlSuKuYKPcFrl39scmRm505kxGus9tgMBmiv+L CiG7KiAI7lgtQkBV0V8g1uCT1tj+7IoSt5U4mZyqSyUxhzIN3/24eyj5GyNXraBoIC59 PmRVIPM/MzLglKve8EMp6EOUN6O0HcqqnQgyyVlUErMIpSNL7lJ5rYtcsaGN4EZwRDp+ yAA0G3vCDSSZqc3Q9dsVhhDjd+M2dfWebctSH0U2xMlh5I4TXamAxYIlbEDMY3Nh7GIL 0BHW0DDm9ITVdGa5TNBkKNAR4PnmwDs8FI1TkhgNoiE3DRQrgF6XPpyT4eos/V+TEyoT BYuA== X-Gm-Message-State: AOAM531nVfiJ+FCxVJVK4nXF2aBU7ZMYgk5CFs9L7RgM1PGqw3iguz9N FzHFFrG5jNvAC2dku7fCKwftCbmQG+ba6mPPogDw7A== X-Google-Smtp-Source: ABdhPJyQAOc9yd5za8sXc+wp9Ht2s4bknqPuzxNR8G6jAhR6yKwtH3h66wVrY3lRyd3R7fQIVIs1wnidXeQUJ7kSPmo= X-Received: by 2002:aca:4dc6:: with SMTP id a189mr7098582oib.166.1626984560867; Thu, 22 Jul 2021 13:09:20 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Thu, 22 Jul 2021 20:09:20 +0000 MIME-Version: 1.0 In-Reply-To: <20210722024227.3313096-4-bjorn.andersson@linaro.org> References: <20210722024227.3313096-1-bjorn.andersson@linaro.org> <20210722024227.3313096-4-bjorn.andersson@linaro.org> From: Stephen Boyd User-Agent: alot/0.9.1 Date: Thu, 22 Jul 2021 20:09:20 +0000 Message-ID: Subject: Re: [PATCH 3/5] drm/msm/dp: Refactor ioremap wrapper To: Abhinav Kumar , Bjorn Andersson , Daniel Vetter , David Airlie , Rob Clark , Rob Herring , Sean Paul Content-Type: text/plain; charset="UTF-8" X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Kuogee Hsieh , Tanmay Shah , freedreno@lists.freedesktop.org, Chandan Uddaraju Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Quoting Bjorn Andersson (2021-07-21 19:42:25) > In order to deal with multiple memory ranges in the following commit > change the ioremap wrapper to not poke directly into the dss_io_data > struct. > > Signed-off-by: Bjorn Andersson > --- > drivers/gpu/drm/msm/dp/dp_parser.c | 28 ++++++++++++++-------------- > drivers/gpu/drm/msm/dp/dp_parser.h | 2 +- > 2 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c b/drivers/gpu/drm/msm/dp/dp_parser.c > index c064ced78278..e68dacef547c 100644 > --- a/drivers/gpu/drm/msm/dp/dp_parser.c > +++ b/drivers/gpu/drm/msm/dp/dp_parser.c > @@ -19,39 +19,39 @@ static const struct dp_regulator_cfg sdm845_dp_reg_cfg = { > }, > }; > > -static int msm_dss_ioremap(struct platform_device *pdev, > - struct dss_io_data *io_data) > +static void __iomem *dp_ioremap(struct platform_device *pdev, int idx, size_t *len) > { > struct resource *res = NULL; Can we drop assignment to NULL too? > + void __iomem *base; > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + res = platform_get_resource(pdev, IORESOURCE_MEM, idx); > if (!res) { > DRM_ERROR("%pS->%s: msm_dss_get_res failed\n", > __builtin_return_address(0), __func__); > - return -ENODEV; > + return ERR_PTR(-ENODEV); > } > > - io_data->len = (u32)resource_size(res); > - io_data->base = devm_ioremap(&pdev->dev, res->start, io_data->len); > - if (!io_data->base) { > + base = devm_ioremap_resource(&pdev->dev, res); > + if (!base) { devm_ioremap_resource() returns an ERR_PTR on failure, not NULL. > DRM_ERROR("%pS->%s: ioremap failed\n", > __builtin_return_address(0), __func__); > - return -EIO; > + return ERR_PTR(-EIO); > } > > - return 0; > + *len = resource_size(res); > + return base; > } > > static int dp_parser_ctrl_res(struct dp_parser *parser) > { > - int rc = 0; > struct platform_device *pdev = parser->pdev; > struct dp_io *io = &parser->io; > + struct dss_io_data *dss = &io->dp_controller; > > - rc = msm_dss_ioremap(pdev, &io->dp_controller); > - if (rc) { > - DRM_ERROR("unable to remap dp io resources, rc=%d\n", rc); > - return rc; > + dss->base = dp_ioremap(pdev, 0, &dss->len); > + if (IS_ERR(dss->base)) { > + DRM_ERROR("unable to remap dp io region: %pe\n", dss->base); > + return PTR_ERR(dss->base); > } > > io->phy = devm_phy_get(&pdev->dev, "dp");