[Skiboot] [PATCH] hw/phys-map: Fix OCAPI_MEM BAR values

[Frederic Barrat]

Le 15/04/2020 à 09:29, Andrew Donnellan a écrit :
> The comment next to the OCAPI_MEM entries in the Nimbus phys-map claims
> that we are "varying the upper 2 bits of the group ID" for each OpenCAPI
> link, as matches the chip address extension mask that will be set by future
> versions of Hostboot.
> 
> The actual entries, on the other hand, vary the *lower* 2 bits of the group
> ID. Whoops.
> 
> This didn't appear to cause us problems on the specific machines that we
> had access to at the time, but now that this is being tested a bit harder
> it's crashing machines...
> 
> Fixes: bc72973d13215 ("hw/npu2-opencapi: Support multiple LPC devices")
> Cc: Frederic Barrat <fbarrat at linux.ibm.com>
> Reported-by: Wael El-Essawy <welessa at us.ibm.com>
> Reported-by: Milton Miller <miltonm at us.ibm.com>
> Reported-by: Jenny Huynh <jhuynh at us.ibm.com>
> Signed-off-by: Andrew Donnellan <ajd at linux.ibm.com>
> ---


I could probably have read the code a zillion times and still not see it...
Reviewed-by: Frederic Barrat <fbarrat at linux.ibm.com>


>   hw/phys-map.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/phys-map.c b/hw/phys-map.c
> index ad041738f0de..2c4d8e45f708 100644
> --- a/hw/phys-map.c
> +++ b/hw/phys-map.c
> @@ -53,9 +53,9 @@ static const struct phys_map_entry phys_map_table_nimbus[] = {
>   	 * We don't currently support >4TB ranges.
>   	 */
>   	{ OCAPI_MEM,	   0, 0x0002000000000000ull, 0x0000040000000000ull },
> -	{ OCAPI_MEM,	   1, 0x0002200000000000ull, 0x0000040000000000ull },
> -	{ OCAPI_MEM,	   2, 0x0002400000000000ull, 0x0000040000000000ull },
> -	{ OCAPI_MEM,	   3, 0x0002600000000000ull, 0x0000040000000000ull },
> +	{ OCAPI_MEM,	   1, 0x0002800000000000ull, 0x0000040000000000ull },
> +	{ OCAPI_MEM,	   2, 0x0003000000000000ull, 0x0000040000000000ull },
> +	{ OCAPI_MEM,	   3, 0x0003800000000000ull, 0x0000040000000000ull },
>   
>   	/* 0 TB offset @ MMIO 0x0006000000000000ull */
>   	{ PHB4_64BIT_MMIO, 0, 0x0006000000000000ull, 0x0000004000000000ull },
>