From nobody Thu Oct 24 02:46:07 2024 X-Original-To: dev-commits-src-branches@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 4XYqzg5rPhz5Zy1v; Thu, 24 Oct 2024 02:46:07 +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 4XYqzg4Hrbz46tS; Thu, 24 Oct 2024 02:46:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737967; 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=X1G9duCNMvMc5ZI/PwfcBkJResZr8dcpUahteD+FGBA=; b=ZCdAi68ERU11DQJDGc14XuNBORaC2ZMZ6FAg0IaFu62bkqMK1HuaoKJmdR1GVYRoWyGZMv dh2gpBJc0x9b0qh7JE/ucEUgqUHLYh/hFx+TRENBACkUjBKv8cQNp81DCNp0Y2aQSqlU5Q bRnZDieEv7vdAfXYZcxeEYGjayYNp82TIUjqP/qpVlJbzQ/K80SXfzwwv/NLQMvGkR3z9Q tHYO89iZgprhFfBOEDYzP9I9EGFE9XCf0kxA9qm8OIoPra7TJIWdDGt0Eu1twa7ZMp0FKf tZzf4X6iImy9tQ9kCsyOqdeDGxUmibQy7sxLV0zTbBMND5PVOve5A0ufK1CciA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729737967; 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=X1G9duCNMvMc5ZI/PwfcBkJResZr8dcpUahteD+FGBA=; b=t1ZziYkxe+5dQJ/NJqcBxCa8gWkpYxjvV2pCm7IxHoeq7YnN1od9hM5Oo2DJCCMD0rWKf6 jp1laSvZVGPjj4I94YYeLzaMgGrpmX6cgA5h+AZxJ/ee0Qif8txhPAWE9fPDd0ag9jwjnu 0ljhJW/vTNU6lDx+wZXLweuM6gTLcM9BCJy1OzGQdyvM4YkRHoBWcOIA8nowiZM+XD5P/6 xL2URJVy/VrkJDOJee6/47Ufn0AasgLznApkG/9hxszYzCLtYORq9cWGfHZoFrS2dZWSBY Wd53Ho9fHIZPOnMBfiJKDdaeJqSWfvrgj6QTB+l14Y581GbY09sZi5cy/dLN9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729737967; a=rsa-sha256; cv=none; b=xR0xOH9GRrCRPuUIZc1cAg43tS6K2YPuAokpI0ftPIOiB8TkKLcfmNtuPulQ1jH+jhkJH1 rh006PtZFZ86fxcdNNX1W0GpzB7gnNMGfLIvMIN0bqb/ws8UdxVlw0wRExLIcJLZwYD8mh yYr2VNdNeqrH4ITWbWpZok9i7zeg/3jfGXVTwznCZqWZYYzFNUcFGERiyDmu0/fD9SW1c7 yXZWdAnUqbsFaucZktE/AR3raM0hlF5GDP38tqBn1LX4nnN0qcqHPXwudCE8z9mwKu/rhh P8c6DfM978BX7BGiS0bytxYno/mwoiNLtJb1KrEdjLiqDlmaMCQOppgBZU7ibQ== 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 4XYqzg3vN5zPPV; Thu, 24 Oct 2024 02:46:07 +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 49O2k7Bt086119; Thu, 24 Oct 2024 02:46:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49O2k70e086116; Thu, 24 Oct 2024 02:46:07 GMT (envelope-from git) Date: Thu, 24 Oct 2024 02:46:07 GMT Message-Id: <202410240246.49O2k70e086116@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: 858397f868c0 - stable/14 - apic: add ioapic_get_dev() method List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 858397f868c0372a074cd14736dabbb2fd0cb09a Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=858397f868c0372a074cd14736dabbb2fd0cb09a commit 858397f868c0372a074cd14736dabbb2fd0cb09a Author: Konstantin Belousov AuthorDate: 2024-10-12 22:52:44 +0000 Commit: Konstantin Belousov CommitDate: 2024-10-24 02:44:40 +0000 apic: add ioapic_get_dev() method (cherry picked from commit ea4e4449b85593025c2eb31bb642732971d96225) --- sys/x86/include/apicvar.h | 1 + sys/x86/x86/io_apic.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h index ac6a82659e34..61c726f150df 100644 --- a/sys/x86/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -258,6 +258,7 @@ void lapic_handle_intr(int vector, struct trapframe *frame); void lapic_handle_timer(struct trapframe *frame); int ioapic_get_rid(u_int apic_id, uint16_t *ridp); +device_t ioapic_get_dev(u_int apic_id); extern int x2apic_mode; extern int lapic_eoi_suppression; diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c index 4337d1adc8a9..525547f9482a 100644 --- a/sys/x86/x86/io_apic.c +++ b/sys/x86/x86/io_apic.c @@ -1081,6 +1081,22 @@ ioapic_get_rid(u_int apic_id, uint16_t *ridp) return (0); } +device_t +ioapic_get_dev(u_int apic_id) +{ + struct ioapic *io; + + mtx_lock_spin(&icu_lock); + STAILQ_FOREACH(io, &ioapic_list, io_next) { + if (io->io_hw_apic_id == apic_id) + break; + } + mtx_unlock_spin(&icu_lock); + if (io != NULL) + return (io->pci_dev); + return (NULL); +} + /* * A new-bus driver to consume the memory resources associated with * the APICs in the system. On some systems ACPI or PnPBIOS system