[Skiboot] [PATCH v2 11/11] astbmc: Fail SFC init if SIO is unavailable

[Andrew Jeffery]

On Tue, 25 Sep 2018, at 14:36, Andrew Jeffery wrote:
> If SuperIO is unavailable then the driver cannot perform accesses on
> which it currently depends. Test for SuperIO availability during
> initialsation and bail out immediately if it is absent.
> 
> Signed-off-by: Andrew Jeffery <andrew at aj.id.au>
> ---
>  hw/ast-bmc/ast-sf-ctrl.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/hw/ast-bmc/ast-sf-ctrl.c b/hw/ast-bmc/ast-sf-ctrl.c
> index 32fc63ae33d6..839af376d4de 100644
> --- a/hw/ast-bmc/ast-sf-ctrl.c
> +++ b/hw/ast-bmc/ast-sf-ctrl.c
> @@ -950,6 +950,9 @@ int ast_sf_open(uint8_t type, struct spi_flash_ctrl **ctrl)
>  	uint32_t hicr7;
>  #endif /* __SKIBOOT__ */
>  
> +	if (!ast_sio_is_enabled())
> +		return -ENODEV;
> +

This hunk should actually be inside the `#ifdef __SKIBOOT__`, otherwise
building e.g. pflash fails.

>  	if (type != AST_SF_TYPE_PNOR && type != AST_SF_TYPE_BMC
>  	    && type != AST_SF_TYPE_MEM)
>  		return -EINVAL;
> -- 
> 2.17.1
>