From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (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 E18FB426D02 for ; Tue, 16 Jun 2026 11:38:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781609886; cv=none; b=pJSKNH17/fYz1Zj8fOZAT7cHGVUlhbrTEGuOw+M1EsJC+yxahe+2acTPCMhKmsZAJS+WaHSZ1KhoDGDoTIT3bWMEejY7hRm6T+ixhaV/dzADOw9H3sUxaiI/wpZZ64i8g7nYGbg7lg02gVWaQgBA+1XXDOYjlz6fPhbPkQb+V/o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781609886; c=relaxed/simple; bh=Zx+VMlOCv6IpYCIpbgZoAu7Rqm6ZaaGVS2tn/BuYWv4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IJtrLU1fHDHEv6C8jFkNO5vl+llnKPqbQF2Qz64OSdznz9VuW+eykVYco4t+OCxJOgV41Bux1TS0ptp4f0BKBEPDTQ3mwn+XNdoUKq6qXc8REPEIOUf2rUawFzu68+Vxaw3c2n4K1CWI/OBLQ0waffkk0tI/GW4SG+k//KesVj8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=IOF930vX; arc=none smtp.client-ip=198.175.65.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="IOF930vX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1781609885; x=1813145885; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Zx+VMlOCv6IpYCIpbgZoAu7Rqm6ZaaGVS2tn/BuYWv4=; b=IOF930vXvuYuVhEdrksUxNmp11euzg63QCAMXzUllOomsrfQDQdw9sO7 O8/MVdgRvMNj5OQ+kQouE56+OSvAsYIlohyevkWGhLvzmPucvcvfFu3nS wL+lCGvoiwm2qdR51JJP06jZo3Cutd39LoTj3uv6vGcul2T0CHakNDc26 N8OOJasR6ese01uKICud2nNgXq05YysZxPOkC2yq6Bw8r9Y8xJP3aPWjD px/1jUTMfFa0wWl/DOyED6ClyNdo65Gkt1UN/mvTFeBfVdgG1XVPoEzBr ccJvdLjkWfB1qkwDvLJI+jTOQ30epQWkPvY9NTUNd0WzXSfpnQ+UbIMCE g==; X-CSE-ConnectionGUID: fVx2kDUyToOHA7XFyApK9g== X-CSE-MsgGUID: 3rqAzs3wRdCFP1d+l5m1RQ== X-IronPort-AV: E=McAfee;i="6800,10657,11818"; a="82383807" X-IronPort-AV: E=Sophos;i="6.24,208,1774335600"; d="scan'208";a="82383807" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jun 2026 04:38:05 -0700 X-CSE-ConnectionGUID: CMmXdfx8Rv2nfji8yGr+Qg== X-CSE-MsgGUID: ZcWXVCliRpyngC/0vZUFsQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,208,1774335600"; d="scan'208";a="251666728" Received: from abityuts-desk.ger.corp.intel.com (HELO ahunter6-desk) ([10.245.244.134]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jun 2026 04:38:03 -0700 From: Adrian Hunter To: alexandre.belloni@bootlin.com Cc: Frank.Li@nxp.com, Adrian Ng Ho Yin , linux-i3c@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] i3c: master: Update dev_nack_retry_count under maintenance lock Date: Tue, 16 Jun 2026 14:37:50 +0300 Message-ID: <20260616113752.196140-2-adrian.hunter@intel.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260616113752.196140-1-adrian.hunter@intel.com> References: <20260616113752.196140-1-adrian.hunter@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: c/o Alberga Business Park, 6 krs, Bertel Jungin Aukio 5, 02600 Espoo, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: 8bit Protect master->dev_nack_retry_count against concurrent sysfs updates by updating it while holding the bus maintenance lock. Consequently, combine adjacent return statements into one. For consistency, read dev_nack_retry_count while holding the bus normaluse lock. Fixes: b58f47eb39268 ("i3c: add sysfs entry and attribute for Device NACK Retry count") Signed-off-by: Adrian Hunter --- drivers/i3c/master.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c index 367e0d6d4a64..66cf5d3bd987 100644 --- a/drivers/i3c/master.c +++ b/drivers/i3c/master.c @@ -744,7 +744,14 @@ static DEVICE_ATTR_RW(hotjoin); static ssize_t dev_nack_retry_count_show(struct device *dev, struct device_attribute *attr, char *buf) { - return sysfs_emit(buf, "%u\n", dev_to_i3cmaster(dev)->dev_nack_retry_count); + struct i3c_bus *i3cbus = dev_to_i3cbus(dev); + ssize_t ret; + + i3c_bus_normaluse_lock(i3cbus); + ret = sysfs_emit(buf, "%u\n", dev_to_i3cmaster(dev)->dev_nack_retry_count); + i3c_bus_normaluse_unlock(i3cbus); + + return ret; } static ssize_t dev_nack_retry_count_store(struct device *dev, @@ -762,14 +769,11 @@ static ssize_t dev_nack_retry_count_store(struct device *dev, i3c_bus_maintenance_lock(i3cbus); ret = master->ops->set_dev_nack_retry(master, val); + if (!ret) + master->dev_nack_retry_count = val; i3c_bus_maintenance_unlock(i3cbus); - if (ret) - return ret; - - master->dev_nack_retry_count = val; - - return count; + return ret ?: count; } static DEVICE_ATTR_RW(dev_nack_retry_count); -- 2.51.0