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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EB4FC433F5 for ; Thu, 25 Nov 2021 14:06:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350685AbhKYOJi (ORCPT ); Thu, 25 Nov 2021 09:09:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:37694 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350802AbhKYOHi (ORCPT ); Thu, 25 Nov 2021 09:07:38 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 30D646101D; Thu, 25 Nov 2021 14:04:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637849066; bh=q7V8F6qSJHjqXtrI3YBq5loJBB2SpqG85pXCYkz7q4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gk2jVKFppZ+luLKOCu2PIDhdS6HLx5drsnFBsFE/5qZNVRBtOE7xv+48PntW/RhVA Z9xAhU2gAAXe77FUV4qSOTMSExXAXaBXBhN4kTIBtWVxVJ3Vub/j98v5IpNG2vwsVY hWLN7mcjcevVBgVIsrceGXkZp1UG7jiaD7GT8DXdUGCaXTnriTDagHGBmzCHThpJfX ew8Mhot9GrQP3Jfi0Ifl++JpiQUyfEm/4AoRCWIB71IytnNBIFVnsaIaIR3wnY2nxq +CPZ2EX1hYT9QD6YX/+/fzncKrt/EUxNyxjAKiHw/PMcrF1HR+HoW48FYOaG3VEU9+ mq5L7Gnbvy/OA== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Greg Kroah-Hartman , Sasha Levin Cc: pali@kernel.org, stable@vger.kernel.org, =?UTF-8?q?Marek=20Beh=C3=BAn?= , Lorenzo Pieralisi Subject: [PATCH 5.15 3/4] PCI: aardvark: Simplify initialization of rootcap on virtual bridge Date: Thu, 25 Nov 2021 15:04:15 +0100 Message-Id: <20211125140416.15181-4-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211125140416.15181-1-kabel@kernel.org> References: <20211125140416.15181-1-kabel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Pali Rohár commit 454c53271fc11f3aa5e44e41fd99ca181bd32c62 upstream. PCIe config space can be initialized also before pci_bridge_emul_init() call, so move rootcap initialization after PCI config space initialization. This simplifies the function a little since it removes one if (ret < 0) check. Link: https://lore.kernel.org/r/20211005180952.6812-11-kabel@kernel.org Signed-off-by: Pali Rohár Signed-off-by: Marek Behún Signed-off-by: Lorenzo Pieralisi Reviewed-by: Marek Behún Signed-off-by: Marek Behún --- drivers/pci/controller/pci-aardvark.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c index ff243be8410c..52caa6f86f58 100644 --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c @@ -992,7 +992,6 @@ static struct pci_bridge_emul_ops advk_pci_bridge_emul_ops = { static int advk_sw_pci_bridge_init(struct advk_pcie *pcie) { struct pci_bridge_emul *bridge = &pcie->bridge; - int ret; bridge->conf.vendor = cpu_to_le16(advk_readl(pcie, PCIE_CORE_DEV_ID_REG) & 0xffff); @@ -1012,19 +1011,14 @@ static int advk_sw_pci_bridge_init(struct advk_pcie *pcie) /* Support interrupt A for MSI feature */ bridge->conf.intpin = PCIE_CORE_INT_A_ASSERT_ENABLE; + /* Indicates supports for Completion Retry Status */ + bridge->pcie_conf.rootcap = cpu_to_le16(PCI_EXP_RTCAP_CRSVIS); + bridge->has_pcie = true; bridge->data = pcie; bridge->ops = &advk_pci_bridge_emul_ops; - /* PCIe config space can be initialized after pci_bridge_emul_init() */ - ret = pci_bridge_emul_init(bridge, 0); - if (ret < 0) - return ret; - - /* Indicates supports for Completion Retry Status */ - bridge->pcie_conf.rootcap = cpu_to_le16(PCI_EXP_RTCAP_CRSVIS); - - return 0; + return pci_bridge_emul_init(bridge, 0); } static bool advk_pcie_valid_device(struct advk_pcie *pcie, struct pci_bus *bus, -- 2.32.0