From patchwork Tue Jun 25 11:27:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 167711 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp5437642ilk; Tue, 25 Jun 2019 04:38:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqx13mDpZrx9gYJaVyTyUHQ8q8/Ag/lc+ssXP/WIjp6Rs28xdgcHAku9RawHcHwnAJvmquB5 X-Received: by 2002:a17:906:158c:: with SMTP id k12mr25048747ejd.83.1561462705736; Tue, 25 Jun 2019 04:38:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561462705; cv=none; d=google.com; s=arc-20160816; b=dUQ7N/3hWE2xRZ1r4nGCoJ5P8ZX7HpyHfRDIokdFz9ZZP2IR/3f+MyWCtek8aN8ejE u9tIjNP5VVo8sFvhJFumo3K5JuASJtnfqAwxvUfQeN7tfYHH/2K2EJOmuPIa6c8DkZBk AEYInpU82WYzOSURagVLsZWrA6U24FihtMUTvjq+OzXK6Gwhl1Lkk2eVpqEp5vXpZDon gUcd0gaSwKA2XTANH90fDp6TpIaOhURi6m44R/bUYQyj+4N7cbfgCvJJUsaA3+LcD1Hh GDM9rfwzbGV7YGtOrs7N0pF6fcoSwI7/RqutOOpCvTEdzgqzB4IQfxbMvoDcQ+s08kWn OY4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=vny0JeLY8068lnZq3ri7O4TG7cP/R0bH/2O5Tk6SOxU=; b=acsBOiV9yoojny99x7P8yXzOmEv3yfRtqyeC+M0SQGhlrKo3CHgC9ZXK3qiHkYpucg FZAY6QOvmsHxxilet2AOpy8S2xmhFaBZtWGT+R8bJ7O7LnFhfNvoua4MdkSTJ+XX9Bcd CnoUxxHK8R42Mf8A+NRdjUnvz/rtuwU/bSBJHmuQeglelwcy/dLRQj7w0FTg24EhRrEE 46yBLN2W6G4lyOFhhKsJF5kcCxxRVutJI5eG5UFfYMES4ZFqEYpak13y15Up+9wKB0d8 ErNC+lzfrdoyGxOpbJfCemdPSWEg8Sc/d+v/XNw+4GIF3CuENYoMdem7J0G3qG+0dtJe KBHw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p2si150189ejf.202.2019.06.25.04.38.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Jun 2019 04:38:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:59064 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfjmK-0000VZ-P3 for patch@linaro.org; Tue, 25 Jun 2019 07:38:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53761) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfjdG-000775-Ma for qemu-devel@nongnu.org; Tue, 25 Jun 2019 07:29:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfjdF-0004Gi-31 for qemu-devel@nongnu.org; Tue, 25 Jun 2019 07:29:02 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:43142 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hfjdA-000472-LJ; Tue, 25 Jun 2019 07:28:57 -0400 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 46FF97BF38E2C0BCB813; Tue, 25 Jun 2019 19:28:53 +0800 (CST) Received: from lhrphicprd00229.huawei.com (10.123.41.22) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.439.0; Tue, 25 Jun 2019 19:28:44 +0800 From: Jonathan Cameron To: QEMU Developers Date: Tue, 25 Jun 2019 19:27:51 +0800 Message-ID: <20190625112752.83188-7-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190625112752.83188-1-Jonathan.Cameron@huawei.com> References: <20190625112752.83188-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.123.41.22] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 45.249.212.32 Subject: [Qemu-devel] [RFC PATCH 6/7] misc: CCIX endpoint function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , jcm@redhat.com, linuxarm@huawei.com, Auger Eric , qemu-arm , Jonathan Cameron Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This handles the case where a given function is not also a PCIe topology upstream or downstream port. This include, non function 0 functions on upstream ports and any function on a device without a PCIe switch. Note that this doesn't exclude the possibility of this being the upstream port of a CCIX layer switch. Signed-off-by: Jonathan Cameron --- hw/misc/Kconfig | 5 ++ hw/misc/Makefile.objs | 1 + hw/misc/ccix-ep.c | 112 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+) -- 2.20.1 diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 385e1b0cec..7aba167999 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -118,3 +118,8 @@ config AUX select I2C source macio/Kconfig + +config CCIX_EP + bool + select CCIX_LIB + \ No newline at end of file diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 77b9df9796..56a6cb3591 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -6,6 +6,7 @@ common-obj-$(CONFIG_ISA_DEBUG) += debugexit.o common-obj-$(CONFIG_SGA) += sga.o common-obj-$(CONFIG_ISA_TESTDEV) += pc-testdev.o common-obj-$(CONFIG_PCI_TESTDEV) += pci-testdev.o +common-obj-$(CONFIG_CCIX_EP) += ccix-ep.o common-obj-$(CONFIG_EDU) += edu.o common-obj-$(CONFIG_PCA9552) += pca9552.o diff --git a/hw/misc/ccix-ep.c b/hw/misc/ccix-ep.c new file mode 100644 index 0000000000..40a5b22dd8 --- /dev/null +++ b/hw/misc/ccix-ep.c @@ -0,0 +1,112 @@ +/* + * CCIX EP configuration space test device + * + * Copyright (c) 2019 Huawei + * Author: Jonathan Cameron + * + * Portions copied from pci-testdev.c + * Copyright (c) 2012 Red Hat Inc. + * Author: Michael S. Tsirkin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, see . + */ +#include "qemu/osdep.h" +#include "hw/hw.h" +#include "hw/pci/pci.h" +#include "qemu/event_notifier.h" +#include "sysemu/kvm.h" +#include "hw/misc/ccix.h" +#include "qemu/module.h" + +typedef struct CCIXEpState { + PCIDevice parent_obj; + struct CCIXState s; + +} CCIXEpState; + +#define TYPE_CCIX_EP "ccix-ep" +#define CCIX_EP_DEV(obj) OBJECT_CHECK(CCIXEpState, (obj), TYPE_CCIX_EP) + +static void ccix_ep_write_config(PCIDevice *pci_dev, uint32_t addr, + uint32_t val_in, int l) +{ + CCIXEpState *s = CCIX_EP_DEV(pci_dev); + + ccix_write_config(pci_dev, &s->s, addr, val_in, l); + pci_default_write_config(pci_dev, addr, val_in, l); +} + +static void ccix_ep_realize(PCIDevice *pci_dev, Error **errp) +{ + CCIXEpState *s = CCIX_EP_DEV(pci_dev); + int offset = PCI_CONFIG_SPACE_SIZE; + + if (PCI_FUNC(pci_dev->devfn) == 0) + ccix_set_port(&s->s); + initialize_ccixstate(&s->s, pci_dev); + pci_dev->config_write = ccix_ep_write_config; + pcie_endpoint_cap_init(pci_dev, 0); + offset = ccix_add_prldvsec(pci_dev, &s->s, offset); + if (s->s.flags & (1 << CCIX_IS_PORT)) + ccix_add_tdldvsec(pci_dev, offset); + + pci_dev->config[PCI_INTERRUPT_PIN] = 0; /* no interrupt pin */ + ccix_register(&s->s); +} + +static Property ccix_props[] = { + DEFINE_PROP_STRING("ccix_device", CCIXEpState, s.ccix_dev_name), + DEFINE_PROP_BIT("primaryport", CCIXEpState, s.flags, PRIMARY_PORT_BIT, true), + DEFINE_PROP_UINT8("port_id", CCIXEpState, s.port_id, 0), + DEFINE_PROP_UINT8("num_links", CCIXEpState, s.num_links, 1), + DEFINE_PROP_UINT8("psam_entries", CCIXEpState, s.psam_entries, 0), + DEFINE_PROP_UINT8("request_agents", CCIXEpState, s.num_ras, 0), + DEFINE_PROP_UINT8("home_agents", CCIXEpState, s.num_has, 0), + DEFINE_PROP_UINT8("hsam_entries", CCIXEpState, s.hsam_entries, 0), + DEFINE_PROP_UINT8("rsam_entries", CCIXEpState, s.rsam_entries, 0), + DEFINE_PROP_END_OF_LIST(), +}; + +static void ccix_ep_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + + k->realize = ccix_ep_realize; + k->vendor_id = PCI_VENDOR_ID_HUAWEI; + k->device_id = PCI_DEVICE_ID_HUAWEI_CCIX_EP; + k->revision = 0x00; + k->class_id = PCI_CLASS_OTHERS; + dc->desc = "CCIX EP Test Device"; + set_bit(DEVICE_CATEGORY_MISC, dc->categories); + dc->props = ccix_props; +} + +static const TypeInfo ccix_ep_info = { + .name = TYPE_CCIX_EP, + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(CCIXEpState), + .class_init = ccix_ep_class_init, + .interfaces = (InterfaceInfo[]) { + { INTERFACE_PCIE_DEVICE }, + { }, + }, +}; + +static void ccix_register_types(void) +{ + type_register_static(&ccix_ep_info); +} + +type_init(ccix_register_types)