Skip to content

L
linux
Commit 9154b00f authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files
Options

Merge branch 'pci/ctrl/brcmstb' 

- Remove unnecessary forward declarations (Jim Quinlan)

- Prevent config space access when link is down (Jim Quinlan)

- Split post-link up initialization to brcm_pcie_start_link() (Jim Quinlan)

- Enable child bus device regulators described under Root Ports in DT (Jim
  Quinlan)

- Disable/enable regulators in suspend/resume (Jim Quinlan)

- Rename .map_bus() functions to end with 'map_bus' as they do in other
  drivers (Jim Quinlan)

* pci/ctrl/brcmstb:
  PCI: brcmstb: Rename .map_bus() functions to end with 'map_bus'
  PCI: brcmstb: Disable/enable regulators in suspend/resume
  PCI: brcmstb: Enable child bus device regulators from DT
  PCI: brcmstb: Split post-link up initialization to brcm_pcie_start_link()
  PCI: brcmstb: Prevent config space access when link is down
  PCI: brcmstb: Remove unnecessary forward declarations
parents 95aa832b 94c65116
Hide whitespace changes
Inline Side-by-side
Showing with 305 additions and 138 deletions
drivers/pci/controller/pcie-brcmstb.c
View file @ 9154b00f
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/pci-ecam.h> #include <linux/pci-ecam.h>
#include <linux/printk.h> #include <linux/printk.h>
#include <linux/regulator/consumer.h>
#include <linux/reset.h> #include <linux/reset.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -190,11 +191,6 @@ ...@@ -190,11 +191,6 @@
/* Forward declarations */ /* Forward declarations */
struct brcm_pcie; struct brcm_pcie;
static inline void brcm_pcie_bridge_sw_init_set_7278(struct brcm_pcie *pcie, u32 val);
static inline void brcm_pcie_bridge_sw_init_set_generic(struct brcm_pcie *pcie, u32 val);
static inline void brcm_pcie_perst_set_4908(struct brcm_pcie *pcie, u32 val);
static inline void brcm_pcie_perst_set_7278(struct brcm_pcie *pcie, u32 val);
static inline void brcm_pcie_perst_set_generic(struct brcm_pcie *pcie, u32 val);
enum { enum {
RGR1_SW_INIT_1, RGR1_SW_INIT_1,
...@@ -223,64 +219,9 @@ struct pcie_cfg_data { ...@@ -223,64 +219,9 @@ struct pcie_cfg_data {
void (*bridge_sw_init_set)(struct brcm_pcie *pcie, u32 val); void (*bridge_sw_init_set)(struct brcm_pcie *pcie, u32 val);
}; };
static const int pcie_offsets[] = { struct subdev_regulators {
[RGR1_SW_INIT_1] = 0x9210, unsigned int num_supplies;
[EXT_CFG_INDEX] = 0x9000, struct regulator_bulk_data supplies[];
[EXT_CFG_DATA] = 0x9004,
};
static const int pcie_offsets_bmips_7425[] = {
[RGR1_SW_INIT_1] = 0x8010,
[EXT_CFG_INDEX] = 0x8300,
[EXT_CFG_DATA] = 0x8304,
};
static const struct pcie_cfg_data generic_cfg = {
.offsets = pcie_offsets,
.type = GENERIC,
.perst_set = brcm_pcie_perst_set_generic,
.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
};
static const struct pcie_cfg_data bcm7425_cfg = {
.offsets = pcie_offsets_bmips_7425,
.type = BCM7425,
.perst_set = brcm_pcie_perst_set_generic,
.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
};
static const struct pcie_cfg_data bcm7435_cfg = {
.offsets = pcie_offsets,
.type = BCM7435,
.perst_set = brcm_pcie_perst_set_generic,
.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
};
static const struct pcie_cfg_data bcm4908_cfg = {
.offsets = pcie_offsets,
.type = BCM4908,
.perst_set = brcm_pcie_perst_set_4908,
.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
};
static const int pcie_offset_bcm7278[] = {
[RGR1_SW_INIT_1] = 0xc010,
[EXT_CFG_INDEX] = 0x9000,
[EXT_CFG_DATA] = 0x9004,
};
static const struct pcie_cfg_data bcm7278_cfg = {
.offsets = pcie_offset_bcm7278,
.type = BCM7278,
.perst_set = brcm_pcie_perst_set_7278,
.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_7278,
};
static const struct pcie_cfg_data bcm2711_cfg = {
.offsets = pcie_offsets,
.type = BCM2711,
.perst_set = brcm_pcie_perst_set_generic,
.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
}; };
struct brcm_msi { struct brcm_msi {
...@@ -320,6 +261,8 @@ struct brcm_pcie { ...@@ -320,6 +261,8 @@ struct brcm_pcie {
u32 hw_rev; u32 hw_rev;
void (*perst_set)(struct brcm_pcie *pcie, u32 val); void (*perst_set)(struct brcm_pcie *pcie, u32 val);
void (*bridge_sw_init_set)(struct brcm_pcie *pcie, u32 val); void (*bridge_sw_init_set)(struct brcm_pcie *pcie, u32 val);
struct subdev_regulators *sr;
bool ep_wakeup_capable;
}; };
static inline bool is_bmips(const struct brcm_pcie *pcie) static inline bool is_bmips(const struct brcm_pcie *pcie)
...@@ -741,52 +684,48 @@ static bool brcm_pcie_link_up(struct brcm_pcie *pcie) ...@@ -741,52 +684,48 @@ static bool brcm_pcie_link_up(struct brcm_pcie *pcie)
return dla && plu; return dla && plu;
} }
static void __iomem *brcm_pcie_map_conf(struct pci_bus *bus, unsigned int devfn, static void __iomem *brcm_pcie_map_bus(struct pci_bus *bus,
int where) unsigned int devfn, int where)
{ {
struct brcm_pcie *pcie = bus->sysdata; struct brcm_pcie *pcie = bus->sysdata;
void __iomem *base = pcie->base; void __iomem *base = pcie->base;
int idx; int idx;
/* Accesses to the RC go right to the RC registers if slot==0 */ /* Accesses to the RC go right to the RC registers if !devfn */
if (pci_is_root_bus(bus)) if (pci_is_root_bus(bus))
return PCI_SLOT(devfn) ? NULL : base + where; return devfn ? NULL : base + PCIE_ECAM_REG(where);
/* An access to our HW w/o link-up will cause a CPU Abort */
if (!brcm_pcie_link_up(pcie))
return NULL;
/* For devices, write to the config space index register */ /* For devices, write to the config space index register */
idx = PCIE_ECAM_OFFSET(bus->number, devfn, 0); idx = PCIE_ECAM_OFFSET(bus->number, devfn, 0);
writel(idx, pcie->base + PCIE_EXT_CFG_INDEX); writel(idx, pcie->base + PCIE_EXT_CFG_INDEX);
return base + PCIE_EXT_CFG_DATA + where; return base + PCIE_EXT_CFG_DATA + PCIE_ECAM_REG(where);
} }
static void __iomem *brcm_pcie_map_conf32(struct pci_bus *bus, unsigned int devfn, static void __iomem *brcm7425_pcie_map_bus(struct pci_bus *bus,
int where) unsigned int devfn, int where)
{ {
struct brcm_pcie *pcie = bus->sysdata; struct brcm_pcie *pcie = bus->sysdata;
void __iomem *base = pcie->base; void __iomem *base = pcie->base;
int idx; int idx;
/* Accesses to the RC go right to the RC registers if slot==0 */ /* Accesses to the RC go right to the RC registers if !devfn */
if (pci_is_root_bus(bus)) if (pci_is_root_bus(bus))
return PCI_SLOT(devfn) ? NULL : base + (where & ~0x3); return devfn ? NULL : base + PCIE_ECAM_REG(where);
/* An access to our HW w/o link-up will cause a CPU Abort */
if (!brcm_pcie_link_up(pcie))
return NULL;
/* For devices, write to the config space index register */ /* For devices, write to the config space index register */
idx = PCIE_ECAM_OFFSET(bus->number, devfn, (where & ~3)); idx = PCIE_ECAM_OFFSET(bus->number, devfn, where);
writel(idx, base + IDX_ADDR(pcie)); writel(idx, base + IDX_ADDR(pcie));
return base + DATA_ADDR(pcie); return base + DATA_ADDR(pcie);
} }
static struct pci_ops brcm_pcie_ops = {
.map_bus = brcm_pcie_map_conf,
.read = pci_generic_config_read,
.write = pci_generic_config_write,
};
static struct pci_ops brcm_pcie_ops32 = {
.map_bus = brcm_pcie_map_conf32,
.read = pci_generic_config_read32,
.write = pci_generic_config_write32,
};
static inline void brcm_pcie_bridge_sw_init_set_generic(struct brcm_pcie *pcie, u32 val) static inline void brcm_pcie_bridge_sw_init_set_generic(struct brcm_pcie *pcie, u32 val)
{ {
u32 tmp, mask = RGR1_SW_INIT_1_INIT_GENERIC_MASK; u32 tmp, mask = RGR1_SW_INIT_1_INIT_GENERIC_MASK;
...@@ -926,17 +865,13 @@ static inline int brcm_pcie_get_rc_bar2_size_and_offset(struct brcm_pcie *pcie, ...@@ -926,17 +865,13 @@ static inline int brcm_pcie_get_rc_bar2_size_and_offset(struct brcm_pcie *pcie,
static int brcm_pcie_setup(struct brcm_pcie *pcie) static int brcm_pcie_setup(struct brcm_pcie *pcie)
{ {
struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
u64 rc_bar2_offset, rc_bar2_size; u64 rc_bar2_offset, rc_bar2_size;
void __iomem *base = pcie->base; void __iomem *base = pcie->base;
struct device *dev = pcie->dev; struct pci_host_bridge *bridge;
struct resource_entry *entry; struct resource_entry *entry;
bool ssc_good = false;
struct resource *res;
int num_out_wins = 0;
u16 nlw, cls, lnksta;
int i, ret, memc;
u32 tmp, burst, aspm_support; u32 tmp, burst, aspm_support;
int num_out_wins = 0;
int ret, memc;
/* Reset the bridge */ /* Reset the bridge */
pcie->bridge_sw_init_set(pcie, 1); pcie->bridge_sw_init_set(pcie, 1);
...@@ -1012,6 +947,11 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) ...@@ -1012,6 +947,11 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
else else
pcie->msi_target_addr = BRCM_MSI_TARGET_ADDR_GT_4GB; pcie->msi_target_addr = BRCM_MSI_TARGET_ADDR_GT_4GB;
if (!brcm_pcie_rc_mode(pcie)) {
dev_err(pcie->dev, "PCIe RC controller misconfigured as Endpoint\n");
return -EINVAL;
}
/* disable the PCIe->GISB memory window (RC_BAR1) */ /* disable the PCIe->GISB memory window (RC_BAR1) */
tmp = readl(base + PCIE_MISC_RC_BAR1_CONFIG_LO); tmp = readl(base + PCIE_MISC_RC_BAR1_CONFIG_LO);
tmp &= ~PCIE_MISC_RC_BAR1_CONFIG_LO_SIZE_MASK; tmp &= ~PCIE_MISC_RC_BAR1_CONFIG_LO_SIZE_MASK;
...@@ -1022,31 +962,27 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) ...@@ -1022,31 +962,27 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
tmp &= ~PCIE_MISC_RC_BAR3_CONFIG_LO_SIZE_MASK; tmp &= ~PCIE_MISC_RC_BAR3_CONFIG_LO_SIZE_MASK;
writel(tmp, base + PCIE_MISC_RC_BAR3_CONFIG_LO); writel(tmp, base + PCIE_MISC_RC_BAR3_CONFIG_LO);
if (pcie->gen) /* Don't advertise L0s capability if 'aspm-no-l0s' */
brcm_pcie_set_gen(pcie, pcie->gen); aspm_support = PCIE_LINK_STATE_L1;
if (!of_property_read_bool(pcie->np, "aspm-no-l0s"))
/* Unassert the fundamental reset */ aspm_support |= PCIE_LINK_STATE_L0S;
pcie->perst_set(pcie, 0); tmp = readl(base + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY);
u32p_replace_bits(&tmp, aspm_support,
PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_ASPM_SUPPORT_MASK);
writel(tmp, base + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY);
/* /*
* Give the RC/EP time to wake up, before trying to configure RC. * For config space accesses on the RC, show the right class for
* Intermittently check status for link-up, up to a total of 100ms. * a PCIe-PCIe bridge (the default setting is to be EP mode).
*/ */
for (i = 0; i < 100 && !brcm_pcie_link_up(pcie); i += 5) tmp = readl(base + PCIE_RC_CFG_PRIV1_ID_VAL3);
msleep(5); u32p_replace_bits(&tmp, 0x060400,
PCIE_RC_CFG_PRIV1_ID_VAL3_CLASS_CODE_MASK);
if (!brcm_pcie_link_up(pcie)) { writel(tmp, base + PCIE_RC_CFG_PRIV1_ID_VAL3);
dev_err(dev, "link down\n");
return -ENODEV;
}
if (!brcm_pcie_rc_mode(pcie)) {
dev_err(dev, "PCIe misconfigured; is in EP mode\n");
return -EINVAL;
}
bridge = pci_host_bridge_from_priv(pcie);
resource_list_for_each_entry(entry, &bridge->windows) { resource_list_for_each_entry(entry, &bridge->windows) {
res = entry->res; struct resource *res = entry->res;
if (resource_type(res) != IORESOURCE_MEM) if (resource_type(res) != IORESOURCE_MEM)
continue; continue;
...@@ -1075,23 +1011,41 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) ...@@ -1075,23 +1011,41 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
num_out_wins++; num_out_wins++;
} }
/* Don't advertise L0s capability if 'aspm-no-l0s' */ /* PCIe->SCB endian mode for BAR */
aspm_support = PCIE_LINK_STATE_L1; tmp = readl(base + PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1);
if (!of_property_read_bool(pcie->np, "aspm-no-l0s")) u32p_replace_bits(&tmp, PCIE_RC_CFG_VENDOR_SPCIFIC_REG1_LITTLE_ENDIAN,
aspm_support |= PCIE_LINK_STATE_L0S; PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1_ENDIAN_MODE_BAR2_MASK);
tmp = readl(base + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY); writel(tmp, base + PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1);
u32p_replace_bits(&tmp, aspm_support,
PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_ASPM_SUPPORT_MASK); return 0;
writel(tmp, base + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY); }
static int brcm_pcie_start_link(struct brcm_pcie *pcie)
{
struct device *dev = pcie->dev;
void __iomem *base = pcie->base;
u16 nlw, cls, lnksta;
bool ssc_good = false;
u32 tmp;
int ret, i;
/* Unassert the fundamental reset */
pcie->perst_set(pcie, 0);
/* /*
* For config space accesses on the RC, show the right class for * Give the RC/EP time to wake up, before trying to configure RC.
* a PCIe-PCIe bridge (the default setting is to be EP mode). * Intermittently check status for link-up, up to a total of 100ms.
*/ */
tmp = readl(base + PCIE_RC_CFG_PRIV1_ID_VAL3); for (i = 0; i < 100 && !brcm_pcie_link_up(pcie); i += 5)
u32p_replace_bits(&tmp, 0x060400, msleep(5);
PCIE_RC_CFG_PRIV1_ID_VAL3_CLASS_CODE_MASK);
writel(tmp, base + PCIE_RC_CFG_PRIV1_ID_VAL3); if (!brcm_pcie_link_up(pcie)) {
dev_err(dev, "link down\n");
return -ENODEV;
}
if (pcie->gen)
brcm_pcie_set_gen(pcie, pcie->gen);
if (pcie->ssc) { if (pcie->ssc) {
ret = brcm_pcie_set_ssc(pcie); ret = brcm_pcie_set_ssc(pcie);
...@@ -1108,12 +1062,6 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) ...@@ -1108,12 +1062,6 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
pci_speed_string(pcie_link_speed[cls]), nlw, pci_speed_string(pcie_link_speed[cls]), nlw,
ssc_good ? "(SSC)" : "(!SSC)"); ssc_good ? "(SSC)" : "(!SSC)");
/* PCIe->SCB endian mode for BAR */
tmp = readl(base + PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1);
u32p_replace_bits(&tmp, PCIE_RC_CFG_VENDOR_SPCIFIC_REG1_LITTLE_ENDIAN,
PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1_ENDIAN_MODE_BAR2_MASK);
writel(tmp, base + PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1);
/* /*
* Refclk from RC should be gated with CLKREQ# input when ASPM L0s,L1 * Refclk from RC should be gated with CLKREQ# input when ASPM L0s,L1
* is enabled => setting the CLKREQ_DEBUG_ENABLE field to 1. * is enabled => setting the CLKREQ_DEBUG_ENABLE field to 1.
...@@ -1125,6 +1073,82 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) ...@@ -1125,6 +1073,82 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
return 0; return 0;
} }
static const char * const supplies[] = {
"vpcie3v3",
"vpcie3v3aux",
"vpcie12v",
};
static void *alloc_subdev_regulators(struct device *dev)
{
const size_t size = sizeof(struct subdev_regulators) +
sizeof(struct regulator_bulk_data) * ARRAY_SIZE(supplies);
struct subdev_regulators *sr;
int i;
sr = devm_kzalloc(dev, size, GFP_KERNEL);
if (sr) {
sr->num_supplies = ARRAY_SIZE(supplies);
for (i = 0; i < ARRAY_SIZE(supplies); i++)
sr->supplies[i].supply = supplies[i];
}
return sr;
}
static int brcm_pcie_add_bus(struct pci_bus *bus)
{
struct brcm_pcie *pcie = bus->sysdata;
struct device *dev = &bus->dev;
struct subdev_regulators *sr;
int ret;
if (!bus->parent || !pci_is_root_bus(bus->parent))
return 0;
if (dev->of_node) {
sr = alloc_subdev_regulators(dev);
if (!sr) {
dev_info(dev, "Can't allocate regulators for downstream device\n");
goto no_regulators;
}
pcie->sr = sr;
ret = regulator_bulk_get(dev, sr->num_supplies, sr->supplies);
if (ret) {
dev_info(dev, "No regulators for downstream device\n");
goto no_regulators;
}
ret = regulator_bulk_enable(sr->num_supplies, sr->supplies);
if (ret) {
dev_err(dev, "Can't enable regulators for downstream device\n");
regulator_bulk_free(sr->num_supplies, sr->supplies);
pcie->sr = NULL;
}
}
no_regulators:
brcm_pcie_start_link(pcie);
return 0;
}
static void brcm_pcie_remove_bus(struct pci_bus *bus)
{
struct brcm_pcie *pcie = bus->sysdata;
struct subdev_regulators *sr = pcie->sr;
struct device *dev = &bus->dev;
if (!sr)
return;
if (regulator_bulk_disable(sr->num_supplies, sr->supplies))
dev_err(dev, "Failed to disable regulators for downstream device\n");
regulator_bulk_free(sr->num_supplies, sr->supplies);
pcie->sr = NULL;
}
/* L23 is a low-power PCIe link state */ /* L23 is a low-power PCIe link state */
static void brcm_pcie_enter_l23(struct brcm_pcie *pcie) static void brcm_pcie_enter_l23(struct brcm_pcie *pcie)
{ {
...@@ -1221,9 +1245,21 @@ static void brcm_pcie_turn_off(struct brcm_pcie *pcie) ...@@ -1221,9 +1245,21 @@ static void brcm_pcie_turn_off(struct brcm_pcie *pcie)
pcie->bridge_sw_init_set(pcie, 1); pcie->bridge_sw_init_set(pcie, 1);
} }
static int brcm_pcie_suspend(struct device *dev) static int pci_dev_may_wakeup(struct pci_dev *dev, void *data)
{
bool *ret = data;
if (device_may_wakeup(&dev->dev)) {
*ret = true;
dev_info(&dev->dev, "Possible wake-up device; regulators will not be disabled\n");
}
return (int) *ret;
}
static int brcm_pcie_suspend_noirq(struct device *dev)
{ {
struct brcm_pcie *pcie = dev_get_drvdata(dev); struct brcm_pcie *pcie = dev_get_drvdata(dev);
struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
int ret; int ret;
brcm_pcie_turn_off(pcie); brcm_pcie_turn_off(pcie);
...@@ -1241,12 +1277,31 @@ static int brcm_pcie_suspend(struct device *dev) ...@@ -1241,12 +1277,31 @@ static int brcm_pcie_suspend(struct device *dev)
return ret; return ret;
} }
if (pcie->sr) {
/*
* Now turn off the regulators, but if at least one
* downstream device is enabled as a wake-up source, do not
* turn off regulators.
*/
pcie->ep_wakeup_capable = false;
pci_walk_bus(bridge->bus, pci_dev_may_wakeup,
&pcie->ep_wakeup_capable);
if (!pcie->ep_wakeup_capable) {
ret = regulator_bulk_disable(pcie->sr->num_supplies,
pcie->sr->supplies);
if (ret) {
dev_err(dev, "Could not turn off regulators\n");
reset_control_reset(pcie->rescal);
return ret;
}
}
}
clk_disable_unprepare(pcie->clk); clk_disable_unprepare(pcie->clk);
return 0; return 0;
} }
static int brcm_pcie_resume(struct device *dev) static int brcm_pcie_resume_noirq(struct device *dev)
{ {
struct brcm_pcie *pcie = dev_get_drvdata(dev); struct brcm_pcie *pcie = dev_get_drvdata(dev);
void __iomem *base; void __iomem *base;
...@@ -1281,11 +1336,37 @@ static int brcm_pcie_resume(struct device *dev) ...@@ -1281,11 +1336,37 @@ static int brcm_pcie_resume(struct device *dev)
if (ret) if (ret)
goto err_reset; goto err_reset;
if (pcie->sr) {
if (pcie->ep_wakeup_capable) {
/*
* We are resuming from a suspend. In the suspend we
* did not disable the power supplies, so there is
* no need to enable them (and falsely increase their
* usage count).
*/
pcie->ep_wakeup_capable = false;
} else {
ret = regulator_bulk_enable(pcie->sr->num_supplies,
pcie->sr->supplies);
if (ret) {
dev_err(dev, "Could not turn on regulators\n");
goto err_reset;
}
}
}
ret = brcm_pcie_start_link(pcie);
if (ret)
goto err_regulator;
if (pcie->msi) if (pcie->msi)
brcm_msi_set_regs(pcie->msi); brcm_msi_set_regs(pcie->msi);
return 0; return 0;
err_regulator:
if (pcie->sr)
regulator_bulk_disable(pcie->sr->num_supplies, pcie->sr->supplies);
err_reset: err_reset:
reset_control_rearm(pcie->rescal); reset_control_rearm(pcie->rescal);
err_disable_clk: err_disable_clk:
...@@ -1316,6 +1397,66 @@ static int brcm_pcie_remove(struct platform_device *pdev) ...@@ -1316,6 +1397,66 @@ static int brcm_pcie_remove(struct platform_device *pdev)
return 0; return 0;
} }
static const int pcie_offsets[] = {
[RGR1_SW_INIT_1] = 0x9210,
[EXT_CFG_INDEX] = 0x9000,
[EXT_CFG_DATA] = 0x9004,
};
static const int pcie_offsets_bmips_7425[] = {
[RGR1_SW_INIT_1] = 0x8010,
[EXT_CFG_INDEX] = 0x8300,
[EXT_CFG_DATA] = 0x8304,
};
static const struct pcie_cfg_data generic_cfg = {
.offsets = pcie_offsets,
.type = GENERIC,
.perst_set = brcm_pcie_perst_set_generic,
.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
};
static const struct pcie_cfg_data bcm7425_cfg = {
.offsets = pcie_offsets_bmips_7425,
.type = BCM7425,
.perst_set = brcm_pcie_perst_set_generic,
.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
};
static const struct pcie_cfg_data bcm7435_cfg = {
.offsets = pcie_offsets,
.type = BCM7435,
.perst_set = brcm_pcie_perst_set_generic,
.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
};
static const struct pcie_cfg_data bcm4908_cfg = {
.offsets = pcie_offsets,
.type = BCM4908,
.perst_set = brcm_pcie_perst_set_4908,
.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
};
static const int pcie_offset_bcm7278[] = {
[RGR1_SW_INIT_1] = 0xc010,
[EXT_CFG_INDEX] = 0x9000,
[EXT_CFG_DATA] = 0x9004,
};
static const struct pcie_cfg_data bcm7278_cfg = {
.offsets = pcie_offset_bcm7278,
.type = BCM7278,
.perst_set = brcm_pcie_perst_set_7278,
.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_7278,
};
static const struct pcie_cfg_data bcm2711_cfg = {
.offsets = pcie_offsets,
.type = BCM2711,
.perst_set = brcm_pcie_perst_set_generic,
.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
};
static const struct of_device_id brcm_pcie_match[] = { static const struct of_device_id brcm_pcie_match[] = {
{ .compatible = "brcm,bcm2711-pcie", .data = &bcm2711_cfg }, { .compatible = "brcm,bcm2711-pcie", .data = &bcm2711_cfg },
{ .compatible = "brcm,bcm4908-pcie", .data = &bcm4908_cfg }, { .compatible = "brcm,bcm4908-pcie", .data = &bcm4908_cfg },
...@@ -1328,6 +1469,22 @@ static const struct of_device_id brcm_pcie_match[] = { ...@@ -1328,6 +1469,22 @@ static const struct of_device_id brcm_pcie_match[] = {
{}, {},
}; };
static struct pci_ops brcm_pcie_ops = {
.map_bus = brcm_pcie_map_bus,
.read = pci_generic_config_read,
.write = pci_generic_config_write,
.add_bus = brcm_pcie_add_bus,
.remove_bus = brcm_pcie_remove_bus,
};
static struct pci_ops brcm7425_pcie_ops = {
.map_bus = brcm7425_pcie_map_bus,
.read = pci_generic_config_read32,
.write = pci_generic_config_write32,
.add_bus = brcm_pcie_add_bus,
.remove_bus = brcm_pcie_remove_bus,
};
static int brcm_pcie_probe(struct platform_device *pdev) static int brcm_pcie_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node, *msi_np; struct device_node *np = pdev->dev.of_node, *msi_np;
...@@ -1414,12 +1571,22 @@ static int brcm_pcie_probe(struct platform_device *pdev) ...@@ -1414,12 +1571,22 @@ static int brcm_pcie_probe(struct platform_device *pdev)
} }
} }
bridge->ops = pcie->type == BCM7425 ? &brcm_pcie_ops32 : &brcm_pcie_ops; bridge->ops = pcie->type == BCM7425 ? &brcm7425_pcie_ops : &brcm_pcie_ops;
bridge->sysdata = pcie; bridge->sysdata = pcie;
platform_set_drvdata(pdev, pcie); platform_set_drvdata(pdev, pcie);
return pci_host_probe(bridge); ret = pci_host_probe(bridge);
if (!ret && !brcm_pcie_link_up(pcie))
ret = -ENODEV;
if (ret) {
brcm_pcie_remove(pdev);
return ret;
}
return 0;
fail: fail:
__brcm_pcie_remove(pcie); __brcm_pcie_remove(pcie);
return ret; return ret;
...@@ -1428,8 +1595,8 @@ static int brcm_pcie_probe(struct platform_device *pdev) ...@@ -1428,8 +1595,8 @@ static int brcm_pcie_probe(struct platform_device *pdev)
MODULE_DEVICE_TABLE(of, brcm_pcie_match); MODULE_DEVICE_TABLE(of, brcm_pcie_match);
static const struct dev_pm_ops brcm_pcie_pm_ops = { static const struct dev_pm_ops brcm_pcie_pm_ops = {
.suspend = brcm_pcie_suspend, .suspend_noirq = brcm_pcie_suspend_noirq,
.resume = brcm_pcie_resume, .resume_noirq = brcm_pcie_resume_noirq,
}; };
static struct platform_driver brcm_pcie_driver = { static struct platform_driver brcm_pcie_driver = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7