From patchwork Wed May 7 12:19:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Tanislav X-Patchwork-Id: 888402 Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) (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 3896225E46A; Wed, 7 May 2025 12:19:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746620369; cv=none; b=H0DzN6teLDPvv87Gh5GA6kZwgn2tipz0j6dHfO6uirP8f65K8M2qhWlsCMG8QgKfo3IrB+RjRXAuNiAGqiVf8qeXrJHLoxjyVivy7dwrUzd6X5iGOIFKwWXSAPzy8oCekk4cqcEBqv7bVrt6N8Og34ZXu12JZpgCCWaLSDx9KYI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746620369; c=relaxed/simple; bh=Z+tVSftXwckDmiKqRv3bbROINZNt9Bt3KdI8yT1ZnpE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fMjxCqqxe8hFfeZd+nVjrFbqj7/tuhajSFsQd67bvI6vuXeRLrZmKq5srLloaSjXICDxZHGqTkSgGxacE720bvlARSwrxu6CIg+EAK04tIltqnRvhd5zVqHPbNSMfYipnmQZN9PwxTEJ2rYhApWNvjozqGDY5m028MlH4t86Or0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fMNtY8eL; arc=none smtp.client-ip=209.85.208.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fMNtY8eL" Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-5e5e0caa151so2568370a12.0; Wed, 07 May 2025 05:19:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746620365; x=1747225165; 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=5XbduvruUPEUAj/PBFNz8Mdx99O0o/ram7Wa9Kwv82c=; b=fMNtY8eL5XWvWvDTmya2DZORLdwftj+6+/RTfNNqQSkdqD0Vw69cXTh1kH3fNMh7TT uE/bWoGtK5w1xpZTAaCJ/4ulqFwAu1PDJx5PfQRPmtnbUexEMHANXycQHpEkopJ1/eEC gw+gcml8MvSZWZMMC4tB0PzXC57VrRN8tlvOg1ToFSU5ST6k1X7PU2hK02yGz8LAh1jP EMzSfcrrhLUxLxqZI0IRFI1f8hxYxzpN+krHtoLfRcwR3oCUuwjnszGUljPQzRDpQH/G G7TFvdEzfGyMdFWG9HsCxTI+Y/vRaGb2l0QrxsB+alzawi57cgzjxXieLBsDSWBr/hqa CTJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746620365; x=1747225165; 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=5XbduvruUPEUAj/PBFNz8Mdx99O0o/ram7Wa9Kwv82c=; b=Z3VQmhEW6nwVeYac77DZ3IUuJ2/kNm7kZs76Vs12/VnGUhMnxpxrLWTaHom19PvOSC 9UeKXdZKdh5CtAJcYBKsMtue3cAwEkisPT9QfBdSDdN+JqJMTTKLagjRq7O8ANT4wqyK QyyRogggttLrPSyvFdcIT+dOGdM5fRtgNNHmddwkWUk+0aFDvkUkiP6lLKbgGLX0KNX/ 1N6amb0aJfy+9oDOAmci2DOK0dOiXlkSWom+T/s7BCx2DNguuyV4nZzfJioAy0xsdK79 S/4jNGBaMHkU1JRtWbLICiSF8SrRTHgKcaJib7IQEb/V2rAseEl1akbTBtZ+50PWaZKt aRyA== X-Forwarded-Encrypted: i=1; AJvYcCUZJ0//CE/XBzUqIeH+iYYoFcTQ24wfCtRnpmlxo4FWG1SN+GYUnK2JeUJD6lRMrYRDp70qg+f1iSUAPmZs@vger.kernel.org, AJvYcCV7opDyomQg1Ryhcu27QuOivfM60UdkmFoOXP76t4R3+2Gq0HFHSrrb1rNDh23ayLyoNt1TkGltGlw=@vger.kernel.org, AJvYcCW760v7061vDE/XvSxndnE4v2J0V5C0JI+3rWfiWLhm1bm+5oMAKKt3HeUJpwF4h1GpUwQCgjJnpGP4a6Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yw4MseXrcua2PDfTDZIniFsn6BTRcSdoj/Ur2C3+QaBPPJDJu7n TKeVW23+1cL4OmVkuKv5gD4vbuBHgOikIpDKEqxsMoX14WhHmE5v X-Gm-Gg: ASbGncuMwM9lhpmBVbYbHpilyhym5jSy4UZBwpq8RZMYqS8QPiK+H4XaOvwkWI9rikv 1fAm013DxS+4PEhByDtEKRuYlJcsSF2G1eZ66thMeg/BdwkHRONIqVe73N0bsoaYLlFpbSuTd5Z Fm62J5GSv/JR5WhW/GLbCmJ5cHLyq3qGlsypd5x93vrxB6LLp6uDtrhHRMk+fOYoraAqpBz2pzm x3ScmdwLE0MHUOzJen6SnNJ3ulTNnTkyRkjJXl4ZUinAqFxiTUUUrDKtgDstbbWc8lRSZwh+aLg xXsuwv7eXFQ8ni1Su4ZgbYExxa2mWyakMA8HHcQCsRyajkb+tF8d X-Google-Smtp-Source: AGHT+IEZpzoZE1uIN362rCbRLMB2kpdi6xmv0t+LFOroEHGSDg4Kxu1XEY+MtkIZr1FXwDzKReIDhA== X-Received: by 2002:a05:6402:1d54:b0:5f3:fad4:fa75 with SMTP id 4fb4d7f45d1cf-5fbe9f81559mr2971623a12.32.1746620365327; Wed, 07 May 2025 05:19:25 -0700 (PDT) Received: from demon-pc.localdomain ([188.27.128.5]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5fa777557b9sm9350002a12.10.2025.05.07.05.19.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 05:19:24 -0700 (PDT) From: Cosmin Tanislav To: Cc: Wolfram Sang , Tomi Valkeinen , Luca Ceresoli , Mauro Carvalho Chehab , Romain Gantois , Arnd Bergmann , Greg Kroah-Hartman , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Cosmin Tanislav Subject: [PATCH v5 2/9] i2c: atr: find_mapping() -> get_mapping() Date: Wed, 7 May 2025 15:19:08 +0300 Message-ID: <20250507121917.2364416-3-demonsingur@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250507121917.2364416-1-demonsingur@gmail.com> References: <20250507121917.2364416-1-demonsingur@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 A find operation implies that a null result is not an error. Use get naming to clarify things and to prepare for splitting up the logic inside this function. Signed-off-by: Cosmin Tanislav Reviewed-by: Luca Ceresoli --- drivers/i2c/i2c-atr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/i2c-atr.c b/drivers/i2c/i2c-atr.c index a79ca87e8bbd..939fb95fe781 100644 --- a/drivers/i2c/i2c-atr.c +++ b/drivers/i2c/i2c-atr.c @@ -241,7 +241,7 @@ static void i2c_atr_release_alias(struct i2c_atr_alias_pool *alias_pool, u16 ali /* Must be called with alias_pairs_lock held */ static struct i2c_atr_alias_pair * -i2c_atr_find_mapping_by_addr(struct i2c_atr_chan *chan, u16 addr) +i2c_atr_get_mapping_by_addr(struct i2c_atr_chan *chan, u16 addr) { struct i2c_atr *atr = chan->atr; struct i2c_atr_alias_pair *c2a; @@ -339,7 +339,7 @@ static int i2c_atr_map_msgs(struct i2c_atr_chan *chan, struct i2c_msg *msgs, for (i = 0; i < num; i++) { chan->orig_addrs[i] = msgs[i].addr; - c2a = i2c_atr_find_mapping_by_addr(chan, msgs[i].addr); + c2a = i2c_atr_get_mapping_by_addr(chan, msgs[i].addr); if (!c2a) { dev_err(atr->dev, "client 0x%02x not mapped!\n", @@ -432,7 +432,7 @@ static int i2c_atr_smbus_xfer(struct i2c_adapter *adap, u16 addr, mutex_lock(&chan->alias_pairs_lock); - c2a = i2c_atr_find_mapping_by_addr(chan, addr); + c2a = i2c_atr_get_mapping_by_addr(chan, addr); if (!c2a) { dev_err(atr->dev, "client 0x%02x not mapped!\n", addr); @@ -540,7 +540,7 @@ static void i2c_atr_detach_addr(struct i2c_adapter *adapter, mutex_lock(&chan->alias_pairs_lock); - c2a = i2c_atr_find_mapping_by_addr(chan, addr); + c2a = i2c_atr_get_mapping_by_addr(chan, addr); if (!c2a) { /* This should never happen */ dev_warn(atr->dev, "Unable to find address mapping\n"); From patchwork Wed May 7 12:19:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Tanislav X-Patchwork-Id: 888401 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (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 A2EEE25F79C; Wed, 7 May 2025 12:19:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746620372; cv=none; b=OOmOGGQF4PXJ9STx9wLUzLjNMAJ5snNMBBYt48mF8wMoBWNxK9S1nTn0OHdtzKtYomBzQSGw1HqcWvJGZLmpBxP/0CuyZeFmo5NLuXyYkywsH9ogXkg10S1a9Cf8RBk9B6c2Irnshh9zpSGPpnCqUJT5iKvLGAIXp5bLkLr7mhc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746620372; c=relaxed/simple; bh=lctrcFQ6u0h5yUi4JGVq1rQdGkWFCwASe2sFOWRpklY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pilLPCHwj4E4R8nE/flXiqNP5QmkF6Ru7ykVHPAEJofhtSo0b/+hNEXLRadgfSBFPsh8wo8QMY+kYSnbIhoqjJeECJCjUErSlz2g9ZteU8znxfoouapCq/pbgFgLWRwHF4OsElWgl1e3oNzEAROqEuRf7KD5Rm7u5xyI/ROR9RY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mUFJBmJ4; arc=none smtp.client-ip=209.85.208.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mUFJBmJ4" Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-5fbda5a8561so1907612a12.2; Wed, 07 May 2025 05:19:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746620369; x=1747225169; 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=h9UBtmB9zYRXrNN2sqjqR5grKIOrEsHM+Wf3UFhuRp8=; b=mUFJBmJ4MR7E+qOnKpVXoSzLuQGpobi1y/TCQj5pPeGEAocnAY9rD4Lwj7nfZhQuGb t0lzc14Eo6BSc+xtpuHD/gFmP9s3dHn5hJbp6ngTkCxGkKMCGL98lz8gb5wX1uCl7fwU dLZRRpZM8LrWrjDA9SSWYBi/ajuJiKotntMPgZ91I7kzszVLb7o7MxTORCvVD9YC8LwR /tzXQcO3oTImyniRoxZXhklIrMp+zZX/ZXpi34AsbDtXQ8QUVraeWZc/KTd28k3RBWQq t8xxppHFzoz7MkjJhcu5mcQvCSvu+1galVvJfE2JS+cj0JJTasFunu2BdNfpOi3VRu2u nM1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746620369; x=1747225169; 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=h9UBtmB9zYRXrNN2sqjqR5grKIOrEsHM+Wf3UFhuRp8=; b=OxIt6DB3hBNhNEUm6Z2Ygqkz16MgIon1yVwKHSyjII/FfPhr5/F3mGQIrEkUhwpAyZ DBjek+iS5sSlnkfEJQ3cufzS40kxlqPCBbNl58GUGMhHVarEWGFBklEkFKHfyy3xJziq zA6LrUUvT9JChTFkRkY9brb9SvS+Tz1zGV8OOBomLMXw28eYhT5SeIpib78pdnprSIws /6n0uP8aaZIP3QCWLOBAgBHjx5kOqCdcNO81x+Ur3eJJZzXmFcKxMCkB4GbSbaG61A8h LwYahJkOW1BTXw/0o4zSV3hRC0LzM3mfFtNqnIxMI7O5MWQRIginu7gceWvARYD55GK2 IwXw== X-Forwarded-Encrypted: i=1; AJvYcCUs+N6+G3V+Z+bULwgy1o8T1ay6hDoRU68ipGivEpuTTTkLLje+rPzy+Aio1nZAxJyrb8I27dl6RiOo3JWc@vger.kernel.org, AJvYcCVDc/cwTMLNjyIiwVcWSn5BfFHz8/rdp18QRgCwtxISVTTu1+j2497jgPaDAIkAfGQz1B8bOAGB7zztKqc=@vger.kernel.org, AJvYcCVXKjK0wxsLaR2gQjBmkrMypLPLzMkUAW8M10zKkpdUdEW+IBMnaOA+JccD/1nWlaBh7GsCG9ntUCI=@vger.kernel.org X-Gm-Message-State: AOJu0Yxa081eEWUJM86W4oZduzjFeAjAxCoPQp9SZ8HckGcCaA1z9X47 WCH3/DvBYTA/sDE9QYa/ZfL2jsKR7K46PSxi7aM0xSvyLOp12CH0 X-Gm-Gg: ASbGncsB+jp2euOXsec3Rnjzm9pu/NQHq3m6kjnKWlgMgVTN2+vjX3lqYQMzqLau+O+ 6+U6/1A35hiYZL35Qiq3/9J5qfJHczalA3D1I4WSQhrdzc/KWrHi+rw0V7yEZi6E2feT35hfpuT p9Q7TcPKqXx1Kz6tSPkImqlaLD2UeZzcHaGlcAygnmYLtAFPm24FnTNY1IbawIMX1cjComV6m7H XB2onUFv8IcF4qZRx0cMy1+j6Ng0bb6GfCo6NOxJX/smrY7NvcjWtagNGgR1qTYuRKxBjHo6jjU U7q9XWHxeo+Tj+Qa8+EfXUc9jU7/8D4jlhTVT9ijvRmWG58L/8bx X-Google-Smtp-Source: AGHT+IHo8QlU181o7K8+pmDxKCcN0PlkDif/QNKIrYLyBMZRtuBLcy6gkM3KLxlckajlARtewvq33Q== X-Received: by 2002:a05:6402:4341:b0:5e7:5b30:3c4f with SMTP id 4fb4d7f45d1cf-5fbe9dfbeedmr2254052a12.14.1746620368727; Wed, 07 May 2025 05:19:28 -0700 (PDT) Received: from demon-pc.localdomain ([188.27.128.5]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5fa777557b9sm9350002a12.10.2025.05.07.05.19.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 05:19:28 -0700 (PDT) From: Cosmin Tanislav To: Cc: Wolfram Sang , Tomi Valkeinen , Luca Ceresoli , Mauro Carvalho Chehab , Romain Gantois , Arnd Bergmann , Greg Kroah-Hartman , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Cosmin Tanislav Subject: [PATCH v5 4/9] i2c: atr: do not create mapping in detach_addr() Date: Wed, 7 May 2025 15:19:10 +0300 Message-ID: <20250507121917.2364416-5-demonsingur@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250507121917.2364416-1-demonsingur@gmail.com> References: <20250507121917.2364416-1-demonsingur@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 It is useless to create a new mapping just to detach it immediately. Use the newly added i2c_atr_find_mapping_by_addr() function to avoid it, and exit without logging an error if not found. Signed-off-by: Cosmin Tanislav Reviewed-by: Luca Ceresoli --- drivers/i2c/i2c-atr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/i2c/i2c-atr.c b/drivers/i2c/i2c-atr.c index 215b6773fe06..178b203c8777 100644 --- a/drivers/i2c/i2c-atr.c +++ b/drivers/i2c/i2c-atr.c @@ -586,10 +586,8 @@ static void i2c_atr_detach_addr(struct i2c_adapter *adapter, mutex_lock(&chan->alias_pairs_lock); - c2a = i2c_atr_get_mapping_by_addr(chan, addr); + c2a = i2c_atr_find_mapping_by_addr(chan, addr); if (!c2a) { - /* This should never happen */ - dev_warn(atr->dev, "Unable to find address mapping\n"); mutex_unlock(&chan->alias_pairs_lock); return; } From patchwork Wed May 7 12:19:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Tanislav X-Patchwork-Id: 888400 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (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 4665E261581; Wed, 7 May 2025 12:19:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746620375; cv=none; b=dKGTPnVK/KIjghe3ybKxa8veDjJ94d7lC6x7gqaU5SGtkRmMQDBUALPBcPCR9e1se8CzGwuXTX417hksCl650SQFAKVb19lONgzjruZBX6yatZyw4JVBS/ulIcq9ZLYQ665JVKs5wNDJiiFZ3rvxgVieOkTyuaWjGCclqgvYTGs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746620375; c=relaxed/simple; bh=X3YUS/ie8/5FFQjnr03A2xbiPiwtHC++WaH/577C/GM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RhYcAjjnKRExPatima43DAOW1Wmt/U79VY2hUd2YEvPBCCZcgcvrE1n/+xwwCUCJe0bxUHDLUkRWhJ/OCLkNKAxXKI5UPJ9Wj77mSa/FPThy47QQcjQ+h+XYqZNu6HQDho8x+fMpDYRdnD2vahWv7I3z6njRVzfJANVzFJz4hcc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mShRjFcD; arc=none smtp.client-ip=209.85.208.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mShRjFcD" Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-5fbf0324faaso996392a12.1; Wed, 07 May 2025 05:19:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746620373; x=1747225173; 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=Hum8qy+jd558PCIht5KO1+9qi0uHpfr5Dfjd1rYbB/s=; b=mShRjFcDo0ufBOioeu8rtm6Ypwxw3O/fs2e+9jajr++RmcVqwwcm6k+D9rWss0z9Yf xeKWTaLRZaZWqIvlcQcYZNMwlXe2vNyAFYWpEh/WD/X6W2oY/tvsiOMGU7QgpBJcTDGQ KgKdzmD/H9LLvux7fExkJxW/6diH3DG0SBx36WQdOI5NnQGnkJyoc4o32VMevaegInAh 96Qk0BtE2/SKP/NETn+2eWsOmFBcbWkMjJG9YadM3lh6RZOuk8vHd+ajoHq1uwGQ5ek8 KqHGeCpEGeQ71u5jQ6eVDOA3be3iDpKvAt29BURuLfMnpidMe3s2QTFw3XtGFuOS9PP/ Ib4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746620373; x=1747225173; 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=Hum8qy+jd558PCIht5KO1+9qi0uHpfr5Dfjd1rYbB/s=; b=Lr9Y5Ww8ODJ2PxnozhIHZ0JB0Zn3FAxh3aYFLNusaLHtHVDcfIOvSN041axAFv0lag mvFnsDpxNZi9xxvKpUuwF3I8olm2aTgYkIKNPYJ068z791srcZvxdXoY50VKj/7/QRHQ ASwwu85AY21ppXLji5z0KV1c5JYkv3A4xGWeSuc5jh8QeHB7yF8n1Q/1uj7B3EDAxLDn FZlXe/USlP3PF61ztvkBzMtjY2RalgX8P3HtDmEvTeWnsLvWpERL1reLpv+QG+b1R5+g fg+Q3we5S2FfGHIuoAf5WUTxkRE/3PN/ROJyIj0ZKOq48iaKniC4iKguyPiUUXYV9nhW RlkQ== X-Forwarded-Encrypted: i=1; AJvYcCU5K2//Pkdaj9Xi+0gByVs+Zwi1Krolm44bqs0/9dbRkD4bIVUR8C67rFCX+HdCQV5zm9tBUshgiPY=@vger.kernel.org, AJvYcCVrScP/Ny4s8JrbX9v81cVt13Fzm5JPvHywRi6zOPQMWmGkhZRF4pWINRYFiH12nYcLtMGc6MXT9FHFEQm6@vger.kernel.org, AJvYcCW57sJ+bci2KHLLs/LASCX9LLBYrcogcSpkynHezQhVQU4xChYieU7YCDiauOlFVFjzodtidM2YOzO6bWU=@vger.kernel.org X-Gm-Message-State: AOJu0Yyc7qaVX/x0aXd652SNPcbccWmjV8qBWmU6oYLtovnfDGS7b1xS NjMB2VLgYkiOpylSVSgKfzNXXyTzpr+pqeyE+awXGUwnNAho7k8UIIOwMw== X-Gm-Gg: ASbGncs0tp+g0LxbAuBo4zURcIU+49GSqiJRZ2I5ZZeKQIJ6Yp8eS6Pk2RhDUgu941S +qSpNJRGdx6mcytjWwyEZWQ8S+eE89T58xvfQqmtD0Y/R74K/cLBIpNF+hpdm6fLKIXsD1dmI06 Qjrc5OuXHdqyQIJiejRoCuPoVCVqIQdsZiPxDtbOe5c5iZAo1c2IsjU05FDSkh5ln04xg2UV+aI 7BtIX/534t18W5F8ssHItUi+jG42jWc5yYsTyhjQHu7zaisUCLvTDM+h/DSK8XOsA/3jjLihEnD 5/5E2yqXwSTEAlRFrQ1p/Lm+uu97myvJFcTZLFRQUJlMyE7QR97QmDnHs9T3VwY= X-Google-Smtp-Source: AGHT+IHgBSIVG7Xa9BXL9TdhQxQ6rHWVbK1V9hDshVe5yWBiKY4V4ani0CAqOqHy2aBB4ONpetAx7Q== X-Received: by 2002:a05:6402:3588:b0:5e6:17e6:9510 with SMTP id 4fb4d7f45d1cf-5fbe9d77c6dmr2625869a12.6.1746620372382; Wed, 07 May 2025 05:19:32 -0700 (PDT) Received: from demon-pc.localdomain ([188.27.128.5]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5fa777557b9sm9350002a12.10.2025.05.07.05.19.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 05:19:32 -0700 (PDT) From: Cosmin Tanislav To: Cc: Wolfram Sang , Tomi Valkeinen , Luca Ceresoli , Mauro Carvalho Chehab , Romain Gantois , Arnd Bergmann , Greg Kroah-Hartman , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Cosmin Tanislav Subject: [PATCH v5 6/9] i2c: atr: allow replacing mappings in attach_addr() Date: Wed, 7 May 2025 15:19:12 +0300 Message-ID: <20250507121917.2364416-7-demonsingur@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250507121917.2364416-1-demonsingur@gmail.com> References: <20250507121917.2364416-1-demonsingur@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 It is possible for aliases to be exhausted while we are still attaching children. Allow replacing mapping on attach by calling i2c_atr_replace_mapping_by_addr() if i2c_atr_create_mapping_by_addr() fails. Signed-off-by: Cosmin Tanislav --- drivers/i2c/i2c-atr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/i2c/i2c-atr.c b/drivers/i2c/i2c-atr.c index ae5c2ee629f0..91aabfb4379b 100644 --- a/drivers/i2c/i2c-atr.c +++ b/drivers/i2c/i2c-atr.c @@ -543,6 +543,9 @@ static int i2c_atr_attach_addr(struct i2c_adapter *adapter, mutex_lock(&chan->alias_pairs_lock); c2a = i2c_atr_create_mapping_by_addr(chan, addr); + if (!c2a) + c2a = i2c_atr_replace_mapping_by_addr(chan, addr); + if (!c2a) { dev_err(atr->dev, "failed to find a free alias\n"); ret = -EBUSY; From patchwork Wed May 7 12:19:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Tanislav X-Patchwork-Id: 888399 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (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 70A1E263F43; Wed, 7 May 2025 12:19:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746620379; cv=none; b=Bs/FlHD212HgS4R2iqPHn5GxHjabbbp35ZujiS7y9g0k0KRpNrLzLKRo2zd/f7pYFLgXZ3/kQygUavFqemuIbRlSQN6S2BNCVxyBkGSFVUedYD8QVnPgUlptuvUOqop+xgJcGFga7jUUf53z6CpkKxBKBLih5ysz9o8aMIoANro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746620379; c=relaxed/simple; bh=IncmGeBrDS5I/fgmp8yiaekm5sPKDwdxDosYXHlXQvc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SSC3hm0TRSAvz8mIqPO8PIjUemFHdL4cQH3HOMfPp3Lkca585NsahaaZocLqSPEipO6K7tZ445dRjgbmMKQsn1iJp3ND3CPwPE2WzkkRwvO+AWxxG+Jt+LAiauUzQvzZRsuoBpWrm7FPi4RuB7RG7YujJ6qimT+W4YPjH0cci5w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ZUySwLQL; arc=none smtp.client-ip=209.85.208.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZUySwLQL" Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-5fbf007ea38so1190024a12.3; Wed, 07 May 2025 05:19:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746620376; x=1747225176; 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=Q2KJ26YIlL26ps6IFL0kVpu1NN+yB+jxrYA5HLOizf4=; b=ZUySwLQLfldzo6fd8idLe9U9HwPfReOYHrzB7jHS2HbrIHMlkkLFrl2Wzh/3xaUHWx z7KdjC14Usz74/gGqI1T/EOVLtDyFRUIs1hGxiXuze0sTHF75ZzwY2/ZVigAuYYzaoUx MQXq4i8GM3Oqt6FW4M4RfQnOIHQerUjKkStOYLH/1kNMbHtEXfKQAPZb8qer2rXC0C5B 95UaRPNmL48TjL9qOwKTJm9O488/ARb7CG3xCvg82GyVqt0Ik1jAoLOtQqmT+jg8GGlg EhJlgmXK7r19ypuyUcYFt/WsBkbjzrrYrmTNBt9YR0eJMdhtQwTmj9UpaO7m7l4EaHr1 v1cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746620376; x=1747225176; 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=Q2KJ26YIlL26ps6IFL0kVpu1NN+yB+jxrYA5HLOizf4=; b=naDHX+JIe7IMsLirhM1rAA9qceoFn5NVTE4uWqbWiaDpRIaSRcpA9P+Ltr2N20XkeC 1MwpP/tk09fL0VT9i9gPSg5aDkeHueNDRcOqYzo/ywkIIvd2Sq2HmbxgI5mo0UekjkbT Jfy8U6abj7+gySV0jmHym5Rs0hHtwWuURJLeOj8UTt/sfexYgehGNEpPrkbDXLhCLv0f w3IS+cOQuJaQSk+eJ1jC1i3Oiu7dL5lI1j9/VtVa2fFTTCQo4DU5QI32jhaQawSih7+/ 0LLxS4DK4yS7ft/jHNDqeDUJWgUBc8qbf74kkxvobQKzQEsQJZhTwZ36640mCuMVI0xv FMvw== X-Forwarded-Encrypted: i=1; AJvYcCVB6HC5jjY/zkU+cQYM7yRSHPPYvmcliEGwlHgWgzTR4dXzvr4y3imBGFhq6Y39RqnwOxIz5d3/dc3vr0Y=@vger.kernel.org, AJvYcCW55V2Atdf7JtokIf+G9XqFT8pKuPtGLTp9+pBTerPsPNNYJ+JSMnphNla4dEFpJ3pWuIMgBPwiKhM=@vger.kernel.org, AJvYcCWytIJNremnxzsgzZBSzTzT1qYLPysaOgtEkTeJvXFehBWFIZSokedbt4is8Ab/mSy7ZfjaP89oSefSUUN+@vger.kernel.org X-Gm-Message-State: AOJu0Yxvz5wHhIaOyRutHVENWuNSGrF9PYvitPdsApRC2X9v7fINAusE 347gZcugZq1VjWFUHXPwuuyrB5MfgcYkTcNh8sE/DOcVZ8tj5+9U X-Gm-Gg: ASbGnct4k8mOznOWPC2u/gJ15JXkVam7A29C28k4yDYoSZTbkUFIKtrhBwFQSgLAaW+ FNJv29MxQ/YnmPksUCspTkOYTXp1e3mFNycFl1Z2Y1esW/16uu32JzY0YVUI01GAp5kYUUt0Hlo ACb3J295LmqQatdn/ZqKlc+t215nE9VeemlD5wRmVl1xgdUX2E/9aP3R1P2ZeSkHKNMRhceIAKh RtQ5sNxUajPLuChK+68W/HXl8jUTzbN8xXjQrfhcpCiTRS91/eY0u7aAzeSinbcUzOLor+nNyaF 5FutpcJJ0OwOSaFjdqZNmF/0R0v3Gtwtew2NFrkxBcbZAU3EolXQ X-Google-Smtp-Source: AGHT+IEvLotDHhdb7KPxeTvSHi1rKTMFXmu+F9vTFpZBRVBhkjY5JDO4yOcT8sqnDe3jtEEKcN3ozA== X-Received: by 2002:a05:6402:4307:b0:5fa:a495:6904 with SMTP id 4fb4d7f45d1cf-5fbe9f3c4d7mr2450261a12.23.1746620375615; Wed, 07 May 2025 05:19:35 -0700 (PDT) Received: from demon-pc.localdomain ([188.27.128.5]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5fa777557b9sm9350002a12.10.2025.05.07.05.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 05:19:35 -0700 (PDT) From: Cosmin Tanislav To: Cc: Wolfram Sang , Tomi Valkeinen , Luca Ceresoli , Mauro Carvalho Chehab , Romain Gantois , Arnd Bergmann , Greg Kroah-Hartman , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Cosmin Tanislav Subject: [PATCH v5 8/9] i2c: atr: add static flag Date: Wed, 7 May 2025 15:19:14 +0300 Message-ID: <20250507121917.2364416-9-demonsingur@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250507121917.2364416-1-demonsingur@gmail.com> References: <20250507121917.2364416-1-demonsingur@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Some I2C ATRs do not support dynamic remapping, only static mapping of direct children. Mappings will only be added or removed as a result of devices being added or removed from a child bus. The ATR pool will have to be big enough to accomodate all devices expected to be added to the child buses. Add a new flag that prevents old mappings to be replaced or new mappings to be created in the alias finding code paths. Signed-off-by: Cosmin Tanislav --- drivers/i2c/i2c-atr.c | 6 +++++- include/linux/i2c-atr.h | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/i2c-atr.c b/drivers/i2c/i2c-atr.c index 121cabbdb85d..76d70efdf190 100644 --- a/drivers/i2c/i2c-atr.c +++ b/drivers/i2c/i2c-atr.c @@ -341,12 +341,16 @@ i2c_atr_replace_mapping_by_addr(struct i2c_atr_chan *chan, u16 addr) static struct i2c_atr_alias_pair * i2c_atr_get_mapping_by_addr(struct i2c_atr_chan *chan, u16 addr) { + struct i2c_atr *atr = chan->atr; struct i2c_atr_alias_pair *c2a; c2a = i2c_atr_find_mapping_by_addr(chan, addr); if (c2a) return c2a; + if (atr->flags & I2C_ATR_F_STATIC) + return NULL; + c2a = i2c_atr_create_mapping_by_addr(chan, addr); if (c2a) return c2a; @@ -545,7 +549,7 @@ static int i2c_atr_attach_addr(struct i2c_adapter *adapter, mutex_lock(&chan->alias_pairs_lock); c2a = i2c_atr_create_mapping_by_addr(chan, addr); - if (!c2a) + if (!c2a && !(atr->flags & I2C_ATR_F_STATIC)) c2a = i2c_atr_replace_mapping_by_addr(chan, addr); if (!c2a) { diff --git a/include/linux/i2c-atr.h b/include/linux/i2c-atr.h index 5082f4dd0e23..5aaab1598084 100644 --- a/include/linux/i2c-atr.h +++ b/include/linux/i2c-atr.h @@ -20,8 +20,15 @@ struct i2c_atr; /** * enum i2c_atr_flags - Flags for an I2C ATR driver + * + * @I2C_ATR_F_STATIC: ATR does not support dynamic mapping, use static mapping. + * Mappings will only be added or removed as a result of + * devices being added or removed from a child bus. + * The ATR pool will have to be big enough to accomodate all + * devices expected to be added to the child buses. */ enum i2c_atr_flags { + I2C_ATR_F_STATIC = BIT(0), }; /**