8d14ca9c99
Currently, bwn(4) relies on the siba_bwn(4) bus driver to provide support
for the on-chip SSB interconnect found in Broadcom's older PCI(e) Wi-Fi
adapters. Non-PCI Wi-Fi adapters, as well as the newer BCMA interconnect
found in post-2009 Broadcom Wi-Fi hardware, are not supported by
siba_bwn(4).
The bhnd(4) bus driver (also used by the FreeBSD/MIPS Broadcom port)
provides a unified kernel interface to a superset of the hardware supported
by siba_bwn; by attaching bwn(4) via bhnd(4), we can support both modern
PCI(e) Wi-Fi devices based on the BCMA backplane interconnect, as well as
Broadcom MIPS WiSoCs that include a D11 MAC core directly attached to their
SSB or BCMA backplane.
This diff introduces opt-in bwn(4) support for bhnd(4) by providing:
- A small bwn(4) driver subclass, if_bwn_bhnd, that attaches via
bhnd(4) instead of siba_bwn(4).
- A bhndb(4)-based PCI host bridge driver, if_bwn_pci, that optionally
probes at a higher priority than the siba_bwn(4) PCI driver.
- A set of compatibility shims that perform translation of bwn(4)'s
siba_bwn function calls into their bhnd(9) API equivalents when bwn(4)
is attached via a bhnd(4) bus parent. When bwn(4) is attached via
siba_bwn(4), all siba_bwn function calls are simply passed through to
their original implementations.
To test bwn(4) with bhnd(4), place the following lines in loader.conf(5):
hw.bwn_pci.preferred="1"
if_bwn_pci_load="YES
bwn_v4_ucode_load="YES"
bwn_v4_lp_ucode_load="YES"
To verify that bwn(4) is using bhnd(4), you can check dmesg:
bwn0: <Broadcom 802.11 MAC/PHY/Radio, rev 15> ... on bhnd0
... or devinfo(8):
pcib2
pci2
bwn_pci0
bhndb0
bhnd0
bwn0
...
bwn(4)/bhnd(4) has been tested for regressions with most chipsets currently
supported by bwn(4), including:
- BCM4312
- BCM4318
- BCM4321
With minimal changes to the DMA code (not included in this commit), I was
also able to test support for newer BCMA devices by bringing up basic
working Wi-Fi on two previously unsupported, BCMA-based N-PHY chipsets:
- BCM43224
- BCM43225
Approved by: adrian (mentor, implicit)
Sponsored by: The FreeBSD Foundation & Plausible Labs
Differential Revision: https://reviews.freebsd.org/D13041
103 lines
3.3 KiB
C
103 lines
3.3 KiB
C
/*-
|
|
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
|
|
*
|
|
* Copyright (c) 2016 Landon J. Fuller <landonf@FreeBSD.org>.
|
|
* Copyright (c) 2017 The FreeBSD Foundation
|
|
* All rights reserved.
|
|
*
|
|
* Portions of this software were developed by Landon Fuller
|
|
* under sponsorship from the FreeBSD Foundation.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _IF_BWN_SIBA_COMPAT_H_
|
|
#define _IF_BWN_SIBA_COMPAT_H_
|
|
|
|
#define BWN_USE_SIBA 0
|
|
#include "if_bwn_siba.h"
|
|
|
|
#include "if_bwnvar.h"
|
|
|
|
#define BWN_BHND_NUM_CORE_PWR 4
|
|
|
|
/**
|
|
* Compatiblity shim state.
|
|
*/
|
|
struct bwn_bhnd_ctx {
|
|
device_t chipc_dev; /**< ChipCommon device */
|
|
device_t gpio_dev; /**< GPIO device */
|
|
|
|
device_t pmu_dev; /**< PMU device, or NULL if no PMU */
|
|
uint32_t pmu_cctl_addr; /**< chipctrl_addr target of
|
|
reads/writes to/from the
|
|
chipctrl_data register */
|
|
|
|
uint8_t sromrev; /**< SROM format revision */
|
|
|
|
/* NVRAM variables for which bwn(4) expects the bus to manage storage
|
|
* for (and in some cases, allow writes). */
|
|
uint8_t mac_80211bg[6]; /**< D11 unit 0 */
|
|
uint8_t mac_80211a[6]; /**< D11 unit 1 */
|
|
|
|
uint32_t boardflags; /**< boardflags (bwn-writable) */
|
|
uint8_t pa0maxpwr; /**< 2GHz max power (bwn-writable) */
|
|
};
|
|
|
|
/**
|
|
* Return the bwn(4) device's bhnd compatiblity context.
|
|
*/
|
|
static inline struct bwn_bhnd_ctx *
|
|
bwn_bhnd_get_ctx(device_t dev)
|
|
{
|
|
struct bwn_softc *sc = device_get_softc(dev);
|
|
return (sc->sc_bus_ctx);
|
|
}
|
|
|
|
/**
|
|
* Fetch an NVRAM variable via bhnd_nvram_getvar_*().
|
|
*/
|
|
#define BWN_BHND_NVRAM_FETCH_VAR(_dev, _type, _name, _result) \
|
|
do { \
|
|
int error; \
|
|
\
|
|
error = bhnd_nvram_getvar_ ## _type(_dev, _name, _result); \
|
|
if (error) { \
|
|
panic("NVRAM variable %s unreadable: %d", _name, \
|
|
error); \
|
|
} \
|
|
} while(0)
|
|
|
|
/**
|
|
* Fetch and return an NVRAM variable via bhnd_nvram_getvar_*().
|
|
*/
|
|
#define BWN_BHND_NVRAM_RETURN_VAR(_dev, _type, _name) \
|
|
do { \
|
|
_type ## _t value; \
|
|
BWN_BHND_NVRAM_FETCH_VAR(_dev, _type, _name, &value); \
|
|
return (value); \
|
|
} while(0)
|
|
|
|
#endif /* _IF_BWN_SIBA_COMPAT_H_ */
|