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
101 lines
3.1 KiB
C
101 lines
3.1 KiB
C
/*-
|
|
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
|
|
*
|
|
* Copyright (c) 2015-2016 Landon Fuller <landonf@FreeBSD.org>
|
|
* All rights reserved.
|
|
*
|
|
* 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_PCIVAR_H_
|
|
#define _IF_BWN_PCIVAR_H_
|
|
|
|
struct bwn_pci_devcfg;
|
|
|
|
/** bwn_pci per-instance state. */
|
|
struct bwn_pci_softc {
|
|
device_t dev; /**< device */
|
|
device_t bhndb_dev; /**< bhnd bridge device */
|
|
const struct bwn_pci_devcfg *devcfg; /**< bwn device config */
|
|
uint32_t quirks; /**< quirk flags */
|
|
};
|
|
|
|
/* bwn device quirks */
|
|
enum {
|
|
/** No quirks */
|
|
BWN_QUIRK_NONE = 0,
|
|
|
|
/**
|
|
* This model/revision has not been tested and may not work.
|
|
*/
|
|
BWN_QUIRK_UNTESTED = 1<<0,
|
|
|
|
/**
|
|
* Early dual-band devices did not support accessing multiple PHYs
|
|
* from a single WLAN core, and instead used separate 2GHz and 5GHz
|
|
* WLAN cores.
|
|
*
|
|
* However, not all cards with two WLAN cores are fully populated;
|
|
* we must whitelist the boards on which a second WLAN core is actually
|
|
* usable.
|
|
*/
|
|
BWN_QUIRK_WLAN_DUALCORE = 1<<1,
|
|
|
|
/**
|
|
* Some early devices shipped with unconnected ethernet cores; set
|
|
* this quirk to treat these cores as unpopulated.
|
|
*/
|
|
BWN_QUIRK_ENET_HW_UNPOPULATED = 1<<2,
|
|
|
|
/**
|
|
* Some PCI/PCIe "Intensi-fi" chipsets shipped with floating USB
|
|
* host controller cores; set this quirk to treat these cores as
|
|
* unpopulated.
|
|
*/
|
|
BWN_QUIRK_USBH_UNPOPULATED = 1<<3,
|
|
};
|
|
|
|
/* PCI device descriptor */
|
|
struct bwn_pci_device {
|
|
uint16_t vendor;
|
|
uint16_t device;
|
|
const char *desc;
|
|
uint32_t quirks;
|
|
};
|
|
|
|
|
|
#define BWN_BCM_DEV(_devid, _desc, _quirks) \
|
|
{ PCI_VENDOR_BROADCOM, PCI_DEVID_ ## _devid, \
|
|
"Broadcom " _desc " Wireless", _quirks }
|
|
|
|
/* Supported device table */
|
|
struct bwn_pci_devcfg {
|
|
const struct bhndb_hwcfg *bridge_hwcfg;
|
|
const struct bhndb_hw *bridge_hwtable;
|
|
const struct bhndb_hw_priority *bridge_hwprio;
|
|
const struct bwn_pci_device *devices;
|
|
};
|
|
|
|
#endif /* _IF_BWN_PCIVAR_H_ */
|