From nobody Mon Sep 29 21:14:09 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26D51C32766 for ; Mon, 15 Aug 2022 22:21:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348957AbiHOWVZ (ORCPT ); Mon, 15 Aug 2022 18:21:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349660AbiHOWRK (ORCPT ); Mon, 15 Aug 2022 18:17:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAF132E69A; Mon, 15 Aug 2022 12:40:31 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BABA2611DD; Mon, 15 Aug 2022 19:40:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8CE32C433C1; Mon, 15 Aug 2022 19:40:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660592417; bh=CBb0Nq4prmkpogVj+AXr6e4xJHBujYPfz49hr0sMgxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sHPljrCGhI4TfioskPw1/sqCiyypztr7uVrHd5mkf56V8ES4SUTYdbIT1rfaYSiU6 7QU6cBuLnLZZzC3nzgVbZf3ew2vDX5XrpRVUAwprlBqfCYeOAAhWOnPLJ9Q44wvZJ5 lIyauwRmToGrkSX+LX6pTRGWCpF+ZcUWW/YzWUEw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Srinivas Kandagatla , Vinod Koul Subject: [PATCH 5.19 0107/1157] soundwire: qcom: Check device status before reading devid Date: Mon, 15 Aug 2022 19:51:03 +0200 Message-Id: <20220815180443.921178647@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Srinivas Kandagatla commit aa1262ca66957183ea1fb32a067e145b995f3744 upstream. As per hardware datasheet its recommended that we check the device status before reading devid assigned by auto-enumeration. Without this patch we see SoundWire devices with invalid enumeration addresses on the bus. Cc: stable@vger.kernel.org Fixes: a6e6581942ca ("soundwire: qcom: add auto enumeration support") Signed-off-by: Srinivas Kandagatla Link: https://lore.kernel.org/r/20220706095644.5852-1-srinivas.kandagatla@l= inaro.org Signed-off-by: Vinod Koul Signed-off-by: Greg Kroah-Hartman --- drivers/soundwire/qcom.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -471,6 +471,10 @@ static int qcom_swrm_enumerate(struct sd char *buf1 =3D (char *)&val1, *buf2 =3D (char *)&val2; =20 for (i =3D 1; i <=3D SDW_MAX_DEVICES; i++) { + /* do not continue if the status is Not Present */ + if (!ctrl->status[i]) + continue; + /*SCP_Devid5 - Devid 4*/ ctrl->reg_read(ctrl, SWRM_ENUMERATOR_SLAVE_DEV_ID_1(i), &val1);