From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932345AbcDAF3a (ORCPT ); Fri, 1 Apr 2016 01:29:30 -0400 Received: from mail-bn1on0088.outbound.protection.outlook.com ([157.56.110.88]:39520 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932166AbcDAF31 (ORCPT ); Fri, 1 Apr 2016 01:29:27 -0400 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: 0O4XWKX-07-GYM-02 X-M-MSG: From: Wan Zongshun To: Joerg Roedel , CC: Suravee Suthikulpanit , Borislav Petkov , Ray Huang , , , , Wan Zongshun Subject: [PATCH V3 8/9] iommu/amd: Manage iommu_group for ACPI HID devices Date: Fri, 1 Apr 2016 09:06:04 -0400 Message-ID: <1459515965-2865-9-git-send-email-vincent.wan@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459515965-2865-1-git-send-email-vincent.wan@amd.com> References: <1459515965-2865-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;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(199003)(189002)(33646002)(36756003)(87936001)(106466001)(77096005)(189998001)(229853001)(105586002)(2950100001)(19580395003)(586003)(19580405001)(1220700001)(1096002)(50226001)(53416004)(5003600100002)(47776003)(5008740100001)(5001770100001)(81166005)(11100500001)(4326007)(2906002)(48376002)(101416001)(50466002)(86362001)(76176999)(5003940100001)(92566002)(50986999)(217873001);DIR:OUT;SFP:1101;SCL:1;SRVR:DM3PR1201MB1086;H:atltwp01.amd.com;FPR:;SPF:None;MLV:sfv;A:1;MX:1;LANG:en; X-MS-Office365-Filtering-Correlation-Id: f7dd8689-445c-411b-8be4-08d359ee952e X-Microsoft-Exchange-Diagnostics: 1;DM3PR1201MB1086;2:K2ngO0EVAHxclcVwRN5FNhQ0V/3uV0agtWJzJr6MFzI6hcrYCCVSwxHW+2JVyRtxjTN6vWQgrRAX27D5T2mZIwlJS4/DaUfYTuup1RZ4HPFV6NsiHuwtSKO5POLR/nhhqj7kvnqlbO5ke/j53J3KUtAT1HQCGATjbouZjpBhFpu7nZpWHZOcgOzz2xEnViPW;3:iN2uPhAalHYl3+3mvT87+NnWyrGp3l5uAHmjYZh4O0oOzFvW/1WsFmmEx4amebdjYiU5IAQ5s21CZhS9XNDkbdarSC+VIOwxoWKc1LxQ4sNKPf9wTyuoCVQ6OQbf9/Z7c50ses3jqojz5yk9GTyyqWsKB9PgIpdlLzkxA1rHTSEUJgjqbaCUc5X4kVKVBXc1nMflJW+DfYbu+LtH/1t980rGsmLYVH9Jv2SFV6JAiPw= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM3PR1201MB1086; X-Microsoft-Exchange-Diagnostics: 1;DM3PR1201MB1086;25:DU3DCGqaTokQ9TpvXnsg6EHaaNxgXTVylZ5YXztr2AyKXlL/dEw7eIBkRNd6O5n5rFeivepJ58WrSVuiMMm40cqv/vu6xCkJKI/bT2WlvXBIEijnIC3nJnbZn7PN+b3J2h3acpDzLctyzORedBOg7OW6XW4rPTeQDZjvb0rNb6IeM1GEX0AcTYwWQkd7qfPrEx8iimZ1lUpgfgR9H1wUI0fZsx75zgqR46bPkMTR5fDvawtgbj3EZ5sGOWVESeYbC9+OvC31Gg+ezEc14Zw8vLWLvfnlCs2619uinPIhT4vGWlldjX48/eAHc4Bwy507IXBVC0v+12bwIFRgPStFjA273v7CPJkq5i9iBChTL0DVLH3GiOcHGU1QdV3HdLLIo9egUpVNEysWYiuHTaVHnSzlhSGSek70f4BP8NOcbFFqWk3DLLQ98AdSJIugEywUCeJvm+AOACApzP+QfWpig4kTrIHDvl0tMFDvCowkUIKpCm9lGRsKdSbbWuCam9XdgPcjtjw9H2cjxnqA1Qaq1eOyedsTJg1/aNLO0WHGZM9spUcCJ9w2i4wZnYUW3IamudhRG1USz/KSr9wLpIdR2k7uoeNF/xZ0YvOtJkAZXenmOxUiXCQ+CB0WvqHtWHt0X9XikXCi39XzFMmlH+fMRygmP0ypK9nt0s4t81+QdxU= X-Microsoft-Exchange-Diagnostics: 1;DM3PR1201MB1086;20:JDchllYIUaVCR8L10qNmh9FOnhQlBtH8vshaeVCxwCGxTd+8xnnBp3ruWDKm/F8pZKbd8z/sZNqZta3OigTsrqV/rkSw23miM8YXx+lE+i3NPiGIDjDl0ICNKoZO/ln53fPmMDhQb1MGvRXZZHvQhYx5f4vA2c9/VDsdEf+vqZj46pLffjw8OWX2GCJuVNaEPV5T8E2XvthUCRMS5uUBnP/uPQmENMjs6mJpmZLN3kt7eUWRt2Pac1TrRjHXnyKDFE4k0197Qa5wOfNfDymxRvah6pB38KjJPKRfbRFjx8FSuwSiorpo+Kay/t6+hsZMK+bmlML5n558EhA+4cnpoW6qWYAGxUmWXxPKtcEIYuMsuYRM6oQ0rsYkw2fqyFNHsoxEqvfsSdnI3tSHYtx07tjKt/pmJOE/jQqTLxbfpPr5C1yDxnnZ5Piy6A3zXZm8Bdm3TBcPfmcrWulxh4lXxPluTY8p2Ou/5dsNWy3cKOk6EVI1RLL+Ccccl62bgBUI X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13023025)(8121501046)(13018025)(5005006)(13015025)(13024025)(13017025)(3002001)(10201501046);SRVR:DM3PR1201MB1086;BCL:0;PCL:0;RULEID:;SRVR:DM3PR1201MB1086; X-Microsoft-Exchange-Diagnostics: 1;DM3PR1201MB1086;4:OSvMBOk1ZE3gWrG5yuFy2CxuGc4FTaqJYuF3q9i+Uc6De4H8WcPRrRiQpkpMwyZglL6pbD2kncCP2gKfNWrX51ucuekxXR2egSGk3XIt3OII352c4xsfQucUsd7Gx1twx5wwBABQV4yojpt+b8UvK52OvDx9rMd0epxaTyBHwK+btU+a5IiizKqdOGnrYZLDtKcc/UcKvjc9RAJtwRQFmrn6mgDXYo7f6sz2ithKmHY7hZ6ssVQ4vONQir9vRBnt8INJdGj5l3YefqOQRPXXnQT6pVA2pKMTrHZCmt6TINmkaBG6lKAyHlHSxggKfqWDqX+CVlIA2K/0fMd6mRKIVACjO37q8TpSuwDzueEuCOKp+EduWG/B/ynfU1zOcvKPnaNe/ldHuvZ0IstWbDWEWeo6RCYrAV8gBTNwb+DmnRY1kdjkyqAsUu3KEjbtKbbgDy+9bF+Iq2nWsSjFetP4YA== X-Forefront-PRVS: 0899B47777 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM3PR1201MB1086;23:jZjsY3X6N3Dg5nyXnuIDQstiM3Hs6B1Jujmr+QP?= =?us-ascii?Q?QZvgT1cojHvJrpQUi8m/xsvndAV8Qs3xMndKvRfGdvZgKmXyxDQA3rV+FAI1?= =?us-ascii?Q?Yyz1xz7DSIa0dpBTxWs4xOar0bQWeO4BVWOW3YBGVMzt6/TDWINBJpX2Yd/J?= =?us-ascii?Q?Sz7k3LQ2DLU/0fZpEu1pSzpVUypTb8ojVkBx3ZMWe2/YcYBfNCGNnwJ0qtXh?= =?us-ascii?Q?l3suHoWrn7taATNsQivym/eX+sxJIk1tHloWjdwkIfcEbDWZiWr1C0C5O7VJ?= =?us-ascii?Q?rNfqwo4H7hn2MYO+PxwaTEzZaxi7HgdgsOgiDqE2NI59+5RE+HFvHillEoRl?= =?us-ascii?Q?wUcuWJtclMWkh0XFRhZOS6fhswf0f0znDjXWRgT/axPeO0iawcUkAyN7m+sL?= =?us-ascii?Q?CZtOb3nndJu1aAcGJHP3FEBlcD3nhw5zGn0dzOzefAInxWQcjQiveS4VAocS?= =?us-ascii?Q?1JYDRqKFZuYrhHAgJovWLXMmTLuW2+hO5AtX38TuUe/EuRB+97FHmxKdHW5n?= =?us-ascii?Q?PRrjWTtv2ltDNsPuxXgWRCb7JGUQzcM0JiAxwY92nqqAiSMeqEe2oMhHOdxi?= =?us-ascii?Q?p3hL4LXgND9RVlwgv71CwTsyPNirYGxVcfePt44AgdeRsosmY3TPrHQivpSq?= =?us-ascii?Q?91zMRduBrxHHtLd6B73/qOv6y2E1nQssP0USsqM0RRHNIxZJhAqXRV4JjpzR?= =?us-ascii?Q?MZhUYfkirc2XKZyGfGXuMOdAqzqeUa0NQs8pmbX64UQBKPfiaI3mMZl2PBy0?= =?us-ascii?Q?hplC0Pe77REuj1zrCoTQFieos+V9Gi8IxE19ZVykFMrmlyTZ1+Xl624qji7l?= =?us-ascii?Q?7ykg/tL0hW6MgMPw8wp3SAVUFzrOB5IFTUht+phJNsrKfjqPF19W8uhdi2sM?= =?us-ascii?Q?4E6/G0XikR10n1pumL5np0udW4o36+TfkMDXC0hSrfGQVRVHqyZ7S8i/lhlj?= =?us-ascii?Q?FgI/zmg05FvAOhKXCqVKuP+dKzcU7DiahjEnWOdBysYwQqTNqZ0x06LcY7mn?= =?us-ascii?Q?uai2+lrJFvvYncBd6q82UY0JQIo0PBeJ/A2cV/DEKGLK3+Q=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM3PR1201MB1086;5:pASBVIPYjtIxOo8T7eMrJpMC8kFdAePx7C0DWSa98s9wZ7euHyvsRlEzZ9vJgxI4F5PpwM97EXliSz2T2I85z6Mv7D9zzZ9TgftHY9u9kpqdwd2vE5h1BJjC0G3rE0h6BDea9txyQA6o4GW9rF0NeA==;24:berK7sW97aWUUn81Gt7Fe6AnzQ+pNET5JmfVuG18Fmv7rjZpvR89pcnmiiR5lSL+ykBZ8VDZ5jv+gazGweZxknSrz8NIolTFrdJEQ/W/Kzc=;20:+GqQgSzR0097eV3WoVBNWX6xEGrltynFhtn/OsNIBp/ZOt5/zLwftfla+Z+vxJeDSvgyUoCjk5jlQUerso9QGJvaV+S0It1Pch4iDgPTInQ3tz/7JJT+oSXA71EL96aOpnEaD9BfSWRtmJ9FGz9SRJnFuXq34j2zJD+EoAgVnlNLEUClY+B8NHUqJ0x+9WU9xd/oHbZ/Qz48tKKK6zcJ2hRluRlAHUWg6t/1bZq2Ff1T3N03QCMykuIIcnJGXFBL SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2016 05:29:22.3065 (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: DM3PR1201MB1086 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 --- 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 0df651a3..713e7ea 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -276,6 +276,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[] = { @@ -2445,6 +2468,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. @@ -3286,7 +3317,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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wan Zongshun Subject: [PATCH V3 8/9] iommu/amd: Manage iommu_group for ACPI HID devices Date: Fri, 1 Apr 2016 09:06:04 -0400 Message-ID: <1459515965-2865-9-git-send-email-vincent.wan@amd.com> References: <1459515965-2865-1-git-send-email-vincent.wan@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1459515965-2865-1-git-send-email-vincent.wan-5C7GfCeVMHo@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Joerg Roedel , iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Wan Zongshun , Ray Huang , Borislav Petkov List-Id: iommu@lists.linux-foundation.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 --- 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 0df651a3..713e7ea 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -276,6 +276,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[] = { @@ -2445,6 +2468,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. @@ -3286,7 +3317,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