[src/trunk]: src/sys/arch/alpha/pci Make the following PCI chipset functions ...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/27ce18d9e138
branches:  trunk
changeset: 984157:27ce18d9e138
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Jun 25 03:44:10 2021 +0000

description:
Make the following PCI chipset functions optional:
- attach_hook()
- bus_maxdevs()
- make_tag()
- decompose_tag()
...and provide a default implementation for each.

diffstat:

 sys/arch/alpha/pci/pci_machdep.c |  33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diffs (73 lines):

diff -r b0289e8589a8 -r 27ce18d9e138 sys/arch/alpha/pci/pci_machdep.c
--- a/sys/arch/alpha/pci/pci_machdep.c  Thu Jun 24 23:48:08 2021 +0000
+++ b/sys/arch/alpha/pci/pci_machdep.c  Fri Jun 25 03:44:10 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.29 2021/06/19 16:59:07 thorpej Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.30 2021/06/25 03:44:10 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.29 2021/06/19 16:59:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.30 2021/06/25 03:44:10 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -481,14 +481,18 @@
 {
        pci_chipset_tag_t const pc = pba->pba_pc;
 
-       KASSERT(pc->pc_attach_hook != NULL);
-       pc->pc_attach_hook(parent, self, pba);
+       if (pc->pc_attach_hook != NULL) {
+               pc->pc_attach_hook(parent, self, pba);
+       }
 }
 
 int
 pci_bus_maxdevs(pci_chipset_tag_t const pc, int const busno)
 {
-       KASSERT(pc->pc_bus_maxdevs != NULL);
+       if (pc->pc_bus_maxdevs == NULL) {
+               return 32;
+       }
+
        return pc->pc_bus_maxdevs(pc->pc_conf_v, busno);
 }
 
@@ -496,7 +500,13 @@
 pci_make_tag(pci_chipset_tag_t const pc, int const bus, int const dev,
     int const func)
 {
-       KASSERT(pc->pc_make_tag != NULL);
+       if (__predict_true(pc->pc_make_tag == NULL)) {
+               /* Just use the standard Type 1 address format. */
+               return __SHIFTIN(bus, PCI_CONF_TYPE1_BUS) |
+                      __SHIFTIN(dev, PCI_CONF_TYPE1_DEVICE) |
+                      __SHIFTIN(func, PCI_CONF_TYPE1_FUNCTION);
+       }
+
        return pc->pc_make_tag(pc->pc_conf_v, bus, dev, func);
 }
 
@@ -504,7 +514,16 @@
 pci_decompose_tag(pci_chipset_tag_t const pc, pcitag_t const tag,
     int * const busp, int * const devp, int * const funcp)
 {
-       KASSERT(pc->pc_decompose_tag != NULL);
+       if (__predict_true(pc->pc_decompose_tag == NULL)) {
+               if (busp != NULL)
+                       *busp = __SHIFTOUT(tag, PCI_CONF_TYPE1_BUS);
+               if (devp != NULL)
+                       *devp = __SHIFTOUT(tag, PCI_CONF_TYPE1_DEVICE);
+               if (funcp != NULL)
+                       *funcp = __SHIFTOUT(tag, PCI_CONF_TYPE1_FUNCTION);
+               return;
+       }
+
        pc->pc_decompose_tag(pc->pc_conf_v, tag, busp, devp, funcp);
 }