LinuxKPI: Remove sys/rman.h include from LKPI headers.
ClosedPublic
Actions

Authored by wulf on Nov 28 2023, 8:40 PM.

Details

Reviewers

manu
dumbbell
bz

Group Reviewers

Restricted Owners Package

(Owns No Changed Paths)

Commits

rG914a0c5e1b0f: LinuxKPI: Remove sys/rman.h include from LKPI headers.
rG96ab16ebab63: LinuxKPI: Remove sys/rman.h include from LKPI headers.

Summary

sys/rman.h defines resource structure which conflicts with the Linux
structure of the same name. To fix that remove reference to sys/rman.h
from linux/pci.h and move resource management code to linux_pci.c.
Update consumers which were depending on linux/pci.h pollution.

No functional changes intended.

Sponsored by: Serenity Cyber Security, LLC
MFC after: 1 week

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

wulf created this revision.Nov 28 2023, 8:40 PM

Owners added a reviewer: Restricted Owners Package.Nov 28 2023, 8:40 PM

Herald added subscribers: linuxkpi, emaste, imp. · View Herald TranscriptNov 28 2023, 8:40 PM

wulf requested review of this revision.Nov 28 2023, 8:40 PM

Harbormaster completed remote builds in B54646: Diff 130675.Nov 28 2023, 8:41 PM

The aim of this set of reviews is to reach 6.1-lts (6.1.63 at the moment of writing). https://github.com/wulf7/drm-kmod/commits/6.1-lts

bz requested changes to this revision.Dec 8 2023, 4:17 PM

bz added inline comments.

sys/compat/linuxkpi/common/include/linux/interrupt.h
43	I really don't like this.
sys/compat/linuxkpi/common/include/linux/pci.h
400–401	This seems misplaced and should go up with the other function declarations.
534–537	If it is a public interface we tend to use linuxkpi_ prefixes; for internal stuff (not part of the LinuxKPI, use lkpi_)
535	Function declarations should all go up.
713	ditto, ditto.
743–744	ditto.
767	ditto.
1328–1329	ditto.
1328–1329	ditto.
1332	ditto. ditto.
sys/compat/linuxkpi/common/src/linux_pci.c
134	Looks like copy&paste in Phabricator; are tabs preserved?
454	linuxkpi_
473	linuxkpi_
612	no more inline
650	linuxkpi_
695	linuxkpi_
755	linuxkpi_
768–831	Is this part of the public interface or can become static now?
769	linuxkpi_
785	linuxkpi_
983–984	no more inline?
984	if it's static it's lkpi_ given we touch it.
995	remove comment
996	Leading space.

This revision now requires changes to proceed.Dec 8 2023, 4:17 PM

erj added a subscriber: erj.Dec 8 2023, 5:18 PM

erj added inline comments.

sys/compat/linuxkpi/common/include/linux/interrupt.h
43	I don't get it, but based on my limited understanding of the Linux KPI, If that define is part of a public API, wouldn't it make sense to match the value used in Linux instead of using our own?

lkpi->linuxkpi for public interfaces
move function declarations to beginning of pci.h and sort them in order of definition
remove forgotten inlines
make IRQF_SHARED flag FreeBSD-agnostic

wulf marked 25 inline comments as done.Dec 10 2023, 7:50 PM

wulf added inline comments.

sys/compat/linuxkpi/common/include/linux/interrupt.h
43	It is now not RF_SHAREABLE but has it's value to preserve KBI
sys/compat/linuxkpi/common/include/linux/pci.h
400–401	Moved up
534–537	It got linuxkpi_ prefix while I personally prefer lkpi_ one as it shorter by 4 symbols
535	Moved up
sys/compat/linuxkpi/common/src/linux_pci.c
134	Seems to be Phabricator issue. All tabs are in place.
612	Inline removed