From patchwork Fri Jan 10 01:26:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Woods X-Patchwork-Id: 11326465 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BCA22109A for ; Fri, 10 Jan 2020 01:28:33 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 8D103206ED for ; Fri, 10 Jan 2020 01:28:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="Cme2gVnl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8D103206ED Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ipj5O-000706-5S; Fri, 10 Jan 2020 01:27:38 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ipj5N-0006zz-Lu for xen-devel@lists.xenproject.org; Fri, 10 Jan 2020 01:27:37 +0000 X-Inumbo-ID: 61cf63fe-3348-11ea-a985-bc764e2007e4 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (unknown [2a01:111:f400:7eab::602]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 61cf63fe-3348-11ea-a985-bc764e2007e4; Fri, 10 Jan 2020 01:27:36 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mXKJvQxxCqbK8EbGoG+9VeGhcMlqYtLrBkja6SybHXhEtk/Sb3Ph/lPx5qdiQmw+E8FX9DUsE1favFHUhqSiwrKz3d4TGbbIUUqZLWzUOtf+qRn/kALfqytIreYKUoNf06VBnS15HA6W4Yw++yWLR0QcBhgXhnRjdzl5EJIMNMS+WJVfjD1d79snwwLsE2lCS9Oy00JLOq/XqNQg0mJhhwgLTIqAocUyO3lRIktvYBcJGbVf3vPdq4TPvNR+x14u10Z+JAhNx6o7d2hPrdBvwYbjWlaBuzOkm3GZvx/aTCNm5Y1a+dyv5vFUVfEMtfTp+vtQf1qft/xInA1xv82G1A== 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=oz71xV+KibkgPZuZC862aT2iRj3a2M9vG0a647BO+Fg=; b=G+aVSjA+sEMW8sbETfzzBqAfYZH392phWBb14ISudDfpowymSWbq+GlQl0PhhI+EaMKDbxG0q/81uILM2ZJ2yygd/WXr26WTodOeR30blRrkvtTmW4M9WXc1dRSzsqEir1afY+Xe/2dc+wElcCJeK/7wlRIinWb1OUdMKDoa9HzVy0OEwP/xEPWmPpE4Mmi2JJ47EsqJ17Q4YNGFAuoN0lIcQqNdeCXKMTCD9z4gC5APM75UC+479EJsjR95VwloHcu61cktZ77KwiUw8PJl0omkSvqCeW5wG9QssKEaRDHhNHh/KUS2FZC7v4NIpwH6V4Kks14UbrQdD0VOhgC3Wg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.60.83) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=xilinx.com; dmarc=bestguesspass action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oz71xV+KibkgPZuZC862aT2iRj3a2M9vG0a647BO+Fg=; b=Cme2gVnlr6+CTjo9m+Q/O5N6hOFlKW8djsluahkciU7VwKhuvUrVFhoZtGcxgYKuf2FEic+pQAwo3DVjUHMZDJu77vicLpO2x/8WRDgRZ/QDwcziIJMdqTVEtiqvRlpPPLmxGVQjhfgHuHW8s4boxiQSWpTwD6cJCsKSu7kapt8= Received: from BL0PR02CA0144.namprd02.prod.outlook.com (2603:10b6:208:35::49) by BY5PR02MB6932.namprd02.prod.outlook.com (2603:10b6:a03:23a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2623.9; Fri, 10 Jan 2020 01:27:34 +0000 Received: from SN1NAM02FT008.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::203) by BL0PR02CA0144.outlook.office365.com (2603:10b6:208:35::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2623.9 via Frontend Transport; Fri, 10 Jan 2020 01:27:34 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by SN1NAM02FT008.mail.protection.outlook.com (10.152.72.119) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2623.9 via Frontend Transport; Fri, 10 Jan 2020 01:27:33 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1ipj5J-0003lN-Am; Thu, 09 Jan 2020 17:27:33 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1ipj5E-0000HS-6Q; Thu, 09 Jan 2020 17:27:28 -0800 Received: from [172.19.2.62] (helo=xsjwoods50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1ipj5B-00008C-G1; Thu, 09 Jan 2020 17:27:25 -0800 From: Brian Woods To: xen-devel@lists.xenproject.org Date: Thu, 9 Jan 2020 17:26:29 -0800 Message-Id: <1578619590-3661-2-git-send-email-brian.woods@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1578619590-3661-1-git-send-email-brian.woods@xilinx.com> References: <1578619590-3661-1-git-send-email-brian.woods@xilinx.com> X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(396003)(346002)(376002)(136003)(189003)(199004)(7696005)(9786002)(316002)(107886003)(8936002)(4326008)(6916009)(186003)(5660300002)(336012)(70206006)(36756003)(478600001)(26005)(54906003)(70586007)(8676002)(44832011)(86362001)(356004)(2906002)(81156014)(426003)(81166006)(2616005)(142933001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY5PR02MB6932; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; LANG:en; PTR:unknown-60-83.xilinx.com; MX:1; A:1; MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 29b2a201-6420-41b7-d00a-08d7956c44bd X-MS-TrafficTypeDiagnostic: BY5PR02MB6932: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:655; X-Forefront-PRVS: 02788FF38E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: whWp3dtgu8SS+H6RxkNMMZ6b7JkORgtjsFTzkfnReWxzJQjrHKanuEpxHYEUD6Jn1NopmG1vTMN/b8L6GEyaamEn7M3GHK2q/kqK26ze9GBBPhjZyQeYkWnJsVBkZ9NmdZF1jbQYMSDfgOyMjGlpOxi/nrujUdoxLuuT1pHIib/MHLIq9dVp+pN/nsW4GG7eeAAv+JN2uV8EeL1HBdig8/TT3NDO5YesBoGq0CiqAYRFGxKPLEX6RAW/0XHWYkNAjp2Tos/8Dfwzndo9wHupEqZ9N2pTKvCzvsz8PbjtKCk5CWkxJFrSU2pRl71OzXaIzRam4s+m83uY+Q3jr9YPwNoeeNbhOAEyhXPKq1ztuoXhTxOIi69gm6OT3eyJstNlQl6ps/xZngp3AnuObuGCzfajav/GdiAKAv64x219/T+ykt0/r3wYCbPzRWp36/fJRJfUwpwDLflyLVRYxr3csfZQQyPJiIUmBhgLla4HwgJeS7MkYaHT0+eND4udhtTt X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2020 01:27:33.7030 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 29b2a201-6420-41b7-d00a-08d7956c44bd X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR02MB6932 Subject: [Xen-devel] [RFC 1/2] arm, smmu: add support for iommu_fwspec functions X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Volodymyr Babchuk , Stefano Stabellini , Julien Grall , Brian Woods Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Modify the smmu driver so that it uses the iommu_fwspec helper functions. This means both ARM IOMMU drivers will both use the iommu_fwspec helper functions, making enabling generic device tree bindings in the SMMU driver much cleaner. Signed-off-by: Brian Woods --- RFC especially wanted on: - Check in device_tree.c. This is needed, otherwise it won't boot due to dev_iommu_fwspec_get(dev) being true and returning EEXIST. I'm not completely sure what type of check is best here. xen/drivers/passthrough/arm/smmu.c | 74 ++++++++++++++++++++++------------- xen/drivers/passthrough/device_tree.c | 3 ++ 2 files changed, 49 insertions(+), 28 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index 94662a8..c5db5be 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -49,6 +49,7 @@ #include #include #include +#include #include /* Xen: The below defines are redefined within the file. Undef it */ @@ -597,8 +598,7 @@ struct arm_smmu_smr { }; struct arm_smmu_master_cfg { - int num_streamids; - u16 streamids[MAX_MASTER_STREAMIDS]; + struct iommu_fwspec *fwspec; struct arm_smmu_smr *smrs; }; @@ -779,7 +779,7 @@ static int register_smmu_master(struct arm_smmu_device *smmu, struct device *dev, struct of_phandle_args *masterspec) { - int i; + int i, ret = 0; struct arm_smmu_master *master; master = find_smmu_master(smmu, masterspec->np); @@ -798,26 +798,37 @@ static int register_smmu_master(struct arm_smmu_device *smmu, } master = devm_kzalloc(dev, sizeof(*master), GFP_KERNEL); - if (!master) + if (!master) { return -ENOMEM; + } + master->of_node = masterspec->np; + + ret = iommu_fwspec_init(&master->of_node->dev, smmu->dev); + if (ret) { + kfree(master); + return ret; + } + master->cfg.fwspec = dev_iommu_fwspec_get(&master->of_node->dev); - master->of_node = masterspec->np; - master->cfg.num_streamids = masterspec->args_count; + /* adding the ids here */ + ret = iommu_fwspec_add_ids(&masterspec->np->dev, + masterspec->args, + masterspec->args_count); + if (ret) + return ret; /* Xen: Let Xen know that the device is protected by an SMMU */ dt_device_set_protected(masterspec->np); - for (i = 0; i < master->cfg.num_streamids; ++i) { - u16 streamid = masterspec->args[i]; - - if (!(smmu->features & ARM_SMMU_FEAT_STREAM_MATCH) && - (streamid >= smmu->num_mapping_groups)) { - dev_err(dev, - "stream ID for master device %s greater than maximum allowed (%d)\n", - masterspec->np->name, smmu->num_mapping_groups); - return -ERANGE; + if (!(smmu->features & ARM_SMMU_FEAT_STREAM_MATCH)) { + for (i = 0; i < master->cfg.fwspec->num_ids; ++i) { + if (masterspec->args[i] >= smmu->num_mapping_groups) { + dev_err(dev, + "stream ID for master device %s greater than maximum allowed (%d)\n", + masterspec->np->name, smmu->num_mapping_groups); + return -ERANGE; + } } - master->cfg.streamids[i] = streamid; } return insert_smmu_master(smmu, master); } @@ -1397,15 +1408,15 @@ static int arm_smmu_master_configure_smrs(struct arm_smmu_device *smmu, if (cfg->smrs) return -EEXIST; - smrs = kmalloc_array(cfg->num_streamids, sizeof(*smrs), GFP_KERNEL); + smrs = kmalloc_array(cfg->fwspec->num_ids, sizeof(*smrs), GFP_KERNEL); if (!smrs) { dev_err(smmu->dev, "failed to allocate %d SMRs\n", - cfg->num_streamids); + cfg->fwspec->num_ids); return -ENOMEM; } /* Allocate the SMRs on the SMMU */ - for (i = 0; i < cfg->num_streamids; ++i) { + for (i = 0; i < cfg->fwspec->num_ids; ++i) { int idx = __arm_smmu_alloc_bitmap(smmu->smr_map, 0, smmu->num_mapping_groups); if (IS_ERR_VALUE(idx)) { @@ -1416,12 +1427,12 @@ static int arm_smmu_master_configure_smrs(struct arm_smmu_device *smmu, smrs[i] = (struct arm_smmu_smr) { .idx = idx, .mask = 0, /* We don't currently share SMRs */ - .id = cfg->streamids[i], + .id = cfg->fwspec->ids[i], }; } /* It worked! Now, poke the actual hardware */ - for (i = 0; i < cfg->num_streamids; ++i) { + for (i = 0; i < cfg->fwspec->num_ids; ++i) { u32 reg = SMR_VALID | smrs[i].id << SMR_ID_SHIFT | smrs[i].mask << SMR_MASK_SHIFT; writel_relaxed(reg, gr0_base + ARM_SMMU_GR0_SMR(smrs[i].idx)); @@ -1448,7 +1459,7 @@ static void arm_smmu_master_free_smrs(struct arm_smmu_device *smmu, return; /* Invalidate the SMRs before freeing back to the allocator */ - for (i = 0; i < cfg->num_streamids; ++i) { + for (i = 0; i < cfg->fwspec->num_ids; ++i) { u8 idx = smrs[i].idx; writel_relaxed(~SMR_VALID, gr0_base + ARM_SMMU_GR0_SMR(idx)); @@ -1471,10 +1482,10 @@ static int arm_smmu_domain_add_master(struct arm_smmu_domain *smmu_domain, if (ret) return ret == -EEXIST ? 0 : ret; - for (i = 0; i < cfg->num_streamids; ++i) { + for (i = 0; i < cfg->fwspec->num_ids; ++i) { u32 idx, s2cr; - idx = cfg->smrs ? cfg->smrs[i].idx : cfg->streamids[i]; + idx = cfg->smrs ? cfg->smrs[i].idx : cfg->fwspec->ids[i]; s2cr = S2CR_TYPE_TRANS | (smmu_domain->cfg.cbndx << S2CR_CBNDX_SHIFT); writel_relaxed(s2cr, gr0_base + ARM_SMMU_GR0_S2CR(idx)); @@ -1499,8 +1510,8 @@ static void arm_smmu_domain_remove_master(struct arm_smmu_domain *smmu_domain, * that it can be re-allocated immediately. * Xen: Unlike Linux, any access to non-configured stream will fault. */ - for (i = 0; i < cfg->num_streamids; ++i) { - u32 idx = cfg->smrs ? cfg->smrs[i].idx : cfg->streamids[i]; + for (i = 0; i < cfg->fwspec->num_ids; ++i) { + u32 idx = cfg->smrs ? cfg->smrs[i].idx : cfg->fwspec->ids[i]; writel_relaxed(S2CR_TYPE_FAULT, gr0_base + ARM_SMMU_GR0_S2CR(idx)); @@ -1924,14 +1935,21 @@ static int arm_smmu_add_device(struct device *dev) ret = -ENOMEM; goto out_put_group; } + cfg->fwspec = kzalloc(sizeof(struct iommu_fwspec), GFP_KERNEL); + if (!cfg->fwspec) { + kfree(cfg); + ret = -ENOMEM; + goto out_put_group; + } + iommu_fwspec_init(dev, smmu->dev); - cfg->num_streamids = 1; + cfg->fwspec->num_ids = 1; /* * Assume Stream ID == Requester ID for now. * We need a way to describe the ID mappings in FDT. */ pci_for_each_dma_alias(pdev, __arm_smmu_get_pci_sid, - &cfg->streamids[0]); + &cfg->fwspec->ids[0]); releasefn = __arm_smmu_release_pci_iommudata; } else { struct arm_smmu_master *master; diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthrough/device_tree.c index 999b831..acf6b62 100644 --- a/xen/drivers/passthrough/device_tree.c +++ b/xen/drivers/passthrough/device_tree.c @@ -140,6 +140,9 @@ int iommu_add_dt_device(struct dt_device_node *np) if ( !ops ) return -EINVAL; + if ( dt_device_is_protected(np) ) + return 0; + if ( dev_iommu_fwspec_get(dev) ) return -EEXIST;