mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
![Jon Hunter](/assets/img/avatar_default.png)
7f10074474
("PCI: tegra: Add Tegra194 MCFG quirks for ECAM errata") caused a few build regressions: -7f10074474
removed the Makefile rule for CONFIG_PCIE_TEGRA194, so pcie-tegra.c can no longer be built as a module. Restore that rule. -7f10074474
added "#ifdef CONFIG_PCIE_TEGRA194" around the native driver, but that's only set when the driver is built-in (for a module, CONFIG_PCIE_TEGRA194_MODULE is defined). The ACPI quirk is completely independent of the rest of the native driver, so move the quirk to its own file and remove the #ifdef in the native driver. -7f10074474
added symbols that are always defined but used only when CONFIG_PCIEASPM, which causes warnings when CONFIG_PCIEASPM is not set: drivers/pci/controller/dwc/pcie-tegra194.c:259:18: warning: ‘event_cntr_data_offset’ defined but not used [-Wunused-const-variable=] drivers/pci/controller/dwc/pcie-tegra194.c:250:18: warning: ‘event_cntr_ctrl_offset’ defined but not used [-Wunused-const-variable=] drivers/pci/controller/dwc/pcie-tegra194.c:243:27: warning: ‘pcie_gen_freq’ defined but not used [-Wunused-const-variable=] Fixes:7f10074474
("PCI: tegra: Add Tegra194 MCFG quirks for ECAM errata") Link: https://lore.kernel.org/r/20210610064134.336781-1-jonathanh@nvidia.com Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Thierry Reding <treding@nvidia.com>
108 lines
2.7 KiB
C
108 lines
2.7 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* ACPI quirks for Tegra194 PCIe host controller
|
|
*
|
|
* Copyright (C) 2021 NVIDIA Corporation.
|
|
*
|
|
* Author: Vidya Sagar <vidyas@nvidia.com>
|
|
*/
|
|
|
|
#include <linux/pci.h>
|
|
#include <linux/pci-acpi.h>
|
|
#include <linux/pci-ecam.h>
|
|
|
|
#include "pcie-designware.h"
|
|
|
|
struct tegra194_pcie_ecam {
|
|
void __iomem *config_base;
|
|
void __iomem *iatu_base;
|
|
void __iomem *dbi_base;
|
|
};
|
|
|
|
static int tegra194_acpi_init(struct pci_config_window *cfg)
|
|
{
|
|
struct device *dev = cfg->parent;
|
|
struct tegra194_pcie_ecam *pcie_ecam;
|
|
|
|
pcie_ecam = devm_kzalloc(dev, sizeof(*pcie_ecam), GFP_KERNEL);
|
|
if (!pcie_ecam)
|
|
return -ENOMEM;
|
|
|
|
pcie_ecam->config_base = cfg->win;
|
|
pcie_ecam->iatu_base = cfg->win + SZ_256K;
|
|
pcie_ecam->dbi_base = cfg->win + SZ_512K;
|
|
cfg->priv = pcie_ecam;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void atu_reg_write(struct tegra194_pcie_ecam *pcie_ecam, int index,
|
|
u32 val, u32 reg)
|
|
{
|
|
u32 offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index);
|
|
|
|
writel(val, pcie_ecam->iatu_base + offset + reg);
|
|
}
|
|
|
|
static void program_outbound_atu(struct tegra194_pcie_ecam *pcie_ecam,
|
|
int index, int type, u64 cpu_addr,
|
|
u64 pci_addr, u64 size)
|
|
{
|
|
atu_reg_write(pcie_ecam, index, lower_32_bits(cpu_addr),
|
|
PCIE_ATU_LOWER_BASE);
|
|
atu_reg_write(pcie_ecam, index, upper_32_bits(cpu_addr),
|
|
PCIE_ATU_UPPER_BASE);
|
|
atu_reg_write(pcie_ecam, index, lower_32_bits(pci_addr),
|
|
PCIE_ATU_LOWER_TARGET);
|
|
atu_reg_write(pcie_ecam, index, lower_32_bits(cpu_addr + size - 1),
|
|
PCIE_ATU_LIMIT);
|
|
atu_reg_write(pcie_ecam, index, upper_32_bits(pci_addr),
|
|
PCIE_ATU_UPPER_TARGET);
|
|
atu_reg_write(pcie_ecam, index, type, PCIE_ATU_CR1);
|
|
atu_reg_write(pcie_ecam, index, PCIE_ATU_ENABLE, PCIE_ATU_CR2);
|
|
}
|
|
|
|
static void __iomem *tegra194_map_bus(struct pci_bus *bus,
|
|
unsigned int devfn, int where)
|
|
{
|
|
struct pci_config_window *cfg = bus->sysdata;
|
|
struct tegra194_pcie_ecam *pcie_ecam = cfg->priv;
|
|
u32 busdev;
|
|
int type;
|
|
|
|
if (bus->number < cfg->busr.start || bus->number > cfg->busr.end)
|
|
return NULL;
|
|
|
|
if (bus->number == cfg->busr.start) {
|
|
if (PCI_SLOT(devfn) == 0)
|
|
return pcie_ecam->dbi_base + where;
|
|
else
|
|
return NULL;
|
|
}
|
|
|
|
busdev = PCIE_ATU_BUS(bus->number) | PCIE_ATU_DEV(PCI_SLOT(devfn)) |
|
|
PCIE_ATU_FUNC(PCI_FUNC(devfn));
|
|
|
|
if (bus->parent->number == cfg->busr.start) {
|
|
if (PCI_SLOT(devfn) == 0)
|
|
type = PCIE_ATU_TYPE_CFG0;
|
|
else
|
|
return NULL;
|
|
} else {
|
|
type = PCIE_ATU_TYPE_CFG1;
|
|
}
|
|
|
|
program_outbound_atu(pcie_ecam, 0, type, cfg->res.start, busdev,
|
|
SZ_256K);
|
|
|
|
return pcie_ecam->config_base + where;
|
|
}
|
|
|
|
const struct pci_ecam_ops tegra194_pcie_ops = {
|
|
.init = tegra194_acpi_init,
|
|
.pci_ops = {
|
|
.map_bus = tegra194_map_bus,
|
|
.read = pci_generic_config_read,
|
|
.write = pci_generic_config_write,
|
|
}
|
|
};
|