ClosedPublic
Actions

Authored by dumbbell on Nov 11 2022, 6:29 PM.

Details

Reviewers

manu
bz

Commits

rG577e5458c520: linuxkpi: Define `pci_reset_function()` in <linux/pci.h>
rG86a1c5d12945: linuxkpi: Define `pci_reset_function()` in <linux/pci.h>

Summary

Currently, it always returns an error on FreeBSD.

This change is a requirement to update our DRM drivers to Linux 5.12.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

dumbbell created this revision.Nov 11 2022, 6:29 PM

Herald added subscribers: linuxkpi, emaste, imp. · View Herald TranscriptNov 11 2022, 6:29 PM

dumbbell requested review of this revision.Nov 11 2022, 6:29 PM

bz accepted this revision.Nov 11 2022, 7:05 PM

bz added a subscriber: bz.

bz added inline comments.

sys/compat/linuxkpi/common/include/linux/pci.h
947	Would there be any harm in implementing it? I am just asking what the effects would be on drm-kmod -- or what they are now if this doesn't work?

This revision is now accepted and ready to land.Nov 11 2022, 7:05 PM

manu accepted this revision.Nov 11 2022, 7:47 PM

I admit I didn't digged deeper into this yet. My focus was on finishing the backport of Linux 5.12 drivers. But I will take a look to understand what the impact is in the drivers.

Closed by commit rG86a1c5d12945: linuxkpi: Define `pci_reset_function()` in <linux/pci.h> (authored by dumbbell). · Explain WhyNov 11 2022, 8:06 PM

This revision was automatically updated to reflect the committed changes.

dumbbell added a commit: rG86a1c5d12945: linuxkpi: Define `pci_reset_function()` in <linux/pci.h>.

manu added a commit: rG577e5458c520: linuxkpi: Define `pci_reset_function()` in <linux/pci.h>.Jan 24 2023, 8:56 AM

Revision Contents
Changeset List

Path

Size

sys/

compat/

linuxkpi/

common/

include/

linux/

pci.h

7 lines

Diff 113014

View Options

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

Property	Old Value	New Value
fbsd:nokeywords	null	yes \ No newline at end of property
svn:eol-style	null	native \ No newline at end of property
svn:mime-type	null	text/plain \ No newline at end of property

				--- vendor/golang.org/x/net/ipv6/zsys_freebsd_arm64.go.orig 2020-03-30 16:34:37 UTC
				+++ vendor/golang.org/x/net/ipv6/zsys_freebsd_arm64.go
				@@ -0,0 +1,122 @@
				+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
				+// cgo -godefs defs_freebsd.go
				+
				+package ipv6
				+
				+const (
				+ sysIPV6_UNICAST_HOPS = 0x4
				+ sysIPV6_MULTICAST_IF = 0x9
				+ sysIPV6_MULTICAST_HOPS = 0xa
				+ sysIPV6_MULTICAST_LOOP = 0xb
				+ sysIPV6_JOIN_GROUP = 0xc
				+ sysIPV6_LEAVE_GROUP = 0xd
				+ sysIPV6_PORTRANGE = 0xe
				+ sysICMP6_FILTER = 0x12
				+
				+ sysIPV6_CHECKSUM = 0x1a
				+ sysIPV6_V6ONLY = 0x1b
				+
				+ sysIPV6_IPSEC_POLICY = 0x1c
				+
				+ sysIPV6_RTHDRDSTOPTS = 0x23
				+
				+ sysIPV6_RECVPKTINFO = 0x24
				+ sysIPV6_RECVHOPLIMIT = 0x25
				+ sysIPV6_RECVRTHDR = 0x26
				+ sysIPV6_RECVHOPOPTS = 0x27
				+ sysIPV6_RECVDSTOPTS = 0x28
				+
				+ sysIPV6_USE_MIN_MTU = 0x2a
				+ sysIPV6_RECVPATHMTU = 0x2b
				+
				+ sysIPV6_PATHMTU = 0x2c
				+
				+ sysIPV6_PKTINFO = 0x2e
				+ sysIPV6_HOPLIMIT = 0x2f
				+ sysIPV6_NEXTHOP = 0x30
				+ sysIPV6_HOPOPTS = 0x31
				+ sysIPV6_DSTOPTS = 0x32
				+ sysIPV6_RTHDR = 0x33
				+
				+ sysIPV6_RECVTCLASS = 0x39
				+
				+ sysIPV6_AUTOFLOWLABEL = 0x3b
				+
				+ sysIPV6_TCLASS = 0x3d
				+ sysIPV6_DONTFRAG = 0x3e
				+
				+ sysIPV6_PREFER_TEMPADDR = 0x3f
				+
				+ sysIPV6_BINDANY = 0x40
				+
				+ sysIPV6_MSFILTER = 0x4a
				+
				+ sysMCAST_JOIN_GROUP = 0x50
				+ sysMCAST_LEAVE_GROUP = 0x51
				+ sysMCAST_JOIN_SOURCE_GROUP = 0x52
				+ sysMCAST_LEAVE_SOURCE_GROUP = 0x53
				+ sysMCAST_BLOCK_SOURCE = 0x54
				+ sysMCAST_UNBLOCK_SOURCE = 0x55
				+
				+ sysIPV6_PORTRANGE_DEFAULT = 0x0
				+ sysIPV6_PORTRANGE_HIGH = 0x1
				+ sysIPV6_PORTRANGE_LOW = 0x2
				+
				+ sizeofSockaddrStorage = 0x80
				+ sizeofSockaddrInet6 = 0x1c
				+ sizeofInet6Pktinfo = 0x14
				+ sizeofIPv6Mtuinfo = 0x20
				+
				+ sizeofIPv6Mreq = 0x14
				+ sizeofGroupReq = 0x88
				+ sizeofGroupSourceReq = 0x108
				+
				+ sizeofICMPv6Filter = 0x20
				+)
				+
				+type sockaddrStorage struct {
				+ Len uint8
				+ Family uint8
				+ X__ss_pad1 [6]uint8
				+ X__ss_align int64
				+ X__ss_pad2 [112]uint8
				+}
				+
				+type sockaddrInet6 struct {
				+ Len uint8
				+ Family uint8
				+ Port uint16
				+ Flowinfo uint32
				+ Addr [16]byte /* in6_addr */
				+ Scope_id uint32
				+}
				+
				+type inet6Pktinfo struct {
				+ Addr [16]byte /* in6_addr */
				+ Ifindex uint32
				+}
				+
				+type ipv6Mtuinfo struct {
				+ Addr sockaddrInet6
				+ Mtu uint32
				+}
				+
				+type ipv6Mreq struct {
				+ Multiaddr [16]byte /* in6_addr */
				+ Interface uint32
				+}
				+
				+type groupReq struct {
				+ Interface uint32
				+ Group sockaddrStorage
				+}
				+
				+type groupSourceReq struct {
				+ Interface uint32
				+ Group sockaddrStorage
				+ Source sockaddrStorage
				+}
				+
				+type icmpv6Filter struct {
				+ Filt [8]uint32
				+}

linuxkpi: Define `pci_reset_function()` in <linux/pci.h>ClosedPublicActions