From nobody Sat May 4 02:01:09 2024 Delivered-To: importer@patchew.org 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; 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=1579540487; cv=none; d=zohomail.com; s=zohoarc; b=jy+jNH3IUFC/nfKVRHHpY/b0uzG7IcxCweR3PKjv6rmAK1V6MazmJwZMVcNyXtz6MtUBilr/7BXZE9YvC8nNFFqOfTRWY473Q+w6nRAiTpcDh4JY68qz6tU8nAA67luenpHVdardIn7PYwrzf1/BrSsC2GW/ArWkj7FmywjTKMk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579540487; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=fKibVKMTN/g3RLg3BnsPK7GTis/dJbeQ9XnVDxmBdhk=; b=jC/QFSj84m2N0/0n41drvXQwPaDTGRrvdl309p+xp/0plLgn4aLED2KUbKbKb9DR0ulL3ChxAwn8/Hu64LhxWRi+fkLFVNHqBAH4qAPbUTgSL4utK5NJ1znDD1TzOlYzJ90XB7dzAb5l3xzqLkJJwVHOVpd+c9h7B9akYSsi7MU= 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 1579540487706451.99225035246286; Mon, 20 Jan 2020 09:14:47 -0800 (PST) Received: from localhost ([::1]:40386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itadS-0005Hv-73 for importer@patchew.org; Mon, 20 Jan 2020 12:14:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36358) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itaWV-0005rM-O1 for qemu-devel@nongnu.org; Mon, 20 Jan 2020 12:07:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itaWU-0001gs-G6 for qemu-devel@nongnu.org; Mon, 20 Jan 2020 12:07:35 -0500 Received: from mail-oi1-x242.google.com ([2607:f8b0:4864:20::242]:38183) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itaWU-0001gT-B3 for qemu-devel@nongnu.org; Mon, 20 Jan 2020 12:07:34 -0500 Received: by mail-oi1-x242.google.com with SMTP id l9so620oii.5 for ; Mon, 20 Jan 2020 09:07:33 -0800 (PST) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id i8sm4158747oto.9.2020.01.20.09.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 09:07:32 -0800 (PST) Received: from t560.minyard.net (unknown [IPv6:2001:470:b8f6:1b:9c9c:d583:ce3d:f87a]) by serve.minyard.net (Postfix) with ESMTPA id 68924180051; Mon, 20 Jan 2020 17:07:31 +0000 (UTC) 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; bh=fKibVKMTN/g3RLg3BnsPK7GTis/dJbeQ9XnVDxmBdhk=; b=TcnwYCraeLFfl770q05H+Hm2/x1E/1fHnFGPoZrRpSYq7JKW2upXzsDjZplVuRflL2 UqabHFYodJ6KTPNo82UQT1XQhhFg2ojeCV7XJJGxcyX9KJAyvQEpoRONnzOXkXK+6dAb mhzA7N8N8wl/Jn6P2uGHqfsGB7HPGeqLFZD1mcD4Bi1B7hxFM18CFyRBY8x7g55A4vFc 6jhytqGBWp+82Sx6o0yDe5ZJtD5Woula54JQcJg5NKvi8QHjOTSZBJhiIGZizli90lm6 ruliwLS/cnqdZJg2wXDPvLhA8ufVKCEy+ftayV0PL2CfP520o9nmJCJ2RkZBLXoMlUPF UvEw== 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; bh=fKibVKMTN/g3RLg3BnsPK7GTis/dJbeQ9XnVDxmBdhk=; b=uCa5v0Wl64GXZbzN7rDZ5IRe7M9nYM4AJcBpQJ9ej0dOToEBAuETAe2SxwfBG4c7k9 m94lgqWkiJg7pDIUihsMLKaNeX3LdXzq/sD+oP4+d2Eo5czDrJNfHFzCmZxEphFcSbVE dTWRADoE4uwWbjbGxK73YZ3m28heTXPGNNxCaWr3+QHRrlsoe358Y86hhXKkCdpP7OFn BU6LJgQZd8xP/CvvXj475nARDURpCdSrmWMo+DjPo1n5csrSBANvyVWh6iseeCbQhBLP pQjrbAn/zO9d2xfAxy3Ba5WQaujiny0mnvzu2ZhQ4T8krQ1rXwLQK9pswt/Xy838DfSu 6M+w== X-Gm-Message-State: APjAAAVlUgHWltAe1FYAuFjXc4d9nNW0Jm50AGmr7huNkVkI2NK25yJD cmnba+Ngcgf9VpBke/gVin5aptk= X-Google-Smtp-Source: APXvYqynhyIZoyPzbJUNIFxy1l7V6SECORPmwpwP3aNFSAG8s05j4qNEsuQKDnXLYthsZAdX0GpQAA== X-Received: by 2002:aca:b703:: with SMTP id h3mr219056oif.148.1579540052777; Mon, 20 Jan 2020 09:07:32 -0800 (PST) From: minyard@acm.org To: QEMU Developers Subject: [PATCH 1/5] ipmi: Add man page pieces for the IPMI PCI devices Date: Mon, 20 Jan 2020 11:07:21 -0600 Message-Id: <20200120170725.24935-2-minyard@acm.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200120170725.24935-1-minyard@acm.org> References: <20200120170725.24935-1-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::242 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: Corey Minyard Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Corey Minyard This was forgotten when the devices were added. Signed-off-by: Corey Minyard --- qemu-options.hx | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/qemu-options.hx b/qemu-options.hx index e9d6231438..2417a1305f 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -795,6 +795,19 @@ set this to 0. Like the KCS interface, but defines a BT interface. The default port is 0xe4 and the default interrupt is 5. =20 +@item -device pci-ipmi-kcs,bmc=3D@var{id} + +Add a KCS IPMI interafce on the PCI bus. + +@table @option +@item bmc=3D@var{id} +The BMC to connect to, one of ipmi-bmc-sim or ipmi-bmc-extern above. +@end table + +@item -device pci-ipmi-bt,bmc=3D@var{id} + +Like the KCS interface, but defines a BT interface on the PCI bus. + ETEXI =20 DEF("name", HAS_ARG, QEMU_OPTION_name, --=20 2.17.1 From nobody Sat May 4 02:01:09 2024 Delivered-To: importer@patchew.org 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; 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=1579540716; cv=none; d=zohomail.com; s=zohoarc; b=MXBYv0/7ILKaVZGOiMK7Uj7CveYO/7xLi7OgxqLD666CX5eax1wP/LuAUlV+xfNKlvx7KOwmrfuCkYwuk6VGd/xwEym03lny87UWWjnJrGxZ7z58bgG+6sovgx47PdF2bOyWQblkEpsiiRgMW3lPri1GTkLG97kbMHbEGs8lE9I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579540716; 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=xXgs8aTcQ0uGhBK5sC1zXETwAujk79dljWd/Jt9xxR0=; b=AnK9nRl4ULFwq9Yr8peX+7PYw+fimaJ+Co+650Op4ZW3l4oKYoHNMZ2Xw3ZjT8o9vWiNhEJ3TvdTipOXekdptA96G+qtrQNQsuJQ3vv5FTwndmlb66IYtnbENotuCP9RejLIYvq75mPjXe7hE0vfTBs+VdyY2NEg2IZk4qxcCYY= 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 1579540716556351.0244462696206; Mon, 20 Jan 2020 09:18:36 -0800 (PST) Received: from localhost ([::1]:40434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itah8-0000mm-Vj for importer@patchew.org; Mon, 20 Jan 2020 12:18:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36353) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itaWV-0005rA-Lk for qemu-devel@nongnu.org; Mon, 20 Jan 2020 12:07:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itaWU-0001gx-GL for qemu-devel@nongnu.org; Mon, 20 Jan 2020 12:07:35 -0500 Received: from mail-ot1-x32d.google.com ([2607:f8b0:4864:20::32d]:39485) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itaWU-0001gJ-BE for qemu-devel@nongnu.org; Mon, 20 Jan 2020 12:07:34 -0500 Received: by mail-ot1-x32d.google.com with SMTP id 77so379028oty.6 for ; Mon, 20 Jan 2020 09:07:33 -0800 (PST) Received: from serve.minyard.net ([47.184.136.59]) by smtp.gmail.com with ESMTPSA id k17sm2597801otl.45.2020.01.20.09.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 09:07:32 -0800 (PST) Received: from t560.minyard.net (unknown [IPv6:2001:470:b8f6:1b:9c9c:d583:ce3d:f87a]) by serve.minyard.net (Postfix) with ESMTPA id 7D0BD180052; Mon, 20 Jan 2020 17:07:31 +0000 (UTC) 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=xXgs8aTcQ0uGhBK5sC1zXETwAujk79dljWd/Jt9xxR0=; b=uOnCvRWGs6oeu3Jde/XWJaqb20pytL83RVdKJkXyvT73RioKMb45nZk19MqvvYezIc WlgP1atkjvsK44HjXqTarZv2hpwZd9XH0x8WsnNY7BrZzZUaPN2JXMoB2TSc8esmDJXU ntf31FQpKGfe2F1DXaSEdP/RZ+Hajtw1bhUKZICi3u/rithZNUkXJHoWj/nxPAq/mrrX twbDoi6Xb0gVXuzbaoAytHm6BrUG4ROjAIos5Vpx5dyajmK11ljo8dG3sILR5SxtlkXR cvasqKx8HcYRMV/J8zmkkEQPVxulyzraXZNVd35JfdTopeIZPQQcmxNQA7oTbwoTZNK0 TXYw== 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=xXgs8aTcQ0uGhBK5sC1zXETwAujk79dljWd/Jt9xxR0=; b=XOPM4orJMPrGi2fZpCPgj+N9u/5zsenFga7NeAf4RSW3ZRAsJemrAJqbHnDHHzNhhv SZwhkQ9YTFaDo57RJpsEsuPU6X7LjQ1J1hBqfaSuUR/f12k4qIn5n2nRAEPy1rS7Xk65 e8sJqtz1IVkEz1XUZvPWoSTMt0D2h4eDFmLNKXgt14Bx3iahudCV0JFhs21Q4BB5GW6e AtY9ep8b+vc+096AIiI0AFWWCqiw/oV8ef+e6RcESFOU6g0XQfqQLdm8Ryfn5V7N/Gwt XrxAf2s73wdgvAHsaXsTBdZs2XLbiO5GyVEUBR50Msk5yKAwD+zVZVYbhxn7Ovl6nMtO ho6g== X-Gm-Message-State: APjAAAUgKAmY+qQ3qrBNpU4ZboIZVUWFJVb0BQlZn/u+3CNQp0rCmfMq VWBD20tl4GkrBRYdglnj9A== X-Google-Smtp-Source: APXvYqyKvU4FF1l+DMGylGFkQ76jnSmRhzrYP4In1sH3GWqwYOmv02NRVJrc45EqzzSq12RBWTytzA== X-Received: by 2002:a9d:6f07:: with SMTP id n7mr353777otq.112.1579540052529; Mon, 20 Jan 2020 09:07:32 -0800 (PST) From: minyard@acm.org To: QEMU Developers Subject: [PATCH 2/5] smbus-eeprom: remove PROP_PTR Date: Mon, 20 Jan 2020 11:07:22 -0600 Message-Id: <20200120170725.24935-3-minyard@acm.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200120170725.24935-1-minyard@acm.org> References: <20200120170725.24935-1-minyard@acm.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::32d 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Corey Minyard Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Instead, set the initial data field directly. (the initial data is an array of 256 bytes. As I don't know if it may change over time, I keep the pointer to original buffer as is, but it might be worth to consider to copy it instead) Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20191120152442.26657-32-marcandre.lureau@redhat.com> Signed-off-by: Corey Minyard --- hw/i2c/smbus_eeprom.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c index 54c86a0112..533c728b3b 100644 --- a/hw/i2c/smbus_eeprom.c +++ b/hw/i2c/smbus_eeprom.c @@ -44,7 +44,7 @@ typedef struct SMBusEEPROMDevice { SMBusDevice smbusdev; uint8_t data[SMBUS_EEPROM_SIZE]; - void *init_data; + uint8_t *init_data; uint8_t offset; bool accessed; } SMBusEEPROMDevice; @@ -129,14 +129,14 @@ static void smbus_eeprom_reset(DeviceState *dev) =20 static void smbus_eeprom_realize(DeviceState *dev, Error **errp) { + SMBusEEPROMDevice *eeprom =3D SMBUS_EEPROM(dev); + smbus_eeprom_reset(dev); + if (eeprom->init_data =3D=3D NULL) { + error_setg(errp, "init_data cannot be NULL"); + } } =20 -static Property smbus_eeprom_properties[] =3D { - DEFINE_PROP_PTR("data", SMBusEEPROMDevice, init_data), - DEFINE_PROP_END_OF_LIST(), -}; - static void smbus_eeprom_class_initfn(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -146,9 +146,8 @@ static void smbus_eeprom_class_initfn(ObjectClass *klas= s, void *data) dc->reset =3D smbus_eeprom_reset; sc->receive_byte =3D eeprom_receive_byte; sc->write_data =3D eeprom_write_data; - dc->props =3D smbus_eeprom_properties; dc->vmsd =3D &vmstate_smbus_eeprom; - /* Reason: pointer property "data" */ + /* Reason: init_data */ dc->user_creatable =3D false; } =20 @@ -172,7 +171,7 @@ void smbus_eeprom_init_one(I2CBus *smbus, uint8_t addre= ss, uint8_t *eeprom_buf) =20 dev =3D qdev_create((BusState *) smbus, TYPE_SMBUS_EEPROM); qdev_prop_set_uint8(dev, "address", address); - qdev_prop_set_ptr(dev, "data", eeprom_buf); + SMBUS_EEPROM(dev)->init_data =3D eeprom_buf; qdev_init_nofail(dev); } =20 --=20 2.17.1 From nobody Sat May 4 02:01:09 2024 Delivered-To: importer@patchew.org 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; 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=1579540685; cv=none; d=zohomail.com; s=zohoarc; b=T0TuyCD3oIcDDhWRase+WWcVg7EbM9E5kSyjB40JJL2eXyGaFfbjMhI1h+oZKenAUYuO9kTyEraom+5PJI+gzkpvKi4j3CyaUPJ8G3/JT/7P+s0kDj8APkpXdlTvKMbQDQ14xSdWTKB90OkxWhsOjBD8NbKvkh2f5d9Vk7N4Mpk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579540685; 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=mQCnOs0DasZCx15BvzrZGXuwOubDqdp3HufF8qDnOq0=; b=AYgcy2Nv3tkvVXeIQhTaUArq/y5svDr+/cjoFhlES8vLSEszBm46TQwjgPH9RFF5wVk3lptBxIS9FiP0r/euSA9/3Z7Ct3GGRNI2x8NkS/HoS516ZtSg3SdDWrf8eGIT6flpTowrqcL4N0EVSu9iWgQIfQJNBnpFF3c9cGNvLvc= 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 1579540685379400.17676298911863; Mon, 20 Jan 2020 09:18:05 -0800 (PST) Received: from localhost ([::1]:40430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itagc-0000Di-W0 for importer@patchew.org; Mon, 20 Jan 2020 12:18:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36381) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itaWW-0005sH-Fo for qemu-devel@nongnu.org; Mon, 20 Jan 2020 12:07:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itaWU-0001hQ-Pd for qemu-devel@nongnu.org; Mon, 20 Jan 2020 12:07:36 -0500 Received: from mail-oi1-x22d.google.com ([2607:f8b0:4864:20::22d]:41606) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itaWU-0001gY-KG for qemu-devel@nongnu.org; Mon, 20 Jan 2020 12:07:34 -0500 Received: by mail-oi1-x22d.google.com with SMTP id i1so29069028oie.8 for ; Mon, 20 Jan 2020 09:07:34 -0800 (PST) Received: from serve.minyard.net ([47.184.136.59]) by smtp.gmail.com with ESMTPSA id t23sm11086770oic.28.2020.01.20.09.07.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 09:07:32 -0800 (PST) Received: from t560.minyard.net (unknown [IPv6:2001:470:b8f6:1b:9c9c:d583:ce3d:f87a]) by serve.minyard.net (Postfix) with ESMTPA id 88523180053; Mon, 20 Jan 2020 17:07:31 +0000 (UTC) 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=mQCnOs0DasZCx15BvzrZGXuwOubDqdp3HufF8qDnOq0=; b=pnlhiTFx/3MugHFxA5GJwND3D/VFmm9YogyPVFBWy70XlYDZztb6FSEOfSyCaF2K2D 3T1gjbCL8dx2uRr/jhHTlNmrV9CIzTh4x4wfGBRhGpmMJpBNJCG8WUmytFIIGi9XSqRM pQJrsUkiF1FIU/kcs10cTAxtIyQNqEWt+Fe6UVNGWumLwIf8A4Ekto98z2UFCq+4rG/X ZNE06z075REy/QMNW70c1nhGG7Wo+ECxEc6AqHAITpPKD0/3kg+/bA3kkZi3FJD+uvS6 VTRxliW2NFrG6gnFqCgvmcDhRU8hYFJJIad977OO2+YgN3UqTvNx/DzoG8WAVap53Pfj M7hg== 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=mQCnOs0DasZCx15BvzrZGXuwOubDqdp3HufF8qDnOq0=; b=jxUcXe++XDrgUHi+leC7BdRuXIEwg1flMfL9lw0eZD+7bfPb2mfvBjNTqYMstp1SMA omHyOrx2ET63btbWy4Bh7RRWGhdWpk7sBvXnVX1OD4Gt9bjsVdnnGpdjLY++l/ZoszW5 rE3hmeiPS0Jz/GCmT8x2fTLvr5OY4/9sws5TCNP/EDinex0EFl7+I0NeWnyosHk0nFv4 2fXSt9jTBPxwin68NLLwBlVX284XXrS1ociCg2+nyf5jkRLW4ICJS0BYv7BmMbWdZx1Y 9n7JXAvShugSME7Q2mr6WA2wrdXKFBarc24TJnypY4v43FrR3HseM2v9AHAR7pCERsDS 1uqA== X-Gm-Message-State: APjAAAXXiXS1rim5GHb01RVd1qJXdpLJglHWgehsT9unAsTT1h23AcXh sRz7RFmj5YcPiD7kD0uRzzckQpw= X-Google-Smtp-Source: APXvYqwSanX/FiI1lha6ojZ97a9TiG3PUJeQHKMnnVWiNYVvbbzznsyTobMAsihpHYQBXF3xMZtbBQ== X-Received: by 2002:aca:c386:: with SMTP id t128mr246203oif.32.1579540053128; Mon, 20 Jan 2020 09:07:33 -0800 (PST) From: minyard@acm.org To: QEMU Developers Subject: [PATCH 3/5] ipmi: add SET_SENSOR_READING command Date: Mon, 20 Jan 2020 11:07:23 -0600 Message-Id: <20200120170725.24935-4-minyard@acm.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200120170725.24935-1-minyard@acm.org> References: <20200120170725.24935-1-minyard@acm.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::22d 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: Corey Minyard , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: C=C3=A9dric Le Goater SET_SENSOR_READING is a complex IPMI command (see IPMI spec 35.17) which enables the host software to set the reading value and the event status of sensors supporting it. Below is a proposal for all the operations (reading, assert, deassert, event data) with the following limitations : - No event are generated for threshold-based sensors. - The case in which the BMC needs to generate its own events is not supported. Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Corey Minyard Message-Id: <20191118092429.16149-1-clg@kaod.org> [Moved the break statement for case SENSOR_GEN_EVENT_DATA above the closing brace to keep the indention consistent.] Signed-off-by: Corey Minyard --- hw/ipmi/ipmi_bmc_sim.c | 223 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 223 insertions(+) diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index 6670cf039d..611a0095df 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -49,6 +49,7 @@ #define IPMI_CMD_GET_SENSOR_READING 0x2d #define IPMI_CMD_SET_SENSOR_TYPE 0x2e #define IPMI_CMD_GET_SENSOR_TYPE 0x2f +#define IPMI_CMD_SET_SENSOR_READING 0x30 =20 /* #define IPMI_NETFN_APP 0x06 In ipmi.h */ =20 @@ -1747,6 +1748,227 @@ static void get_sensor_type(IPMIBmcSim *ibs, rsp_buffer_push(rsp, sens->evt_reading_type_code); } =20 +/* + * bytes parameter + * 1 sensor number + * 2 operation (see below for bits meaning) + * 3 sensor reading + * 4:5 assertion states (optional) + * 6:7 deassertion states (optional) + * 8:10 event data 1,2,3 (optional) + */ +static void set_sensor_reading(IPMIBmcSim *ibs, + uint8_t *cmd, unsigned int cmd_len, + RspBuffer *rsp) +{ + IPMISensor *sens; + uint8_t evd1 =3D 0; + uint8_t evd2 =3D 0; + uint8_t evd3 =3D 0; + uint8_t new_reading =3D 0; + uint16_t new_assert_states =3D 0; + uint16_t new_deassert_states =3D 0; + bool change_reading =3D false; + bool change_assert =3D false; + bool change_deassert =3D false; + enum { + SENSOR_GEN_EVENT_NONE, + SENSOR_GEN_EVENT_DATA, + SENSOR_GEN_EVENT_BMC, + } do_gen_event =3D SENSOR_GEN_EVENT_NONE; + + if ((cmd[2] >=3D MAX_SENSORS) || + !IPMI_SENSOR_GET_PRESENT(ibs->sensors + cmd[2])) { + rsp_buffer_set_error(rsp, IPMI_CC_REQ_ENTRY_NOT_PRESENT); + return; + } + + sens =3D ibs->sensors + cmd[2]; + + /* [1:0] Sensor Reading operation */ + switch ((cmd[3]) & 0x3) { + case 0: /* Do not change */ + break; + case 1: /* write given value to sensor reading byte */ + new_reading =3D cmd[4]; + if (sens->reading !=3D new_reading) { + change_reading =3D true; + } + break; + case 2: + case 3: + rsp_buffer_set_error(rsp, IPMI_CC_INVALID_DATA_FIELD); + return; + } + + /* [3:2] Deassertion bits operation */ + switch ((cmd[3] >> 2) & 0x3) { + case 0: /* Do not change */ + break; + case 1: /* write given value */ + if (cmd_len > 7) { + new_deassert_states =3D cmd[7]; + change_deassert =3D true; + } + if (cmd_len > 8) { + new_deassert_states |=3D (cmd[8] << 8); + } + break; + + case 2: /* mask on */ + if (cmd_len > 7) { + new_deassert_states =3D (sens->deassert_states | cmd[7]); + change_deassert =3D true; + } + if (cmd_len > 8) { + new_deassert_states |=3D (sens->deassert_states | (cmd[8] << 8= )); + } + break; + + case 3: /* mask off */ + if (cmd_len > 7) { + new_deassert_states =3D (sens->deassert_states & cmd[7]); + change_deassert =3D true; + } + if (cmd_len > 8) { + new_deassert_states |=3D (sens->deassert_states & (cmd[8] << 8= )); + } + break; + } + + if (change_deassert && (new_deassert_states =3D=3D sens->deassert_stat= es)) { + change_deassert =3D false; + } + + /* [5:4] Assertion bits operation */ + switch ((cmd[3] >> 4) & 0x3) { + case 0: /* Do not change */ + break; + case 1: /* write given value */ + if (cmd_len > 5) { + new_assert_states =3D cmd[5]; + change_assert =3D true; + } + if (cmd_len > 6) { + new_assert_states |=3D (cmd[6] << 8); + } + break; + + case 2: /* mask on */ + if (cmd_len > 5) { + new_assert_states =3D (sens->assert_states | cmd[5]); + change_assert =3D true; + } + if (cmd_len > 6) { + new_assert_states |=3D (sens->assert_states | (cmd[6] << 8)); + } + break; + + case 3: /* mask off */ + if (cmd_len > 5) { + new_assert_states =3D (sens->assert_states & cmd[5]); + change_assert =3D true; + } + if (cmd_len > 6) { + new_assert_states |=3D (sens->assert_states & (cmd[6] << 8)); + } + break; + } + + if (change_assert && (new_assert_states =3D=3D sens->assert_states)) { + change_assert =3D false; + } + + if (cmd_len > 9) { + evd1 =3D cmd[9]; + } + if (cmd_len > 10) { + evd2 =3D cmd[10]; + } + if (cmd_len > 11) { + evd3 =3D cmd[11]; + } + + /* [7:6] Event Data Bytes operation */ + switch ((cmd[3] >> 6) & 0x3) { + case 0: /* + * Don=E2=80=99t use Event Data bytes from this command. BMC w= ill + * generate it's own Event Data bytes based on its sensor + * implementation. + */ + evd1 =3D evd2 =3D evd3 =3D 0x0; + do_gen_event =3D SENSOR_GEN_EVENT_BMC; + break; + case 1: /* + * Write given values to event data bytes including bits + * [3:0] Event Data 1. + */ + do_gen_event =3D SENSOR_GEN_EVENT_DATA; + break; + case 2: /* + * Write given values to event data bytes excluding bits + * [3:0] Event Data 1. + */ + evd1 &=3D 0xf0; + do_gen_event =3D SENSOR_GEN_EVENT_DATA; + break; + case 3: + rsp_buffer_set_error(rsp, IPMI_CC_INVALID_DATA_FIELD); + return; + } + + /* + * Event Data Bytes operation and parameter are inconsistent. The + * Specs are not clear on that topic but generating an error seems + * correct. + */ + if (do_gen_event =3D=3D SENSOR_GEN_EVENT_DATA && cmd_len < 10) { + rsp_buffer_set_error(rsp, IPMI_CC_INVALID_DATA_FIELD); + return; + } + + /* commit values */ + if (change_reading) { + sens->reading =3D new_reading; + } + + if (change_assert) { + sens->assert_states =3D new_assert_states; + } + + if (change_deassert) { + sens->deassert_states =3D new_deassert_states; + } + + /* TODO: handle threshold sensor */ + if (!IPMI_SENSOR_IS_DISCRETE(sens)) { + return; + } + + switch (do_gen_event) { + case SENSOR_GEN_EVENT_DATA: { + unsigned int bit =3D evd1 & 0xf; + uint16_t mask =3D (1 << bit); + + if (sens->assert_states & mask & sens->assert_enable) { + gen_event(ibs, cmd[2], 0, evd1, evd2, evd3); + } + + if (sens->deassert_states & mask & sens->deassert_enable) { + gen_event(ibs, cmd[2], 1, evd1, evd2, evd3); + } + break; + } + case SENSOR_GEN_EVENT_BMC: + /* + * TODO: generate event and event data bytes depending on the + * sensor + */ + break; + case SENSOR_GEN_EVENT_NONE: + break; + } +} =20 static const IPMICmdHandler chassis_cmds[] =3D { [IPMI_CMD_GET_CHASSIS_CAPABILITIES] =3D { chassis_capabilities }, @@ -1768,6 +1990,7 @@ static const IPMICmdHandler sensor_event_cmds[] =3D { [IPMI_CMD_GET_SENSOR_READING] =3D { get_sensor_reading, 3 }, [IPMI_CMD_SET_SENSOR_TYPE] =3D { set_sensor_type, 5 }, [IPMI_CMD_GET_SENSOR_TYPE] =3D { get_sensor_type, 3 }, + [IPMI_CMD_SET_SENSOR_READING] =3D { set_sensor_reading, 5 }, }; static const IPMINetfn sensor_event_netfn =3D { .cmd_nums =3D ARRAY_SIZE(sensor_event_cmds), --=20 2.17.1 From nobody Sat May 4 02:01:09 2024 Delivered-To: importer@patchew.org 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; 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=1579540727; cv=none; d=zohomail.com; s=zohoarc; b=an4fRIJ9uEEPIdxDKOMmPJvrVfNXeNV7q7B5aZRqz7gzwZHPvP64zMcojN6txP8KmfP4CfPmm13vDf5pqxuQb10Zw4t+z89yiloqmiPqMjZVBmr+1E2fu2ypq1/BWjzHW27aWwCDuWHVCx8iSyU738u5m+6UBUo4c8lJSLG121k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579540727; 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=1wu5g7+p7wcL2vh9OtQFkZ0v1XFmjPDGg3VgD4d9f2E=; b=nnw1oZLJJF6n4Dm3bO4OFLAUSPDjn0bM5HxItAKY+FbWmquwBqESHPylDEOayzf6qd1QOhEoueZS+rkrJ3TzMBcGtM5sdl1LduwMJt1qfXc/VIiyyM8YCbHWFLICf1OvIMtU5DFxO1zgZWHlJJbgMJGYLI4ES3a2+Ri2Nld6fKA= 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 1579540727843805.5600683655226; Mon, 20 Jan 2020 09:18:47 -0800 (PST) Received: from localhost ([::1]:40436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itahI-00012s-GY for importer@patchew.org; Mon, 20 Jan 2020 12:18:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36356) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itaWV-0005rI-Nl for qemu-devel@nongnu.org; Mon, 20 Jan 2020 12:07:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itaWU-0001hJ-Nb for qemu-devel@nongnu.org; Mon, 20 Jan 2020 12:07:35 -0500 Received: from mail-oi1-x22e.google.com ([2607:f8b0:4864:20::22e]:41607) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itaWU-0001gg-Iq for qemu-devel@nongnu.org; Mon, 20 Jan 2020 12:07:34 -0500 Received: by mail-oi1-x22e.google.com with SMTP id i1so29069056oie.8 for ; Mon, 20 Jan 2020 09:07:34 -0800 (PST) Received: from serve.minyard.net ([47.184.136.59]) by smtp.gmail.com with ESMTPSA id y13sm12461746otk.40.2020.01.20.09.07.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 09:07:33 -0800 (PST) Received: from t560.minyard.net (unknown [IPv6:2001:470:b8f6:1b:9c9c:d583:ce3d:f87a]) by serve.minyard.net (Postfix) with ESMTPA id 94F77180054; Mon, 20 Jan 2020 17:07:31 +0000 (UTC) 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=1wu5g7+p7wcL2vh9OtQFkZ0v1XFmjPDGg3VgD4d9f2E=; b=gXYyYkKYM4Ro4tfDWsEMoeRtlRXxmGC/cHIGiQJm4L1YTyPBWJPhQzszNtLr8svF3N 9CHMyDvvQaa7Oe4t2zwr/yl/wTZB4C3rKf2in8F2S9X6RxqjqDIsrKqprBSjvDLDfvXP yL88rIE3rgdNewX+OazOQ/SXLCd+g9AqX6AIha/1Fs/psleebJWDFtwtgao8FoD9SOvD ZjFcf4E3UujAxSSWK2jB2DXlcn3e2U0vcaJsIe0eqbtFvodnkstikh3SFRis4bKLmi14 jzHds1iHhZnBv/bQeeBlUVrC4WrgLXwOxLdD7hWnUvu1T4GyRdrHZQ1tAL2Xowkwk08p pe8w== 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=1wu5g7+p7wcL2vh9OtQFkZ0v1XFmjPDGg3VgD4d9f2E=; b=cm7B1KCFh899scrJXMhrVtOet599Uy7YImjEsABaROhIcggHTO31YfEFP4x8FyGXqj CXK+CT4MY/+00j6SwZESoIg/MDoTyR7Xk2SW9vCghupIBmvauOvcYoQDwSiHbXSXdkVf dMd9AyXt6wJ/7YMijmQFROhQqC5AKPa2KPm7uQ9rQgUwoPzR+Xi0ljX5Ack2SURUcjzU VeAFc5M/C8O1kl8CHDD/CZeLAIB+l8+Hc2GDV81b9a/0MH32v+cAScPN+9+09PqKRNmr 4bcSqs0j0MfoXMTuXogsjjj9plc1wYHasm2n5LoVEvs7GjJgbfCVxnKXwGLx/0TbFCH0 aCzw== X-Gm-Message-State: APjAAAUYYE8kLKYvBkNcPmOTTLS76IJGQnN/seNyPgBZ7BcmQQukqLgK 1XrqcqU7QSHphTHCpVnDuzjP12U= X-Google-Smtp-Source: APXvYqzixw4J4jlcIoZuMErwT0C/7Xu0GYp8YXkHTyQDviEaB/kX55myIAMziU5sST32V9OxNA2PQQ== X-Received: by 2002:a54:4501:: with SMTP id l1mr186599oil.101.1579540053675; Mon, 20 Jan 2020 09:07:33 -0800 (PST) From: minyard@acm.org To: QEMU Developers Subject: [PATCH 4/5] hw/i2c/Kconfig: Add an entry for the SMBus Date: Mon, 20 Jan 2020 11:07:24 -0600 Message-Id: <20200120170725.24935-5-minyard@acm.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200120170725.24935-1-minyard@acm.org> References: <20200120170725.24935-1-minyard@acm.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::22e 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: =?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) From: Philippe Mathieu-Daud=C3=A9 The System Management Bus is more or less a derivative of the I2C bus, thus the Kconfig entry depends of I2C. Not all boards providing an I2C bus support SMBus. Use two different Kconfig entries to be able to select I2C without selecting SMBus. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191231183216.6781-6-philmd@redhat.com> --- hw/i2c/Kconfig | 8 ++++++-- hw/i2c/Makefile.objs | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig index 2bbd395813..09642a6dcb 100644 --- a/hw/i2c/Kconfig +++ b/hw/i2c/Kconfig @@ -1,9 +1,13 @@ config I2C bool =20 +config SMBUS + bool + select I2C + config SMBUS_EEPROM bool - depends on I2C + select SMBUS =20 config VERSATILE_I2C bool @@ -11,7 +15,7 @@ config VERSATILE_I2C =20 config ACPI_SMBUS bool - select I2C + select SMBUS =20 config BITBANG_I2C bool diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs index d7073a401f..cbbc8507a3 100644 --- a/hw/i2c/Makefile.objs +++ b/hw/i2c/Makefile.objs @@ -1,4 +1,5 @@ -common-obj-$(CONFIG_I2C) +=3D core.o smbus_slave.o smbus_master.o +common-obj-$(CONFIG_I2C) +=3D core.o +common-obj-$(CONFIG_SMBUS) +=3D smbus_slave.o smbus_master.o common-obj-$(CONFIG_SMBUS_EEPROM) +=3D smbus_eeprom.o common-obj-$(CONFIG_VERSATILE_I2C) +=3D versatile_i2c.o common-obj-$(CONFIG_ACPI_X86_ICH) +=3D smbus_ich9.o --=20 2.17.1 From nobody Sat May 4 02:01:09 2024 Delivered-To: importer@patchew.org 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; 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=1579540213; cv=none; d=zohomail.com; s=zohoarc; b=Zkm9ByO4Mrf8ksMarL3W2X2jxIaItMgCHUJd04Enb2Ym8fsezNQ9vjTbIm09rNA3vgRnzz169Ry4Qgbr02ttneXcY2WACjAlEeEgfJjr5rmKsplaXb99AcT+mK8NxKQLp8/KzD5XfA/U/ziZ6c3rhpHSyZsLTTmJqrWQOy3EJt4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579540213; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=NgG8/oXKPfzZ5PXrBgXiek8H6KwYdNE5o1J3M+0kzq0=; b=LWDYM/jQDI59P1ikrT4RuLUlpfkFBUZMsWfeLAbtDUp56t+5Bk98EroiZcGtEM+QAwJOsI2eD2foY6ARmSTqIhX0/nl3nsUD2L21ItQUW57oBJ3hkl9uFTbc9VMHmkcdB5il8Ce/ays1txkAg7P9KbBwMq0ieklL2uhBoWzmIe0= 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 1579540213567970.3631692434019; Mon, 20 Jan 2020 09:10:13 -0800 (PST) Received: from localhost ([::1]:40330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itaZ1-0007nx-VP for importer@patchew.org; Mon, 20 Jan 2020 12:10:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36385) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itaWW-0005sj-Ot for qemu-devel@nongnu.org; Mon, 20 Jan 2020 12:07:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itaWV-0001hd-64 for qemu-devel@nongnu.org; Mon, 20 Jan 2020 12:07:36 -0500 Received: from mail-ot1-x343.google.com ([2607:f8b0:4864:20::343]:36701) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itaWV-0001hC-0h for qemu-devel@nongnu.org; Mon, 20 Jan 2020 12:07:35 -0500 Received: by mail-ot1-x343.google.com with SMTP id m2so396277otq.3 for ; Mon, 20 Jan 2020 09:07:34 -0800 (PST) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id 101sm12570617otj.55.2020.01.20.09.07.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 09:07:33 -0800 (PST) Received: from t560.minyard.net (unknown [IPv6:2001:470:b8f6:1b:9c9c:d583:ce3d:f87a]) by serve.minyard.net (Postfix) with ESMTPA id A6E88180055; Mon, 20 Jan 2020 17:07:31 +0000 (UTC) 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; bh=NgG8/oXKPfzZ5PXrBgXiek8H6KwYdNE5o1J3M+0kzq0=; b=nesdw3H5n0bL3sOhbpvgZPUFftlI4XTCVnaOvTRmsc/qmmROUO3pCvBx7cTIcW+gAw z0lYHdGYIGJwslSbwsEbxo8ib6XU82uvliMED1lyje5672kvjSm3hJOzXNUnMbNm6yML uNwAar+VbHwWOFizNBzhCcVuS29ijFB1ZA9lB9S5GG55PBii2DWM7pjJjUT749IG77m1 PEotE+uyjLeX4bk/Vhq3ObdXp5bP6PoBXlnIHQ0ok7L/5Ey7n+1e9L8hjOyBKsm4Yipd m9K+DAU1B50e2uLVrsA1kTkYV/AB2x2dzCYFvNQgJMQARo0f7rublsgIxVwnHhmQW4nN aCxA== 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; bh=NgG8/oXKPfzZ5PXrBgXiek8H6KwYdNE5o1J3M+0kzq0=; b=iN5v+15nxeiTofEdKwWA6HPv+1q5A8eYqh2auvQNBo0P9Xb0sCVFVNDXyqoVxd8gOF G/2PQw6xfse3tKCW5EbEpZsbbawVnQq1xh/O0yv5NI3IxrMURlvyuCSMNE3fpPUnXzT8 LxZf6qwgAUSgXn+Pb4KSYR+jG/VBerz/aWOa7DfZ9C3wTmwbIomBQhE2fuYphETUTFDJ DufEmQCScTsZd2bDX7Er4hvSlidwVuHYeW52hZa609s83yvKzEiAuSYiRqAnesxVc6GX EdJ2ma11cTqh1/zAjvWx2mDmIr/aHoUNjPiZ2/IfGnlB+NqzGLmhoEkqGmR97Qt2oZdY Z/9g== X-Gm-Message-State: APjAAAWhni/uxSSWwWwapqJTMmRG3UAhIzZ4Je4wbW8fme6076UCSlHE M3Zd9qkoANDTdq4Bz3utohdrNEY= X-Google-Smtp-Source: APXvYqwxCwUo84AzXy8wf2MuxJIHXr2/uAggIAofwlylYEv/cWXIqlD7TrtY/BQ18U15+geV1tSdaQ== X-Received: by 2002:a05:6830:154a:: with SMTP id l10mr370134otp.44.1579540054023; Mon, 20 Jan 2020 09:07:34 -0800 (PST) From: minyard@acm.org To: QEMU Developers Subject: [PATCH 5/5] i386:acpi: Remove _HID from the SMBus ACPI entry Date: Mon, 20 Jan 2020 11:07:25 -0600 Message-Id: <20200120170725.24935-6-minyard@acm.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200120170725.24935-1-minyard@acm.org> References: <20200120170725.24935-1-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::343 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: Corey Minyard , Igor Mammedov , "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Corey Minyard Per the ACPI spec (version 6.1, section 6.1.5 _HID) it is not required on enumerated buses (like PCI in this case), _ADR is required (and is already there). And the _HID value is wrong. Linux appears to ignore the _HID entry, but Windows 10 detects it as 'Unknown Device' and there is no driver available. See https://bugs.launchpad.net/qemu/+bug/1856724 Signed-off-by: Corey Minyard Cc: Michael S. Tsirkin Cc: Igor Mammedov Reviewed-by: Igor Mammedov --- hw/i386/acpi-build.c | 1 - tests/data/acpi/q35/DSDT | Bin 7879 -> 7869 bytes tests/data/acpi/q35/DSDT.bridge | Bin 7896 -> 7886 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8342 -> 8332 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9532 -> 9522 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7954 -> 7944 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9238 -> 9228 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 9009 -> 8999 bytes tests/data/acpi/q35/DSDT.numamem | Bin 7885 -> 7875 bytes 9 files changed, 1 deletion(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 7b8da62d41..ab73a8f4c8 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1815,7 +1815,6 @@ static void build_smb0(Aml *table, I2CBus *smbus, int= devnr, int func) Aml *scope =3D aml_scope("_SB.PCI0"); Aml *dev =3D aml_device("SMB0"); =20 - aml_append(dev, aml_name_decl("_HID", aml_eisaid("APP0005"))); aml_append(dev, aml_name_decl("_ADR", aml_int(devnr << 16 | func))); build_acpi_ipmi_devices(dev, BUS(smbus), "\\_SB.PCI0.SMB0"); aml_append(scope, dev); diff --git a/tests/data/acpi/q35/DSDT b/tests/data/acpi/q35/DSDT index 77ea60ffed421c566138fe6341421f579129a582..1f91888d7a485850cf27f152e24= 7a90b208003dc 100644 GIT binary patch delta 42 xcmX?ZyVsV>CDe&h`+ diff --git a/tests/data/acpi/q35/DSDT.dimmpxm b/tests/data/acpi/q35/DSDT.di= mmpxm index 23fdf5e60a5069f60d6c680ac9c68c4a8a81318e..02ccdd5f38d5b2356dcca89398c= 41dcf2595dfff 100644 GIT binary patch delta 42 xcmdnvwaJUiCDv8151UVN}qe1Nm3L39&;u&FFx2QKET=3D2Ai9Y^*w@Km^J2+-Rsi7S3kU!J delta 52 zcmeCMn`Fo366_KpB+tOWxOgL1ouss?UVN}qe1Nm3L3ER3u&>&QD-BUv81%BUVN}qe1Nm3L3ER3u&