diff mbox series

[v7,16/16] sdhci: throw an error if capabilities are incorrectly configured

Message ID 20180118123219.19410-17-f4bug@amsat.org
State Superseded, archived
Headers show
Series SDHCI: clean v1/v2 Specs (part 2) | expand

Commit Message

Philippe Mathieu-Daudé Jan. 18, 2018, 12:32 p.m. UTC 
now than the Exynos4210 uses the 'capareg-reserved' property,
we can safely report missing capabilities as error, since
capabilities will only get changed once new SDHCI models
are added.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/sd/sdhci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Alistair Francis Jan. 18, 2018, 6:19 p.m. UTC | #1 
On Thu, Jan 18, 2018 at 4:32 AM, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> now than the Exynos4210 uses the 'capareg-reserved' property,
> we can safely report missing capabilities as error, since
> capabilities will only get changed once new SDHCI models
> are added.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>

Alistair

> ---
>  hw/sd/sdhci.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
> index 7799382e89..07a7ebcc1e 100644
> --- a/hw/sd/sdhci.c
> +++ b/hw/sd/sdhci.c
> @@ -23,7 +23,6 @@
>   */
>
>  #include "qemu/osdep.h"
> -#include "qemu/error-report.h"
>  #include "qapi/error.h"
>  #include "hw/hw.h"
>  #include "sysemu/block-backend.h"
> @@ -1208,7 +1207,8 @@ static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp)
>      } else {
>          capab = s->capareg & ~capab;
>          if (capab) {
> -            warn_report("SDHCI: missing capability mask: 0x%" PRIx64, capab);
> +            error_setg(errp, "missing capability mask: 0x%" PRIx64, capab);
> +            return;
>          }
>      }
>  }
> --
> 2.15.1
>
>
diff mbox series

Patch

diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 7799382e89..07a7ebcc1e 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -23,7 +23,6 @@ 
  */
 
 #include "qemu/osdep.h"
-#include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
 #include "sysemu/block-backend.h"
@@ -1208,7 +1207,8 @@  static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp)
     } else {
         capab = s->capareg & ~capab;
         if (capab) {
-            warn_report("SDHCI: missing capability mask: 0x%" PRIx64, capab);
+            error_setg(errp, "missing capability mask: 0x%" PRIx64, capab);
+            return;
         }
     }
 }