| Message ID | 1306931292-2313-1-git-send-email-dbaryshkov@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Wed, Jun 01, 2011 at 04:28:11PM +0400, Dmitry Eremin-Solenikov wrote: [...] > --- a/arch/powerpc/sysdev/fsl_pci.h > +++ b/arch/powerpc/sysdev/fsl_pci.h > @@ -92,6 +92,7 @@ extern int fsl_add_bridge(struct device_node *dev, int is_primary); > extern void fsl_pcibios_fixup_bus(struct pci_bus *bus); > extern int mpc83xx_add_bridge(struct device_node *dev); > u64 fsl_pci_immrbar_base(struct pci_controller *hose); > +int fsl_add_pci_err(void); With #ifdef CONFIG_PCI int fsl_add_pci_err(void); #else static inline int fsl_add_pci_err(void) { return -ENODEV; } #endif You won't need endless ifdefs in the board files: #ifdef CONFIG_PCI fsl_add_pci_err(); #endif Also, why not add this call to the fsl_add_bridge(), so you won't need to touch board files at all. Thanks,
On 6/1/11, Anton Vorontsov <avorontsov@mvista.com> wrote: > On Wed, Jun 01, 2011 at 04:28:11PM +0400, Dmitry Eremin-Solenikov wrote: > [...] >> --- a/arch/powerpc/sysdev/fsl_pci.h >> +++ b/arch/powerpc/sysdev/fsl_pci.h >> @@ -92,6 +92,7 @@ extern int fsl_add_bridge(struct device_node *dev, int >> is_primary); >> extern void fsl_pcibios_fixup_bus(struct pci_bus *bus); >> extern int mpc83xx_add_bridge(struct device_node *dev); >> u64 fsl_pci_immrbar_base(struct pci_controller *hose); >> +int fsl_add_pci_err(void); > > With > > #ifdef CONFIG_PCI > int fsl_add_pci_err(void); > #else > static inline int fsl_add_pci_err(void) { return -ENODEV; } > #endif > > You won't need endless ifdefs in the board files: OK, will redo this patch. > > #ifdef CONFIG_PCI > fsl_add_pci_err(); > #endif > > Also, why not add this call to the fsl_add_bridge(), so you > won't need to touch board files at all. Because fsl_add_bridge is called too early, so allocation of platform device fails.
On Wed, Jun 01, 2011 at 06:55:35PM +0400, Dmitry Eremin-Solenikov wrote: > On 6/1/11, Anton Vorontsov <avorontsov@mvista.com> wrote: > > On Wed, Jun 01, 2011 at 04:28:11PM +0400, Dmitry Eremin-Solenikov wrote: > > [...] > >> --- a/arch/powerpc/sysdev/fsl_pci.h > >> +++ b/arch/powerpc/sysdev/fsl_pci.h > >> @@ -92,6 +92,7 @@ extern int fsl_add_bridge(struct device_node *dev, int > >> is_primary); > >> extern void fsl_pcibios_fixup_bus(struct pci_bus *bus); > >> extern int mpc83xx_add_bridge(struct device_node *dev); > >> u64 fsl_pci_immrbar_base(struct pci_controller *hose); > >> +int fsl_add_pci_err(void); > > > > With > > > > #ifdef CONFIG_PCI > > int fsl_add_pci_err(void); > > #else > > static inline int fsl_add_pci_err(void) { return -ENODEV; } > > #endif > > > > You won't need endless ifdefs in the board files: > > OK, will redo this patch. Btw, if you don't check return value of fsl_add_pci_err(), then it would probably make sense to return void. And if you do check it somewhere, be sure to include linux/errno.h for -ENODEV. :-) Thanks,
On Wed, 1 Jun 2011 18:55:35 +0400 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> wrote: > On 6/1/11, Anton Vorontsov <avorontsov@mvista.com> wrote: > > On Wed, Jun 01, 2011 at 04:28:11PM +0400, Dmitry Eremin-Solenikov wrote: > > [...] > > Also, why not add this call to the fsl_add_bridge(), so you > > won't need to touch board files at all. > > Because fsl_add_bridge is called too early, so allocation > of platform device fails. That doesn't seem like a good reason for putting more stuff in board files that isn't board-specific. Why not just make fsl_add_pci_err() an initcall? It already only works when a compatible device tree node is found. Is there any case where a board would not want this PCI code to be used, even if the device tree node is present? If so, fsl_add_bridge could set a flag that fsl_add_pci_err() could check -- but I doubt it's needed. -Scott
diff --git a/arch/powerpc/platforms/85xx/ksi8560.c b/arch/powerpc/platforms/85xx/ksi8560.c index c46f935..0b4e98c 100644 --- a/arch/powerpc/platforms/85xx/ksi8560.c +++ b/arch/powerpc/platforms/85xx/ksi8560.c @@ -228,6 +228,10 @@ static int __init declare_of_platform_devices(void) { of_platform_bus_probe(NULL, of_bus_ids, NULL); +#ifdef CONFIG_PCI + fsl_add_pci_err(); +#endif + return 0; } machine_device_initcall(ksi8560, declare_of_platform_devices); diff --git a/arch/powerpc/platforms/85xx/mpc8536_ds.c b/arch/powerpc/platforms/85xx/mpc8536_ds.c index f79f2f1..fe4d835 100644 --- a/arch/powerpc/platforms/85xx/mpc8536_ds.c +++ b/arch/powerpc/platforms/85xx/mpc8536_ds.c @@ -114,6 +114,10 @@ static struct of_device_id __initdata mpc8536_ds_ids[] = { static int __init mpc8536_ds_publish_devices(void) { +#ifdef CONFIG_PCI + fsl_add_pci_err(); +#endif + return of_platform_bus_probe(NULL, mpc8536_ds_ids, NULL); } machine_device_initcall(mpc8536_ds, mpc8536_ds_publish_devices); diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c index 3b2c9bb..d5ef029 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c @@ -235,6 +235,10 @@ static int __init declare_of_platform_devices(void) { of_platform_bus_probe(NULL, of_bus_ids, NULL); +#ifdef CONFIG_PCI + fsl_add_pci_err(); +#endif + return 0; } machine_device_initcall(mpc85xx_ads, declare_of_platform_devices); diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c index 6299a2a..1101608 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c @@ -341,6 +341,10 @@ static struct of_device_id __initdata of_bus_ids[] = { static int __init declare_of_platform_devices(void) { +#ifdef CONFIG_PCI + fsl_add_pci_err(); +#endif + return of_platform_bus_probe(NULL, of_bus_ids, NULL); } machine_device_initcall(mpc85xx_cds, declare_of_platform_devices); diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c index c7b97f7..d17a49f 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c @@ -228,6 +228,10 @@ static struct of_device_id __initdata mpc85xxds_ids[] = { static int __init mpc85xxds_publish_devices(void) { +#ifdef CONFIG_PCI + fsl_add_pci_err(); +#endif + return of_platform_bus_probe(NULL, mpc85xxds_ids, NULL); } machine_device_initcall(mpc8544_ds, mpc85xxds_publish_devices); diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c index 747d1ee..856ba60 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c @@ -455,6 +455,10 @@ static int __init mpc85xx_publish_devices(void) if (machine_is(mpc8569_mds)) simple_gpiochip_init("fsl,mpc8569mds-bcsr-gpio"); +#ifdef CONFIG_PCI + fsl_add_pci_err(); +#endif + of_platform_bus_probe(NULL, mpc85xx_ids, NULL); mpc85xx_publish_qe_devices(); @@ -463,6 +467,10 @@ static int __init mpc85xx_publish_devices(void) static int __init p1021_publish_devices(void) { +#ifdef CONFIG_PCI + fsl_add_pci_err(); +#endif + of_platform_bus_probe(NULL, p1021_ids, NULL); mpc85xx_publish_qe_devices(); diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c index 088f30b..918b7b6 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c @@ -118,6 +118,10 @@ static struct of_device_id __initdata mpc85xxrdb_ids[] = { static int __init mpc85xxrdb_publish_devices(void) { +#ifdef CONFIG_PCI + fsl_add_pci_err(); +#endif + return of_platform_bus_probe(NULL, mpc85xxrdb_ids, NULL); } machine_device_initcall(p2020_rdb, mpc85xxrdb_publish_devices); diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c index 7eb5c40..e5012e9 100644 --- a/arch/powerpc/platforms/85xx/p1022_ds.c +++ b/arch/powerpc/platforms/85xx/p1022_ds.c @@ -326,6 +326,10 @@ static struct of_device_id __initdata p1022_ds_ids[] = { static int __init p1022_ds_publish_devices(void) { +#ifdef CONFIG_PCI + fsl_add_pci_err(); +#endif + return of_platform_bus_probe(NULL, p1022_ds_ids, NULL); } machine_device_initcall(p1022_ds, p1022_ds_publish_devices); diff --git a/arch/powerpc/platforms/85xx/sbc8548.c b/arch/powerpc/platforms/85xx/sbc8548.c index ecdd8c0..74fb9e6 100644 --- a/arch/powerpc/platforms/85xx/sbc8548.c +++ b/arch/powerpc/platforms/85xx/sbc8548.c @@ -162,6 +162,10 @@ static int __init declare_of_platform_devices(void) { of_platform_bus_probe(NULL, of_bus_ids, NULL); +#ifdef CONFIG_PCI + fsl_add_pci_err(); +#endif + return 0; } machine_device_initcall(sbc8548, declare_of_platform_devices); diff --git a/arch/powerpc/platforms/85xx/sbc8560.c b/arch/powerpc/platforms/85xx/sbc8560.c index d2dfd46..c58d11f 100644 --- a/arch/powerpc/platforms/85xx/sbc8560.c +++ b/arch/powerpc/platforms/85xx/sbc8560.c @@ -222,6 +222,10 @@ static int __init declare_of_platform_devices(void) { of_platform_bus_probe(NULL, of_bus_ids, NULL); +#ifdef CONFIG_PCI + fsl_add_pci_err(); +#endif + return 0; } machine_device_initcall(sbc8560, declare_of_platform_devices); diff --git a/arch/powerpc/platforms/85xx/socrates.c b/arch/powerpc/platforms/85xx/socrates.c index 747d8fb..54a17cd 100644 --- a/arch/powerpc/platforms/85xx/socrates.c +++ b/arch/powerpc/platforms/85xx/socrates.c @@ -104,6 +104,10 @@ static struct of_device_id __initdata socrates_of_bus_ids[] = { static int __init socrates_publish_devices(void) { +#ifdef CONFIG_PCI + fsl_add_pci_err(); +#endif + return of_platform_bus_probe(NULL, socrates_of_bus_ids, NULL); } machine_device_initcall(socrates, socrates_publish_devices); diff --git a/arch/powerpc/platforms/85xx/stx_gp3.c b/arch/powerpc/platforms/85xx/stx_gp3.c index 5387e9f..661ba4a 100644 --- a/arch/powerpc/platforms/85xx/stx_gp3.c +++ b/arch/powerpc/platforms/85xx/stx_gp3.c @@ -154,6 +154,10 @@ static int __init declare_of_platform_devices(void) { of_platform_bus_probe(NULL, of_bus_ids, NULL); +#ifdef CONFIG_PCI + fsl_add_pci_err(); +#endif + return 0; } machine_device_initcall(stx_gp3, declare_of_platform_devices); diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c index 325de77..3ef01bc 100644 --- a/arch/powerpc/platforms/85xx/tqm85xx.c +++ b/arch/powerpc/platforms/85xx/tqm85xx.c @@ -183,6 +183,10 @@ static int __init declare_of_platform_devices(void) { of_platform_bus_probe(NULL, of_bus_ids, NULL); +#ifdef CONFIG_PCI + fsl_add_pci_err(); +#endif + return 0; } machine_device_initcall(tqm85xx, declare_of_platform_devices); diff --git a/arch/powerpc/platforms/85xx/xes_mpc85xx.c b/arch/powerpc/platforms/85xx/xes_mpc85xx.c index 0125604..5e8a09f 100644 --- a/arch/powerpc/platforms/85xx/xes_mpc85xx.c +++ b/arch/powerpc/platforms/85xx/xes_mpc85xx.c @@ -187,6 +187,10 @@ static struct of_device_id __initdata xes_mpc85xx_ids[] = { static int __init xes_mpc85xx_publish_devices(void) { +#ifdef CONFIG_PCI + fsl_add_pci_err(); +#endif + return of_platform_bus_probe(NULL, xes_mpc85xx_ids, NULL); } machine_device_initcall(xes_mpc8572, xes_mpc85xx_publish_devices); diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 68ca929..52eea53 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -381,6 +381,38 @@ int __init fsl_add_bridge(struct device_node *dev, int is_primary) return 0; } +int __init fsl_add_pci_err(void) +{ + struct device_node *np; + + for_each_node_by_type(np, "pci") { + /* Only PCI, not PCI Express! */ + if (of_device_is_compatible(np, "fsl,mpc8540-pci")) { + struct resource r[2]; + + r[0].parent = NULL; + r[1].parent = NULL; + + if (of_address_to_resource(np, 0, &r[0])) { + printk(KERN_WARNING + "Can't get register base for PCI EDAC!\n"); + return -ENOMEM; + } + r[0].start += 0xe00; + + if (of_irq_to_resource(np, 0, &r[1]) == NO_IRQ) { + printk(KERN_WARNING + "Can't get irq for PCI EDAC!\n"); + return -ENOMEM; + } + platform_device_register_simple("mpc85xx_pci_err", -1, + r, ARRAY_SIZE(r)); + } + } + + return 0; +} + DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8548E, quirk_fsl_pcie_header); DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8548, quirk_fsl_pcie_header); DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8543E, quirk_fsl_pcie_header); diff --git a/arch/powerpc/sysdev/fsl_pci.h b/arch/powerpc/sysdev/fsl_pci.h index a39ed5c..2e1950b 100644 --- a/arch/powerpc/sysdev/fsl_pci.h +++ b/arch/powerpc/sysdev/fsl_pci.h @@ -92,6 +92,7 @@ extern int fsl_add_bridge(struct device_node *dev, int is_primary); extern void fsl_pcibios_fixup_bus(struct pci_bus *bus); extern int mpc83xx_add_bridge(struct device_node *dev); u64 fsl_pci_immrbar_base(struct pci_controller *hose); +int fsl_add_pci_err(void); #endif /* __POWERPC_FSL_PCI_H */ #endif /* __KERNEL__ */
As a device for pci node isn't created, create a special platform_device for PCI EDAC device on MPC85xx. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> --- arch/powerpc/platforms/85xx/ksi8560.c | 4 +++ arch/powerpc/platforms/85xx/mpc8536_ds.c | 4 +++ arch/powerpc/platforms/85xx/mpc85xx_ads.c | 4 +++ arch/powerpc/platforms/85xx/mpc85xx_cds.c | 4 +++ arch/powerpc/platforms/85xx/mpc85xx_ds.c | 4 +++ arch/powerpc/platforms/85xx/mpc85xx_mds.c | 8 +++++++ arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 4 +++ arch/powerpc/platforms/85xx/p1022_ds.c | 4 +++ arch/powerpc/platforms/85xx/sbc8548.c | 4 +++ arch/powerpc/platforms/85xx/sbc8560.c | 4 +++ arch/powerpc/platforms/85xx/socrates.c | 4 +++ arch/powerpc/platforms/85xx/stx_gp3.c | 4 +++ arch/powerpc/platforms/85xx/tqm85xx.c | 4 +++ arch/powerpc/platforms/85xx/xes_mpc85xx.c | 4 +++ arch/powerpc/sysdev/fsl_pci.c | 32 +++++++++++++++++++++++++++++ arch/powerpc/sysdev/fsl_pci.h | 1 + 16 files changed, 93 insertions(+), 0 deletions(-)