Page MenuHomeFreeBSD
Differential D34305

LinuxKPI: pci: implement pci_upstream_bridge()
ClosedPublic
Actions

Authored by bz on Feb 16 2022, 6:34 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Aug 15, 4:00 PM
Unknown Object (File)
Wed, Aug 12, 4:33 PM
Unknown Object (File)
Tue, Aug 11, 11:08 PM
Unknown Object (File)
Mon, Aug 10, 5:55 PM
Unknown Object (File)
Mon, Aug 10, 5:52 PM
Unknown Object (File)
Mon, Aug 10, 5:59 AM
Unknown Object (File)
Sun, Aug 9, 4:08 AM
Unknown Object (File)
Sat, Aug 8, 8:34 PM
View All Files
Subscribers
emaste
• hselasky
imp
wulf

Details

Reviewers
jhb
grehan
• hselasky
Group Reviewers
linuxkpi
x11
Commits
rGa85cf68895d4: LinuxKPI: pci: implement pci_upstream_bridge()
rG50136233846e: LinuxKPI: pci: implement pci_upstream_bridge()
rGb3b836251f9f: LinuxKPI: pci: implement pci_upstream_bridge()
Summary

Currently we point back to ourselves on pdev->bus->self rather than
the parent PCI bridge.

We keep this as status-quo with an extra comment and only on-demand
allocate a pci_dev for the parent bridge if we are asked for in
pci_upstream_bridge().
When releasing the pci_dev we check if pdev->bus->self has changed
and call pci_dev_put() to release the reference count on the parent
bridge as well.

This code moves pci_is_root_bus() higher up in pci.h but no functional
change there.

Sponsored by: The FreeBSD Foundation
MFC after: 3 days

Test Plan

Adding x11 to reviewers as this conflicts with the
implementation there.

I'll also need to MFC this.

Diff Detail

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

Event Timeline

bz created this revision.Feb 16 2022, 6:34 PM
Herald added subscribers: emaste, imp. · View Herald TranscriptFeb 16 2022, 6:35 PM
bz requested review of this revision.Feb 16 2022, 6:35 PM
Harbormaster completed remote builds in B44484: Diff 102849.Feb 16 2022, 6:35 PM
bz added reviewers: jhb, grehan.Feb 18 2022, 12:29 PM

Sorry to add you here but I know you to know PCI very well; I found pci_find_pcie_root_port() but nothing which just walks up the PCI bridge tree step by step as a function to the next step so I am going with what other people also have done in sys/dev/ and got two up and check the class on that parent. Is that sane? I wonder if we should indeed (in the future) add a function and then replace then 2-3 places throughout the tree with that...?

bz added a comment.Feb 20 2022, 6:58 PM

x11 I opened a pull request which will remove the conflict : https://github.com/freebsd/drm-kmod/pull/152/commits/a35463b86a3babd4b580dab5f447d215478036ee If possible please apply to the devel/current/13 versions so this could proceed once reviewed.

jhb added inline comments.Feb 23 2022, 11:43 PM
sys/compat/linuxkpi/common/include/linux/pci.h
500

Won't this second case (pdev->bus->self == NULL) never get this far because pci_is_root_bus() would be true and return NULL instead?

bz added inline comments.Feb 23 2022, 11:57 PM
sys/compat/linuxkpi/common/include/linux/pci.h
500

Correct; I'll remove the second condition :-)

bz updated this revision to Diff 103184.Feb 24 2022, 12:04 AM
bz marked an inline comment as done.

Remove 2nd condition from if() clause as it cannot happen here.

Harbormaster completed remote builds in B44559: Diff 103184.Feb 24 2022, 12:04 AM
bz added a subscriber: wulf.Feb 27 2022, 11:57 PM

Thank you @wulf for handling the drm-kmod bits! Much appreciated.

Anyone any comments on this? If I don't hear back I'll probably commit it Tuesday morning UTC.

bz added a comment.Mar 12 2022, 12:50 AM

This fell through. ANyone trying to use a last chance to review? I'd love to at least get the linux_pci.c part of the change in.

• hselasky added a subscriber: • hselasky.Mar 12 2022, 8:37 AM

Change looks good. I've added some comments.

sys/compat/linuxkpi/common/include/linux/pci.h
505

goto done;

508

goto done;

511

goto done;

518

done:

bz updated this revision to Diff 103845.Mar 14 2022, 10:00 PM

Goto done, goto done, goto done, are we done now?

Harbormaster completed remote builds in B44770: Diff 103845.Mar 14 2022, 10:00 PM
• hselasky accepted this revision.Mar 15 2022, 7:56 AM
This revision is now accepted and ready to land.Mar 15 2022, 7:56 AM
Closed by commit rGb3b836251f9f: LinuxKPI: pci: implement pci_upstream_bridge() (authored by bz). · Explain WhyMar 21 2022, 4:20 PM
This revision was automatically updated to reflect the committed changes.
bz added a commit: rGb3b836251f9f: LinuxKPI: pci: implement pci_upstream_bridge().
bz added a commit: rG50136233846e: LinuxKPI: pci: implement pci_upstream_bridge().Mar 27 2022, 8:16 PM
bz added a commit: rGa85cf68895d4: LinuxKPI: pci: implement pci_upstream_bridge().Mar 30 2022, 3:50 PM

Revision Contents
Changeset List

PathSize
sys/
compat/
linuxkpi/
common/
include/
linux/
49 lines
src/
7 lines

Diff 103845

View Options

sys/compat/linuxkpi/common/include/linux/pci.h

Loading...
View Options

sys/compat/linuxkpi/common/src/linux_pci.c

Loading...