Received: by 2002:a17:906:fc07:b0:9bd:85f7:2662 with SMTP id ov7csp2114284ejb; Tue, 24 Oct 2023 08:06:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHCifu/iJJp4irv1iOp0Si3KAq9VmEB3DbL8nJZl5sCMvh+6UwXbSO2cV0+ovNTQSOe7mJr X-Received: by 2002:a67:e101:0:b0:452:d9d4:a056 with SMTP id d1-20020a67e101000000b00452d9d4a056mr10885250vsl.26.1698159968096; Tue, 24 Oct 2023 08:06:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698159968; cv=none; d=google.com; s=arc-20160816; b=Kb41maNmuCTmdPqDF82csZJ0iblMgw9Jb7i4dwHnNne+kxZNiyqUK6r2B2BNkp+PbR 2rvkjp2SdwsTnug8o41JioSBf9jdQ2G6f53DmagcVFYdFeGhQQB6zYijO6vstBn3XUI4 zPT1v35X+SPZJzCMldcT/l7TMGiY8DyW+X6nhncsnya5LvkxBkqEDSlNa6FCXlayxgjy hf5dpXJyLngqWgC+D7Ti1D4GdJeAe/TLyob4u5JcK/L42QQEEUlpd5TfIhuqnPg2Bh1K seOT05G/ijs8X8S4l7I6M2O6SwnBtp0bCw61i3qgttadlKg9GZkTuwEC4OQ+uL6YhBCr 4oNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :in-reply-to:from:content-language:references:cc:to:subject :user-agent:mime-version:date:message-id:dkim-signature; bh=+TxjDYff8mKhVwHLIWE8MjqCOpVdQE+q9vdCiowe0OM=; fh=HTHR+Q2d6bLhEl37Oh4T8uXQP5/6sUv4T2u8Op+j0Ns=; b=KK2uXE2btA6rU+Po/A9Z/RlrS1ORHWsDXF4rtkzmYUBDNyLQY2oQZ+U/aD4WpFbHCW AoaBj3Nie+dmFRNqCrfDsLIuEhrnWpX144CQK0C3mAMn39vPogugj4FaqyhcQ4qaGesf 7gNdR5TmVzqJEfknYNZALZVKsw11Vojeu4+EWQkPT93vJQ4pnyXyCH+EFMG5+TtDW3q+ iWdrksanuM4jIvRSUkg+Rg39wxnwTZJetXRED2g1v0n/6NUfDMUOYgoiSVMX2N0T9pay 4SAKFrUYSoFjda8lRANfCNFObMFyBWLfPmL87othxfeSKBv5K592q542h6A44csd0LUE Nq3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=jCKjL0Uv; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y9-20020a67e8c9000000b00452ef1f9287si927135vsn.459.2023.10.24.08.06.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Oct 2023 08:06:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=jCKjL0Uv; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvIyV-00020p-Bp; Tue, 24 Oct 2023 11:05:43 -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 1qvIyT-00020S-Br; Tue, 24 Oct 2023 11:05:41 -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 1qvIyQ-0008Vk-3z; Tue, 24 Oct 2023 11:05:41 -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 39OF0Oow027159; Tue, 24 Oct 2023 15:05:19 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=+TxjDYff8mKhVwHLIWE8MjqCOpVdQE+q9vdCiowe0OM=; b=jCKjL0UvsEW0vCkwYnsR3Ro2+JLuGAritkKJOJg6AdK1anqMg0GHFkzAurTmFkYLM1bJ crb7tpYaoAcwimD0Ax6rXH15LXX4JoyeKFmZswzvC6a5w2+Y2YlmSlEWDzcFPqnieYQT JANX61IGVdrJ8llZ0Yll4GVUTp3soyh3ddXx89EJ59ZLZWRwgyXiVGvNPZcZw7Z4ebW4 SrJJX8ExcQARLBGgAKQp/YMuwopTD9UWzsb1sgOR7uhdReczCH8KCGRLj72gMm3lub3Z Oms3s3B5fxyEgSS2uegq8AHRALoO+R0+CDFnqNhbj2dotFCg1L5mL9sYvcwKxxwLx+MO Fg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3txg2g0p1v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Oct 2023 15:05:17 +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 39OF10t6000516; Tue, 24 Oct 2023 15:05:17 GMT Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3txg2g0ntr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Oct 2023 15:05:16 +0000 Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 39ODM1ka023834; Tue, 24 Oct 2023 15:00:48 GMT Received: from smtprelay05.dal12v.mail.ibm.com ([172.16.1.7]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 3tvryt0dkj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Oct 2023 15:00:48 +0000 Received: from smtpav02.wdc07v.mail.ibm.com (smtpav02.wdc07v.mail.ibm.com [10.39.53.229]) by smtprelay05.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 39OF0mYG13894246 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Oct 2023 15:00:48 GMT Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id ED5EE5805E; Tue, 24 Oct 2023 15:00:47 +0000 (GMT) Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0AB7D58067; Tue, 24 Oct 2023 15:00:47 +0000 (GMT) Received: from [9.24.12.86] (unknown [9.24.12.86]) by smtpav02.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 24 Oct 2023 15:00:46 +0000 (GMT) Message-ID: <1b83521d-4885-490e-b8d7-1d760de5c173@linux.ibm.com> Date: Tue, 24 Oct 2023 10:00:46 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v6 06/10] hw/fsi: Aspeed APB2OPB interface 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: <20231021211720.3571082-1-ninad@linux.ibm.com> <20231021211720.3571082-7-ninad@linux.ibm.com> Content-Language: en-US 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-ORIG-GUID: EXZz0vEMA3VlPIjcguIFguclluDFdMF2 X-Proofpoint-GUID: 026oargGVM4_W07gkCPh_qOBUvc08cNX 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-24_15,2023-10-24_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 malwarescore=0 suspectscore=0 priorityscore=1501 impostorscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 mlxscore=0 bulkscore=0 phishscore=0 mlxlogscore=930 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310170001 definitions=main-2310240129 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-arm@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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: CBm64uRU+fjw Hello Cedric, On 10/24/23 02:46, Cédric Le Goater wrote: > On 10/21/23 23:17, Ninad Palsule wrote: >> This is a part of patchset where IBM's Flexible Service Interface is >> introduced. >> >> An APB-to-OPB bridge enabling access to the OPB from the ARM core in >> the AST2600. Hardware limitations prevent the OPB from being directly >> mapped into APB, so all accesses are indirect through the bridge. >> >> Signed-off-by: Andrew Jeffery >> Signed-off-by: Ninad Palsule >> --- >> v2: >> - Incorporated review comments by Joel >> v3: >> - Incorporated review comments by Thomas Huth >> v4: >>    - Compile FSI with ASPEED_SOC only. >> v5: >> - Incorporated review comments by Cedric. >> v6: >> - Incorporated review comments by Cedric. >> --- >>   include/hw/fsi/aspeed-apb2opb.h |  33 ++++ >>   hw/fsi/aspeed-apb2opb.c         | 280 ++++++++++++++++++++++++++++++++ >>   hw/arm/Kconfig                  |   1 + >>   hw/fsi/Kconfig                  |   4 + >>   hw/fsi/meson.build              |   1 + >>   hw/fsi/trace-events             |   2 + >>   6 files changed, 321 insertions(+) >>   create mode 100644 include/hw/fsi/aspeed-apb2opb.h >>   create mode 100644 hw/fsi/aspeed-apb2opb.c >> >> diff --git a/include/hw/fsi/aspeed-apb2opb.h >> b/include/hw/fsi/aspeed-apb2opb.h >> new file mode 100644 >> index 0000000000..a81ae67023 >> --- /dev/null >> +++ b/include/hw/fsi/aspeed-apb2opb.h >> @@ -0,0 +1,33 @@ >> +/* >> + * SPDX-License-Identifier: GPL-2.0-or-later >> + * Copyright (C) 2023 IBM Corp. >> + * >> + * ASPEED APB2OPB Bridge >> + */ >> +#ifndef FSI_ASPEED_APB2OPB_H >> +#define FSI_ASPEED_APB2OPB_H >> + >> +#include "hw/sysbus.h" >> +#include "hw/fsi/opb.h" >> + >> +#define TYPE_ASPEED_APB2OPB "aspeed.apb2opb" >> +OBJECT_DECLARE_SIMPLE_TYPE(AspeedAPB2OPBState, ASPEED_APB2OPB) >> + >> +#define ASPEED_APB2OPB_NR_REGS ((0xe8 >> 2) + 1) >> + >> +#define ASPEED_FSI_NUM 2 >> + >> +typedef struct AspeedAPB2OPBState { >> +    /*< private >*/ >> +    SysBusDevice parent_obj; >> + >> +    /*< public >*/ >> +    MemoryRegion iomem; >> + >> +    uint32_t regs[ASPEED_APB2OPB_NR_REGS]; >> +    qemu_irq irq; >> + >> +    OPBus opb[ASPEED_FSI_NUM]; >> +} AspeedAPB2OPBState; >> + >> +#endif /* FSI_ASPEED_APB2OPB_H */ >> diff --git a/hw/fsi/aspeed-apb2opb.c b/hw/fsi/aspeed-apb2opb.c >> new file mode 100644 >> index 0000000000..6f97a6bc7d >> --- /dev/null >> +++ b/hw/fsi/aspeed-apb2opb.c >> @@ -0,0 +1,280 @@ >> +/* >> + * SPDX-License-Identifier: GPL-2.0-or-later >> + * Copyright (C) 2023 IBM Corp. >> + * >> + * ASPEED APB-OPB FSI interface >> + */ >> + >> +#include "qemu/osdep.h" >> +#include "qemu/log.h" >> +#include "qom/object.h" >> +#include "qapi/error.h" >> +#include "trace.h" >> + >> +#include "hw/fsi/aspeed-apb2opb.h" >> +#include "hw/qdev-core.h" >> + >> +#define TO_REG(x) (x >> 2) >> +#define GENMASK(t, b) (((1ULL << ((t) + 1)) - 1) & ~((1ULL << (b)) - >> 1)) >> + >> +#define APB2OPB_VERSION                    TO_REG(0x00) >> +#define   APB2OPB_VERSION_VER              GENMASK(7, 0) >> + >> +#define APB2OPB_TRIGGER                    TO_REG(0x04) >> +#define   APB2OPB_TRIGGER_EN               BIT(0) >> + >> +#define APB2OPB_CONTROL                    TO_REG(0x08) >> +#define   APB2OPB_CONTROL_OFF              GENMASK(31, 13) >> + >> +#define APB2OPB_OPB2FSI                    TO_REG(0x0c) >> +#define   APB2OPB_OPB2FSI_OFF              GENMASK(31, 22) >> + >> +#define APB2OPB_OPB0_SEL                   TO_REG(0x10) >> +#define APB2OPB_OPB1_SEL                   TO_REG(0x28) >> +#define   APB2OPB_OPB_SEL_EN               BIT(0) >> + >> +#define APB2OPB_OPB0_MODE                  TO_REG(0x14) >> +#define APB2OPB_OPB1_MODE                  TO_REG(0x2c) >> +#define   APB2OPB_OPB_MODE_RD              BIT(0) >> + >> +#define APB2OPB_OPB0_XFER                  TO_REG(0x18) >> +#define APB2OPB_OPB1_XFER                  TO_REG(0x30) >> +#define   APB2OPB_OPB_XFER_FULL            BIT(1) >> +#define   APB2OPB_OPB_XFER_HALF            BIT(0) >> + >> +#define APB2OPB_OPB0_ADDR                  TO_REG(0x1c) >> +#define APB2OPB_OPB0_WRITE_DATA            TO_REG(0x20) >> + >> +#define APB2OPB_OPB1_ADDR                  TO_REG(0x34) >> +#define APB2OPB_OPB1_WRITE_DATA                  TO_REG(0x38) >> + >> +#define APB2OPB_IRQ_STS                    TO_REG(0x48) >> +#define   APB2OPB_IRQ_STS_OPB1_TX_ACK      BIT(17) >> +#define   APB2OPB_IRQ_STS_OPB0_TX_ACK      BIT(16) >> + >> +#define APB2OPB_OPB0_WRITE_WORD_ENDIAN     TO_REG(0x4c) >> +#define   APB2OPB_OPB0_WRITE_WORD_ENDIAN_BE 0x0011101b >> +#define APB2OPB_OPB0_WRITE_BYTE_ENDIAN     TO_REG(0x50) >> +#define   APB2OPB_OPB0_WRITE_BYTE_ENDIAN_BE 0x0c330f3f >> +#define APB2OPB_OPB1_WRITE_WORD_ENDIAN     TO_REG(0x54) >> +#define APB2OPB_OPB1_WRITE_BYTE_ENDIAN     TO_REG(0x58) >> +#define APB2OPB_OPB0_READ_BYTE_ENDIAN      TO_REG(0x5c) >> +#define APB2OPB_OPB1_READ_BYTE_ENDIAN      TO_REG(0x60) >> +#define   APB2OPB_OPB0_READ_WORD_ENDIAN_BE  0x00030b1b >> + >> +#define APB2OPB_OPB0_READ_DATA         TO_REG(0x84) >> +#define APB2OPB_OPB1_READ_DATA         TO_REG(0x90) >> + >> +/* >> + * The following magic values came from AST2600 data sheet >> + * The register values are defined under section "FSI controller" >> + * as initial values. >> + */ >> +static const uint32_t aspeed_apb2opb_reset[ASPEED_APB2OPB_NR_REGS] = { >> +     [APB2OPB_VERSION]                = 0x000000a1, >> +     [APB2OPB_OPB0_WRITE_WORD_ENDIAN] = 0x0044eee4, >> +     [APB2OPB_OPB0_WRITE_BYTE_ENDIAN] = 0x0055aaff, >> +     [APB2OPB_OPB1_WRITE_WORD_ENDIAN] = 0x00117717, >> +     [APB2OPB_OPB1_WRITE_BYTE_ENDIAN] = 0xffaa5500, >> +     [APB2OPB_OPB0_READ_BYTE_ENDIAN]  = 0x0044eee4, >> +     [APB2OPB_OPB1_READ_BYTE_ENDIAN]  = 0x00117717 >> +}; >> + >> +static uint64_t fsi_aspeed_apb2opb_read(void *opaque, hwaddr addr, >> +                                        unsigned size) >> +{ >> +    AspeedAPB2OPBState *s = ASPEED_APB2OPB(opaque); >> + >> +    trace_fsi_aspeed_apb2opb_read(addr, size); >> + >> +    if (addr + size > sizeof(s->regs)) { > > > hmm, the parameter 'size' is a memop transaction size not an address > offset. OK, Changed it to validate the register (index) instead of addr + size. > >> +        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_aspeed_apb2opb_write(void *opaque, hwaddr addr, >> uint64_t data, >> +                                     unsigned size) >> +{ >> +    AspeedAPB2OPBState *s = ASPEED_APB2OPB(opaque); >> + >> +    trace_fsi_aspeed_apb2opb_write(addr, size, data); >> + >> +    if (addr + size > sizeof(s->regs)) { > > same comment. Fixed it same as above. > > >> +        qemu_log_mask(LOG_GUEST_ERROR, >> +                      "%s: Out of bounds write: %"HWADDR_PRIx" for >> %u\n", >> +                      __func__, addr, size); >> +        return; >> +    } >> + >> +    switch (TO_REG(addr)) { >> +    case APB2OPB_CONTROL: >> +        fsi_opb_fsi_master_address(&s->opb[0], data & >> APB2OPB_CONTROL_OFF); > > fsi_opb_fsi_master_address() should statically defined in this file We have separation of OPB bus implementation and APB2OPB interface. If we move this function here then we will be exposing OPB implementation here. > >> +        break; >> +    case APB2OPB_OPB2FSI: >> +        fsi_opb_opb2fsi_address(&s->opb[0], data & >> APB2OPB_OPB2FSI_OFF); > > > same for fsi_opb_opb2fsi_address() Same as above. > >> +        break; >> +    case APB2OPB_OPB0_WRITE_WORD_ENDIAN: >> +        if (data != APB2OPB_OPB0_WRITE_WORD_ENDIAN_BE) { >> +            qemu_log_mask(LOG_GUEST_ERROR, >> +                          "%s: Bridge needs to be driven as BE >> (0x%x)\n", >> +                          __func__, APB2OPB_OPB0_WRITE_WORD_ENDIAN_BE); >> +        } >> +        break; >> +    case APB2OPB_OPB0_WRITE_BYTE_ENDIAN: >> +        if (data != APB2OPB_OPB0_WRITE_BYTE_ENDIAN_BE) { >> +            qemu_log_mask(LOG_GUEST_ERROR, >> +                          "%s: Bridge needs to be driven as BE >> (0x%x)\n", >> +                          __func__, APB2OPB_OPB0_WRITE_BYTE_ENDIAN_BE); >> +        } >> +        break; >> +    case APB2OPB_OPB0_READ_BYTE_ENDIAN: >> +        if (data != APB2OPB_OPB0_READ_WORD_ENDIAN_BE) { >> +            qemu_log_mask(LOG_GUEST_ERROR, >> +                          "%s: Bridge needs to be driven as BE >> (0x%x)\n", >> +                          __func__, APB2OPB_OPB0_READ_WORD_ENDIAN_BE); >> +        } >> +        break; >> +    case APB2OPB_TRIGGER: >> +    { >> +        uint32_t opb, op_mode, op_size, op_addr, op_data; >> + >> +        assert((s->regs[APB2OPB_OPB0_SEL] & APB2OPB_OPB_SEL_EN) ^ >> +               (s->regs[APB2OPB_OPB1_SEL] & APB2OPB_OPB_SEL_EN)); >> + >> +        if (s->regs[APB2OPB_OPB0_SEL] & APB2OPB_OPB_SEL_EN) { >> +            opb = 0; >> +            op_mode = s->regs[APB2OPB_OPB0_MODE]; >> +            op_size = s->regs[APB2OPB_OPB0_XFER]; >> +            op_addr = s->regs[APB2OPB_OPB0_ADDR]; >> +            op_data = s->regs[APB2OPB_OPB0_WRITE_DATA]; >> +        } else if (s->regs[APB2OPB_OPB1_SEL] & APB2OPB_OPB_SEL_EN) { >> +            opb = 1; >> +            op_mode = s->regs[APB2OPB_OPB1_MODE]; >> +            op_size = s->regs[APB2OPB_OPB1_XFER]; >> +            op_addr = s->regs[APB2OPB_OPB1_ADDR]; >> +            op_data = s->regs[APB2OPB_OPB1_WRITE_DATA]; >> +        } else { >> +            qemu_log_mask(LOG_GUEST_ERROR, >> +                          "%s: Invalid operation: 0x%"HWADDR_PRIx" >> for %u\n", >> +                          __func__, addr, size); >> +            return; >> +        } >> + >> +        if (op_size & ~(APB2OPB_OPB_XFER_HALF | >> APB2OPB_OPB_XFER_FULL)) { >> +            qemu_log_mask(LOG_GUEST_ERROR, >> +                          "OPB transaction failed: Unrecognised >> access width: %d\n", > > Unrecognized Fixed > >> +                          op_size); >> +            return; >> +        } >> + >> +        op_size += 1; >> + >> +        if (op_mode & APB2OPB_OPB_MODE_RD) { >> +            int index = opb ? APB2OPB_OPB1_READ_DATA >> +                : APB2OPB_OPB0_READ_DATA; >> + >> +            switch (op_size) { >> +            case 1: >> +                s->regs[index] = fsi_opb_read8(&s->opb[opb], op_addr); >> +                break; >> +            case 2: >> +                s->regs[index] = fsi_opb_read16(&s->opb[opb], op_addr); >> +                break; >> +            case 4: >> +                s->regs[index] = fsi_opb_read32(&s->opb[opb], op_addr); >> +                break; >> +            default: >> +                qemu_log_mask(LOG_GUEST_ERROR, >> +                              "%s: Size not supported: %u\n", >> +                              __func__, size); > > this should use op_size and not size and seems redudant with > the unrecognized test above. true, Keeping it in case bits meaning change in future. > > >> +                return; >> +            } >> +        } else { >> +            /* FIXME: Endian swizzling */ >> +            switch (op_size) { >> +            case 1: >> +                fsi_opb_write8(&s->opb[opb], op_addr, op_data); >> +                break; >> +            case 2: >> +                fsi_opb_write16(&s->opb[opb], op_addr, op_data); >> +                break; >> +            case 4: >> +                fsi_opb_write32(&s->opb[opb], op_addr, op_data); >> +                break; >> +            default: >> +                qemu_log_mask(LOG_GUEST_ERROR, >> +                              "%s: Size not supported: %u\n", >> +                              __func__, op_size); >> +                return; >> +            } >> +        } > > > The above is equivalent to : > >         MemTxResult result; >         bool is_write = !(op_mode & APB2OPB_OPB_MODE_RD); >         int index = opb ? APB2OPB_OPB1_READ_DATA : > APB2OPB_OPB0_READ_DATA; >         AddressSpace *as = &s->opb[opb].as; > >         result = address_space_rw(as, op_addr, MEMTXATTRS_UNSPECIFIED, >                                   &op_data, op_size, is_write); >         if (result != MEMTX_OK) { >             qemu_log_mask(LOG_GUEST_ERROR, "%s: OPB %s failed @%08x\n", >                           __func__, is_write ? "write" : "read", > op_addr); >             return; >         } > >         if (!is_write) { >             s->regs[index] = op_data; >         } > > and the fsi_opb_* routines are useless to me. We are trying to keep the separation between OPB implementation and interface hence we have all those fsi_opb_*. I feel that we should keep as it is so that future extensions will be easier. Please let me know. > > > > >> +        s->regs[APB2OPB_IRQ_STS] |= opb ? APB2OPB_IRQ_STS_OPB1_TX_ACK >> +            : APB2OPB_IRQ_STS_OPB0_TX_ACK; >> +        break; >> +    } >> +    } >> + >> +    s->regs[TO_REG(addr)] = data; >> +} >> + >> +static const struct MemoryRegionOps aspeed_apb2opb_ops = { >> +    .read = fsi_aspeed_apb2opb_read, >> +    .write = fsi_aspeed_apb2opb_write, >> +    .valid.max_access_size = 4, >> +    .valid.min_access_size = 4, >> +    .impl.max_access_size = 4, >> +    .impl.min_access_size = 4, >> +    .endianness = DEVICE_LITTLE_ENDIAN, >> +}; >> + >> +static void fsi_aspeed_apb2opb_realize(DeviceState *dev, Error **errp) >> +{ >> +    SysBusDevice *sbd = SYS_BUS_DEVICE(dev); >> +    AspeedAPB2OPBState *s = ASPEED_APB2OPB(dev); >> + >> +    qbus_init(&s->opb[0], sizeof(s->opb[0]), TYPE_OP_BUS, >> +                        DEVICE(s), NULL); >> +    qbus_init(&s->opb[1], sizeof(s->opb[1]), TYPE_OP_BUS, >> +                        DEVICE(s), NULL); >> + >> +    sysbus_init_irq(sbd, &s->irq); >> + >> +    memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_apb2opb_ops, s, >> +                          TYPE_ASPEED_APB2OPB, 0x1000); >> +    sysbus_init_mmio(sbd, &s->iomem); >> +} >> + >> +static void fsi_aspeed_apb2opb_reset(DeviceState *dev) >> +{ >> +    AspeedAPB2OPBState *s = ASPEED_APB2OPB(dev); >> + >> +    memcpy(s->regs, aspeed_apb2opb_reset, ASPEED_APB2OPB_NR_REGS); >> +} >> + >> +static void fsi_aspeed_apb2opb_class_init(ObjectClass *klass, void >> *data) >> +{ >> +    DeviceClass *dc = DEVICE_CLASS(klass); >> + >> +    dc->desc = "ASPEED APB2OPB Bridge"; >> +    dc->realize = fsi_aspeed_apb2opb_realize; >> +    dc->reset = fsi_aspeed_apb2opb_reset; >> +} >> + >> +static const TypeInfo aspeed_apb2opb_info = { >> +    .name = TYPE_ASPEED_APB2OPB, >> +    .parent = TYPE_SYS_BUS_DEVICE, >> +    .instance_size = sizeof(AspeedAPB2OPBState), >> +    .class_init = fsi_aspeed_apb2opb_class_init, >> +}; >> + >> +static void aspeed_apb2opb_register_types(void) >> +{ >> +    type_register_static(&aspeed_apb2opb_info); >> +} >> + >> +type_init(aspeed_apb2opb_register_types); >> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig >> index 7e68348440..d963de74c9 100644 >> --- a/hw/arm/Kconfig >> +++ b/hw/arm/Kconfig >> @@ -555,6 +555,7 @@ config ASPEED_SOC >>       select LED >>       select PMBUS >>       select MAX31785 >> +    select FSI_APB2OPB_ASPEED >>     config MPS2 >>       bool >> diff --git a/hw/fsi/Kconfig b/hw/fsi/Kconfig >> index 0f6e6d331a..6bbcb8f6ca 100644 >> --- a/hw/fsi/Kconfig >> +++ b/hw/fsi/Kconfig >> @@ -1,3 +1,7 @@ >> +config FSI_APB2OPB_ASPEED >> +    bool >> +    select FSI_OPB >> + >>   config FSI_OPB >>       bool >>       select FSI_CFAM >> diff --git a/hw/fsi/meson.build b/hw/fsi/meson.build >> index 407b8c2775..1bc6bb63cc 100644 >> --- a/hw/fsi/meson.build >> +++ b/hw/fsi/meson.build >> @@ -3,3 +3,4 @@ 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.c','fsi-master.c','fsi-slave.c')) >>   system_ss.add(when: 'CONFIG_FSI_OPB', if_true: files('opb.c')) >> +system_ss.add(when: 'CONFIG_FSI_APB2OPB_ASPEED', if_true: >> files('aspeed-apb2opb.c')) >> diff --git a/hw/fsi/trace-events b/hw/fsi/trace-events >> index 13b211a815..9a45843eb6 100644 >> --- a/hw/fsi/trace-events >> +++ b/hw/fsi/trace-events >> @@ -17,3 +17,5 @@ fsi_opb_write16(uint64_t addr, uint32_t size) >> "@0x%" PRIx64 " size=%d" >>   fsi_opb_write32(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" >>   fsi_opb_unimplemented_read(uint64_t addr, uint32_t size) "@0x%" >> PRIx64 " size=%d" >>   fsi_opb_unimplemented_write(uint64_t addr, uint32_t size, uint64_t >> data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 >> +fsi_aspeed_apb2opb_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 >> " size=%d" >> +fsi_aspeed_apb2opb_write(uint64_t addr, uint32_t size, uint64_t >> data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 >