From patchwork Wed Dec 6 21:21:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 750818 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="BqlF9JxR" Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2047.outbound.protection.outlook.com [40.107.223.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BB4BD5B; Wed, 6 Dec 2023 13:21:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VblodD+fbGsZ4x/VacJQMiyYvk0RzPgdEpzy6fdNU4eUxM67sONYxfOVfey5Xkv2vbMDLFbKNAlVcVeWtlSHkBnJNc0ULsxX2tQbgxQoh4p4BWgO4IXJ1EN4eb4r/E64Co1+WnHMj/FeNvZykezFXNfoN+QgIR64DiKA7a7utLjxJHqAjY9+PhegjRWgk8Y7V8+QjF0pWpRha4Cuyv7+PZEq+dY6mKxXncDolILZZ+gyFERABKLP0ZIR4RAZZd+26RSLLAsaXoXteC3qA1lHuybO8xbi65KPpbHpZXcDiCCmH+KpbW7q1Cpxx7kwtyNKRhSnCkQk5JssHiChlWCT8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=au2cpbVPtCOztqv182LcRqwqRxVcvEX43ihrmpNCi7Y=; b=J1eLZryCckEXN4rgzTB3+r4CGPmndKCNN/H7eWT7JZJ/7sIge4p0OB8LsVGFt+WY2Nflk0UZP47REG09Kn0Ckk+zzFIeY2Jdwx1Y395TBPtGVI1s1m2PmQc8IHHX0UGuD8kuXv1G02dQQK0Ax+drXji8NZg8HDJ8avp4Lkm/FmZpbNNLMaCpmW+QWNcq++22vie9qH3k7h7sq40h9jfPOA3vxkxl9U6tLjPqmeKQM+5cRmViHzZOf+RfPxOPx0QBmZ004+n7Wmv+JN2CFqS4pcNgrh9H1/476hSV4Vr8apJkglxgqkVXCLExqNoeL84Xm8vKp5KC/WW0+UXDq5nM6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=au2cpbVPtCOztqv182LcRqwqRxVcvEX43ihrmpNCi7Y=; b=BqlF9JxRtpEEZhXJaYsTlZ7FE3DuQ3X2AL/LSTrjWqYJmQr/yAKRD0KRJd1Ubc19gfpJYo1l7NNz1ftBIYte6r0K0tVEBrKUiHCC3iJnknCsWOyTz1ZhLERqmHmijCBuIGA8k7SlhLDDIxo5ogiWjjcT0N1Y9QnScONjD8z7udY= Received: from DS7PR03CA0241.namprd03.prod.outlook.com (2603:10b6:5:3b3::6) by MW6PR12MB8757.namprd12.prod.outlook.com (2603:10b6:303:239::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34; Wed, 6 Dec 2023 21:21:55 +0000 Received: from DS3PEPF000099DD.namprd04.prod.outlook.com (2603:10b6:5:3b3:cafe::2a) by DS7PR03CA0241.outlook.office365.com (2603:10b6:5:3b3::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.33 via Frontend Transport; Wed, 6 Dec 2023 21:21:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS3PEPF000099DD.mail.protection.outlook.com (10.167.17.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7068.26 via Frontend Transport; Wed, 6 Dec 2023 21:21:55 +0000 Received: from AUS-P9-MLIMONCI.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Wed, 6 Dec 2023 15:21:54 -0600 From: Mario Limonciello To: CC: , , , Mario Limonciello Subject: [PATCH v2 1/2] Input: i8042: Avoid probing if no keyboard and mouse are set in quirks Date: Wed, 6 Dec 2023 15:21:39 -0600 Message-ID: <20231206212140.7458-1-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099DD:EE_|MW6PR12MB8757:EE_ X-MS-Office365-Filtering-Correlation-Id: 087f0af4-0778-42e2-0c3d-08dbf6a15f53 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ts6PYfKW9vEXHr33KjD6oteaBZpHHuVhZMxlZrI0VulOxMnoar2tIcc3IwKg2j+hJLGaIE5HpTUylfYG5Pq9BR91o06kQ2SopqXSHcOWkQkuYygWnGL25rmJwY+o/I17daoUAXK14ILuyJK7yw81rm2YeIWTqpC5uPG2vx45tv62ekWKCZ3MHg8nOJjCNZQG2zyJgV+DTmNH81Vm3sHG7zG7DwPmC1lRWfuaRNqRQuettmuA+fuP+WC4GYLBEVVMd16PgHKkqmp9VH4ehwthCGSB/qf0oyv4phIogOvBFwowgxrcNykDWiGW1O/06GJnqLDa0AaYeze+4BL6LDoghWjJMNaRHqB7cLgG6UeUUWcWdZ8Jb+ItWGqnCDCnJkGV7bfc+aajSkWgq1ToncrMHxVUTd3lpONu5ILU4KCuPu9EoyPQr3WP/A6gzAo4kqLJdzCpofdjdhup3SYJWq8uDY8oIOvV8Kgzuc8/ek4nNcysttdBJ3v5A7dGFlgv2eyDcinvL8PJfitMXqFRMSqXprOLa/TuaPbkIB68IPkNBbUbPxhmgUXA3mcR7XgiPxlbz8VvajEDLlTLOaRY7DOeZ66CwhkPphXxNb/jGsWUG2VXTlcc1Mcop1egHbblZN8AkOu1Lqd3qXidsyN4lZvn2JUm5iOEp4AS1dfGfc2dg62nbDDXw/aPaaQYG4hPcu+9cxvXgCwyyPbHk5glZqecPYtjhwp60W8pLrHj1M7Qd+Q2uphSsCzYbxp/tRthQsuT9phT73cJVIU/TM+hxlLS+g== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(376002)(346002)(396003)(39860400002)(136003)(230922051799003)(1800799012)(82310400011)(186009)(64100799003)(451199024)(36840700001)(46966006)(40470700004)(36860700001)(6666004)(7696005)(40480700001)(478600001)(54906003)(356005)(70586007)(70206006)(81166007)(316002)(26005)(16526019)(2616005)(47076005)(1076003)(4326008)(8676002)(8936002)(6916009)(426003)(336012)(40460700003)(82740400003)(44832011)(5660300002)(4744005)(2906002)(41300700001)(86362001)(36756003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2023 21:21:55.1721 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 087f0af4-0778-42e2-0c3d-08dbf6a15f53 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.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF000099DD.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8757 Some laptops have an i8042 controller in the SOC, nothing mentioned in ACPI PNP and nothing connected to the controller. Add the ability to skip probing in this case. Signed-off-by: Mario Limonciello Reviewed-by: Rahul Rameshbabu Reviewed-by: Rahul Rameshbabu --- drivers/input/serio/i8042-acpipnpio.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/input/serio/i8042-acpipnpio.h b/drivers/input/serio/i8042-acpipnpio.h index 9c39553d30fa..0fd88bbfaee1 100644 --- a/drivers/input/serio/i8042-acpipnpio.h +++ b/drivers/input/serio/i8042-acpipnpio.h @@ -1707,6 +1707,9 @@ static int __init i8042_platform_init(void) ""); #endif + if (i8042_nokbd && i8042_noaux) + return -ENODEV; + retval = i8042_pnp_init(); if (retval) return retval; From patchwork Wed Dec 6 21:21:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 751488 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="sTgsF0JQ" Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2065.outbound.protection.outlook.com [40.107.93.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67F6DD5C; Wed, 6 Dec 2023 13:21:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ElNEAslK/k29fP3QId0mqKFEkdtqji1iUaiN86yxzCUwELkzi3vfF3CHQssWl+MqpikSS38/KwbPQOPyBMrlEtTNNPldX10jn/0vOnaGz0vBq2/xO8TVK19x8T5VnsJKhysvL4TYKxXjo7gAwEX5UtreAQnnlliWzraTPjIMpU/1uMV1LrHQTn1OjkKQ3HQ9IkEE3ASQi8kaqeRKLeIo3iYOtJVCpwwGcpWv+N4ongIzlmZntKo7aaxSXUUDeNwotnUV5qmt5h0xuJr5HKKhnGadazTBQdzaadYc3Bn5ESJFZgs8LjKsrPaDIxIBBJgHTvPBOnXB62q4NS8fyTMqbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oVvv84fCwhp+OjJzJ0AEnSnAsmhYjC0YQRUMDk5O8O8=; b=hpKaetGwjzmaiwCno7n58J7a0rXS9Qhu7FX4012O1NdIJYAgn9KQcjxpr+lOuOrarDOuNKBbc7gW5s8VjyxQaUDnzpalhyPouTssIMWBZ4denrcBh/lnAANSbVzy8y/WlRLw4PDPM7KL4T6dNA5gaqTj/GFBUc+4F3SI8bNtIsnSnQ3UDpjFlHYKzMt+d0hNA4CTrNUC0oxW3shyxFkgH4Yu5NCIPa8U5PFCcnhNJijw8TTYC8emigohRVIO7qU5GavrecFpsZRnX5wzWdTGgKCuVuykVi4it3uy9KJbEydCblxwJA6HFyH3TUVap2YNrgLBSDniiqkqQLHjm9nIMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gmail.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oVvv84fCwhp+OjJzJ0AEnSnAsmhYjC0YQRUMDk5O8O8=; b=sTgsF0JQSG9aHJkXdlCwOER3gGo14mEGsI3c5C8wf/3137RV1FCHqzMTN+V0rwDB7ikr57IloShnlHAy3TUwx4pgawMqeaaVNLxOA99h8t1mAUJlk9cu51AsCMQQ/7CyhwQFMsjFaZej/CGVJ+bcFUZR4+VDodVcT+U7NTBP3us= Received: from DS7PR03CA0269.namprd03.prod.outlook.com (2603:10b6:5:3b3::34) by CY8PR12MB8297.namprd12.prod.outlook.com (2603:10b6:930:79::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.24; Wed, 6 Dec 2023 21:21:56 +0000 Received: from DS3PEPF000099DD.namprd04.prod.outlook.com (2603:10b6:5:3b3:cafe::45) by DS7PR03CA0269.outlook.office365.com (2603:10b6:5:3b3::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34 via Frontend Transport; Wed, 6 Dec 2023 21:21:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS3PEPF000099DD.mail.protection.outlook.com (10.167.17.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7068.26 via Frontend Transport; Wed, 6 Dec 2023 21:21:55 +0000 Received: from AUS-P9-MLIMONCI.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Wed, 6 Dec 2023 15:21:54 -0600 From: Mario Limonciello To: CC: , , , Mario Limonciello Subject: [PATCH v2 2/2] Input: i8042: Add a quirk for Framework 16" laptop Date: Wed, 6 Dec 2023 15:21:40 -0600 Message-ID: <20231206212140.7458-2-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231206212140.7458-1-mario.limonciello@amd.com> References: <20231206212140.7458-1-mario.limonciello@amd.com> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099DD:EE_|CY8PR12MB8297:EE_ X-MS-Office365-Filtering-Correlation-Id: 131f00f8-2613-4dd8-f4f9-08dbf6a15f9c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yWM25TIHx6QJ+jUXl5grZnReXdnc7/6K9jtGWQ9iENd++op3LlWEj9BvxjgTV0xnmGbqwSiQ8xvLi/ttXnKRHY49SkOeuO4SbTyW9u35xQUdXOvbk3tQuPFqBW9sPeHVa75KPYJv8QAUs+3rmzIomgF8W+4RHYVB3R31nFwiWhIKC1GfCWSKl9T8njsnnr0DrRCz543lZubsNaXeVi8tI2kqcfVxlbolAvUjyytXJp/EVLg0c/E4KO75LvU2dlbwQKF93hcvs4wBlbmBO7t0As/dxhY2ca01BUTN+0LdRE9BiZmiMEg+/qzS3Qye1OEvCwS5CeWukRqRFL5GqRG+Rv7JrWFluif96ZoqRah5Ph9i6q9UlI6RO+I7W67k2jbs+8c3xKXNleTbW85kKkIjqM5Sgj4QkbYqaxbN0PCJtUPm31mUnVaQ2AUZNQPQvKOxnaZJy3z9dpd49Nh1VTdiA7zqv/OwsaoUYAANnZT7nDzQsV9hRoyX6l7zDQfEDl9sulb+gg8q3KWRm1p5ZWGbZ8Ntgfmqn3k1TgIoKSdYCS4DDNP7HNq2Nlv6i42mgxOiy0Tf6kVHiZx3W3s6sl7xNcPyKf6A8xmZd9i0h+GIMaPALSRAr0kzMjGGMn8W6ZWCZ9eJM/NW4aSJ7L5vnhOPjU71PNMsfxB8scZ79pSr6tW1wnyrOK2O7UOsPimPcrw7uzmIFcJhKwF0Pqd04z98x3DMEqZtxa6wNY0BkkFVKMTD5exfxOx8oFlUxztglwdpvRMbHdA7xffRL+9eOFS6wg== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(396003)(39860400002)(376002)(136003)(346002)(230922051799003)(64100799003)(82310400011)(1800799012)(451199024)(186009)(36840700001)(40470700004)(46966006)(1076003)(26005)(40480700001)(83380400001)(40460700003)(356005)(36860700001)(7696005)(2616005)(81166007)(82740400003)(47076005)(5660300002)(2906002)(336012)(16526019)(426003)(6666004)(36756003)(478600001)(8676002)(44832011)(316002)(70206006)(70586007)(41300700001)(86362001)(6916009)(4326008)(8936002)(54906003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2023 21:21:55.6409 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 131f00f8-2613-4dd8-f4f9-08dbf6a15f9c 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.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF000099DD.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8297 The Framework 16" laptop doesn't have a PS/2 keyboard. At bootup the following messages are emitted: i8042: PNP: No PS/2 controller found. i8042: PNP: Probing ports directly. i8042: Can't read CTR while initializing i8042 i8042: probe of i8042 failed with error -5 There are no PNP devices as those listed in `pnp_kbd_devids` but i8042_pnp_init() ignores this and still runs and will continue to try to probe. As there is no PS/2 keyboard or mouse in this laptop, set a quirk to avoid this behavior. Signed-off-by: Mario Limonciello --- drivers/input/serio/i8042-acpipnpio.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/input/serio/i8042-acpipnpio.h b/drivers/input/serio/i8042-acpipnpio.h index 0fd88bbfaee1..6a71416057a3 100644 --- a/drivers/input/serio/i8042-acpipnpio.h +++ b/drivers/input/serio/i8042-acpipnpio.h @@ -1310,6 +1310,14 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) }, + /* Framework 16" laptop uses an internal USB keyboard */ + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Framework"), + DMI_MATCH(DMI_PRODUCT_NAME, "Laptop 16"), + }, + .driver_data = (void *)(SERIO_QUIRK_NOKBD | SERIO_QUIRK_NOAUX) + }, { } };