Re: [Qemu-devel] [PATCH 2/3] aspeed/smc: fix HW strapping

[Andrew Jeffery]

On Tue, 12 Jun 2018, at 16:27, Cédric Le Goater wrote:
> Only the flash type is strapped by HW. The 4BYTE mode is set by
> firmware when the flash device is detected.
> 
> Signed-off-by: Cédric Le Goater 

Reviewed-by: Andrew Jeffery 

> ---
>  hw/ssi/aspeed_smc.c | 8 +---
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
> index fce126e6ee92..b15370893583 100644
> --- a/hw/ssi/aspeed_smc.c
> +++ b/hw/ssi/aspeed_smc.c
> @@ -639,23 +639,17 @@ static void aspeed_smc_reset(DeviceState *d)
>  aspeed_smc_segment_to_reg(&s->ctrl->segments[i]);
>  }
>  
> -/* HW strapping for AST2500 FMC controllers  */
> +/* HW strapping flash type for FMC controllers  */
>  if (s->ctrl->segments == aspeed_segments_ast2500_fmc) {
>  /* flash type is fixed to SPI for CE0 and CE1 */
>  s->regs[s->r_conf] |= (CONF_FLASH_TYPE_SPI << CONF_FLASH_TYPE0);
>  s->regs[s->r_conf] |= (CONF_FLASH_TYPE_SPI << CONF_FLASH_TYPE1);
> -
> -/* 4BYTE mode is autodetected for CE0. Let's force it to 1 for
> - * now */
> -s->regs[s->r_ce_ctrl] |= (1 << (CTRL_EXTENDED0));
>  }
>  
>  /* HW strapping for AST2400 FMC controllers (SCU70). Let's use the
>   * configuration of the palmetto-bmc machine */
>  if (s->ctrl->segments == aspeed_segments_fmc) {
>  s->regs[s->r_conf] |= (CONF_FLASH_TYPE_SPI << CONF_FLASH_TYPE0);
> -
> -s->regs[s->r_ce_ctrl] |= (1 << (CTRL_EXTENDED0));
>  }
>  }
>  
> -- 
> 2.13.6
> 
> 

[Qemu-devel] [PATCH 2/3] aspeed/smc: fix HW strapping

[Cédric Le Goater]

Only the flash type is strapped by HW. The 4BYTE mode is set by
firmware when the flash device is detected.

Signed-off-by: Cédric Le Goater 
---
 hw/ssi/aspeed_smc.c | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index fce126e6ee92..b15370893583 100644
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -639,23 +639,17 @@ static void aspeed_smc_reset(DeviceState *d)
 aspeed_smc_segment_to_reg(&s->ctrl->segments[i]);
 }
 
-/* HW strapping for AST2500 FMC controllers  */
+/* HW strapping flash type for FMC controllers  */
 if (s->ctrl->segments == aspeed_segments_ast2500_fmc) {
 /* flash type is fixed to SPI for CE0 and CE1 */
 s->regs[s->r_conf] |= (CONF_FLASH_TYPE_SPI << CONF_FLASH_TYPE0);
 s->regs[s->r_conf] |= (CONF_FLASH_TYPE_SPI << CONF_FLASH_TYPE1);
-
-/* 4BYTE mode is autodetected for CE0. Let's force it to 1 for
- * now */
-s->regs[s->r_ce_ctrl] |= (1 << (CTRL_EXTENDED0));
 }
 
 /* HW strapping for AST2400 FMC controllers (SCU70). Let's use the
  * configuration of the palmetto-bmc machine */
 if (s->ctrl->segments == aspeed_segments_fmc) {
 s->regs[s->r_conf] |= (CONF_FLASH_TYPE_SPI << CONF_FLASH_TYPE0);
-
-s->regs[s->r_ce_ctrl] |= (1 << (CTRL_EXTENDED0));
 }
 }
 
-- 
2.13.6