Message ID | 20200407210023.v4.12.I36321d5e30daf051900f01f6289dfc58439871ea@changeid |
---|---|
State | Superseded |
Delegated to: | Bin Meng |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=XPZC/4pE; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48xpz03TBdz9sPF for <incoming@patchwork.ozlabs.org>; Wed, 8 Apr 2020 13:04:28 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4E90A819D7; Wed, 8 Apr 2020 05:02:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="XPZC/4pE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5770C8197B; Wed, 8 Apr 2020 05:01:55 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x143.google.com (mail-il1-x143.google.com [IPv6:2607:f8b0:4864:20::143]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B533C8180F for <u-boot@lists.denx.de>; Wed, 8 Apr 2020 05:01:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x143.google.com with SMTP id n13so5381492ilm.5 for <u-boot@lists.denx.de>; Tue, 07 Apr 2020 20:01:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r0+RTcaskgBD9mb/PvvUKD70yh6aifN3mrow/fFbpRY=; b=XPZC/4pE8OiYdNgHRRuA1PkAT+q6RpsJRQCFkJM6GfkG3ceqkO3q5FGWv/H49W7Akx 3mCwM9ltMTSxF7GzXj0V4ff648KxxVLua/JuhOjJbPmH2DNyePr8sCpAhQe6iNJbt/fa WWvFpV7eVkcgf07OvKa3Q2aULizoiQuE7hDYA= 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=r0+RTcaskgBD9mb/PvvUKD70yh6aifN3mrow/fFbpRY=; b=Q8//86yAyTBQTNnqNEAGALCMSFhGVP9Il+Al6uGEuBnlWA+W1clFmu+ZwSE+LdAPo0 DUNE141yM11uVsZfvuERuzw+0r9vgSzouSfni3sKYX5fYICD703SHaBkT9EaIFSXLw+G llLmtQK/DefoMJHpYxJbs2cDvduNdXqqgnfwJkiVoIfVS/JVM3d2VS9vPgrx0EW3Cytq SwdQS/NRAM1xyIA1eEBJWyvVeDMeJc9CSLL6R0FllFdzU9R02gWAQNMbtPLYe+iTCGek SFEwoQS9Ig396LNphVcXAorbvwJDq72BC14gEnG9KyMtpJssmyy56H4ZEJ+crlrPikRI YzKQ== X-Gm-Message-State: AGi0PuYQ+GyPnYmfTo1VwvSAEWnDvOgwFQgGE0JF7rsfouqHdnthl9ec Yludf0GQb9sD2M4BH55CGADSnypyK9m7eQ== X-Google-Smtp-Source: APiQypL01JpBdrOAzFy5ylEb7YHEbgIQ6lnkycbQHjFA8G+T3M3MuHAkhYu5oLZZNSZBkDSJGp7W4Q== X-Received: by 2002:a92:7e82:: with SMTP id q2mr5572719ill.188.1586314907473; Tue, 07 Apr 2020 20:01:47 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id l6sm7732310ilh.27.2020.04.07.20.01.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 20:01:47 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Wolfgang Wallner <wolfgang.wallner@br-automation.com>, Bin Meng <bmeng.cn@gmail.com>, Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Leif Lindholm <leif@nuviainc.com>, Simon Glass <sjg@chromium.org>, Alex Marginean <alexm.osslist@gmail.com>, =?utf-8?q?Marek_Beh=C3=BAn?= <marek.behun@nic.cz>, Michael Walle <michael@walle.cc>, Thierry Reding <treding@nvidia.com> Subject: [PATCH v4 12/31] pci: Adjust dm_pci_read_bar32() to return errors correctly Date: Tue, 7 Apr 2020 21:00:48 -0600 Message-Id: <20200407210023.v4.12.I36321d5e30daf051900f01f6289dfc58439871ea@changeid> X-Mailer: git-send-email 2.26.0.292.g33ef6b2f38-goog In-Reply-To: <20200408030107.168474-1-sjg@chromium.org> References: <20200408030107.168474-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean |
Series |
dm: Add programmatic generation of ACPI tables (part A)
|
expand
|
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index ceb64517047..d2e10d6868a 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1213,7 +1213,14 @@ u32 dm_pci_read_bar32(const struct udevice *dev, int barnum) bar = PCI_BASE_ADDRESS_0 + barnum * 4; dm_pci_read_config32(dev, bar, &addr); - if (addr & PCI_BASE_ADDRESS_SPACE_IO) + + /* + * If we get an invalid address, return this so that comparisons with + * FDT_ADDR_T_NONE work correctly + */ + if (addr == 0xffffffff) + return addr; + else if (addr & PCI_BASE_ADDRESS_SPACE_IO) return addr & PCI_BASE_ADDRESS_IO_MASK; else return addr & PCI_BASE_ADDRESS_MEM_MASK;