Page MenuHomeFreeBSD
Differential D32955

Retire unused non-PCI_RES_BUS code
ClosedPublic
Actions

Authored by jrtc27 on Nov 12 2021, 1:17 AM.
Tags
None
Referenced Files
F102078559: D32955.diff
Thu, Nov 7, 8:47 AM
Unknown Object (File)
Thu, Oct 17, 6:27 AM
Unknown Object (File)
Tue, Oct 15, 10:04 PM
Unknown Object (File)
Tue, Oct 15, 6:08 AM
Unknown Object (File)
Sat, Oct 12, 9:39 PM
Unknown Object (File)
Fri, Oct 11, 12:40 PM
Unknown Object (File)
Wed, Oct 9, 5:43 PM
Unknown Object (File)
Wed, Oct 9, 5:19 PM
View All 86 Files
Subscribers
andrew
emaste
imp

Details

Reviewers
jhb
manu
andrew
emaste
imp
Commits
rGe1d442a6db14: Retire unused non-PCI_RES_BUS code
Summary

All architectures define PCI_RES_BUS unconditionally now that only
NEW_PCIB is supported, so we no longer need the legacy code.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 42745
Build 39633: arc lint + arc unit

Event Timeline

jrtc27 created this revision.Nov 12 2021, 1:17 AM
Herald added a reviewer: manu. · View Herald TranscriptNov 12 2021, 1:17 AM
Herald added subscribers: emaste, andrew, imp. · View Herald Transcript
jrtc27 requested review of this revision.Nov 12 2021, 1:17 AM
Harbormaster completed remote builds in B42745: Diff 98392.Nov 12 2021, 1:18 AM
jrtc27 added a parent revision: D32954: Retire non-NEW_PCIB code and remove config option.Nov 12 2021, 1:27 AM
jrtc27 added a comment.Nov 12 2021, 1:29 AM

The patch series passes make kernels and riscv GENERIC still boots with VirtIO-over-PCI in use, but both were done manually (unifdef apparently does not do anything to defined(A) && defined(B), only defined(A) || defined(B)) so I could easily have broken something.

jhb accepted this revision.Nov 12 2021, 5:29 PM

\o/

This revision is now accepted and ready to land.Nov 12 2021, 5:29 PM
jrtc27 mentioned this in D32954: Retire non-NEW_PCIB code and remove config option.Jan 20 2023, 5:45 PM
emaste added a comment.Jan 20 2023, 6:28 PM

love the removal of "AFU" and "gross hack"!

andrew accepted this revision.Jan 30 2023, 2:49 PM
emaste accepted this revision.Aug 3 2023, 5:52 PM
imp accepted this revision.Aug 3 2023, 8:12 PM

This all looks good to me... I'll see if I still have a CardBus machine around to test on... I kinda doubt it... I'll bet even if I did, it's long ago broken by something else.

sys/dev/pccbb/pccbb_pci.c
304

sc->bus can likely go away, no?

342–345

These likely can go away too.... They were part of the gross hack to allow people to set sec/sub bus numbers. This hack never worked very well...

355

This entire #if 0 likely can go... I never needed to finish stubbing it out...

sys/dev/pci/pci_pci.c
1420

Maybe this is a separate commit? IT's super-duper old hw that I doubt freebsd could still boot on...
But maybe it's ok to include in this omnibus cleanup.

1435

2003/2004 era laptop... likely related to the hacks I had in cbb

jrtc27 updated this revision to Diff 133383.Jan 26 2024, 2:01 AM

Rebased. Build-tested with tinderbox -DWITHOUT_WORLDS -DMAKE_ALL_KERNELS.

This revision now requires review to proceed.Jan 26 2024, 2:01 AM
Harbormaster completed remote builds in B55630: Diff 133383.Jan 26 2024, 2:02 AM
jhb accepted this revision.Jan 29 2024, 6:08 PM

While there is some cruft @imp noted in the ccb driver that can be purged further, that probably should be done as a separate commit.

sys/dev/pci/pci_pci.c
1420

I think in the PCI_RES_BUS case I had previously replicated this logic up in the pci(4) bus driver since it now tracks bus numbers in ivars. In particular, check pci_reserve_secbus in sys/dev/pci/pci.c.

This revision is now accepted and ready to land.Jan 29 2024, 6:08 PM
jrtc27 added inline comments.Feb 1 2024, 1:29 AM
sys/dev/pci/pci_pci.c
1420

Also I'm not removing functionality, I'm removing code that's always compiled out

jrtc27 updated this revision to Diff 141048.Jul 17 2024, 3:53 PM

Rebased

This revision now requires review to proceed.Jul 17 2024, 3:53 PM
Harbormaster completed remote builds in B58681: Diff 141048.Jul 17 2024, 3:53 PM
jrtc27 edited the summary of this revision. (Show Details)Jul 17 2024, 3:53 PM
andrew accepted this revision.Jul 17 2024, 5:29 PM
This revision is now accepted and ready to land.Jul 17 2024, 5:29 PM
jhb accepted this revision.Jul 18 2024, 5:53 PM
Closed by commit rGe1d442a6db14: Retire unused non-PCI_RES_BUS code (authored by jrtc27). · Explain WhyJul 18 2024, 5:56 PM
This revision was automatically updated to reflect the committed changes.
jrtc27 added a commit: rGe1d442a6db14: Retire unused non-PCI_RES_BUS code.

Revision Contents
Changeset List

PathSize
sys/
arm/
mv/
4 lines
arm64/
cavium/
6 lines
dev/
acpica/
31 lines
cardbus/
10 lines
2 lines
ofw/
6 lines
pccbb/
46 lines
pci/
18 lines
6 lines
61 lines
2 lines
2 lines
4 lines
x86/
pci/
9 lines
7 lines
x86/
8 lines

Diff 98392

View Options

sys/arm/mv/mv_pci.c

Loading...
View Options

sys/arm64/cavium/thunder_pcie_pem.c

Loading...
View Options

sys/dev/acpica/acpi_pcib_acpi.c

Loading...
View Options

sys/dev/cardbus/cardbus.c

Loading...
View Options

sys/dev/cardbus/cardbusvar.h

Loading...
View Options

sys/dev/ofw/ofw_pcib.c

Loading...
View Options

sys/dev/pccbb/pccbb_pci.c

Loading...
View Options

sys/dev/pci/pci.c

Loading...
View Options

sys/dev/pci/pci_host_generic.c

Loading...
View Options

sys/dev/pci/pci_pci.c

Loading...
View Options

sys/dev/pci/pci_private.h

Loading...
View Options

sys/dev/pci/pci_subr.c

Loading...
View Options

sys/dev/pci/pcib_private.h

Loading...
View Options

sys/x86/pci/pci_bus.c

Loading...
View Options

sys/x86/pci/qpi.c

Loading...
View Options

sys/x86/x86/mptable_pci.c

Loading...