From patchwork Wed Dec 7 23:12:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13067741 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BB0B6C4708D for ; Wed, 7 Dec 2022 23:13:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p33ar-0005jP-VU; Wed, 07 Dec 2022 18:12:49 -0500 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 ) id 1p33aq-0005iy-R3 for qemu-devel@nongnu.org; Wed, 07 Dec 2022 18:12:48 -0500 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p33ao-0003Uz-Jh for qemu-devel@nongnu.org; Wed, 07 Dec 2022 18:12:48 -0500 Received: by mail-ej1-x634.google.com with SMTP id vp12so17537613ejc.8 for ; Wed, 07 Dec 2022 15:12:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fXF6leAVFw+IPAA2S+2l7sWlCEcXEtnrXV0kdfpgDh8=; b=c+hfSW/2n0jM/xO2gVMU6QsATbQR9sOhpcOqv86bPnrSnX/W2S38uOIYDS0KPJms7Q HPq7f+Riny6UXRehEVSY71uYG/q9Kaj0UdEPTX8XEm075uI1G2xxOJsurIfiN+RK1LxO 0MDyBnNMpS/poChh7AJIPbXx1WVgkj1OFbklwNvx0MLbuIpfy/+GvlX8r0yTImn0CW47 6qUKrQ5twdX9Hkns6eLKhvypv0luFLfnXVH1KxRlk6SJGaDePMKtHvtmB5DQESuaNw/O MX2HJ9ZvcHaIPpmdVe9kYatcWsxgjAfth061SD4UTOrX5zktqXu2h77QrY6TN60y8m0H hSnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fXF6leAVFw+IPAA2S+2l7sWlCEcXEtnrXV0kdfpgDh8=; b=rbAMi95pa3BVsmNEjBqcs6rpeecwtKJD0pGex3RP3GL/jx5H32x6q0XVt+iH07puMJ 2Mqk1aDNxMJjqAEyIi5MUwaaQUiyzEnGyzbHjEPWwl5LJS6ZsqXBooVtGrUM7MZIV/iq BIzvZqg3hImKGVIPM3yzEbgdfKIDeDmNOlBLamPfIWoPwAPW4G4L514c5Tn+UNvN9gLi y/7yrlpm1YoYuzmAlrcEGlsC51mcQ/2iRmSmHQ9o97XG4PbiYOvaa8E74A9n276yFdO8 mh6DDK8QteVvg5xwba+xZu2/ym/bLsy9efxtbaECHeU9BXDckcOq+hA97hEIQoHMTo9W 0hzA== X-Gm-Message-State: ANoB5pnIP/tAARf8Ih9bVrtNp7OjXhhHxoZbj3rJX57lxx3rlo5TcASx DiWES9vqRMDHgBdIXsaQ9FDyZumjMPA= X-Google-Smtp-Source: AA0mqf5hfWIH/p5/XotWr/8ior1F4sI9fNP01VnpiolW7pJ4toiJWAJUtaUUGuziAhktZWUj9V0sxQ== X-Received: by 2002:a17:907:770e:b0:7bf:3627:df32 with SMTP id kw14-20020a170907770e00b007bf3627df32mr876612ejc.75.1670454763873; Wed, 07 Dec 2022 15:12:43 -0800 (PST) Received: from localhost.localdomain (dynamic-077-011-181-051.77.11.pool.telefonica.de. [77.11.181.51]) by smtp.gmail.com with ESMTPSA id r6-20020a508d86000000b004587f9d3ce8sm2732367edh.56.2022.12.07.15.12.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 15:12:43 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Igor Mammedov , "Michael S. Tsirkin" , Marcel Apfelbaum , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Eduardo Habkost , Ani Sinha , Bernhard Beschow Subject: [PATCH 1/5] hw/acpi/Kconfig: Add missing dependencies to ACPI_PIIX4 Date: Thu, 8 Dec 2022 00:12:01 +0100 Message-Id: <20221207231205.1106381-2-shentey@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221207231205.1106381-1-shentey@gmail.com> References: <20221207231205.1106381-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=shentey@gmail.com; helo=mail-ej1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org piix4_pm_realize() uses apm_init() and pm_smbus_init(), so both APM and ACPI_SMBUS are provided by the device model managed by ACPI_PIIX4. Signed-off-by: Bernhard Beschow --- configs/devices/mips-softmmu/common.mak | 2 -- hw/acpi/Kconfig | 2 ++ hw/i386/Kconfig | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips-softmmu/common.mak index 416161f833..3011304443 100644 --- a/configs/devices/mips-softmmu/common.mak +++ b/configs/devices/mips-softmmu/common.mak @@ -19,7 +19,6 @@ CONFIG_PCKBD=y CONFIG_FDC=y CONFIG_ACPI=y CONFIG_ACPI_PIIX4=y -CONFIG_APM=y CONFIG_I8257=y CONFIG_PIIX4=y CONFIG_IDE_ISA=y @@ -32,6 +31,5 @@ CONFIG_MIPS_ITU=y CONFIG_MALTA=y CONFIG_PCNET_PCI=y CONFIG_MIPSSIM=y -CONFIG_ACPI_SMBUS=y CONFIG_SMBUS_EEPROM=y CONFIG_TEST_DEVICES=y diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig index 3703aca212..9504cbad2f 100644 --- a/hw/acpi/Kconfig +++ b/hw/acpi/Kconfig @@ -30,6 +30,8 @@ config ACPI_NVDIMM config ACPI_PIIX4 bool + select ACPI_SMBUS + select APM depends on ACPI config ACPI_PCIHP diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index d22ac4a4b9..2fdefd7458 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -62,7 +62,6 @@ config PC_ACPI select ACPI_VIOT select SMBUS_EEPROM select PFLASH_CFI01 - depends on ACPI_SMBUS config I440FX bool @@ -71,7 +70,6 @@ config I440FX imply VMMOUSE select PC_PCI select PC_ACPI - select ACPI_SMBUS select PCI_I440FX select PIIX3 select IDE_PIIX From patchwork Wed Dec 7 23:12:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13067743 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AD883C4708D for ; Wed, 7 Dec 2022 23:13:46 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p33av-0005mR-WC; Wed, 07 Dec 2022 18:12:54 -0500 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 ) id 1p33au-0005lb-Kt for qemu-devel@nongnu.org; Wed, 07 Dec 2022 18:12:53 -0500 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p33ao-0003V3-Sv for qemu-devel@nongnu.org; Wed, 07 Dec 2022 18:12:52 -0500 Received: by mail-ed1-x52e.google.com with SMTP id d20so27096070edn.0 for ; Wed, 07 Dec 2022 15:12:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=z6A2hDYam9mls+BGlfzcKRLkIxZPLYh/mqXWVkLXZUU=; b=lwX3oWbS+c/5H42Q7i9h63C18KyswkuASRHb9CtAr6KVWI+WtXq76IerZgko3qnkey Pw3Q5+4vyjNDTiNNG/Wd6ThYsJs4Ph00qOZbb/EIVT6Mg4EvNpGOXKINUPGib3iCx/NA AnUzSLt6SbfPPh1HAmHpkD2ALOZZHMxV02QytY1FbDzVMdvuQUnb5fk3UEyzPhMjn3jr y+1O8HUy8/of3SBBG06gssOgiy7rMmsMgM9jSssm2vXTwdQNuu9CgqYqZs1QTxsq4Ra3 IWJnPELqErL3h7nRe30/q030lSzaQUdqMcXe4+Y//xfkSKfGuqmUFuO3AdpyDh1lyKE0 d3yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=z6A2hDYam9mls+BGlfzcKRLkIxZPLYh/mqXWVkLXZUU=; b=UIHUEbhISHXb2o/fyAx9s0qGANa10w9QkqnBVDUfFJYrXy1c0tEyZWVg9zDgIal8C4 QCucm7uO6zoIkRK8KZ8GTPSfHsFpAGfhqNv/X/M4hyrueajtHfwgjnnU3ILTSmsL5ZzD kOZwU94z996rc3w/L32GLFOk+2Hvm2MyIsL04WBua/Oxp8QOj0bqUT1IP+N1/R+h74UK kNCTq08RaDKNAeRo+SwPMCY/QBHNaCX4olWV4C0HZN0S4cUAcRnbc4NVGly0fmqXbfXj FEh27ESvrjCrUZ13Xg/0OK7TXkLOGZlSUA6TxTm9bJN46e8PnJAkeUHDzjpaFyMJUzA7 tA1g== X-Gm-Message-State: ANoB5pllzShdJ6lpnk7HLrUHhqiknfgRZkYuzW6PpgOduEpomFQTwDHu VHtZt+gqQBfvRANJWib7UNMnzdtbLJU= X-Google-Smtp-Source: AA0mqf7hbXKQA2otC7RtaajB+tj1rMPuyNChJCenWbHlNeXVLXpcK4h9T7dnfjsRXb/2rM9tke7i/w== X-Received: by 2002:a05:6402:1ccc:b0:461:8be6:1ac4 with SMTP id ds12-20020a0564021ccc00b004618be61ac4mr1224387edb.20.1670454765044; Wed, 07 Dec 2022 15:12:45 -0800 (PST) Received: from localhost.localdomain (dynamic-077-011-181-051.77.11.pool.telefonica.de. [77.11.181.51]) by smtp.gmail.com with ESMTPSA id r6-20020a508d86000000b004587f9d3ce8sm2732367edh.56.2022.12.07.15.12.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 15:12:44 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Igor Mammedov , "Michael S. Tsirkin" , Marcel Apfelbaum , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Eduardo Habkost , Ani Sinha , Bernhard Beschow Subject: [PATCH 2/5] hw/acpi/Kconfig: Rename ACPI_X86_ICH to ACPI_ICH9 Date: Thu, 8 Dec 2022 00:12:02 +0100 Message-Id: <20221207231205.1106381-3-shentey@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221207231205.1106381-1-shentey@gmail.com> References: <20221207231205.1106381-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=shentey@gmail.com; helo=mail-ed1-x52e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Although the ICH9 ACPI controller may currently be tied to x86 it doesn't have to. Furthermore, the source files this configuration switch manages contain a '9', so this name fits more. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé --- hw/acpi/Kconfig | 2 +- hw/acpi/meson.build | 2 +- hw/i2c/meson.build | 2 +- hw/isa/Kconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig index 9504cbad2f..ec16dd20e6 100644 --- a/hw/acpi/Kconfig +++ b/hw/acpi/Kconfig @@ -13,7 +13,7 @@ config ACPI_X86 select ACPI_PCIHP select ACPI_ERST -config ACPI_X86_ICH +config ACPI_ICH9 bool select ACPI_X86 diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build index f8c820ca94..cfae2f58f6 100644 --- a/hw/acpi/meson.build +++ b/hw/acpi/meson.build @@ -22,7 +22,7 @@ acpi_ss.add(when: 'CONFIG_ACPI_PIIX4', if_true: files('piix4.c')) acpi_ss.add(when: 'CONFIG_ACPI_PCIHP', if_true: files('pcihp.c')) acpi_ss.add(when: 'CONFIG_ACPI_PCIHP', if_false: files('acpi-pci-hotplug-stub.c')) acpi_ss.add(when: 'CONFIG_ACPI_VIOT', if_true: files('viot.c')) -acpi_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('ich9.c', 'tco.c')) +acpi_ss.add(when: 'CONFIG_ACPI_ICH9', if_true: files('ich9.c', 'tco.c')) acpi_ss.add(when: 'CONFIG_ACPI_ERST', if_true: files('erst.c')) acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'), if_false: files('ipmi-stub.c')) acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c')) diff --git a/hw/i2c/meson.build b/hw/i2c/meson.build index d3df273251..6e7340aaac 100644 --- a/hw/i2c/meson.build +++ b/hw/i2c/meson.build @@ -2,7 +2,7 @@ i2c_ss = ss.source_set() i2c_ss.add(when: 'CONFIG_I2C', if_true: files('core.c')) i2c_ss.add(when: 'CONFIG_SMBUS', if_true: files('smbus_slave.c', 'smbus_master.c')) i2c_ss.add(when: 'CONFIG_ACPI_SMBUS', if_true: files('pm_smbus.c')) -i2c_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('smbus_ich9.c')) +i2c_ss.add(when: 'CONFIG_ACPI_ICH9', if_true: files('smbus_ich9.c')) i2c_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_i2c.c')) i2c_ss.add(when: 'CONFIG_BITBANG_I2C', if_true: files('bitbang_i2c.c')) i2c_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_i2c.c')) diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 18b5c6bf3f..01f330d941 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -78,4 +78,4 @@ config LPC_ICH9 select I8257 select ISA_BUS select ACPI_SMBUS - select ACPI_X86_ICH + select ACPI_ICH9 From patchwork Wed Dec 7 23:12:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13067744 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 118E3C4708D for ; Wed, 7 Dec 2022 23:14:50 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p33b7-0005s7-Ay; Wed, 07 Dec 2022 18:13:05 -0500 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 ) id 1p33b5-0005rt-Qj for qemu-devel@nongnu.org; Wed, 07 Dec 2022 18:13:04 -0500 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p33ap-0003V9-Nc for qemu-devel@nongnu.org; Wed, 07 Dec 2022 18:13:03 -0500 Received: by mail-ej1-x629.google.com with SMTP id fc4so17480811ejc.12 for ; Wed, 07 Dec 2022 15:12:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uL+X4URS6URh+lnIy3wy89QDomDBD/eH1SHw/ATk9/Y=; b=IejAtmu/1+nnUOQFhadGDgZ0cSFD4EXIuHbkp6CmKWNrOnZTitVkUu4oRlriVt0ZBo Xn/ppvqQPX5aaSskh7jyVOzKpugWxcxxVWj/RSvi3oi5CerC7XFmjMkip2zwkl8JnjRZ XobCF4YU77oGcd0M/jfgZDzmApfhS5Cr6gSQLDxIEj4TnKm/qsEtTenWhLJnAESYDJ5s R53ktkQDvk+3Hg2jlIVvU5U5Shrn59YK7aTJt/boMetplFtYX/dAnQ+WgUmjed28R8Ps JiXfeIRnjL9uG0eHu8Dy7u5KJFBUzRBoIIFYK+h6BskBOea94Av0ahVJ1e3znQznnIvY 6UCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uL+X4URS6URh+lnIy3wy89QDomDBD/eH1SHw/ATk9/Y=; b=WvEO8glnB9f6t7bfC7XWAfOMSN5vgg8cpJjG+GmbsatpwQros8153u8NR5gsdAtE9n 86GnUJpEfP4MIrQSThUxPPTehPmxQPHEExWoqVBgztUQbRtxr9/hbm/205Q73OjbQmd8 fsF2dBY5VGCY8ZgnLV3ZF5FX10GE36p7cFewcYpbdxrmL5KzzLp8qIUlz208WOhMzQtc J2cQ2ZY7j+ElUGyB+c7hF+rE+qgtJiYuLpBW2M99m4sFvLkCgSXOViMcgHFKjec5f1Ls yGOsjW/Ps5xCd3NF0D7akp8o0ONleM3OXzKbS5nupX9AsM8w6sxC5e46Q03ttURjdFjt XFaQ== X-Gm-Message-State: ANoB5pkOVNevxeJFWzJHtlQJy+5pME4TrAPW0Te/wKE4PDM5jvAq5kSM 0Cgx0rDsYhxsvXENzz9cUxV1dhWvl2g= X-Google-Smtp-Source: AA0mqf6qZ1rS7ycAAEIBvERGgzZBcMNCZG9JJStorwg0A2qit9IH8Bkn53ohxFXxKFrnt9bD+KaHAw== X-Received: by 2002:a17:906:7c83:b0:7c0:f325:637b with SMTP id w3-20020a1709067c8300b007c0f325637bmr868627ejo.62.1670454766175; Wed, 07 Dec 2022 15:12:46 -0800 (PST) Received: from localhost.localdomain (dynamic-077-011-181-051.77.11.pool.telefonica.de. [77.11.181.51]) by smtp.gmail.com with ESMTPSA id r6-20020a508d86000000b004587f9d3ce8sm2732367edh.56.2022.12.07.15.12.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 15:12:45 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Igor Mammedov , "Michael S. Tsirkin" , Marcel Apfelbaum , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Eduardo Habkost , Ani Sinha , Bernhard Beschow Subject: [PATCH 3/5] hw/acpi/Kconfig: Add missing dependencies to ACPI_ICH9 Date: Thu, 8 Dec 2022 00:12:03 +0100 Message-Id: <20221207231205.1106381-4-shentey@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221207231205.1106381-1-shentey@gmail.com> References: <20221207231205.1106381-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=shentey@gmail.com; helo=mail-ej1-x629.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org ich9_lpc_realize() uses apm_init() and ich9_smbus_realize() uses pm_smbus_init(), so both APM and ACPI_SMBUS are provided by the device models managed by ACPI_ICH9. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé --- hw/acpi/Kconfig | 2 ++ hw/i386/Kconfig | 1 - hw/isa/Kconfig | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig index ec16dd20e6..5a678b07c7 100644 --- a/hw/acpi/Kconfig +++ b/hw/acpi/Kconfig @@ -15,7 +15,9 @@ config ACPI_X86 config ACPI_ICH9 bool + select ACPI_SMBUS select ACPI_X86 + select APM config ACPI_CPU_HOTPLUG bool diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 2fdefd7458..4b4b5265bb 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -51,7 +51,6 @@ config PC_PCI bool select APIC select IOAPIC - select APM select PC config PC_ACPI diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 01f330d941..0a6a04947c 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -77,5 +77,4 @@ config LPC_ICH9 # for ICH9. select I8257 select ISA_BUS - select ACPI_SMBUS select ACPI_ICH9 From patchwork Wed Dec 7 23:12:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13067742 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C4E39C63709 for ; Wed, 7 Dec 2022 23:13:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p33av-0005mQ-Vs; Wed, 07 Dec 2022 18:12:54 -0500 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 ) id 1p33at-0005lH-SZ for qemu-devel@nongnu.org; Wed, 07 Dec 2022 18:12:51 -0500 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p33as-0003VE-3A for qemu-devel@nongnu.org; Wed, 07 Dec 2022 18:12:51 -0500 Received: by mail-ed1-x536.google.com with SMTP id i15so18842585edf.2 for ; Wed, 07 Dec 2022 15:12:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xF24NYxJq1DgMM7z5X76nfJmSnQrTfSUFnB/Og4Rdk0=; b=m1pQLi3baY9jue5dINvWpyxESEw2ZBIsAdb1hwIKACYD114qKwhGh8gwpQu88ny71Y VuYuTAzFf5YnNVxCpFpjasWUzik53fHaypoosg6o5DUP35i7ODADdJhR3OKKCASlJXTt 3lrqu8aBDl5ve+KNsAouZ/hAUs+Rke6NzrkGU1fQBFoc9aqR3NPM3EaeTQVOav2x9dEf R2LASplan3IW6Z6Al5bIfFGisKXBQWNaxLYraaQE6Nygx1q1I95MO0Jwp/TQ9a/8x5ya fdgVip6ODcJP4uCH+P70C2YMhmPskfrsVg4ZHLDz9mCIfkBU0aiQDWGEDCxWrLrUKZIp Wn3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xF24NYxJq1DgMM7z5X76nfJmSnQrTfSUFnB/Og4Rdk0=; b=T6rsOikwifANwCWhi2xcvhGJEZiUGB0Y0Gz8oAC2ZHgm8X1eVmgZ00isdUfieXdDnv Vbm5sEiilhL5m8HlhoZrj8fGWKTvDa4C9pBXPC8/Yizj/sroa+oeN/d0Q5apJ1fEZsmv FDCCH9Dtb9mC+/mra3sfzG++LU7EvWU4uRrkaRdmlGQJkowUzJgt3XTE4PF+cyy4ODE7 5Da4v43hYnZGS0+6FhnO4gy6CxwGIHtzwUDM+xNH4l+LieaqzjjoqQJ4ulZk1chDZUPT 8ae75Yfkg6Lcix7+YsGtNnA5SraAgWuxbw5+rqFOprtsX9IOxzbJcy1j4jCW1vGSDycU FgrQ== X-Gm-Message-State: ANoB5pl+YuvXTWB1D/jefT6bmFrPzweHsZ87QDkHoR0jQ8YefPiqjZ9O AHn2YgXBS+y+MwIkCWVZMWmLFwiYU4Y= X-Google-Smtp-Source: AA0mqf6O/HYROeisvBcHDLJypuAnM7VojE3YcSAl5VJZWB5+VRHHpvkbcOJAGo7u4Szxxyf//WNn9A== X-Received: by 2002:a05:6402:159:b0:461:22bb:1ae4 with SMTP id s25-20020a056402015900b0046122bb1ae4mr1123963edu.17.1670454767339; Wed, 07 Dec 2022 15:12:47 -0800 (PST) Received: from localhost.localdomain (dynamic-077-011-181-051.77.11.pool.telefonica.de. [77.11.181.51]) by smtp.gmail.com with ESMTPSA id r6-20020a508d86000000b004587f9d3ce8sm2732367edh.56.2022.12.07.15.12.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 15:12:46 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Igor Mammedov , "Michael S. Tsirkin" , Marcel Apfelbaum , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Eduardo Habkost , Ani Sinha , Bernhard Beschow Subject: [PATCH 4/5] hw/isa/Kconfig: Add missing dependency to VT82C686 Date: Thu, 8 Dec 2022 00:12:04 +0100 Message-Id: <20221207231205.1106381-5-shentey@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221207231205.1106381-1-shentey@gmail.com> References: <20221207231205.1106381-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=shentey@gmail.com; helo=mail-ed1-x536.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Both ACPI_PIIX4 (directly) and ACPI_ICH9 (indirectly) require ACPI to be selected. Require it for VT82C686's ACPI controller too for consistency. Signed-off-by: Bernhard Beschow --- hw/isa/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 0a6a04947c..bc2e3ecf02 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -63,6 +63,7 @@ config VT82C686 select IDE_VIA select MC146818RTC select PARALLEL + depends on ACPI config SMC37C669 bool From patchwork Wed Dec 7 23:12:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13067746 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 012E6C4708D for ; Wed, 7 Dec 2022 23:15:26 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p33ax-0005n6-KO; Wed, 07 Dec 2022 18:12:55 -0500 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 ) id 1p33av-0005lm-Cm for qemu-devel@nongnu.org; Wed, 07 Dec 2022 18:12:53 -0500 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p33as-0003VZ-4W for qemu-devel@nongnu.org; Wed, 07 Dec 2022 18:12:52 -0500 Received: by mail-ed1-x530.google.com with SMTP id a16so26995727edb.9 for ; Wed, 07 Dec 2022 15:12:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F2lh7ePLWH9MC7IF9XYD3B06iz9fHKdzke7e7jCke8U=; b=Jw2Ani+IqG6qlnlSN9BR/Xa4HrMAowg+445q6WLiqlWN23Ru0Ha4JQgdVm7ZnwLOWc vgRpjRVLP19zWiQvby7sdRlKGRdRG3KBl2R6kCpCON1F55UnGGJuRrJbBYxIQfJzXsAd Iclwsdn9w3FAWuqHS5ZcUV2LmqPUZzLA9EH2F/aFXwjLnGRxC7pdImuJ+bCF/+P5uXVh pNyxCvAjJgxBt39jPUqiFNpoURKGLxK2KfPTAU4s6G+dpt/stAO6Co9Jd1lD6sCEhcVp YOnyxtZfG4V8/PgvJeADdhlHfmap0P/Mm1MRUCTA8GwN4Z9dD3RkDg5GCzrup+Xj87WP FZZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F2lh7ePLWH9MC7IF9XYD3B06iz9fHKdzke7e7jCke8U=; b=MvmNEVFX6ek9K42sbuPSnjLNUG/aEJPA0fjicnKyZoG+8hINXFFeIhp6FcQfaSh+e3 VMiN5XOUsR8K80altPpLn5A2PmMo5bM8e5LMCIonlWMo4Kj2jGTc6BwmW3s1nJ31iOx1 +Us5rQfPeWw0PkOY91eQSWnj2TOvndAmLvcXMGCywmJaz6A8emPoqOwACeJ2b+5dwZVQ x1wmxXix8ixndJrImLdV1Tilt4i03mgMWekzKW1tQ0UUCtfugyG0uBr3b6WXo5IcfvFS IQP4GgqnAhfSnG7V+/+oLz2IIseQD0cB2xnR0UQLmmUYAxW9B9Z2/M46kFv3IPQiM0e4 kqRA== X-Gm-Message-State: ANoB5pk0P/ckolYOjcr4jSCuRIF1jH6YziIG6cGujAFfaWH22yAxHi1w H9KkFasmwNQP5lFQ19QtfGDR0rpceLM= X-Google-Smtp-Source: AA0mqf4zlAU/bzOPaJ8hMBx/PGrpnlP8oHjXjMzE0CUvUgRMfFoMXVLwzLtEtfPzXoetaW/yBAfb2w== X-Received: by 2002:a05:6402:4518:b0:461:46c5:992f with SMTP id ez24-20020a056402451800b0046146c5992fmr945335edb.4.1670454768342; Wed, 07 Dec 2022 15:12:48 -0800 (PST) Received: from localhost.localdomain (dynamic-077-011-181-051.77.11.pool.telefonica.de. [77.11.181.51]) by smtp.gmail.com with ESMTPSA id r6-20020a508d86000000b004587f9d3ce8sm2732367edh.56.2022.12.07.15.12.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 15:12:48 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Igor Mammedov , "Michael S. Tsirkin" , Marcel Apfelbaum , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Eduardo Habkost , Ani Sinha , Bernhard Beschow Subject: [PATCH 5/5] hw/ppc/Kconfig: Remove unused dependencies from PEGASOS2 Date: Thu, 8 Dec 2022 00:12:05 +0100 Message-Id: <20221207231205.1106381-6-shentey@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221207231205.1106381-1-shentey@gmail.com> References: <20221207231205.1106381-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=shentey@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Removes the following dependencies from ppc-softmmu: - CONFIG_ACPI_CPU_HOTPLUG - CONFIG_ACPI_CXL - CONFIG_ACPI_HMAT - CONFIG_ACPI_MEMORY_HOTPLUG - CONFIG_ACPI_NVDIMM - CONFIG_ACPI_PCIHP - CONFIG_ACPI_PIIX4 - CONFIG_ACPI_X86 - CONFIG_MEM_DEVICE Signed-off-by: Bernhard Beschow --- hw/ppc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index b8d2522f45..0ab77177a8 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -77,7 +77,7 @@ config PEGASOS2 select SMBUS_EEPROM select VOF # This should come with VT82C686 - select ACPI_X86 + select ACPI config PREP bool