From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758255AbcDAFoP (ORCPT ); Fri, 1 Apr 2016 01:44:15 -0400 Received: from mail-by2on0059.outbound.protection.outlook.com ([207.46.100.59]:21776 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754498AbcDAFoM (ORCPT ); Fri, 1 Apr 2016 01:44:12 -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: 0O4XWJH-07-GWX-02 X-M-MSG: From: Wan Zongshun To: Joerg Roedel , CC: Suravee Suthikulpanit , Borislav Petkov , Ray Huang , , , Subject: [PATCH V3 2/9] iommu/amd: Modify ivhd_header structure to support type 11h and 40h Date: Fri, 1 Apr 2016 09:05:58 -0400 Message-ID: <1459515965-2865-3-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)(586003)(5001770100001)(76176999)(86362001)(189998001)(50986999)(2950100001)(77096005)(5008740100001)(92566002)(229853001)(101416001)(11100500001)(33646002)(47776003)(36756003)(5003940100001)(19580405001)(81166005)(19580395003)(5003600100002)(105586002)(50466002)(48376002)(106466001)(1220700001)(1096002)(2906002)(53416004)(87936001)(50226001)(4326007);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0719;H:atltwp01.amd.com;FPR:;SPF:None;MLV:sfv;A:1;MX:1;LANG:en; X-MS-Office365-Filtering-Correlation-Id: c8c71132-b71d-413a-9ccd-08d359ee770f X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0719;2:YVLhPtaa5vsOcGRfGV6Ymi6oOa0Dly/eW6TfNaP7zUHJm2SiXsuXe+/mv8+0OLRnBsu/u+kAj0kADUS64izQIbcOpxIAWywgzhigbGA5D7uzoySL9ZVZ0itAJItVfNrzbKD4tMYfXZNMk9I7obj94xK3WG9GbWhEDXFUjIRO7tcws0B9lQwDucXMIqaIedX7;3:amUEdNt7Ui5y9gw7kc719jHm9Q5Ko+oR0+t1bATBY93fVpZEByTdiEAQF3LYmCMH2456Ya1BOB7ntMUXMl/+Omn7rDQmagekhUnK2t4yZ8CQs05YL0756HJrcTTTGmU6+q5WppNA4nfjsZ1g6HHCv5wl5EEymPgVbTuOcRpsTIPCjd/N5GhmaVPfwcRVlpOck/tEfzRcJTo2xQIExLRYrAMqy15p2Zhq+gk7zO7hH/I= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0719; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0719;25:RQDyAGONFKElMfTcJNA4qIZAQV1+dYnQXo10i/AV/ZYV1IH6eVRE9NlpZBdopcK95twOLFkO2GTCpWEXh07sBiwRbiE1qOPrVmQzdZ2FpvlOlye8A8yWnUGGDxBLc/1Tl9gIusd+rXcww49fGwX+D43ORgrPOfIoWyBKmlfRt1+EXsMWKVWAMPqAj2Iq0sBi940L0224P/j4DDkX91apn9YFE0JUh0jqZaRLiZCKkxrDlfBVQoEKx0Vu7EOG/4Aw+PLi9ezoKRkGDcTbnSCecfQV7P3Nz/jgI/6Yj3mLDvzA53FBgSNa8MudP0qnHaSE0X9FtkAiDomR3JllfHEB9Q85A5rFQRNwGR1HBEQz2KNX9sM12CeQgE9/QSEQOc2v7WRFrjHA4wyBerfW08xDqtkyId21xpvB2Y/1HOR3DIKtTn3S1yWUSqpNJK3hE7B4Acd+FZfFkql995+ok3DQDuJ6o19v2G5YTt6qWYwIJcVVwq110Ckoyl03BGJ9RurCLvyHXu1H8mfjaXwwb63tmo6ASVyICiH5iMejQl6rPWWe5EgZPL5vY4s4j/ZdQc7c4pqX5hWLgaYqs89d6btmQQgBtpoA3ObwdHzAKV3TAcpRistRBbppJzSRyLY9bjXC X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0719;20:FpL7rOTy9WdzYDNZyRt6FBxYiMQs8Hcl8bxZE5uJLroxHGkAS2n9fx4WOYtMypimjXfQs6WVT+33VazbJZVdheGJIvCqL0O1klrYPQE//QZLqNcAnyxWpOwle5m62moJxIoaoc23BCctT36z3zewQsrWs5F0x471xebsEtHN61+MQolNqBh1g5GchdouAgLeCWSO6S0TgSefYjAoXD4jZTD8be1b5nMFtT4kiWL8CmzwY3BY9XkF3ZGG6LspPSftPbosFioijMvebMxm88c3z79luw0u2dXHc0sy57dXLk1CSWLnhHi0I/CFrlt3aSzzjrQ9phZ+5Oz8JhfkR08Mzui4D0Jl5zWJHb7pwhxL821V7nQEJtHFJ7/MkY+FmipuQJXZ7NLULy9umY5/WD3WLm4mu19VlYzkCqwzjzyX+Kh/rHQnviSbZ8+OpqVxWatGbDXGB0uGaCctaDgRi7zOYfw6OlFghOuIljSdWn2czFbHSzYAFMYYnh011TcLVGkj X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(13023025)(8121501046)(13017025)(13015025)(13024025)(13018025)(3002001)(10201501046);SRVR:SN1PR12MB0719;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0719; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0719;4:t1lOV5urB/eyCB7HqtkmPV/uUHeNShmJXQ6Ir+TLwRZSS3z1BrOQM1T3r0XEMnkJMm24Un1GMcwV7mYehvy754JwwZ9nBm747K/yk7H/2XDn4vZtqtDdYftVde+RClrcApV0BCxh9PlAFMtGNcTVe7+iCAXP7/JWyF8cZVzHg+WViIXd8C94w3PGjw7rlIekF6G4V7WnG39wNAy8EGdq33mSz/zOGshBmEPFrBlhrbSft9DJIVE2/HD7GRCXMlrx7jAKys3vquGICpotXd8pC8PPXXdcOeNS+MHVw5O+ig4mQiS9L9VwaVN7eahv9R4zgOFQ8EpRGSQndrn1n0p9zlnU+pglEduR6pMAZmJciTqI+Mqh1x08P/Saf2lAkOKNSLXphe2KV4gXYZvaTzzeYMGHraQd3W3u3Zg0KngobDcZ3B+TtMbRCMxlr3Q6vhG38vmfahEt7/pSwSfa9u1g5A== X-Forefront-PRVS: 0899B47777 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR12MB0719;23:FieS4gPAqec6sHV2hjtwBoP0kRdt6Bpii7n6/ogn+?= =?us-ascii?Q?MYb7X4iltjyP1BQZbNuC/JlrYcm2UCcCdcO7QfAFp9oJL8V/tGU5OaU+Csvf?= =?us-ascii?Q?t94w92ksvyosnjrDKndBRj7dMSeZVgKmH36f5stbE6BBOeNiR3Fgq6KHZaNR?= =?us-ascii?Q?sX7M6wGXV24V1pQLq7WaDi3KOAm3Uu6LqXUbl2nejOyfrxjyKknl25HEHOio?= =?us-ascii?Q?qJ4BdVk1tUeyCVEp6OYWFbP2XLhqE26CA4x5/7JjBMChh4vIeDIfLa0aj/Fl?= =?us-ascii?Q?UirB/WJvGF09VNZswNEocKPnS6TU3IMYYlgp1cWH7x0HMPEH4lJQ/td/2v6g?= =?us-ascii?Q?empomQT9ZMLhBN5Pvw5Njq+Be9Lf0jc0Jmg/sOKm63YpH5Ptps7PAejW0h6w?= =?us-ascii?Q?qZ2smCPwF8FA0ROLtd+NWD/aJqM+8vA4HMPXK1mnM5ZKniMG78kqH8v2SdMl?= =?us-ascii?Q?YTOWUzlYRdbIVkrdBhYgpWAnJJKcdfyhssI6xpZ7BdJQzHFM+FvpZfannuRm?= =?us-ascii?Q?s+jJ+CJnYkT2scFDq/27MOVulwAXHRJMhg5rZwY7WFg8iqmFPpGIzEmr6h3V?= =?us-ascii?Q?iArQPFIkYd7ZEU/cYBUMB11JlZfjxDTHsU9FVwc46yWVAnpHDAeT9WMXXVgg?= =?us-ascii?Q?F2bxBzt/gBrscp7X3ZEi1avj+DWxaUCo2QOeFsGvvmp4NGnWz+m0A8ZF4RWD?= =?us-ascii?Q?ce+SInkOukMIt6Fmn+Mh6kYtML/7TL37ZQEOUixN7D2K3jckVPO44lDT2Euc?= =?us-ascii?Q?0KmBDAsOlJNwnEsI+xQV4BoiyIywjzd0429nAjNVUlfjHHx11wG9M8LwCc8z?= =?us-ascii?Q?R+6WSAtpPOevLNXL9Vj2JHhGuYrLH9cSWtr8CHwW8XBVuJKaLqBIERxkYkag?= =?us-ascii?Q?hVif+MHRPbUsm0ZXXyT09HKAZFxZ1lhJIODAJ4uPZVs+krSEo0zwf7ASgbF7?= =?us-ascii?Q?jVKJD9u/XWoLhysmKG4DN074W1rB+KDZC5QsBDcZugzXZGhsb/5upQTV4/pL?= =?us-ascii?Q?5EHsNBkulocbnDqqTD2p4+n?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0719;5:MUObv1QaAR+OnRfl0oh+5+dboadSTD55+Zh2igxJW6DIjj3QbNf8jf7ToZNjl9jzTC3mr/6JocEULQaaNqySQ/u6xsJQLcA0zRq01NtWqrC968OT3QMAsEOMvXZXlxXjEtDkYlGvhfgxiscN5+BVww==;24:ExcEQUBeRpMKk4skrMQKeL+KjbFesdFC47hI8N3zFstkXF9+RmqGnVyY97dIsS+4vLUx0vT+11odPy1sZ0Z5+7k64rEg2xOOZDdCbnSJY8Y=;20:XmtYA0BiQnrzzw7Um+x2vpwVByfAItiHR/KfJ7dPRmtFVQM/pW9gWnzVYjt0w1dqu/FU2IYaaGRV5Uo6Ja6j1cAyyJcmf7pUFn8dCXFW7GPcFLBuKhh3EHNNBxMr3ylSZ2YiEqRDZZxyoLtENioeSLJWyTaLmlDZ6hhRIkrScXy5RZyHrye/zZMlZnfhNFB301Xvz8JAlMWE7MZRR3pnVBIyFYqd+xNw9V3lxaQgus9vOCWLXdEN6I4zVgOvjrVr SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2016 05:28:31.6159 (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: SN1PR12MB0719 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suravee Suthikulpanit This patch modifies the existing struct ivhd_header, which currently only support IVHD type 0x10, to add new fields from IVHD type 11h and 40h. It also modifies the pointer calculation to allow support for IVHD type 11h and 40h Signed-off-by: Suravee Suthikulpanit --- drivers/iommu/amd_iommu_init.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index dff1e01..22e078b 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -398,6 +398,22 @@ static void __init iommu_unmap_mmio_space(struct amd_iommu *iommu) release_mem_region(iommu->mmio_phys, iommu->mmio_phys_end); } +static inline u32 get_ivhd_header_size(struct ivhd_header *h) +{ + u32 size = 0; + + switch (h->type) { + case 0x10: + size = 24; + break; + case 0x11: + case 0x40: + size = 40; + break; + } + return size; +} + /**************************************************************************** * * The functions below belong to the first pass of AMD IOMMU ACPI table @@ -424,7 +440,14 @@ static int __init find_last_devid_from_ivhd(struct ivhd_header *h) u8 *p = (void *)h, *end = (void *)h; struct ivhd_entry *dev; - p += sizeof(*h); + u32 ivhd_size = get_ivhd_header_size(h); + + if (!ivhd_size) { + pr_err("AMD-Vi: Unsupported IVHD type %#x\n", h->type); + return -EINVAL; + } + + p += ivhd_size; end += h->length; while (p < end) { @@ -789,6 +812,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, u32 dev_i, ext_flags = 0; bool alias = false; struct ivhd_entry *e; + u32 ivhd_size; int ret; @@ -804,7 +828,14 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, /* * Done. Now parse the device entries */ - p += sizeof(struct ivhd_header); + ivhd_size = get_ivhd_header_size(h); + if (!ivhd_size) { + pr_err("AMD-Vi: Unsupported IVHD type %#x\n", h->type); + return -EINVAL; + } + + p += ivhd_size; + end += h->length; -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wan Zongshun Subject: [PATCH V3 2/9] iommu/amd: Modify ivhd_header structure to support type 11h and 40h Date: Fri, 1 Apr 2016 09:05:58 -0400 Message-ID: <1459515965-2865-3-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, Ray Huang , Borislav Petkov List-Id: iommu@lists.linux-foundation.org From: Suravee Suthikulpanit This patch modifies the existing struct ivhd_header, which currently only support IVHD type 0x10, to add new fields from IVHD type 11h and 40h. It also modifies the pointer calculation to allow support for IVHD type 11h and 40h Signed-off-by: Suravee Suthikulpanit --- drivers/iommu/amd_iommu_init.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index dff1e01..22e078b 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -398,6 +398,22 @@ static void __init iommu_unmap_mmio_space(struct amd_iommu *iommu) release_mem_region(iommu->mmio_phys, iommu->mmio_phys_end); } +static inline u32 get_ivhd_header_size(struct ivhd_header *h) +{ + u32 size = 0; + + switch (h->type) { + case 0x10: + size = 24; + break; + case 0x11: + case 0x40: + size = 40; + break; + } + return size; +} + /**************************************************************************** * * The functions below belong to the first pass of AMD IOMMU ACPI table @@ -424,7 +440,14 @@ static int __init find_last_devid_from_ivhd(struct ivhd_header *h) u8 *p = (void *)h, *end = (void *)h; struct ivhd_entry *dev; - p += sizeof(*h); + u32 ivhd_size = get_ivhd_header_size(h); + + if (!ivhd_size) { + pr_err("AMD-Vi: Unsupported IVHD type %#x\n", h->type); + return -EINVAL; + } + + p += ivhd_size; end += h->length; while (p < end) { @@ -789,6 +812,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, u32 dev_i, ext_flags = 0; bool alias = false; struct ivhd_entry *e; + u32 ivhd_size; int ret; @@ -804,7 +828,14 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, /* * Done. Now parse the device entries */ - p += sizeof(struct ivhd_header); + ivhd_size = get_ivhd_header_size(h); + if (!ivhd_size) { + pr_err("AMD-Vi: Unsupported IVHD type %#x\n", h->type); + return -EINVAL; + } + + p += ivhd_size; + end += h->length; -- 1.9.1