lkml.org 
[lkml]   [2020]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v2 pci-next] PCI: Keep both device name and resource name for config space remaps
    Follow the rule taken in commit 35bd8c07db2c
    ("devres: keep both device name and resource name in pretty name")
    and keep both device and resource names while requesting memory
    regions for PCI config space to prettify e.g. /proc/iomem output:

    Before (DWC Host Controller):

    18b00000-18b01fff : dbi
    18b10000-18b11fff : config
    18b20000-18b21fff : dbi
    18b30000-18b31fff : config

    After:

    18b00000-18b01fff : 18b00000.pci dbi
    18b10000-18b11fff : 18b00000.pci config
    18b20000-18b21fff : 18b20000.pci dbi
    18b30000-18b31fff : 18b20000.pci config

    Since v1 [0]:
    - massage subject and commit message (Bjorn);
    - no functional changes.

    [0] https://lore.kernel.org/lkml/JvyOzv8K8n5CCdP1xfLOdOWh4AbFrXdMMOEExr6em8@cp4-web-036.plabs.ch

    Cc: Bjorn Helgaas <bhelgaas@google.com>
    Signed-off-by: Alexander Lobakin <alobakin@pm.me>
    ---
    drivers/pci/pci.c | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
    index e578d34095e9..0716691f7d14 100644
    --- a/drivers/pci/pci.c
    +++ b/drivers/pci/pci.c
    @@ -4188,7 +4188,14 @@ void __iomem *devm_pci_remap_cfg_resource(struct device *dev,
    }

    size = resource_size(res);
    - name = res->name ?: dev_name(dev);
    +
    + if (res->name)
    + name = devm_kasprintf(dev, GFP_KERNEL, "%s %s", dev_name(dev),
    + res->name);
    + else
    + name = devm_kstrdup(dev, dev_name(dev), GFP_KERNEL);
    + if (!name)
    + return IOMEM_ERR_PTR(-ENOMEM);

    if (!devm_request_mem_region(dev, res->start, size, name)) {
    dev_err(dev, "can't request region for resource %pR\n", res);
    --
    2.29.2

    \
     
     \ /
      Last update: 2020-11-19 22:30    [W:5.034 / U:0.560 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site