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 A6AC522EF7; Thu, 18 Jan 2024 10:54:25 +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=1705575265; cv=none; b=bC7SvDlKFTbKNZFq55zVpezY3oFTnC8wLxBThDpXfm4soK029Bc5VkRhc836gk9ZeTP2PV35L9ZCGYS8K+w+RouVjB7D6JOCULIhrkvA86NjyaCNA5jpafb/Fo4/n3ohsqWuC9m/oNoUo2X7foG5JezFRCZ2XeBiJTjLXkiKC0c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705575265; c=relaxed/simple; bh=n8R2yQgQLdYpwvYMLJdlMK/Gpqdhcb9NXxCVyheeTbM=; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:User-Agent:X-stable: X-Patchwork-Hint:MIME-Version:Content-Transfer-Encoding; b=GqYUaQaU3+icjbjRtSUOrAkjB+qEb9U5guaI0JmSBwdKiFTNEmb5IO+r/9A+CsbS5sCUu+v7MKr15wcLp6L3UeZbIRTpuvMszDKhbxWlpj6CJNckxgXyaEHRPtSSmeyhcWc9kf0lagnNC7mLpVN727RpxSk+VPUYCpN/U6Zg7B4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=AdzZo1EK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="AdzZo1EK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28727C433C7; Thu, 18 Jan 2024 10:54:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705575265; bh=n8R2yQgQLdYpwvYMLJdlMK/Gpqdhcb9NXxCVyheeTbM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AdzZo1EKZsqOaGyATX4kFPkLlDV6tdPtbT/6tOVa5Ag75ekYoU9LPdDGRizYnxTZM TbXNfkt8uuGCkm8f48NYg4JiEJrIBEkbUTVA/X2FNqGOvHLwZq582VycSyUeMIBf3Z 93egaN+skZeWilYLH1bWRbqmDojzEII4KSO9UcjY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chao Song , Pierre-Louis Bossart , Bard Liao , Vinod Koul , Sasha Levin Subject: [PATCH 6.6 071/150] soundwire: intel_ace2x: fix AC timing setting for ACE2.x Date: Thu, 18 Jan 2024 11:48:13 +0100 Message-ID: <20240118104323.263399189@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240118104320.029537060@linuxfoundation.org> References: <20240118104320.029537060@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chao Song [ Upstream commit 393cae5f32d640b9798903702018a48c7a45e59f ] Start from ACE1.x, DOAISE is added to AC timing control register bit 5, it combines with DOAIS to get effective timing, and has the default value 1. The current code fills DOAIS, DACTQE and DODS bits to a variable initialized to zero, and updates the variable to AC timing control register. With this operation, We change DOAISE to 0, and force a much more aggressive timing. The timing is even unable to form a working waveform on SDA pin. This patch uses read-modify-write operation for the AC timing control register access, thus makes sure those bits not supposed and intended to change are not touched. Signed-off-by: Chao Song Reviewed-by: Pierre-Louis Bossart Signed-off-by: Bard Liao Link: https://lore.kernel.org/r/20231127124735.2080562-1-yung-chuan.liao@linux.intel.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/soundwire/intel_ace2x.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/soundwire/intel_ace2x.c b/drivers/soundwire/intel_ace2x.c index a9d25ae0b73f..e320c9128913 100644 --- a/drivers/soundwire/intel_ace2x.c +++ b/drivers/soundwire/intel_ace2x.c @@ -23,8 +23,9 @@ static void intel_shim_vs_init(struct sdw_intel *sdw) { void __iomem *shim_vs = sdw->link_res->shim_vs; - u16 act = 0; + u16 act; + act = intel_readw(shim_vs, SDW_SHIM2_INTEL_VS_ACTMCTL); u16p_replace_bits(&act, 0x1, SDW_SHIM2_INTEL_VS_ACTMCTL_DOAIS); act |= SDW_SHIM2_INTEL_VS_ACTMCTL_DACTQE; act |= SDW_SHIM2_INTEL_VS_ACTMCTL_DODS; -- 2.43.0