From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 1689FC432BE for ; Thu, 2 Sep 2021 08:16:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B9FEE60525 for ; Thu, 2 Sep 2021 08:16:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B9FEE60525 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=163.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:39944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLhu4-0003xM-Sy for qemu-devel@archiver.kernel.org; Thu, 02 Sep 2021 04:16:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLhsN-0001n6-JF; Thu, 02 Sep 2021 04:15:12 -0400 Received: from m12-16.163.com ([220.181.12.16]:52841) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLhsJ-0002jk-1E; Thu, 02 Sep 2021 04:15:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=/Uyc5 PzT8EKt6zmEc25VFAwVDkD1qIMpvvkUsu5fmg4=; b=HLEzstvFiv9lZvR+tM2BU Ax6pxpx0Xqc7IRSBymPbl9g6rvvMjZtzBW5gRxgft/s7PJ/2EFpRZZF8a3CE+eH2 t0w41iKZ83e4zw4fCf2m0/Gkq1W1ZnQSkqmNBy7Tvge5Kgd8+OQ6MsJp4F6ODMQV Nxq4jQO46lqBMzMr5IYqD8= Received: from lcm-VirtualBox.verisilicon.com (unknown [182.148.13.201]) by smtp12 (Coremail) with SMTP id EMCowABXMRDmhzBhan7BAQ--.86S7; Thu, 02 Sep 2021 16:14:45 +0800 (CST) From: chunming To: eric.auger@redhat.com, peter.maydell@linaro.org Subject: [PATCH v6 3/4] hw/arm/virt: Update SMMU v3 creation to support non PCI/PCIe device connection Date: Thu, 2 Sep 2021 16:14:28 +0800 Message-Id: <20210902081429.140293-4-chunming_li1234@163.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210902081429.140293-1-chunming_li1234@163.com> References: <20210902081429.140293-1-chunming_li1234@163.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: EMCowABXMRDmhzBhan7BAQ--.86S7 X-Coremail-Antispam: 1Uf129KBjvJXoW7WFyDCr1fWr4rKF4kKw1kuFg_yoW8Cw1xpF s5tFykGryY93W3Z392vF13u3WrGws2gw1UKr4xWrZ3Aw1Ut34UWr1kKa1YkFWUuF1kCF43 ZFn2gF47Wr17XrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07bsVbkUUUUU= X-Originating-IP: [182.148.13.201] X-CM-SenderInfo: xfkx0zplqjszjlrsjki6rwjhhfrp/1tbivxUCdlWBveQstQABsL Received-SPF: pass client-ip=220.181.12.16; envelope-from=chunming_li1234@163.com; helo=m12-16.163.com X-Spam_score_int: 1 X-Spam_score: 0.1 X-Spam_bar: / X-Spam_report: (0.1 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=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-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: renwei.liu@verisilicon.com, qemu-arm@nongnu.org, jianxian.wen@verisilicon.com, qemu-devel@nongnu.org, chunming Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: chunming . Add "smmuv3_sidmap" to set non PCI/PCIe devices SID value . Pass non PCI/PCIe devices SID value to SMMU v3 model creation Signed-off-by: chunming --- hw/arm/virt.c | 14 ++++++++++++++ include/hw/arm/virt.h | 1 + 2 files changed, 15 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 81eda46b0..9373d20e9 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -204,6 +204,9 @@ static const char *valid_cpus[] = { ARM_CPU_TYPE_NAME("max"), }; +static const uint16_t smmuv3_peri_sidmap[] = { +}; + static bool cpu_type_valid(const char *cpu) { int i; @@ -1244,6 +1247,15 @@ static void create_smmu(const VirtMachineState *vms, object_property_set_link(OBJECT(dev), "primary-bus", OBJECT(bus), &error_abort); + + qdev_prop_set_uint32(dev, "len-peri-sid-map", + ARRAY_SIZE(smmuv3_peri_sidmap)); + + for (i = 0; i < ARRAY_SIZE(smmuv3_peri_sidmap); i++) { + g_autofree char *propname = g_strdup_printf("peri-sid-map[%d]", i); + qdev_prop_set_uint16(dev, propname, smmuv3_peri_sidmap[i]); + } + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); for (i = 0; i < NUM_SMMU_IRQS; i++) { @@ -2762,6 +2774,8 @@ static void virt_instance_init(Object *obj) vms->irqmap = a15irqmap; + vms->peri_sidmap = smmuv3_peri_sidmap; + virt_flash_create(vms); vms->oem_id = g_strndup(ACPI_BUILD_APPNAME6, 6); diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 9661c4669..fb00118b3 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -167,6 +167,7 @@ struct VirtMachineState { PCIBus *bus; char *oem_id; char *oem_table_id; + const uint16_t *peri_sidmap; }; #define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM) -- 2.30.2