From owner-dev-commits-src-all@freebsd.org Wed Apr 14 13:21:04 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F00A75D8A66; Wed, 14 Apr 2021 13:21:04 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FL35D6XPxz3FZw; Wed, 14 Apr 2021 13:21:04 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D33BC1E983; Wed, 14 Apr 2021 13:21:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13EDL4EQ043077; Wed, 14 Apr 2021 13:21:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13EDL4H7043076; Wed, 14 Apr 2021 13:21:04 GMT (envelope-from git) Date: Wed, 14 Apr 2021 13:21:04 GMT Message-Id: <202104141321.13EDL4H7043076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f28241ca1341 - stable/13 - Remove more remnants of sio(4) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f28241ca1341aba66ef31cce82f1c8451300026d Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Apr 2021 13:21:05 -0000 The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f28241ca1341aba66ef31cce82f1c8451300026d commit f28241ca1341aba66ef31cce82f1c8451300026d Author: Mark Johnston AuthorDate: 2021-04-07 18:21:07 +0000 Commit: Mark Johnston CommitDate: 2021-04-14 13:19:49 +0000 Remove more remnants of sio(4) Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29626 (cherry picked from commit 0f07c234ca1d3ccce158bb68c03829a266942c6e) --- sys/amd64/amd64/machdep.c | 22 ---------------------- sys/isa/isavar.h | 1 - sys/kern/subr_witness.c | 1 - sys/x86/isa/atpic.c | 15 --------------- 4 files changed, 39 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index a21a93610e51..458d700a21e0 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -959,28 +959,6 @@ ssdtosyssd(ssd, sd) sd->sd_gran = ssd->ssd_gran; } -#if !defined(DEV_ATPIC) && defined(DEV_ISA) -#include -#include -/* - * Return a bitmap of the current interrupt requests. This is 8259-specific - * and is only suitable for use at probe time. - * This is only here to pacify sio. It is NOT FATAL if this doesn't work. - * It shouldn't be here. There should probably be an APIC centric - * implementation in the apic driver code, if at all. - */ -intrmask_t -isa_irq_pending(void) -{ - u_char irr1; - u_char irr2; - - irr1 = inb(IO_ICU1); - irr2 = inb(IO_ICU2); - return ((irr2 << 8) | irr1); -} -#endif - u_int basemem; static int diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h index d95a9c1ab3f2..81ba280da457 100644 --- a/sys/isa/isavar.h +++ b/sys/isa/isavar.h @@ -168,7 +168,6 @@ ISA_ACCESSOR(pnpbios_handle, PNPBIOS_HANDLE, int) /* Device class for ISA bridges. */ extern devclass_t isab_devclass; -extern intrmask_t isa_irq_pending(void); extern void isa_probe_children(device_t dev); void isa_dmacascade(int chan); diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index 7e21db5d7c91..c849a191bf16 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -664,7 +664,6 @@ static struct witness_order_list_entry order_lists[] = { { "ap boot", &lock_class_mtx_spin }, #endif { "rm.mutex_mtx", &lock_class_mtx_spin }, - { "sio", &lock_class_mtx_spin }, #ifdef __i386__ { "cy", &lock_class_mtx_spin }, #endif diff --git a/sys/x86/isa/atpic.c b/sys/x86/isa/atpic.c index bb902610b0f4..07d63b041d0b 100644 --- a/sys/x86/isa/atpic.c +++ b/sys/x86/isa/atpic.c @@ -591,21 +591,6 @@ atpic_attach(device_t dev) return (0); } -/* - * Return a bitmap of the current interrupt requests. This is 8259-specific - * and is only suitable for use at probe time. - */ -intrmask_t -isa_irq_pending(void) -{ - u_char irr1; - u_char irr2; - - irr1 = inb(IO_ICU1); - irr2 = inb(IO_ICU2); - return ((irr2 << 8) | irr1); -} - static device_method_t atpic_methods[] = { /* Device interface */ DEVMETHOD(device_probe, atpic_probe),