From patchwork Wed Jun 5 13:07:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1110477 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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="JHgoWdE+"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45Jpww0n0Dz9s4Y for ; Wed, 5 Jun 2019 23:07:25 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 9760BC21E62; Wed, 5 Jun 2019 13:07:19 +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 82FFCC21C2F; Wed, 5 Jun 2019 13:07:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6BDA9C21C2F; Wed, 5 Jun 2019 13:07:16 +0000 (UTC) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by lists.denx.de (Postfix) with ESMTPS id D0901C21C27 for ; Wed, 5 Jun 2019 13:07:15 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id h17so12390330pgv.0 for ; Wed, 05 Jun 2019 06:07:15 -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; bh=xhC6yKbAmW66si9vPjOenQLYX5cq52edeCahv07tZrQ=; b=JHgoWdE+UjZ7uZcVSyam9rxNFmjIAYitXzJHYR19raIoxIhswgtrpIDyCGEDTVNDJF tPSz36dMEhlrRijVxu+M818MO83z1NJxCr47ZPKd38eGF1rpARQ098kv1Yw0mWT3c8OM xim8d3uKMGIFD96CDIFRf3loooFxdP5sNB91why+Lortc5jVSRQdYmJRgXLDUgLh5TKC NXXr6NjiqE2JWJuUr20euSDaeHkgacc3TqEIimqrQrAu+unVKwCaMRzDEdm5N+d8hviy 3RlfXc90XUJck3XHL6gfq043gchZqFQ324gQcP23rROe0aLeD45KF6CsFZCbr9J5nx5D kwdw== 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; bh=xhC6yKbAmW66si9vPjOenQLYX5cq52edeCahv07tZrQ=; b=RtoLxFGhvqBVCUaEdVRMWQupY3mW9oSavliQcigaNkP5KC4bt6ZYgGsY2k7yW05qpP WaMnwKyf5n9GM3YK80wecivSZd8N3rErr5tPbP5aAj1YVpMUcqlq3dQd7ZaByDtIxm/W Ceyy2ltXRIwq4C7Fa2fA7o7A6SdxwbIiL/us3Z6vaQQixmjNVoHv7MYjcEyTHPSbHlVn IemBboQrdktxRBa8SC0YdRYDCJZE183TW6Lq4GgLwsYf5xUB0hSGMq8tUbTUS+QCvawR vSygBgeh9jP1WnmU1TCMxa6b6SxtD+0kXsG/BakL2yTJwJI0H8V5hsgy9L9n7TSlhWhP o5gA== X-Gm-Message-State: APjAAAWw9/Hayt9+9C/9m7VyLxjfCBUtTghVp3E05Mwp5IiyJ+33O2Uo I79CunHhPoHdwGRkAt8C1ZQ= X-Google-Smtp-Source: APXvYqy6GG08UmADnDoPnTt8j9zoUaml5ujCBQyFooePSLli0gsojvYr2EAc+Jv9WPDNXSXd2F1fog== X-Received: by 2002:a17:90a:be0a:: with SMTP id a10mr1219549pjs.112.1559740031938; Wed, 05 Jun 2019 06:07:11 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id j15sm24145109pfn.187.2019.06.05.06.07.10 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 05 Jun 2019 06:07:11 -0700 (PDT) From: Bin Meng To: Simon Glass , U-Boot Mailing List Date: Wed, 5 Jun 2019 06:07:06 -0700 Message-Id: <1559740026-29276-1-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 Cc: Stefan Roese Subject: [U-Boot] [PATCH] pci: Avoid assigning PCI resources that are below 0x1000 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" commit b7598a43f2b4 ("[PATCH] Avoid assigning PCI resources from zero address") only moved the bus lower address to 0x1000 if the given bus start address is zero. The comment said 0x1000 is a reasonable starting value, hence we'd better apply the same adjustment when the given bus start address is below 0x1000. Signed-off-by: Bin Meng Reviewed-by: Stefan Roese --- drivers/pci/pci_auto_common.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci_auto_common.c b/drivers/pci/pci_auto_common.c index 1837873..3ff42f2 100644 --- a/drivers/pci/pci_auto_common.c +++ b/drivers/pci/pci_auto_common.c @@ -21,9 +21,12 @@ void pciauto_region_init(struct pci_region *res) /* * Avoid allocating PCI resources from address 0 -- this is illegal * according to PCI 2.1 and moreover, this is known to cause Linux IDE - * drivers to fail. Use a reasonable starting value of 0x1000 instead. + * drivers to fail. Use a reasonable starting value of 0x1000 instead + * if the bus start address is below 0x1000. */ - res->bus_lower = res->bus_start ? res->bus_start : 0x1000; + if (res->bus_start < 0x1000) + res->bus_start = 0x1000; + res->bus_lower = res->bus_start; } void pciauto_region_align(struct pci_region *res, pci_size_t size)