From patchwork Tue Jun 25 11:27:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 167709 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp5434578ilk; Tue, 25 Jun 2019 04:35:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqyKReKW10yoZgkxUas7X/Z3cEiabWsOcws8dpofR/CIL5c9hxXbDzm+oArtn2jhzP4LeQE9 X-Received: by 2002:a50:9203:: with SMTP id i3mr153729903eda.302.1561462534917; Tue, 25 Jun 2019 04:35:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561462534; cv=none; d=google.com; s=arc-20160816; b=vwI0j7Z7S9i2KgeybAauj/jDr7bHTKcJkRyTkP6sVH2KHz4mxGv31RvVcWD+9wNvt7 WBGo6yeLBCBQttq3uUng+1Oai8JKc/sc0l2C6A2cYXkSqGVx8lyfUX08pwPy+jmCt9K+ KJeXwCGTEPsKlamzTybAQZOAbWXuUokDheV5R9XT208AYbNv6mcmESxKtpkt+0s/BD/v WSFax+WoopQtYtGIXsEwz3Ij8faiOAtsQ3wmHYjLiq7F8uRizyRA3Q4iiYupUh8o22LM CKQGJhIfIZmBLCNBQ00iyLPthavak8agHz/oRNs+RFww5lVYwxiPvpy1mGyBSrSSjmzs C4vA== 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=05cl7/W4z4ceUmzbYGffcWPbMb1dFWGCSz7UiMCwGrk=; b=ygprJd98jtfPvw13Ga+42D3p0Boi3oa0449Vua11Vmkr5c9mg7ZhigZ447YXhakGJa NqxKpkpPuOHi8PpTWfB+DlFVRSYlROv82Pb10E1wG84wxAinZiV6GdNKF5Itd0BcZCKs J6N2B033veRrPYtAwDwuxzUHDjcaQBeVOCyoyNBTYiSWMRwvX5Va7cq6vhfBVZfUECIo qb7qU9gAyjBWh7FC6Amdspg8rjXGPn2frAkWydGa9tORJm1WUn77lAOcQLf13KUjJ95k A/9rrq8Z+7lX+gEmoVPctLy/Ari2Ml2kzwYBm6vTmsMNRPlObj3G5wGc50E50a683+ka Wkvg== 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 v1si162845ejk.50.2019.06.25.04.35.34 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Jun 2019 04:35:34 -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]:59030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfjjZ-0005QO-TC for patch@linaro.org; Tue, 25 Jun 2019 07:35:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53682) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfjdC-0006xk-FN for qemu-devel@nongnu.org; Tue, 25 Jun 2019 07:29:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfjdA-0004A8-L3 for qemu-devel@nongnu.org; Tue, 25 Jun 2019 07:28:58 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:52884 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hfjd6-0003xB-Dt; Tue, 25 Jun 2019 07:28:53 -0400 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 4F9DDCE1D6C9A67333DF; Tue, 25 Jun 2019 19:28:48 +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:39 +0800 From: Jonathan Cameron To: QEMU Developers Date: Tue, 25 Jun 2019 19:27:49 +0800 Message-ID: <20190625112752.83188-5-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.35 Subject: [Qemu-devel] [RFC PATCH 4/7] pci-bridge: CCIX capable PCIE/CCIX switch upstream port. 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" Note that these occur as function 0 within CCIX devices that have many other elements in the PCIE topology. This driver has around 100 lines of code copied directly from the xio3130-upstream.c file. There are various options to avoid this: 1) Expose the xio3130 functions so this module can just call them. 2) Create a library for the code that is shared. 3) Don't worry too much about it as it's likely they will diverge overtime as we extend the CCIX driver. Signed-off-by: Jonathan Cameron --- hw/pci-bridge/Kconfig | 5 + hw/pci-bridge/Makefile.objs | 1 + hw/pci-bridge/ccix_upstream.c | 197 ++++++++++++++++++++++++++++++++++ 3 files changed, 203 insertions(+) -- 2.20.1 diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig index a51ec716f5..f6ff8975a5 100644 --- a/hw/pci-bridge/Kconfig +++ b/hw/pci-bridge/Kconfig @@ -27,3 +27,8 @@ config DEC_PCI config SIMBA bool + +config CCIX_SWITCH + default y if CCIX_EP + depends on PCI_EXPRESS && MSI_NONBROKEN + select CCIX_LIB diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs index 47065f87d9..e266e39fed 100644 --- a/hw/pci-bridge/Makefile.objs +++ b/hw/pci-bridge/Makefile.objs @@ -8,3 +8,4 @@ common-obj-$(CONFIG_I82801B11) += i82801b11.o common-obj-$(CONFIG_DEC_PCI) += dec.o # Sun4u common-obj-$(CONFIG_SIMBA) += simba.o +common-obj-$(CONFIG_CCIX_SWITCH) += ccix_upstream.o diff --git a/hw/pci-bridge/ccix_upstream.c b/hw/pci-bridge/ccix_upstream.c new file mode 100644 index 0000000000..f2b8441fba --- /dev/null +++ b/hw/pci-bridge/ccix_upstream.c @@ -0,0 +1,197 @@ +/* + * ccix_upstream.c + * CCIX / pci express upstream port switch + * + * Copyright (c) 2019 Jonathan Camerom + * Huawei + * Based on: xio3130_downstream.c + * Copyright (c) 2010 Isaku Yamahata + * VA Linux Systems Japan K.K. + * + * 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/pci/pci_ids.h" +#include "hw/pci/msi.h" +#include "hw/pci/pcie.h" +#include "hw/pci/pcie_port.h" +#include "hw/misc/ccix.h" +#include "qemu/module.h" + +/* + * As no CCIX devices have publically available specs, just use + * the xio3130 elements for the PCIe specific parts. + */ +#define XIO3130_REVISION 0x2 +#define XIO3130_MSI_OFFSET 0x70 +#define XIO3130_MSI_SUPPORTED_FLAGS PCI_MSI_FLAGS_64BIT +#define XIO3130_MSI_NR_VECTOR 1 +#define XIO3130_SSVID_OFFSET 0x80 +#define XIO3130_SSVID_SVID 0 +#define XIO3130_SSVID_SSID 0 +#define XIO3130_EXP_OFFSET 0x90 +#define XIO3130_AER_OFFSET 0x100 + +#define TYPE_CCIX_UP_PORT "ccix-upstream-port" + +#define CCIX_UP_DEV(obj) OBJECT_CHECK(CCIXUpPortState, (obj), TYPE_CCIX_UP_PORT) + +typedef struct CCIXUpPortState { + PCIEPort parent_obj; + struct CCIXState s; +} CCIXUpPortState; + +static void ccix_upstream_port_write_config(PCIDevice *d, uint32_t address, + uint32_t val, int len) +{ + CCIXUpPortState *s = CCIX_UP_DEV(d); + pci_bridge_write_config(d, address, val, len); + pcie_cap_flr_write_config(d, address, val, len); + pcie_aer_write_config(d, address, val, len); + ccix_write_config(d, &s->s, address, val, len); +} + +static void xio3130_upstream_reset(DeviceState *qdev) +{ + PCIDevice *d = PCI_DEVICE(qdev); + + pci_bridge_reset(qdev); + pcie_cap_deverr_reset(d); +} + +static void ccix_upstream_port_realize(PCIDevice *d, Error **errp) +{ + CCIXUpPortState *s = CCIX_UP_DEV(d); + PCIEPort *p = PCIE_PORT(d); + uint32_t offset = 0x180; + int rc; + + pci_bridge_initfn(d, TYPE_PCIE_BUS); + pcie_port_init_reg(d); + + rc = msi_init(d, XIO3130_MSI_OFFSET, XIO3130_MSI_NR_VECTOR, + XIO3130_MSI_SUPPORTED_FLAGS & PCI_MSI_FLAGS_64BIT, + XIO3130_MSI_SUPPORTED_FLAGS & PCI_MSI_FLAGS_MASKBIT, + errp); + if (rc < 0) { + assert(rc == -ENOTSUP); + goto err_bridge; + } + + rc = pci_bridge_ssvid_init(d, XIO3130_SSVID_OFFSET, + XIO3130_SSVID_SVID, XIO3130_SSVID_SSID, + errp); + if (rc < 0) { + goto err_bridge; + } + + rc = pcie_cap_init(d, XIO3130_EXP_OFFSET, PCI_EXP_TYPE_UPSTREAM, + p->port, errp); + if (rc < 0) { + goto err_msi; + } + pcie_cap_flr_init(d); + pcie_cap_deverr_init(d); + + rc = pcie_aer_init(d, PCI_ERR_VER, XIO3130_AER_OFFSET, + PCI_ERR_SIZEOF, errp); + if (rc < 0) { + goto err; + } + initialize_ccixstate(&s->s, d); + ccix_set_port(&s->s); + offset = ccix_add_prldvsec(d, &s->s, offset); + ccix_register(&s->s); + + return; + +err: + pcie_cap_exit(d); +err_msi: + msi_uninit(d); +err_bridge: + pci_bridge_exitfn(d); +} + +static Property ccix_props[] = { + DEFINE_PROP_STRING("ccix_device", CCIXUpPortState, s.ccix_dev_name), + DEFINE_PROP_BIT("primaryport", CCIXUpPortState, s.flags, PRIMARY_PORT_BIT, true), + DEFINE_PROP_UINT8("port_id", CCIXUpPortState, s.port_id, 0), + DEFINE_PROP_UINT8("num_links", CCIXUpPortState, s.num_links, 1), + DEFINE_PROP_UINT8("psam_entries", CCIXUpPortState, s.psam_entries, 0), + DEFINE_PROP_UINT8("request_agents", CCIXUpPortState, s.num_ras, 0), + DEFINE_PROP_UINT8("home_agents", CCIXUpPortState, s.num_has, 0), + DEFINE_PROP_UINT8("hsam_entries", CCIXUpPortState, s.hsam_entries, 0), + DEFINE_PROP_UINT8("rsam_entries", CCIXUpPortState, s.rsam_entries, 0), + DEFINE_PROP_END_OF_LIST(), +}; + +static void ccix_upstream_exitfn(PCIDevice *d) +{ + pcie_aer_exit(d); + pcie_cap_exit(d); + msi_uninit(d); + pci_bridge_exitfn(d); +} + +static const VMStateDescription vmstate_ccix_upstream = { + .name = "ccix-upstream-port", + .priority = MIG_PRI_PCI_BUS, + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_PCI_DEVICE(parent_obj.parent_obj, PCIEPort), + VMSTATE_STRUCT(parent_obj.parent_obj.exp.aer_log, PCIEPort, 0, + vmstate_pcie_aer_log, PCIEAERLog), + VMSTATE_END_OF_LIST() + } +}; + +static void ccix_upstream_port_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + + k->is_bridge = true; + k->config_write = ccix_upstream_port_write_config; + k->realize = ccix_upstream_port_realize; + k->exit = ccix_upstream_exitfn; + k->vendor_id = PCI_VENDOR_ID_HUAWEI; + k->device_id = PCI_DEVICE_ID_HUAWEI_CCIX_UP; + k->revision = 1; + set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); + dc->desc = "CCIX / PCIe switch upstream port"; + dc->props = ccix_props; + dc->reset = xio3130_upstream_reset; + dc->vmsd = &vmstate_ccix_upstream; +} + +static const TypeInfo ccix_upstream_port_info = { + .name = TYPE_CCIX_UP_PORT, + .parent = TYPE_PCIE_PORT, + .class_init = ccix_upstream_port_init, + .instance_size = sizeof(CCIXUpPortState), + .interfaces = (InterfaceInfo[]) { + { INTERFACE_PCIE_DEVICE }, + { } + }, +}; + +static void ccix_upstream_register_types(void) +{ + type_register_static(&ccix_upstream_port_info); +} + +type_init(ccix_upstream_register_types)