Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 14 Jul 2016 17:16:51 +0000 (UTC)
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r302851 - head/sys/arm64/arm64
Message-ID:  <201607141716.u6EHGpBI004190@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: andrew
Date: Thu Jul 14 17:16:51 2016
New Revision: 302851
URL: https://svnweb.freebsd.org/changeset/base/302851

Log:
  Move gic_v3_irqsrc into the GICv3 driver source as it's only needed there.
  Remove unused macros from the GICv3 header.
  
  Obtained from:	ABT Systems Ltd
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/arm64/arm64/gic_v3.c
  head/sys/arm64/arm64/gic_v3_var.h

Modified: head/sys/arm64/arm64/gic_v3.c
==============================================================================
--- head/sys/arm64/arm64/gic_v3.c	Thu Jul 14 17:16:10 2016	(r302850)
+++ head/sys/arm64/arm64/gic_v3.c	Thu Jul 14 17:16:51 2016	(r302851)
@@ -134,6 +134,13 @@ enum gic_v3_xdist {
 	REDIST,
 };
 
+struct gic_v3_irqsrc {
+	struct intr_irqsrc	gi_isrc;
+	uint32_t		gi_irq;
+	enum intr_polarity	gi_pol;
+	enum intr_trigger	gi_trig;
+};
+
 /* Helper routines starting with gic_v3_ */
 static int gic_v3_dist_init(struct gic_v3_softc *);
 static int gic_v3_redist_alloc(struct gic_v3_softc *);

Modified: head/sys/arm64/arm64/gic_v3_var.h
==============================================================================
--- head/sys/arm64/arm64/gic_v3_var.h	Thu Jul 14 17:16:10 2016	(r302850)
+++ head/sys/arm64/arm64/gic_v3_var.h	Thu Jul 14 17:16:51 2016	(r302851)
@@ -36,12 +36,7 @@
 
 DECLARE_CLASS(gic_v3_driver);
 
-struct gic_v3_irqsrc {
-	struct intr_irqsrc	gi_isrc;
-	uint32_t		gi_irq;
-	enum intr_polarity	gi_pol;
-	enum intr_trigger	gi_trig;
-};
+struct gic_v3_irqsrc;
 
 struct redist_lpis {
 	vm_offset_t		conf_base;
@@ -140,27 +135,4 @@ void gic_r_write_8(device_t, bus_size_t,
 	    reg, val);				\
 })
 
-#define	PCI_DEVID_GENERIC(pci_dev)				\
-({								\
-	((pci_get_domain(pci_dev) << PCI_RID_DOMAIN_SHIFT) |	\
-	(pci_get_bus(pci_dev) << PCI_RID_BUS_SHIFT) |		\
-	(pci_get_slot(pci_dev) << PCI_RID_SLOT_SHIFT) |		\
-	(pci_get_function(pci_dev) << PCI_RID_FUNC_SHIFT));	\
-})
-
-/*
- * Request number of maximum MSI-X vectors for this device.
- * Device can ask for less vectors than maximum supported but not more.
- */
-#define	PCI_MSIX_NUM(pci_dev)			\
-({						\
-	struct pci_devinfo *dinfo;		\
-	pcicfgregs *cfg;			\
-						\
-	dinfo = device_get_ivars(pci_dev);	\
-	cfg = &dinfo->cfg;			\
-						\
-	cfg->msix.msix_msgnum;			\
-})
-
 #endif /* _GIC_V3_VAR_H_ */

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607141716.u6EHGpBI004190>