Commit 8115846e authored by Tony Breeds's avatar Tony Breeds Committed by Josh Boyer

powerpc/44x: pci: Add a want_sdr flag into ppc4xx_pciex_hwops

Currituck doesn't need nor use SDR so aborting the pci setup if there is
no sdr-base would be bad.

Add a flag to ppc4xx_pciex_hwops for the backends to state if they need
SDR and then only complain and abort if they do and it's not found in
the device tree.
Signed-off-by: default avatarTony Breeds <tony@bakeyournoodle.com>
Signed-off-by: default avatarJosh Boyer <jwboyer@gmail.com>
parent 9fb55296
...@@ -647,6 +647,7 @@ static unsigned int ppc4xx_pciex_port_count; ...@@ -647,6 +647,7 @@ static unsigned int ppc4xx_pciex_port_count;
struct ppc4xx_pciex_hwops struct ppc4xx_pciex_hwops
{ {
bool want_sdr;
int (*core_init)(struct device_node *np); int (*core_init)(struct device_node *np);
int (*port_init_hw)(struct ppc4xx_pciex_port *port); int (*port_init_hw)(struct ppc4xx_pciex_port *port);
int (*setup_utl)(struct ppc4xx_pciex_port *port); int (*setup_utl)(struct ppc4xx_pciex_port *port);
...@@ -916,6 +917,7 @@ static int ppc440speB_pciex_init_utl(struct ppc4xx_pciex_port *port) ...@@ -916,6 +917,7 @@ static int ppc440speB_pciex_init_utl(struct ppc4xx_pciex_port *port)
static struct ppc4xx_pciex_hwops ppc440speA_pcie_hwops __initdata = static struct ppc4xx_pciex_hwops ppc440speA_pcie_hwops __initdata =
{ {
.want_sdr = true,
.core_init = ppc440spe_pciex_core_init, .core_init = ppc440spe_pciex_core_init,
.port_init_hw = ppc440speA_pciex_init_port_hw, .port_init_hw = ppc440speA_pciex_init_port_hw,
.setup_utl = ppc440speA_pciex_init_utl, .setup_utl = ppc440speA_pciex_init_utl,
...@@ -924,6 +926,7 @@ static struct ppc4xx_pciex_hwops ppc440speA_pcie_hwops __initdata = ...@@ -924,6 +926,7 @@ static struct ppc4xx_pciex_hwops ppc440speA_pcie_hwops __initdata =
static struct ppc4xx_pciex_hwops ppc440speB_pcie_hwops __initdata = static struct ppc4xx_pciex_hwops ppc440speB_pcie_hwops __initdata =
{ {
.want_sdr = true,
.core_init = ppc440spe_pciex_core_init, .core_init = ppc440spe_pciex_core_init,
.port_init_hw = ppc440speB_pciex_init_port_hw, .port_init_hw = ppc440speB_pciex_init_port_hw,
.setup_utl = ppc440speB_pciex_init_utl, .setup_utl = ppc440speB_pciex_init_utl,
...@@ -1034,6 +1037,7 @@ static int ppc460ex_pciex_init_utl(struct ppc4xx_pciex_port *port) ...@@ -1034,6 +1037,7 @@ static int ppc460ex_pciex_init_utl(struct ppc4xx_pciex_port *port)
static struct ppc4xx_pciex_hwops ppc460ex_pcie_hwops __initdata = static struct ppc4xx_pciex_hwops ppc460ex_pcie_hwops __initdata =
{ {
.want_sdr = true,
.core_init = ppc460ex_pciex_core_init, .core_init = ppc460ex_pciex_core_init,
.port_init_hw = ppc460ex_pciex_init_port_hw, .port_init_hw = ppc460ex_pciex_init_port_hw,
.setup_utl = ppc460ex_pciex_init_utl, .setup_utl = ppc460ex_pciex_init_utl,
...@@ -1181,6 +1185,7 @@ static void __init ppc460sx_pciex_check_link(struct ppc4xx_pciex_port *port) ...@@ -1181,6 +1185,7 @@ static void __init ppc460sx_pciex_check_link(struct ppc4xx_pciex_port *port)
} }
static struct ppc4xx_pciex_hwops ppc460sx_pcie_hwops __initdata = { static struct ppc4xx_pciex_hwops ppc460sx_pcie_hwops __initdata = {
.want_sdr = true,
.core_init = ppc460sx_pciex_core_init, .core_init = ppc460sx_pciex_core_init,
.port_init_hw = ppc460sx_pciex_init_port_hw, .port_init_hw = ppc460sx_pciex_init_port_hw,
.setup_utl = ppc460sx_pciex_init_utl, .setup_utl = ppc460sx_pciex_init_utl,
...@@ -1276,6 +1281,7 @@ static int ppc405ex_pciex_init_utl(struct ppc4xx_pciex_port *port) ...@@ -1276,6 +1281,7 @@ static int ppc405ex_pciex_init_utl(struct ppc4xx_pciex_port *port)
static struct ppc4xx_pciex_hwops ppc405ex_pcie_hwops __initdata = static struct ppc4xx_pciex_hwops ppc405ex_pcie_hwops __initdata =
{ {
.want_sdr = true,
.core_init = ppc405ex_pciex_core_init, .core_init = ppc405ex_pciex_core_init,
.port_init_hw = ppc405ex_pciex_init_port_hw, .port_init_hw = ppc405ex_pciex_init_port_hw,
.setup_utl = ppc405ex_pciex_init_utl, .setup_utl = ppc405ex_pciex_init_utl,
...@@ -1972,13 +1978,15 @@ static void __init ppc4xx_probe_pciex_bridge(struct device_node *np) ...@@ -1972,13 +1978,15 @@ static void __init ppc4xx_probe_pciex_bridge(struct device_node *np)
} }
port->node = of_node_get(np); port->node = of_node_get(np);
pval = of_get_property(np, "sdr-base", NULL); if (ppc4xx_pciex_hwops->want_sdr) {
if (pval == NULL) { pval = of_get_property(np, "sdr-base", NULL);
printk(KERN_ERR "PCIE: missing sdr-base for %s\n", if (pval == NULL) {
np->full_name); printk(KERN_ERR "PCIE: missing sdr-base for %s\n",
return; np->full_name);
return;
}
port->sdr_base = *pval;
} }
port->sdr_base = *pval;
/* Check if device_type property is set to "pci" or "pci-endpoint". /* Check if device_type property is set to "pci" or "pci-endpoint".
* Resulting from this setup this PCIe port will be configured * Resulting from this setup this PCIe port will be configured
......
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