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 phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1D1B0C433EF for ; Tue, 29 Mar 2022 17:01:31 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8B3348405C; Tue, 29 Mar 2022 19:00:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="QDhjFE4I"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F37E684029; Tue, 29 Mar 2022 18:59:47 +0200 (CEST) Received: from mail-wm1-x34a.google.com (mail-wm1-x34a.google.com [IPv6:2a00:1450:4864:20::34a]) (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 E305384036 for ; Tue, 29 Mar 2022 18:59:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=3-TpDYgYKBpQyG0I994CC492.0CAI-zCCH96GHG.12BL.12@flex--ascull.bounces.google.com Received: by mail-wm1-x34a.google.com with SMTP id v62-20020a1cac41000000b0038cfe6edf3fso1041605wme.5 for ; Tue, 29 Mar 2022 09:59:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=SmZx5cDgrpdeNexHXDIKd2F80GicDCO4kNDMNwVDeUc=; b=QDhjFE4IVT75BbDBs6jZdTXv6nz1CD9qk41iWE4TaPayJ7Pa+on99rx6UgDjSuWfZr R0h5gmvyWddoKdRpJmzetAq6aazUIDf3ro9hH0dmCNpWN9P4nxeCyQxxvHAlE8UTZVmi zjzPF2ZzT6WDj20HG2K1/O2zm223nJPr2h3ASRoHiSD0M6e2XGbchrLfgzaA6PlXnN1I oS5IyBITErYZD/4uGtIKo+qCXWW2db02E16MigVs5gAnOww7jYn04T8CGiPNdEQOZIzr Lk6D7MvkYEzCDFiUhYKzMaWz8Fh0EBL+CEwyZbU/sAib+5eprSyS6SV3R9DxPlAgfein IzLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=SmZx5cDgrpdeNexHXDIKd2F80GicDCO4kNDMNwVDeUc=; b=o4XMVAa7lXwyo6HbsQW/wOYbvCZcd1de1QfYqcRv6ZAWYI0VsqlKeYbIBEqwNnUP90 FvW8sNXk9rAHw53Cg4B03mbhjiJkhwbwcXgUObMJil6HsoYjTYDYq/aLlzCnMtlv8wSu SDgW+XU3IRqYMSY5WgDm7j4KrtxvTWQT4EtWCqkQRTqqEFLPY5OwZ5+Ag5U8Acm0ckDB h19e1P7vQXXD0fC7jCGjg5Va52b8W8EYzg6nTe6qv123SdD9eCHbEjGdHBXiuSKcKfjp C0y/Sk5PUM/7QvXk196bQs6x/gTUg8vBht6HVP/QY/oJ5auNR/dgDnaVct58Zxnu/iNx N59w== X-Gm-Message-State: AOAM532M+sbagsG+RSRXrrwRQ8FVCCDS5XWg8laxeizzJ0zsIOEnCDj6 OVnOYlUrbfht2GtBtk7H6SGbtiQCJTn979E98+6Mpl75hyyCv71+aRP0kcg7LFYK4nW/xhmCmAY hqmdagH1uw4eQ1JrZveBmWshdw/SkN6wSGstzK1B/k+IjVayfj/NMmLpDt2o= X-Google-Smtp-Source: ABdhPJxanS6vjisOD/uzTXs9TZ4Ov6/UYYMWYyIkHqcBFy3pTyrveZNVD+OQZs4A+eQBFzXDsXgG6KyrNrA= X-Received: from ascull.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:1510]) (user=ascull job=sendgmr) by 2002:a7b:c841:0:b0:389:864c:e715 with SMTP id c1-20020a7bc841000000b00389864ce715mr178912wml.72.1648573177349; Tue, 29 Mar 2022 09:59:37 -0700 (PDT) Date: Tue, 29 Mar 2022 16:58:50 +0000 In-Reply-To: <20220329165900.1139885-1-ascull@google.com> Message-Id: <20220329165900.1139885-9-ascull@google.com> Mime-Version: 1.0 References: <20220329165900.1139885-1-ascull@google.com> X-Mailer: git-send-email 2.35.1.1021.g381101b075-goog Subject: [PATCH v2 08/18] pci: Fix use of flags in dm_pci_map_bar() From: Andrew Scull To: u-boot@lists.denx.de Cc: sjg@chromium.org, bmeng.cn@gmail.com, adelva@google.com, keirf@google.com, ptosi@google.com, Andrew Scull Content-Type: text/plain; charset="UTF-8" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean The flags parameter of dm_pci_map_bar() is used for PCI region flags rather than memory mapping flags. Fix the type to match that of the region flags and stop using the regions flags as memory mapping flags. Signed-off-by: Andrew Scull --- drivers/pci/pci-uclass.c | 10 +++++----- include/pci.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 33dda00002..8bbeb62f2e 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1533,8 +1533,8 @@ static phys_addr_t dm_pci_map_ea_virt(struct udevice *dev, int ea_off, return addr; } -static void *dm_pci_map_ea_bar(struct udevice *dev, int bar, int flags, - int ea_off, struct pci_child_plat *pdata) +static void *dm_pci_map_ea_bar(struct udevice *dev, int bar, int ea_off, + struct pci_child_plat *pdata) { int ea_cnt, i, entry_size; int bar_id = (bar - PCI_BASE_ADDRESS_0) >> 2; @@ -1577,13 +1577,13 @@ static void *dm_pci_map_ea_bar(struct udevice *dev, int bar, int flags, addr += dm_pci_map_ea_virt(dev, ea_off, pdata); /* size ignored for now */ - return map_physmem(addr, 0, flags); + return map_physmem(addr, 0, MAP_NOCACHE); } return 0; } -void *dm_pci_map_bar(struct udevice *dev, int bar, int flags) +void *dm_pci_map_bar(struct udevice *dev, int bar, unsigned long flags) { struct pci_child_plat *pdata = dev_get_parent_plat(dev); struct udevice *udev = dev; @@ -1608,7 +1608,7 @@ void *dm_pci_map_bar(struct udevice *dev, int bar, int flags) */ ea_off = dm_pci_find_capability(udev, PCI_CAP_ID_EA); if (ea_off) - return dm_pci_map_ea_bar(udev, bar, flags, ea_off, pdata); + return dm_pci_map_ea_bar(udev, bar, ea_off, pdata); /* read BAR address */ dm_pci_read_config32(udev, bar, &bar_response); diff --git a/include/pci.h b/include/pci.h index 673c95c6bb..5ba82826f4 100644 --- a/include/pci.h +++ b/include/pci.h @@ -1472,7 +1472,7 @@ pci_addr_t dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t addr, * @flags: Flags for the region type (PCI_REGION_...) * @return: pointer to the virtual address to use or 0 on error */ -void *dm_pci_map_bar(struct udevice *dev, int bar, int flags); +void *dm_pci_map_bar(struct udevice *dev, int bar, unsigned long flags); /** * dm_pci_find_next_capability() - find a capability starting from an offset -- 2.35.1.1021.g381101b075-goog