From nobody Mon Nov 25 04:35:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1717630711; cv=none; d=zohomail.com; s=zohoarc; b=JZgor9MmNnLyr33tNyPmaPPVyFkyvQ6ulK0BE2wmrRaUD9mhsIoBApVPm1Ry8tgJFHU0SVgoWDINPr75LGNySPstCNJiigz1g4QYs4+6Fi1MFOYlHhtKTd+OSbwV9EQbbj6YGhJviWtdn5sVeqKqDzzYwquqgwhLB3lqKs2fZpo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717630711; h=Content-Type:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=I7oOBawQ17ekJGPjTeJH6qenvWsB1BSkAwbq0wuPpCg=; b=cWCsppKqVfBlol3b6OskDKQS2Z38yL52SRrWN5KDEyFJqPqnPCqKAZx66zO1+Kxs9W6PPGEZGZUJAMbvlnud/LR8otwipOG78YT01DN5CcvaGtcd98mnCPb4ONhmcyBUlVMLETNzyg6KEaiWQjbWilhdjG72nsOaWq/vFRWIwEo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1717630711904404.2747698013868; Wed, 5 Jun 2024 16:38:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sF0An-0003zP-LE; Wed, 05 Jun 2024 19:36:05 -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 1sF0Al-0003jN-TF for qemu-devel@nongnu.org; Wed, 05 Jun 2024 19:36:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sF0Ad-0005bc-8d for qemu-devel@nongnu.org; Wed, 05 Jun 2024 19:35:57 -0400 Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-626-Rk_BtKQnMSKZ3x2OcstPAg-1; Wed, 05 Jun 2024 19:35:49 -0400 Received: by mail-lf1-f71.google.com with SMTP id 2adb3069b0e04-52b998cb52eso210332e87.3 for ; Wed, 05 Jun 2024 16:35:49 -0700 (PDT) Received: from redhat.com ([2.55.56.67]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6c806eb641sm6591066b.111.2024.06.05.16.35.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 16:35:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717630554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=I7oOBawQ17ekJGPjTeJH6qenvWsB1BSkAwbq0wuPpCg=; b=LwnFSA+RaeLn0Zmjv9H2v8IXRq1ZXaSgtht1501WUAieNeAhdkoKdmMd9Y1NfKGEbssWOy MLxGD/NcMUhd/qsMwxSo8wjXOJsuyx1ryaaTsNkwF3j22tXamNT4ZR5CvUnIbQ8tXTLMqB u6FtpgprnaXYDV+4idYtmaBQjSO9SbU= X-MC-Unique: Rk_BtKQnMSKZ3x2OcstPAg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717630547; x=1718235347; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=I7oOBawQ17ekJGPjTeJH6qenvWsB1BSkAwbq0wuPpCg=; b=Z0rVxOo06tX7kJUjgkBJDn01Vdl6eng3dk30nblGGAxvgjdcF77YUEEslWaOoViSKg qfFdPd7Gk8PXfap29/f7qEDPnPymAdVLpy20XVFwOvWrtl2G0X2Q8Sb3iv5DNbxWFwyP GBfovuK8cJSmFSV54L7Tk4fXoiSR/5ndCciHnejyB3m/+2N8RL1g4G2r/mU/HlVr/0Cm ylozFaw+Wa4tAmroIinOWz4xvRjJsoQ7uGtavuMZwFmjcvX9BxBqJg2ubiO0iujj16EF Wi5U9dITP3jZIw2yyufvlFcClnqZW9gELy3LdQ+cTDQVb19FYyGTSpTs9Ncuk7mkUEZk 6Mqg== X-Gm-Message-State: AOJu0Yxs3GS92aIB46GsrMRel2K53MiCtirENd59mZ856srOkdL/4swS gyAv1VaIbyOW9XfMUmh8AXTGHyWHWklkrcL2/UPmTU7AaAfJDCuEajlU37j0xlVG6VHx7Ci2sqN OyTD/xvBHl4W+nLwbUFUvfokcxfbw9bwpRBLZbR5NUTGI9UQomGcP5xtcTPHGP9I/1aMvyo6CgA ZDdiRN8Db3poYwNfiMQCnrma8iYsEuHQ== X-Received: by 2002:ac2:4c92:0:b0:52b:84bd:344f with SMTP id 2adb3069b0e04-52bab4fa611mr2101390e87.53.1717630547263; Wed, 05 Jun 2024 16:35:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFFR/0LSCc+Uzk+dMIYa4HRFxxbYxU2HeYP4Q5/VGai6gbiuuWGPu/qGmHgIe/1CpJmmsC3xA== X-Received: by 2002:ac2:4c92:0:b0:52b:84bd:344f with SMTP id 2adb3069b0e04-52bab4fa611mr2101376e87.53.1717630546600; Wed, 05 Jun 2024 16:35:46 -0700 (PDT) Date: Wed, 5 Jun 2024 19:35:42 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Gregory Price , Gregory Price , Jonathan Cameron , Fan Ni Subject: [PULL v3 17/41] hw/cxl/mailbox: interface to add CCI commands to an existing CCI Message-ID: <7ef5a1800a2b2c0ec2207e32c8409f1214687d2a.1717630437.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1717630712282100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Gregory Price This enables wrapper devices to customize the base device's CCI (for example, with custom commands outside the specification) without the need to change the base device. The also enabled the base device to dispatch those commands without requiring additional driver support. Heavily edited by Jonathan Cameron to increase code reuse Signed-off-by: Gregory Price Signed-off-by: Jonathan Cameron Signed-off-by: Fan Ni Message-Id: <20240523174651.1089554-3-nifan.cxl@gmail.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/cxl/cxl_device.h | 2 ++ hw/cxl/cxl-mailbox-utils.c | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h index ccc4611875..a5f8e25020 100644 --- a/include/hw/cxl/cxl_device.h +++ b/include/hw/cxl/cxl_device.h @@ -301,6 +301,8 @@ void cxl_initialize_mailbox_t3(CXLCCI *cci, DeviceState= *d, size_t payload_max); void cxl_initialize_mailbox_swcci(CXLCCI *cci, DeviceState *intf, DeviceState *d, size_t payload_max); void cxl_init_cci(CXLCCI *cci, size_t payload_max); +void cxl_add_cci_commands(CXLCCI *cci, const struct cxl_cmd (*cxl_cmd_set)= [256], + size_t payload_max); int cxl_process_cci_message(CXLCCI *cci, uint8_t set, uint8_t cmd, size_t len_in, uint8_t *pl_in, size_t *len_out, uint8_t *pl_out, diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c index 2c9f50f0f9..2a64c58e2f 100644 --- a/hw/cxl/cxl-mailbox-utils.c +++ b/hw/cxl/cxl-mailbox-utils.c @@ -1424,9 +1424,9 @@ static void bg_timercb(void *opaque) } } =20 -void cxl_init_cci(CXLCCI *cci, size_t payload_max) +static void cxl_rebuild_cel(CXLCCI *cci) { - cci->payload_max =3D payload_max; + cci->cel_size =3D 0; /* Reset for a fresh build */ for (int set =3D 0; set < 256; set++) { for (int cmd =3D 0; cmd < 256; cmd++) { if (cci->cxl_cmd_set[set][cmd].handler) { @@ -1440,6 +1440,13 @@ void cxl_init_cci(CXLCCI *cci, size_t payload_max) } } } +} + +void cxl_init_cci(CXLCCI *cci, size_t payload_max) +{ + cci->payload_max =3D payload_max; + cxl_rebuild_cel(cci); + cci->bg.complete_pct =3D 0; cci->bg.starttime =3D 0; cci->bg.runtime =3D 0; @@ -1458,6 +1465,14 @@ static void cxl_copy_cci_commands(CXLCCI *cci, const= struct cxl_cmd (*cxl_cmds)[ } } =20 +void cxl_add_cci_commands(CXLCCI *cci, const struct cxl_cmd (*cxl_cmd_set)= [256], + size_t payload_max) +{ + cci->payload_max =3D MAX(payload_max, cci->payload_max); + cxl_copy_cci_commands(cci, cxl_cmd_set); + cxl_rebuild_cel(cci); +} + void cxl_initialize_mailbox_swcci(CXLCCI *cci, DeviceState *intf, DeviceState *d, size_t payload_max) { --=20 MST