Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/powerpc/sysdev/ppc4xx_pci.c

+14 −6
Original line number Diff line number Diff line
@@ -647,6 +647,7 @@ static unsigned int ppc4xx_pciex_port_count; 


struct ppc4xx_pciex_hwops

{

	bool want_sdr;

	int (*core_init)(struct device_node *np);

	int (*port_init_hw)(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) 


static struct ppc4xx_pciex_hwops ppc440speA_pcie_hwops __initdata =

{

	.want_sdr	= true,

	.core_init	= ppc440spe_pciex_core_init,

	.port_init_hw	= ppc440speA_pciex_init_port_hw,

	.setup_utl	= ppc440speA_pciex_init_utl,
@@ -924,6 +926,7 @@ static struct ppc4xx_pciex_hwops ppc440speA_pcie_hwops __initdata = 


static struct ppc4xx_pciex_hwops ppc440speB_pcie_hwops __initdata =

{

	.want_sdr	= true,

	.core_init	= ppc440spe_pciex_core_init,

	.port_init_hw	= ppc440speB_pciex_init_port_hw,

	.setup_utl	= ppc440speB_pciex_init_utl,
@@ -1034,6 +1037,7 @@ static int ppc460ex_pciex_init_utl(struct ppc4xx_pciex_port *port) 


static struct ppc4xx_pciex_hwops ppc460ex_pcie_hwops __initdata =

{

	.want_sdr	= true,

	.core_init	= ppc460ex_pciex_core_init,

	.port_init_hw	= ppc460ex_pciex_init_port_hw,

	.setup_utl	= ppc460ex_pciex_init_utl,
@@ -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 = {

	.want_sdr	= true,

	.core_init	= ppc460sx_pciex_core_init,

	.port_init_hw	= ppc460sx_pciex_init_port_hw,

	.setup_utl	= ppc460sx_pciex_init_utl,
@@ -1276,6 +1281,7 @@ static int ppc405ex_pciex_init_utl(struct ppc4xx_pciex_port *port) 


static struct ppc4xx_pciex_hwops ppc405ex_pcie_hwops __initdata =

{

	.want_sdr	= true,

	.core_init	= ppc405ex_pciex_core_init,

	.port_init_hw	= ppc405ex_pciex_init_port_hw,

	.setup_utl	= ppc405ex_pciex_init_utl,
@@ -1972,6 +1978,7 @@ static void __init ppc4xx_probe_pciex_bridge(struct device_node *np) 
	}



	port->node = of_node_get(np);

	if (ppc4xx_pciex_hwops->want_sdr) {

		pval = of_get_property(np, "sdr-base", NULL);

		if (pval == NULL) {

			printk(KERN_ERR "PCIE: missing sdr-base for %s\n",
@@ -1979,6 +1986,7 @@ static void __init ppc4xx_probe_pciex_bridge(struct device_node *np) 
			return;

		}

		port->sdr_base = *pval;

	}



	/* Check if device_type property is set to "pci" or "pci-endpoint".

	 * Resulting from this setup this PCIe port will be configured