Page MenuHomeFreeBSD
Differential D21075

sfxge(4): fix align to power of 2 when align has smaller type
ClosedPublic
Actions

Authored by arybchik on Jul 26 2019, 3:02 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 21, 7:53 AM
Unknown Object (File)
Sat, Apr 19, 8:30 PM
Unknown Object (File)
Tue, Apr 15, 4:22 PM
Unknown Object (File)
Tue, Apr 15, 12:16 PM
Unknown Object (File)
Tue, Apr 15, 7:30 AM
Unknown Object (File)
Tue, Apr 15, 3:36 AM
Unknown Object (File)
Sat, Apr 12, 7:49 AM
Unknown Object (File)
Mar 9 2025, 2:26 PM
View All 67 Files
Subscribers
imp

Details

Reviewers
gnn
philip
Commits
rS350370: sfxge(4): fix align to power of 2 when align has smaller type
Summary

Substitute driver-defined P2ALIGN() with EFX_P2ALIGN() defined in
libefx.

Cast value and alignment to one specified type to guarantee result
correctness.

Sponsored by: Solarflare Communications, Inc.
MFC after: 2 days

Test Plan

amd64 tinderbox build tested

Diff Detail

Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 25516
Build 24134: arc lint + arc unit

Revision Contents
Changeset List

PathSize
sys/
dev/
sfxge/
common/
2 lines
4 lines
4 lines

Diff 60165

View Options

sys/dev/sfxge/common/ef10_rx.c

Show First 20 Lines • Show All 863 Lines • ▼ Show 20 Linesef10_rx_qpush(
__inout unsigned int *pushedp) __inout unsigned int *pushedp)
{ {
efx_nic_t *enp = erp->er_enp; efx_nic_t *enp = erp->er_enp;
unsigned int pushed = *pushedp; unsigned int pushed = *pushedp;
uint32_t wptr; uint32_t wptr;
efx_dword_t dword; efx_dword_t dword;
/* Hardware has alignment restriction for WPTR */ /* Hardware has alignment restriction for WPTR */
wptr = P2ALIGN(added, EF10_RX_WPTR_ALIGN); wptr = EFX_P2ALIGN(unsigned int, added, EF10_RX_WPTR_ALIGN);
if (pushed == wptr) if (pushed == wptr)
return; return;
*pushedp = wptr; *pushedp = wptr;
/* Push the populated descriptors out */ /* Push the populated descriptors out */
wptr &= erp->er_mask; wptr &= erp->er_mask;
▲ Show 20 Lines • Show All 361 Lines • Show Last 20 Lines
View Options

sys/dev/sfxge/common/efsys.h

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
#ifndef B_TRUE #ifndef B_TRUE
#define B_TRUE TRUE #define B_TRUE TRUE
#endif #endif
#ifndef IS_P2ALIGNED #ifndef IS_P2ALIGNED
#define IS_P2ALIGNED(v, a) ((((uintptr_t)(v)) & ((uintptr_t)(a) - 1)) == 0) #define IS_P2ALIGNED(v, a) ((((uintptr_t)(v)) & ((uintptr_t)(a) - 1)) == 0)
#endif #endif
#ifndef P2ALIGN
#define P2ALIGN(_x, _a) ((_x) & -(_a))
#endif
#ifndef IS2P #ifndef IS2P
#define ISP2(x) (((x) & ((x) - 1)) == 0) #define ISP2(x) (((x) & ((x) - 1)) == 0)
#endif #endif
#if defined(__x86_64__) && __FreeBSD_version >= 1000000 #if defined(__x86_64__) && __FreeBSD_version >= 1000000
#define SFXGE_USE_BUS_SPACE_8 1 #define SFXGE_USE_BUS_SPACE_8 1
▲ Show 20 Lines • Show All 1,072 Lines • Show Last 20 Lines
View Options

sys/dev/sfxge/common/efx.h

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines
/* The macro expands divider twice */ /* The macro expands divider twice */
#define EFX_DIV_ROUND_UP(_n, _d) (((_n) + (_d) - 1) / (_d)) #define EFX_DIV_ROUND_UP(_n, _d) (((_n) + (_d) - 1) / (_d))
/* Round value up to the nearest power of two. */ /* Round value up to the nearest power of two. */
#define EFX_P2ROUNDUP(_type, _value, _align) \ #define EFX_P2ROUNDUP(_type, _value, _align) \
(-(-(_type)(_value) & -(_type)(_align))) (-(-(_type)(_value) & -(_type)(_align)))
/* Align value down to the nearest power of two. */
#define EFX_P2ALIGN(_type, _value, _align) \
((_type)(_value) & -(_type)(_align))
/* Return codes */ /* Return codes */
typedef __success(return == 0) int efx_rc_t; typedef __success(return == 0) int efx_rc_t;
/* Chip families */ /* Chip families */
typedef enum efx_family_e { typedef enum efx_family_e {
▲ Show 20 Lines • Show All 3,244 Lines • Show Last 20 Lines