6e347b5e05
The host bridge memory window resource is inserted into the iomem_resource
tree and cannot be deallocated until the host bridge itself is removed.
Previously, the window was on the stack, which meant the iomem_resource
entry pointed into the stack and was corrupted as soon as the probe
function returned, which caused memory corruption and errors like this:
pcie_iproc_bcma bcma0:8: resource collision: [mem 0x40000000-0x47ffffff] conflicts with PCIe MEM space [mem 0x40000000-0x47ffffff]
Move the memory window resource from the stack into struct iproc_pcie so
its lifetime matches that of the host bridge.
Fixes: c3245a5664 ("PCI: iproc: Request host bridge window resources")
Reported-and-tested-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: stable@vger.kernel.org # v4.8+
119 lines
3.1 KiB
C
119 lines
3.1 KiB
C
/*
|
|
* Copyright (C) 2015 Broadcom Corporation
|
|
* Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation version 2.
|
|
*
|
|
* This program is distributed "as is" WITHOUT ANY WARRANTY of any
|
|
* kind, whether express or implied; without even the implied warranty
|
|
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/module.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/phy/phy.h>
|
|
#include <linux/bcma/bcma.h>
|
|
#include <linux/ioport.h>
|
|
|
|
#include "pcie-iproc.h"
|
|
|
|
|
|
/* NS: CLASS field is R/O, and set to wrong 0x200 value */
|
|
static void bcma_pcie2_fixup_class(struct pci_dev *dev)
|
|
{
|
|
dev->class = PCI_CLASS_BRIDGE_PCI << 8;
|
|
}
|
|
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0x8011, bcma_pcie2_fixup_class);
|
|
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0x8012, bcma_pcie2_fixup_class);
|
|
|
|
static int iproc_pcie_bcma_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
|
{
|
|
struct pci_sys_data *sys = dev->sysdata;
|
|
struct iproc_pcie *pcie = sys->private_data;
|
|
struct bcma_device *bdev = container_of(pcie->dev, struct bcma_device, dev);
|
|
|
|
return bcma_core_irq(bdev, 5);
|
|
}
|
|
|
|
static int iproc_pcie_bcma_probe(struct bcma_device *bdev)
|
|
{
|
|
struct device *dev = &bdev->dev;
|
|
struct iproc_pcie *pcie;
|
|
LIST_HEAD(resources);
|
|
int ret;
|
|
|
|
pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
|
|
if (!pcie)
|
|
return -ENOMEM;
|
|
|
|
pcie->dev = dev;
|
|
|
|
pcie->type = IPROC_PCIE_PAXB_BCMA;
|
|
pcie->base = bdev->io_addr;
|
|
if (!pcie->base) {
|
|
dev_err(dev, "no controller registers\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
pcie->base_addr = bdev->addr;
|
|
|
|
pcie->mem.start = bdev->addr_s[0];
|
|
pcie->mem.end = bdev->addr_s[0] + SZ_128M - 1;
|
|
pcie->mem.name = "PCIe MEM space";
|
|
pcie->mem.flags = IORESOURCE_MEM;
|
|
pci_add_resource(&resources, &pcie->mem);
|
|
|
|
pcie->map_irq = iproc_pcie_bcma_map_irq;
|
|
|
|
ret = iproc_pcie_setup(pcie, &resources);
|
|
if (ret) {
|
|
dev_err(dev, "PCIe controller setup failed\n");
|
|
pci_free_resource_list(&resources);
|
|
return ret;
|
|
}
|
|
|
|
bcma_set_drvdata(bdev, pcie);
|
|
return 0;
|
|
}
|
|
|
|
static void iproc_pcie_bcma_remove(struct bcma_device *bdev)
|
|
{
|
|
struct iproc_pcie *pcie = bcma_get_drvdata(bdev);
|
|
|
|
iproc_pcie_remove(pcie);
|
|
}
|
|
|
|
static const struct bcma_device_id iproc_pcie_bcma_table[] = {
|
|
BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_NS_PCIEG2, BCMA_ANY_REV, BCMA_ANY_CLASS),
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(bcma, iproc_pcie_bcma_table);
|
|
|
|
static struct bcma_driver iproc_pcie_bcma_driver = {
|
|
.name = KBUILD_MODNAME,
|
|
.id_table = iproc_pcie_bcma_table,
|
|
.probe = iproc_pcie_bcma_probe,
|
|
.remove = iproc_pcie_bcma_remove,
|
|
};
|
|
|
|
static int __init iproc_pcie_bcma_init(void)
|
|
{
|
|
return bcma_driver_register(&iproc_pcie_bcma_driver);
|
|
}
|
|
module_init(iproc_pcie_bcma_init);
|
|
|
|
static void __exit iproc_pcie_bcma_exit(void)
|
|
{
|
|
bcma_driver_unregister(&iproc_pcie_bcma_driver);
|
|
}
|
|
module_exit(iproc_pcie_bcma_exit);
|
|
|
|
MODULE_AUTHOR("Hauke Mehrtens");
|
|
MODULE_DESCRIPTION("Broadcom iProc PCIe BCMA driver");
|
|
MODULE_LICENSE("GPL v2");
|