From mboxrd@z Thu Jan 1 00:00:00 1970 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 30FC4C54E58 for ; Mon, 25 Mar 2024 15:00:07 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rolnh-0001Dr-MX; Mon, 25 Mar 2024 10:59:49 -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 ) id 1rolng-0001DY-DQ; Mon, 25 Mar 2024 10:59:48 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rolnd-0004Vd-O7; Mon, 25 Mar 2024 10:59:48 -0400 Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 42PENVcH023805; Mon, 25 Mar 2024 14:59:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : subject : from : to : cc : date : in-reply-to : references : content-type : mime-version : content-transfer-encoding; s=pp1; bh=xwsP8fbTOK8fPfrOjwTmzLwZm5LxASknvc4yN/CUuq4=; b=WfUIs37FmnuKl29htuu0Vp7TuIo6Oxb5XfrGu5Zjz9T1nDBp0Opa/1MCOEzXKfmS4A7V rFCbvLpCEQf3iiDhTcNYFJPebw2nL0wDhduLRhbQJ/o6XAB911ZXBbYaYv44vylX/nsp 2+YSxHfy/ESFL7Ww++gQz3E+WxkvpUFLNxZfphpqWf18YhvGdj1GlZbOmWGhI3MKp5W2 9vGsIVSfMjS56tgvbQdsoIFRs+CG4kHB5+p5PKvd0zsmUyEbE643LSdw75WCqJ+FWSpb 5k4MQASSBKLXtPyKPubwxc9/yxEOFzu3zgnwF50oV0n+BYwW4MaAQK886qsvbAjfGa4R wg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3x3aygr2uu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 Mar 2024 14:59:25 +0000 Received: from m0356517.ppops.net (m0356517.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 42PExPv7018888; Mon, 25 Mar 2024 14:59:25 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3x3aygr2um-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 Mar 2024 14:59:25 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 42PDcph0013367; Mon, 25 Mar 2024 14:59:23 GMT Received: from smtprelay04.wdc07v.mail.ibm.com ([172.16.1.71]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3x29t0a0rv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 Mar 2024 14:59:23 +0000 Received: from smtpav01.dal12v.mail.ibm.com (smtpav01.dal12v.mail.ibm.com [10.241.53.100]) by smtprelay04.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 42PExLbj31457896 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 25 Mar 2024 14:59:23 GMT Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2205758061; Mon, 25 Mar 2024 14:59:21 +0000 (GMT) Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C47EA58066; Mon, 25 Mar 2024 14:59:20 +0000 (GMT) Received: from mamboa4.aus.stglabs.ibm.com (unknown [9.3.84.87]) by smtpav01.dal12v.mail.ibm.com (Postfix) with ESMTP; Mon, 25 Mar 2024 14:59:20 +0000 (GMT) Message-ID: <6b626026caeda97432cefc43dd1a97734ad48d06.camel@linux.vnet.ibm.com> Subject: Re: [PATCH] misc/pca955*: Move models under hw/gpio From: Miles Glenn To: =?ISO-8859-1?Q?C=E9dric?= Le Goater , =?ISO-8859-1?Q?C=E9dric?= Le Goater , Peter Maydell , Andrew Jeffery , Joel Stanley , Thomas Huth , Laurent Vivier , Paolo Bonzini , Nicholas Piggin , =?ISO-8859-1?Q?Fr=E9d=E9ric?= Barrat Cc: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org Date: Mon, 25 Mar 2024 09:59:20 -0500 In-Reply-To: <20240325134833.1484265-1-clg@redhat.com> References: <20240325134833.1484265-1-clg@redhat.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5 (3.28.5-18.el8) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: VLp3bBMZqdmrs1o-oHvTSF29kFCrgKta X-Proofpoint-ORIG-GUID: pXUWiS0BdFhRZQzWbZrg6FP6w8hUchzq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-03-25_11,2024-03-21_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 bulkscore=0 adultscore=0 mlxlogscore=999 malwarescore=0 lowpriorityscore=0 impostorscore=0 phishscore=0 suspectscore=0 priorityscore=1501 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2403210000 definitions=main-2403250083 Received-SPF: none client-ip=148.163.156.1; envelope-from=milesg@linux.vnet.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=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 Thanks for doing this, Cédric! Reviewed-by: Glenn Miles -Glenn On Mon, 2024-03-25 at 14:48 +0100, Cédric Le Goater wrote: > The PCA9552 and PCA9554 devices are both I2C GPIO controllers and the > PCA9552 also can drive LEDs. Do all the necessary adjustments to move > the models under hw/gpio. > > Cc: Glenn Miles > Signed-off-by: Cédric Le Goater > --- > MAINTAINERS | 4 ++-- > include/hw/{misc => gpio}/pca9552.h | 0 > include/hw/{misc => gpio}/pca9552_regs.h | 0 > include/hw/{misc => gpio}/pca9554.h | 0 > include/hw/{misc => gpio}/pca9554_regs.h | 0 > hw/arm/aspeed.c | 2 +- > hw/{misc => gpio}/pca9552.c | 4 ++-- > hw/{misc => gpio}/pca9554.c | 4 ++-- > tests/qtest/pca9552-test.c | 2 +- > tests/qtest/pnv-host-i2c-test.c | 4 ++-- > hw/gpio/meson.build | 2 ++ > hw/gpio/trace-events | 4 ++++ > hw/misc/meson.build | 2 -- > hw/misc/trace-events | 4 ---- > 14 files changed, 16 insertions(+), 16 deletions(-) > rename include/hw/{misc => gpio}/pca9552.h (100%) > rename include/hw/{misc => gpio}/pca9552_regs.h (100%) > rename include/hw/{misc => gpio}/pca9554.h (100%) > rename include/hw/{misc => gpio}/pca9554_regs.h (100%) > rename hw/{misc => gpio}/pca9552.c (99%) > rename hw/{misc => gpio}/pca9554.c (99%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 409d7db4d457..a07af6b9d48e 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1549,8 +1549,8 @@ M: Glenn Miles > L: qemu-ppc@nongnu.org > L: qemu-arm@nongnu.org > S: Odd Fixes > -F: hw/misc/pca955*.c > -F: include/hw/misc/pca955*.h > +F: hw/gpio/pca955*.c > +F: include/hw/gpio/pca955*.h > > virtex_ml507 > M: Edgar E. Iglesias > diff --git a/include/hw/misc/pca9552.h b/include/hw/gpio/pca9552.h > similarity index 100% > rename from include/hw/misc/pca9552.h > rename to include/hw/gpio/pca9552.h > diff --git a/include/hw/misc/pca9552_regs.h > b/include/hw/gpio/pca9552_regs.h > similarity index 100% > rename from include/hw/misc/pca9552_regs.h > rename to include/hw/gpio/pca9552_regs.h > diff --git a/include/hw/misc/pca9554.h b/include/hw/gpio/pca9554.h > similarity index 100% > rename from include/hw/misc/pca9554.h > rename to include/hw/gpio/pca9554.h > diff --git a/include/hw/misc/pca9554_regs.h > b/include/hw/gpio/pca9554_regs.h > similarity index 100% > rename from include/hw/misc/pca9554_regs.h > rename to include/hw/gpio/pca9554_regs.h > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > index 729f66941462..badf6f6fa09d 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -18,7 +18,7 @@ > #include "hw/block/flash.h" > #include "hw/i2c/i2c_mux_pca954x.h" > #include "hw/i2c/smbus_eeprom.h" > -#include "hw/misc/pca9552.h" > +#include "hw/gpio/pca9552.h" > #include "hw/nvram/eeprom_at24c.h" > #include "hw/sensor/tmp105.h" > #include "hw/misc/led.h" > diff --git a/hw/misc/pca9552.c b/hw/gpio/pca9552.c > similarity index 99% > rename from hw/misc/pca9552.c > rename to hw/gpio/pca9552.c > index 2ae13af35e93..27d4db068095 100644 > --- a/hw/misc/pca9552.c > +++ b/hw/gpio/pca9552.c > @@ -15,8 +15,8 @@ > #include "qemu/module.h" > #include "qemu/bitops.h" > #include "hw/qdev-properties.h" > -#include "hw/misc/pca9552.h" > -#include "hw/misc/pca9552_regs.h" > +#include "hw/gpio/pca9552.h" > +#include "hw/gpio/pca9552_regs.h" > #include "hw/irq.h" > #include "migration/vmstate.h" > #include "qapi/error.h" > diff --git a/hw/misc/pca9554.c b/hw/gpio/pca9554.c > similarity index 99% > rename from hw/misc/pca9554.c > rename to hw/gpio/pca9554.c > index 5e31696797d9..7d10a64ba7c1 100644 > --- a/hw/misc/pca9554.c > +++ b/hw/gpio/pca9554.c > @@ -11,8 +11,8 @@ > #include "qemu/module.h" > #include "qemu/bitops.h" > #include "hw/qdev-properties.h" > -#include "hw/misc/pca9554.h" > -#include "hw/misc/pca9554_regs.h" > +#include "hw/gpio/pca9554.h" > +#include "hw/gpio/pca9554_regs.h" > #include "hw/irq.h" > #include "migration/vmstate.h" > #include "qapi/error.h" > diff --git a/tests/qtest/pca9552-test.c b/tests/qtest/pca9552-test.c > index ccca2b3d9140..747495769239 100644 > --- a/tests/qtest/pca9552-test.c > +++ b/tests/qtest/pca9552-test.c > @@ -12,7 +12,7 @@ > #include "libqtest.h" > #include "libqos/qgraph.h" > #include "libqos/i2c.h" > -#include "hw/misc/pca9552_regs.h" > +#include "hw/gpio/pca9552_regs.h" > > #define PCA9552_TEST_ID "pca9552-test" > #define PCA9552_TEST_ADDR 0x60 > diff --git a/tests/qtest/pnv-host-i2c-test.c b/tests/qtest/pnv-host- > i2c-test.c > index c6351772520c..7f64d597ac1d 100644 > --- a/tests/qtest/pnv-host-i2c-test.c > +++ b/tests/qtest/pnv-host-i2c-test.c > @@ -8,8 +8,8 @@ > */ > #include "qemu/osdep.h" > #include "libqtest.h" > -#include "hw/misc/pca9554_regs.h" > -#include "hw/misc/pca9552_regs.h" > +#include "hw/gpio/pca9554_regs.h" > +#include "hw/gpio/pca9552_regs.h" > #include "pnv-xscom.h" > > #define PPC_BIT(bit) (0x8000000000000000ULL >> (bit)) > diff --git a/hw/gpio/meson.build b/hw/gpio/meson.build > index 791e93a97bcc..a7495d196ae9 100644 > --- a/hw/gpio/meson.build > +++ b/hw/gpio/meson.build > @@ -2,6 +2,8 @@ system_ss.add(when: 'CONFIG_GPIO_KEY', if_true: > files('gpio_key.c')) > system_ss.add(when: 'CONFIG_GPIO_MPC8XXX', if_true: > files('mpc8xxx.c')) > system_ss.add(when: 'CONFIG_GPIO_PWR', if_true: files('gpio_pwr.c')) > system_ss.add(when: 'CONFIG_MAX7310', if_true: files('max7310.c')) > +system_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c')) > +system_ss.add(when: 'CONFIG_PCA9554', if_true: files('pca9554.c')) > system_ss.add(when: 'CONFIG_PL061', if_true: files('pl061.c')) > system_ss.add(when: 'CONFIG_ZAURUS', if_true: files('zaurus.c')) > > diff --git a/hw/gpio/trace-events b/hw/gpio/trace-events > index 9331f4289d5a..b91cc7e9a45d 100644 > --- a/hw/gpio/trace-events > +++ b/hw/gpio/trace-events > @@ -13,6 +13,10 @@ nrf51_gpio_write(uint64_t offset, uint64_t value) > "offset 0x%" PRIx64 " value 0x > nrf51_gpio_set(int64_t line, int64_t value) "line %" PRIi64 " value > %" PRIi64 > nrf51_gpio_update_output_irq(int64_t line, int64_t value) "line %" > PRIi64 " value %" PRIi64 > > +# pca9552.c > +pca955x_gpio_status(const char *description, const char *buf) "%s > GPIOs 0-15 [%s]" > +pca955x_gpio_change(const char *description, unsigned id, unsigned > prev_state, unsigned current_state) "%s GPIO id:%u status: %u -> %u" > + > # pl061.c > pl061_update(const char *id, uint32_t dir, uint32_t data, uint32_t > pullups, uint32_t floating) "%s GPIODIR 0x%x GPIODATA 0x%x pullups > 0x%x floating 0x%x" > pl061_set_output(const char *id, int gpio, int level) "%s setting > output %d to %d" > diff --git a/hw/misc/meson.build b/hw/misc/meson.build > index 8e1ddc00f9b2..dd6cf89a5449 100644 > --- a/hw/misc/meson.build > +++ b/hw/misc/meson.build > @@ -3,8 +3,6 @@ system_ss.add(when: 'CONFIG_EDU', if_true: > files('edu.c')) > system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: > files('vmcoreinfo.c')) > system_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: > files('debugexit.c')) > system_ss.add(when: 'CONFIG_ISA_TESTDEV', if_true: files('pc- > testdev.c')) > -system_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c')) > -system_ss.add(when: 'CONFIG_PCA9554', if_true: files('pca9554.c')) > system_ss.add(when: 'CONFIG_PCI_TESTDEV', if_true: files('pci- > testdev.c')) > system_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c')) > system_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: > files('empty_slot.c')) > diff --git a/hw/misc/trace-events b/hw/misc/trace-events > index 0374eb33ac52..4896001f35de 100644 > --- a/hw/misc/trace-events > +++ b/hw/misc/trace-events > @@ -340,10 +340,6 @@ grlib_apb_pnp_read(uint64_t addr, unsigned size, > uint32_t value) "APB PnP read a > led_set_intensity(const char *color, const char *desc, uint8_t > intensity_percent) "LED desc:'%s' color:%s intensity: %u%%" > led_change_intensity(const char *color, const char *desc, uint8_t > old_intensity_percent, uint8_t new_intensity_percent) "LED desc:'%s' > color:%s intensity %u%% -> %u%%" > > -# pca9552.c > -pca955x_gpio_status(const char *description, const char *buf) "%s > GPIOs 0-15 [%s]" > -pca955x_gpio_change(const char *description, unsigned id, unsigned > prev_state, unsigned current_state) "%s GPIO id:%u status: %u -> %u" > - > # bcm2835_cprman.c > bcm2835_cprman_read(uint64_t offset, uint64_t value) "offset:0x%" > PRIx64 " value:0x%" PRIx64 > bcm2835_cprman_write(uint64_t offset, uint64_t value) "offset:0x%" > PRIx64 " value:0x%" PRIx64