Module Name: src
Committed By: kiyohara
Date: Mon Jun 28 12:14:08 UTC 2010
Modified Files:
src/sys/arch/ia64/include: pci_machdep.h
src/sys/arch/ia64/pci: pci_machdep.c
Log Message:
Implement pci_attach_hook/pci_bus_maxdevs/pci_make_tag/pci_decompose_tag/
pci_conf_read/pci_conf_write.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/include/pci_machdep.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/pci/pci_machdep.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/ia64/include/pci_machdep.h
diff -u src/sys/arch/ia64/include/pci_machdep.h:1.1 src/sys/arch/ia64/include/pci_machdep.h:1.2
--- src/sys/arch/ia64/include/pci_machdep.h:1.1 Mon Jul 20 04:41:37 2009
+++ src/sys/arch/ia64/include/pci_machdep.h Mon Jun 28 12:14:08 2010
@@ -1,8 +1,45 @@
-typedef int pci_chipset_tag_t;
+/* $NetBSD: pci_machdep.h,v 1.2 2010/06/28 12:14:08 kiyohara Exp $ */
+/*
+ * Copyright (c) 2010 KIYOHARA Takashi
+ * 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 ``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 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.
+ */
+
+#ifndef _PCI_MACHDEP_H
+#define _PCI_MACHDEP_H
+
+struct pci_attach_args;
+struct pci_chipset_tag;
+
+typedef struct pci_chipset_tag *pci_chipset_tag_t;
typedef int pci_intr_handle_t;
typedef int pcitag_t;
-pcireg_t pci_conf_read(pci_chipset_tag_t pc, pcitag_t tag, int reg);
-void pci_conf_write(pci_chipset_tag_t pc, pcitag_t tag, int reg, pcireg_t val);
+void pci_attach_hook(device_t, device_t, struct pcibus_attach_args *);
+int pci_bus_maxdevs(pci_chipset_tag_t, int);
+pcitag_t pci_make_tag(pci_chipset_tag_t, int, int, int);
+void pci_decompose_tag(pci_chipset_tag_t, pcitag_t, int *, int *, int *);
+pcireg_t pci_conf_read(pci_chipset_tag_t, pcitag_t, int);
+void pci_conf_write(pci_chipset_tag_t, pcitag_t, int, pcireg_t);
-pcitag_t pci_make_tag(pci_chipset_tag_t pc, int bus, int device, int function);
+#endif
Index: src/sys/arch/ia64/pci/pci_machdep.c
diff -u src/sys/arch/ia64/pci/pci_machdep.c:1.1 src/sys/arch/ia64/pci/pci_machdep.c:1.2
--- src/sys/arch/ia64/pci/pci_machdep.c:1.1 Mon Jul 20 04:41:36 2009
+++ src/sys/arch/ia64/pci/pci_machdep.c Mon Jun 28 12:14:08 2010
@@ -1,6 +1,6 @@
-/* $NetBSD: pci_machdep.c,v 1.1 2009/07/20 04:41:36 kiyohara Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.2 2010/06/28 12:14:08 kiyohara Exp $ */
/*
- * Copyright (c) 2009 KIYOHARA Takashi
+ * Copyright (c) 2009, 2010 KIYOHARA Takashi
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,30 +25,71 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.1 2009/07/20 04:41:36 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.2 2010/06/28 12:14:08 kiyohara Exp $");
#include <machine/bus.h>
+#include <machine/sal.h>
+
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcidevs.h>
+void
+pci_attach_hook(device_t parent, device_t self, struct pcibus_attach_args *pba)
+{
+
+ /* Nothing */
+}
+
+int
+pci_bus_maxdevs(pci_chipset_tag_t pc, int busno)
+{
+
+ return 32; /* 32 device/bus */
+}
+
pcitag_t
pci_make_tag(pci_chipset_tag_t pc, int bus, int device, int function)
{
-printf("%s: not yet\n", __func__);
- return 0;
+
+#if DIAGNOSTIC
+ if (bus >= 256 || device >= 32 || function >= 8)
+ panic("%s: bad request", __func__);
+#endif
+
+ return (bus << 16) | (device << 11) | (function << 8);
+}
+
+void
+pci_decompose_tag(pci_chipset_tag_t pc, pcitag_t tag, int *bp, int *dp, int *fp)
+{
+
+ if (bp != NULL)
+ *bp = (tag >> 16) & 0xff;
+ if (dp != NULL)
+ *dp = (tag >> 11) & 0x1f;
+ if (fp != NULL)
+ *fp = (tag >> 8) & 0x07;
}
pcireg_t
pci_conf_read(pci_chipset_tag_t pc, pcitag_t tag, int reg)
{
-printf("%s: not yet\n", __func__);
- return 0;
+ struct ia64_sal_result res;
+
+ res = ia64_sal_entry(SAL_PCI_CONFIG_READ,
+ tag | reg, sizeof(pcireg_t), 0, 0, 0, 0, 0);
+ if (res.sal_status < 0)
+ return -1;
+ else
+ return res.sal_result[0];
}
void
pci_conf_write(pci_chipset_tag_t pc, pcitag_t tag, int reg, pcireg_t val)
{
-printf("%s: not yet\n", __func__);
+
+ (void) ia64_sal_entry(SAL_PCI_CONFIG_WRITE,
+ tag | reg, sizeof(pcireg_t), val, 0, 0, 0, 0);
}
