Module Name: src Committed By: jmcneill Date: Tue Oct 15 13:27:51 UTC 2019
Modified Files: src/sys/arch/arm/acpi: acpi_pci_machdep.c acpi_pci_machdep.h acpipchb.c Log Message: Amazon Graviton maxdevs quirk no longer required as of pci.c r1.155 To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/acpi/acpi_pci_machdep.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/acpi/acpi_pci_machdep.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/acpi/acpipchb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arm/acpi/acpi_pci_machdep.c diff -u src/sys/arch/arm/acpi/acpi_pci_machdep.c:1.11 src/sys/arch/arm/acpi/acpi_pci_machdep.c:1.12 --- src/sys/arch/arm/acpi/acpi_pci_machdep.c:1.11 Mon Oct 14 22:59:15 2019 +++ src/sys/arch/arm/acpi/acpi_pci_machdep.c Tue Oct 15 13:27:50 2019 @@ -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 @@ acpi_pci_md_attach_hook(device_t parent, 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; } Index: src/sys/arch/arm/acpi/acpi_pci_machdep.h diff -u src/sys/arch/arm/acpi/acpi_pci_machdep.h:1.4 src/sys/arch/arm/acpi/acpi_pci_machdep.h:1.5 --- src/sys/arch/arm/acpi/acpi_pci_machdep.h:1.4 Mon Oct 14 22:59:15 2019 +++ src/sys/arch/arm/acpi/acpi_pci_machdep.h Tue Oct 15 13:27:50 2019 @@ -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 @@ struct acpi_pci_context { 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 */ Index: src/sys/arch/arm/acpi/acpipchb.c diff -u src/sys/arch/arm/acpi/acpipchb.c:1.12 src/sys/arch/arm/acpi/acpipchb.c:1.13 --- src/sys/arch/arm/acpi/acpipchb.c:1.12 Tue Oct 15 00:23:44 2019 +++ src/sys/arch/arm/acpi/acpipchb.c Tue Oct 15 13:27:50 2019 @@ -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 @@ acpipchb_amazon_graviton_conf_write(pci_ 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 @@ acpipchb_amazon_graviton_map(ACPI_HANDLE 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; }