diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2017-06-24 14:17:09 -0500 |
---|---|---|
committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-06-26 14:28:58 +1000 |
commit | 077fdef306529c7d266f13dbfd56c25da211df96 (patch) | |
tree | b7e8a8cb313d04c29cdbee8ded8932ec861b9c5d | |
parent | ead3cafd000b003ddda4c27989e30d239a91d8be (diff) | |
download | skiboot-077fdef306529c7d266f13dbfd56c25da211df96.zip skiboot-077fdef306529c7d266f13dbfd56c25da211df96.tar.gz skiboot-077fdef306529c7d266f13dbfd56c25da211df96.tar.bz2 |
phb3/4: Move IO VPD preload out to a common place
The code is duplicated between phb3 and phb4 for no reason
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Neuling <mikey@neuling.org>
# Conflicts:
# core/init.c
# hw/phb3.c
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r-- | core/init.c | 2 | ||||
-rw-r--r-- | core/vpd.c | 11 | ||||
-rw-r--r-- | hw/phb3.c | 10 | ||||
-rw-r--r-- | hw/phb4.c | 11 | ||||
-rw-r--r-- | include/skiboot.h | 3 |
5 files changed, 13 insertions, 24 deletions
diff --git a/core/init.c b/core/init.c index b5f4f3d..1d2d07d 100644 --- a/core/init.c +++ b/core/init.c @@ -992,7 +992,7 @@ void __noreturn __nomcount main_cpu_entry(const void *fdt) pci_nvram_init(); - phb3_preload_vpd(); + preload_io_vpd(); preload_capp_ucode(); start_preload_kernel(); @@ -272,3 +272,14 @@ void vpd_preload(struct dt_node *hub_node) vpd_lid = vpd_lid_preload(lxr); } + +void preload_io_vpd(void) +{ + const struct dt_property *prop; + + prop = dt_find_property(dt_root, "ibm,io-vpd"); + if (!prop) { + /* LX VPD Lid not already loaded */ + vpd_preload(dt_root); + } +} @@ -4934,16 +4934,6 @@ static void phb3_probe_pbcq(struct dt_node *pbcq) add_chip_dev_associativity(np); } -void phb3_preload_vpd(void) -{ - const struct dt_property *prop; - - prop = dt_find_property(dt_root, "ibm,io-vpd"); - if (!prop) { - /* LX VPD Lid not already loaded */ - vpd_preload(dt_root); - } -} void probe_phb3(void) { @@ -4356,17 +4356,6 @@ static void phb4_probe_pbcq(struct dt_node *pbcq) } } -void phb4_preload_vpd(void) -{ - const struct dt_property *prop; - - prop = dt_find_property(dt_root, "ibm,io-vpd"); - if (!prop) { - /* LX VPD Lid not already loaded */ - vpd_preload(dt_root); - } -} - void probe_phb4(void) { struct dt_node *np; diff --git a/include/skiboot.h b/include/skiboot.h index 83e2c25..394ce93 100644 --- a/include/skiboot.h +++ b/include/skiboot.h @@ -214,9 +214,8 @@ extern void setup_reset_vector(void); extern void probe_p7ioc(void); extern void probe_phb3(void); extern void probe_phb4(void); -extern void phb3_preload_vpd(void); extern int preload_capp_ucode(void); -extern void phb4_preload_vpd(void); +extern void preload_io_vpd(void); extern void probe_npu(void); extern void probe_npu2(void); extern void uart_init(void); |