From owner-svn-src-all@freebsd.org Thu Dec 10 15:51:04 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8F0959D5BC4; Thu, 10 Dec 2015 15:51:04 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4C4C91E2C; Thu, 10 Dec 2015 15:51:04 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBAFp348058800; Thu, 10 Dec 2015 15:51:03 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBAFp3fL058529; Thu, 10 Dec 2015 15:51:03 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201512101551.tBAFp3fL058529@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Thu, 10 Dec 2015 15:51:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r292063 - head/sys/arm64/arm64 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2015 15:51:04 -0000 Author: andrew Date: Thu Dec 10 15:51:02 2015 New Revision: 292063 URL: https://svnweb.freebsd.org/changeset/base/292063 Log: Remove pic_map_msix from ARM64, it is unneeded as all mappings happen through pic_map_msi (without the x). Sponsored by: ABT Systems Ltd Modified: head/sys/arm64/arm64/gic_v3_its.c head/sys/arm64/arm64/gic_v3_var.h head/sys/arm64/arm64/intr_machdep.c head/sys/arm64/arm64/pic_if.m Modified: head/sys/arm64/arm64/gic_v3_its.c ============================================================================== --- head/sys/arm64/arm64/gic_v3_its.c Thu Dec 10 13:19:30 2015 (r292062) +++ head/sys/arm64/arm64/gic_v3_its.c Thu Dec 10 15:51:02 2015 (r292063) @@ -74,10 +74,9 @@ static device_method_t gic_v3_its_method */ /* MSI-X */ DEVMETHOD(pic_alloc_msix, gic_v3_its_alloc_msix), - DEVMETHOD(pic_map_msix, gic_v3_its_map_msix), /* MSI */ DEVMETHOD(pic_alloc_msi, gic_v3_its_alloc_msi), - DEVMETHOD(pic_map_msi, gic_v3_its_map_msix), + DEVMETHOD(pic_map_msi, gic_v3_its_map_msi), /* End */ DEVMETHOD_END @@ -1658,7 +1657,7 @@ gic_v3_its_alloc_msi(device_t dev, devic } int -gic_v3_its_map_msix(device_t dev, device_t pci_dev, int irq, uint64_t *addr, +gic_v3_its_map_msi(device_t dev, device_t pci_dev, int irq, uint64_t *addr, uint32_t *data) { struct gic_v3_its_softc *sc; Modified: head/sys/arm64/arm64/gic_v3_var.h ============================================================================== --- head/sys/arm64/arm64/gic_v3_var.h Thu Dec 10 13:19:30 2015 (r292062) +++ head/sys/arm64/arm64/gic_v3_var.h Thu Dec 10 15:51:02 2015 (r292063) @@ -253,7 +253,7 @@ int gic_v3_its_detach(device_t); int gic_v3_its_alloc_msix(device_t, device_t, int *); int gic_v3_its_alloc_msi(device_t, device_t, int, int *); -int gic_v3_its_map_msix(device_t, device_t, int, uint64_t *, uint32_t *); +int gic_v3_its_map_msi(device_t, device_t, int, uint64_t *, uint32_t *); int its_init_cpu(struct gic_v3_its_softc *); Modified: head/sys/arm64/arm64/intr_machdep.c ============================================================================== --- head/sys/arm64/arm64/intr_machdep.c Thu Dec 10 13:19:30 2015 (r292062) +++ head/sys/arm64/arm64/intr_machdep.c Thu Dec 10 15:51:02 2015 (r292063) @@ -252,13 +252,6 @@ arm_release_msix(device_t pci, device_t } -int -arm_map_msix(device_t pci, device_t child, int irq, uint64_t *addr, uint32_t *data) -{ - - return (PIC_MAP_MSIX(msi_pic, child, irq, addr, data)); -} - /* * Finalize interrupts bring-up (should be called from configure_final()). * Enables all interrupts registered by bus_setup_intr() during boot Modified: head/sys/arm64/arm64/pic_if.m ============================================================================== --- head/sys/arm64/arm64/pic_if.m Thu Dec 10 13:19:30 2015 (r292062) +++ head/sys/arm64/arm64/pic_if.m Thu Dec 10 15:51:02 2015 (r292063) @@ -158,14 +158,6 @@ METHOD int map_msi { uint32_t *data; }; -METHOD int map_msix { - device_t dev; - device_t pci_dev; - int irq; - uint64_t *addr; - uint32_t *data; -}; - METHOD int release_msi { device_t dev; device_t pci_dev;