From patchwork Tue Oct 29 21:07:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suneel Garapati X-Patchwork-Id: 1186299 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ssGqIZhP"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 472kpv0V77z9sCJ for ; Wed, 30 Oct 2019 08:13:58 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id AD9E8C21CB1; Tue, 29 Oct 2019 21:10:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 7088EC21E02; Tue, 29 Oct 2019 21:08:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 428A5C21E2F; Tue, 29 Oct 2019 21:08:39 +0000 (UTC) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by lists.denx.de (Postfix) with ESMTPS id 7CAC9C21DD3 for ; Tue, 29 Oct 2019 21:08:33 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id f19so10468859pgn.13 for ; Tue, 29 Oct 2019 14:08:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0q0agl3P6f0Qs2TGQUfnz5a0ZuIUu3bkicbO8YqyIXo=; b=ssGqIZhP6VsChOZMi3gddYVJc4t1aiG9GXCx8hX0Q3zbAzAHWCPAmi0MoV9oPiOZgA JicQ/dqdvq5kMdj3x9FRA4pwbj+/pNVQM4kRF6P6PTrLWWBCqE0UWzY0SBuDLXdflbRZ NOudaDB8Sz3yKZ6GVBQwNw/ixIlswCa2D4E5mW4KVAUOflpb+OnOOcN0UKWHu7ACDDWH ZC/VrCvashfRS1H4FfTAKAbttKRi+KFXMU3EHSLCt0REJtHGjApFOvpMHsQu8kq0Arix GgHx0fjaUAmqORIccBA69lt9GVP/ScgjueTzd4giRXmCsKnKiEaPRS+bhSHg8nXz4zXZ +IQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0q0agl3P6f0Qs2TGQUfnz5a0ZuIUu3bkicbO8YqyIXo=; b=LKCCA/iBKx49nm4i1FvxOefoR/qj/zrD5HZJtwk6bsIhOSN9Ncj3DfnTW63ZjL8nOe 5c+5MC8YslDif1putqD5LOzR0odlNXUSZ64SawJbqkPFHYzTEYkXf+eUsUSK7mipcv7c P8OTaHfixUmS1/Q6gQtjCaGy6vUPGCjkKNKMxY3/Ik2mMJqDR5bS0ivMHJDer13xVvRr 3RTC80XAA+hUS3VgK406AF6ua3qG+hlqVDLExdU8zdJmFLTK6o0XWP1wK+W+0S4XopIN VokggFDLlHvhvtiDEhAsUYRtzgrHF5KwIpeEblh+ar0I9fkZbqutXeTCVH8R8ohVBSHy W5Pg== X-Gm-Message-State: APjAAAVpucjDxxAlLTMVjiE3DLjGbTmK6UJEOm4O4T3G/9t3D47SlNiD 1c67/VQbYX/7Iiot0oUQTicCHOnw X-Google-Smtp-Source: APXvYqwANDwrZ0bXrvAxb2a/jWaTq/CLGTvfUEoh0us9GEi4+DxYtZLWWlt+NCOotbItxIgjvjorrQ== X-Received: by 2002:a62:68c1:: with SMTP id d184mr29768356pfc.195.1572383312079; Tue, 29 Oct 2019 14:08:32 -0700 (PDT) Received: from suneel.hsd1.ca.comcast.net ([2601:641:4000:c9c0:7044:5eef:7096:2413]) by smtp.gmail.com with ESMTPSA id q3sm131160pgj.54.2019.10.29.14.08.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Oct 2019 14:08:31 -0700 (PDT) From: Suneel Garapati To: u-boot Date: Tue, 29 Oct 2019 14:07:59 -0700 Message-Id: <20191029210821.1954-8-suneelglinux@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191029210821.1954-1-suneelglinux@gmail.com> References: <20191029210821.1954-1-suneelglinux@gmail.com> MIME-Version: 1.0 Cc: Tom Rini , Matthias Brugger , Joe Hershberger , Prasun Kapoor , Maen Suleiman , Chandrakala Chavva , Zi Shen Lim , Stefan Roese , Chris Packham Subject: [U-Boot] [RFC PATCH 07/29] drivers: pci-uclass: add support for Enhanced Allocation in Bridges X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Suneel Garapati If Enhanced Allocation capability is present in bridges, use it to read the fixed sub-ordinate bus number. Signed-off-by: Suneel Garapati Reviewed-by: Simon Glass --- drivers/pci/pci-uclass.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index f17e83565c..51f7135723 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -599,10 +599,20 @@ int dm_pci_hose_probe_bus(struct udevice *bus) { int sub_bus; int ret; + int ea_pos; + u8 reg; debug("%s\n", __func__); - sub_bus = pci_get_bus_max() + 1; + ea_pos = dm_pci_find_capability(bus, PCI_CAP_ID_EA); + + if (ea_pos) { + dm_pci_read_config8(bus, ea_pos + sizeof(u32) + sizeof(u8), + ®); + sub_bus = reg; + } else { + sub_bus = pci_get_bus_max() + 1; + } debug("%s: bus = %d/%s\n", __func__, sub_bus, bus->name); dm_pciauto_prescan_setup_bridge(bus, sub_bus); @@ -612,12 +622,15 @@ int dm_pci_hose_probe_bus(struct udevice *bus) ret); return ret; } - if (sub_bus != bus->seq) { - printf("%s: Internal error, bus '%s' got seq %d, expected %d\n", - __func__, bus->name, bus->seq, sub_bus); - return -EPIPE; + + if (!ea_pos) { + if (sub_bus != bus->seq) { + printf("%s: Internal error, bus '%s' got seq %d, expected %d\n", + __func__, bus->name, bus->seq, sub_bus); + return -EPIPE; + } + sub_bus = pci_get_bus_max(); } - sub_bus = pci_get_bus_max(); dm_pciauto_postscan_setup_bridge(bus, sub_bus); return sub_bus;