From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 CBF5E14C599; Mon, 22 Jan 2024 15:17:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705936673; cv=none; b=iAgYu89p09XhYiHEKMVYY/4DFOxPbvwGlmwyhUAu6u70ptXiOdGm8zvey/1i9Xq4nyr+og1SuDoJq1EvhP8hC4p6yQrQO5fb3fkdzf6jf74FV5QXlygY4xWZofuRYV0WQ7gzilxMRvN8fGaAqQt86qTsvsKhqDaV5IM7IzAa1X8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705936673; c=relaxed/simple; bh=Duf5G8RFJCYbHOwpwBD1F55O756p0JeBz9f8XmbBEC0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oNqlrA1tOgsYOFIpsKxKr+B/WOWdvLvHEtOXG+fIz5G9SNF+0a9Uk8nrecbfUSx2HQfyLAssrJadz7Z9K/7ebRqOf8fGE7TluzqEJSU78qZN8c8+9yFAT1ofQQcpahy3K38DjZXrsrHDg0/PPhYYFiN42sEfwYHm4dnRWqv5hQs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=A1pWxCCD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="A1pWxCCD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5BE5C43601; Mon, 22 Jan 2024 15:17:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705936673; bh=Duf5G8RFJCYbHOwpwBD1F55O756p0JeBz9f8XmbBEC0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A1pWxCCDabtw59c2G5rc8bbCBj2+1HgB7Ecv+izM/jFVMISQZNJJ2/gaEMwo2i1tV ESOOHvV0MNhzAvNAQJH6Z+4YGwmyMvwOJgZCDmD+zOlz0TdW/JdbvNFwC5+N8iJcc3 NdUmW1hQUaFTw4I6pkKlKwSFcXa0bjaDuW0PstJhidrzS7cR4q0zwlToVd4j8t0ajo v7BqQKvXQdz6gHk0nu0E6fVPBJI4RblBkz3Jwpa3/MdN2Rd0kyCtcWf9KWtOsYM85W djsuEYSdJLzWDOhYY1cs/EUp2tbiuMWcwroSoO/RJ8E6Ldmw96FlH8ecXvWgTzTLg5 ginlLGdUqyLsg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Werner Fischer , Guenter Roeck , Wim Van Sebroeck , Sasha Levin , linux-watchdog@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 21/24] watchdog: it87_wdt: Keep WDTCTRL bit 3 unmodified for IT8784/IT8786 Date: Mon, 22 Jan 2024 10:16:35 -0500 Message-ID: <20240122151659.997085-21-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122151659.997085-1-sashal@kernel.org> References: <20240122151659.997085-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-watchdog@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.267 Content-Transfer-Encoding: 8bit From: Werner Fischer [ Upstream commit d12971849d71781c1e4ffd1117d4878ce233d319 ] WDTCTRL bit 3 sets the mode choice for the clock input of IT8784/IT8786. Some motherboards require this bit to be set to 1 (= PCICLK mode), otherwise the watchdog functionality gets broken. The BIOS of those motherboards sets WDTCTRL bit 3 already to 1. Instead of setting all bits of WDTCTRL to 0 by writing 0x00 to it, keep bit 3 of it unchanged for IT8784/IT8786 chips. In this way, bit 3 keeps the status as set by the BIOS of the motherboard. Watchdog tests have been successful with this patch with the following systems: IT8784: Thomas-Krenn LES plus v2 (YANLING YL-KBRL2 V2) IT8786: Thomas-Krenn LES plus v3 (YANLING YL-CLU L2) IT8786: Thomas-Krenn LES network 6L v2 (YANLING YL-CLU6L) Link: https://lore.kernel.org/all/140b264d-341f-465b-8715-dacfe84b3f71@roeck-us.net/ Signed-off-by: Werner Fischer Reviewed-by: Guenter Roeck Link: https://lore.kernel.org/r/20231213094525.11849-4-devlists@wefi.net Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Sasha Levin --- drivers/watchdog/it87_wdt.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/it87_wdt.c b/drivers/watchdog/it87_wdt.c index a4b71ebc8cab..0a2c44a3aac0 100644 --- a/drivers/watchdog/it87_wdt.c +++ b/drivers/watchdog/it87_wdt.c @@ -260,6 +260,7 @@ static struct watchdog_device wdt_dev = { static int __init it87_wdt_init(void) { u8 chip_rev; + u8 ctrl; int rc; rc = superio_enter(); @@ -315,7 +316,18 @@ static int __init it87_wdt_init(void) superio_select(GPIO); superio_outb(WDT_TOV1, WDTCFG); - superio_outb(0x00, WDTCTRL); + + switch (chip_type) { + case IT8784_ID: + case IT8786_ID: + ctrl = superio_inb(WDTCTRL); + ctrl &= 0x08; + superio_outb(ctrl, WDTCTRL); + break; + default: + superio_outb(0x00, WDTCTRL); + } + superio_exit(); if (timeout < 1 || timeout > max_units * 60) { -- 2.43.0