From mboxrd@z Thu Jan 1 00:00:00 1970 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 E2A70C433EF for ; Tue, 29 Mar 2022 17:02:35 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ACE2D84016; Tue, 29 Mar 2022 19:01:44 +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="Saslozhg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 65AAE84043; Tue, 29 Mar 2022 18:59:59 +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 956A184030 for ; Tue, 29 Mar 2022 18:59:52 +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=3BztDYgYKBqICUEWNNIQQING.EQOW-DQQVNKUVU.FGPZ.FG@flex--ascull.bounces.google.com Received: by mail-wm1-x34a.google.com with SMTP id 84-20020a1c0257000000b0038124c99ebcso6945555wmc.9 for ; Tue, 29 Mar 2022 09:59:52 -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=buq10lncGqDiLKEMVFcUTyOFLWrksa9Su4/MLlkigTg=; b=SaslozhgRqNuwLp7eqGIlUJL5XZXiBjq5WtyRwmoQ+xU7NHU6KiPnqdvPCWSE9G/oq dOShglYnGI+rBDCmdTmH9D+7jAOFpVGoQre3eTWbzgd1+s3Ypa1WEql5/zd/NyyFYNwj des4BGaGFGGSwJ3gKc/tqEgLS1wsAJ6zHz7aLPP51DuJXMbyqjtPqeqdJtYxcjIgbI71 SqqSsarP4S4AQwr5eW0Q7+eOnBdSO9ywMUXoBiUHj8aZhhgBT0PKLQW+PMV6yDMG1lkg Y1LYIEE3VBKvmjMfpl0gt+a4ajnFlfNTdEEkIYagHE6WEhNmJmwVuZf+EYv+CuiciQPU 2UqQ== 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=buq10lncGqDiLKEMVFcUTyOFLWrksa9Su4/MLlkigTg=; b=rL7VImOqnjlO6QcQoq4QSRmL51Jih5unKkHuVsmtAOzq5dJHMaxxQ6MpqhihlbZvH7 QSI/zWLlkcE8MzI9ioZs6qkjB6B9GrVo/WhG/ixmVW9EE5q8MJJyQWLAgYBWkNgl0onO WrZx6RdTkP3amWCOElXZgJJ8aQU2JhGx4UjqPpmRKXOZxl/a5lJ/UaKJOCwRM0GOKLXG Mwac/uYawZ+s4rWL8ipSuAWeXF6OmYpBdYiA2+A8QLeg2W8do7GqDOARKVsbpPNmheSx R61o286HA9VmDS4ev1E4IVKUxU87PDbUihBN+MaB76C3X/sM+LXEYHjYV9bFHEPIIanV Pm1w== X-Gm-Message-State: AOAM533m1Sn9Tgz84A0n5L6S6YziIqlGTaEQkyKwl1t22TKycw5FFL0B KT/0/nKqDQYhV/WPMnxqcrRr6r5YcKvc6jucMreo/zfSCItBB+qfy/t4bmv4As9/+fRWy07LoOQ o/zLP+xOh+r+qpot4WWAshPOIUWJoHtk0N6H7cyy90i5c/NnzQ9bABD5ezwQ= X-Google-Smtp-Source: ABdhPJzIDJ354adKEBluBzq7IR27/pN7wMjRBLD8godLzw4oweEHmOz0LnkRIiRjo1SeU4N50sLXsxZMgO0= X-Received: from ascull.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:1510]) (user=ascull job=sendgmr) by 2002:a7b:c382:0:b0:388:2e76:49ed with SMTP id s2-20020a7bc382000000b003882e7649edmr92245wmj.195.1648573191932; Tue, 29 Mar 2022 09:59:51 -0700 (PDT) Date: Tue, 29 Mar 2022 16:58:57 +0000 In-Reply-To: <20220329165900.1139885-1-ascull@google.com> Message-Id: <20220329165900.1139885-16-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 15/18] pci: Update dm_pci_bus_to_virt() parameters 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 Add mask parameter and reorder length parameter to match the other PCI address conversion functions. Using PCI_REGION_TYPE as the mask gives the old behaviour. It's converted from a macro to an inline function as the length parameter is now used twice, but should only be calculated once. Signed-off-by: Andrew Scull --- drivers/bios_emulator/atibios.c | 4 ++-- drivers/pci/pci-uclass.c | 4 ++-- include/pci.h | 19 ++++++++++++++----- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c index 9547470a2f..cdc5ba6ad9 100644 --- a/drivers/bios_emulator/atibios.c +++ b/drivers/bios_emulator/atibios.c @@ -368,8 +368,8 @@ void *PCI_mapBIOSImage(struct udevice *pcidev) return NULL; } - BIOSImage = dm_pci_bus_to_virt(pcidev, BIOSImageBus, - PCI_REGION_MEM, 0, MAP_NOCACHE); + BIOSImage = dm_pci_bus_to_virt(pcidev, BIOSImageBus, 0, PCI_REGION_TYPE, + PCI_REGION_MEM, MAP_NOCACHE); /*Change the PCI BAR registers to map it onto the bus.*/ dm_pci_write_config32(pcidev, BIOSImageBAR, 0); diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 5069ada66d..676052090a 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1602,8 +1602,8 @@ void *dm_pci_map_bar(struct udevice *dev, int bar, size_t offset, size_t len, * a PCI range, but a better check would be to probe for the size of * the bar and prevent overflow more locally. */ - return dm_pci_bus_to_virt(udev, pci_bus_addr + offset, flags, len, - MAP_NOCACHE); + return dm_pci_bus_to_virt(udev, pci_bus_addr + offset, len, + PCI_REGION_TYPE, flags, MAP_NOCACHE); } static int _dm_pci_find_next_capability(struct udevice *dev, u8 pos, int cap) diff --git a/include/pci.h b/include/pci.h index 8198265269..683efcd1be 100644 --- a/include/pci.h +++ b/include/pci.h @@ -11,6 +11,8 @@ #ifndef _PCI_H #define _PCI_H +#include + #define PCI_CFG_SPACE_SIZE 256 #define PCI_CFG_SPACE_EXP_SIZE 4096 @@ -1584,9 +1586,14 @@ int dm_pci_flr(struct udevice *dev); #define dm_pci_virt_to_bus(dev, addr, flags) \ dm_pci_phys_to_bus(dev, (virt_to_phys(addr)), 0, PCI_REGION_TYPE, (flags)) -#define dm_pci_bus_to_virt(dev, addr, flags, len, map_flags) \ - map_physmem(dm_pci_bus_to_phys(dev, (addr), (len), PCI_REGION_TYPE, (flags)), \ - (len), (map_flags)) + +static inline void *dm_pci_bus_to_virt(struct udevice *dev, pci_addr_t addr, + size_t len, unsigned long mask, + unsigned long flags, + unsigned long map_flags) { + return map_physmem(dm_pci_bus_to_phys(dev, addr, len, mask, flags), + len, map_flags); +} #define dm_pci_phys_to_mem(dev, addr) \ dm_pci_phys_to_bus((dev), (addr), 0, PCI_REGION_TYPE, PCI_REGION_MEM) @@ -1600,11 +1607,13 @@ int dm_pci_flr(struct udevice *dev); #define dm_pci_virt_to_mem(dev, addr) \ dm_pci_virt_to_bus((dev), (addr), PCI_REGION_MEM) #define dm_pci_mem_to_virt(dev, addr, len, map_flags) \ - dm_pci_bus_to_virt((dev), (addr), PCI_REGION_MEM, (len), (map_flags)) + dm_pci_bus_to_virt((dev), (addr), (len), PCI_REGION_TYPE, \ + PCI_REGION_MEM, (map_flags)) #define dm_pci_virt_to_io(dev, addr) \ dm_pci_virt_to_bus((dev), (addr), PCI_REGION_IO) #define dm_pci_io_to_virt(dev, addr, len, map_flags) \ - dm_pci_bus_to_virt((dev), (addr), PCI_REGION_IO, (len), (map_flags)) + dm_pci_bus_to_virt((dev), (addr), (len), PCI_REGION_TYPE, \ + PCI_REGION_IO, (map_flags)) /** * dm_pci_find_device() - find a device by vendor/device ID -- 2.35.1.1021.g381101b075-goog