Page MenuHomeFreeBSD
Differential D32748

bus: Add ACPI locator support
ClosedPublic
Actions

Authored by imp on Oct 30 2021, 12:53 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 14, 5:05 PM
Unknown Object (File)
Sun, Apr 6, 2:15 AM
Unknown Object (File)
Mon, Mar 31, 5:41 PM
Unknown Object (File)
Mar 17 2025, 8:57 AM
Unknown Object (File)
Mar 17 2025, 8:51 AM
Unknown Object (File)
Mar 11 2025, 7:10 AM
Unknown Object (File)
Mar 6 2025, 11:10 PM
Unknown Object (File)
Mar 4 2025, 10:06 PM
View All Files
Subscribers
dab

Details

Reviewers
jhb
Commits
rGcae7d9ec8328: bus: Add ACPI locator support
Summary

Add support for printing ACPI paths. This is a bit of a degenerate case
for this interface since it's always just the device handle if the
device has one. But it is illustrtive of how to do this for a few nodes
in the tree.

Sponsored by: Netflix

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

imp created this revision.Oct 30 2021, 12:53 AM
Herald added a subscriber: dab. · View Herald TranscriptOct 30 2021, 12:53 AM
imp requested review of this revision.Oct 30 2021, 12:53 AM
Harbormaster completed remote builds in B42449: Diff 97726.Oct 30 2021, 12:53 AM
imp added a parent revision: D32747: devctl: add getpath command.Oct 30 2021, 12:53 AM
imp added a child revision: D32749: Add UEFI locator for bus_get_device_path, pci acpi.
imp added a reviewer: jhb.Oct 30 2021, 12:54 AM
imp updated this revision to Diff 97935.Nov 3 2021, 1:56 PM

rebase + ping

Harbormaster completed remote builds in B42548: Diff 97935.Nov 3 2021, 1:56 PM
jhb added inline comments.Nov 4 2021, 9:29 PM
sys/dev/acpica/acpi.c
935

You could take advantage of all of the ACPI-aware buses supporting the ACPI handle ivar to make this a shared function across the various ACPI-aware buses. Something like:

