From nobody Sun Apr 28 16:34:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1593982194; cv=none; d=zohomail.com; s=zohoarc; b=WkFbErc4D5jKLyxeC7uCK9utchZOpZIN/DnimjXQBUnYv5SLhLQ8oMxa4ePfA7EU6SiUqSGSqR6wNq284A0IHm9ZK2kpRxDf2sncVzw+i1rKApHs17soqxY8Nmhu8EYHitAuX6TFf6Nl5bDtfQ0Y4whnxvCAGcXmH54eWvMB9os= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593982194; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=G37x8W0rCVo00GrhnCpy9+AXL7M1+3sgu4vRFcZInrU=; b=XwDyN2yF9PNUlgw6SSfr9ou7WViLSnEXVmEqyp67WTTZx+WvFk3BuyYiNpn6VoL//lscBKzwJq7+lgfjjUfedJIPUaMPh2vNV4gPlp+DUIMWLb4hd5gIMIMFXPewNbZhBasWUirb70EVc8vZp02G8SrrNMNNEcyi4vUkEjyxRpw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593982194448297.62914553178325; Sun, 5 Jul 2020 13:49:54 -0700 (PDT) Received: from localhost ([::1]:46476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsBaD-00013r-AW for importer@patchew.org; Sun, 05 Jul 2020 16:49:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsBX3-0004Mm-4Z; Sun, 05 Jul 2020 16:46:37 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:38675) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsBX1-0000oo-J7; Sun, 05 Jul 2020 16:46:36 -0400 Received: by mail-wm1-x342.google.com with SMTP id f18so39594667wml.3; Sun, 05 Jul 2020 13:46:34 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id g144sm51397817wme.2.2020.07.05.13.46.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2020 13:46:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=G37x8W0rCVo00GrhnCpy9+AXL7M1+3sgu4vRFcZInrU=; b=JJczDjMLwMoXPKH+0R+2mc8M0V5x0fBL5XvAeVmEQu99CdurZAJztHO9STsOU0vEaJ SG8DAY7+LTfanaJkzCZYR2+Uu04pzvSRxkXws5SK3fCFwTMsAMgZNtOSxAnSUaFSThpO H/RupYVTFwisJoa/9TeF9VKdcGHkYJzhtfeK/E80ty0B2dwHu6f4YHG8qOhBIzzg1iZ3 mx4XApkCKKLDh0lp9zeSJ1A7riNMTCuU0afNGRSPGg0uiY/psA6krnUvXDYIJ9RZPO6f F59inMBbDlQ5jFbVJ6KyZLmkVNS3HXTHsbOZxC4L3Baqj7hmq6igKphPPAy6rnBjm9Ws oJlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=G37x8W0rCVo00GrhnCpy9+AXL7M1+3sgu4vRFcZInrU=; b=Y0xytoydmUnImSWShUs78XfcAgT4MQWNOLJr3wkNqud7yCK4Ix8dzQ4Pw2uk1MnyW8 w0POVcfz4ut2WuNdPBYiwDw3orUqFxO3zOSd9fzRdDGrNN6AaQwWxuWnr9C6pwKiKH0x kHL5R41jv98A7dW4OjV5rfh9jrh1AP7xQ3IUwlq54sfBG+Nw3MvZdo8S1lGin+T617Bk JzyRhmh5s8qn9taDhAYGKEGYLZTxNZUiUDA70EjdW8d1c9XmoWrrnlvNm3X5jVMvToWu 8SY4YFI7yS+xu9Cf1hVpn4e8iEbq71d/BG4iaGgZ+wm2b+c7X5YJoJjNKYVqlS+fGuV5 o/0Q== X-Gm-Message-State: AOAM530zZ0orWjrpX+Nn9vdzLPqNPXLS3c7AayTiGfhmTdA3xjk0DpFK PHiIoQMIQY/wxu9wfDUHhnvmvcbKt2w= X-Google-Smtp-Source: ABdhPJxoF+/qcYu3Da7PSaZmAENMPjDleFND+iYJdIA5FD6YvAvgnKWLL7LxdeMYwbFhM+tHyW18nA== X-Received: by 2002:a05:600c:258:: with SMTP id 24mr7340640wmj.126.1593981993901; Sun, 05 Jul 2020 13:46:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 01/10] hw/sd/pl181: Replace fprintf(stderr, "*\n") with error_report() Date: Sun, 5 Jul 2020 22:46:21 +0200 Message-Id: <20200705204630.4133-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200705204630.4133-1-f4bug@amsat.org> References: <20200705204630.4133-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Alistair Francis Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed. find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_= report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_re= port("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report= ("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("= \1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1= "\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\= 2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2)= ;|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|= Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig= }' \ {} + find ./* -type f -exec sed -i \ 'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}'= \ {} + find ./* -type f -exec sed -i \ 'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + Some lines where then manually tweaked to pass checkpatch. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alistair Francis Message-Id: <488ba8d4c562ea44119de8ea0f385a898bd8fa1e.1513790495.git.alista= ir.francis@xilinx.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Peter Maydell --- hw/sd/pl181.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 2b3776a6a0..649386ec3d 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -15,6 +15,7 @@ #include "hw/sd/sd.h" #include "qemu/log.h" #include "qemu/module.h" +#include "qemu/error-report.h" #include "qapi/error.h" =20 //#define DEBUG_PL181 1 @@ -148,7 +149,7 @@ static void pl181_fifo_push(PL181State *s, uint32_t val= ue) int n; =20 if (s->fifo_len =3D=3D PL181_FIFO_LEN) { - fprintf(stderr, "pl181: FIFO overflow\n"); + error_report("%s: FIFO overflow", __func__); return; } n =3D (s->fifo_pos + s->fifo_len) & (PL181_FIFO_LEN - 1); @@ -162,7 +163,7 @@ static uint32_t pl181_fifo_pop(PL181State *s) uint32_t value; =20 if (s->fifo_len =3D=3D 0) { - fprintf(stderr, "pl181: FIFO underflow\n"); + error_report("%s: FIFO underflow", __func__); return 0; } value =3D s->fifo[s->fifo_pos]; --=20 2.21.3 From nobody Sun Apr 28 16:34:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593982096; cv=none; d=zohomail.com; s=zohoarc; b=QRjG13HWq25lj33rKgRlwQzfEoXote+FmReJM4B/urWBHw2kwDVe5Ca0XAbtcVco/jFoV5SG4+ymqcH/i6VKkUJTStdJIr+1wylR4iGI9OHAv60YEUqem5/u5SI0hlcv55Ox1mBpfyHHtzEMg7CpSmRkuJ4uANMzqydqMoMZkhg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593982096; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=97pUZmX/67wbHP9Fb1MFklUqwh59qQdvzxeqL5/W8D4=; b=Eqhb63x7y0wD6bOhAAFHyxxJPw3Jr0vypfC0TEfi2aTxOy6/rFk0KZC3rK1Its6v1kf9hU9+pv7ARwCd7osb6FseAEKgB53OlJ3Nt3Sxt/OR5G5GQWXPR+RQCa4VdP8xX/fl9qugXQSwScBJqY0145GhWPYWB84qsUN12kLGMSA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159398209665514.047357693728486; Sun, 5 Jul 2020 13:48:16 -0700 (PDT) Received: from localhost ([::1]:38718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsBYd-0006Db-4h for importer@patchew.org; Sun, 05 Jul 2020 16:48:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsBX4-0004PM-DG; Sun, 05 Jul 2020 16:46:38 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:56313) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsBX2-0000p1-UD; Sun, 05 Jul 2020 16:46:38 -0400 Received: by mail-wm1-x344.google.com with SMTP id g75so37066778wme.5; Sun, 05 Jul 2020 13:46:36 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id g144sm51397817wme.2.2020.07.05.13.46.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2020 13:46:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=97pUZmX/67wbHP9Fb1MFklUqwh59qQdvzxeqL5/W8D4=; b=uGqxQPLPNagqvAJlLJufXSkR4jInpyfz+KVDjHLZRwMN7Kk+EOLJ8d7pUkBc5uYkRU KhM3bHfMakJN5r/Gd89cq6gN+4Dj55IObDyjHHGQ7caqcXncD36kZ6MUHTSxqgeT8wh8 FELegVmolU+gYrBr/FgqTSU7Q2WQA17iTTxlNbjgHn2bczrB++MF+m101hfKA3bdxUKy 39jAyhv/7D34Yslqnv1NwGF5m37xMJNnQc70xGdCVxqQPdYP4GxiH/Ter2y9/roh2rCO 503gsou0Mk2FrlOYzZ3x43LZRLGCKo9+Fkxj0MIm9rSwl1KTBUEx6fO0O9maHK/PulDW z1qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=97pUZmX/67wbHP9Fb1MFklUqwh59qQdvzxeqL5/W8D4=; b=a/leI7WlTyFUxdyaIKuNgx255ajjIPyPFxnnw3trSuJ1HLjryDxL1I+/zTPkEj/1qD oXSEElzbh03lM6GKpnJOAYHJxGTuPpbz9r8LAiAHHTaR5AOpki2/+ibXBHM5eGQ/NTsk NrOWhuVRlMXhFwLEKUyW/QMR3DeZRk8kOwrleeywYXrcO7pA8TDlUez0ekwLvV5UxkP3 9akmOFx5upN1F1oXza+z6WAI3+O8V769NTpyyYShoKzWipoyMEGPUG0NyJUhLBP+FkVm kr9uW7aqJ1oo7moi9c4yvOq2LvIY+2zkuzDAbeoIMsdGaB9r0yK161ls9WwQFgaTGqeB Jb5g== X-Gm-Message-State: AOAM533UA4J2ik46MKDtoyliDPXzA2hsISiNLykvy9LFRqAelP245IrB oHsqgGUBZv4gfgouP6EarCclO9N50Kw= X-Google-Smtp-Source: ABdhPJzcIwUuzT6OUxbkOEB/leCLT/f8hgT9lGfq7iqtLEvoduxDdN9SnE9Oyaoqul5hEqsQsxckdg== X-Received: by 2002:a1c:32c4:: with SMTP id y187mr47170302wmy.79.1593981995180; Sun, 05 Jul 2020 13:46:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 02/10] hw/sd/pl181: Rename pl181_send_command() as pl181_do_command() Date: Sun, 5 Jul 2020 22:46:22 +0200 Message-Id: <20200705204630.4133-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200705204630.4133-1-f4bug@amsat.org> References: <20200705204630.4133-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) pl181_send_command() do a bus transaction (send or receive), rename it as pl181_do_command(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Peter Maydell Reviewed-by: Alistair Francis --- hw/sd/pl181.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 649386ec3d..3fc2cdd71a 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -173,7 +173,7 @@ static uint32_t pl181_fifo_pop(PL181State *s) return value; } =20 -static void pl181_send_command(PL181State *s) +static void pl181_do_command(PL181State *s) { SDRequest request; uint8_t response[16]; @@ -402,7 +402,7 @@ static void pl181_write(void *opaque, hwaddr offset, qemu_log_mask(LOG_UNIMP, "pl181: Pending commands not implemented\n"); } else { - pl181_send_command(s); + pl181_do_command(s); pl181_fifo_run(s); } /* The command has completed one way or the other. */ --=20 2.21.3 From nobody Sun Apr 28 16:34:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593982096; cv=none; d=zohomail.com; s=zohoarc; b=fvfgy6wWPxAhXQY+/wa6dRK3E4J/PD0rTypCSwp34ZIuwU3jF03mZcr8VTIxh1voa1d/fOP4iHnhhBX1cVDxbvCO5bno64hHFEwu4OTRD9hqef7a/byt7T/pSHwsvmdHUcT/16XJ1jlxN9y3PJwIBkR4gyo2XZjFKnPfEmlYYZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593982096; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6rxTtNzGxZKeUz8u/465WGrq0JGlEJZidTb9y8deq6c=; b=ZdpG5uWJ/PbwPryhUnHDc/b6eJ1hYZaTb2DetsF/VLRu1Z5dPe32sfxG+cepFXHYLMKD94kDtnFoKknXZkbnvsvxOsh2figbgh45tweMevwAPRDX2Y/8jJTKLdg2sOTSJKaWYElIxfoeJMFImvpI0Y3BsFlcOKvsAmHoUxNZUN8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159398209664618.959379411396753; Sun, 5 Jul 2020 13:48:16 -0700 (PDT) Received: from localhost ([::1]:38786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsBYd-0006Fz-Dp for importer@patchew.org; Sun, 05 Jul 2020 16:48:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsBX5-0004T8-RU; Sun, 05 Jul 2020 16:46:39 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:38676) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsBX4-0000pH-6M; Sun, 05 Jul 2020 16:46:39 -0400 Received: by mail-wm1-x343.google.com with SMTP id f18so39594739wml.3; Sun, 05 Jul 2020 13:46:37 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id g144sm51397817wme.2.2020.07.05.13.46.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2020 13:46:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6rxTtNzGxZKeUz8u/465WGrq0JGlEJZidTb9y8deq6c=; b=kT1j+IAINJp7ET0x51OC/MutF4L7mkS5pCL+JGPwLNniC8TM6Ri7o5a9xToazhcOTI lzMg36zKQNqHJMib3Cub0vAkeA9bHaKwha7Dccc4Sx0FRjLwN8SBEb/aoXyXa2Lhzf9Q ierLrYARMMXpjWl9S6FDg9xYHNMgsBgo/rl6vlc+hrJbMvaHng+5df1I0S3hmFpJZhy7 RJM43IgBWG8L3VHNG42x2NSKU/YzESwdiR433jvZdfi/uQZArT+kGkt5PHkpxsPVjOnJ Qi3OXVcILGjSqEU5vWIE/gd5advfeCSdlDJLZlto5DotH1CQD/YCFpze6VT4puP2W5Bo yQHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=6rxTtNzGxZKeUz8u/465WGrq0JGlEJZidTb9y8deq6c=; b=qhrx7fhr5T2QLezImpODrq7pWtjSbg82YjSCevbKf3aUo1mdVYd9pi4A4d3BgNzCnw qS003ArLUHDmD5SgktemIkw/P0WHbrem+s2v3YMzfdTaTvSg/PM7u0RUGBUtoBkAV9/o C/tRNFSDXmJfJamCqfBnJH/YkISQ4sL4V84GUZ9Bumlq2JNEnzQkynDUgHmXWJ/8oRvm LRNe4IMVtBgKfKyCFbpaz1snP0ybUl9OIhAqWbeFQmpQEck0Kw+LGCp9G9lI5gRBGMfT W5TJowthVkYlOXvUvkl5evy9xMSTl7IzF9o/0+khiYl+anBP/i+CpiO1MhwKPJWdGhdP 2e/A== X-Gm-Message-State: AOAM531FVuYxRwxshUhsnCp5BX3iRe2hMNLTli8Eix/BsYaxBgfLFF4B aYvmrgjo0tsJrwNixJQnDbxTQ6/TIUU= X-Google-Smtp-Source: ABdhPJyKUKMwKXsEBNjcQ1ADhx/FTh/fF0qzFCVe6Jso5XEsc4jsCxugiJJqCezX0WzWafqrgv9PtQ== X-Received: by 2002:a1c:a986:: with SMTP id s128mr49169383wme.121.1593981996400; Sun, 05 Jul 2020 13:46:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 03/10] hw/sd/pl181: Add TODO to use Fifo32 API Date: Sun, 5 Jul 2020 22:46:23 +0200 Message-Id: <20200705204630.4133-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200705204630.4133-1-f4bug@amsat.org> References: <20200705204630.4133-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Add TODO to use Fifo32 API from "qemu/fifo32.h". Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Peter Maydell --- hw/sd/pl181.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 3fc2cdd71a..86219c851d 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -57,7 +57,7 @@ typedef struct PL181State { http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=3D44= 46/1 */ int32_t linux_hack; - uint32_t fifo[PL181_FIFO_LEN]; + uint32_t fifo[PL181_FIFO_LEN]; /* TODO use Fifo32 */ qemu_irq irq[2]; /* GPIO outputs for 'card is readonly' and 'card inserted' */ qemu_irq cardstatus[2]; --=20 2.21.3 From nobody Sun Apr 28 16:34:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593982203; cv=none; d=zohomail.com; s=zohoarc; b=EinEMAPJLT8oYVYbXCaSXI1zm1roY31RzwhIYHXQkN52JJyPBVNzTPjdtf7iuEVkhdsZR+KF/r82SNCAqIJSUaBnyC9qUSGoDPspUxm/FX0cmnHhG75pfRwuE2bPSCOuDm5rv6d+VjbHbRMxgWM4utdG19LkNWFR1P8okoDbm4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593982203; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WxPjkbT1Cf+fTJhIz6EA4Q+a6g7EtjSauXqyKUUtqbs=; b=cmwXq//fG/bKghNrFcepAq0ZekpW67B5zNpWma6AtvJIqC53eLUYEeUp2H2Q7eWtfEWNyNVCNH4wMUqsd39v4Y2a7vmx7l7OhxkjKEmR0KNlV3UAPE6T5+hlecvrOQeDkVKnjjztkBmKsQl1VEQder8af0VjkIm7fmr1A4+dqGo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593982203864844.4702224057892; Sun, 5 Jul 2020 13:50:03 -0700 (PDT) Received: from localhost ([::1]:47048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsBaM-0001Hf-HQ for importer@patchew.org; Sun, 05 Jul 2020 16:50:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsBX6-0004Wa-Vg; Sun, 05 Jul 2020 16:46:40 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:40836) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsBX5-0000pR-F5; Sun, 05 Jul 2020 16:46:40 -0400 Received: by mail-wr1-x441.google.com with SMTP id f2so10762416wrp.7; Sun, 05 Jul 2020 13:46:38 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id g144sm51397817wme.2.2020.07.05.13.46.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2020 13:46:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WxPjkbT1Cf+fTJhIz6EA4Q+a6g7EtjSauXqyKUUtqbs=; b=mc2aaxRiAz5Y+OEAGL+ybYmW+l0Bz0R2Ha60762Wtp6AqE1nSMUAWgkSgzcfZOUWBE or23TPDUpHb4t/cC+k8K7o+tDy8stfHAWygt+CpZ/ExKqIJIkaBGTY1xn5sgytoBFG/U refyFb9/5P+yQK0JEBuTckvRtmyo4dgBOKxPvza5YMh6HSgq+ZrMjs3UNOxWjxYRdsDj fXEX72oVKjWAqGDVEHEtk5Sqg6QOfFj4BXql57UdkBq0Kq8qzalcG4JFXFSPsclNEuI+ HOu49jQHSFE93+ITlUirQHQbGh4w+jzeLOmnQhLZLQqd6pI5a9JLh0oOd/jfg2U2v3H0 0hLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=WxPjkbT1Cf+fTJhIz6EA4Q+a6g7EtjSauXqyKUUtqbs=; b=TIkKK/Tc9lloLNORhMAugF9dYWsFvMYQRV9RJKHgf0016KstBMDbH5gkm8kEd+ma1x 2xi+4K9jrYSwACd1Ika43PFmUFsN/Vtxy5O91hk45DCSHbiYpFtZIpSKi0pM0GXsk9/J Vi3Lp2tO108/TUO8yr1hlcf/dv6DZwe4pHDpE1+Xiod4fz4uqwf+v+hjomsrz2QDz245 oxHnsDGM6CIgb/34jyohzBMJSYX1ZfZNWd1ogkOJ0Vs3OfhpOnFpm2skhgN7hjoJRGwd x/G4bPA1C8u7euadBK9OVzVpY2MQvIxiMoSNEH6a5sSMrDDHwwM1vYLutdyVSPRSVagM fEcA== X-Gm-Message-State: AOAM530q1qIrKl9U8USm+m8twdBPYZm3kTbHRxbJPk0YJ8qDypho1F1a 0VYxCIjJ345du2yYCVqj7RW1zmv4YeM= X-Google-Smtp-Source: ABdhPJw91Wwsgy9yklgukYdN1oyXPDCzUEIFnV6ARwpc631pb89EqxuL+33SqYWbyZ97j4i35SQlbg== X-Received: by 2002:adf:e6c8:: with SMTP id y8mr48495990wrm.40.1593981997457; Sun, 05 Jul 2020 13:46:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 04/10] hw/arm/versatilepb: Comment to remember some IRQs lines are left unwired Date: Sun, 5 Jul 2020 22:46:24 +0200 Message-Id: <20200705204630.4133-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200705204630.4133-1-f4bug@amsat.org> References: <20200705204630.4133-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The 'card is readonly' and 'card inserted' IRQs are not wired. Add a comment in case someone know where to wire them. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Peter Maydell --- hw/arm/versatilepb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index e596b8170f..45a13ae2b9 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -310,7 +310,9 @@ static void versatile_init(MachineState *machine, int b= oard_id) qdev_connect_gpio_out(sysctl, 0, qdev_get_gpio_in(dev, 0)); =20 sysbus_create_varargs("pl181", 0x10005000, sic[22], sic[1], NULL); + /* FIXME wire 'card is readonly' and 'card inserted' IRQs? */ sysbus_create_varargs("pl181", 0x1000b000, sic[23], sic[2], NULL); + /* FIXME wire 'card is readonly' and 'card inserted' IRQs? */ =20 /* Add PL031 Real Time Clock. */ sysbus_create_simple("pl031", 0x101e8000, pic[10]); --=20 2.21.3 From nobody Sun Apr 28 16:34:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1593982300; cv=none; d=zohomail.com; s=zohoarc; b=Vy37ZAmQvA8iqPZ/KykulbrBktkmHNwKOA1HFXnqYvV2VH28imxGNgjlsxUGB7XghvV9be1wTCi9X64DmbnqK1krcbya7UM6VdxI4A8Z00mNdSBdai/JZvw2TzruFdU9fqlOvxJpaDy6hAgQIXF5XThk9sEz9Et2yARlIFPeB1c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593982300; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zq4O1k2rwycdf6oHiRxmb0Ixv9secgC8eTrxhU7dpKo=; b=TqCzdXH8Y4CaiYOfLOsHwM2wNkeJYs1q1rWPa8kjvBGP93uawxlmd4BYmUcEPPRtIgiiVDRZmL6VxmeMvCtTBwvS+3w8eVPDgP8fjCPeBtd+9Q2M0OfuKMIPhTWmXI6G7nbKd3l+m28IYoTSwRK69iGFMRNbdyc0cvsM/ZPw9ac= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593982300357212.4749656875615; Sun, 5 Jul 2020 13:51:40 -0700 (PDT) Received: from localhost ([::1]:51396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsBbv-0003Dn-6u for importer@patchew.org; Sun, 05 Jul 2020 16:51:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsBX8-0004aN-69; Sun, 05 Jul 2020 16:46:42 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:37284) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsBX6-0000pZ-KP; Sun, 05 Jul 2020 16:46:41 -0400 Received: by mail-wr1-x444.google.com with SMTP id a6so38743220wrm.4; Sun, 05 Jul 2020 13:46:39 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id g144sm51397817wme.2.2020.07.05.13.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2020 13:46:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zq4O1k2rwycdf6oHiRxmb0Ixv9secgC8eTrxhU7dpKo=; b=a6bVa01RQg54e9WoT8RxKoP2OUMpe6C2Hlq175437gpJRF6SloXA3HlnxvVu0Qy+VA wPLtHF0y6MrasjQ2bRjvg7JRmjLru338nzgvME9gmd9pLWBl4Cby3I8XyYXg008s+ZbQ 3oc581IYc80164snEnWu/24rkEw/JVaX1XoJ7cxelexuQEg5CfbUAP59pTEBHFC36kVr mKhF82yEaHer4R70u1JKATosgn+NY3GpaxehNj0pHpSi6P0q0iT7UcScpYGZYKuguSr9 BwBxvW0cFjsb0I0tU0rfbwL+jyOxF/iTm999U9mO4G4p7bCYxvb4FQ81UjApVyARGILr xDQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=zq4O1k2rwycdf6oHiRxmb0Ixv9secgC8eTrxhU7dpKo=; b=gth8BPUkhh0EFpI9oy41M4HPGnuQ+4uaJCnv9b9KLNSREJXBi/cteySQiJkYuApbDX qHJcELN2urDEu8CcX68vLRlJEYs8NZPfR27llOHQjEpxvMVwBTSKhin8Zmk+jadJCusC p/Mr21iCO0+eVaNy2SdzwNW907hCAiwxGRgDEbNyF7OPs72OKPeQ16PpJKwK/+MzpPUo 1dCLj3ez4xXO+VASe6fHXj5/ILX69wYS05aFzD9DjTrGEryGdXbKUUR+uw2e43JJa5gp yzZgq9Sqf7qvmKW2kSu16EJWeOcVgDIh/40Kt3NbrIAQDgcZDKbo4Md2avR5eUKJ4Bua 34TQ== X-Gm-Message-State: AOAM5327bjriy+VGa99mpWZ9idBulXCHxQgCB4KquejdfYBHEm733EmP AtU8OeQ2VNR3OtBmdckRxfNUk/5O8yo= X-Google-Smtp-Source: ABdhPJzQ2mrD/Thmxb1UJHEdD7k1yejLIcEpzcv3Mi6zCcEg9NVNEOD0zA9yK94giT7FI84MVzzZCQ== X-Received: by 2002:a5d:4903:: with SMTP id x3mr48531843wrq.351.1593981998684; Sun, 05 Jul 2020 13:46:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 05/10] hw/sd/pl181: Use named GPIOs Date: Sun, 5 Jul 2020 22:46:25 +0200 Message-Id: <20200705204630.4133-6-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200705204630.4133-1-f4bug@amsat.org> References: <20200705204630.4133-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) To make the code easier to manage/review/use, rename the cardstatus[0] variable as 'card_readonly' and name the GPIO "card-read-only". Similarly with cardstatus[1], renamed as 'card_inserted' and name its GPIO "card-inserted". Adapt the users accordingly by using the qdev_init_gpio_out_named() function. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Peter Maydell Reviewed-by: Alistair Francis --- hw/arm/integratorcp.c | 4 ++-- hw/arm/realview.c | 4 ++-- hw/arm/vexpress.c | 4 ++-- hw/sd/pl181.c | 8 +++++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index b11a846355..2595e4d052 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -645,9 +645,9 @@ static void integratorcp_init(MachineState *machine) sysbus_create_simple(TYPE_INTEGRATOR_DEBUG, 0x1a000000, 0); =20 dev =3D sysbus_create_varargs("pl181", 0x1c000000, pic[23], pic[24], N= ULL); - qdev_connect_gpio_out(dev, 0, + qdev_connect_gpio_out_named(dev, "card-read-only", 0, qdev_get_gpio_in_named(icp, ICP_GPIO_MMC_WPROT, = 0)); - qdev_connect_gpio_out(dev, 1, + qdev_connect_gpio_out_named(dev, "card-inserted", 0, qdev_get_gpio_in_named(icp, ICP_GPIO_MMC_CARDIN,= 0)); sysbus_create_varargs("pl041", 0x1d000000, pic[25], NULL); =20 diff --git a/hw/arm/realview.c b/hw/arm/realview.c index b6c0a1adb9..8dc5f77139 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -234,8 +234,8 @@ static void realview_init(MachineState *machine, mmc_irq[1] =3D qemu_irq_split( qdev_get_gpio_in(sysctl, ARM_SYSCTL_GPIO_MMC_CARDIN), qemu_irq_invert(qdev_get_gpio_in(gpio2, 0))); - qdev_connect_gpio_out(dev, 0, mmc_irq[0]); - qdev_connect_gpio_out(dev, 1, mmc_irq[1]); + qdev_connect_gpio_out_named(dev, "card-read-only", 0, mmc_irq[0]); + qdev_connect_gpio_out_named(dev, "card-inserted", 0, mmc_irq[1]); =20 sysbus_create_simple("pl031", 0x10017000, pic[10]); =20 diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 5bf9cff8a8..16629d6599 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -624,9 +624,9 @@ static void vexpress_common_init(MachineState *machine) =20 dev =3D sysbus_create_varargs("pl181", map[VE_MMCI], pic[9], pic[10], = NULL); /* Wire up MMC card detect and read-only signals */ - qdev_connect_gpio_out(dev, 0, + qdev_connect_gpio_out_named(dev, "card-read-only", 0, qdev_get_gpio_in(sysctl, ARM_SYSCTL_GPIO_MMC_WPR= OT)); - qdev_connect_gpio_out(dev, 1, + qdev_connect_gpio_out_named(dev, "card-inserted", 0, qdev_get_gpio_in(sysctl, ARM_SYSCTL_GPIO_MMC_CAR= DIN)); =20 sysbus_create_simple("pl050_keyboard", map[VE_KMI0], pic[12]); diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 86219c851d..ab4cd733a4 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -60,7 +60,8 @@ typedef struct PL181State { uint32_t fifo[PL181_FIFO_LEN]; /* TODO use Fifo32 */ qemu_irq irq[2]; /* GPIO outputs for 'card is readonly' and 'card inserted' */ - qemu_irq cardstatus[2]; + qemu_irq card_readonly; + qemu_irq card_inserted; } PL181State; =20 static const VMStateDescription vmstate_pl181 =3D { @@ -479,7 +480,7 @@ static void pl181_reset(DeviceState *d) s->mask[1] =3D 0; =20 /* We can assume our GPIO outputs have been wired up now */ - sd_set_cb(s->card, s->cardstatus[0], s->cardstatus[1]); + sd_set_cb(s->card, s->card_readonly, s->card_inserted); /* Since we're still using the legacy SD API the card is not plugged * into any bus, and we must reset it manually. */ @@ -496,7 +497,8 @@ static void pl181_init(Object *obj) sysbus_init_mmio(sbd, &s->iomem); sysbus_init_irq(sbd, &s->irq[0]); sysbus_init_irq(sbd, &s->irq[1]); - qdev_init_gpio_out(dev, s->cardstatus, 2); + qdev_init_gpio_out_named(dev, &s->card_readonly, "card-read-only", 1); + qdev_init_gpio_out_named(dev, &s->card_inserted, "card-inserted", 1); } =20 static void pl181_realize(DeviceState *dev, Error **errp) --=20 2.21.3 From nobody Sun Apr 28 16:34:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593982103; cv=none; d=zohomail.com; s=zohoarc; b=aODc4jAtadJIsGxsB+DYiW1COPw9xGGmxQJuuMkPxBCgguPyO1Y8DU98ozCEXREnm4SFs68vR+Y//R111KFXB+uuRi45ovG55ZScls5/dPQnZA5xvelFtuHbKZs+6LqwuWOcQt2IyjjJ6Ng4ypRKUE5OKCPIAN5kooARI5jE4aU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593982103; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oBbjHGJBucg5THxZq7KR1Jrgf1YjvhSClfXgvgV5JcQ=; b=Zz5lJzAwvJdX51NFCZDJ9w7oz4IlIOK95MEihb06GQelscvOV3u4RszFDnBpr4wCq+/WKd290Z2MI35E4DVLIeS9a+JZTzr8KcX/IvWJ0zj/N/99Fv+4X/uvUTO5P45PI6JbmRE1fzGPDxlWIC5Tl2PddCENV9aa0kM7L2N9roc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593982103963379.0297241551988; Sun, 5 Jul 2020 13:48:23 -0700 (PDT) Received: from localhost ([::1]:39518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsBYk-0006ZE-NE for importer@patchew.org; Sun, 05 Jul 2020 16:48:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsBXA-0004eh-MV; Sun, 05 Jul 2020 16:46:44 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:43107) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsBX7-0000pk-Pz; Sun, 05 Jul 2020 16:46:43 -0400 Received: by mail-wr1-x441.google.com with SMTP id j4so36312025wrp.10; Sun, 05 Jul 2020 13:46:41 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id g144sm51397817wme.2.2020.07.05.13.46.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2020 13:46:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oBbjHGJBucg5THxZq7KR1Jrgf1YjvhSClfXgvgV5JcQ=; b=Y1KFWg4JbGmm5RET/B82Sot6qGMvhQslhwXjX1IOWPnQ8H37mqCIN8Tvwp9DmxQ2J5 IXE2QtsgZrQvwxeEI2KdoORTnuuVOrisUYe4lxso5VH5oe9A/u+3hX/PPnjtXy3lr5y0 Eb5rLbV8jpKvzjdc5LhoTMTjp0dnNuyT/O419mwm4kenSVWsXfp+fDCxftaH1VdjZWOI XyZLlOtmuB6bbDaRyR1QoIuxJ0LNr0x0R4TCF9GV3EuMwRNmhqLHgb8hmdJgnmh1+W3k sJxxAOhO9rXo5NlNYurp3UaA3maaxOx1OCsQQ0Kl/jsaR4i1Z8wSaomp+bYlnl+ObEHH MywQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oBbjHGJBucg5THxZq7KR1Jrgf1YjvhSClfXgvgV5JcQ=; b=WYRHS2WOlDoNAZRy/zQcOKXEGkkGFgEt/pZlDwBjp4hioMhOvqhJcWKijOnRJi5MWc 506OtuvPl0wZcpJ22PeElOzUVVVGmAcR5hFcXARWDUzjz1jZatS5TpviUC9DzwqbARSJ h0ke2ayNHZIDFVbIPlgsQZi9+wGR7E2b79LWdFg0ONaYbBgJmaPuXhyjjWyy5OK1yQAu 5CfhQJWOyKf+sX4HihUb2xC76vtDgF6dqYF/I5Osf0ovYaH984eZHXC0XjXHnh3v9eWX o6EgyvJXjQFkw5Tg64J5YbJdAwHe6d83C9vIRhMIH3yKfyvvq6bPgQHSIsSzzsGs+tUM wZxw== X-Gm-Message-State: AOAM531oN1YOeVPmXo++KBmZyQgjx3G4+2gEoMweMRAhnuJWcCvzhLQU binmiIokag6P2FHmFwOuKFZC3+1ZaiI= X-Google-Smtp-Source: ABdhPJxOITLXvnAw/Ph5iYXBLAuQjO3e57tDfcvXcUrNup+TxLdjbI2xhRLlLj9tenqWNg7qGtFRfw== X-Received: by 2002:adf:efc9:: with SMTP id i9mr48377933wrp.77.1593981999790; Sun, 05 Jul 2020 13:46:39 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 06/10] hw/sd/pl181: Expose a SDBus and connect the SDCard to it Date: Sun, 5 Jul 2020 22:46:26 +0200 Message-Id: <20200705204630.4133-7-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200705204630.4133-1-f4bug@amsat.org> References: <20200705204630.4133-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Convert the controller to the SDBus API: - add the a TYPE_PL181_BUS object of type TYPE_SD_BUS, - adapt the SDBusClass set_inserted/set_readonly handlers - create the bus in the PL181 controller - switch legacy sd_*() API to the sdbus_*() API. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Peter Maydell Reviewed-by: Alistair Francis --- Since v3: Addressed Peter comment, adding TYPE_PL181_BUS: https://www.mail-archive.com/qemu-devel@nongnu.org/msg515866.html --- hw/sd/pl181.c | 67 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 16 deletions(-) diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index ab4cd733a4..f6de06ece8 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -17,6 +17,7 @@ #include "qemu/module.h" #include "qemu/error-report.h" #include "qapi/error.h" +#include "hw/qdev-properties.h" =20 //#define DEBUG_PL181 1 =20 @@ -32,11 +33,13 @@ do { printf("pl181: " fmt , ## __VA_ARGS__); } while (0) #define TYPE_PL181 "pl181" #define PL181(obj) OBJECT_CHECK(PL181State, (obj), TYPE_PL181) =20 +#define TYPE_PL181_BUS "pl181-bus" + typedef struct PL181State { SysBusDevice parent_obj; =20 MemoryRegion iomem; - SDState *card; + SDBus sdbus; uint32_t clock; uint32_t power; uint32_t cmdarg; @@ -183,7 +186,7 @@ static void pl181_do_command(PL181State *s) request.cmd =3D s->cmd & PL181_CMD_INDEX; request.arg =3D s->cmdarg; DPRINTF("Command %d %08x\n", request.cmd, request.arg); - rlen =3D sd_do_command(s->card, &request, response); + rlen =3D sdbus_do_command(&s->sdbus, &request, response); if (rlen < 0) goto error; if (s->cmd & PL181_CMD_RESPONSE) { @@ -224,12 +227,12 @@ static void pl181_fifo_run(PL181State *s) int is_read; =20 is_read =3D (s->datactrl & PL181_DATA_DIRECTION) !=3D 0; - if (s->datacnt !=3D 0 && (!is_read || sd_data_ready(s->card)) + if (s->datacnt !=3D 0 && (!is_read || sdbus_data_ready(&s->sdbus)) && !s->linux_hack) { if (is_read) { n =3D 0; while (s->datacnt && s->fifo_len < PL181_FIFO_LEN) { - value |=3D (uint32_t)sd_read_data(s->card) << (n * 8); + value |=3D (uint32_t)sdbus_read_data(&s->sdbus) << (n * 8); s->datacnt--; n++; if (n =3D=3D 4) { @@ -250,7 +253,7 @@ static void pl181_fifo_run(PL181State *s) } n--; s->datacnt--; - sd_write_data(s->card, value & 0xff); + sdbus_write_data(&s->sdbus, value & 0xff); value >>=3D 8; } } @@ -456,6 +459,20 @@ static const MemoryRegionOps pl181_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 +static void pl181_set_readonly(DeviceState *dev, bool level) +{ + PL181State *s =3D (PL181State *)dev; + + qemu_set_irq(s->card_readonly, level); +} + +static void pl181_set_inserted(DeviceState *dev, bool level) +{ + PL181State *s =3D (PL181State *)dev; + + qemu_set_irq(s->card_inserted, level); +} + static void pl181_reset(DeviceState *d) { PL181State *s =3D PL181(d); @@ -479,12 +496,9 @@ static void pl181_reset(DeviceState *d) s->mask[0] =3D 0; s->mask[1] =3D 0; =20 - /* We can assume our GPIO outputs have been wired up now */ - sd_set_cb(s->card, s->card_readonly, s->card_inserted); - /* Since we're still using the legacy SD API the card is not plugged - * into any bus, and we must reset it manually. - */ - device_legacy_reset(DEVICE(s->card)); + /* Reset other state based on current card insertion/readonly status */ + pl181_set_inserted(DEVICE(s), sdbus_get_inserted(&s->sdbus)); + pl181_set_readonly(DEVICE(s), sdbus_get_readonly(&s->sdbus)); } =20 static void pl181_init(Object *obj) @@ -499,19 +513,24 @@ static void pl181_init(Object *obj) sysbus_init_irq(sbd, &s->irq[1]); qdev_init_gpio_out_named(dev, &s->card_readonly, "card-read-only", 1); qdev_init_gpio_out_named(dev, &s->card_inserted, "card-inserted", 1); + + qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), + TYPE_PL181_BUS, dev, "sd-bus"); } =20 static void pl181_realize(DeviceState *dev, Error **errp) { - PL181State *s =3D PL181(dev); + DeviceState *card; DriveInfo *dinfo; =20 /* FIXME use a qdev drive property instead of drive_get_next() */ + card =3D qdev_new(TYPE_SD_CARD); dinfo =3D drive_get_next(IF_SD); - s->card =3D sd_init(dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, false); - if (s->card =3D=3D NULL) { - error_setg(errp, "sd_init failed"); - } + qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo), + &error_fatal); + qdev_realize_and_unref(card, + qdev_get_child_bus(dev, "sd-bus"), + &error_fatal); } =20 static void pl181_class_init(ObjectClass *klass, void *data) @@ -533,9 +552,25 @@ static const TypeInfo pl181_info =3D { .class_init =3D pl181_class_init, }; =20 +static void pl181_bus_class_init(ObjectClass *klass, void *data) +{ + SDBusClass *sbc =3D SD_BUS_CLASS(klass); + + sbc->set_inserted =3D pl181_set_inserted; + sbc->set_readonly =3D pl181_set_readonly; +} + +static const TypeInfo pl181_bus_info =3D { + .name =3D TYPE_PL181_BUS, + .parent =3D TYPE_SD_BUS, + .instance_size =3D sizeof(SDBus), + .class_init =3D pl181_bus_class_init, +}; + static void pl181_register_types(void) { type_register_static(&pl181_info); + type_register_static(&pl181_bus_info); } =20 type_init(pl181_register_types) --=20 2.21.3 From nobody Sun Apr 28 16:34:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593982381; cv=none; d=zohomail.com; s=zohoarc; b=T/1PsWNWGv+eUcD0h/bRhSMV56LbFNsEPOO6UK6dD14Dt8TLRUJRdYH8RUSeFrGHmU42dBVTZhDPaeYbadwkPV+whQ5PF2EA//mdpr+GUmXIOz1yPzixnVe0uspk8dZ4QqkNeQJbpYHVqxJOtxEc9bhlkM/BojVr/zqryIMFrSs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593982381; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=v1NlZalUn9sYtpkkGM3q4r5EBxdvP894Z098G1hnWP4=; b=HNqhgD53/q25nUiT1hrwLPBhTZRNSOPmbDiQ9kXrvLAvqd2aFcvUfxzhZl0VO8AzUAaIhIZCTASwEwnyjnHAykAOIZgg4eJsAJDa3ck4TnfW8eDEJZMQKKctw5K10nXH2UDu0STODHuL/9pohxvv8vLdk6LvBNislS8iKzOTasY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159398238129432.31222454518695; Sun, 5 Jul 2020 13:53:01 -0700 (PDT) Received: from localhost ([::1]:55672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsBdE-0005JY-1G for importer@patchew.org; Sun, 05 Jul 2020 16:53:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsBXA-0004hS-KI; Sun, 05 Jul 2020 16:46:44 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:52596) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsBX8-0000py-Rw; Sun, 05 Jul 2020 16:46:44 -0400 Received: by mail-wm1-x344.google.com with SMTP id q15so37072259wmj.2; Sun, 05 Jul 2020 13:46:42 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id g144sm51397817wme.2.2020.07.05.13.46.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2020 13:46:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v1NlZalUn9sYtpkkGM3q4r5EBxdvP894Z098G1hnWP4=; b=RNSj7tMK0/nBt4fFGPLqNk+LrrXz1yQyjt56PsKMq6D3C1QDpdObXzPb6r8a6rbhoV AtImB+Io9PTAfVLs+4livWbCY3jDyqoJXgyt2bAT8Qc5gLnPh6jzs62bCB9fbTdnWx1z e61c1nmN+Uho/HE8bHhNkSGfxOLoPByMwi2A5/mJorMtn0hNUsP2A7fd5NJ1/ECLtcZL KZEnl+YlotqTyOtTnD4310L7cyRFVhnbO5frKWCqKmRoR+5oXa/vK4/ns7OXHqjf9Zxr pwJl8PEkWwWEb9hyEkJEuqtw9XQw/B1SbA3GTYvPrWPfieU3hhwYW+wziqtl4uztDQlE 6FJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=v1NlZalUn9sYtpkkGM3q4r5EBxdvP894Z098G1hnWP4=; b=Xx4G/8h+desEWaqEuE6y901DNYj7MKndPoC8D0rGGCOvWs26SUYlDzKoxTT8Sywl5R zjUOcQN9JoTykSF+Nkp7nwVFeHFlHQbF41d8sYzLMeS19kWH1I7S2CddgdyQT1cse85Y pnpC3sszgFsMVCI/qDwlmtFFARZ5AocwcDn6b2lpgVr7oKIBpUVrM+y9y8wODEm148vT 4J9UyrcPFLf5k4JNfbGba5NhmOTnBm3wJhFpcwBXAWD8MkKEEyU6xudVQmfy65hRvDab +dw95x0Qe2yG0LY+izi49WK4sUpTdzOW96gTLhmjob55W2wL6BCSdH8O0O2dtPKhVadQ +Kqw== X-Gm-Message-State: AOAM530ngNLvbgbAPjAYM5KUVByTdcvU+Ut7GuQ6YnOOdZN896Q98pDO yGNy+Gj++MNU5AI1/AKGItk+aGJbS/c= X-Google-Smtp-Source: ABdhPJwB10OF1a+cD5b3rJUlrg7ifW359DNwQGWNXliB18I6JcVNWC+VxvdX2p9EcIh4UejOI8yaFQ== X-Received: by 2002:a1c:7f87:: with SMTP id a129mr48288069wmd.10.1593982000914; Sun, 05 Jul 2020 13:46:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 07/10] hw/sd/pl181: Do not create SD card within the SDHCI controller Date: Sun, 5 Jul 2020 22:46:27 +0200 Message-Id: <20200705204630.4133-8-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200705204630.4133-1-f4bug@amsat.org> References: <20200705204630.4133-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) SDHCI controllers provide a SD Bus to plug SD cards, but don't come with SD card plugged in :) Let the machine/board object create and plug the SD cards when required. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Peter Maydell Reviewed-by: Alistair Francis Reviewed-by: Peter Maydell --- hw/arm/integratorcp.c | 13 +++++++++++++ hw/arm/realview.c | 12 ++++++++++++ hw/arm/versatilepb.c | 26 ++++++++++++++++++++++++-- hw/arm/vexpress.c | 11 +++++++++++ hw/sd/pl181.c | 19 +------------------ 5 files changed, 61 insertions(+), 20 deletions(-) diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index 2595e4d052..9bf25945d2 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -25,6 +25,7 @@ #include "hw/char/pl011.h" #include "hw/hw.h" #include "hw/irq.h" +#include "hw/sd/sd.h" =20 #define TYPE_INTEGRATOR_CM "integrator_core" #define INTEGRATOR_CM(obj) \ @@ -595,6 +596,7 @@ static void integratorcp_init(MachineState *machine) MemoryRegion *ram_alias =3D g_new(MemoryRegion, 1); qemu_irq pic[32]; DeviceState *dev, *sic, *icp; + DriveInfo *dinfo; int i; =20 cpuobj =3D object_new(machine->cpu_type); @@ -649,6 +651,17 @@ static void integratorcp_init(MachineState *machine) qdev_get_gpio_in_named(icp, ICP_GPIO_MMC_WPROT, = 0)); qdev_connect_gpio_out_named(dev, "card-inserted", 0, qdev_get_gpio_in_named(icp, ICP_GPIO_MMC_CARDIN,= 0)); + dinfo =3D drive_get_next(IF_SD); + if (dinfo) { + DeviceState *card; + + card =3D qdev_new(TYPE_SD_CARD); + qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo), + &error_fatal); + qdev_realize_and_unref(card, qdev_get_child_bus(dev, "sd-bus"), + &error_fatal); + } + sysbus_create_varargs("pl041", 0x1d000000, pic[25], NULL); =20 if (nd_table[0].used) diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 8dc5f77139..4df8ea4fce 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -27,6 +27,7 @@ #include "hw/intc/realview_gic.h" #include "hw/irq.h" #include "hw/i2c/arm_sbcon_i2c.h" +#include "hw/sd/sd.h" =20 #define SMP_BOOT_ADDR 0xe0000000 #define SMP_BOOTREG_ADDR 0x10000030 @@ -69,6 +70,7 @@ static void realview_init(MachineState *machine, qemu_irq mmc_irq[2]; PCIBus *pci_bus =3D NULL; NICInfo *nd; + DriveInfo *dinfo; I2CBus *i2c; int n; unsigned int smp_cpus =3D machine->smp.cpus; @@ -236,6 +238,16 @@ static void realview_init(MachineState *machine, qemu_irq_invert(qdev_get_gpio_in(gpio2, 0))); qdev_connect_gpio_out_named(dev, "card-read-only", 0, mmc_irq[0]); qdev_connect_gpio_out_named(dev, "card-inserted", 0, mmc_irq[1]); + dinfo =3D drive_get_next(IF_SD); + if (dinfo) { + DeviceState *card; + + card =3D qdev_new(TYPE_SD_CARD); + qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo), + &error_fatal); + qdev_realize_and_unref(card, qdev_get_child_bus(dev, "sd-bus"), + &error_fatal); + } =20 sysbus_create_simple("pl031", 0x10017000, pic[10]); =20 diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 45a13ae2b9..7fb9da5a47 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -25,6 +25,7 @@ #include "hw/block/flash.h" #include "qemu/error-report.h" #include "hw/char/pl011.h" +#include "hw/sd/sd.h" =20 #define VERSATILE_FLASH_ADDR 0x34000000 #define VERSATILE_FLASH_SIZE (64 * 1024 * 1024) @@ -309,10 +310,31 @@ static void versatile_init(MachineState *machine, int= board_id) /* Wire up the mux control signals from the SYS_CLCD register */ qdev_connect_gpio_out(sysctl, 0, qdev_get_gpio_in(dev, 0)); =20 - sysbus_create_varargs("pl181", 0x10005000, sic[22], sic[1], NULL); + dev =3D sysbus_create_varargs("pl181", 0x10005000, sic[22], sic[1], NU= LL); /* FIXME wire 'card is readonly' and 'card inserted' IRQs? */ - sysbus_create_varargs("pl181", 0x1000b000, sic[23], sic[2], NULL); + dinfo =3D drive_get_next(IF_SD); + if (dinfo) { + DeviceState *card; + + card =3D qdev_new(TYPE_SD_CARD); + qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo), + &error_fatal); + qdev_realize_and_unref(card, qdev_get_child_bus(dev, "sd-bus"), + &error_fatal); + } + + dev =3D sysbus_create_varargs("pl181", 0x1000b000, sic[23], sic[2], NU= LL); /* FIXME wire 'card is readonly' and 'card inserted' IRQs? */ + dinfo =3D drive_get_next(IF_SD); + if (dinfo) { + DeviceState *card; + + card =3D qdev_new(TYPE_SD_CARD); + qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo), + &error_fatal); + qdev_realize_and_unref(card, qdev_get_child_bus(dev, "sd-bus"), + &error_fatal); + } =20 /* Add PL031 Real Time Clock. */ sysbus_create_simple("pl031", 0x101e8000, pic[10]); diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 16629d6599..a2f70588bd 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -43,6 +43,7 @@ #include "hw/cpu/a9mpcore.h" #include "hw/cpu/a15mpcore.h" #include "hw/i2c/arm_sbcon_i2c.h" +#include "hw/sd/sd.h" =20 #define VEXPRESS_BOARD_ID 0x8e0 #define VEXPRESS_FLASH_SIZE (64 * 1024 * 1024) @@ -628,6 +629,16 @@ static void vexpress_common_init(MachineState *machine) qdev_get_gpio_in(sysctl, ARM_SYSCTL_GPIO_MMC_WPR= OT)); qdev_connect_gpio_out_named(dev, "card-inserted", 0, qdev_get_gpio_in(sysctl, ARM_SYSCTL_GPIO_MMC_CAR= DIN)); + dinfo =3D drive_get_next(IF_SD); + if (dinfo) { + DeviceState *card; + + card =3D qdev_new(TYPE_SD_CARD); + qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo), + &error_fatal); + qdev_realize_and_unref(card, qdev_get_child_bus(dev, "sd-bus"), + &error_fatal); + } =20 sysbus_create_simple("pl050_keyboard", map[VE_KMI0], pic[12]); sysbus_create_simple("pl050_mouse", map[VE_KMI1], pic[13]); diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index f6de06ece8..f69488ebac 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -17,7 +17,6 @@ #include "qemu/module.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" =20 //#define DEBUG_PL181 1 =20 @@ -518,30 +517,14 @@ static void pl181_init(Object *obj) TYPE_PL181_BUS, dev, "sd-bus"); } =20 -static void pl181_realize(DeviceState *dev, Error **errp) -{ - DeviceState *card; - DriveInfo *dinfo; - - /* FIXME use a qdev drive property instead of drive_get_next() */ - card =3D qdev_new(TYPE_SD_CARD); - dinfo =3D drive_get_next(IF_SD); - qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo), - &error_fatal); - qdev_realize_and_unref(card, - qdev_get_child_bus(dev, "sd-bus"), - &error_fatal); -} - static void pl181_class_init(ObjectClass *klass, void *data) { DeviceClass *k =3D DEVICE_CLASS(klass); =20 k->vmsd =3D &vmstate_pl181; k->reset =3D pl181_reset; - /* Reason: init() method uses drive_get_next() */ + /* Reason: output IRQs should be wired up */ k->user_creatable =3D false; - k->realize =3D pl181_realize; } =20 static const TypeInfo pl181_info =3D { --=20 2.21.3 From nobody Sun Apr 28 16:34:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593982324; cv=none; d=zohomail.com; s=zohoarc; b=m+AzOeaoH5GgCyu60JXG3ZTwbxxggHUK8mphltzrDPF3E/WY/h2TG2pXzEVqPUj7Ps8XquziC9zyNnaRf0bIBBhbjoJEGOWgXEctW4o5ss2BM3il2F/KVCfYTa4+DVIpx7Y3jdI6nBewPQI36n1C65LZxkE7FCX7/bhmYH7VHvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593982324; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9r/UuMNriotkB9gXNJa6dykrAj3Jm9YA/tEThvkByFI=; b=ZeAOo3PiaYxLOlffZ0mi0NOpWzn8mfxerh2H7jnbrs6+poPQ9KiRLbPBU0wlBhgGLAx+8H6eJoKavPJV/IvXKl04SrF6QsNF+UCxnoaeuQ3AUKdsLDRkz2PWSoXWRw+xDLtMl7BzKdnHM1gz+NoBJwa+/GJjPaNoEIVEvO2EvCo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593982324704641.6763595320566; Sun, 5 Jul 2020 13:52:04 -0700 (PDT) Received: from localhost ([::1]:52448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsBcJ-0003dO-I1 for importer@patchew.org; Sun, 05 Jul 2020 16:52:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsBXB-0004kj-Tc; Sun, 05 Jul 2020 16:46:45 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:40515) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsBXA-0000q9-6d; Sun, 05 Jul 2020 16:46:45 -0400 Received: by mail-wm1-x329.google.com with SMTP id f139so39591232wmf.5; Sun, 05 Jul 2020 13:46:43 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id g144sm51397817wme.2.2020.07.05.13.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2020 13:46:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9r/UuMNriotkB9gXNJa6dykrAj3Jm9YA/tEThvkByFI=; b=XCFxlx/+OKFUTT9H1bSYw9a34DB2DnStTMlRHTeJX+STyC3PCjjO6V4LueXAeuWddy mgVcF+yjl91IJSQbwjl4ibglXO73LXhtdpsigv8VrUe+ksLjdaP0EC+TJgRTS0kFAONO tsW9hgiuz/pZVTGJox/JHUXsbzuyuvOZVO9B1PEINypJs+r3m/X2rOVju6cXQ0ddn5Po ArWyos2HTJ2ZBkrqZIhHYfpvOdiLNQeSSuyvwSkYP+Qa0yCpMVZej4R/0iyLUKQ2wknS 8d6zLwLsVS1NS/XtpDx9ROCM8uhYGuO56ymKVHDafSMsHk1vLYYfUXuHuk8ochExs8+z kfxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9r/UuMNriotkB9gXNJa6dykrAj3Jm9YA/tEThvkByFI=; b=KAHsc0I3tNmPElpY/MQRvpdfjdB1Kbksx/95jOWRV+/qVyyjsvoGXABddwMcD0sYv7 4X1zxL6DNg6MyXz4w8utfSGQ3T8PwxMrwoBAsHd4iSo2hS4PqLKmevniTH8VZXdU6wmq jZMlsap+uKDDakewP2FK8qXEcCIULHE/nOIBkHvvZm+bMsbVfUW16uS4w78qHiFYnHkI gfDdba2jBj8VmqsYsbwyTUTUN+FC0YvppWYDaTeccQ5frPHsczVi/0PQegBV9t9OR0EE c/oFu4/9l3e0qwTtdOxo7di02megZzv/Tp3UcJAFJXjmWCFAxKmMrRK8RZ3+pjoBAMOg QFIQ== X-Gm-Message-State: AOAM530Q1r846H1F28sV7mM5DJVfmomqx9QiD4FV/feQvoGUg+iTrt8+ i678xVWAdsuDRDiJ+VeCYjDpCEBC5nI= X-Google-Smtp-Source: ABdhPJyE7dTtryLtaSUYdhYaKoVGMGVmflRl2pVmy6IPbvISfh4+5Id0+WwPDEvWgbtN0G0g0KTCPw== X-Received: by 2002:a7b:c956:: with SMTP id i22mr47109373wml.95.1593982002099; Sun, 05 Jul 2020 13:46:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 08/10] hw/sd/pl181: Replace disabled fprintf()s by trace events Date: Sun, 5 Jul 2020 22:46:28 +0200 Message-Id: <20200705204630.4133-9-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200705204630.4133-1-f4bug@amsat.org> References: <20200705204630.4133-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x329.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Convert disabled DPRINTF() to trace events and remove ifdef'ry. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Peter Maydell Reviewed-by: Alistair Francis --- hw/sd/pl181.c | 26 +++++++++----------------- hw/sd/trace-events | 10 ++++++++++ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index f69488ebac..574500ce60 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -17,15 +17,7 @@ #include "qemu/module.h" #include "qemu/error-report.h" #include "qapi/error.h" - -//#define DEBUG_PL181 1 - -#ifdef DEBUG_PL181 -#define DPRINTF(fmt, ...) \ -do { printf("pl181: " fmt , ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) do {} while(0) -#endif +#include "trace.h" =20 #define PL181_FIFO_LEN 16 =20 @@ -158,7 +150,7 @@ static void pl181_fifo_push(PL181State *s, uint32_t val= ue) n =3D (s->fifo_pos + s->fifo_len) & (PL181_FIFO_LEN - 1); s->fifo_len++; s->fifo[n] =3D value; - DPRINTF("FIFO push %08x\n", (int)value); + trace_pl181_fifo_push(value); } =20 static uint32_t pl181_fifo_pop(PL181State *s) @@ -172,7 +164,7 @@ static uint32_t pl181_fifo_pop(PL181State *s) value =3D s->fifo[s->fifo_pos]; s->fifo_len--; s->fifo_pos =3D (s->fifo_pos + 1) & (PL181_FIFO_LEN - 1); - DPRINTF("FIFO pop %08x\n", (int)value); + trace_pl181_fifo_pop(value); return value; } =20 @@ -184,7 +176,7 @@ static void pl181_do_command(PL181State *s) =20 request.cmd =3D s->cmd & PL181_CMD_INDEX; request.arg =3D s->cmdarg; - DPRINTF("Command %d %08x\n", request.cmd, request.arg); + trace_pl181_command_send(request.cmd, request.arg); rlen =3D sdbus_do_command(&s->sdbus, &request, response); if (rlen < 0) goto error; @@ -201,16 +193,16 @@ static void pl181_do_command(PL181State *s) s->response[2] =3D ldl_be_p(&response[8]); s->response[3] =3D ldl_be_p(&response[12]) & ~1; } - DPRINTF("Response received\n"); + trace_pl181_command_response_pending(); s->status |=3D PL181_STATUS_CMDRESPEND; } else { - DPRINTF("Command sent\n"); + trace_pl181_command_sent(); s->status |=3D PL181_STATUS_CMDSENT; } return; =20 error: - DPRINTF("Timeout\n"); + trace_pl181_command_timeout(); s->status |=3D PL181_STATUS_CMDTIMEOUT; } =20 @@ -262,11 +254,11 @@ static void pl181_fifo_run(PL181State *s) s->status |=3D PL181_STATUS_DATAEND; /* HACK: */ s->status |=3D PL181_STATUS_DATABLOCKEND; - DPRINTF("Transfer Complete\n"); + trace_pl181_fifo_transfer_complete(); } if (s->datacnt =3D=3D 0 && s->fifo_len =3D=3D 0) { s->datactrl &=3D ~PL181_DATA_ENABLE; - DPRINTF("Data engine idle\n"); + trace_pl181_data_engine_idle(); } else { /* Update FIFO bits. */ bits =3D PL181_STATUS_TXACTIVE | PL181_STATUS_RXACTIVE; diff --git a/hw/sd/trace-events b/hw/sd/trace-events index 5f09d32eb2..a87d7355fb 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -62,3 +62,13 @@ milkymist_memcard_memory_write(uint32_t addr, uint32_t v= alue) "addr 0x%08x value # pxa2xx_mmci.c pxa2xx_mmci_read(uint8_t size, uint32_t addr, uint32_t value) "size %d add= r 0x%02x value 0x%08x" pxa2xx_mmci_write(uint8_t size, uint32_t addr, uint32_t value) "size %d ad= dr 0x%02x value 0x%08x" + +# pl181.c +pl181_command_send(uint8_t cmd, uint32_t arg) "sending CMD%02d arg 0x%08" = PRIx32 +pl181_command_sent(void) "command sent" +pl181_command_response_pending(void) "response received" +pl181_command_timeout(void) "command timeouted" +pl181_fifo_push(uint32_t data) "FIFO push 0x%08" PRIx32 +pl181_fifo_pop(uint32_t data) "FIFO pop 0x%08" PRIx32 +pl181_fifo_transfer_complete(void) "FIFO transfer complete" +pl181_data_engine_idle(void) "data engine idle" --=20 2.21.3 From nobody Sun Apr 28 16:34:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593982480; cv=none; d=zohomail.com; s=zohoarc; b=mVCVN6khfBK57jfVOmkh93S8U3B4jtK1TGXRJuWujamh0Ff1lUdkK74G3/t5kDdQmQtNuRgKPK+4CejyxqO4yrgAspMWTpZbY6pY67UBEMjgVh0BgIdykWRffgvtLo6rQvGS8c4HJl9E1YyMLl0tczinZObxCUN4t233iyJNxjY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593982480; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kNwib0BMo1+5Iu5sjaNj7HGTV7ZxsjSjKRCMexInxyg=; b=Ol/rBoiNy6kcvRGQheICh0UIgq/pnyavOdf6p+CuINy0VcfbjR1XM82Wodt93bFh2rZXEoswebhhmIdbirHLJ8edJlraPp/iaYwqWkAqwwSy4tfMrPxdvNbkFGOgyhyzC5Kl2Pk4rpg4AJVvfPplJXkUtcMbJq21BF04z2mVcRE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159398248049722.266990216447084; Sun, 5 Jul 2020 13:54:40 -0700 (PDT) Received: from localhost ([::1]:60116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsBep-0007ej-7G for importer@patchew.org; Sun, 05 Jul 2020 16:54:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsBXC-0004oI-Uz; Sun, 05 Jul 2020 16:46:46 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:39212) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsBXB-0000qM-Bm; Sun, 05 Jul 2020 16:46:46 -0400 Received: by mail-wr1-x432.google.com with SMTP id q5so38718653wru.6; Sun, 05 Jul 2020 13:46:44 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id g144sm51397817wme.2.2020.07.05.13.46.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2020 13:46:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kNwib0BMo1+5Iu5sjaNj7HGTV7ZxsjSjKRCMexInxyg=; b=uLt8axL5DGUbglnhirInKZ6wy5zC9Rf5Nde7P2D3eB7Jtr8YcQDVOqywS9poHF1n8U jRwbs1GKuJne8DuQRWv5+EkIynR2wuywL5jY89HjKj+NukpaenXkttWWNu4F+PQtfJDU A3wtGiDRIy7p7jTSEwL0kLOlGM9/lDdB5famGENHUDmQu2HuNcxV4+0zJmHxkH08/5J5 dtkI8jLYK2ALuf9Q3KhttqtvFGmB0+rw7NDzBcOw/N3PuE9SqbiY3edia3UiG67twD0O 5tXAj01dPnDyYSr+rCcT8+wpfwUmCgP1BWHYaCoYqWB0w7upiOQmXnVNYSpOo156FrOU bNuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kNwib0BMo1+5Iu5sjaNj7HGTV7ZxsjSjKRCMexInxyg=; b=oTioSonD69o6BiFKtRs8ZyakOwIfauD8UEhgMCA3h9HAtW5fHbx9HmxRVOPN6AUZLl wOamKrZVZCBJAWzxk5B34b+1WgQS1QmhrTMb33qvn2Azp5bNF8gGeblurOeEzr1/BI+X 051nK8XIeGEqxTx4G+Sl5tX4Xy7BIuHzJT2/dEKRDEfBZQ4NYEOK7s6TG+LxZETxq2u7 vsK9STh91dWXw+5VXsKO20HARmpmjGxfOsqsSNO8KmbG6dzCOnrNwXfOcYGTBuZhJHW6 dc9x7oluzwRVKvzQ4V9OK33vcAGygGST6vsCbDo5kEl4RW8xSC3NGW3TfEPiekBPQqiU 7xng== X-Gm-Message-State: AOAM531ve90X6IU61F6yBjP+i92X3e6MgsVbkTuPH/BcrUm16EFtr/Aq 644I70GciISVql7ZlKvYHtf66rB3cT4= X-Google-Smtp-Source: ABdhPJxZ+r34r9tSOXg1sfVhSImkPRW2+KzqKZ2GYiL68eTQhEjPjIygq6R/ElgZ/c9/2SzCSKB+mg== X-Received: by 2002:adf:82a1:: with SMTP id 30mr48880977wrc.210.1593982003494; Sun, 05 Jul 2020 13:46:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 09/10] hw/sd/sdcard: make sd_data_ready() static Date: Sun, 5 Jul 2020 22:46:29 +0200 Message-Id: <20200705204630.4133-10-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200705204630.4133-1-f4bug@amsat.org> References: <20200705204630.4133-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x432.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) sd_data_ready() belongs to the legacy API. As its last user has been converted to the SDBus API, make it static. Reviewed-by: Alistair Francis Message-Id: <20180216022933.10945-7-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Peter Maydell --- include/hw/sd/sd.h | 1 - hw/sd/sd.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index a84b8e274a..ace350e0e8 100644 --- a/include/hw/sd/sd.h +++ b/include/hw/sd/sd.h @@ -143,7 +143,6 @@ int sd_do_command(SDState *sd, SDRequest *req, void sd_write_data(SDState *sd, uint8_t value); uint8_t sd_read_data(SDState *sd); void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert); -bool sd_data_ready(SDState *sd); /* sd_enable should not be used -- it is only used on the nseries boards, * where it is part of a broken implementation of the MMC card slot switch * (there should be two card slots which are multiplexed to a single MMC diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 97a9d32964..54b1414131 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2059,7 +2059,7 @@ uint8_t sd_read_data(SDState *sd) return ret; } =20 -bool sd_data_ready(SDState *sd) +static bool sd_data_ready(SDState *sd) { return sd->state =3D=3D sd_sendingdata_state; } --=20 2.21.3 From nobody Sun Apr 28 16:34:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1593982422; cv=none; d=zohomail.com; s=zohoarc; b=L6CWzJw1rq2ufULmKdjbwxO87bZlYqvxwgMiK7mQhXEnWBhTHQ1XcHCDrZ4XzcL5YhzKilEeWYiN3cfUi7cCy6fdnT9IoWDZoOmP5apBCneaeu1nrTGGtMO0r2i/nQRZYw+owDkzRGsMlJmj9NXUGvsu5xbJ3XvsKRycIKXp7Hc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593982422; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ixcXKWbf6cfHfw1IyV/7F3PpTUGdIgNQjxeIJDW6DDw=; b=RmdfMns8daatg5/nuWLp4Y5QMovPQQZV8WcM0QFxCwkQ9K/TQbUbdCe87+7Z1u5zbiqHeN9sVQE54HnLjj7kW231VK4T7pFUcDubN6007fhgWsydJsk37KvlDp2fOgz1C7YPhU9XcMZ14B1Y4tw2QJsmDaOQtCk4asXLHXaWYLU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593982421997891.1317579596732; Sun, 5 Jul 2020 13:53:41 -0700 (PDT) Received: from localhost ([::1]:57230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsBds-0006DE-9z for importer@patchew.org; Sun, 05 Jul 2020 16:53:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsBXE-0004sY-Eo; Sun, 05 Jul 2020 16:46:48 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:37439) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsBXC-0000qW-No; Sun, 05 Jul 2020 16:46:48 -0400 Received: by mail-wm1-x330.google.com with SMTP id o2so39569814wmh.2; Sun, 05 Jul 2020 13:46:45 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id g144sm51397817wme.2.2020.07.05.13.46.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2020 13:46:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ixcXKWbf6cfHfw1IyV/7F3PpTUGdIgNQjxeIJDW6DDw=; b=dX9X87CICh83fMLpy1imMTodQaq6w4CS+Qa/L4TVpg8B8IE3gJ7frwcEVhcIRfaVvV wVIMR22gHAOpnivn6uI9WT7Ngq4Nbz6X0H5s6hS15PWwErB3AXNMYoTQW9RtPQcaJGdc 8Oyu2LP/7YkDCGJcI1siFDU3mIcsrmmuuSjk7+5v1bNVBGyrxp/mkxM2Wxftb4aWUJlr hXaGZnRE17OjSBfmF1v0DviKNeXSttdh8UACH5SRshLFm5OSYTnY13NsyVwUsrJgWFuZ 2xRYWcr62P6+Cy1kaJQCqswNP5r/FulYvUd02Qu9woFqg6M8gL9GIBRnj99W/lhmwmSE FVNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ixcXKWbf6cfHfw1IyV/7F3PpTUGdIgNQjxeIJDW6DDw=; b=B1LZUWG3s3mPmsw3sT+rf+J07koIsb3ejVXyNswxUrp6ux91+Ch7RBdq3OfmXOiBj2 um0D7Hldg9mz5JiqXIrl+eNVaBlvBfczbpk6fO6e8u07ohkuM+XiFwj3PtTUYjBfqlqw wkcT8Ygc1v/yqrZP+9aLmcxsDu/SPJ+lfdgRJelzD9mUpgUANCn+mY3a/FU+Dx6rvkNH tzrJfdXgRT5BnDBMXGMjgigXjEAJkKDcqwscBP8m+X7tbQtumDiaqxQOJQhQgQFfhSGb HYm4i4og/xSaJTircfC7CMXs74IjOk6cgm4GzXyYafeDybMwbNdS+fPp/m59Bghimn+g zVoQ== X-Gm-Message-State: AOAM531DGIvqZ44IF3jCWN5nL7xBGVx8JRJ5HdGaCCJonK7c7T79hI8n T/yIFPK/Uu3jNN/xB7rAcleDLBmYgLA= X-Google-Smtp-Source: ABdhPJw24A2SJD5MrIPJGOitkSwr0oyO/ViPWTHib9o0ECClvV45KISmDYxNk/UjWqWdiDIKEV+i/A== X-Received: by 2002:a1c:e4d4:: with SMTP id b203mr17343330wmh.49.1593982004659; Sun, 05 Jul 2020 13:46:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 10/10] hw/sd: move sdcard legacy API to 'hw/sd/sdcard_legacy.h' Date: Sun, 5 Jul 2020 22:46:30 +0200 Message-Id: <20200705204630.4133-11-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200705204630.4133-1-f4bug@amsat.org> References: <20200705204630.4133-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x330.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) omap_mmc.c is the last device left using the legacy sdcard API. Move the prototype declarations into a separate header, to make it clear this is a legacy API. Reviewed-by: Alistair Francis Message-Id: <20180216022933.10945-8-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Peter Maydell --- include/hw/sd/sd.h | 16 ----------- include/hw/sd/sdcard_legacy.h | 50 +++++++++++++++++++++++++++++++++++ hw/sd/omap_mmc.c | 2 +- hw/sd/sd.c | 1 + 4 files changed, 52 insertions(+), 17 deletions(-) create mode 100644 include/hw/sd/sdcard_legacy.h diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index ace350e0e8..8767ab817c 100644 --- a/include/hw/sd/sd.h +++ b/include/hw/sd/sd.h @@ -136,22 +136,6 @@ typedef struct { void (*set_readonly)(DeviceState *dev, bool readonly); } SDBusClass; =20 -/* Legacy functions to be used only by non-qdevified callers */ -SDState *sd_init(BlockBackend *bs, bool is_spi); -int sd_do_command(SDState *sd, SDRequest *req, - uint8_t *response); -void sd_write_data(SDState *sd, uint8_t value); -uint8_t sd_read_data(SDState *sd); -void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert); -/* sd_enable should not be used -- it is only used on the nseries boards, - * where it is part of a broken implementation of the MMC card slot switch - * (there should be two card slots which are multiplexed to a single MMC - * controller, but instead we model it with one card and controller and - * disable the card when the second slot is selected, so it looks like the - * second slot is always empty). - */ -void sd_enable(SDState *sd, bool enable); - /* Functions to be used by qdevified callers (working via * an SDBus rather than directly with SDState) */ diff --git a/include/hw/sd/sdcard_legacy.h b/include/hw/sd/sdcard_legacy.h new file mode 100644 index 0000000000..8681f8089b --- /dev/null +++ b/include/hw/sd/sdcard_legacy.h @@ -0,0 +1,50 @@ +/* + * SD Memory Card emulation (deprecated legacy API) + * + * Copyright (c) 2006 Andrzej Zaborowski + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef HW_SDCARD_LEGACY_H +#define HW_SDCARD_LEGACY_H + +#include "hw/sd/sd.h" + +/* Legacy functions to be used only by non-qdevified callers */ +SDState *sd_init(BlockBackend *blk, bool is_spi); +int sd_do_command(SDState *card, SDRequest *request, uint8_t *response); +void sd_write_data(SDState *card, uint8_t value); +uint8_t sd_read_data(SDState *card); +void sd_set_cb(SDState *card, qemu_irq readonly, qemu_irq insert); + +/* sd_enable should not be used -- it is only used on the nseries boards, + * where it is part of a broken implementation of the MMC card slot switch + * (there should be two card slots which are multiplexed to a single MMC + * controller, but instead we model it with one card and controller and + * disable the card when the second slot is selected, so it looks like the + * second slot is always empty). + */ +void sd_enable(SDState *card, bool enable); + +#endif /* HW_SDCARD_LEGACY_H */ diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c index 4088a8a80b..7d33c59226 100644 --- a/hw/sd/omap_mmc.c +++ b/hw/sd/omap_mmc.c @@ -23,7 +23,7 @@ #include "qemu/log.h" #include "hw/irq.h" #include "hw/arm/omap.h" -#include "hw/sd/sd.h" +#include "hw/sd/sdcard_legacy.h" =20 struct omap_mmc_s { qemu_irq irq; diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 54b1414131..6bd7ed59e7 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -36,6 +36,7 @@ #include "hw/registerfields.h" #include "sysemu/block-backend.h" #include "hw/sd/sd.h" +#include "hw/sd/sdcard_legacy.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/bitmap.h" --=20 2.21.3