svn commit: r301697 - in head/sys: dev/bhnd dev/bhnd/cores/chipc dev/bhnd/cores/pci dev/bhnd/cores/pcie2 dev/bhnd/siba mips/broadcom
Landon J. Fuller
landonf at FreeBSD.org
Wed Jun 8 21:31:35 UTC 2016
Author: landonf
Date: Wed Jun 8 21:31:33 2016
New Revision: 301697
URL: https://svnweb.freebsd.org/changeset/base/301697
Log:
bhnd(4): Add a vendor parameter to BHND_DEVICE(), replacing vendor-specific
BHND_*_DEVICE macros.
Approved by: adrian (mentor)
Differential Revision: https://reviews.freebsd.org/D6736
Modified:
head/sys/dev/bhnd/bhnd.h
head/sys/dev/bhnd/cores/chipc/chipc.c
head/sys/dev/bhnd/cores/pci/bhnd_pci.c
head/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c
head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2.c
head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c
head/sys/dev/bhnd/siba/siba_bhndb.c
head/sys/mips/broadcom/bcm_mipscore.c
Modified: head/sys/dev/bhnd/bhnd.h
==============================================================================
--- head/sys/dev/bhnd/bhnd.h Wed Jun 8 20:54:56 2016 (r301696)
+++ head/sys/dev/bhnd/bhnd.h Wed Jun 8 21:31:33 2016 (r301697)
@@ -232,16 +232,8 @@ struct bhnd_device {
BHND_COREID_ ## _device) }, _desc, _quirks, \
_flags }
-#define BHND_MIPS_DEVICE(_device, _desc, _quirks, ...) \
- _BHND_DEVICE(MIPS, _device, _desc, _quirks, \
- ## __VA_ARGS__, 0)
-
-#define BHND_ARM_DEVICE(_device, _desc, _quirks, ...) \
- _BHND_DEVICE(ARM, _device, _desc, _quirks, \
- ## __VA_ARGS__, 0)
-
-#define BHND_DEVICE(_device, _desc, _quirks, ...) \
- _BHND_DEVICE(BCM, _device, _desc, _quirks, \
+#define BHND_DEVICE(_vendor, _device, _desc, _quirks, ...) \
+ _BHND_DEVICE(_vendor, _device, _desc, _quirks, \
## __VA_ARGS__, 0)
#define BHND_DEVICE_END { { BHND_MATCH_ANY }, NULL, NULL, 0 }
Modified: head/sys/dev/bhnd/cores/chipc/chipc.c
==============================================================================
--- head/sys/dev/bhnd/cores/chipc/chipc.c Wed Jun 8 20:54:56 2016 (r301696)
+++ head/sys/dev/bhnd/cores/chipc/chipc.c Wed Jun 8 21:31:33 2016 (r301697)
@@ -84,7 +84,7 @@ static struct bhnd_device_quirk chipc_qu
/* Supported device identifiers */
static const struct bhnd_device chipc_devices[] = {
- BHND_DEVICE(CC, NULL, chipc_quirks),
+ BHND_DEVICE(BCM, CC, NULL, chipc_quirks),
BHND_DEVICE_END
};
Modified: head/sys/dev/bhnd/cores/pci/bhnd_pci.c
==============================================================================
--- head/sys/dev/bhnd/cores/pci/bhnd_pci.c Wed Jun 8 20:54:56 2016 (r301696)
+++ head/sys/dev/bhnd/cores/pci/bhnd_pci.c Wed Jun 8 21:31:33 2016 (r301697)
@@ -68,8 +68,8 @@ static struct bhnd_device_quirk bhnd_pci
#define BHND_PCI_QUIRKS bhnd_pci_quirks
#define BHND_PCIE_QUIRKS bhnd_pcie_quirks
-#define BHND_PCI_DEV(_core, _desc, ...) \
- { BHND_DEVICE(_core, _desc, BHND_ ## _core ## _QUIRKS, \
+#define BHND_PCI_DEV(_core, _desc, ...) \
+ { BHND_DEVICE(BCM, _core, _desc, BHND_ ## _core ## _QUIRKS, \
## __VA_ARGS__), BHND_PCI_REGFMT_ ## _core }
static const struct bhnd_pci_device {
Modified: head/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c
==============================================================================
--- head/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c Wed Jun 8 20:54:56 2016 (r301696)
+++ head/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c Wed Jun 8 21:31:33 2016 (r301697)
@@ -87,7 +87,7 @@ static int bhnd_pci_wars_hwdown(struct b
*/
#define BHND_PCI_DEV(_core, _quirks) \
- BHND_DEVICE(_core, NULL, _quirks, BHND_DF_HOSTB)
+ BHND_DEVICE(BCM, _core, NULL, _quirks, BHND_DF_HOSTB)
static const struct bhnd_device bhnd_pci_devs[] = {
BHND_PCI_DEV(PCI, bhnd_pci_quirks),
Modified: head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2.c
==============================================================================
--- head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2.c Wed Jun 8 20:54:56 2016 (r301696)
+++ head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2.c Wed Jun 8 21:31:33 2016 (r301697)
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
static struct bhnd_device_quirk bhnd_pcie2_quirks[];
#define BHND_PCIE_DEV(_core, _desc, ...) \
- BHND_DEVICE(_core, _desc, bhnd_pcie2_quirks, ## __VA_ARGS__)
+ BHND_DEVICE(BCM, _core, _desc, bhnd_pcie2_quirks, ## __VA_ARGS__)
static const struct bhnd_device bhnd_pcie2_devs[] = {
BHND_PCIE_DEV(PCIE2, "PCIe-G2 Host-PCI bridge", BHND_DF_HOSTB),
Modified: head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c
==============================================================================
--- head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c Wed Jun 8 20:54:56 2016 (r301696)
+++ head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c Wed Jun 8 21:31:33 2016 (r301697)
@@ -83,7 +83,7 @@ static int bhnd_pcie2_wars_hwdown(struct
*/
#define BHND_PCI_DEV(_core, _quirks) \
- BHND_DEVICE(_core, NULL, _quirks, BHND_DF_HOSTB)
+ BHND_DEVICE(BCM, _core, NULL, _quirks, BHND_DF_HOSTB)
static const struct bhnd_device bhnd_pcie2_devs[] = {
BHND_PCI_DEV(PCIE2, bhnd_pcie2_quirks),
Modified: head/sys/dev/bhnd/siba/siba_bhndb.c
==============================================================================
--- head/sys/dev/bhnd/siba/siba_bhndb.c Wed Jun 8 20:54:56 2016 (r301696)
+++ head/sys/dev/bhnd/siba/siba_bhndb.c Wed Jun 8 21:31:33 2016 (r301697)
@@ -74,7 +74,7 @@ static struct bhnd_device_quirk bridge_q
};
static struct bhnd_device bridge_devs[] = {
- BHND_DEVICE(PCI, NULL, bridge_quirks),
+ BHND_DEVICE(BCM, PCI, NULL, bridge_quirks),
};
static int
Modified: head/sys/mips/broadcom/bcm_mipscore.c
==============================================================================
--- head/sys/mips/broadcom/bcm_mipscore.c Wed Jun 8 20:54:56 2016 (r301696)
+++ head/sys/mips/broadcom/bcm_mipscore.c Wed Jun 8 21:31:33 2016 (r301697)
@@ -54,9 +54,9 @@ static const struct resource_spec mipsco
};
struct bhnd_device mipscore_match[] = {
- BHND_MIPS_DEVICE(MIPS, "BHND MIPS processor", NULL),
- BHND_MIPS_DEVICE(MIPS33, "BHND MIPS3302 processor", NULL),
- BHND_MIPS_DEVICE(MIPS74K, "BHND MIPS74K processor", NULL),
+ BHND_DEVICE(BCM, MIPS, NULL, NULL),
+ BHND_DEVICE(BCM, MIPS33, NULL, NULL),
+ BHND_DEVICE(MIPS, MIPS74K, NULL, NULL),
BHND_DEVICE_END
};
More information about the svn-src-head
mailing list