int
acpi_get_device_path(device_t bus, device_t child, const char *locator, struct sbuf *sb)
{
     if (strcmp(locator, BUS_LOCATOR_ACPI) == 0) {
         ACPI_HANDLE *handle = acpi_get_handle(child);

         if (handle != NULL)
              sbuf_printf(sb, "%s", acpi_name(handle);
         return (0);
    }

    return (bus_generic_get_device_path(bus, child, locator, sb));
}

I think all of the buses you patch here could then just reuse that directly (some of them might later have to still grow a driver-specific method for UEFI, but that could at least call this shared routine after handling UEFI).

sys/sys/bus.h
742

Maybe sort these somehow, e.g. alphabetically? Probably make the first commit that adds UEFI follow whatever convention you decide to follow?

jhb added a comment.Nov 4 2021, 9:29 PM

Should this review also update the devctl manpage?

imp marked an inline comment as done.Nov 5 2021, 11:29 PM
imp added inline comments.
sys/sys/bus.h
742

sure.

imp marked an inline comment as done.EditedNov 5 2021, 11:30 PM
In D32748#741302, @jhb wrote:

Should this review also update the devctl manpage?

I thought I'd already updated it elsewhere. Or maybe I should ask 'which devctl man page?'

imp marked an inline comment as done.Nov 15 2021, 4:07 PM
imp updated this revision to Diff 98516.Nov 15 2021, 4:10 PM

update, per review comments, rebase, likely randomly break something subtle

Harbormaster completed remote builds in B42784: Diff 98516.Nov 15 2021, 4:10 PM
jhb accepted this revision.Nov 29 2021, 5:35 PM
This revision is now accepted and ready to land.Nov 29 2021, 5:35 PM
Closed by commit rGcae7d9ec8328: bus: Add ACPI locator support (authored by imp). · Explain WhyMar 1 2022, 3:43 PM
This revision was automatically updated to reflect the committed changes.
imp added a commit: rGcae7d9ec8328: bus: Add ACPI locator support.

Revision Contents
Changeset List

PathSize
sys/
dev/
acpica/
34 lines
14 lines
2 lines
iicbus/
1 line
nvdimm/
1 line
usb/
12 lines
kern/
12 lines
sys/
1 line

Diff 103343

View Options

sys/dev/acpica/acpi.c

Show First 20 Lines • Show All 139 Lines • ▼ Show 20 Lines#define TCPT_RANGESET(tv, value, tvmin, tvmax) do { \
if ((u_long)(tv) < (u_long)(tvmin)) \ if ((u_long)(tv) < (u_long)(tvmin)) \
(tv) = (tvmin); \ (tv) = (tvmin); \
if ((u_long)(tv) > (u_long)(tvmax)) \ if ((u_long)(tv) > (u_long)(tvmax)) \
(tv) = (tvmax); \ (tv) = (tvmax); \
} while(0) } while(0)
#ifdef _KERNEL #ifdef _KERNEL
/*
* Flags for the tcpcb's tt_flags field.
*/
#define TT_DELACK 0x0001
#define TT_REXMT 0x0002
#define TT_PERSIST 0x0004
#define TT_KEEP 0x0008
#define TT_2MSL 0x0010
#define TT_MASK (TT_DELACK|TT_REXMT|TT_PERSIST|TT_KEEP|TT_2MSL)
#define TT_STOPPED 0x00010000
#define TP_KEEPINIT(tp) ((tp)->t_keepinit ? (tp)->t_keepinit : tcp_keepinit) #define TP_KEEPINIT(tp) ((tp)->t_keepinit ? (tp)->t_keepinit : tcp_keepinit)
#define TP_KEEPIDLE(tp) ((tp)->t_keepidle ? (tp)->t_keepidle : tcp_keepidle) #define TP_KEEPIDLE(tp) ((tp)->t_keepidle ? (tp)->t_keepidle : tcp_keepidle)
#define TP_KEEPINTVL(tp) ((tp)->t_keepintvl ? (tp)->t_keepintvl : tcp_keepintvl) #define TP_KEEPINTVL(tp) ((tp)->t_keepintvl ? (tp)->t_keepintvl : tcp_keepintvl)
#define TP_KEEPCNT(tp) ((tp)->t_keepcnt ? (tp)->t_keepcnt : tcp_keepcnt) #define TP_KEEPCNT(tp) ((tp)->t_keepcnt ? (tp)->t_keepcnt : tcp_keepcnt)
#define TP_MAXIDLE(tp) (TP_KEEPCNT(tp) * TP_KEEPINTVL(tp)) #define TP_MAXIDLE(tp) (TP_KEEPCNT(tp) * TP_KEEPINTVL(tp))
#define TP_MAXUNACKTIME(tp) \ #define TP_MAXUNACKTIME(tp) \
((tp)->t_maxunacktime ? (tp)->t_maxunacktime : tcp_maxunacktime) ((tp)->t_maxunacktime ? (tp)->t_maxunacktime : tcp_maxunacktime)
Show All 31 Lines
VNET_DECLARE(int, tcp_pmtud_blackhole_detect); VNET_DECLARE(int, tcp_pmtud_blackhole_detect);
#define V_tcp_pmtud_blackhole_detect VNET(tcp_pmtud_blackhole_detect) #define V_tcp_pmtud_blackhole_detect VNET(tcp_pmtud_blackhole_detect)
VNET_DECLARE(int, tcp_pmtud_blackhole_mss); VNET_DECLARE(int, tcp_pmtud_blackhole_mss);
#define V_tcp_pmtud_blackhole_mss VNET(tcp_pmtud_blackhole_mss) #define V_tcp_pmtud_blackhole_mss VNET(tcp_pmtud_blackhole_mss)
VNET_DECLARE(int, tcp_v6pmtud_blackhole_mss); VNET_DECLARE(int, tcp_v6pmtud_blackhole_mss);
#define V_tcp_v6pmtud_blackhole_mss VNET(tcp_v6pmtud_blackhole_mss) #define V_tcp_v6pmtud_blackhole_mss VNET(tcp_v6pmtud_blackhole_mss)
VNET_DECLARE(int, tcp_msl); VNET_DECLARE(int, tcp_msl);
#define V_tcp_msl VNET(tcp_msl) #define V_tcp_msl VNET(tcp_msl)
void tcp_timer_init(void);
void tcp_timer_2msl(void *xtp);
void tcp_timer_keep(void *xtp);
void tcp_timer_persist(void *xtp);
void tcp_timer_rexmt(void *xtp);
void tcp_timer_delack(void *xtp);
#endif /* _KERNEL */ #endif /* _KERNEL */
#endif /* !_NETINET_TCP_TIMER_H_ */ #endif /* !_NETINET_TCP_TIMER_H_ */
View Options

sys/dev/acpica/acpi_pci.c

