From patchwork Mon Jun 24 11:15:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 13709340 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 64ED013667F for ; Mon, 24 Jun 2024 11:15:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719227753; cv=none; b=vFxm8Al1IZwf5sPBYt9Yvaboj4gUxYmAveiTPfY4Qds5UP7ZjH//vUJZR9eBuy2esrgJHpXRxubfpl+vE7fZf0XnEtgUiAQpua9E0YE4STNzR8J71Ge3ADbg9oNrd5gCB2rrjP+f15ydN3aF1QYakoMr92dHz+X6U6VDkToJw3c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719227753; c=relaxed/simple; bh=uOuuW2OCu5jkYs6A1PDaW9HIyGbV+hcSC8SvAFwfnhI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A2GsTFEOVkIL0C7uf8+uAYW4hHUgfkLNBIDMwTSrxl11WOvG74IIoUCCsfdcXHNiW8IO6DLHzQ0ePLPo/ZaZ+xxlMN2LTTly6rGfPh9+dcaiKw43/BEa+SJN9Gy399240rwvj0MWe4lf/gdZOFv6W7TTOvoSf0qaoYxUoc3CgmA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=OaQGthHw; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OaQGthHw" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719227751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0Yl0P6+Gwgq9w+JZ87JIdLfe2VhvU4gKannNDjDrbVQ=; b=OaQGthHwxHW9Cqj6CuEWHy7fIDK3O6LbeAIDdQdlCp5UiTLIFXsZfd/pVYqH+3hjVDPA4M VE8d5FaWqXJG46tE7tY6+Ipb577nl36GH9UvuGwMNPgES9jVHLz1rJHeHIMmJhaH6Ru/Ro w+/XeF1BuGH5sdJUxntFuAV2CMypr90= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-553-HD31-dimOHaA3K7CPT4iJA-1; Mon, 24 Jun 2024 07:15:47 -0400 X-MC-Unique: HD31-dimOHaA3K7CPT4iJA-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 27FE91956080; Mon, 24 Jun 2024 11:15:44 +0000 (UTC) Received: from x1.localdomain.com (unknown [10.39.193.82]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 521CA19560AB; Mon, 24 Jun 2024 11:15:38 +0000 (UTC) From: Hans de Goede To: =?utf-8?q?Pali_Roh=C3=A1r?= , =?utf-8?q?Ilpo_J=C3=A4rvi?= =?utf-8?q?nen?= , Andy Shevchenko , Paul Menzel , Wolfram Sang Cc: Hans de Goede , eric.piel@tremplin-utc.net, Marius Hoch , Dell.Client.Kernel@dell.com, Kai Heng Feng , platform-driver-x86@vger.kernel.org, Jean Delvare , Andi Shyti , linux-i2c@vger.kernel.org Subject: [PATCH v4 2/6] i2c: i801: Use a different adapter-name for IDF adapters Date: Mon, 24 Jun 2024 13:15:14 +0200 Message-ID: <20240624111519.15652-3-hdegoede@redhat.com> In-Reply-To: <20240624111519.15652-1-hdegoede@redhat.com> References: <20240624111519.15652-1-hdegoede@redhat.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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. Signed-off-by: Hans de Goede --- Changes in v4: - Use a single snprintf() with a conditional argument for the 2 names - Add a comment that the adapter-name is used by platform code Changes in v3: - This is a new patch in v3 of this patch-set --- 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 d2d2a6dbe29f..94265ee300c0 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -1760,8 +1760,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);