From patchwork Thu Apr 1 13:40:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 12178997 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59E72C433B4 for ; Thu, 1 Apr 2021 18:08:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 348C461055 for ; Thu, 1 Apr 2021 18:08:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237520AbhDASII (ORCPT ); Thu, 1 Apr 2021 14:08:08 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:24325 "EHLO esa3.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238240AbhDASFw (ORCPT ); Thu, 1 Apr 2021 14:05:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1617300352; x=1648836352; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=0SeBD2Y4EIDEzVjauu5Tq/X7Zekyln9hjSnMOQ5+Ddg=; b=EHyb+9YbVOmmBmQz2Nl7B900f3D/8rF+XAdVrp40NKimzO44QWpxlvEy JaF6t8oXMYyi1ETUobEruujxhchp6K8zuuOD4G/jU8areel50AzI4OPD4 pyCG6ffCfuY8TLOLhC8/RFA1Q0PlsSXRvB7vCCvqEUgHk+yh5pHVx6Yxv MCdCE6SKMbpm0ypQE17B5AOr0sLSIV5IBN0snZPIdKTdQHZAf6emDtOBz csxifyIuwkgTNPO0boJkD8fUQUn+9QX5ts7xqgPwKs+kXmfVm0fX5jJrS qLMl/0QXttvlsJzmtjSW7A+0tbrJWC20Q1O7YO0iR2mIwXpzgZcRL9K7+ g==; IronPort-SDR: dCehat/k93JBX5riByOGxG3FVVXlMVDO/TbtzT8VdtV20zvosDVYN67Z4KX+GWZzLSz+qHYLc/ XV2SJwOn9Cx95hvt/2XxvO8WnGScsvlwDB+yPIUXqf/pbAH2vTOp9YbUNjZQflvNwqYBpljcBU MHuGo29Q7Sv7F9mFrbL87wAPjTh/15BiWcqvzuSt1mmo9tsYGmrTvVwYfYcKLBzBGA0cIbI8o4 MG0BrxEz7rG2Q8qEPjPN+nzZIGU6DY5t6eI/rBRQPScXsHvA1lElT1m/UZ5xPfjN0obV66bc/4 rXY= X-IronPort-AV: E=Sophos;i="5.81,296,1610380800"; d="scan'208";a="168042037" Received: from mail-bn8nam11lp2172.outbound.protection.outlook.com (HELO NAM11-BN8-obe.outbound.protection.outlook.com) ([104.47.58.172]) by ob1.hgst.iphmx.com with ESMTP; 01 Apr 2021 21:42:49 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FvA8w8dxaUITn1pyKNoPEs+AYzti+OmcQw8Y2ixKYGdpgZ1eyYUF3OuOH8aZbKzyZmdVA4xbFBot4prsWldhyxlUZP9HzXdBeabIH4JnX55vpcr7/T9zM/aVDSfqG8Jsybgs2BaWOM0SLZ0UY3LjoBdAIsxNLOagQNa9P396+l3NwDj/QHmxddT4XPdR5JqslrGqMT6bF3bSNvAvtozavPSMlQQWq/QJE2YOvCl4oQTIrXgHVB//Ymksu+BOOvGE8VIo2uvY3eN1OG/lnO4p0GGivVMCTTP/hVTBWaJUsGFL6YdkhADbWxHK3k0h9s5nM/2x6COwDvIkcB9NQXec8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2x2MNJeX2oJncoPsvpTJoOBrfg1Zye8mM0D09q3fN+k=; b=lnGv+ZX9XZmeAZzJW/KUnoszB9fqjirZ1iDYBwMbOC9Ijlk3gxyUGfhTb/JWZX15YNSMWlt370GlIgY4Dab+6KXuv10Wmssw4VDcb4n30h3Y/mhUq4RP1g6Txg6tCP3h7A/JbrSTS31+cLZ2NzckSuiFr0v7euhjF1jU0V/JCUNN4rZWwOPt8knjJLr27u1wCWAGpzkByRU4V6/RVc8j81cdhkvdMLX1ZBROz2g+LOjqebZyDR12LLDFPLorX88Kgl9EtVKrSXNFBjWRAhobz1d6YDteyborlnEJVS2HAMwdAyPytk6MXjETwfE6QX6EGUeNbA+I9/B1lKm43JELCQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2x2MNJeX2oJncoPsvpTJoOBrfg1Zye8mM0D09q3fN+k=; b=tn0f7SO4rQNYKb/6O7fgoTo+VVj0a/qS9NFnDh9aKFNznq7KZsEnhwoOx8RDrxiHjIs+JCsGKUT4r875eOzmAOtvA/xd/hLGw8JHDyVC3u0kuHPybhz9dunMeN4+Cgc6whn+C+dh2CzAd0eEO2bHBbGYVfodMp2ERJf52zqrE2E= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=wdc.com; Received: from DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) by DM6PR04MB6493.namprd04.prod.outlook.com (2603:10b6:5:1bf::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.27; Thu, 1 Apr 2021 13:42:48 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868%7]) with mapi id 15.20.3977.033; Thu, 1 Apr 2021 13:42:48 +0000 From: Anup Patel To: Will Deacon Cc: Paolo Bonzini , Atish Patra , Alistair Francis , Anup Patel , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, Anup Patel Subject: [PATCH v7 8/8] riscv: Generate PCI host DT node Date: Thu, 1 Apr 2021 19:10:56 +0530 Message-Id: <20210401134056.384038-9-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210401134056.384038-1-anup.patel@wdc.com> References: <20210401134056.384038-1-anup.patel@wdc.com> X-Originating-IP: [122.179.112.210] X-ClientProxiedBy: MAXPR0101CA0019.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:c::29) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.179.112.210) by MAXPR0101CA0019.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:c::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.26 via Frontend Transport; Thu, 1 Apr 2021 13:42:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 22897db8-8b66-4c9b-b453-08d8f5140945 X-MS-TrafficTypeDiagnostic: DM6PR04MB6493: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vneUFBg8PcTx3sn7RgeXqgvc4+5tuki7t444k29MqMAXULkclf3b0rGC9Q/TWushy86jYgLx3jEsykdE92aFK0bHxKXRJdsiROpTndVYBtn4nxac5GWr0OTtGrYnNb7UE5b/Cq1Z0fLSN8ro45HcnZhgjsYbRsSSXSi/ci62iPS5dFSO4LOHrD3I4moxkYnLLULXyXpdwMBwFdGkMRnTLt4Z5JdkE14PDk8PivQOytwaUgUC4CCkmOguzUgaBZvqNE+o+tF2qxhAvZghagL56SP7l6/jY+k+NapjXsfdWCXUD4M4Q1FVxrCpRfokmiKLdQ6zUjCSqxwTRCkkztxwB+yvK7ZQ0l9zFHQ+YRzJoWdXtu4AyMRjSX2O0xOmF65b6ZRlClzzG+Hc4DIoCC3iTWots6eayQpitBM8NoM/LODAmxJbLj5aN3WTe+SmOemevF2hQ1KnZFgnVWJg3VQcGjj1rZck/+Jzc3vVrVUpctckz6b+tiS0EAALUHu0S30/IQjpauUh2/R1VNcKARz4MjkanK82+bco2TQR7uW7+NZureecSOI2xSIaURrgyoRQpO/rbGO8hzxZr7eKPM0h+T8LpdmEVtvQDvK/AeTFymMd0AlNYEdd2VTsUgDiZl0Gi6Hs6/DNX+r3ep+PQIPeYQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR04MB6201.namprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(396003)(39860400002)(376002)(346002)(136003)(478600001)(26005)(66476007)(186003)(16526019)(8886007)(6916009)(66556008)(8936002)(316002)(66946007)(8676002)(5660300002)(38100700001)(52116002)(7696005)(44832011)(956004)(2906002)(6666004)(54906003)(86362001)(55016002)(2616005)(4326008)(1076003)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: GhNFhgiAYqBMfaMpaHieRZcHOjxTTWCr+Td9/OaIVG5CHlHh6XJCJri6ZTtJ8LJuh20n1mamjbh80pIiRCPE+IKsb5z9EJjKgDyppDnMo6jypC00+6k9uHhf/WavW7KKqicONbkSFd+/DCpWObnKRyes8szzmPkt8t7WEY4k3dG2kd3uGgiZ3XnJ12kbQkW3rksmyVjAj+r3MNwjQOaNAtZz8wcoP5o6jHwUMVhbews48rMWK3ubOScJB8jttrmUZzLNw3grhrKGflKVsPK43yliodu2AZo+KgJCxuaHcLuzHUtsSQWz05BxTDcRAa7myzTfY0mroegHHRMXkHgjyigEPxiwXq8NfrJbAgKbQlvxoQCYTQ7gB8+6+GfB/YWRoLZVy/z8e3lHdvVGUo0WsuJIYRkA/elZnksbA++guqyQ9Sr8GSA8tHjkLHUv/4aW+tU6/Z+t3dCrCgMOZyqWt0hCafEEL0ilVZUH+uMNFDk3UzpcRN8dIDORs6wpYqDgg5968qV2XIkTC0SfwV30XO0U1Wzbjg64WBZGH4aEnoYjrikQ/opoQjgl/u5BSeP6vAh2WzdClaUwb674HbWTMRuSznJmar+QkBoZeG2pzMHgbeo15QGLI8awau0xockl6b6L+gBaQBazknR+Y/eqHX8Y9pM5dniIkLS8PFIuSdJ1VBPRQL+JTzr0te1UyPGTq6Un5qRlQR9QVRxRQq8C1mqMRT+GevYXzhKLB5P0jVeHvve9eKAw2wKOGESYvkazU/3ImiJ8okvPf82AHCkPJE/Rx7hpn7mWXaOrkSiCEBgpu7iDQhWyM7JeFI7pMREXIlQekuYK6jtO403D4T/ztLMdsbcPk9ssYC5n0n3thEPMcR6m/EYDQEaeKAn5glgvIsWZ3b4jLep0MAppPpjjmtYNMWrsQBkyehQplnAD/QoC/6sitU4LOEo2nfOHhIEYJVLhNcD5XMhI1vh/Eg28QEEQMHMpTa/XH/XbxTTQjO6k8s9OF/3W0lUdoCglbhgO6YeNtOiPLXaaJ68MeuMwGblm9gevqNVTkhi0CtvKoQNNWieKyjlKejnhNaACHcAVQmU0nUSajIV652DGWIJZMqWWseu+9el2HeJIFnl3LeXktRV0MxsljlEKM4gaTqkSzCQPpwMrta4yjhYr3qKvfNuqQGPJqvSiwu8D7V5k+XIH8/x+iaBLcp1omFSQpwacIGTZiqU2NmcRDFvOylgIUxQNqN2jEz6lIRvzgY79WZAK94W4/YBoSQqspBVLGbXHOyKW6Dhi6SzbFyIpcGn5vOeFIVLcCxLV9L44qzHBnrFRHL/VXZgG6kbybldaedwn X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22897db8-8b66-4c9b-b453-08d8f5140945 X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2021 13:42:48.0476 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: sWq1hie6ogrJay9UlQLaSnn8qJHpgTo+LwS4clr0ew4dVpU93dRYa67LIluCclpQxfkEg7TUZTZQuPeOUe9mgA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB6493 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This patch extends FDT generation to generate PCI host DT node. Of course, PCI host for Guest/VM is not useful at the moment because it's mostly for PCI pass-through and we don't have IOMMU and interrupt routing available for KVM RISC-V. In future, we might be able to use PCI host for VirtIO PCI transport or other software emulated PCI devices. Signed-off-by: Anup Patel --- Makefile | 1 + riscv/fdt.c | 3 + riscv/include/kvm/kvm-arch.h | 2 + riscv/pci.c | 109 +++++++++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+) create mode 100644 riscv/pci.c diff --git a/Makefile b/Makefile index e4e1184..6920d7f 100644 --- a/Makefile +++ b/Makefile @@ -204,6 +204,7 @@ ifeq ($(ARCH),riscv) OBJS += riscv/irq.o OBJS += riscv/kvm.o OBJS += riscv/kvm-cpu.o + OBJS += riscv/pci.o OBJS += riscv/plic.o ifeq ($(RISCV_XLEN),32) CFLAGS += -mabi=ilp32d -march=rv32gc diff --git a/riscv/fdt.c b/riscv/fdt.c index 6527ef7..de15bfe 100644 --- a/riscv/fdt.c +++ b/riscv/fdt.c @@ -167,6 +167,9 @@ static int setup_fdt(struct kvm *kvm) dev_hdr = device__next_dev(dev_hdr); } + /* PCI host controller */ + pci__generate_fdt_nodes(fdt); + _FDT(fdt_end_node(fdt)); if (fdt_stdout_path) { diff --git a/riscv/include/kvm/kvm-arch.h b/riscv/include/kvm/kvm-arch.h index 02825cd..d9a072e 100644 --- a/riscv/include/kvm/kvm-arch.h +++ b/riscv/include/kvm/kvm-arch.h @@ -80,4 +80,6 @@ void plic__generate_irq_prop(void *fdt, u8 irq, enum irq_type irq_type); void plic__irq_trig(struct kvm *kvm, int irq, int level, bool edge); +void pci__generate_fdt_nodes(void *fdt); + #endif /* KVM__KVM_ARCH_H */ diff --git a/riscv/pci.c b/riscv/pci.c new file mode 100644 index 0000000..666a452 --- /dev/null +++ b/riscv/pci.c @@ -0,0 +1,109 @@ +#include "kvm/devices.h" +#include "kvm/fdt.h" +#include "kvm/kvm.h" +#include "kvm/of_pci.h" +#include "kvm/pci.h" +#include "kvm/util.h" + +/* + * An entry in the interrupt-map table looks like: + * + */ + +struct of_interrupt_map_entry { + struct of_pci_irq_mask pci_irq_mask; + u32 plic_phandle; + u32 plic_irq; +} __attribute__((packed)); + +void pci__generate_fdt_nodes(void *fdt) +{ + struct device_header *dev_hdr; + struct of_interrupt_map_entry irq_map[OF_PCI_IRQ_MAP_MAX]; + unsigned nentries = 0; + /* Bus range */ + u32 bus_range[] = { cpu_to_fdt32(0), cpu_to_fdt32(1), }; + /* Configuration Space */ + u64 cfg_reg_prop[] = { cpu_to_fdt64(KVM_PCI_CFG_AREA), + cpu_to_fdt64(RISCV_PCI_CFG_SIZE), }; + /* Describe the memory ranges */ + struct of_pci_ranges_entry ranges[] = { + { + .pci_addr = { + .hi = cpu_to_fdt32(of_pci_b_ss(OF_PCI_SS_IO)), + .mid = 0, + .lo = 0, + }, + .cpu_addr = cpu_to_fdt64(KVM_IOPORT_AREA), + .length = cpu_to_fdt64(RISCV_IOPORT_SIZE), + }, + { + .pci_addr = { + .hi = cpu_to_fdt32(of_pci_b_ss(OF_PCI_SS_M32)), + .mid = cpu_to_fdt32(KVM_PCI_MMIO_AREA >> 32), + .lo = cpu_to_fdt32(KVM_PCI_MMIO_AREA), + }, + .cpu_addr = cpu_to_fdt64(KVM_PCI_MMIO_AREA), + .length = cpu_to_fdt64(RISCV_PCI_MMIO_SIZE), + }, + }; + + /* Boilerplate PCI properties */ + _FDT(fdt_begin_node(fdt, "pci")); + _FDT(fdt_property_string(fdt, "device_type", "pci")); + _FDT(fdt_property_cell(fdt, "#address-cells", 0x3)); + _FDT(fdt_property_cell(fdt, "#size-cells", 0x2)); + _FDT(fdt_property_cell(fdt, "#interrupt-cells", 0x1)); + _FDT(fdt_property_string(fdt, "compatible", "pci-host-cam-generic")); + _FDT(fdt_property(fdt, "dma-coherent", NULL, 0)); + + _FDT(fdt_property(fdt, "bus-range", bus_range, sizeof(bus_range))); + _FDT(fdt_property(fdt, "reg", &cfg_reg_prop, sizeof(cfg_reg_prop))); + _FDT(fdt_property(fdt, "ranges", ranges, sizeof(ranges))); + + /* Generate the interrupt map ... */ + dev_hdr = device__first_dev(DEVICE_BUS_PCI); + while (dev_hdr && nentries < ARRAY_SIZE(irq_map)) { + struct of_interrupt_map_entry *entry = &irq_map[nentries]; + struct pci_device_header *pci_hdr = dev_hdr->data; + u8 dev_num = dev_hdr->dev_num; + u8 pin = pci_hdr->irq_pin; + u8 irq = pci_hdr->irq_line; + + *entry = (struct of_interrupt_map_entry) { + .pci_irq_mask = { + .pci_addr = { + .hi = cpu_to_fdt32(of_pci_b_ddddd(dev_num)), + .mid = 0, + .lo = 0, + }, + .pci_pin = cpu_to_fdt32(pin), + }, + .plic_phandle = cpu_to_fdt32(PHANDLE_PLIC), + .plic_irq = cpu_to_fdt32(irq), + }; + + nentries++; + dev_hdr = device__next_dev(dev_hdr); + } + + _FDT(fdt_property(fdt, "interrupt-map", irq_map, + sizeof(struct of_interrupt_map_entry) * nentries)); + + /* ... and the corresponding mask. */ + if (nentries) { + struct of_pci_irq_mask irq_mask = { + .pci_addr = { + .hi = cpu_to_fdt32(of_pci_b_ddddd(-1)), + .mid = 0, + .lo = 0, + }, + .pci_pin = cpu_to_fdt32(7), + }; + + _FDT(fdt_property(fdt, "interrupt-map-mask", &irq_mask, + sizeof(irq_mask))); + } + + _FDT(fdt_end_node(fdt)); +}