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 C12041AB6DA; Mon, 14 Oct 2024 14:42:13 +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=1728916933; cv=none; b=W4MIe6fc91bLpGV9NvWXx4CuXA55RtEIc6EJ0XrWv05vIRopMFP57SFZBQCVppQx4dia6CEI3To/21My5kmDZXxOhk/c9j5mwfK9yJxA4cvLM8hT9kyxBbTLsI1Bertfx7ijZGZnSM1tg2TU024bpa0J7DRMV29WYirhhjtBDUs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728916933; c=relaxed/simple; bh=BGemfGgqagF4eo3XCANohC63Grz7XH//PfJc3jpMFYk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=C7eG0RxIWnAqJJnJoHUI47cBDL2Xh/+EWAnshT92cgkFsKiZod4BCVidoaXx6ikEnMQakynbZXlePfsffLJJTtCxflIua+yK3KjwbRHforlXD2QGN/Da/y+MqrQXqStdmiQR7DICxtwsL9nVDT8sRUvsYa0Epxa2cBf7oDALa/E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CzvyrQhI; 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="CzvyrQhI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01EF5C4CEC3; Mon, 14 Oct 2024 14:42:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728916933; bh=BGemfGgqagF4eo3XCANohC63Grz7XH//PfJc3jpMFYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CzvyrQhIl+HeHII9i9IWxurR8UjbTjJMd5zU9gP9/kBHwPrHxVaHA8Cmxvztnki09 y8cqAFcF8TluPZBse0AACphEpq/ZfuLzz/Tsr/1E/UatVIGmO1pK552upptl7XjRC+ OYtsfsDdr6ERxVzCMqmLNjPON+bf8DCoDVVH4T/E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Pali=20Roh=C3=A1r?= , Hans de Goede , Wolfram Sang , Andi Shyti , Sasha Levin Subject: [PATCH 6.6 074/213] i2c: i801: Use a different adapter-name for IDF adapters Date: Mon, 14 Oct 2024 16:19:40 +0200 Message-ID: <20241014141045.871261011@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141042.954319779@linuxfoundation.org> References: <20241014141042.954319779@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hans de Goede [ Upstream commit 43457ada98c824f310adb7bd96bd5f2fcd9a3279 ] On chipsets with a second 'Integrated Device Function' SMBus controller use a different adapter-name for the second IDF adapter. This allows platform glue code which is looking for the primary i801 adapter to manually instantiate i2c_clients on to differentiate between the 2. This allows such code to find the primary i801 adapter by name, without needing to duplicate the PCI-ids to feature-flags mapping from i2c-i801.c. Reviewed-by: Pali Rohár Signed-off-by: Hans de Goede Acked-by: Wolfram Sang Signed-off-by: Andi Shyti Signed-off-by: Sasha Levin --- drivers/i2c/busses/i2c-i801.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 3410add34aad2..2b8bcd121ffa5 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -1754,8 +1754,15 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id) i801_add_tco(priv); + /* + * adapter.name is used by platform code to find the main I801 adapter + * to instantiante i2c_clients, do not change. + */ snprintf(priv->adapter.name, sizeof(priv->adapter.name), - "SMBus I801 adapter at %04lx", priv->smba); + "SMBus %s adapter at %04lx", + (priv->features & FEATURE_IDF) ? "I801 IDF" : "I801", + priv->smba); + err = i2c_add_adapter(&priv->adapter); if (err) { platform_device_unregister(priv->tco_pdev); -- 2.43.0