[Skiboot] [PATCH 8/8] Remove dead POWER7 code

Vasant Hegde hegdevasant at linux.vnet.ibm.com
Fri Nov 8 17:56:05 AEDT 2019


On 11/7/19 7:22 PM, Nicholas Piggin wrote:
> There are a number of proc_gen branches removed that are trivially
> dead code and comments that refer to P7. As well as those:
> 
> - Oliver points out that add_xics_icps() must be unused on POWER8
>    because it asserts if number of threads > 4, so remove it.
> 
> - Change 16b7ae641 ("Remove POWER7 and POWER7+ support") removed all
>    references to opal_boot_trampoline, so remove that.
> 
> - It also removed the only non-trival choose_bus implementation, so
>    that is removed and its caller simplified.
> 
> Cc: Stewart Smith <stewart at flamingspork.com>
> Signed-off-by: Nicholas Piggin <npiggin at gmail.com>
> ---
>   asm/head.S             | 10 ------
>   core/affinity.c        |  2 +-
>   core/direct-controls.c | 12 -------
>   core/fast-reboot.c     |  6 ----
>   core/pci.c             | 43 +++--------------------
>   hdata/cpu-common.c     |  2 +-
>   hdata/paca.c           | 80 ------------------------------------------

May be remove this file completely? IIRC PACA is P7 only stuff, in P8 we moved 
to PCIA structure.

>   hdata/pcia.c           |  2 +-
>   hdata/spira.c          |  6 +---
>   hdata/spira.h          |  2 +-
>   hdata/vpd.c            |  1 -
>   hw/fsp/fsp-console.c   | 58 ++++++++++--------------------
>   hw/fsp/fsp-occ.c       |  4 ---
>   hw/fsp/fsp-sysdump.c   | 19 ----------
>   hw/fsp/fsp.c           |  5 +--
>   hw/npu.c               |  1 -
>   hw/npu2-opencapi.c     |  1 -
>   hw/npu2.c              |  1 -
>   hw/nx-842.c            | 11 +++---
>   hw/occ.c               |  8 ++---
>   hw/phb3.c              | 11 ------
>   hw/phb4.c              | 11 ------
>   hw/psi.c               |  3 +-
>   hw/slw.c               |  3 --
>   hw/xscom.c             | 10 +-----
>   include/chip.h         |  4 +--
>   include/mem-map.h      |  2 +-
>   include/nx.h           |  2 +-
>   include/pci.h          |  6 ----
>   29 files changed, 41 insertions(+), 285 deletions(-)
> 


.../...

> diff --git a/core/direct-controls.c b/core/direct-controls.c
> index 507a16f50..424b3d94c 100644
> --- a/core/direct-controls.c
> +++ b/core/direct-controls.c
> @@ -522,9 +522,6 @@ int dctl_set_special_wakeup(struct cpu_thread *t)
>   	struct cpu_thread *c = t->primary;
>   	int rc = OPAL_SUCCESS;
> 
> -	if (proc_gen != proc_gen_p9 && proc_gen != proc_gen_p8)
> -		return OPAL_UNSUPPORTED;
> -

Now we have to fix below if-else to throw proper error for unsupported proc_gen_*.


-Vasant



More information about the Skiboot mailing list