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 ED0E3C001E0 for ; Sat, 21 Oct 2023 20:22:08 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quITG-0003AA-6K; Sat, 21 Oct 2023 16:21:18 -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 1quITE-00039p-95; Sat, 21 Oct 2023 16:21:16 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1quITA-0001Xx-3d; Sat, 21 Oct 2023 16:21:16 -0400 Received: from pps.filterd (m0353722.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39LKEChQ032124; Sat, 21 Oct 2023 20:20:55 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=4sAvrTAaASQA0LbzEoJt67TBdrmhShrMCin2Y88ziZ4=; b=ElzDufhOulyQZJrs61g0k/CvYsLnIMJv3wyPsPac9lnSH2OsGz9iU+Pw0rMe2/UsebTW uAL9ALjH/VlTh8uIR5s7y6N7sCS/7FxyIsB7puG11JPqS/n24uw1I/9Onr4jf8LE+6CF 8jn+9aEPKJbe+jEnPwYFCd/ne6MciqHtcDJcjqeHUdj3cQTurVttFk6XW1C+aoJ/Fxl4 7wChly8Q2+AhRn2iu6aiVlQUrzGHQytr+4QndjbQowYhxtws3wKD86Gw5CBqdxSWLvBf zz0dNh2eosW14JA1LXAoUYdQYjR19CJ1D3yJ2nxvyfaHz38v1Cgzwuiik6LQinskuaGq fw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3tvngfr3jh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 21 Oct 2023 20:20:54 +0000 Received: from m0353722.ppops.net (m0353722.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 39LKHpV2006925; Sat, 21 Oct 2023 20:20:54 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 3tvngfr3hx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 21 Oct 2023 20:20:54 +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 39LH3dON029802; Sat, 21 Oct 2023 20:20:53 GMT Received: from smtprelay06.dal12v.mail.ibm.com ([172.16.1.8]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3tuc47w54a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 21 Oct 2023 20:20:53 +0000 Received: from smtpav06.dal12v.mail.ibm.com (smtpav06.dal12v.mail.ibm.com [10.241.53.105]) by smtprelay06.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 39LKKquK25232104 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 21 Oct 2023 20:20:52 GMT Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8CC9258055; Sat, 21 Oct 2023 20:20:52 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2061A58043; Sat, 21 Oct 2023 20:20:51 +0000 (GMT) Received: from [9.67.95.215] (unknown [9.67.95.215]) by smtpav06.dal12v.mail.ibm.com (Postfix) with ESMTP; Sat, 21 Oct 2023 20:20:51 +0000 (GMT) Message-ID: <24becaf5-b34f-4cf1-acf4-33a9405c1c5e@linux.ibm.com> Date: Sat, 21 Oct 2023 15:20:50 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 01/10] hw/fsi: Introduce IBM's Local bus To: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= , qemu-devel@nongnu.org, peter.maydell@linaro.org, andrew@aj.id.au, joel@jms.id.au, pbonzini@redhat.com, marcandre.lureau@redhat.com, berrange@redhat.com, thuth@redhat.com, philmd@linaro.org, lvivier@redhat.com Cc: qemu-arm@nongnu.org References: <20231011151339.2782132-1-ninad@linux.ibm.com> <20231011151339.2782132-2-ninad@linux.ibm.com> <99d8e47e-ef22-4f0b-bae5-750a2d1b6970@kaod.org> Content-Language: en-US From: Ninad Palsule In-Reply-To: <99d8e47e-ef22-4f0b-bae5-750a2d1b6970@kaod.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: nwKQ4Y50qEqqN_VsQVxCIKUERnlaTjg3 X-Proofpoint-ORIG-GUID: MCxmEBumYUrEGFuR6TUYqKXIRUEa_aay X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-21_12,2023-10-19_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 adultscore=0 mlxlogscore=999 phishscore=0 lowpriorityscore=0 priorityscore=1501 malwarescore=0 suspectscore=0 spamscore=0 clxscore=1015 mlxscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310170001 definitions=main-2310210186 Received-SPF: pass client-ip=148.163.158.5; envelope-from=ninad@linux.ibm.com; helo=mx0b-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_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 Hello Cedric, On 10/19/23 03:03, Cédric Le Goater wrote: > On 10/11/23 17:13, Ninad Palsule wrote: >> This is a part of patchset where IBM's Flexible Service Interface is >> introduced. >> >> The LBUS is modelled to maintain the qdev bus hierarchy and to take >> advantage of the object model to automatically generate the CFAM >> configuration block. The configuration block presents engines in the >> order they are attached to the CFAM's LBUS. Engine implementations >> should subclass the LBusDevice and set the 'config' member of >> LBusDeviceClass to match the engine's type. >> >> Signed-off-by: Andrew Jeffery >> Signed-off-by: Cédric Le Goater >> Signed-off-by: Ninad Palsule >> --- >> v2: >> - Incorporated Joel's review comments. >> v5: >> - Incorporated review comments by Cedric. >> --- >>   include/hw/fsi/lbus.h | 51 +++++++++++++++++++++++++ >>   include/qemu/bitops.h |  6 +++ >>   hw/fsi/lbus.c         | 87 +++++++++++++++++++++++++++++++++++++++++++ >>   hw/Kconfig            |  1 + >>   hw/fsi/Kconfig        |  2 + >>   hw/fsi/meson.build    |  1 + >>   hw/meson.build        |  1 + >>   7 files changed, 149 insertions(+) >>   create mode 100644 include/hw/fsi/lbus.h >>   create mode 100644 hw/fsi/lbus.c >>   create mode 100644 hw/fsi/Kconfig >>   create mode 100644 hw/fsi/meson.build >> >> diff --git a/include/hw/fsi/lbus.h b/include/hw/fsi/lbus.h >> new file mode 100644 >> index 0000000000..408fe25831 >> --- /dev/null >> +++ b/include/hw/fsi/lbus.h >> @@ -0,0 +1,51 @@ >> +/* >> + * SPDX-License-Identifier: GPL-2.0-or-later >> + * Copyright (C) 2023 IBM Corp. >> + * >> + * IBM Local bus and connected device structures. >> + */ >> +#ifndef FSI_LBUS_H >> +#define FSI_LBUS_H >> + >> +#include "exec/memory.h" >> +#include "hw/qdev-core.h" >> + >> +#define TYPE_FSI_LBUS_DEVICE "fsi.lbus.device" >> +OBJECT_DECLARE_TYPE(FSILBusDevice, FSILBusDeviceClass, FSI_LBUS_DEVICE) >> + >> +#define FSI_LBUS_MEM_REGION_SIZE  (2 * 1024 * 1024) >> +#define FSI_LBUSDEV_IOMEM_SIZE    0x400 >> + >> +typedef struct FSILBusDevice { >> +    DeviceState parent; >> + >> +    MemoryRegion iomem; >> +    uint32_t address; >> +} FSILBusDevice; >> + >> +typedef struct FSILBusDeviceClass { >> +    DeviceClass parent; >> + >> +    uint32_t config; >> +} FSILBusDeviceClass; >> + >> +typedef struct FSILBusNode { >> +    FSILBusDevice *ldev; >> + >> +    QLIST_ENTRY(FSILBusNode) next; >> +} FSILBusNode; >> + >> +#define TYPE_FSI_LBUS "fsi.lbus" >> +OBJECT_DECLARE_SIMPLE_TYPE(FSILBus, FSI_LBUS) >> + >> +typedef struct FSILBus { >> +    BusState bus; >> + >> +    MemoryRegion mr; >> + >> +    QLIST_HEAD(, FSILBusNode) devices; >> +} FSILBus; >> + >> +DeviceState *lbus_create_device(FSILBus *bus, const char *type, >> uint32_t addr); >> +int lbus_add_device(FSILBus *bus, FSILBusDevice *dev); >> +#endif /* FSI_LBUS_H */ >> diff --git a/include/qemu/bitops.h b/include/qemu/bitops.h >> index cb3526d1f4..e12496f619 100644 >> --- a/include/qemu/bitops.h >> +++ b/include/qemu/bitops.h >> @@ -618,4 +618,10 @@ static inline uint64_t half_unshuffle64(uint64_t x) >>       return x; >>   } >>   +/* Bitwise operations at the word level. */ >> +#define BE_BIT(x)                          BIT(31 - (x)) >> +#define GENMASK(t, b) \ >> +    (((1ULL << ((t) + 1)) - 1) & ~((1ULL << (b)) - 1)) >> +#define BE_GENMASK(t, b)                   GENMASK(BE_BIT(t), >> BE_BIT(b)) >> + >>   #endif >> diff --git a/hw/fsi/lbus.c b/hw/fsi/lbus.c >> new file mode 100644 >> index 0000000000..d7117d1299 >> --- /dev/null >> +++ b/hw/fsi/lbus.c >> @@ -0,0 +1,87 @@ >> +/* >> + * SPDX-License-Identifier: GPL-2.0-or-later >> + * Copyright (C) 2023 IBM Corp. >> + * >> + * IBM Local bus where FSI slaves are connected >> + */ >> + >> +#include "qemu/osdep.h" >> +#include "qapi/error.h" >> +#include "hw/fsi/lbus.h" >> + >> +#include "hw/qdev-properties.h" >> + >> +static void lbus_realize(BusState *bus, Error **errp) >> +{ >> +    FSILBusNode *node; >> +    FSILBus *lbus = FSI_LBUS(bus); >> + >> +    memory_region_init(&lbus->mr, OBJECT(lbus), TYPE_FSI_LBUS, >> +                       FSI_LBUS_MEM_REGION_SIZE - >> FSI_LBUSDEV_IOMEM_SIZE); > > the region init should be done in an init handler (this to avoid the > realize > of the bus) Fixed. > >> + >> +    QLIST_FOREACH(node, &lbus->devices, next) { >> +        memory_region_add_subregion(&lbus->mr, node->ldev->address, >> + &node->ldev->iomem); > > This is redudant with what is done in cfam_realize() and please > remove this list, also redudant with the bus list. Removed the list and used the children. Removed the lbus_realize() function. Thanks for the review. ~Ninad > > Thanks, > > C. > >> +    } >> +} >> + >> +static void lbus_class_init(ObjectClass *klass, void *data) >> +{ >> +    BusClass *k = BUS_CLASS(klass); >> +    k->realize = lbus_realize; >> +} >> + >> +static const TypeInfo lbus_info = { >> +    .name = TYPE_FSI_LBUS, >> +    .parent = TYPE_BUS, >> +    .instance_size = sizeof(FSILBus), >> +    .class_init = lbus_class_init, >> +}; >> + >> +static Property lbus_device_props[] = { >> +    DEFINE_PROP_UINT32("address", FSILBusDevice, address, 0), >> +    DEFINE_PROP_END_OF_LIST(), >> +}; >> + >> +DeviceState *lbus_create_device(FSILBus *bus, const char *type, >> uint32_t addr) >> +{ >> +    DeviceState *dev; >> +    FSILBusNode *node; >> +    BusState *state = BUS(bus); >> + >> +    dev = qdev_new(type); >> +    qdev_prop_set_uint8(dev, "address", addr); >> +    qdev_realize_and_unref(dev, state, &error_fatal); >> + >> +    /* Move to post_load */ >> +    node = g_malloc(sizeof(struct FSILBusNode)); >> +    node->ldev = FSI_LBUS_DEVICE(dev); >> +    QLIST_INSERT_HEAD(&bus->devices, node, next); >> + >> +    return dev; >> +} >> + >> +static void lbus_device_class_init(ObjectClass *klass, void *data) >> +{ >> +    DeviceClass *dc = DEVICE_CLASS(klass); >> + >> +    dc->bus_type = TYPE_FSI_LBUS; >> +    device_class_set_props(dc, lbus_device_props); >> +} >> + >> +static const TypeInfo lbus_device_type_info = { >> +    .name = TYPE_FSI_LBUS_DEVICE, >> +    .parent = TYPE_DEVICE, >> +    .instance_size = sizeof(FSILBusDevice), >> +    .abstract = true, >> +    .class_init = lbus_device_class_init, >> +    .class_size = sizeof(FSILBusDeviceClass), >> +}; >> + >> +static void lbus_register_types(void) >> +{ >> +    type_register_static(&lbus_info); >> +    type_register_static(&lbus_device_type_info); >> +} >> + >> +type_init(lbus_register_types); >> diff --git a/hw/Kconfig b/hw/Kconfig >> index ba62ff6417..2ccb73add5 100644 >> --- a/hw/Kconfig >> +++ b/hw/Kconfig >> @@ -9,6 +9,7 @@ source core/Kconfig >>   source cxl/Kconfig >>   source display/Kconfig >>   source dma/Kconfig >> +source fsi/Kconfig >>   source gpio/Kconfig >>   source hyperv/Kconfig >>   source i2c/Kconfig >> diff --git a/hw/fsi/Kconfig b/hw/fsi/Kconfig >> new file mode 100644 >> index 0000000000..e650c660f0 >> --- /dev/null >> +++ b/hw/fsi/Kconfig >> @@ -0,0 +1,2 @@ >> +config FSI_LBUS >> +    bool >> diff --git a/hw/fsi/meson.build b/hw/fsi/meson.build >> new file mode 100644 >> index 0000000000..4074d3a7d2 >> --- /dev/null >> +++ b/hw/fsi/meson.build >> @@ -0,0 +1 @@ >> +system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) >> diff --git a/hw/meson.build b/hw/meson.build >> index c7ac7d3d75..6c71ee9cfa 100644 >> --- a/hw/meson.build >> +++ b/hw/meson.build >> @@ -43,6 +43,7 @@ subdir('virtio') >>   subdir('watchdog') >>   subdir('xen') >>   subdir('xenpv') >> +subdir('fsi') >>     subdir('alpha') >>   subdir('arm') >