From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754016AbcAECnj (ORCPT ); Mon, 4 Jan 2016 21:43:39 -0500 Received: from mail-bl2on0098.outbound.protection.outlook.com ([65.55.169.98]:50720 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753842AbcAECng (ORCPT ); Mon, 4 Jan 2016 21:43:36 -0500 X-Greylist: delayed 887 seconds by postgrey-1.27 at vger.kernel.org; Mon, 04 Jan 2016 21:43:36 EST Authentication-Results: spf=none (sender IP is 165.204.84.221) smtp.mailfrom=amd.com; 8bytes.org; dkim=none (message not signed) header.d=none;8bytes.org; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0O0GK8T-07-1B5-02 X-M-MSG: From: Wan Zongshun To: Joerg Roedel , CC: Suravee Suthikulpanit , Borislav Petkov , Ray Huang , , , Wan Zongshun Subject: [PATCH 6/6] iommu/amd: Manage iommu_group for non-pci devices Date: Tue, 5 Jan 2016 05:07:24 -0500 Message-ID: <1451988444-4694-7-git-send-email-vincent.wan@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1451988444-4694-1-git-send-email-vincent.wan@amd.com> References: <1451988444-4694-1-git-send-email-vincent.wan@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.221;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(189002)(199003)(19580395003)(586003)(36756003)(5003600100002)(11100500001)(5008740100001)(47776003)(5003940100001)(19580405001)(86362001)(48376002)(50466002)(97736004)(76176999)(1096002)(101416001)(5001770100001)(1220700001)(92566002)(50986999)(53416004)(33646002)(87936001)(105586002)(4326007)(50226001)(106466001)(189998001)(77096005)(2950100001)(229853001);DIR:OUT;SFP:1101;SCL:1;SRVR:DM3PR12MB0857;H:atltwp01.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;DM3PR12MB0857;2:y/4q6zj0IEiP3XONSrknj6Wy14IIKrujpmWVEbOkeKWDJDLsTLMOlgGsVkaqRGavbqywa4/3Q9XlttmE4PvkQS6Rk+PVF74XRPBJnQDItgxedTdXCfot/VzGMMiClSYqZF5ed1NbL1kQD837yn3drQ==;3:fh07qEtfIUXdKcd6vmIHfaZyNrSMsvbugSQhPQGalPB80hRlFdzcmMJsa66V3hV0PgZEf8OHuHWKqCP78fuMjcn+e9b/kMRJCGk/ou1L6r7CIahQFzza7jeCDgA+RfZTmHHsHIkodAWmB+XUevODIeVYhWASmL8Jj8WSwtTy9xbiaMjHQ1288DewULVv8BjV0EmdoyskEQY54+wVKitedaI/YEIhMmNbW8IkrPRnZec=;25:5g9fiE+bvt/hzi/D33rud5VUD/1HU7G3U/uwxMJZK6Oa0WAuyHoTe/2WMcU7iuZ/2oOE7QSBhXCwbiwyZDy1wPnxoNGeguUqR3NYHsQe9KH6FpUXsnQcX7gFm7PQyh5Aw7tmLlLeT2s0joDYhM2ijt4VsRZMobUsrd3QMHdhpQC5Cwq41FoTgDRcnhgYHZ4GjQT9slYG+WXGbTu86rEYCL6mTCIehK0MvVXQ1DKbH9CvUJbRmAWcKFOuihQPwOA5JdqtoKgiqpSzDmcxgHUMzQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM3PR12MB0857; X-Microsoft-Exchange-Diagnostics: 1;DM3PR12MB0857;20:PBTB5wiqk8sDuPUnPUMab29NG17UXEETQaHBpZFBq3gXVbZmQ1yxu0YQ524WbCJQSiLB+sC5xfS1H9lzPkHLuqRHfwGrJH03A/DvFUJ9K12g+3VGVmzUqicKjH7y52eUQ5lr1sUUaA40/oAHrxl23SmQz1dwuTDAI0WnqITg8uyqEE3jqVQGmyHjUTIw5+5UJKN0+dc+3ZprO7ZjluUHfkpPjJWLeKKU4+A7uPBfLTLY6PVxhDPbX4qayix+6ymDFws95kDtVsxPpfybQpu6Z6gECVDa21fptCbAE5+Suw73lHnaItA4KTRyShZLJnDFHqaR6Cjp/1ImJ1jzwt4fu+Qh3c1UvDrbpZaAVAeNfRxhgmhuFxfGnAe4EMrPBqFRpC5ut1wfKlH1LmQFDes4PqhxDLbQFRkab18q+84xic9v94cE2n8VI+eF+sBihKxNS3Gg5WwLxjMJLN5chlZOw7VkoL+5zoPAwfIFNb8etW54NAlP2qBXCz5w1lSQ4Fhc;4:dzTZs0ZcKGbo+lPLpbevLP+BELaumZ78lN20OShWRGIgzF16D54B/zvhjxkanfF99EZthg9I7XpmQVEUumobloHCwI6BZcgtcYeFtk16weMn/p4DcPvRIY0jzfgxh3ksYGnjJvxmShfIfGiEtiJXTZWug97UhG9P9lEdZDBSXXWf6xtb5mWmRMtT4uhOKNceYCBFdn8Bpts7poPBQVhJgdw+MkK7XwmNlbeqt/52VaNvFV6PRRr2gGM/zQVPfCP6+gymx5oSu42WmolP2X1khVN6kKPcKvZ4h0rk5AQqzkqw1+MnV2nutoAr314xZ6DmRXEyZP0b+V2S5mwEqD6kZArDgXNjLALKvncaqTU5zk6oBPxctlKd6CNgDe3cJ2GUsie40YXRvL1dabFUZwmr1tkTWFhwqqnilcZACrc+VvA= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(10201501046)(3002001);SRVR:DM3PR12MB0857;BCL:0;PCL:0;RULEID:;SRVR:DM3PR12MB0857; X-Forefront-PRVS: 0812095267 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM3PR12MB0857;23:nVoLyHp4XKXkvvp8tqLKoOcyQhdOR43zoTd4hu0oi?= =?us-ascii?Q?koLsIV1wvKf6DFmTS0WWMKFLnJ8jILHNMq0HgNh97FOEbjYeC32wOsoNXF/R?= =?us-ascii?Q?4uKyXJChX/sGtYrrvgOwnhoNa3HK9QkJUhuG5UGQt83rqH0Lef3etWbDWUzQ?= =?us-ascii?Q?x8bXhTXv4awRgX79avx65YyHXbv7tQIslLE85C4QaezRusaNrTnbS3K8FTeD?= =?us-ascii?Q?GDT/opSqZEaeKQhvey5TdmBP57DVLfL0mCnRiT3tZXa1g6O3Muu/i8R/2Hdg?= =?us-ascii?Q?Jin5TVE0a4vRUOTU6d+ew+Y0aPdG22m2KxXhmey6WtjJ8l47m6zTN9hZ6m8K?= =?us-ascii?Q?WOBRrnTeC/hYISvsxHpVXIY3NTGOd9JbY6tAB22mmzij0ble1+S4U4c/y5DU?= =?us-ascii?Q?cLs229qBIkynRrk/xxZT4GUcEt+OM8c5KwnPseqY284lBrnPgjS0fI//gWRK?= =?us-ascii?Q?U6ASsdI+GHqmBtxXoKQmGr0MjdMEDWPxYNglf/6qnbNESaN0Wm9LzJXZZm8U?= =?us-ascii?Q?wmnZbaTyzmdEQYONM3FKI6DYI6pOxcT4vipOT+r0VCsFvW+rLHmRRveocgzN?= =?us-ascii?Q?7hJFK0ANrpegcjHn2BU0E/U1HZl3XCFMjcDJHLkhB2YLKzGy+iRHnAYQw2qQ?= =?us-ascii?Q?csLnICchuMq696+d1mPAdoBtCs28CKLi8DhK7xU3gRfNwTf8TpUhIvxIxNuQ?= =?us-ascii?Q?T7PnLS5hNAFyCyx19mrfZynT9xuYEEAxEpGblrsMCt6WLwBm9VoUU4XTDG47?= =?us-ascii?Q?QJSEm84ktcY1vuD1twLeIm7P+vSgfjiHL2zTHOXl0RFKbMgTuL7WSSMz745h?= =?us-ascii?Q?kGtok125/vukw0K+Adz0A8p2hSxPoaH+gusZXLhyF9kC5xcW2DZkUAOdZ0ba?= =?us-ascii?Q?NwjhpaOcKjK1Yd0gk8PryudONmLmNLp4HmiPDiOXE60Qt0QkzNVq6ocWxzpB?= =?us-ascii?Q?hYs/t7Po6V/HFR9AlWkDgFR6pmVUHNvWBh0XbYds1zoics+10wDtDJfRPzzG?= =?us-ascii?Q?I8=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM3PR12MB0857;5:sjB/BROdY7YeAtNt3mgpAJl0y8B4F1CtjIyTq4N1qtr4u54lj6j+Y5v/nRsLvLw8u4LAu9f5CSCj/55GSZzVHVOIUnW8h+cP9BGsoYMKoEoRNyujuIDjGNY7nK+R+/oWZk5iUEqqrrFVQV/EfWNUqA==;24:yXKPwkdWfIB3XuRfgjscwq3SBFz34HaQ9KZU9ukMoClytz9Ja4vjejzWOUlF9VWE3q0nUGXOLUY2tLx7xDxNq1MyLF6j2RLTsvJKQU1IxQQ=;20:mkIL3+RzwCB+cN0Gt59BZWZdPMqBDAnB5ZixaG6sVHcdE9rAB14TiY+3Ib9axmHrO2RWhKx6iAjFxDVlR8m2gk/Iz+TeIeDbenVPvnuJnlVVVOUV1t54+g9ZohEUYQC++JAcvOhKjw2p17k83ek840AmunSDIBQDQVMU6XywWMoV2MeeoqtdB5jK4jiU8S5FOCGfgCY0Gjb4aGuiA/b+KqgUXJ9qofjbKktaLvOuuMgf3YAoRJ+KzJCdi9QgefcM SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2016 02:29:18.9381 (UTC) X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.221];Helo=[atltwp01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR12MB0857 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wan Zongshun This patch creates a new function for finding or creating an IOMMU group for acpihid(ACPI Hardware ID) device. The acpihid devices with the same devid will be put into same group and there will have the same domain id and share the same page table. Signed-off-by: Wan Zongshun Signed-off-by: Suravee Suthikulpanit --- drivers/iommu/amd_iommu.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 1902d01..e1083ce 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -232,6 +232,29 @@ static struct iommu_dev_data *get_dev_data(struct device *dev) return dev->archdata.iommu; } +/* +* Find or create an IOMMU group for a acpihid device. +*/ +static struct iommu_group *acpihid_device_group(struct device *dev) +{ + struct acpihid_map_entry *p, *entry = NULL; + u16 devid; + + devid = get_acpihid_device_id(dev, &entry); + if (devid < 0) + return ERR_PTR(devid); + + list_for_each_entry(p, &acpihid_map, list) { + if ((devid == p->devid) && p->group) + entry->group = p->group; + } + + if (!entry->group) + entry->group = generic_device_group(dev); + + return entry->group; +} + static bool pci_iommuv2_capable(struct pci_dev *pdev) { static const int caps[] = { @@ -2311,6 +2334,14 @@ static void amd_iommu_remove_device(struct device *dev) iommu_completion_wait(iommu); } +static struct iommu_group *amd_iommu_device_group(struct device *dev) +{ + if (dev_is_pci(dev)) + return pci_device_group(dev); + + return acpihid_device_group(dev); +} + /***************************************************************************** * * The next functions belong to the dma_ops mapping/unmapping code. @@ -3202,7 +3233,7 @@ static const struct iommu_ops amd_iommu_ops = { .iova_to_phys = amd_iommu_iova_to_phys, .add_device = amd_iommu_add_device, .remove_device = amd_iommu_remove_device, - .device_group = pci_device_group, + .device_group = amd_iommu_device_group, .get_dm_regions = amd_iommu_get_dm_regions, .put_dm_regions = amd_iommu_put_dm_regions, .pgsize_bitmap = AMD_IOMMU_PGSIZES, -- 1.9.1