From nobody Wed May 1 01:29:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1679350535; cv=none; d=zohomail.com; s=zohoarc; b=lIfBJ3PZ3jodr4UrgmkWjMMq64/W5GaLfvC2E3jInEgcrBUNrCBmVxGT1sY8gdGO+BvjIKIIIYvfVUh1VR8To6yobMSAtYsiIDTzpogRD86/eviNWZERSPHmgye/6yeXKkdBXC4l54BRKobUaBJhH3uSM1HUqg97MdQ4zibDFxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679350535; h=Content-Type: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=G9h1pghCJ9XAsr4xSNN5xqA2lbhruSbq3L9/vCF6TkY=; b=ErYFCoKTgpHbGIHHKMkKM/RklMxnGlNo82UvECCTo2yi57pYpcTw0BUZA+v4NYrKJMaPkngQ8LmoJFFfxnqlh3w6cDKrRvljwq08T9/p/8WHoIeJ1sy8qXfyLr0oEBbzoEK+PhmAHPsaYbdkqKxB1fjoq6Y4VTqtdw1m1SH/d8Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1679350535194181.15541623737522; Mon, 20 Mar 2023 15:15:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peNlw-0005Cl-67; Mon, 20 Mar 2023 18:14:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3wNoYZAcKCgElpnmpejhpphmf.dpnrfnv-efwfmopohov.psh@flex--komlodi.bounces.google.com>) id 1peNlu-0005Cc-IT for qemu-devel@nongnu.org; Mon, 20 Mar 2023 18:14:30 -0400 Received: from mail-pf1-x449.google.com ([2607:f8b0:4864:20::449]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3wNoYZAcKCgElpnmpejhpphmf.dpnrfnv-efwfmopohov.psh@flex--komlodi.bounces.google.com>) id 1peNlr-0004QV-MP for qemu-devel@nongnu.org; Mon, 20 Mar 2023 18:14:28 -0400 Received: by mail-pf1-x449.google.com with SMTP id m9-20020a056a00164900b0062300619e03so6827645pfc.18 for ; Mon, 20 Mar 2023 15:14:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1679350464; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=G9h1pghCJ9XAsr4xSNN5xqA2lbhruSbq3L9/vCF6TkY=; b=i2Q/9YsySArH7DEDxXNoKGIh4lgM85ta36WqujH8bEQ0QnGV75W31j5V+7ft2Bw42W MPqJrzfAXIqRblkQC9tvglD9yRPGBc82iIGyTeBbp5l8EW6tDJpXJr1DE79snIiQAwsq 1RqXS6Hctgi0owHQXZ6WJmqGkSENAkoVX77E74cToYVPLqAQHPxhGUsFS4IgA9Lcs1ah /boUbGRR/Yf/1UH9SvySyRrE9UHFRE9RfkN9dllFuPT/4Uoagn3LsLUjBnP2W4PqkN+Y x1bpt4aDLwYu6Pb+NqgcjROEmOBNnlC/g2U5Httx9GYcI6UsIkhT4RYoFewneQGyIjuq /NAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679350464; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=G9h1pghCJ9XAsr4xSNN5xqA2lbhruSbq3L9/vCF6TkY=; b=52S58Fmhy6zmTKCccxPa2drEBT5BhaEmACIc2r317KfmGHtWZitodm/jlNHMOI+ouQ Gp5jDhUkNk/jQJp6U7R72UoXs1Wc8NMdeyOlfD7Gr0S5kBbriHa19o4nl7S/5Vyniqol ghwxKMANffi9B4hl1k2kVeIo9J0CC6apisUO9vRcIzHgfsOwniIYhGHjrLwantoRlXFT tUF/6Y5hYAToLFke4CnSbM8VdT6KysHwlMMubaWJnj80HcTeastIQa71usDmFElIZIWq uNzVMbp/1AYEOslOn7i0PyxI/gtNj9t7m/St142PTLrSIMZKkpa6Mwpzzr+IXyD9MuC0 7Hfw== X-Gm-Message-State: AO0yUKW+e+PamLRGXe7A04o9gxiRbT+C7UoWHI0NEACvHx85HZfnWcaT +1D3V3Y3u7TV2BZawzVrsjdf+8TDCaeq X-Google-Smtp-Source: AK7set98/a0qG3aDJ+zdVPmFQUGgYRh1aaTwWAu/8JND//CNJ7biYPMKxCalHqkVvIQ7NvJhw290CuFtRbh9 X-Received: from komlodi.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:35ee]) (user=komlodi job=sendgmr) by 2002:a05:6a00:2303:b0:5a8:a475:918f with SMTP id h3-20020a056a00230300b005a8a475918fmr234171pfh.4.1679350464387; Mon, 20 Mar 2023 15:14:24 -0700 (PDT) Date: Mon, 20 Mar 2023 22:14:18 +0000 In-Reply-To: <20230320221419.2225561-1-komlodi@google.com> Mime-Version: 1.0 References: <20230320221419.2225561-1-komlodi@google.com> X-Mailer: git-send-email 2.40.0.rc2.332.ga46443480c-goog Message-ID: <20230320221419.2225561-2-komlodi@google.com> Subject: [PATCH 1/2] hw/i2c: smbus_slave: Reset state on reset From: Joe Komlodi To: cminyard@mvista.com Cc: qemu-devel@nongnu.org, komlodi@google.com 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=2607:f8b0:4864:20::449; envelope-from=3wNoYZAcKCgElpnmpejhpphmf.dpnrfnv-efwfmopohov.psh@flex--komlodi.bounces.google.com; helo=mail-pf1-x449.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1679350535896100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If a reset comes while the SMBus device is not in its idle state, it's possible for it to get confused on valid transactions post-reset. Signed-off-by: Joe Komlodi Acked-by: Corey Minyard Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i2c/smbus_slave.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/i2c/smbus_slave.c b/hw/i2c/smbus_slave.c index feb3ec6333..7b9d8780ae 100644 --- a/hw/i2c/smbus_slave.c +++ b/hw/i2c/smbus_slave.c @@ -197,10 +197,19 @@ static int smbus_i2c_send(I2CSlave *s, uint8_t data) return 0; } =20 +static void smbus_device_enter_reset(Object *obj, ResetType type) +{ + SMBusDevice *dev =3D SMBUS_DEVICE(obj); + dev->mode =3D SMBUS_IDLE; + dev->data_len =3D 0; +} + static void smbus_device_class_init(ObjectClass *klass, void *data) { I2CSlaveClass *sc =3D I2C_SLAVE_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); =20 + rc->phases.enter =3D smbus_device_enter_reset; sc->event =3D smbus_i2c_event; sc->recv =3D smbus_i2c_recv; sc->send =3D smbus_i2c_send; --=20 2.40.0.rc2.332.ga46443480c-goog From nobody Wed May 1 01:29:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1679350544; cv=none; d=zohomail.com; s=zohoarc; b=KIfMrVDHVtGYpk4pJRC86wWxIWFmXbAGvEXFf++GN7rbaDmJo/dAfNXxGI/AagiiBkKeQUK1ZU+/lsDwM0Z+8lFKtmxdJ8UPn2Y5dWslhsoauqFDfKq1eMJaPGJgvfKwjyYlYEmVGomq3PvemZ/3Ts8qSansSYR7SsQN6J71UWM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679350544; h=Content-Type: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=g+dsGi3rfOPju1S9X+xSfNR+P2c80nLDtQ8EH/REXBc=; b=DtVdRldzCm99LLO+tnNs8xdLfiBfkZtStg1eDoi5YjArN5iDZvSm9CEH87KWm+Q8nPpU9NnBmhN3LQ8+fEkSStdfJ5/JdAmv1imRXBbFFaG2v6hLmt7GL2pVhKw3V54t721HSUMVK0ji7QJsrUoJRxU5fQKSfL9ukq4wWMf4Gvk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1679350544861197.6836387943141; Mon, 20 Mar 2023 15:15:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peNlx-0005DK-Pi; Mon, 20 Mar 2023 18:14:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3wtoYZAcKCgMnrporgljrrjoh.frpthpx-ghyhoqrqjqx.ruj@flex--komlodi.bounces.google.com>) id 1peNlw-0005Cm-0X for qemu-devel@nongnu.org; Mon, 20 Mar 2023 18:14:32 -0400 Received: from mail-pf1-x44a.google.com ([2607:f8b0:4864:20::44a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3wtoYZAcKCgMnrporgljrrjoh.frpthpx-ghyhoqrqjqx.ruj@flex--komlodi.bounces.google.com>) id 1peNlu-0004Ql-As for qemu-devel@nongnu.org; Mon, 20 Mar 2023 18:14:31 -0400 Received: by mail-pf1-x44a.google.com with SMTP id d12-20020a056a0024cc00b006256990dddeso6799704pfv.9 for ; Mon, 20 Mar 2023 15:14:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1679350466; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=g+dsGi3rfOPju1S9X+xSfNR+P2c80nLDtQ8EH/REXBc=; b=nXKcMGGuWFQ6rBuuTg0yACqsttK63z6ZXsjzn8vSJ7nepoS9WcEZUJ7SVHs8XJpmQw IW5Mynl2Um/quVuFTUQH39ku0q5XomLeEkfC/1azHgSW/oIoa1N4M8yO5IAeF7ZAoLkQ h57NaYfVAHVxNqs1PCIkGx/fAhsWlQLKea1OoOhqx4jVxHRLyWouFERsJTPcolVmWw7c cL0LSIAfXd5f41rYXNxEHc5NbrMHQUXQm+gwySgpbES8eK9kOMBE4+HHGhISqgaLICXw 5eeiyrSRXK2n4UpN4A+rK39V6i2Qw6LvqJkTkzZJSSZC/ejPt19biyzW4jjRDTYIs4NJ 5zXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679350466; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=g+dsGi3rfOPju1S9X+xSfNR+P2c80nLDtQ8EH/REXBc=; b=EuS7PitMX3S8T6j120FiAxcGgj1T/w8T79HAFmlYuB3YQv8dgFaaeR9Kgoy0jqozBe 7lHBJp8hEak824DKgXC7F9I/C1oqwni+LFEeTykm62CPuSI9kj5gKl6QeB4VSTUKa57z s9eo/ZPKBaHDum0TIIRIiesGXWKqY55Fpn8s2zmsKbZrzP5yg3rS3r2xpN+V9qPQRYdH 1c6Wgc9bBHqaBUhx0C9Bw0E3U+HDshnmudAB9QcFe6RJxt9KvGfXq3m+zYGRbuqtE1l5 g8o8X1YghDQqF0b0phQnNY4d25QYk2SYwOoK6/wJSbrQb+YKtFXdQU9hKj5f1cMpn/BO zlUA== X-Gm-Message-State: AO0yUKVw9BYmR1gXzkPO6rnZR9WDG6TpRueNvqoHhBAlOIU783OqBTFq bYMfnKVLBJfVaVudXC4fU8Twhum8z26q X-Google-Smtp-Source: AK7set8geeK/kt5sY+sSiWJDWloJwAUcVypB8FJFk6Xnp210FKqblQ2+pZiHy1e0NTKpUVx7Xwq/4qoHwxCA X-Received: from komlodi.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:35ee]) (user=komlodi job=sendgmr) by 2002:a05:6a00:2303:b0:5a8:a475:918f with SMTP id h3-20020a056a00230300b005a8a475918fmr234199pfh.4.1679350466047; Mon, 20 Mar 2023 15:14:26 -0700 (PDT) Date: Mon, 20 Mar 2023 22:14:19 +0000 In-Reply-To: <20230320221419.2225561-1-komlodi@google.com> Mime-Version: 1.0 References: <20230320221419.2225561-1-komlodi@google.com> X-Mailer: git-send-email 2.40.0.rc2.332.ga46443480c-goog Message-ID: <20230320221419.2225561-3-komlodi@google.com> Subject: [PATCH 2/2] hw/i2c: core: Add reset From: Joe Komlodi To: cminyard@mvista.com Cc: qemu-devel@nongnu.org, komlodi@google.com 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=2607:f8b0:4864:20::44a; envelope-from=3wtoYZAcKCgMnrporgljrrjoh.frpthpx-ghyhoqrqjqx.ruj@flex--komlodi.bounces.google.com; helo=mail-pf1-x44a.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1679350545781100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It's possible for a reset to come in the middle of a transaction, which causes the bus to be in an old state when a new transaction comes in. Signed-off-by: Joe Komlodi Acked-by: Corey Minyard --- hw/i2c/core.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/hw/i2c/core.c b/hw/i2c/core.c index bed594fe59..2aecbfb334 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -23,10 +23,29 @@ static Property i2c_props[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 +static void i2c_bus_enter_reset(Object *obj, ResetType type) +{ + I2CBus *bus =3D I2C_BUS(obj); + I2CNode *node, *next; + + bus->broadcast =3D false; + QLIST_FOREACH_SAFE(node, &bus->current_devs, next, next) { + QLIST_REMOVE(node, next); + g_free(node); + } +} + +static void i2c_bus_class_init(ObjectClass *klass, void *data) +{ + ResettableClass *rc =3D RESETTABLE_CLASS(klass); + rc->phases.enter =3D i2c_bus_enter_reset; +} + static const TypeInfo i2c_bus_info =3D { - .name =3D TYPE_I2C_BUS, - .parent =3D TYPE_BUS, - .instance_size =3D sizeof(I2CBus), + .name =3D TYPE_I2C_BUS, + .parent =3D TYPE_BUS, + .instance_size =3D sizeof(I2CBus), + .class_init =3D i2c_bus_class_init, }; =20 static int i2c_bus_pre_save(void *opaque) --=20 2.40.0.rc2.332.ga46443480c-goog