mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-16 01:38:22 +00:00
b3f96b4f99
With the newly added test cases for PCI configuration access, we get: => ut dm pci_busdev Test: dm_test_pci_busdev: pci.c test/dm/pci.c:49, dm_test_pci_busdev(): SANDBOX_PCI_VENDOR_ID == vendor: Expected 4660, got 65535 Test: dm_test_pci_busdev: pci.c (flat tree) test/dm/pci.c:49, dm_test_pci_busdev(): SANDBOX_PCI_VENDOR_ID == vendor: Expected 4660, got 65535 Failures: 2 The bug only shows up when bus number is not equal to zero. This is caused by the plain find_devfn parameter is passed to function call pci_bus_find_devfn(), inside which find_devfn is compared to devfn in the device's pplat structure. However pplat->devfn does not carry the bus number. Fix this by passing find_devfn with bus number masked. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
64 lines
1.3 KiB
C
64 lines
1.3 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (c) 2014 Google, Inc
|
|
* Written by Simon Glass <sjg@chromium.org>
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <dm.h>
|
|
#include <fdtdec.h>
|
|
#include <linux/libfdt.h>
|
|
#include <pci.h>
|
|
#include <dm/lists.h>
|
|
|
|
struct sandbox_pci_priv {
|
|
int dev_count;
|
|
};
|
|
|
|
int sandbox_pci_get_emul(struct udevice *bus, pci_dev_t find_devfn,
|
|
struct udevice **emulp)
|
|
{
|
|
struct udevice *dev;
|
|
int ret;
|
|
|
|
ret = pci_bus_find_devfn(bus, PCI_MASK_BUS(find_devfn), &dev);
|
|
if (ret) {
|
|
debug("%s: Could not find emulator for dev %x\n", __func__,
|
|
find_devfn);
|
|
return ret;
|
|
}
|
|
|
|
ret = device_find_first_child(dev, emulp);
|
|
if (ret)
|
|
return ret;
|
|
|
|
return *emulp ? 0 : -ENODEV;
|
|
}
|
|
|
|
static int sandbox_pci_emul_post_probe(struct udevice *dev)
|
|
{
|
|
struct sandbox_pci_priv *priv = dev->uclass->priv;
|
|
|
|
priv->dev_count++;
|
|
sandbox_set_enable_pci_map(true);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int sandbox_pci_emul_pre_remove(struct udevice *dev)
|
|
{
|
|
struct sandbox_pci_priv *priv = dev->uclass->priv;
|
|
|
|
priv->dev_count--;
|
|
sandbox_set_enable_pci_map(priv->dev_count > 0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
UCLASS_DRIVER(pci_emul) = {
|
|
.id = UCLASS_PCI_EMUL,
|
|
.name = "pci_emul",
|
|
.post_probe = sandbox_pci_emul_post_probe,
|
|
.pre_remove = sandbox_pci_emul_pre_remove,
|
|
.priv_auto_alloc_size = sizeof(struct sandbox_pci_priv),
|
|
};
|