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.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 B791DC433C1 for ; Sun, 28 Mar 2021 15:39:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8783761969 for ; Sun, 28 Mar 2021 15:39:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231241AbhC1Pi3 (ORCPT ); Sun, 28 Mar 2021 11:38:29 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:36166 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229538AbhC1PiL (ORCPT ); Sun, 28 Mar 2021 11:38:11 -0400 Received: from mail-il1-f199.google.com ([209.85.166.199]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lQXUP-0008Mc-Dm for linux-kernel@vger.kernel.org; Sun, 28 Mar 2021 15:38:09 +0000 Received: by mail-il1-f199.google.com with SMTP id g1so486790ild.15 for ; Sun, 28 Mar 2021 08:38:09 -0700 (PDT) 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=1J2me4BRR0mUOZbWzDbk8ObXSy9+cWyrkTA57Rydf9I=; b=rngkZrdBfBLXZ2DLt6Vd7tkNGKiwfJLUkffl7WG4sKQyMy5leL6C+LUwlQ3aQtLtF0 EuZqG/xQQytVuRlei5/k/iBkWwbdE5Acd9ong9Ua4AYzw37PgONMbbOuqxkT3gj+pWDc TzTXLW7E16pShN0kaC/RU2rCCRFJWctM4LUWOiFvdmKn+M6UVJc2wY4FWtqpehC7p/8p AUuQAost+k6H1Fd/75K1YcvNSuZoCuW7XVn6iUTXnThJXrAlxAKxeu3DgzCPNT+jaNkz sumx1MoiacWRnJ0HDlWI1SJsLwj3cqEYGUaLwMKGQX5x/O9DTZ1KEvo6LE0F2yXl25EY XyyQ== X-Gm-Message-State: AOAM533P7nStsgi6x9GaY52YFJaBxJdtf623jMfWxktkZjlxiOt4uLax uaOSpuJlyqwG+iOTGum5eSa20CF7vXzNgYj32GXblmAron/ESpykeNgvkt6uOoOyKIZ5BZ8wmnN 0vKGL8ZB87uI10Ldd5MAYmS4YqOJsxVfW9pHrvS2Y4w== X-Received: by 2002:a92:c150:: with SMTP id b16mr16793305ilh.202.1616945888367; Sun, 28 Mar 2021 08:38:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytCZecaEq92p4ZHqxX/W6THB3gXSvr2bCtovOLqeTc68eQQrzsH7O1CGOyUBSPw6BReMeOcA== X-Received: by 2002:a92:c150:: with SMTP id b16mr16793295ilh.202.1616945888031; Sun, 28 Mar 2021 08:38:08 -0700 (PDT) Received: from xps13.dannf (c-71-56-235-36.hsd1.co.comcast.net. [71.56.235.36]) by smtp.gmail.com with ESMTPSA id 14sm8335316ilt.54.2021.03.28.08.38.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Mar 2021 08:38:07 -0700 (PDT) Date: Sun, 28 Mar 2021 09:38:05 -0600 From: dann frazier To: Dejin Zheng Cc: toan@os.amperecomputing.com, lorenzo.pieralisi@arm.com, robh@kernel.org, bhelgaas@google.com, gustavo.pimentel@synopsys.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] PCI: xgene: fix a mistake about cfg address Message-ID: References: <20210328144118.305074-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210328144118.305074-1-zhengdejin5@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Mar 28, 2021 at 10:41:18PM +0800, Dejin Zheng wrote: > It has a wrong modification to the xgene driver by the commit > e2dcd20b1645a. it use devm_platform_ioremap_resource_byname() to > simplify codes and remove the res variable, But the following code > needs to use this res variable, So after this commit, the port->cfg_addr > will get a wrong address. Now, revert it. > > Fixes: e2dcd20b1645a ("PCI: controller: Convert to devm_platform_ioremap_resource_byname()") > Reported-by: dann.frazier@canonical.com > Signed-off-by: Dejin Zheng Tested-by: dann frazier Thanks! -dann > --- > drivers/pci/controller/pci-xgene.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c > index 2afdc865253e..7f503dd4ff81 100644 > --- a/drivers/pci/controller/pci-xgene.c > +++ b/drivers/pci/controller/pci-xgene.c > @@ -354,7 +354,8 @@ static int xgene_pcie_map_reg(struct xgene_pcie_port *port, > if (IS_ERR(port->csr_base)) > return PTR_ERR(port->csr_base); > > - port->cfg_base = devm_platform_ioremap_resource_byname(pdev, "cfg"); > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg"); > + port->cfg_base = devm_ioremap_resource(dev, res); > if (IS_ERR(port->cfg_base)) > return PTR_ERR(port->cfg_base); > port->cfg_addr = res->start;