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 EE8F9C433F5 for ; Thu, 25 Nov 2021 11:27:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235162AbhKYLaz (ORCPT ); Thu, 25 Nov 2021 06:30:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:49790 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233959AbhKYL3j (ORCPT ); Thu, 25 Nov 2021 06:29:39 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 361B261106; Thu, 25 Nov 2021 11:26:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637839588; bh=esbk8gQsnePkaUBpyH89ZIaF3j9nnP/pXMmddSM6En8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p1rkCcGkbYw8+prHCuN7flvhyUhvCcDb5VfhnMCjHeXhS+/8qjcX7yQImkNXw723h cvKip4GezggrRlYU+88JLFguLJmrgkp2ueA2exUanrgm2PTmswJhxksDrRvZiRHBOB oa5PuMjQ+WHpO5WbHrMoyxXB4b/+EeYp2tw4qWiNxQ1N2pVaeNXr/uPohZqDqBFaQ4 YbzFKZBvB0BkuKYfaQud4YD10wkJJrM3P97+vz62Ntomo3T8WFv2Rt+fbK4whaeoAB uOavJMHw000oEvUNPQahY9Rw8jj07rzaXcKpgspXM1AO1gro/OTM7qdZTNEAu9lc3R dZvPzmUzpHHcg== 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.10 4/5] PCI: aardvark: Simplify initialization of rootcap on virtual bridge Date: Thu, 25 Nov 2021 12:26:11 +0100 Message-Id: <20211125112612.11501-5-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211125112612.11501-1-kabel@kernel.org> References: <20211125112612.11501-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 c81a811c75b8..45574b394571 100644 --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c @@ -999,7 +999,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); @@ -1019,19 +1018,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