From nobody Fri Dec 19 10:41:47 2025 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5CEE1183CDC for ; Mon, 2 Sep 2024 14:10:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725286214; cv=none; b=BLtsC8s5eMsF7+sa9D5Cu/j3URqAib27bW92s1o5hE1KH3VX8GCOWMlUxaJuvVulFml5dGzjvNCLXCE6FjzZw8mY1jmDLTSmPnSjVWvCQyfuD66Q7WG90OUxI5GMfIXRB+lGeCov3YKDkWSBMb7RCtFr2POFD0aee7xOvkUNJsA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725286214; c=relaxed/simple; bh=Rqbvxj3n98trjlHdrE5VMKTk4FUqRBiiWZY/N59Lh94=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CpKuvlxuUHQrDxg0X4jtcLspKoHU1v6VflahhJSpVQv6CwOq4E+I8aGxh3KEVKSCJKbFdCXwV+9tFv7vstTmIZOsGXEFZ+1tLN0yVnLOY7a5dHXQoVakd0NztxPfeQK99Eb3JxnrsC+FAN0kHkZQWH07VadXsrE8stQ4TB4QLZ8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=rLERkQk7; arc=none smtp.client-ip=209.85.167.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="rLERkQk7" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5343e75c642so5559384e87.2 for ; Mon, 02 Sep 2024 07:10:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725286210; x=1725891010; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BFrr/vhtyUsBCEL3AzabuAYoE0ekzhv/EiMOJWFtnNw=; b=rLERkQk7kAP8nB0ummoWRmIEW+je1xsc2kNxCT+sZoRP2dnhT5yhq1F5Ij8hK/b4Ne t5t8R5VdF7E0/hZIr2uB2KUMJF1MG/EuN8Ze1G1mnBgMuhKEJDkC2eVXHQ7e4EEoFwrp PrUm7oDc9QBhN4gd0OftBL4b1hiInmURgIrx39+8TtXKiwvHenZYGT9g0mmyU1OP167Y N9mx0XSiqb2O2phSqnwXvbf01OLeNMuX5Pqyvm3qHNzV+kKH2lpRLh5b/gxpXWCw+uyq rDTJldtFrhBl459Cg7n5FIHR+z0WmYAPX138bXaNu8+ubgrfQiGbwxukwMdTQBwFg6bK 0rgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725286210; x=1725891010; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BFrr/vhtyUsBCEL3AzabuAYoE0ekzhv/EiMOJWFtnNw=; b=twL0GyJbS2xVbMmeiYCUqDbMRBZMvyiuwjtmERpRliLHydiTdTg8lXHCHeeCFcUQ5O HCbnTEjcS/gnkCqYOuqKcFMUpvxqy2I0fmOmaq4Y//CYUfq655VzpXus4JPWzIMBErwL TESwNPu9OvYyGeSUylEX+lgSAfawyDnKzDW8ammuwne5Q2HEYtMvWUtXQrzMw9JGhSGZ cOq6ftYbo/fy3eLeD9q0ilUftZ0LR2RzWiVqd3W2VS2NfFneORVV8ixAmRZCTlDC4B1m okPfxnKq7tYSVCGyHdgZ+WcZtG0KuuRPC68VxudSMp6pOQUOkPe2cCX2dumjwDD0XnA2 TZbQ== X-Gm-Message-State: AOJu0YxAVMLR7efHjW/TT83YCaqYHVZerBLhIxuGFLHFW7k3D5JBUHux R/iC2PqVb+Hc+ezmWOWF/m7WLARDfEu4v+vIHC/axSowCA0TUiF+0qrnDfWJ3qE= X-Google-Smtp-Source: AGHT+IFaO6dxlDDaiWFSdIP/UX9nluCBle4q/MSw8r+vz8yzTRdG1rB1gJ4tgPH4HvY2bPou2oAjug== X-Received: by 2002:a05:6512:118e:b0:530:dfab:930c with SMTP id 2adb3069b0e04-53546b34ddcmr6403270e87.28.1725286210350; Mon, 02 Sep 2024 07:10:10 -0700 (PDT) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a89891d6f16sm561716066b.150.2024.09.02.07.10.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2024 07:10:09 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Wolfram Sang , Srinivas Kandagatla Subject: [PATCH 1/4] slimbus: messaging: use 'time_left' variable with wait_for_completion_timeout() Date: Mon, 2 Sep 2024 15:10:01 +0100 Message-Id: <20240902141004.70048-2-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240902141004.70048-1-srinivas.kandagatla@linaro.org> References: <20240902141004.70048-1-srinivas.kandagatla@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Wolfram Sang There is a confusing pattern in the kernel to use a variable named 'timeout= ' to store the result of wait_for_completion_timeout() causing patterns like: timeout =3D wait_for_completion_timeout(...) if (!timeout) return -ETIMEDOUT; with all kinds of permutations. Use 'time_left' as a variable to make the c= ode self explaining. Fix to the proper variable type 'unsigned long' while here. Signed-off-by: Wolfram Sang Signed-off-by: Srinivas Kandagatla --- drivers/slimbus/messaging.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/slimbus/messaging.c b/drivers/slimbus/messaging.c index 4ce0cb61e481..242570a5e565 100644 --- a/drivers/slimbus/messaging.c +++ b/drivers/slimbus/messaging.c @@ -111,7 +111,8 @@ int slim_do_transfer(struct slim_controller *ctrl, stru= ct slim_msg_txn *txn) { DECLARE_COMPLETION_ONSTACK(done); bool need_tid =3D false, clk_pause_msg =3D false; - int ret, timeout; + int ret; + unsigned long time_left; =20 /* * do not vote for runtime-PM if the transactions are part of clock @@ -151,9 +152,9 @@ int slim_do_transfer(struct slim_controller *ctrl, stru= ct slim_msg_txn *txn) if (!ret && need_tid && !txn->msg->comp) { unsigned long ms =3D txn->rl + HZ; =20 - timeout =3D wait_for_completion_timeout(txn->comp, - msecs_to_jiffies(ms)); - if (!timeout) { + time_left =3D wait_for_completion_timeout(txn->comp, + msecs_to_jiffies(ms)); + if (!time_left) { ret =3D -ETIMEDOUT; slim_free_txn_tid(ctrl, txn); } --=20 2.25.1 From nobody Fri Dec 19 10:41:47 2025 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 952532101AB for ; Mon, 2 Sep 2024 14:10:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725286215; cv=none; b=EHfWjBiGKWBvpeJ8erGmb1CXTVfzZAzSzuOiRzx2KIjsKQbohhNsH+S5zzTkwPjksDPdrdOz1NMy2y78QorraOSTNcNG+QGzS34PIwZC0QzFCoqmryc5jelAW/c6+b7oFaP9gdjg11a4F0fGi2zTb50KjM59W0cxKTTPGXB3lzk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725286215; c=relaxed/simple; bh=AFl07KV8klEOJ6+rT1G4qkvtt0+o8Zw3nuDs4h233sk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ioe5cjNPX6dvRgYrcndHK8Yk5kMRVX4MN9t7nBOgwDooMwV5ULMJvz9teIRw1AKRTxTtChrFaROsjVV1wlcN7dxjhca5LyAP4Wfus0Fyajrti2MI6fwND7Zb3L22k6PC3N7y3nssetxQAMLzsZbqJnSYhnv1+4OnBKkFuKdQHhQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=KNt6koip; arc=none smtp.client-ip=209.85.218.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="KNt6koip" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-a8692bbec79so484470266b.3 for ; Mon, 02 Sep 2024 07:10:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725286212; x=1725891012; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bpr9dXIidsXFpm+K15CdNYJqzGIzIYw+BZn+15r3Xp4=; b=KNt6koipVN9FNS1vBCWuKpicp6z10jRTAp1bJB2TVdTXwHCdL/NEBsiqKHoi43vqVl Vktt8GNY5lngHY3DV0Nnk55oQEHI/aCBjD0puOrfM05nD3K726nQ5X9KJC1fm1wnTaL/ wF12P6SlM0XNv6/eW6Q7G3wU8tMSyX0NKouyg2nX8JA7hi1P7500Wl04GqEw7juNyqRV VjyYg02ZVO+UJNztgFO38XPG2AdUfG2iMiF4zu8yv2HshBaBdewdrhu8GOAqp0bb/+zj 9fvX8SSUJLpwMLo24iPvORYahuN5cd9v96H5hWounzVrLHGijPKZIIbWas/j49pcJnB3 G3yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725286212; x=1725891012; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bpr9dXIidsXFpm+K15CdNYJqzGIzIYw+BZn+15r3Xp4=; b=eYwwFeaOeiOZRXilKBvg28Hrq8S1aoL5QOFlN98eF4z/6g/3F32VIUafB9xPj6r8dF EDYdriypqnLwxffh/Pusg+yXwjmqGlT0kpV1DCTudABt6UmTjtfWbmnS0+7VUBr39oU/ vf2w/ihDOdQ24gkR7hj5RjmW0eLtXSH39xLToJgihKJzmlW4/lKL1V31Z5Wfg+TKgzmg alRg8FwC0ZP3NN3v8jUMw8GjzgzwTPEjQJVi2UoWbuytowN5E+ri/Y2v1GrMSUOY+iUu IghRU2bVuWJpAd5JPUPqMucAI/LY5uaR54cdYdcOi8TZf38kh3eDZymAAo/eEjZ6yfQo PbrQ== X-Gm-Message-State: AOJu0YxEES34ZH/dj9bVRrvgUdutQEB9Dr/LVzP5brxXxa7iDHXcP4hR fTI+veCTpPGhSdkAQ1Kog/F8GVXPXknoXKxJH6P2huRl3BvtEANjhP+1Tm9SGfrtYsBW8aH1edp w X-Google-Smtp-Source: AGHT+IHcERo4BB7U4JT+gMACRHG24hTd6QLkbBaA2Vzft6CwbCbxaBJa+aGSL0RMP6WviX4D4BWcxA== X-Received: by 2002:a17:907:1c28:b0:a86:a77e:83b1 with SMTP id a640c23a62f3a-a89a379b622mr700498566b.47.1725286211829; Mon, 02 Sep 2024 07:10:11 -0700 (PDT) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a89891d6f16sm561716066b.150.2024.09.02.07.10.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2024 07:10:10 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Wolfram Sang , Srinivas Kandagatla Subject: [PATCH 2/4] slimbus: qcom-ctrl: use 'time_left' variable with wait_for_completion_timeout() Date: Mon, 2 Sep 2024 15:10:02 +0100 Message-Id: <20240902141004.70048-3-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240902141004.70048-1-srinivas.kandagatla@linaro.org> References: <20240902141004.70048-1-srinivas.kandagatla@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Wolfram Sang There is a confusing pattern in the kernel to use a variable named 'timeout= ' to store the result of wait_for_completion_timeout() causing patterns like: timeout =3D wait_for_completion_timeout(...) if (!timeout) return -ETIMEDOUT; with all kinds of permutations. Use 'time_left' as a variable to make the c= ode self explaining. Fix to the proper variable type 'unsigned long' while here. Signed-off-by: Wolfram Sang Signed-off-by: Srinivas Kandagatla --- drivers/slimbus/qcom-ctrl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c index 0274bc285b60..e25f9bdd9b23 100644 --- a/drivers/slimbus/qcom-ctrl.c +++ b/drivers/slimbus/qcom-ctrl.c @@ -330,7 +330,8 @@ static int qcom_xfer_msg(struct slim_controller *sctrl, void *pbuf =3D slim_alloc_txbuf(ctrl, txn, &done); unsigned long ms =3D txn->rl + HZ; u8 *puc; - int ret =3D 0, timeout, retries =3D QCOM_BUF_ALLOC_RETRIES; + int ret =3D 0, retries =3D QCOM_BUF_ALLOC_RETRIES; + unsigned long time_left; u8 la =3D txn->la; u32 *head; /* HW expects length field to be excluded */ @@ -374,9 +375,9 @@ static int qcom_xfer_msg(struct slim_controller *sctrl, memcpy(puc, txn->msg->wbuf, txn->msg->num_bytes); =20 qcom_slim_queue_tx(ctrl, head, txn->rl, MGR_TX_MSG); - timeout =3D wait_for_completion_timeout(&done, msecs_to_jiffies(ms)); + time_left =3D wait_for_completion_timeout(&done, msecs_to_jiffies(ms)); =20 - if (!timeout) { + if (!time_left) { dev_err(ctrl->dev, "TX timed out:MC:0x%x,mt:0x%x", txn->mc, txn->mt); ret =3D -ETIMEDOUT; --=20 2.25.1 From nobody Fri Dec 19 10:41:47 2025 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 278612139A4 for ; Mon, 2 Sep 2024 14:10:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725286217; cv=none; b=hTj2zktG8b+NlO00C90r8Bi5KVjIleBvg2EZw/xY+JfQSQVCOHVNhwnJVKH6AdEH8HkarCCGanOhozsfo3a8fr7aeSxSC3yzNcIsAlMmy8lerrTibYHEmHiTomKkjVkLODqzMQRHML1x1RJHO+Yxt6xpG+y6B7PoV9esrn8pxbk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725286217; c=relaxed/simple; bh=UORapo7YlNTuvEJAeLimPXM90asjpEKjHP5U8x+YZ/Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lsHHqOsvADJsN54XbiEj7j9QGsln7+zbol0EMMMXoL7J3HKhFLvNELZCQ1G2gpmAkOovy2DJg8djFcOVaG6YHdOMs3fuaxrhv3kI1oW5sjkEPxDOrJGzuKM/vcEULcMYMkfJBNKuWzYy+jSDetFxfOTqYJ71g9wQfznsatNBwuw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=AMRQe1Ln; arc=none smtp.client-ip=209.85.208.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="AMRQe1Ln" Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-5bec87ececeso4540611a12.0 for ; Mon, 02 Sep 2024 07:10:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725286213; x=1725891013; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=q7dzsMwdjr7BdMT9siJ5A6qZhkd2DGrmBmUTDDuztxI=; b=AMRQe1LnhUyCUeXMFWavboo0HAHqBFBgQpa565z52Wn+CUEqTyL5KM3t4tX2PJDGd5 9q8BkQ4IqIo9v9FyzeImxtDg5qJdexvGkZ9PlSTMCHwVjFAF7ToCa777KVdnmbulFIEh SWklBpNQZ46bUNKTmIhxF4lL13NdEqrGaKXzbKEJt8H68UT5cjTrWZLEaIaRVBcXbf8z XQMr9sE2L/A9uUgiD3fR+albjgdZ3fqjRPAsF6eTdACvNqRA6eb/XWKRyIqEDdp0rEV6 Pe35khki8mZ8+vVmafW34VjjLViHoPe354WANAg3XY8g7hRnmT1JKI5SvXzlLIPUWXHV 4DUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725286213; x=1725891013; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=q7dzsMwdjr7BdMT9siJ5A6qZhkd2DGrmBmUTDDuztxI=; b=B1RBjcxg9z0DWIafKoA57jUKfcLGuJ39UgoIiwvBrJPobLJCfaP0QYHW6wSYNEJAfb wnqnSydXic3cdAEkFwzVO5oAaWwTunzCEbQJPfvyWl06y2hlDr5fwvBQe6uvPHHuD49q kjWbWjXcfDbuJur72NkBHzdF9VsOnveYACfykXR8jK8bjhyL4kPGjCXrxnF48yXg9pEU FfCbLRMGJUDSCc29LBnhcm/Q/xtQbZDuV2S6k06ysUEsgnglxDlcg7k1PnkhUuv2EJM5 wyCjqheUNwbaT7jOb/JCC1XB0iU5zYDfwboJtk4G+Sja+WoO6zRnLPNAsVSMVu+mjS67 VnOA== X-Gm-Message-State: AOJu0YxYlTSLbSrh4FsXHC5uxL6gu6ucXz16wgdnCtOf4aXknJ4CXZCB 4ra6ddoyt/hbX7R7fInENnvVRB6tRQibTZjFBv3FH8vagI+lCn/5P87YWf6K6r8= X-Google-Smtp-Source: AGHT+IFDLeYmh3ZwnVxagcpzj2n7lgxU+6XtZaDAv0CjoaeABPjeryT5ak67NrLKA0BEeVBr73R7Lw== X-Received: by 2002:a17:907:7ba3:b0:a86:bd58:ecfb with SMTP id a640c23a62f3a-a897fad6fc2mr1072884466b.66.1725286213235; Mon, 02 Sep 2024 07:10:13 -0700 (PDT) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a89891d6f16sm561716066b.150.2024.09.02.07.10.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2024 07:10:12 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Wolfram Sang , Srinivas Kandagatla Subject: [PATCH 3/4] slimbus: qcom-ngd-ctrl: use 'time_left' variable with wait_for_completion_timeout() Date: Mon, 2 Sep 2024 15:10:03 +0100 Message-Id: <20240902141004.70048-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240902141004.70048-1-srinivas.kandagatla@linaro.org> References: <20240902141004.70048-1-srinivas.kandagatla@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Wolfram Sang There is a confusing pattern in the kernel to use a variable named 'timeout= ' to store the result of wait_for_completion_timeout() causing patterns like: timeout =3D wait_for_completion_timeout(...) if (!timeout) return -ETIMEDOUT; with all kinds of permutations. Use 'time_left' as a variable to make the c= ode self explaining. Fix to the proper variable type 'unsigned long' while here. Signed-off-by: Wolfram Sang Signed-off-by: Srinivas Kandagatla --- drivers/slimbus/qcom-ngd-ctrl.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctr= l.c index e0b21f0f79c1..1ac8e2912fd1 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -788,7 +788,8 @@ static int qcom_slim_ngd_xfer_msg(struct slim_controlle= r *sctrl, struct qcom_slim_ngd_ctrl *ctrl =3D dev_get_drvdata(sctrl->dev); DECLARE_COMPLETION_ONSTACK(tx_sent); DECLARE_COMPLETION_ONSTACK(done); - int ret, timeout, i; + int ret, i; + unsigned long time_left; u8 wbuf[SLIM_MSGQ_BUF_LEN]; u8 rbuf[SLIM_MSGQ_BUF_LEN]; u32 *pbuf; @@ -890,8 +891,8 @@ static int qcom_slim_ngd_xfer_msg(struct slim_controlle= r *sctrl, return ret; } =20 - timeout =3D wait_for_completion_timeout(&tx_sent, HZ); - if (!timeout) { + time_left =3D wait_for_completion_timeout(&tx_sent, HZ); + if (!time_left) { dev_err(sctrl->dev, "TX timed out:MC:0x%x,mt:0x%x", txn->mc, txn->mt); mutex_unlock(&ctrl->tx_lock); @@ -899,8 +900,8 @@ static int qcom_slim_ngd_xfer_msg(struct slim_controlle= r *sctrl, } =20 if (usr_msg) { - timeout =3D wait_for_completion_timeout(&done, HZ); - if (!timeout) { + time_left =3D wait_for_completion_timeout(&done, HZ); + if (!time_left) { dev_err(sctrl->dev, "TX timed out:MC:0x%x,mt:0x%x", txn->mc, txn->mt); mutex_unlock(&ctrl->tx_lock); @@ -916,7 +917,8 @@ static int qcom_slim_ngd_xfer_msg_sync(struct slim_cont= roller *ctrl, struct slim_msg_txn *txn) { DECLARE_COMPLETION_ONSTACK(done); - int ret, timeout; + int ret; + unsigned long time_left; =20 ret =3D pm_runtime_get_sync(ctrl->dev); if (ret < 0) @@ -928,8 +930,8 @@ static int qcom_slim_ngd_xfer_msg_sync(struct slim_cont= roller *ctrl, if (ret) goto pm_put; =20 - timeout =3D wait_for_completion_timeout(&done, HZ); - if (!timeout) { + time_left =3D wait_for_completion_timeout(&done, HZ); + if (!time_left) { dev_err(ctrl->dev, "TX timed out:MC:0x%x,mt:0x%x", txn->mc, txn->mt); ret =3D -ETIMEDOUT; @@ -1168,11 +1170,12 @@ static int qcom_slim_ngd_power_up(struct qcom_slim_= ngd_ctrl *ctrl) enum qcom_slim_ngd_state cur_state =3D ctrl->state; struct qcom_slim_ngd *ngd =3D ctrl->ngd; u32 laddr, rx_msgq; - int timeout, ret =3D 0; + int ret =3D 0; + unsigned long time_left; =20 if (ctrl->state =3D=3D QCOM_SLIM_NGD_CTRL_DOWN) { - timeout =3D wait_for_completion_timeout(&ctrl->qmi.qmi_comp, HZ); - if (!timeout) + time_left =3D wait_for_completion_timeout(&ctrl->qmi.qmi_comp, HZ); + if (!time_left) return -EREMOTEIO; } =20 @@ -1217,8 +1220,8 @@ static int qcom_slim_ngd_power_up(struct qcom_slim_ng= d_ctrl *ctrl) ngd->base + NGD_RX_MSGQ_CFG); qcom_slim_ngd_setup(ctrl); =20 - timeout =3D wait_for_completion_timeout(&ctrl->reconf, HZ); - if (!timeout) { + time_left =3D wait_for_completion_timeout(&ctrl->reconf, HZ); + if (!time_left) { dev_err(ctrl->dev, "capability exchange timed-out\n"); return -ETIMEDOUT; } --=20 2.25.1 From nobody Fri Dec 19 10:41:47 2025 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A19CA2139D4 for ; Mon, 2 Sep 2024 14:10:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725286218; cv=none; b=XbuWWkuwGjC7orhMdJpcwNDuoA8be292rvtYXUsgKAN2f2+ARxP7InHzuNIZzYkDQHqvWM7DN1lktWcF6kfpsY4R48vAgOiTESd6oSLXbtAdRMW5yzy0WhQ961Oe9DTsNBSUimOyUv8hdz3qBqwUvWtzhorCjSwT1+cs8pjd8dc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725286218; c=relaxed/simple; bh=6YwwAfyU0B0/g/tSliwXNeMH+iCOQdzN52CjixjX9mk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AgpgOtWxlgwl3aB/a69TLFfJXRwKnrDLiVvsEy1xf+ZNBI+dMw7aSvKFwdGLsBQiHT4ovWu7uauU6paEZNhhYk1vMFAexRLN2CX1Gwe71TTHs5YrdgoZk7GlA0LC4iumP56ZA9UrVvBB74BtAP3KTMp3X74aQcF0AgYlnRv7ilE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=j5mzraXN; arc=none smtp.client-ip=209.85.218.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="j5mzraXN" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-a8695cc91c8so427727266b.3 for ; Mon, 02 Sep 2024 07:10:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725286215; x=1725891015; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NEXG8xSsxSH4oncQomb3hsfY98uEQJs5PaBlHSgTpck=; b=j5mzraXNI+KEuI4thSbE56dS7L+DvBRv36scs/n104p4Yq15ojPwKnwekPOIAPj7wK 6uxb5KMpjyjYDJh6Uh5GCzVAZjHouARPgFAnyZuRdS7yXcYBhuF/lgrPGNYswiWRbRQk +E9YK62slOfkI/rzcw5zxFUTrnY/rJ0f1gP+FfV2HlTtx8ibccXYW/J90ErcMYIYLW8V hTDAYclmqXKqtNZAyBJFegA+eTdhEsaziciGZhzSIvipBReZ5/zESmHefWQiBmbuVmzq CwCJKNkL8W1UJ//69w+6Ly31ZhtCWQQQJl7eyWpr8bO99QVAhSkNY+SzG1aum4req7BY dUwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725286215; x=1725891015; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NEXG8xSsxSH4oncQomb3hsfY98uEQJs5PaBlHSgTpck=; b=aOYB1Hb6IQJ7zOQ0o+q983x8lNIOA7ogpNsmdNPbIRbg3+05WYeD/8AlNuAIssJ3Fs i6nms78hmSuf5liScb75yowPdmVxXIyWkZJx9qTTK9UrjumeTQTeWb8TPRBUk14sdSbE eoGnZBYScpqHLLOjfCp/L0q/kfhva5y0yslNCkZaxgIc9py5qAOgh4sKwmiIbdwJvyqY d7Kn22A5iRszMoNbZ33boUz0FKfIGv8edo7fGfHmqf+1ImnvLLwVAxcbdUkIoxMQDL6c Xvux5L7ZsDDZHWcLohYYJwRGLnP3sTciGvMwHY2Kg0vcV9jeItm9SIgrQhLTz3M9zoRI abIg== X-Gm-Message-State: AOJu0YxyIgL4ffn87b0Am3WBwbsPRBMdL4uFWq6tq8WS9MAbDicS4wLu bx11Aseg55afy3Y4sCKCtykKxPtMAKU2zaAcl8OxThtmldbU7ZoELwqZA14Q13o= X-Google-Smtp-Source: AGHT+IGXCNyaNZl9sPxZZZ6KU5nSZOR6dYdungazLFE2e1ReXfppeBK2JoIQOrnSSkmu1lL/r4mscg== X-Received: by 2002:a17:907:3f24:b0:a7a:a892:8e05 with SMTP id a640c23a62f3a-a897f92022amr947243266b.33.1725286214766; Mon, 02 Sep 2024 07:10:14 -0700 (PDT) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a89891d6f16sm561716066b.150.2024.09.02.07.10.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2024 07:10:13 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Srinivas Kandagatla Subject: [PATCH 4/4] slimbus: generate MODULE_ALIAS() from MODULE_DEVICE_TABLE() Date: Mon, 2 Sep 2024 15:10:04 +0100 Message-Id: <20240902141004.70048-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240902141004.70048-1-srinivas.kandagatla@linaro.org> References: <20240902141004.70048-1-srinivas.kandagatla@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Masahiro Yamada Commit 9e663f4811c6 ("slimbus: core: add support to uevent") added the MODALIAS=3Dslim:* uevent variable, but modpost does not generate the corresponding MODULE_ALIAS(). To support automatic module loading, slimbus drivers still need to manually add MODULE_ALIAS("slim:::*"), as seen in sound/soc/codecs/wcd9335.c. To automate this, make modpost generate the proper MODULE_ALIAS() from MODULE_DEVICE_TABLE(slim, ). Signed-off-by: Masahiro Yamada Signed-off-by: Srinivas Kandagatla --- scripts/mod/devicetable-offsets.c | 4 ++++ scripts/mod/file2alias.c | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-of= fsets.c index 518200813d4e..9c7b404defbd 100644 --- a/scripts/mod/devicetable-offsets.c +++ b/scripts/mod/devicetable-offsets.c @@ -153,6 +153,10 @@ int main(void) DEVID_FIELD(i3c_device_id, part_id); DEVID_FIELD(i3c_device_id, extra_info); =20 + DEVID(slim_device_id); + DEVID_FIELD(slim_device_id, manf_id); + DEVID_FIELD(slim_device_id, prod_code); + DEVID(spi_device_id); DEVID_FIELD(spi_device_id, name); =20 diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index 5d1c61fa5a55..99dce93a4188 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -960,6 +960,16 @@ static int do_i3c_entry(const char *filename, void *sy= mval, return 1; } =20 +static int do_slim_entry(const char *filename, void *symval, char *alias) +{ + DEF_FIELD(symval, slim_device_id, manf_id); + DEF_FIELD(symval, slim_device_id, prod_code); + + sprintf(alias, "slim:%x:%x:*", manf_id, prod_code); + + return 1; +} + /* Looks like: spi:S */ static int do_spi_entry(const char *filename, void *symval, char *alias) @@ -1555,6 +1565,7 @@ static const struct devtable devtable[] =3D { {"rpmsg", SIZE_rpmsg_device_id, do_rpmsg_entry}, {"i2c", SIZE_i2c_device_id, do_i2c_entry}, {"i3c", SIZE_i3c_device_id, do_i3c_entry}, + {"slim", SIZE_slim_device_id, do_slim_entry}, {"spi", SIZE_spi_device_id, do_spi_entry}, {"dmi", SIZE_dmi_system_id, do_dmi_entry}, {"platform", SIZE_platform_device_id, do_platform_entry}, --=20 2.25.1