Module Name: src
Committed By: martin
Date: Fri Aug 11 10:13:51 UTC 2023
Modified Files:
src/sys/arch/arm/marvell [netbsd-10]: mvsoc_intr.h
src/sys/dev/marvell [netbsd-10]: marvellvar.h
Log Message:
Additionall pull up following revision(s) (requested by riastradh in ticket
#316):
sys/dev/marvell/marvellvar.h: revision 1.7
sys/arch/arm/marvell/mvsoc_intr.h: revision 1.9
marvell: Reconcile arm vs powerpc marvell_intr_establish.
If there's a better way to do this without #ifdef __powerpc__, please
have at it!
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.4.1 src/sys/arch/arm/marvell/mvsoc_intr.h
cvs rdiff -u -r1.6 -r1.6.48.1 src/sys/dev/marvell/marvellvar.h
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/marvell/mvsoc_intr.h
diff -u src/sys/arch/arm/marvell/mvsoc_intr.h:1.8 src/sys/arch/arm/marvell/mvsoc_intr.h:1.8.4.1
--- src/sys/arch/arm/marvell/mvsoc_intr.h:1.8 Sat Jun 25 13:24:35 2022
+++ src/sys/arch/arm/marvell/mvsoc_intr.h Fri Aug 11 10:13:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsoc_intr.h,v 1.8 2022/06/25 13:24:35 jmcneill Exp $ */
+/* $NetBSD: mvsoc_intr.h,v 1.8.4.1 2023/08/11 10:13:50 martin Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -47,6 +47,17 @@ void mvsoc_irq_handler(void *);
#include <arm/pic/picvar.h>
+/*
+ * Note: arm and powerpc Marvell platforms have a conflicting idea of
+ * marvell_intr_establish.
+ *
+ * On arm-based Marvell platforms, there is a static inline
+ * marvell_intr_establish defined in mvsoc_intr.h.
+ *
+ * On powerpc-based Marvell platforms, there is an out-of-line
+ * marvell_intr_establish defined in a SoC-specific gt_mainbus.c
+ * (evbppc/ev64260, ofppc) and declared in dev/marvell/marvellvar.h.
+ */
static __inline void *
marvell_intr_establish(int irq, int ipl, int (*func)(void *), void *arg)
{
Index: src/sys/dev/marvell/marvellvar.h
diff -u src/sys/dev/marvell/marvellvar.h:1.6 src/sys/dev/marvell/marvellvar.h:1.6.48.1
--- src/sys/dev/marvell/marvellvar.h:1.6 Sat Jan 7 14:26:37 2017
+++ src/sys/dev/marvell/marvellvar.h Fri Aug 11 10:13:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: marvellvar.h,v 1.6 2017/01/07 14:26:37 kiyohara Exp $ */
+/* $NetBSD: marvellvar.h,v 1.6.48.1 2023/08/11 10:13:50 martin Exp $ */
/*
* Copyright (c) 2009 KIYOHARA Takashi
* All rights reserved.
@@ -71,8 +71,21 @@ struct marvell_attach_args {
#define MVA_OFFSET_DEFAULT GTCF_OFFSET_DEFAULT
#define MVA_IRQ_DEFAULT GTCF_IRQ_DEFAULT
-
+#ifdef __powerpc__
+/*
+ * Note: arm and powerpc Marvell platforms have a conflicting idea of
+ * marvell_intr_establish.
+ *
+ * On arm-based Marvell platforms, there is a static inline
+ * marvell_intr_establish defined in mvsoc_intr.h.
+ *
+ * On powerpc-based Marvell platforms, there is an out-of-line
+ * marvell_intr_establish defined in a SoC-specific gt_mainbus.c
+ * (evbppc/ev64260, ofppc) and declared in dev/marvell/marvellvar.h.
+ */
void *marvell_intr_establish(int, int, int (*)(void *), void *);
+#endif
+
int marvell_winparams_by_tag(device_t, int, int *, int *, uint64_t *,
uint32_t *);
