svn commit: r285421 - in head/sys: arm64/acpica arm64/include conf

[Zbigniew Bodek]

Author: zbb
Date: Sun Jul 12 17:28:31 2015
New Revision: 285421
URL: https://svnweb.freebsd.org/changeset/base/285421

Log:
  Implement stubs for ACPI PCI routines
  
  ACPI driver requires special functions to be provided by machdep code.
  Add temporary stubs to satisfy the compiler when both "pci" and "acpi"
  are enabled in the kernel configuration file.
  
  Reviewed by:   andrew
  Obtained from: Semihalf
  Sponsored by:  The FreeBSD Foundation
  Differential Revision: https://reviews.freebsd.org/D3028

Added:
  head/sys/arm64/acpica/pci_cfgreg.c   (contents, props changed)
Modified:
  head/sys/arm64/include/pci_cfgreg.h
  head/sys/conf/files.arm64

Added: head/sys/arm64/acpica/pci_cfgreg.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/arm64/acpica/pci_cfgreg.c	Sun Jul 12 17:28:31 2015	(r285421)
@@ -0,0 +1,73 @@
+/*-
+ * Copyright (c) 2015 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Semihalf under
+ * the sponsorship of the FreeBSD Foundation.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+
+#include <machine/pci_cfgreg.h>
+
+/*
+ * This file contains stubs for ACPI PCI functions
+ */
+
+/*
+ * Read configuration space register
+ */
+uint32_t
+pci_cfgregread(int bus, int slot, int func, int reg, int bytes)
+{
+
+	panic("pci_cfgregread not implemented");
+	return (0);
+}
+
+/*
+ * Write configuration space register
+ */
+void
+pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes)
+{
+
+	panic("pci_cfgregwrite not implemented");
+}
+
+/*
+ * Initialize access to configuration space
+ */
+int
+pci_cfgregopen(void)
+{
+
+	panic("pci_cfgregopen not implemented");
+	return (0);
+}

Modified: head/sys/arm64/include/pci_cfgreg.h
==============================================================================
--- head/sys/arm64/include/pci_cfgreg.h	Sun Jul 12 17:03:50 2015	(r285420)
+++ head/sys/arm64/include/pci_cfgreg.h	Sun Jul 12 17:28:31 2015	(r285421)
@@ -1 +1,36 @@
-/* $FreeBSD$ */
+/*-
+ * Copyright (c) 2015 The FreeBSD Foundation
+ * 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 _MACHINE_PCI_CFGREG_H
+#define	_MACHINE_PCI_CFGREG_H
+
+int pci_cfgregopen(void);
+uint32_t pci_cfgregread(int, int, int, int, int);
+void pci_cfgregwrite(int, int, int, int, u_int32_t, int);
+
+#endif /* !_MACHINE_PCI_CFGREG_H */

Modified: head/sys/conf/files.arm64
==============================================================================
--- head/sys/conf/files.arm64	Sun Jul 12 17:03:50 2015	(r285420)
+++ head/sys/conf/files.arm64	Sun Jul 12 17:28:31 2015	(r285421)
@@ -5,6 +5,7 @@ arm/arm/pmu.c			standard
 arm64/acpica/acpi_machdep.c	optional	acpi
 arm64/acpica/OsdEnvironment.c	optional	acpi
 arm64/acpica/acpi_wakeup.c	optional	acpi
+arm64/acpica/pci_cfgreg.c	optional	acpi	pci
 arm64/arm64/autoconf.c		standard
 arm64/arm64/bcopy.c		standard
 arm64/arm64/bus_machdep.c	standard