[U-Boot,2/3] pci: pcie_fsl: reorder addr check function

Message ID	20191009043722.3413717-3-hs@denx.de
State	Deferred
Delegated to:	Priyanka Jain
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Heiko Schocher <hs@denx.de> To: U-Boot Mailing List <u-boot@lists.denx.de> Date: Wed, 9 Oct 2019 06:37:21 +0200 Message-Id: <20191009043722.3413717-3-hs@denx.de> In-Reply-To: <20191009043722.3413717-1-hs@denx.de> References: <20191009043722.3413717-1-hs@denx.de> MIME-Version: 1.0 Cc: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> Subject: [U-Boot] [PATCH 2/3] pci: pcie_fsl: reorder addr check function Precedence: list Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	pci: pcie_fsl: add support for none PCIe devices \| expand [U-Boot,0/3] pci: pcie_fsl: add support for none PCIe devices [U-Boot,1/3] pci: pcie_fsl: use pci_conv_size_to_32() [U-Boot,2/3] pci: pcie_fsl: reorder addr check function [U-Boot,3/3] pci: pcie_fsl: add support for "fsl, mpc8540-pci"

Message ID

20191009043722.3413717-3-hs@denx.de

State

Deferred

Delegated to:

Priyanka Jain

Headers

From: Heiko Schocher <hs@denx.de>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Date: Wed,  9 Oct 2019 06:37:21 +0200
Message-Id: <20191009043722.3413717-3-hs@denx.de>
In-Reply-To: <20191009043722.3413717-1-hs@denx.de>
References: <20191009043722.3413717-1-hs@denx.de>
MIME-Version: 1.0
Cc: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Subject: [U-Boot] [PATCH 2/3] pci: pcie_fsl: reorder addr check function
Precedence: list
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

pci: pcie_fsl: add support for none PCIe devices | expand

Commit Message

Heiko Schocher Oct. 9, 2019, 4:37 a.m. UTC

reorder checks in fsl_pcie_addr_valid(). Check first
stuff, we also can check when we use driver for PCI devices.

Signed-off-by: Heiko Schocher <hs@denx.de>
---

 drivers/pci/pcie_fsl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c
index ada6e12e2f..05b2522dac 100644
--- a/drivers/pci/pcie_fsl.c
+++ b/drivers/pci/pcie_fsl.c
@@ -30,13 +30,13 @@  static int fsl_pcie_addr_valid(struct fsl_pcie *pcie, pci_dev_t bdf)
 	if (PCI_BUS(bdf) < bus->seq)
 		return -EINVAL;
 
-	if (PCI_BUS(bdf) > bus->seq && (!fsl_pcie_link_up(pcie) || pcie->mode))
+	if (PCI_BUS(bdf) == (bus->seq + 1) && (PCI_DEV(bdf) > 0))
 		return -EINVAL;
 
-	if (PCI_BUS(bdf) == bus->seq && (PCI_DEV(bdf) > 0 || PCI_FUNC(bdf) > 0))
+	if (PCI_BUS(bdf) > bus->seq && (!fsl_pcie_link_up(pcie) || pcie->mode))
 		return -EINVAL;
 
-	if (PCI_BUS(bdf) == (bus->seq + 1) && (PCI_DEV(bdf) > 0))
+	if (PCI_BUS(bdf) == bus->seq && (PCI_DEV(bdf) > 0 || PCI_FUNC(bdf) > 0))
 		return -EINVAL;
 
 	return 0;

[U-Boot,2/3] pci: pcie_fsl: reorder addr check function

Commit Message

Patch