From patchwork Thu Sep 26 09:53:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luke Jones X-Patchwork-Id: 13813138 Received: from fout-a7-smtp.messagingengine.com (fout-a7-smtp.messagingengine.com [103.168.172.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B29FB2745C; Thu, 26 Sep 2024 09:54:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.150 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727344452; cv=none; b=aeWzATW7xcKRGHHy66PFuTcgAONWjx60xTNxv5FFeieqkc8jE0fbmInl6ya9UkwC4TBefVhN0d0JbWWiRA4wKfvwCimlh5hYyr3MRqkGrEmkNEX03KOd7BTGjQXpJJKfUtVWFkCGrahALWkxEQnEZ3yY7sBKP++0fCQN3txgAmw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727344452; c=relaxed/simple; bh=h60hLbOhYvhPPbw6fRiesv3vxzyV/S4kIi/JDhH/Uxw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dwldyxbCZkfPblBu1P3e0ebsxhKCPaUHLUVL5x9ViuXHvLlLclyKkBt8N/PnbNKdPQ2sSu3jrllqJP2ufvPCKwbkIxMWbqI4QBfb10eVZVyG16wnqjV1NshhCB5mMVOVjsBsxPmP3vVv2eSMA6rSlL4H3jsVX7cqZpLexbG7FU8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev; spf=none smtp.mailfrom=ljones.dev; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b=k9atz48s; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=YUtnaVyJ; arc=none smtp.client-ip=103.168.172.150 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ljones.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b="k9atz48s"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="YUtnaVyJ" Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfout.phl.internal (Postfix) with ESMTP id CAED913805F5; Thu, 26 Sep 2024 05:54:09 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-02.internal (MEProxy); Thu, 26 Sep 2024 05:54:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ljones.dev; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1727344449; x= 1727430849; bh=dpsn5bzp75GqLyhrAX6/Nz5GBf6o93F6imCWKpwhsUk=; b=k 9atz48s5EH/5d4lTTt3q/Th9DaNXNNS+zCBooFpxlRK8GhVdxWqZoGnTaj2Nq+u9 80NmbkBds86KHHp14kEAHGsr6h8GcPHP52DpO8+lM04AepgoDGWdXbON2s3sqHg/ IKB+XGsm0bPdRkOv6Wb1vmKcfWBbng+dtf/EPzmyBuQFS0TrFscht2zh3OqsMicm x4ffNrksfmXv/4V9xNwD9vRnYNf6+GW9ZuutTeBhCESdkBmXXSEnKnpK0xNBjxrx OFJ70em4Gg0anz1WoPoLmrKDmw1FltwZr9JHn+iAGCt3zDcBuZOjQmErlMJhXVFt EAYd/urIv1JqRwKT2/RXA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727344449; x= 1727430849; bh=dpsn5bzp75GqLyhrAX6/Nz5GBf6o93F6imCWKpwhsUk=; b=Y UtnaVyJRYvq8dNi/MlTUR/slQiU7WXSO3pWIKOpXEeUax+vBlm6lbTJw8kdSBCkq 0T1kh9t3IMMOB7FAUnIn4/S2Jlbn4KUJtFgMWP0fh8vVg01h9pZ9VhGjPPKUD21A zktzFP4SZv/ZyLQVCQohsbrG8gOk8ltSAesul2Jtu9HZEOxigdpb8RCKoy2nyuOy N4qyEoSsHNScVXGAH31w9TJwuptmlG8hLb5S+GAm7JmTI/pz0PGL45gMqssQJbLd KOtpUPBxqW1Vs0bQsJIIQ9+mnAsR6ux4FLj9hpLzN7t4EYU/6qDJ0Fl8IAzl28rk tlohpFK6i5vZqHeXFiafA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvddtjedgvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevuf ffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpedfnfhukhgvucffrdculfhonhgv shdfuceolhhukhgvsehljhhonhgvshdruggvvheqnecuggftrfgrthhtvghrnhepgfetfe dugfetudeuheetjefhuefggfelleetvdevtefhueeujeefvdegleevhefgnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhhukhgvsehljhhonh gvshdruggvvhdpnhgspghrtghpthhtohepjedpmhhouggvpehsmhhtphhouhhtpdhrtghp thhtoheplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtg hpthhtohepphhlrghtfhhorhhmqdgurhhivhgvrhdqgiekieesvhhgvghrrdhkvghrnhgv lhdrohhrghdprhgtphhtthhopehilhhpohdrjhgrrhhvihhnvghnsehlihhnuhigrdhinh htvghlrdgtohhmpdhrtghpthhtohephhguvghgohgvuggvsehrvgguhhgrthdrtghomhdp rhgtphhtthhopegtohhrvghnthhinhdrtghhrghrhiesghhmrghilhdrtghomhdprhgtph htthhopehsuhhpvghrmhdusehkvghrnhgvlhdrohhrghdprhgtphhtthhopehluhhkvges lhhjohhnvghsrdguvghv X-ME-Proxy: Feedback-ID: i5ec1447f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 26 Sep 2024 05:54:05 -0400 (EDT) From: "Luke D. Jones" To: linux-kernel@vger.kernel.org Cc: platform-driver-x86@vger.kernel.org, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, corentin.chary@gmail.com, superm1@kernel.org, "Luke D. Jones" Subject: [PATCH 1/3] Revert "platform/x86: asus-wmi: ROG Ally increase wait time, allow MCU powersave" Date: Thu, 26 Sep 2024 21:53:42 +1200 Message-ID: <20240926095344.1291013-2-luke@ljones.dev> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240926095344.1291013-1-luke@ljones.dev> References: <20240926095344.1291013-1-luke@ljones.dev> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This reverts commit 7e7a5dee49732ed01a3a17c9a3edf027fb9457fe. This is part of some hacks that are no-longer required when users have updated their MCU firmware to the latest version: - Ally 1: v319 - Ally X: v313 Signed-off-by: Luke D. Jones --- drivers/platform/x86/asus-wmi.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 08861792bddd..8daefd9a0d94 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -146,7 +146,7 @@ module_param(fnlock_default, bool, 0444); /* Controls the power state of the USB0 hub on ROG Ally which input is on */ #define ASUS_USB0_PWR_EC0_CSEE "\\_SB.PCI0.SBRG.EC0.CSEE" /* 300ms so far seems to produce a reliable result on AC and battery */ -#define ASUS_USB0_PWR_EC0_CSEE_WAIT 1500 +#define ASUS_USB0_PWR_EC0_CSEE_WAIT 300 static const char * const ashs_ids[] = { "ATK4001", "ATK4002", NULL }; @@ -4971,7 +4971,6 @@ static int asus_hotk_resume_early(struct device *device) struct asus_wmi *asus = dev_get_drvdata(device); if (asus->ally_mcu_usb_switch) { - /* sleep required to prevent USB0 being yanked then reappearing rapidly */ if (ACPI_FAILURE(acpi_execute_simple_method(NULL, ASUS_USB0_PWR_EC0_CSEE, 0xB8))) dev_err(device, "ROG Ally MCU failed to connect USB dev\n"); else @@ -4983,8 +4982,17 @@ static int asus_hotk_resume_early(struct device *device) static int asus_hotk_prepare(struct device *device) { struct asus_wmi *asus = dev_get_drvdata(device); + int result, err; if (asus->ally_mcu_usb_switch) { + /* When powersave is enabled it causes many issues with resume of USB hub */ + result = asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_MCU_POWERSAVE); + if (result == 1) { + dev_warn(device, "MCU powersave enabled, disabling to prevent resume issues"); + err = asus_wmi_set_devstate(ASUS_WMI_DEVID_MCU_POWERSAVE, 0, &result); + if (err || result != 1) + dev_err(device, "Failed to set MCU powersave mode: %d\n", err); + } /* sleep required to ensure USB0 is disabled before sleep continues */ if (ACPI_FAILURE(acpi_execute_simple_method(NULL, ASUS_USB0_PWR_EC0_CSEE, 0xB7))) dev_err(device, "ROG Ally MCU failed to disconnect USB dev\n"); From patchwork Thu Sep 26 09:53:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luke Jones X-Patchwork-Id: 13813139 Received: from fout-a7-smtp.messagingengine.com (fout-a7-smtp.messagingengine.com [103.168.172.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2DC051AD3E0; Thu, 26 Sep 2024 09:54:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.150 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727344456; cv=none; b=WRAJ7ooNWxV74s5XLWwSqzWG3J7P37wej4bobideFEQ7+QOiOUR1Eh015X2FwVOnrqDC6wuawC9OSChgREx0i/Af8tRbE6MoXwlyWvYc9UGOekAoUEHCFYUHMu1HO3GbQkPiFrkxrxEukITpAU+8TnjJg/7lQj1VNGQBOQ/PeL8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727344456; c=relaxed/simple; bh=K4r3ZHtDdVwxu0KYK9+ld+RhGfv+PjFdyOJ73N7Os7I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tx392KUcP/2YGB1Nqhub1x5kPG3GyCbvYVb67TFmG/MFjlot1fOXgxngPmzlZcho3C/CD/OyEAAVrHnRUokvz+D7aSGCL5Wox21iOVDqVcTKIxnHypgFartxKr3ixjzRXG1GeSM4MOiT0S1MBx8R2UC62E8tc8k/gphX1HJh7D4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev; spf=none smtp.mailfrom=ljones.dev; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b=sxw4I04C; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=hK93oYAc; arc=none smtp.client-ip=103.168.172.150 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ljones.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b="sxw4I04C"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="hK93oYAc" Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id 377D513805EC; Thu, 26 Sep 2024 05:54:14 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-01.internal (MEProxy); Thu, 26 Sep 2024 05:54:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ljones.dev; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1727344454; x= 1727430854; bh=ZFx6bHZZmYPBZHXbu8ROAgHZRPYt7Cvx5swag6tKpNE=; b=s xw4I04CCyhpEqfFhsiEIaoYX2ghpajEM2GHJUOwTHrEvvSyyaqYBhWutvX1RwOvZ g7I+cGonCRWvJ6gSDiEXguB4ZEgT4bc+BEQv3ymMEW9sIGLZW+oqj3DRgqy0Yi8v 3kZ1D45+rFjSJuBdBQLNKx6Jwp3ePxDNH2LoIZl3wEWbnR8iJeBoRhqHCNpPXqZ1 Q2VO5P4S1dbmef7O/v/kBibJV8ro04NjepVHg2u6Bfg2c6mwEBOHoPXBz3TkSTsl op0P+2wkR8Ukl0bj06Z2D+w6jjmUnT3KlvVb9U1WqPibBGsFusSBmZWpaKhm5CM9 QImumXVLBbjUqh6DgySqw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727344454; x= 1727430854; bh=ZFx6bHZZmYPBZHXbu8ROAgHZRPYt7Cvx5swag6tKpNE=; b=h K93oYAc9j6QhJ1Nb3QUOdXENs7FYhvuEpLY9+OQaPPgVIYNWdxDjeDJkHmq7M2HQ in12cxDnMjmUQPCxzlag0P0X6h1BStRZs+EhRClhLWRkxjADDhSD8bXVJ3QsaBLc kd4oFSuorj3JAV63YMKmH2rY50fMD/c7l+6gLexG9l78fOFAaktW6u26C04JVb1P 9ZPR/6SVgEF4AbhUScJonX5AR1/uz5ewMwlHBiIiBAgBdLNVAYp5TowEy15BxbfY 4zqnV/pTstYo1v3VgQD5g/mm6PsnzvmhzxMEgzc80M80+LU7A3TaFfkM0QuJfVYM tol27EkLM0o2ocVUBCrSQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvddtjedgvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevuf ffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpedfnfhukhgvucffrdculfhonhgv shdfuceolhhukhgvsehljhhonhgvshdruggvvheqnecuggftrfgrthhtvghrnhepgfetfe dugfetudeuheetjefhuefggfelleetvdevtefhueeujeefvdegleevhefgnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhhukhgvsehljhhonh gvshdruggvvhdpnhgspghrtghpthhtohepjedpmhhouggvpehsmhhtphhouhhtpdhrtghp thhtoheplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtg hpthhtohepphhlrghtfhhorhhmqdgurhhivhgvrhdqgiekieesvhhgvghrrdhkvghrnhgv lhdrohhrghdprhgtphhtthhopehilhhpohdrjhgrrhhvihhnvghnsehlihhnuhigrdhinh htvghlrdgtohhmpdhrtghpthhtohephhguvghgohgvuggvsehrvgguhhgrthdrtghomhdp rhgtphhtthhopegtohhrvghnthhinhdrtghhrghrhiesghhmrghilhdrtghomhdprhgtph htthhopehsuhhpvghrmhdusehkvghrnhgvlhdrohhrghdprhgtphhtthhopehluhhkvges lhhjohhnvghsrdguvghv X-ME-Proxy: Feedback-ID: i5ec1447f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 26 Sep 2024 05:54:10 -0400 (EDT) From: "Luke D. Jones" To: linux-kernel@vger.kernel.org Cc: platform-driver-x86@vger.kernel.org, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, corentin.chary@gmail.com, superm1@kernel.org, "Luke D. Jones" Subject: [PATCH 2/3] Revert "platform/x86: asus-wmi: disable USB0 hub on ROG Ally before suspend" Date: Thu, 26 Sep 2024 21:53:43 +1200 Message-ID: <20240926095344.1291013-3-luke@ljones.dev> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240926095344.1291013-1-luke@ljones.dev> References: <20240926095344.1291013-1-luke@ljones.dev> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This reverts commit e0894ff038d86f30614ec16ec26dacb88c8d2bd4. This is part of some hacks that are no-longer required when users have updated their MCU firmware to the latest version: - Ally 1: v319 - Ally X: v313 Signed-off-by: Luke D. Jones --- drivers/platform/x86/asus-wmi.c | 40 --------------------------------- 1 file changed, 40 deletions(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 8daefd9a0d94..27b9fa2c29ae 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include @@ -4962,43 +4961,6 @@ static int asus_hotk_resume(struct device *device) asus_wmi_fnlock_update(asus); asus_wmi_tablet_mode_get_state(asus); - - return 0; -} - -static int asus_hotk_resume_early(struct device *device) -{ - struct asus_wmi *asus = dev_get_drvdata(device); - - if (asus->ally_mcu_usb_switch) { - if (ACPI_FAILURE(acpi_execute_simple_method(NULL, ASUS_USB0_PWR_EC0_CSEE, 0xB8))) - dev_err(device, "ROG Ally MCU failed to connect USB dev\n"); - else - msleep(ASUS_USB0_PWR_EC0_CSEE_WAIT); - } - return 0; -} - -static int asus_hotk_prepare(struct device *device) -{ - struct asus_wmi *asus = dev_get_drvdata(device); - int result, err; - - if (asus->ally_mcu_usb_switch) { - /* When powersave is enabled it causes many issues with resume of USB hub */ - result = asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_MCU_POWERSAVE); - if (result == 1) { - dev_warn(device, "MCU powersave enabled, disabling to prevent resume issues"); - err = asus_wmi_set_devstate(ASUS_WMI_DEVID_MCU_POWERSAVE, 0, &result); - if (err || result != 1) - dev_err(device, "Failed to set MCU powersave mode: %d\n", err); - } - /* sleep required to ensure USB0 is disabled before sleep continues */ - if (ACPI_FAILURE(acpi_execute_simple_method(NULL, ASUS_USB0_PWR_EC0_CSEE, 0xB7))) - dev_err(device, "ROG Ally MCU failed to disconnect USB dev\n"); - else - msleep(ASUS_USB0_PWR_EC0_CSEE_WAIT); - } return 0; } @@ -5046,8 +5008,6 @@ static const struct dev_pm_ops asus_pm_ops = { .thaw = asus_hotk_thaw, .restore = asus_hotk_restore, .resume = asus_hotk_resume, - .resume_early = asus_hotk_resume_early, - .prepare = asus_hotk_prepare, }; /* Registration ***************************************************************/ From patchwork Thu Sep 26 09:53:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luke Jones X-Patchwork-Id: 13813140 Received: from fout-a7-smtp.messagingengine.com (fout-a7-smtp.messagingengine.com [103.168.172.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E08101AD40E; Thu, 26 Sep 2024 09:54:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.150 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727344460; cv=none; b=Mm47TOkEArRREm2teQtEFtk3fD/wpaT0o+shtfcHWhGIMOKcHImCmEf5k99xvHvFO7x9IMBfp6Y4jCnHFsCAfPRDoUjmrOzdlE5TLiE0MJEqMTQncw7RoYvvddpnDBJe/jrcd9wAXM5LKZM3VuVp91jGZdBYj0Zkrov4ezfy1iA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727344460; c=relaxed/simple; bh=G7aw/NqYcnc/D1+SAoG//bSgoeFNLtDlCLzjVu0B7Nw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MZWwPdXEJtwtPAVYXHMb1C7y2+PxYPtcX4Bon6YgFLsRIpq2cJt1URLOAyixWT6qcVBsvwZY6hlPxzXdPvp6JaN7SVxOjchJtKPYl5eH/m1QpWiznofwXNrC8ubt2TD98GdYb2vFUpewhpsYO1kIXkx2qYPVbZTm73ewRcB4U5E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev; spf=none smtp.mailfrom=ljones.dev; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b=vFyRzKzg; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=OvHp1GPf; arc=none smtp.client-ip=103.168.172.150 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ljones.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b="vFyRzKzg"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="OvHp1GPf" Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfout.phl.internal (Postfix) with ESMTP id ED99F13805F7; Thu, 26 Sep 2024 05:54:17 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Thu, 26 Sep 2024 05:54:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ljones.dev; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1727344457; x= 1727430857; bh=cez1vd1E6Fgprar10HoRDPuiMNPnzWbbx/FRrRyMs9M=; b=v FyRzKzgYjM6BMH6ROK11CwtBpvwfZVcHK2lGSRHAlhgUJay9VVvK9O7g53XDPKxJ 1LfTpiPMp4UJxBdVKvH5KT0I8MdX+sRM/JERgJ0IK8+j7P8UtxNEWSf/FEMGWqtv 7g1l1LgJZ8Tu+sOhfCw9TyZIXZxD0pKlzEH+wJQiDwPWOY+c7WTQ+eN1JHI18FAn FhVzdc0JFd0YLn29u5cwX8AMZfCidAbHjJbyGTutivqO0O/h1PuWg/iP/Ykpyifo +bw08QLoQEuAU0bH/4+1btKRqyc1m2DWu7UX+MAun4niIjHPCOS8TV+PlmozLlid oDTnB7M4sBaBLpcOJMEAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727344457; x= 1727430857; bh=cez1vd1E6Fgprar10HoRDPuiMNPnzWbbx/FRrRyMs9M=; b=O vHp1GPfB2d/0jRz/SPlaiREPL877cTMqJ4ROreiJLL9VTJzpZvbYNDIysAnxiiXA fH+5NEi302EWe6xCQaq+2Ke5scpcuiDMRS+m8xl+Ge5IY55MS/dIpfKPmzstxhT3 RdPY6obq+y6JPGAjrvCzEwL4Hfi4lWa/NgvjPLJiTcfUtrYYAkhiKZVBGe3guZBC tYYjN8YmGSNDGb4wuW6KzFSrSm7tyDbt4XvPZfdaTN+7EIh8ITBZPV2rxmLop01X 8Y34668CsdNp29BzLlyXrZZwF1itG4ahVvCkh2OGLZvc7wbMZoazYlsq87BCpAM5 UYBVYn6ui4v4hfIABeWbw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvddtjedgvddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevuf ffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpedfnfhukhgvucffrdculfhonhgv shdfuceolhhukhgvsehljhhonhgvshdruggvvheqnecuggftrfgrthhtvghrnhepgfetfe dugfetudeuheetjefhuefggfelleetvdevtefhueeujeefvdegleevhefgnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhhukhgvsehljhhonh gvshdruggvvhdpnhgspghrtghpthhtohepjedpmhhouggvpehsmhhtphhouhhtpdhrtghp thhtoheplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtg hpthhtohepphhlrghtfhhorhhmqdgurhhivhgvrhdqgiekieesvhhgvghrrdhkvghrnhgv lhdrohhrghdprhgtphhtthhopehilhhpohdrjhgrrhhvihhnvghnsehlihhnuhigrdhinh htvghlrdgtohhmpdhrtghpthhtohephhguvghgohgvuggvsehrvgguhhgrthdrtghomhdp rhgtphhtthhopegtohhrvghnthhinhdrtghhrghrhiesghhmrghilhdrtghomhdprhgtph htthhopehsuhhpvghrmhdusehkvghrnhgvlhdrohhrghdprhgtphhtthhopehluhhkvges lhhjohhnvghsrdguvghv X-ME-Proxy: Feedback-ID: i5ec1447f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 26 Sep 2024 05:54:14 -0400 (EDT) From: "Luke D. Jones" To: linux-kernel@vger.kernel.org Cc: platform-driver-x86@vger.kernel.org, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, corentin.chary@gmail.com, superm1@kernel.org, "Luke D. Jones" Subject: [PATCH 3/3] platfom/x86: asus-wmi: cleanup after Ally quirk reverts Date: Thu, 26 Sep 2024 21:53:44 +1200 Message-ID: <20240926095344.1291013-4-luke@ljones.dev> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240926095344.1291013-1-luke@ljones.dev> References: <20240926095344.1291013-1-luke@ljones.dev> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Cleanup some leftover code after reverting: - 7e7a5dee49732ed01a3a17c9a3edf027fb9457fe - e0894ff038d86f30614ec16ec26dacb88c8d2bd4 This is part of some hacks that are no-longer required when users have updated their MCU firmware to the latest version: - Ally 1: v319 - Ally X: v313 Signed-off-by: Luke D. Jones --- drivers/platform/x86/asus-wmi.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 27b9fa2c29ae..2c4094004549 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -274,9 +274,6 @@ struct asus_wmi { u32 tablet_switch_dev_id; bool tablet_switch_inverted; - /* The ROG Ally device requires the MCU USB device be disconnected before suspend */ - bool ally_mcu_usb_switch; - enum fan_type fan_type; enum fan_type gpu_fan_type; enum fan_type mid_fan_type; @@ -4773,8 +4770,6 @@ static int asus_wmi_add(struct platform_device *pdev) asus->egpu_enable_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_EGPU); asus->dgpu_disable_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_DGPU); asus->kbd_rgb_state_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_STATE); - asus->ally_mcu_usb_switch = acpi_has_method(NULL, ASUS_USB0_PWR_EC0_CSEE) - && dmi_check_system(asus_ally_mcu_quirk); if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MINI_LED_MODE)) asus->mini_led_dev_id = ASUS_WMI_DEVID_MINI_LED_MODE;