Show First 20 Lines • Show All 139 Lines • ▼ Show 20 Lines#define TCPT_RANGESET(tv, value, tvmin, tvmax) do { \
if ((u_long)(tv) < (u_long)(tvmin)) \ if ((u_long)(tv) < (u_long)(tvmin)) \
(tv) = (tvmin); \ (tv) = (tvmin); \
if ((u_long)(tv) > (u_long)(tvmax)) \ if ((u_long)(tv) > (u_long)(tvmax)) \
(tv) = (tvmax); \ (tv) = (tvmax); \
} while(0) } while(0)
#ifdef _KERNEL #ifdef _KERNEL
/*
* Flags for the tcpcb's tt_flags field.
*/
#define TT_DELACK 0x0001
#define TT_REXMT 0x0002
#define TT_PERSIST 0x0004
#define TT_KEEP 0x0008
#define TT_2MSL 0x0010
#define TT_MASK (TT_DELACK|TT_REXMT|TT_PERSIST|TT_KEEP|TT_2MSL)
#define TT_STOPPED 0x00010000
#define TP_KEEPINIT(tp) ((tp)->t_keepinit ? (tp)->t_keepinit : tcp_keepinit) #define TP_KEEPINIT(tp) ((tp)->t_keepinit ? (tp)->t_keepinit : tcp_keepinit)
#define TP_KEEPIDLE(tp) ((tp)->t_keepidle ? (tp)->t_keepidle : tcp_keepidle) #define TP_KEEPIDLE(tp) ((tp)->t_keepidle ? (tp)->t_keepidle : tcp_keepidle)
#define TP_KEEPINTVL(tp) ((tp)->t_keepintvl ? (tp)->t_keepintvl : tcp_keepintvl) #define TP_KEEPINTVL(tp) ((tp)->t_keepintvl ? (tp)->t_keepintvl : tcp_keepintvl)
#define TP_KEEPCNT(tp) ((tp)->t_keepcnt ? (tp)->t_keepcnt : tcp_keepcnt) #define TP_KEEPCNT(tp) ((tp)->t_keepcnt ? (tp)->t_keepcnt : tcp_keepcnt)
#define TP_MAXIDLE(tp) (TP_KEEPCNT(tp) * TP_KEEPINTVL(tp)) #define TP_MAXIDLE(tp) (TP_KEEPCNT(tp) * TP_KEEPINTVL(tp))
#define TP_MAXUNACKTIME(tp) \ #define TP_MAXUNACKTIME(tp) \
((tp)->t_maxunacktime ? (tp)->t_maxunacktime : tcp_maxunacktime) ((tp)->t_maxunacktime ? (tp)->t_maxunacktime : tcp_maxunacktime)
Show All 31 Lines
VNET_DECLARE(int, tcp_pmtud_blackhole_detect); VNET_DECLARE(int, tcp_pmtud_blackhole_detect);
#define V_tcp_pmtud_blackhole_detect VNET(tcp_pmtud_blackhole_detect) #define V_tcp_pmtud_blackhole_detect VNET(tcp_pmtud_blackhole_detect)
VNET_DECLARE(int, tcp_pmtud_blackhole_mss); VNET_DECLARE(int, tcp_pmtud_blackhole_mss);
#define V_tcp_pmtud_blackhole_mss VNET(tcp_pmtud_blackhole_mss) #define V_tcp_pmtud_blackhole_mss VNET(tcp_pmtud_blackhole_mss)
VNET_DECLARE(int, tcp_v6pmtud_blackhole_mss); VNET_DECLARE(int, tcp_v6pmtud_blackhole_mss);
#define V_tcp_v6pmtud_blackhole_mss VNET(tcp_v6pmtud_blackhole_mss) #define V_tcp_v6pmtud_blackhole_mss VNET(tcp_v6pmtud_blackhole_mss)
VNET_DECLARE(int, tcp_msl); VNET_DECLARE(int, tcp_msl);
#define V_tcp_msl VNET(tcp_msl) #define V_tcp_msl VNET(tcp_msl)
void tcp_timer_init(void);
void tcp_timer_2msl(void *xtp);
void tcp_timer_keep(void *xtp);
void tcp_timer_persist(void *xtp);
void tcp_timer_rexmt(void *xtp);
void tcp_timer_delack(void *xtp);
#endif /* _KERNEL */ #endif /* _KERNEL */
#endif /* !_NETINET_TCP_TIMER_H_ */ #endif /* !_NETINET_TCP_TIMER_H_ */
View Options

sys/dev/acpica/acpivar.h

