From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753043AbdHJR6U (ORCPT ); Thu, 10 Aug 2017 13:58:20 -0400 Received: from mail-cys01nam02on0075.outbound.protection.outlook.com ([104.47.37.75]:26304 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752756AbdHJR6S (ORCPT ); Thu, 10 Aug 2017 13:58:18 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yazen.Ghannam@amd.com; From: Yazen Ghannam To: linux-acpi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, rjw@rjwysocki.net, lenb@kernel.org, Yazen Ghannam Subject: [PATCH] ACPI, APEI, EINJ: Subtract any matching Register Region from Trigger resources Date: Thu, 10 Aug 2017 12:58:03 -0500 Message-Id: <1502387883-16667-1-git-send-email-Yazen.Ghannam@amd.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: DM5PR16CA0022.namprd16.prod.outlook.com (10.173.216.32) To BN6PR1201MB0131.namprd12.prod.outlook.com (10.174.114.144) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ae4f5f2c-59bb-4b81-be65-08d4e0195fd9 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(48565401081)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);SRVR:BN6PR1201MB0131; X-Microsoft-Exchange-Diagnostics: 1;BN6PR1201MB0131;3:hiCSxY+mg7oVT24b1teZwEzpvmwlnuSZ7zdHxzfyxyVdlAJuADtBbdTJg53rqOR9Rg4X1jXh0TmfTuyv5JDANGIcGj3cBySMIy8igGN8y60M9TcbLg/czK6rYZn3C1blWP0EdLsz+2+8WfGhn92J//bed0zzcH/wLpIHbL+JLemTjsQ5Wdyl57Ac5gsRe0utBlYElgCkOdxy8NOM5LcfETV9ZWgceb7hSS8I5TC/rOBu1H2IGmH7habuN+GmRqA+;25:b0R4jNDTfBN7aRYXR8HH6j/qmDVp8db4Kcwwye1oBEwJwRYBE5bASNuaRz/d75DlweH6Vpr/TonZg+RGtIql0csTpH4yz/UIJNPGbWpVtVuV8gEO/MOKYszPg80jEPUAGplwmB2hcMAar3wSEmQyzstmGjUn+HhdZMfEcIM02PsujuuVNE9zsikqzKLwDMYZaj5u9UJwjwJfeitdhzm47T7Ic6etZyLfLeR4ghZyQ5bp8oJ54EqvFtXlYVFWUkxfCTNL0n+6Zd5JKIsyipQ6ee4uEUsq5GJlkzoMD9HD31nrgfuh+SPyTdonX3cC/oCIC5wqXcBZMsD+Z3o0FTUjmw==;31:LfUI/h4wP23McfpUVVlRcUxF42RTKQimnrutT0b8tF7EWwaam5gmGwyByRhc7kWKWyzOmzXq9rGk9Zc5agPMy6gAyoJ5A+NBBJuOlb5qoSJgY9I+Za30iXN7/qsFB5n19H1EsL05dlo5usB3rztVQvaFnrqyj/1vZLlIiv66q0q8JRtJV+/0EpwwtgjNycEsy7YNJRIsmfryMZQfsJkG4VrUUBf2zZRPnl1kg152svg= X-MS-TrafficTypeDiagnostic: BN6PR1201MB0131: X-Microsoft-Exchange-Diagnostics: 1;BN6PR1201MB0131;20:2uRvIOMABwpaEBrqgZEZjHDg8KUbvhKO//4/z5bR/bl7VbYRx+rqTIQSgfdJWxGe/Ff1SnwtLcqpPK645HV2S7hbvoAuE7PF9/8jt1rdb5a19m1Z+MHsjJLP5pJJSAERuYDK2rQiVp3vbTNuZ9RRfBgEEJ/nA7tcrAh92PG1MulAKNVAIWQJ1NoVoN9RTYx+uepTo9NeisUDwxgUzv8DSI3Z2ZZybNs1erYh2y+sXu14dr1grfSKyvI3Qd66Df1gkMLc0HViUfJdpOQg402H9Eu6ifYK6MWrJWr1kvNporxelrNKxJnTuQY9q5yYZLcrXi08OHS2GVGtOWxu2V2e/ZIp0js5LVEwgSjkBJIdAdbeJAygmgvHhz3dfFLeCrvOGfdnAE+sKP+r47k6GNjxS3jHzI2FI68qD+kTEL5txgc9KTWwvaYaEwZFQdg+KL2qXS1lhvi4GG9Rc1laMHsrDnwbaXqie51fn0dWmn61+QT/2ibFGPWdIGFo1BvQC06a;4:m8KLQWhz2zS2rHh8ajB03Qo6okwQToa7pguKkPIWjsq4asA1MlLhSWNOms33l5PUTP2oKbJvC2x1d1B++mAxHJh1Vb5Yfeeys4wf1Zqd2Poblrm7OClc05geQw5yPy/i3oZvkkC3QckH/RQ1Dq5zSkM33RYlRCXmHo5KoXXlweiIDcdF5RS6OMkWfHgHLcYqK3vaI0pyEhE77K/FJcdknIMbwXni138Y9wUvM4MvDWnNBDWgZsV6+bdnX3PWajxQ3ZL4kaIqETzBHTJs0dYPbWqgqFtbF5/5MKk3Oj6IJiM= X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123560025)(20161123564025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:BN6PR1201MB0131;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:BN6PR1201MB0131; X-Forefront-PRVS: 03950F25EC X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(7370300001)(4630300001)(6009001)(39450400003)(39850400002)(39410400002)(39400400002)(39840400002)(39860400002)(199003)(189002)(101416001)(5660300001)(4326008)(8676002)(25786009)(6916009)(50466002)(48376002)(86362001)(575784001)(305945005)(189998001)(6666003)(50226002)(2351001)(7736002)(5003940100001)(72206003)(50986999)(81156014)(66066001)(36756003)(38730400002)(110136004)(47776003)(81166006)(2906002)(7350300001)(68736007)(3846002)(97736004)(6116002)(106356001)(53936002)(2361001)(105586002)(53416004)(42186005)(6486002)(478600001);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR1201MB0131;H:yaz-diesel.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN6PR1201MB0131;23:tW6KSs7KJ1ZkxGvCSyK2oudXZIfPpViFXLDh5e9?= =?us-ascii?Q?awC2oo0okQp9rWpPSkBbEHV8N9wJHPmuxRIjvzPOey6h2wFDpdeJkbN6vjRm?= =?us-ascii?Q?6qh+AH7QxbSPDxP6mTO5aAq6J34iDJaZODMR0ahT3UT8PNDX2mPX/xEwZL2L?= =?us-ascii?Q?tBkjZ82x6B79HYYP3P9tIaPKLxsvt1uQU5B7s9z9BPplDMti4h0cwYggpRwG?= =?us-ascii?Q?+LJNGZ3jdXAzQcNif/vJ/7lu6nY3FQAyT8eXWUd038VKCNiHOmEnwEgKQFsc?= =?us-ascii?Q?G3PNmYTnhzi5AtnFp9P/MLhA6WQOGk0KLv9JH45doaGQ/4QjD2/pqcqhVr/m?= =?us-ascii?Q?pemwBVfmI9fDK+jAgwyI5hWzTuSkDtBfu8ic82NmProvqaZh1TubFNJlFC4n?= =?us-ascii?Q?ywOqnJAWiWl7Jmtcoz9wNO5HhjEWqqXx6X1xnGbruIMxRM09B4gsOPEB1SUw?= =?us-ascii?Q?eCc+Oi/wh9+RsensZxA2GVxbg2Ih2uwWeJb+dJzH5fnyfX01vRlRoOV+4VDG?= =?us-ascii?Q?4EpY+vKWWobSCYGltIMBLagTANoUx+vz6HZExku9dBluT/P+zV0foYdH3fb6?= =?us-ascii?Q?ge/wSfk34m6dvHAiOBlZLXEHnLIToflGod/f9laqVYaUMoElLDHMuI1tmZr7?= =?us-ascii?Q?2ufhnugoQs3i90z3WeJwe5mTtbg+ohNstFvH1qBNLP1sM/CbxkON6gaQ8HS8?= =?us-ascii?Q?ivHb2UuP1p+4rSkXAdEB/zph1bbvRENK72aHXBUnWQyRI89JJgYOJyFA7B3q?= =?us-ascii?Q?z2sZEsG9MqFffXBz2y76hzlDN+FdK2I3V9sDSTFVbvrQ+j9ZBe9k5thelEyb?= =?us-ascii?Q?13jnXkS+3AdPZzp9qnBNHTyNZACfvDJD4mVkbhjhxhAK5O6oOJN/XpCymU54?= =?us-ascii?Q?9xOFqGlp4Hj+sWJu+nZM74ZIz/pva4FssuBlA4abw9qq1UxkaGGGMcRZJ4La?= =?us-ascii?Q?lHezzlGl97djYmziwcoEsueZPLwn6FsuT491CDbryB04NqZqohhOawVHVwgI?= =?us-ascii?Q?5Ezfw9LjbVI0ZNBoETlnxQ591GdT3jMb1bU2j3W8HVFTAvV9P3xJ/QCQPrOq?= =?us-ascii?Q?KZzrHSwlgi3q8Cqyk3FRoL2FoTrExVJXJf0GMw0VgJA9gruKeRVtti6RLKgj?= =?us-ascii?Q?W+Y56wvFIQzRiSGlumRPZ3e+yoa4Q9dypioSDBHHo1JY5BeNhzs35B5SwUoT?= =?us-ascii?Q?F9Eir2twMIzCLw2ZEkAZS//sxH1ffu7CvW21v+lwrPVs1ewvnZuwt7qc6apx?= =?us-ascii?Q?8vsp5a/6U4wiNUYAoTszS7akn7hifeiAySCFmohOk?= X-Microsoft-Exchange-Diagnostics: 1;BN6PR1201MB0131;6:ejnMeGwes6K3CbuaFzS3lu4cLU/SwypJvDAk5slZN8e0XIE/F19ZAqDgM+vnb/KoiYsXUK4pB0UQcP2Cn3I9zKLWOCOV8JvpttEBv2vrlVuyCcay5QKtyZMDe/qoYzL7kAlEn8nSCAENoSC0E2jEk54Ejh+vPsu3Zm7MoczVaCZIWt8lll9OfCLEJyBhU+ithXZbeH/5k1+JmgJW72KPYKROrUBApB5BysBtOB2qRntxwudXpGzfhdbmm6Uy5/tFtNMe857yqQKIVF0hgLIpixt849TFUwaHpTYkcpuRfM9hHzBAB0XNR0CT7ze0yv5liuW5Jd/BJea7mG7c8ytpMA==;5:Rh/eb9PXB/7ewRvxaEJiUVCfwURFJkvGM6HgwZozyn9Clzw6deczyXbnheQjXRO2e363RH9bgP/+wQsvd8jVddmO1lLprMQQEB2fbdab6gbeDx93EMRmt86BLNsK4GGk1+Gshel6alGycQV1sv+PwA==;24:gEEPsPeEcKIsY4n3/HGCPs4LK6Boa+apzRfIjkjyKwiHfgWiZOaGykymXaK/KRRVxpdqHzSjK2kRz2lm/6Vvu9Wvi5wGPRLLfFvgTFkRDsM=;7:ImJpOR2sywatLShTYtTXvOGfON41UaPK5R5MUb4+HLnI0Rxhs16/RETJ/HaVpWmOknDd1TlGOB6veSNjJ+cp6R9CH0SeIxE+0RkO/prejet06050PWx1nD73Ohvl8dct1n246cgBbzVDa5/HhSMdL/nGTxx/HyWmTBk83+aO8MovcgIFwKe0PPY0O9bciAs7VklpKR+CvK6036gJ37AInOQjvzuI+/yhnwOOdxj0RcA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN6PR1201MB0131;20:LxLrw4XDo1WbXOPuQX4CoKv+paBVqSvzJLLQ3d27UTeuUph8942qgPsoHUiiNs+hoX1qBY70DLi+4KUTv9/iYrHahMm83ZeNhErv/yaKx2OVLKFw4df9j1PX2llSg49X52gZcfZf2gUcuATL3JRXBVuPg9hZnnVxyZoPs9h7EduoaIWY+i5tLGsQgzo+q24uaIOeG92QVq6eyqNVZbtyf9DpcnjV790HgkiCl07ySBncDQAXiZunbfMCKKWJeNtK X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2017 17:58:14.7367 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB0131 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yazen Ghannam ACPI defines a number of instructions to use for triggering errors. However we are currently removing the address resources from the trigger resources for only the WRITE_REGISTER_VALUE instruction. This leads to a resource conflict for any other valid instruction. Remove the WRITE_REGISTER_VALUE instruction check to fix the resource conflict with other instructions. Fixes: b4e008dc53a3 ("ACPI, APEI, EINJ, Refine the fix of resource conflict") Signed-off-by: Yazen Ghannam --- drivers/acpi/apei/einj.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index ec50c32ea3da..e0f201ea161d 100644 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c @@ -281,7 +281,6 @@ static struct acpi_generic_address *einj_get_trigger_parameter_region( ((char *)trigger_tab + sizeof(struct acpi_einj_trigger)); for (i = 0; i < trigger_tab->entry_count; i++) { if (entry->action == ACPI_EINJ_TRIGGER_ERROR && - entry->instruction == ACPI_EINJ_WRITE_REGISTER_VALUE && entry->register_region.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY && (entry->register_region.address & param2) == (param1 & param2)) -- 2.7.4