From patchwork Fri Apr 1 13:06:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Wan X-Patchwork-Id: 64824 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp538616lbc; Thu, 31 Mar 2016 22:29:11 -0700 (PDT) X-Received: by 10.98.71.210 with SMTP id p79mr27870572pfi.4.1459488549696; Thu, 31 Mar 2016 22:29:09 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qe4si3466868pab.195.2016.03.31.22.29.09; Thu, 31 Mar 2016 22:29:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@amdcloud.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932134AbcDAF3A (ORCPT + 29 others); Fri, 1 Apr 2016 01:29:00 -0400 Received: from mail-bn1bn0100.outbound.protection.outlook.com ([157.56.110.100]:1376 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753115AbcDAF24 (ORCPT ); Fri, 1 Apr 2016 01:28:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=IWJiV9spBywh2SY84mgjsARy8tHVCDrH8WkMWvPN4+Y=; b=rVls9EEE5W+UtF2GWiobwRq+XkyFKPaH+B/yE+yQaGXek17Z672QMyz6B54T2iKe66Fyrh3ooeW/jUUnYLkwX3PpClxJAdhoQSHkWzh/dWjTOQpZaJLkW3HxMy/8h3kq9V4P+dGFu+hDEqG0E774x9TrsncdrqQ7TvJLOvguH10= Received: from BN1PR12CA0022.namprd12.prod.outlook.com (10.160.77.32) by CY1PR1201MB1083.namprd12.prod.outlook.com (10.169.19.11) with Microsoft SMTP Server (TLS) id 15.1.443.12; Fri, 1 Apr 2016 05:28:51 +0000 Received: from DM3NAM03FT014.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e49::209) by BN1PR12CA0022.outlook.office365.com (2a01:111:e400:49::32) with Microsoft SMTP Server (TLS) id 15.1.447.15 via Frontend Transport; Fri, 1 Apr 2016 05:28:51 +0000 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; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from atltwp01.amd.com (165.204.84.221) by DM3NAM03FT014.mail.protection.outlook.com (10.152.82.81) with Microsoft SMTP Server id 15.1.453.6 via Frontend Transport; Fri, 1 Apr 2016 05:28:49 +0000 X-WSS-ID: 0O4XWK0-07-GXR-02 X-M-MSG: Received: from satlvexedge02.amd.com (satlvexedge02.amd.com [10.177.96.29]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by atltwp01.amd.com (Axway MailGate 5.3.1) with ESMTPS id 290EECAE656; Fri, 1 Apr 2016 01:28:47 -0400 (EDT) Received: from SATLEXDAG03.amd.com (10.181.40.7) by SATLVEXEDGE02.amd.com (10.177.96.29) with Microsoft SMTP Server (TLS) id 14.3.195.1; Fri, 1 Apr 2016 00:29:14 -0500 Received: from SCYBEXDAG04.amd.com (10.34.11.14) by satlexdag03.amd.com (10.181.40.7) with Microsoft SMTP Server (TLS) id 14.3.266.1; Fri, 1 Apr 2016 01:28:46 -0400 Received: from viwan-emmc.amd.com (10.237.75.161) by SCYBEXDAG04.amd.com (10.34.11.14) with Microsoft SMTP Server id 14.3.266.1; Fri, 1 Apr 2016 13:28:42 +0800 From: Wan Zongshun To: Joerg Roedel , CC: Suravee Suthikulpanit , Borislav Petkov , Ray Huang , , , , Wan Zongshun Subject: [PATCH V3 5/9] iommu/amd: Introduces ivrs_acpihid kernel parameter Date: Fri, 1 Apr 2016 09:06:01 -0400 Message-ID: <1459515965-2865-6-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 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.221; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(979002)(6009001)(2980300002)(428002)(189002)(199003)(5003600100002)(1220700001)(1096002)(229853001)(53416004)(77096005)(5003940100001)(2906002)(48376002)(92566002)(4326007)(47776003)(586003)(189998001)(50466002)(81166005)(105586002)(2950100001)(5008740100001)(19580395003)(106466001)(11100500001)(50226001)(36756003)(101416001)(19580405001)(33646002)(87936001)(50986999)(76176999)(5001770100001)(86362001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR1201MB1083; H:atltwp01.amd.com; FPR:; SPF:None; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-MS-Office365-Filtering-Correlation-Id: c6e4eca0-8785-49ae-2e9b-08d359ee81bb X-Microsoft-Exchange-Diagnostics: 1; CY1PR1201MB1083; 2:3PtiahruFW7RX6cGRXFzBIZkgHT7bsTf1sWuxcX1bCT+MzZm1S3gP+XsSPOQqFYW/uclLsKeSaGPe1DqHGG2G6gP7zkUEXSLZRfQAIzsYp9XTm4FL469gjOt69wGm/+1/pRKUNrlbdNqYPVbyTeKX0MK+0OaYu7uqQfNstXAzohdcfm3/1XigKrsHmzN04K7; 3:x9LPkaLQUYuTmi26gtHfaFtE4IjXkLqeYdu7LOcLdna9t8iBVxGR1WfwH9yiRqmHKTKWH+CTJo2xMEksJ8Luc4457W4EY2YXbQcY5VbLIcRO28krsaJNZ8Eme5gggssc0LFwkzQO/kAgDkDchwYe8csmZ9eMZm9f6fTJ89qCu8gQUyEao4HltFhgwowWbwRFm7g93wXq5w0XdD42ygGeu1wWGfgB0nGShSkqPCsZNtE= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR1201MB1083; X-Microsoft-Exchange-Diagnostics: 1; CY1PR1201MB1083; 25:xyHSZTepzTTGHIUw/xarWaA/FkyECMg9ptKOTv2RnOWh7cD/fEWOZi9SyUsBCpsnD7AXT5Npq96IlWjExLBvz2AJs3friG3cGsrBJ+0XoHM154209L7+3lFU2Yu5cES8xXO3jnShUQKHpHa+3kGKeBQdNhAXN0/5DxeQMMTzmpsuzecEHLLtvT/OVtZwQmLVPJ15/8tFp8h1rBdpXykyAcRElfKlVsRo6giQyGCD8x7uDlBm59DbS4qxGKu6QSrz1lTgoaZK6bGqi0mXiGRaKk/gxKQra2sAvs++BFjOllIz1sQVN5nwn9JHJgXBJs8Z5AAl3pIvpEO9IlSpBJkbmea9wghTfU3W0xQ6/yuqFC6Ui41eNbXWu7MghtuRNreSn/fP1o7e62efvQZYBJXXWvPTyxr4IlryJLg+6EHJVC6ygpd67hT+v14pPG1RyTMSYpDoSY1HoatSsPJLDT8PNnD9/0zi8fZWoB0QtCRiGKOwHapJQ+gT1Ncw/8oIzZevh8kglESa2NOt7Pxf/rxP4hCcEFBai2X/bCXC+bFQBeJhHDkEKHKFBo6q1KO/hcOm5JyFrGhEeENPBScRX9ulH1fWPGitMdlbcwZ1oV2Uif51OQpSH0kbF38obvShSIvLhO2iFUAPeqBFhihCJhdooQ== X-Microsoft-Exchange-Diagnostics: 1; CY1PR1201MB1083; 20:AMNa6vPpPVidHRU59k6v0KybMsfCFdw+op/OzyvprJj4roW3ErrqPlBO9er8uASSqzlodlPdCnqIlsMs7bVm28JJ4UyKnWNl93sqizlZeShG6STQvOYySfcYDE0aOqFIsITGA8f+R6Whdsl8D3ipP1Ovwm+FjW06v0ZVMdplgCScp66KeSoc1rG84c1bqg3NGx0GBytZJh2zlSUIAVE7ezT8AJm9i1sTcSpCHKjL9EbnozabAiKKb8lBfHtNQCsO/78f9sSpEa9aXFhHI79nb3NHP+jdhg9FaAb+0FifJCmaIVBDCsbpYQmr/nk5BQ/Du1SoDLB5B8h0KocoXMo4GyVF47pBY2P9uDzQV05JoMzDkH+gmIYDojde1J4Htl3p1zCGNj0eQ8HYWCLzxMtH1c8MReuRhP6iBQNkLlYvSukxN2fmZZH8qgY124b4aMIciXNfe4QblFPgMl4dw7UaFFNJpQ3/9gLB3UweGONmnJiHIF+Np+5GrF1wg0uZFkyp 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)(13015025)(5005006)(13017025)(13024025)(13018025)(10201501046)(3002001); SRVR:CY1PR1201MB1083; BCL:0; PCL:0; RULEID:; SRVR:CY1PR1201MB1083; X-Microsoft-Exchange-Diagnostics: 1; CY1PR1201MB1083; 4:/scZ4Ms838d3oQdTBQPm04Qs+ol4ENahw4At8F82/QG/nJz6ieXXhPOmJQOhXzFaGsGeEQq70znB6eG3jU0WxVmz6KQGW7bI1gNJbH5Zc0mCRIEM1iw9Tz6XVTj+t4PaRFsXAEQr3paZIeV+76lNnbJpb0gxy8bPAG1nRC1kWX7GoKXGcg74safq6Ry3mA9Hc33+7P5873QZ3iFkw56/jsX0TlbesJDd46BBjevLx3ELI/z7+6JGWk/8LC95XtZpFQ+wwnccNhlbkHdn/dYxG21Xq65bdd6EzWQyr9bYZeFvM2v0p0J82U1d3R/Nz08hlaKgpo2oCmwgAsoQQeqDw2QTomeg8vD2QOONRHm6KD48L71JEiDUQgZUrpazcogjXK07sC8f022xT+FIlpsgpJimz7sFW+89MlTzjArH8e78WdlRiKPxdnr1ljrLbdn9m+i1b5L8yzpfR9IUnAckjw== X-Forefront-PRVS: 0899B47777 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR1201MB1083; 23:LoKTDFZnRx3Zc8aGYcJ6L616hB49h2z4yiJ6bdt?= =?us-ascii?Q?6KpdCSeTbDkXGA+ZAQbwoVJ+ocZUbAHyqtzSnyai5X+1piGYFGCxksJdHyRY?= =?us-ascii?Q?DWx7VX9TKE99abbGA8KRVakkwdBRG7m57fXIHkJ9CoHqJ6+Kgf1vGLLUxcVK?= =?us-ascii?Q?9NZogTTjD3YGjoSF7QvfZqLuZ1LdWsErHZxcVQG48KTDwXITlbsc5aDgdB1k?= =?us-ascii?Q?8svTwnBv0yjEJNgfOfA5bLNexNhdJ+YIe7vl6ebtO4HZgWH1qF5Q+SI82hs2?= =?us-ascii?Q?MctMklKHrXT8f7ioYLNhtQJ/Ni7ph/obHM2dA4qPEmUxdnTdaByzPSChwWQz?= =?us-ascii?Q?KJtxSxZ9QYqfsYolpSK4p8QDJp/vg1ZI8JhDtX97hmPqFFD8ISantwFLrdss?= =?us-ascii?Q?UCf0/oKSigviiJaM1n9FMHMwfkJagHLuDZA+9oEldvHI4k6KX1yq1yAT2Onm?= =?us-ascii?Q?PMSlEjBUwoh450Fwg7nkunb4H324IVVIr0bmFetSNxa6Czqzx/HLzrucPRp2?= =?us-ascii?Q?2I2mHeADzCNuZoqzV02DL91THoCb2VScpm/KunU5H0dkhUp5rb06WoyDvzBP?= =?us-ascii?Q?xGQJcDJdfxjuBHYhabJsH3fZMG5YB1Q9ugRq7Yz3t6gyY2AYiZWGCbzr0DMJ?= =?us-ascii?Q?SPjzYHaFMO61fumYTp9jDEQpdAZ9c9eCzcmBamJcF6uqYQGv+wCepPzt8kHI?= =?us-ascii?Q?K7vdsjK+6u8Om1vmXHOY7nx5q5uHnvIARs5sQq/M1uQAy2cd3PgIpqQk84E5?= =?us-ascii?Q?lH0Eb+xISeme6Ry6nqBXMfA8/nFr8TL6YBNNq0Ph1x+SyKC2IZgbAOesxPNX?= =?us-ascii?Q?l3lpA4u7xWTWEmFUZL3N5jWecoMdo7gqs9ZigMD9el1+pcplVdUq+K74Y7Zo?= =?us-ascii?Q?c01l78eTmv2ksg0hjWjsrRA4JMRAw06KRn7UA/H5uB451o+CxuGd2gwWf7qW?= =?us-ascii?Q?gzb8GbQzq2RGZRubQeCqBCLtxHJ9s1nyIr+WTIp44e5NjbsmGB+7+6tesx9P?= =?us-ascii?Q?G1V/6xdV12PslwzvFnh417B0wVkYgo0V1V4wbaW1/mnVsoCaGmsLhiCMGOBl?= =?us-ascii?Q?0QrgkZw25Dxej+DdVd8FlWKRF4mw6a54Xb1oAYMk1dAGoBDVHDA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR1201MB1083; 5:wM4s4IB/dMUxktdWC2ZFpAlFbANeJnDXa9bXb9M0Hb2RWTKytQY8llas9zIn4RnYN0F4krD2HVeu95V2Y5njNini/mm02jeRFRpbOxh9gB6q7XHbwghn7Rsi4Jp2kWgJ8yf4SWe4uytgyHzhkIaa5Q==; 24:HJAo7wvJpUFi5wvr/Dg14jKtfG02bm2EHVfjYnZQwNzET7zcRnw7fJbIg38+5qDoI1zr8veG08Vhmvy3ko45+UVtY+nfaIC+9ItVl7qh6kA=; 20:xrc4OZmBUB7x2zinhjGNtCH1L6PVtUgXbb3ZCe+CnsuQ9EEVHX4gyiZVeeWBc9N1pH6J/C08lt+bVVmS5sZJmtjf0/DTHEHiT9GNaEBCPjnQCTlPfZTTMPQqLTtf3/VXivMxj3AakDWkkITcfpenFZv/M5liFzBgyh7butTG8yrdjaHrw0fXLEpSbCURUZTC2KmSvo4SIbs67lMW0bxng2gVLO2NWEi6l5Yo3E9bIU43W0L4WyTGq3maRqeiu8YU SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2016 05:28:49.6738 (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: CY1PR1201MB1083 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suravee Suthikulpanit This patch introduces a new kernel parameter, ivrs_acpihid. This is used to override existing ACPI-HID IVHD device entry, or add an entry in case it is missing in the IVHD. Signed-off-by: Wan Zongshun Signed-off-by: Suravee Suthikulpanit --- Documentation/kernel-parameters.txt | 7 +++++++ drivers/iommu/amd_iommu_init.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) -- 1.9.1 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index ecc74fa..8c881a5 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1767,6 +1767,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted. PCI device 00:14.0 write the parameter as: ivrs_hpet[0]=00:14.0 + ivrs_acpihid [HW,X86_64] + Provide an override to the ACPI-HID:UID<->DEVICE-ID + mapping provided in the IVRS ACPI table. For + example, to map UART-HID:UID AMD0020:0 to + PCI device 00:14.5 write the parameter as: + ivrs_acpihid[00:14.5]=AMD0020:0 + js= [HW,JOY] Analog joystick See Documentation/input/joystick.txt. diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index e7ebfa2..9e00341 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -2477,10 +2477,43 @@ static int __init parse_ivrs_hpet(char *str) return 1; } +static int __init parse_ivrs_acpihid(char *str) +{ + u32 bus, dev, fn; + char *hid, *uid, *p; + char acpiid[ACPIHID_UID_LEN + ACPIHID_HID_LEN] = {0}; + int ret, i; + + ret = sscanf(str, "[%x:%x.%x]=%s", &bus, &dev, &fn, acpiid); + if (ret != 4) { + pr_err("AMD-Vi: Invalid command line: ivrs_acpihid(%s)\n", str); + return 1; + } + + p = acpiid; + hid = strsep(&p, ":"); + uid = p; + + if (!hid || !(*hid) || !uid) { + pr_err("AMD-Vi: Invalid command line: hid or uid\n"); + return 1; + } + + i = early_acpihid_map_size++; + memcpy(early_acpihid_map[i].hid, hid, strlen(hid)); + memcpy(early_acpihid_map[i].uid, uid, strlen(uid)); + early_acpihid_map[i].devid = + ((bus & 0xff) << 8) | ((dev & 0x1f) << 3) | (fn & 0x7); + early_acpihid_map[i].cmd_line = true; + + return 1; +} + __setup("amd_iommu_dump", parse_amd_iommu_dump); __setup("amd_iommu=", parse_amd_iommu_options); __setup("ivrs_ioapic", parse_ivrs_ioapic); __setup("ivrs_hpet", parse_ivrs_hpet); +__setup("ivrs_acpihid", parse_ivrs_acpihid); IOMMU_INIT_FINISH(amd_iommu_detect, gart_iommu_hole_init,