Show First 20 Lines • Show All 139 Lines • ▼ Show 20 Lines#define TCPT_RANGESET(tv, value, tvmin, tvmax) do { \
if ((u_long)(tv) < (u_long)(tvmin)) \ if ((u_long)(tv) < (u_long)(tvmin)) \
(tv) = (tvmin); \ (tv) = (tvmin); \
if ((u_long)(tv) > (u_long)(tvmax)) \ if ((u_long)(tv) > (u_long)(tvmax)) \
(tv) = (tvmax); \ (tv) = (tvmax); \
} while(0) } while(0)
#ifdef _KERNEL #ifdef _KERNEL
/*
* Flags for the tcpcb's tt_flags field.
*/
#define TT_DELACK 0x0001
#define TT_REXMT 0x0002
#define TT_PERSIST 0x0004
#define TT_KEEP 0x0008
#define TT_2MSL 0x0010
#define TT_MASK (TT_DELACK|TT_REXMT|TT_PERSIST|TT_KEEP|TT_2MSL)
#define TT_STOPPED 0x00010000
#define TP_KEEPINIT(tp) ((tp)->t_keepinit ? (tp)->t_keepinit : tcp_keepinit) #define TP_KEEPINIT(tp) ((tp)->t_keepinit ? (tp)->t_keepinit : tcp_keepinit)
#define TP_KEEPIDLE(tp) ((tp)->t_keepidle ? (tp)->t_keepidle : tcp_keepidle) #define TP_KEEPIDLE(tp) ((tp)->t_keepidle ? (tp)->t_keepidle : tcp_keepidle)
#define TP_KEEPINTVL(tp) ((tp)->t_keepintvl ? (tp)->t_keepintvl : tcp_keepintvl) #define TP_KEEPINTVL(tp) ((tp)->t_keepintvl ? (tp)->t_keepintvl : tcp_keepintvl)
#define TP_KEEPCNT(tp) ((tp)->t_keepcnt ? (tp)->t_keepcnt : tcp_keepcnt) #define TP_KEEPCNT(tp) ((tp)->t_keepcnt ? (tp)->t_keepcnt : tcp_keepcnt)
#define TP_MAXIDLE(tp) (TP_KEEPCNT(tp) * TP_KEEPINTVL(tp)) #define TP_MAXIDLE(tp) (TP_KEEPCNT(tp) * TP_KEEPINTVL(tp))
#define TP_MAXUNACKTIME(tp) \ #define TP_MAXUNACKTIME(tp) \
((tp)->t_maxunacktime ? (tp)->t_maxunacktime : tcp_maxunacktime) ((tp)->t_maxunacktime ? (tp)->t_maxunacktime : tcp_maxunacktime)
Show All 31 Lines
VNET_DECLARE(int, tcp_pmtud_blackhole_detect); VNET_DECLARE(int, tcp_pmtud_blackhole_detect);
#define V_tcp_pmtud_blackhole_detect VNET(tcp_pmtud_blackhole_detect) #define V_tcp_pmtud_blackhole_detect VNET(tcp_pmtud_blackhole_detect)
VNET_DECLARE(int, tcp_pmtud_blackhole_mss); VNET_DECLARE(int, tcp_pmtud_blackhole_mss);
#define V_tcp_pmtud_blackhole_mss VNET(tcp_pmtud_blackhole_mss) #define V_tcp_pmtud_blackhole_mss VNET(tcp_pmtud_blackhole_mss)
VNET_DECLARE(int, tcp_v6pmtud_blackhole_mss); VNET_DECLARE(int, tcp_v6pmtud_blackhole_mss);
#define V_tcp_v6pmtud_blackhole_mss VNET(tcp_v6pmtud_blackhole_mss) #define V_tcp_v6pmtud_blackhole_mss VNET(tcp_v6pmtud_blackhole_mss)
VNET_DECLARE(int, tcp_msl); VNET_DECLARE(int, tcp_msl);
#define V_tcp_msl VNET(tcp_msl) #define V_tcp_msl VNET(tcp_msl)
void tcp_timer_init(void);
void tcp_timer_2msl(void *xtp);
void tcp_timer_keep(void *xtp);
void tcp_timer_persist(void *xtp);
void tcp_timer_rexmt(void *xtp);
void tcp_timer_delack(void *xtp);
#endif /* _KERNEL */ #endif /* _KERNEL */
#endif /* !_NETINET_TCP_TIMER_H_ */ #endif /* !_NETINET_TCP_TIMER_H_ */
View Options

sys/dev/iicbus/acpi_iicbus.c

