From nobody Tue Dec 10 02:40:42 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 4Y6jdl2kXBz5h7yV; Tue, 10 Dec 2024 02:40:43 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6jdl0wNRz4mQ5; Tue, 10 Dec 2024 02:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733798443; 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=2RiIXiAgO8NDjkGF4KGrsLyfvtlLvQbbo4TViwkNLTs=; b=ATkyPtwzOVEP9VVQlkm6PFSJkkdC8zO6AmVmgPF0jgDCevBxcSg5xg7huPXowYTXsw/7PC Q/AaFBr60ZpbdcdGm8zRgK24lq0kaA/WJGto20rMl5/9GgTUmrt+PNvuzHF021PCWtXqK6 tqH/iUpNZIauaZXJ0gjKMpn3d5AVnLRLFv7a9KkUU6E/GG9Ud1QUpRiQ6Eb82N90t+12DE tR+HciMxjTsama0xQTKmvMzb9UX9r14FWRFtStvn45LgPk0EzhZu3zwf/bjJp0VjHIECno l8J8Px6ZVeoep9Z7D8criLh+q3/tD7KgVcIeqIYdhP3FMBTMYGdUX/KA/OQIgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733798443; 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=2RiIXiAgO8NDjkGF4KGrsLyfvtlLvQbbo4TViwkNLTs=; b=Sr1UUEXjw+45mkkao2iiQaUfNybnneG0aElHuxWQGezFmL1Y27lsxplSdGTjK2Rk8w/Dtj lADIqXEhWXvS3nTV9lfWyeHUSIKmTtvDeWcvwHpM5fHwPLan6sarzUu4Si5JhjcOOMxNJD uecH2dqiE/4k9fZOqiXAImiXREfnyB6dzN0NzeJpDQl9sPBsIrfnCLdt5LrBeFBLiPtUqp M8bfuOoaam9nl1Utq3UOFR/3G3mBMoFpzhUXeScDzr25+znAgYJjA3sogQgSk1AB+7Tjnd 71zzgJ76S5LRoLsvoYThOqzzbgIc+16m/dX0CG2XKFkoltCyfzk++EGxcSKclA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733798443; a=rsa-sha256; cv=none; b=rsmyInxU1trpteDeem+gqmWWZ1rPRt5hNpzSVxwqeDNEoAAogzZjfrB+zEe8oyBBMsfkMn D61L0E75D4KkuovxiQ+qx+aFq0Wz2wZu9+HXJy+R6bXDen4v6U+w1OCNQJ1Lp8GXH00lk0 wNfz53bWXkE7rZJLpFLEHp4ANxwzoQSWWtWVaj1Y68fE0PG4j+XHrmKWnStFDouHYHRPGg O2n2HkuiGSFYCSNYc//6k2HMGV4L4/Q/EvP5D1KNmuV/QZjhqb6ptgpnvHCrh+urvXCUmA zgrmtxwjV+Hw3zSSepl+cTS6Kw88GfwYOk7y5izpaFDyUN6r+6luhVGV1f95lA== 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 4Y6jdl0X8vz14b7; Tue, 10 Dec 2024 02:40:43 +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 4BA2egl5083492; Tue, 10 Dec 2024 02:40:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BA2egt4083489; Tue, 10 Dec 2024 02:40:42 GMT (envelope-from git) Date: Tue, 10 Dec 2024 02:40:42 GMT Message-Id: <202412100240.4BA2egt4083489@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: fff3323694f7 - stable/14 - amdiommu: correctly initialize iommu.unit 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fff3323694f79e020ea139a020ed047bfeb578e3 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fff3323694f79e020ea139a020ed047bfeb578e3 commit fff3323694f79e020ea139a020ed047bfeb578e3 Author: Konstantin Belousov AuthorDate: 2024-12-06 08:06:42 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-10 02:40:24 +0000 amdiommu: correctly initialize iommu.unit (cherry picked from commit 53adc0b898a4d263cad0bdfb687d9f008e5768f3) --- sys/x86/iommu/amd_drv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/x86/iommu/amd_drv.c b/sys/x86/iommu/amd_drv.c index 2ab0213925eb..72aae58334f2 100644 --- a/sys/x86/iommu/amd_drv.c +++ b/sys/x86/iommu/amd_drv.c @@ -176,7 +176,6 @@ ivrs_lookup_ivhd_0x40(ACPI_IVRS_HARDWARE2 *h2, void *arg) return (false); ildp->sc->unit_dom = h2->PciSegmentGroup; - ildp->sc->iommu.unit = ivrs_info_to_unit_id(h2->Info); ildp->sc->efr = h2->EfrRegisterImage; return (true); } @@ -194,7 +193,6 @@ ivrs_lookup_ivhd_0x10(ACPI_IVRS_HARDWARE1 *h1, void *arg) return (false); ildp->sc->unit_dom = h1->PciSegmentGroup; - ildp->sc->iommu.unit = ivrs_info_to_unit_id(h1->Info); return (true); } @@ -456,6 +454,7 @@ amdiommu_attach(device_t dev) bool res; sc = device_get_softc(dev); + sc->iommu.unit = device_get_unit(dev); sc->iommu.dev = dev; error = pci_find_cap(dev, PCIY_SECDEV, &sc->seccap_reg);