[src/trunk]: src/sys/arch/arm/acpi Amazon Graviton maxdevs quirk no longer re...

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

details:   https://anonhg.NetBSD.org/src/rev/a416cf6a8401
branches:  trunk
changeset: 455339:a416cf6a8401
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Oct 15 13:27:50 2019 +0000

description:
Amazon Graviton maxdevs quirk no longer required as of pci.c r1.155

diffstat:

 sys/arch/arm/acpi/acpi_pci_machdep.c |   9 ++-------
 sys/arch/arm/acpi/acpi_pci_machdep.h |   3 +--
 sys/arch/arm/acpi/acpipchb.c         |  14 ++------------
 3 files changed, 5 insertions(+), 21 deletions(-)

diffs (89 lines):

diff -r 7cc167c53730 -r a416cf6a8401 sys/arch/arm/acpi/acpi_pci_machdep.c
--- a/sys/arch/arm/acpi/acpi_pci_machdep.c      Tue Oct 15 13:27:11 2019 +0000
+++ b/sys/arch/arm/acpi/acpi_pci_machdep.c      Tue Oct 15 13:27:50 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci_machdep.c,v 1.11 2019/10/14 22:59:15 jmcneill Exp $ */
+/* $NetBSD: acpi_pci_machdep.c,v 1.12 2019/10/15 13:27:50 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci_machdep.c,v 1.11 2019/10/14 22:59:15 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci_machdep.c,v 1.12 2019/10/15 13:27:50 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -215,11 +215,6 @@
 static int
 acpi_pci_md_bus_maxdevs(void *v, int busno)
 {
-       struct acpi_pci_context * const ap = v;
-
-       if (ap->ap_bus_maxdevs != NULL)
-               return ap->ap_bus_maxdevs(ap, busno);
-
        return 32;
 }
 
diff -r 7cc167c53730 -r a416cf6a8401 sys/arch/arm/acpi/acpi_pci_machdep.h
--- a/sys/arch/arm/acpi/acpi_pci_machdep.h      Tue Oct 15 13:27:11 2019 +0000
+++ b/sys/arch/arm/acpi/acpi_pci_machdep.h      Tue Oct 15 13:27:50 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci_machdep.h,v 1.4 2019/10/14 22:59:15 jmcneill Exp $ */
+/* $NetBSD: acpi_pci_machdep.h,v 1.5 2019/10/15 13:27:50 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -44,7 +44,6 @@
        bus_space_handle_t ap_conf_bsh;
        int (*ap_conf_read)(pci_chipset_tag_t, pcitag_t, int, pcireg_t *);
        int (*ap_conf_write)(pci_chipset_tag_t, pcitag_t, int, pcireg_t);
-       int (*ap_bus_maxdevs)(struct acpi_pci_context *, int);
 };
 
 #endif /* !_ARM_ACPI_PCI_MACHDEP_H */
diff -r 7cc167c53730 -r a416cf6a8401 sys/arch/arm/acpi/acpipchb.c
--- a/sys/arch/arm/acpi/acpipchb.c      Tue Oct 15 13:27:11 2019 +0000
+++ b/sys/arch/arm/acpi/acpipchb.c      Tue Oct 15 13:27:50 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpipchb.c,v 1.12 2019/10/15 00:23:44 jmcneill Exp $ */
+/* $NetBSD: acpipchb.c,v 1.13 2019/10/15 13:27:50 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpipchb.c,v 1.12 2019/10/15 00:23:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpipchb.c,v 1.13 2019/10/15 13:27:50 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -131,15 +131,6 @@
        return acpimcfg_conf_write(pc, tag, reg, data);
 }
 
-static int
-acpipchb_amazon_graviton_bus_maxdevs(struct acpi_pci_context *ap, int busno)
-{
-       if (busno == ap->ap_bus + 1)
-               return 1;
-
-       return 32;
-}
-
 static ACPI_STATUS
 acpipchb_amazon_graviton_map(ACPI_HANDLE handle, UINT32 level, void *ctx, void **retval)
 {
@@ -172,7 +163,6 @@
 
        ap->ap_conf_read = acpipchb_amazon_graviton_conf_read;
        ap->ap_conf_write = acpipchb_amazon_graviton_conf_write;
-       ap->ap_bus_maxdevs = acpipchb_amazon_graviton_bus_maxdevs;
 
        return AE_CTRL_TERMINATE;
 }