Show First 20 Lines • Show All 139 Lines • ▼ Show 20 Lines#define TCPT_RANGESET(tv, value, tvmin, tvmax) do { \
if ((u_long)(tv) < (u_long)(tvmin)) \ if ((u_long)(tv) < (u_long)(tvmin)) \
(tv) = (tvmin); \ (tv) = (tvmin); \
if ((u_long)(tv) > (u_long)(tvmax)) \ if ((u_long)(tv) > (u_long)(tvmax)) \
(tv) = (tvmax); \ (tv) = (tvmax); \
} while(0) } while(0)
#ifdef _KERNEL #ifdef _KERNEL
/*
* Flags for the tcpcb's tt_flags field.
*/
#define TT_DELACK 0x0001
#define TT_REXMT 0x0002
#define TT_PERSIST 0x0004
#define TT_KEEP 0x0008
#define TT_2MSL 0x0010
#define TT_MASK (TT_DELACK|TT_REXMT|TT_PERSIST|TT_KEEP|TT_2MSL)
#define TT_STOPPED 0x00010000
#define TP_KEEPINIT(tp) ((tp)->t_keepinit ? (tp)->t_keepinit : tcp_keepinit) #define TP_KEEPINIT(tp) ((tp)->t_keepinit ? (tp)->t_keepinit : tcp_keepinit)
#define TP_KEEPIDLE(tp) ((tp)->t_keepidle ? (tp)->t_keepidle : tcp_keepidle) #define TP_KEEPIDLE(tp) ((tp)->t_keepidle ? (tp)->t_keepidle : tcp_keepidle)
#define TP_KEEPINTVL(tp) ((tp)->t_keepintvl ? (tp)->t_keepintvl : tcp_keepintvl) #define TP_KEEPINTVL(tp) ((tp)->t_keepintvl ? (tp)->t_keepintvl : tcp_keepintvl)
#define TP_KEEPCNT(tp) ((tp)->t_keepcnt ? (tp)->t_keepcnt : tcp_keepcnt) #define TP_KEEPCNT(tp) ((tp)->t_keepcnt ? (tp)->t_keepcnt : tcp_keepcnt)
#define TP_MAXIDLE(tp) (TP_KEEPCNT(tp) * TP_KEEPINTVL(tp)) #define TP_MAXIDLE(tp) (TP_KEEPCNT(tp) * TP_KEEPINTVL(tp))
#define TP_MAXUNACKTIME(tp) \ #define TP_MAXUNACKTIME(tp) \
((tp)->t_maxunacktime ? (tp)->t_maxunacktime : tcp_maxunacktime) ((tp)->t_maxunacktime ? (tp)->t_maxunacktime : tcp_maxunacktime)
Show All 31 Lines
VNET_DECLARE(int, tcp_pmtud_blackhole_detect); VNET_DECLARE(int, tcp_pmtud_blackhole_detect);
#define V_tcp_pmtud_blackhole_detect VNET(tcp_pmtud_blackhole_detect) #define V_tcp_pmtud_blackhole_detect VNET(tcp_pmtud_blackhole_detect)
VNET_DECLARE(int, tcp_pmtud_blackhole_mss); VNET_DECLARE(int, tcp_pmtud_blackhole_mss);
#define V_tcp_pmtud_blackhole_mss VNET(tcp_pmtud_blackhole_mss) #define V_tcp_pmtud_blackhole_mss VNET(tcp_pmtud_blackhole_mss)
VNET_DECLARE(int, tcp_v6pmtud_blackhole_mss); VNET_DECLARE(int, tcp_v6pmtud_blackhole_mss);
#define V_tcp_v6pmtud_blackhole_mss VNET(tcp_v6pmtud_blackhole_mss) #define V_tcp_v6pmtud_blackhole_mss VNET(tcp_v6pmtud_blackhole_mss)
VNET_DECLARE(int, tcp_msl); VNET_DECLARE(int, tcp_msl);
#define V_tcp_msl VNET(tcp_msl) #define V_tcp_msl VNET(tcp_msl)
void tcp_timer_init(void);
void tcp_timer_2msl(void *xtp);
void tcp_timer_keep(void *xtp);
void tcp_timer_persist(void *xtp);
void tcp_timer_rexmt(void *xtp);
void tcp_timer_delack(void *xtp);
#endif /* _KERNEL */ #endif /* _KERNEL */
#endif /* !_NETINET_TCP_TIMER_H_ */ #endif /* !_NETINET_TCP_TIMER_H_ */
View Options

sys/dev/nvdimm/nvdimm_acpi.c

Loading...
View Options

sys/dev/usb/usb_hub_acpi.c

Loading...
View Options

sys/kern/subr_bus.c

Loading...
View Options

sys/sys/bus.h

Loading...