[U-Boot] [PATCH 2/4] ata: ahci: Don't cap AHCI port count under CONFIG_DM_SCSI

[Simon Glass]

On 13 September 2018 at 00:28, Tuomas Tynkkynen <tuomas.tynkkynen at iki.fi> wrote:
> When using device model this sort of hardcoded limits aren't used or
> necessary.
>
> Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen at iki.fi>
> ---
>  drivers/ata/ahci.c | 2 ++
>  1 file changed, 2 insertions(+)

Reviewed-by: Simon Glass <sjg at chromium.org>

But please see below
>
> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
> index 333f0457f6..5fafb63aeb 100644
> --- a/drivers/ata/ahci.c
> +++ b/drivers/ata/ahci.c
> @@ -230,8 +230,10 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
>         debug("cap 0x%x  port_map 0x%x  n_ports %d\n",
>               uc_priv->cap, uc_priv->port_map, uc_priv->n_ports);
>
> +#if !defined(CONFIG_DM_SCSI)

Can you use this instead?

if (IS_DEFINED(CONFIG_DM_SCSI))

>         if (uc_priv->n_ports > CONFIG_SYS_SCSI_MAX_SCSI_ID)
>                 uc_priv->n_ports = CONFIG_SYS_SCSI_MAX_SCSI_ID;
> +#endif
>
>         for (i = 0; i < uc_priv->n_ports; i++) {
>                 if (!(port_map & (1 << i)))
> --
> 2.16.3
>