From nobody Thu Oct 17 16:33:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XTtg82jMpz5ZBM4; Thu, 17 Oct 2024 16:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XTtg81sJ3z45xN; Thu, 17 Oct 2024 16:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729182788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0/xaAbsCm7ymaRN3XO4rbLJWIzFcvNcUEdvzlyQB8wk=; b=jwTx4QxhQoe841kHIRoUwDB4lOf1kv6esq2Hrkg8/9hbeRyNfX5lEBuE8JPuzB96g5bvix rR53WQf35H2OUG0fnDmwr41gWg+F8kpfnfVcvJHTsvwyHzlaGMrfeOV+ejXfmtUYQYJ2G7 NvjZ7R7Q/cfEM+rtjErry+G4D1ZvRu2+RAE/IvmO/JJeJ5HRA745jJyHyyQ66L1t/GR13J dmnZB6EZlm76mczaZlpcBXPrRAcPEkqCUHbA3ARhVYfO2cFjiUNF01jfYSpR73+BqeMT2y Fw/i+p3+w1d5smmMfcF1e4+LWdX4dB3kAglvuLKXPsNTzWq2gImrodrIvkHv+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729182788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0/xaAbsCm7ymaRN3XO4rbLJWIzFcvNcUEdvzlyQB8wk=; b=AUrZ4UgOMJuyxCSrGa+jv24XwXHsCasw1e3tPrUghrTsgNvKQOE1EieIZOaB/qu+o/9Q8q f+fcBgchDv05htCR+ThVtdmIwTd3lmhHGAvvSRpx5m5keQo5VvlxVCrxNOvSBJSmccFoRk jEIh29czfQekpwAutDH5R/RhprdZ7XbDjwmfPGitV/3wBH3H/G/r4iO+G4cbm1bYTa8BKs Nw2Ap+mfY64lXrjvNt0DA2Ha0Es/6ktpWl+yThEE6fjvpPcs4Cv7YpNVADODrOOM0ltuKm rP+9d+Ad2dNWabsM8liCTv9pFdOvgD/RXqnEyg9r1QZ+WOqFoJNaruDGDxB5Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729182788; a=rsa-sha256; cv=none; b=qwT9DTmq6uIHJzJGmf3JRPK9T6upBIAMKwFGnXNNbNmp47EJJPEVVbCNP4jz290cNbAJrv mrnrJ2FBCffFM2fxW2x0nSRX0hSfZB9wuazcLzxEt5ZooFbhwuZXAob7PJJED2zLY5CazC XvpP7YXNqXSM2b0qwwbFc1eNjVzqn7GbRf5+wDHDf51wRp50U59Y6AUHI4YS5iO53OpIRi deysjUkqfqqbGvSXUt8eTggC8mw8vK++AWAJhM3m7X4koxOoCgvN1QU2RNztbDT2o4K4fI D20ES6H24MxOpQfVMZOFMBb86jXKG6tENXoVqTXHrcUs1qSfx6bF5vyKB435Hw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XTtg81RPxzxLD; Thu, 17 Oct 2024 16:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49HGX8mv033007; Thu, 17 Oct 2024 16:33:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49HGX8Cx033004; Thu, 17 Oct 2024 16:33:08 GMT (envelope-from git) Date: Thu, 17 Oct 2024 16:33:08 GMT Message-Id: <202410171633.49HGX8Cx033004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 14c22e28e4ee - stable/14 - Add smbus and i2c device IDs for Meteor Lake List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 14c22e28e4ee62f4d3f2d6004881d874fafa7d11 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=14c22e28e4ee62f4d3f2d6004881d874fafa7d11 commit 14c22e28e4ee62f4d3f2d6004881d874fafa7d11 Author: SHENG-YI HONG AuthorDate: 2024-08-13 12:22:43 +0000 Commit: Ed Maste CommitDate: 2024-10-17 16:32:38 +0000 Add smbus and i2c device IDs for Meteor Lake Reviewed by: emaste, Daniel Schaefer MFC after: 3 days Sponsored by: Framework Computer Inc Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46249 (cherry picked from commit d3b05d0ea10abe059dc63c6fb6ef3f061b758af2) --- sys/dev/ichiic/ig4_pci.c | 8 ++++++++ sys/dev/ichsmb/ichsmb_pci.c | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/sys/dev/ichiic/ig4_pci.c b/sys/dev/ichiic/ig4_pci.c index 9f12e713cdeb..138de77c35db 100644 --- a/sys/dev/ichiic/ig4_pci.c +++ b/sys/dev/ichiic/ig4_pci.c @@ -168,6 +168,10 @@ static int ig4iic_pci_detach(device_t dev); #define PCI_CHIP_ALDERLAKE_M_I2C_3 0x54eb8086 #define PCI_CHIP_ALDERLAKE_M_I2C_4 0x54c58086 #define PCI_CHIP_ALDERLAKE_M_I2C_5 0x54c68086 +#define PCI_CHIP_METEORLAKE_M_I2C_0 0x7e788086 +#define PCI_CHIP_METEORLAKE_M_I2C_1 0x7e798086 +#define PCI_CHIP_METEORLAKE_M_I2C_2 0x7e508086 +#define PCI_CHIP_METEORLAKE_M_I2C_3 0x7e518086 struct ig4iic_pci_device { uint32_t devid; @@ -280,6 +284,10 @@ static struct ig4iic_pci_device ig4iic_pci_devices[] = { { PCI_CHIP_ALDERLAKE_M_I2C_3, "Intel Alder Lake-M I2C Controller-3", IG4_TIGERLAKE}, { PCI_CHIP_ALDERLAKE_M_I2C_4, "Intel Alder Lake-M I2C Controller-4", IG4_TIGERLAKE}, { PCI_CHIP_ALDERLAKE_M_I2C_5, "Intel Alder Lake-M I2C Controller-5", IG4_TIGERLAKE}, + { PCI_CHIP_METEORLAKE_M_I2C_0, "Intel Meteor Lake-M I2C Controller-0", IG4_TIGERLAKE}, + { PCI_CHIP_METEORLAKE_M_I2C_1, "Intel Meteor Lake-M I2C Controller-1", IG4_TIGERLAKE}, + { PCI_CHIP_METEORLAKE_M_I2C_2, "Intel Meteor Lake-M I2C Controller-2", IG4_TIGERLAKE}, + { PCI_CHIP_METEORLAKE_M_I2C_3, "Intel Meteor Lake-M I2C Controller-3", IG4_TIGERLAKE}, }; static int diff --git a/sys/dev/ichsmb/ichsmb_pci.c b/sys/dev/ichsmb/ichsmb_pci.c index 57f9afb66f01..6c40132d715d 100644 --- a/sys/dev/ichsmb/ichsmb_pci.c +++ b/sys/dev/ichsmb/ichsmb_pci.c @@ -111,6 +111,9 @@ #define ID_ALDERLAKE 0x7aa3 #define ID_ALDERLAKE2 0x51a3 #define ID_ALDERLAKE3 0x54a3 +#define ID_METEORLAKE 0x7e22 +#define ID_METEORLAKE2 0x7f23 +#define ID_METEORLAKE3 0xae22 static const struct pci_device_table ichsmb_devices[] = { { PCI_DEV(PCI_VENDOR_INTEL, ID_82801AA), @@ -209,6 +212,12 @@ static const struct pci_device_table ichsmb_devices[] = { PCI_DESCR("Intel Alder Lake SMBus controller") }, { PCI_DEV(PCI_VENDOR_INTEL, ID_ALDERLAKE3), PCI_DESCR("Intel Alder Lake SMBus controller") }, + { PCI_DEV(PCI_VENDOR_INTEL, ID_METEORLAKE), + PCI_DESCR("Intel Meteor Lake SMBus controller") }, + { PCI_DEV(PCI_VENDOR_INTEL, ID_METEORLAKE2), + PCI_DESCR("Intel Meteor Lake SMBus controller") }, + { PCI_DEV(PCI_VENDOR_INTEL, ID_METEORLAKE3), + PCI_DESCR("Intel Meteor Lake SMBus controller") }, }; /* Internal functions */