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 98D18C001E0 for ; Sat, 21 Oct 2023 20:35:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quIgN-0000OX-Vw; Sat, 21 Oct 2023 16:34:52 -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 1quIgL-0000Jk-Tu; Sat, 21 Oct 2023 16:34:50 -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 1quIgJ-0004Ax-8u; Sat, 21 Oct 2023 16:34:49 -0400 Received: from pps.filterd (m0353728.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39LJljlp004392; Sat, 21 Oct 2023 20:34:32 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=VmUagEeWIbe+i9tHMP3fQv1fUOsXaZTsuCQovSTToLU=; b=rCyV7wMO9xmMOSUW+pe3VktLw33EAkFVvvP3nluF04j8Ltvzin7s8IsnwiLJbYc3z1o6 Z68V1dDTkmh206kHtQ7dr36Q4znEEfn337zbTGriKColBSMW+zOIAVgYEz1QZmwFBpms MD/6xaExpBDb7i+YgGz0SCr0SNZriAdM3sGBw0KI9LuajekijrU5cmoouIbAydDzNDQw VN/yz+cvGrBZF+DlISgc5SPDgrHGwjnXgfPJPcZyThjBL002C0NSNHLCBljx6GpNuLeF ATDx9r3pEIb47+b8I34NIUH2PqPSDfG67KaS9pV5fbpG2K0jDeuj/+CmAdnjmfZVjw3U yQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3tvn400nqy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 21 Oct 2023 20:34:32 +0000 Received: from m0353728.ppops.net (m0353728.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 39LKYVFv012012; Sat, 21 Oct 2023 20:34:31 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3tvn400nqr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 21 Oct 2023 20:34:31 +0000 Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 39LKV2v5024179; Sat, 21 Oct 2023 20:34:30 GMT Received: from smtprelay07.wdc07v.mail.ibm.com ([172.16.1.74]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3tuc29d7g8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 21 Oct 2023 20:34:30 +0000 Received: from smtpav06.dal12v.mail.ibm.com (smtpav06.dal12v.mail.ibm.com [10.241.53.105]) by smtprelay07.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 39LKYTtt27853484 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 21 Oct 2023 20:34:29 GMT Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4F23958043; Sat, 21 Oct 2023 20:34:29 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DA4DE58055; Sat, 21 Oct 2023 20:34:27 +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:34:27 +0000 (GMT) Message-ID: <970f52af-6c63-4982-9211-9bc9465d4765@linux.ibm.com> Date: Sat, 21 Oct 2023 15:34:27 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 03/10] hw/fsi: Introduce IBM's cfam,fsi-slave Content-Language: en-US To: =?UTF-8?Q?Daniel_P=2E_Berrang=C3=A9?= Cc: qemu-devel@nongnu.org, clg@kaod.org, peter.maydell@linaro.org, andrew@aj.id.au, joel@jms.id.au, pbonzini@redhat.com, marcandre.lureau@redhat.com, thuth@redhat.com, philmd@linaro.org, lvivier@redhat.com, qemu-arm@nongnu.org References: <20231011151339.2782132-1-ninad@linux.ibm.com> <20231011151339.2782132-4-ninad@linux.ibm.com> From: Ninad Palsule In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: XrpN0DbrmfKZ8ogQn7FG3ibCIRz9M5oC X-Proofpoint-ORIG-GUID: RKAQt0VQ95zcMRB67q0HwE-LXF5udox9 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 spamscore=0 phishscore=0 clxscore=1015 impostorscore=0 mlxscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 bulkscore=0 adultscore=0 lowpriorityscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310170001 definitions=main-2310210189 Received-SPF: pass client-ip=148.163.156.1; envelope-from=ninad@linux.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_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 Daniel, On 10/19/23 03:26, Daniel P. Berrangé wrote: > On Wed, Oct 11, 2023 at 10:13:32AM -0500, Ninad Palsule wrote: >> This is a part of patchset where IBM's Flexible Service Interface is >> introduced. >> >> The Common FRU Access Macro (CFAM), an address space containing >> various "engines" that drive accesses on busses internal and external >> to the POWER chip. Examples include the SBEFIFO and I2C masters. The >> engines hang off of an internal Local Bus (LBUS) which is described >> by the CFAM configuration block. >> >> The FSI slave: The slave is the terminal point of the FSI bus for >> FSI symbols addressed to it. Slaves can be cascaded off of one >> another. The slave's configuration registers appear in address space >> of the CFAM to which it is attached. >> >> Signed-off-by: Andrew Jeffery >> Signed-off-by: Cédric Le Goater >> Signed-off-by: Ninad Palsule >> --- >> v2: >> - Incorporated Joel's review comments. >> v3: >> - Incorporated Thomas Huth's review comments. >> v5: >> - Incorporated review comments by Cedric. > >> +static void cfam_realize(DeviceState *dev, Error **errp) >> +{ >> + CFAMState *cfam = CFAM(dev); >> + FSISlaveState *slave = FSI_SLAVE(dev); >> + Error *err = NULL; >> + >> + /* Each slave has a 2MiB address space */ >> + memory_region_init_io(&cfam->mr, OBJECT(cfam), &cfam_unimplemented_ops, >> + cfam, TYPE_CFAM, 2 * 1024 * 1024); >> + address_space_init(&cfam->as, &cfam->mr, TYPE_CFAM); >> + >> + qbus_init(&cfam->lbus, sizeof(cfam->lbus), TYPE_FSI_LBUS, >> + DEVICE(cfam), NULL); >> + >> + lbus_create_device(&cfam->lbus, TYPE_SCRATCHPAD, 0); >> + >> + object_property_set_bool(OBJECT(&cfam->config), "realized", true, &err); >> + if (err) { >> + error_propagate(errp, err); >> + return; >> + } > object_property_set_bool returns false on error so this use of a local > Error object is redundant. > > if (!object_property_set_bool(..., &errp)) { > return; > } > > > If a local Error had been required though, this code should have instead > been using ERRP_GUARD - see include/qapi/error.h docs for illustration > for future work. Fixed as per your suggestion. > >> + qdev_set_parent_bus(DEVICE(&cfam->config), BUS(&cfam->lbus), &error_abort); >> + >> + object_property_set_bool(OBJECT(&cfam->lbus), "realized", true, &err); >> + if (err) { >> + error_propagate(errp, err); >> + return; >> + } > Likewise Fixed. Thanks for the review. Regards, Ninad > >> + >> + memory_region_add_subregion(&cfam->mr, 0, &cfam->config.iomem); >> + /* memory_region_add_subregion(&cfam->mr, 0x800, &cfam->lbus.peek.iomem); */ >> + memory_region_add_subregion(&cfam->mr, 0x800, &slave->iomem); >> + memory_region_add_subregion(&cfam->mr, 0xc00, &cfam->lbus.mr); >> +} >> + >> +static void cfam_init(Object *o) >> +{ >> + CFAMState *s = CFAM(o); >> + >> + object_initialize_child(o, TYPE_CFAM_CONFIG, &s->config, TYPE_CFAM_CONFIG); >> +} >> + >> +static void cfam_finalize(Object *o) >> +{ >> + CFAMState *s = CFAM(o); >> + >> + address_space_destroy(&s->as); >> +} >> + >> +static void cfam_class_init(ObjectClass *klass, void *data) >> +{ >> + DeviceClass *dc = DEVICE_CLASS(klass); >> + dc->bus_type = TYPE_FSI_BUS; >> + dc->realize = cfam_realize; >> +} >> + >> +static const TypeInfo cfam_info = { >> + .name = TYPE_CFAM, >> + .parent = TYPE_FSI_SLAVE, >> + .instance_init = cfam_init, >> + .instance_finalize = cfam_finalize, >> + .instance_size = sizeof(CFAMState), >> + .class_init = cfam_class_init, >> +}; >> + >> +static void cfam_register_types(void) >> +{ >> + type_register_static(&cfam_config_info); >> + type_register_static(&cfam_info); >> +} >> + >> +type_init(cfam_register_types); >> diff --git a/hw/fsi/fsi-slave.c b/hw/fsi/fsi-slave.c >> new file mode 100644 >> index 0000000000..127fdd8a4f >> --- /dev/null >> +++ b/hw/fsi/fsi-slave.c >> @@ -0,0 +1,96 @@ >> +/* >> + * SPDX-License-Identifier: GPL-2.0-or-later >> + * Copyright (C) 2023 IBM Corp. >> + * >> + * IBM Flexible Service Interface slave >> + */ >> + >> +#include "qemu/osdep.h" >> + >> +#include "qemu/bitops.h" >> +#include "qapi/error.h" >> +#include "qemu/log.h" >> +#include "trace.h" >> + >> +#include "hw/fsi/fsi-slave.h" >> + >> +#define TO_REG(x) ((x) >> 2) >> + >> +#define FSI_SMODE TO_REG(0x00) >> +#define FSI_SMODE_WSTART BE_BIT(0) >> +#define FSI_SMODE_AUX_EN BE_BIT(1) >> +#define FSI_SMODE_SLAVE_ID BE_GENMASK(6, 7) >> +#define FSI_SMODE_ECHO_DELAY BE_GENMASK(8, 11) >> +#define FSI_SMODE_SEND_DELAY BE_GENMASK(12, 15) >> +#define FSI_SMODE_LBUS_DIV BE_GENMASK(20, 23) >> +#define FSI_SMODE_BRIEF_LEFT BE_GENMASK(24, 27) >> +#define FSI_SMODE_BRIEF_RIGHT BE_GENMASK(28, 31) >> + >> +#define FSI_SDMA TO_REG(0x04) >> +#define FSI_SISC TO_REG(0x08) >> +#define FSI_SCISC TO_REG(0x08) >> +#define FSI_SISM TO_REG(0x0c) >> +#define FSI_SISS TO_REG(0x10) >> +#define FSI_SSISM TO_REG(0x10) >> +#define FSI_SCISM TO_REG(0x14) >> + >> +static uint64_t fsi_slave_read(void *opaque, hwaddr addr, unsigned size) >> +{ >> + FSISlaveState *s = FSI_SLAVE(opaque); >> + >> + trace_fsi_slave_read(addr, size); >> + >> + if (addr + size > sizeof(s->regs)) { >> + qemu_log_mask(LOG_GUEST_ERROR, >> + "%s: Out of bounds read: 0x%"HWADDR_PRIx" for %u\n", >> + __func__, addr, size); >> + return 0; >> + } >> + >> + return s->regs[TO_REG(addr)]; >> +} >> + >> +static void fsi_slave_write(void *opaque, hwaddr addr, uint64_t data, >> + unsigned size) >> +{ >> + FSISlaveState *s = FSI_SLAVE(opaque); >> + >> + trace_fsi_slave_write(addr, size, data); >> + >> + if (addr + size > sizeof(s->regs)) { >> + qemu_log_mask(LOG_GUEST_ERROR, >> + "%s: Out of bounds write: 0x%"HWADDR_PRIx" for %u\n", >> + __func__, addr, size); >> + return; >> + } >> + >> + s->regs[TO_REG(addr)] = data; >> +} >> + >> +static const struct MemoryRegionOps fsi_slave_ops = { >> + .read = fsi_slave_read, >> + .write = fsi_slave_write, >> + .endianness = DEVICE_BIG_ENDIAN, >> +}; >> + >> +static void fsi_slave_init(Object *o) >> +{ >> + FSISlaveState *s = FSI_SLAVE(o); >> + >> + memory_region_init_io(&s->iomem, OBJECT(s), &fsi_slave_ops, >> + s, TYPE_FSI_SLAVE, 0x400); >> +} >> + >> +static const TypeInfo fsi_slave_info = { >> + .name = TYPE_FSI_SLAVE, >> + .parent = TYPE_DEVICE, >> + .instance_init = fsi_slave_init, >> + .instance_size = sizeof(FSISlaveState), >> +}; >> + >> +static void fsi_slave_register_types(void) >> +{ >> + type_register_static(&fsi_slave_info); >> +} >> + >> +type_init(fsi_slave_register_types); >> diff --git a/hw/fsi/Kconfig b/hw/fsi/Kconfig >> index f7c7fd1b28..8d712e77ed 100644 >> --- a/hw/fsi/Kconfig >> +++ b/hw/fsi/Kconfig >> @@ -1,3 +1,12 @@ >> +config FSI_CFAM >> + bool >> + select FSI >> + select FSI_SCRATCHPAD >> + select FSI_LBUS >> + >> +config FSI >> + bool >> + >> config FSI_SCRATCHPAD >> bool >> select FSI_LBUS >> diff --git a/hw/fsi/meson.build b/hw/fsi/meson.build >> index d45a98c223..a9e7cd4099 100644 >> --- a/hw/fsi/meson.build >> +++ b/hw/fsi/meson.build >> @@ -1,2 +1,4 @@ >> system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) >> system_ss.add(when: 'CONFIG_FSI_SCRATCHPAD', if_true: files('engine-scratchpad.c')) >> +system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) >> +system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi-slave.c')) >> diff --git a/hw/fsi/trace-events b/hw/fsi/trace-events >> index 97fd070354..752a5683a0 100644 >> --- a/hw/fsi/trace-events >> +++ b/hw/fsi/trace-events >> @@ -1,2 +1,9 @@ >> scratchpad_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" >> scratchpad_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 >> +cfam_config_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" >> +cfam_config_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 >> +cfam_unimplemented_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" >> +cfam_unimplemented_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 >> +cfam_config_write_noaddr(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 >> +fsi_slave_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" >> +fsi_slave_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 >> -- >> 2.39.2 >> > With regards, > Daniel