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 09C28C4167B for ; Tue, 28 Nov 2023 22:32:00 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r86bk-0005zK-Ow; Tue, 28 Nov 2023 17:31:08 -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 1r86be-0005yU-MV; Tue, 28 Nov 2023 17:31:04 -0500 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 1r86bc-0004O5-6N; Tue, 28 Nov 2023 17:31:02 -0500 Received: from pps.filterd (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3ASMMcdP000643; Tue, 28 Nov 2023 22:30:40 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=QBNmz4ZFxpErUhPyr3JQX7CNI+klnH5iFDl6Uqq4t18=; b=aMSnE1K2jz6XBlxEFWOi8Ym2YYa9eq0yqRDhaz5ol9SzD3k3spmt2IbKAVGCT62Dy2JQ sw4xsSnD9LZ3UmjZwZ6o3uMM+c8b6Qf/Vp0mbbtcdeBaAGGqDEaYrkPrMGYOWU5rRgt0 oZ5plXlM/JhlzkQQyklShL0g8Vjw/gtIDhc2EqM2zLJ8whpagiLwhzsEmpNBLsc1/pDZ pn0Swh8UbD1fYGr3SVajy3vXlumx08M75RuEsCOpq7UyOAeCscy5BhwQFtIMeVEXGBqg 3AXFZovhtwO7OBX6wCWz2KeoJFzHg66zgfqACQmlxbqXRtfO1GbXIjmY9BibzxO5Bv5D jA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3unrxh05hb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Nov 2023 22:30:40 +0000 Received: from m0353727.ppops.net (m0353727.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3ASMOSuI004652; Tue, 28 Nov 2023 22:30:39 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 3unrxh05gx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Nov 2023 22:30:39 +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 3ASJqbNS028329; Tue, 28 Nov 2023 22:30:38 GMT Received: from smtprelay05.wdc07v.mail.ibm.com ([172.16.1.72]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3ukv8nk90a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Nov 2023 22:30:38 +0000 Received: from smtpav01.wdc07v.mail.ibm.com (smtpav01.wdc07v.mail.ibm.com [10.39.53.228]) by smtprelay05.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3ASMUbbZ16646838 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 28 Nov 2023 22:30:37 GMT Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A5BED5804B; Tue, 28 Nov 2023 22:30:37 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 00A525806D; Tue, 28 Nov 2023 22:30:35 +0000 (GMT) Received: from [9.67.87.213] (unknown [9.67.87.213]) by smtpav01.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 28 Nov 2023 22:30:34 +0000 (GMT) Message-ID: <47ef19e8-b1ea-4465-9df1-6ff58baede1a@linux.ibm.com> Date: Tue, 28 Nov 2023 16:30:34 -0600 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7 02/10] hw/fsi: Introduce IBM's scratchpad Content-Language: en-US To: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= , qemu-devel@nongnu.org, peter.maydell@linaro.org, andrew@codeconstruct.com.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, Andrew Jeffery References: <20231026164741.1184058-1-ninad@linux.ibm.com> <20231026164741.1184058-3-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: 5bAReKDIFLnyVQrfYHHqOruQV_zgqU3I X-Proofpoint-ORIG-GUID: a2ilc6g2RBbP4-GPO8yuxOgqSLtC_3ep X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-28_24,2023-11-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 spamscore=0 priorityscore=1501 impostorscore=0 adultscore=0 bulkscore=0 phishscore=0 clxscore=1015 mlxscore=0 mlxlogscore=999 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311280177 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, T_SCC_BODY_TEXT_LINE=-0.01 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 11/27/23 10:09, Cédric Le Goater wrote: > On 10/26/23 18:47, Ninad Palsule wrote: >> This is a part of patchset where scratchpad is introduced. >> >> The scratchpad provides a set of non-functional registers. The firmware >> is free to use them, hardware does not support any special management >> support. The scratchpad registers can be read or written from LBUS >> slave. >> >> In this model, The LBUS device is parent for the scratchpad. >> >> Signed-off-by: Andrew Jeffery >> Signed-off-by: Ninad Palsule >> --- >> v2: >> - Incorporated Joel's review comments. >> v5: >> - Incorporated review comments by Cedric. >> v6: >> - Incorporated review comments by Daniel. >> v7: >> - Incorporated review comments by Philippe. >> - Cleaned up unused bits. >> --- >>   meson.build                        |  1 + >>   hw/fsi/trace.h                     |  1 + >>   include/hw/fsi/engine-scratchpad.h | 27 +++++++++ >>   include/hw/fsi/fsi.h               | 16 +++++ >>   hw/fsi/engine-scratchpad.c         | 93 ++++++++++++++++++++++++++++++ >>   hw/fsi/Kconfig                     |  4 ++ >>   hw/fsi/meson.build                 |  1 + >>   hw/fsi/trace-events                |  2 + >>   8 files changed, 145 insertions(+) >>   create mode 100644 hw/fsi/trace.h >>   create mode 100644 include/hw/fsi/engine-scratchpad.h >>   create mode 100644 include/hw/fsi/fsi.h >>   create mode 100644 hw/fsi/engine-scratchpad.c >>   create mode 100644 hw/fsi/trace-events >> >> diff --git a/meson.build b/meson.build >> index dcef8b1e79..793c7c1f20 100644 >> --- a/meson.build >> +++ b/meson.build >> @@ -3257,6 +3257,7 @@ if have_system >>       'hw/char', >>       'hw/display', >>       'hw/dma', >> +    'hw/fsi', > > This should be introduced in the first patch. ok, Thanks for fixing it. > >>       'hw/hyperv', >>       'hw/i2c', >>       'hw/i386', >> diff --git a/hw/fsi/trace.h b/hw/fsi/trace.h >> new file mode 100644 >> index 0000000000..ee67c7fb04 >> --- /dev/null >> +++ b/hw/fsi/trace.h >> @@ -0,0 +1 @@ >> +#include "trace/trace-hw_fsi.h" >> diff --git a/include/hw/fsi/engine-scratchpad.h >> b/include/hw/fsi/engine-scratchpad.h >> new file mode 100644 >> index 0000000000..4ffa871965 >> --- /dev/null >> +++ b/include/hw/fsi/engine-scratchpad.h > > This model is introduced to early please drop from this patch. ok, Thanks for fixing it. We should update the commit message. I will send it. > >> @@ -0,0 +1,27 @@ >> +/* >> + * SPDX-License-Identifier: GPL-2.0-or-later >> + * Copyright (C) 2023 IBM Corp. >> + * >> + * IBM scratchpad engne >> + */ >> +#ifndef FSI_ENGINE_SCRATCHPAD_H >> +#define FSI_ENGINE_SCRATCHPAD_H >> + >> +#include "hw/fsi/lbus.h" >> +#include "hw/fsi/fsi.h" >> + >> +#define ENGINE_CONFIG_NEXT            BE_BIT(0) >> +#define ENGINE_CONFIG_TYPE_PEEK       (0x02 << 4) >> +#define ENGINE_CONFIG_TYPE_FSI        (0x03 << 4) >> +#define ENGINE_CONFIG_TYPE_SCRATCHPAD (0x06 << 4) >> + >> +#define TYPE_FSI_SCRATCHPAD "fsi.scratchpad" >> +#define SCRATCHPAD(obj) OBJECT_CHECK(FSIScratchPad, (obj), >> TYPE_FSI_SCRATCHPAD) >> + >> +typedef struct FSIScratchPad { >> +        FSILBusDevice parent; >> + >> +        uint32_t reg; >> +} FSIScratchPad; >> + >> +#endif /* FSI_ENGINE_SCRATCHPAD_H */ >> diff --git a/include/hw/fsi/fsi.h b/include/hw/fsi/fsi.h >> new file mode 100644 >> index 0000000000..b08b97f62b >> --- /dev/null >> +++ b/include/hw/fsi/fsi.h >> @@ -0,0 +1,16 @@ >> +/* >> + * SPDX-License-Identifier: GPL-2.0-or-later >> + * Copyright (C) 2023 IBM Corp. >> + * >> + * IBM Flexible Service Interface >> + */ >> +#ifndef FSI_FSI_H >> +#define FSI_FSI_H >> + >> +#include "qemu/bitops.h" >> + >> +/* Bitwise operations at the word level. */ >> +#define BE_BIT(x)           BIT(31 - (x)) > > 31 ? BITS_PER_LONG would be better I think. > >> +#define BE_GENMASK(hb, lb) MAKE_64BIT_MASK((lb), ((hb) - (lb) + 1)) >> + >> +#endif >> diff --git a/hw/fsi/engine-scratchpad.c b/hw/fsi/engine-scratchpad.c >> new file mode 100644 >> index 0000000000..a8887cd613 >> --- /dev/null >> +++ b/hw/fsi/engine-scratchpad.c > > DRop FSIScratchPad from this patch. It should be introduced later. > > However, TYPE_FSI_BUS should be introcuded now because the following > patch needs it. ok, The scratpad is a engine/device which is attached to the LBUS hence it was introduced early. But I am fine with the change. Thanks for the change. > > >> @@ -0,0 +1,93 @@ >> +/* >> + * SPDX-License-Identifier: GPL-2.0-or-later >> + * Copyright (C) 2023 IBM Corp. >> + * >> + * IBM scratchpad engine >> + */ >> + >> +#include "qemu/osdep.h" >> + >> +#include "qapi/error.h" >> +#include "qemu/log.h" >> +#include "trace.h" >> + >> +#include "hw/fsi/engine-scratchpad.h" >> + >> +static uint64_t fsi_scratchpad_read(void *opaque, hwaddr addr, >> unsigned size) >> +{ >> +    FSIScratchPad *s = SCRATCHPAD(opaque); >> + >> +    trace_fsi_scratchpad_read(addr, size); >> + >> +    if (addr) { >> +        return 0; >> +    } >> + >> +    return s->reg; >> +} >> + >> +static void fsi_scratchpad_write(void *opaque, hwaddr addr, uint64_t >> data, >> +                                 unsigned size) >> +{ >> +    FSIScratchPad *s = SCRATCHPAD(opaque); >> + >> +    trace_fsi_scratchpad_write(addr, size, data); >> + >> +    if (addr) { >> +        return; >> +    } >> + >> +    s->reg = data; >> +} >> + >> +static const struct MemoryRegionOps scratchpad_ops = { >> +    .read = fsi_scratchpad_read, >> +    .write = fsi_scratchpad_write, >> +    .endianness = DEVICE_BIG_ENDIAN, >> +}; >> + >> +static void fsi_scratchpad_realize(DeviceState *dev, Error **errp) >> +{ >> +    FSILBusDevice *ldev = FSI_LBUS_DEVICE(dev); >> + >> +    memory_region_init_io(&ldev->iomem, OBJECT(ldev), &scratchpad_ops, >> +                          ldev, TYPE_FSI_SCRATCHPAD, 0x400); >> +} >> + >> +static void fsi_scratchpad_reset(DeviceState *dev) >> +{ >> +    FSIScratchPad *s = SCRATCHPAD(dev); >> + >> +    s->reg = 0; >> +} >> + >> +static void fsi_scratchpad_class_init(ObjectClass *klass, void *data) >> +{ >> +    DeviceClass *dc = DEVICE_CLASS(klass); >> +    FSILBusDeviceClass *ldc = FSI_LBUS_DEVICE_CLASS(klass); >> + >> +    dc->realize = fsi_scratchpad_realize; >> +    dc->reset = fsi_scratchpad_reset; >> + >> +    ldc->config = >> +          ENGINE_CONFIG_NEXT            | /* valid */ >> +          0x00010000                    | /* slots */ >> +          0x00001000                    | /* version */ >> +          ENGINE_CONFIG_TYPE_SCRATCHPAD | /* type */ >> +          0x00000007;                     /* crc */ >> +} >> + >> +static const TypeInfo fsi_scratchpad_info = { >> +    .name = TYPE_FSI_SCRATCHPAD, >> +    .parent = TYPE_FSI_LBUS_DEVICE, >> +    .instance_size = sizeof(FSIScratchPad), >> +    .class_init = fsi_scratchpad_class_init, >> +    .class_size = sizeof(FSILBusDeviceClass), >> +}; >> + >> +static void fsi_scratchpad_register_types(void) >> +{ >> +    type_register_static(&fsi_scratchpad_info); >> +} >> + >> +type_init(fsi_scratchpad_register_types); >> diff --git a/hw/fsi/Kconfig b/hw/fsi/Kconfig >> index e650c660f0..f7c7fd1b28 100644 >> --- a/hw/fsi/Kconfig >> +++ b/hw/fsi/Kconfig >> @@ -1,2 +1,6 @@ >> +config FSI_SCRATCHPAD >> +    bool >> +    select FSI_LBUS >> + >>   config FSI_LBUS >>       bool > > > I am not sure we need all this config option. We will see that at the end > when the models are ready. OK Thanks for the review. Regards, Ninad > > > Thanks, > > C. > > > >> diff --git a/hw/fsi/meson.build b/hw/fsi/meson.build >> index 4074d3a7d2..d45a98c223 100644 >> --- a/hw/fsi/meson.build >> +++ b/hw/fsi/meson.build >> @@ -1 +1,2 @@ >>   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')) >> diff --git a/hw/fsi/trace-events b/hw/fsi/trace-events >> new file mode 100644 >> index 0000000000..c5753e2791 >> --- /dev/null >> +++ b/hw/fsi/trace-events >> @@ -0,0 +1,2 @@ >> +fsi_scratchpad_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " >> size=%d" >> +fsi_scratchpad_write(uint64_t addr, uint32_t size, uint64_t data) >> "@0x%" PRIx64 " size=%d value=0x%"PRIx64 >