The branch main has been updated by andrew:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=c0dba117de236a68de5dc233ab4f61bed337a9cb

commit c0dba117de236a68de5dc233ab4f61bed337a9cb
Author:     Andrew Turner <and...@freebsd.org>
AuthorDate: 2025-03-27 13:21:33 +0000
Commit:     Andrew Turner <and...@freebsd.org>
CommitDate: 2025-03-27 13:47:37 +0000

    arm/mv: Remove ic.c, it's unused
    
    Reviewed by:    cognet, imp
    Sponsored by:   Arm Ltd
    Differential Revision:  https://reviews.freebsd.org/D49496
---
 sys/arm/mv/ic.c | 310 --------------------------------------------------------
 1 file changed, 310 deletions(-)

diff --git a/sys/arm/mv/ic.c b/sys/arm/mv/ic.c
deleted file mode 100644
index aaea59ae2ca6..000000000000
--- a/sys/arm/mv/ic.c
+++ /dev/null
@@ -1,310 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * Copyright (c) 2006 Benno Rice.
- * Copyright (C) 2007-2008 MARVELL INTERNATIONAL LTD.
- * All rights reserved.
- *
- * Adapted and extended to Marvell SoCs by Semihalf.
- *
- * 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.
- *
- * from: FreeBSD: //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0_icu.c, 
rev 1
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
-#include <sys/kernel.h>
-#include <sys/ktr.h>
-#include <sys/module.h>
-#include <sys/rman.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
-
-#include <dev/ofw/ofw_bus.h>
-#include <dev/ofw/ofw_bus_subr.h>
-
-#include <arm/mv/mvreg.h>
-#include <arm/mv/mvvar.h>
-
-struct mv_ic_softc {
-       struct resource *       ic_res[1];
-       bus_space_tag_t         ic_bst;
-       bus_space_handle_t      ic_bsh;
-       int                     ic_high_regs;
-       int                     ic_error_regs;
-};
-
-static struct resource_spec mv_ic_spec[] = {
-       { SYS_RES_MEMORY,       0,      RF_ACTIVE },
-       { -1, 0 }
-};
-
-static struct mv_ic_softc *mv_ic_sc = NULL;
-
-static int     mv_ic_probe(device_t);
-static int     mv_ic_attach(device_t);
-
-uint32_t       mv_ic_get_cause(void);
-uint32_t       mv_ic_get_mask(void);
-void           mv_ic_set_mask(uint32_t);
-uint32_t       mv_ic_get_cause_hi(void);
-uint32_t       mv_ic_get_mask_hi(void);
-void           mv_ic_set_mask_hi(uint32_t);
-uint32_t       mv_ic_get_cause_error(void);
-uint32_t       mv_ic_get_mask_error(void);
-void           mv_ic_set_mask_error(uint32_t);
-static void    arm_mask_irq_all(void);
-
-static int
-mv_ic_probe(device_t dev)
-{
-
-       if (!ofw_bus_status_okay(dev))
-               return (ENXIO);
-
-       if (!ofw_bus_is_compatible(dev, "mrvl,pic"))
-               return (ENXIO);
-
-       device_set_desc(dev, "Marvell Integrated Interrupt Controller");
-       return (0);
-}
-
-static int
-mv_ic_attach(device_t dev)
-{
-       struct mv_ic_softc *sc;
-       uint32_t dev_id, rev_id;
-       int error;
-
-       sc = (struct mv_ic_softc *)device_get_softc(dev);
-
-       if (mv_ic_sc != NULL)
-               return (ENXIO);
-       mv_ic_sc = sc;
-
-       soc_id(&dev_id, &rev_id);
-
-       sc->ic_high_regs = 0;
-       sc->ic_error_regs = 0;
-
-       if (dev_id == MV_DEV_88F6281 ||
-           dev_id == MV_DEV_88F6282 ||
-           dev_id == MV_DEV_MV78100 ||
-           dev_id == MV_DEV_MV78100_Z0)
-               sc->ic_high_regs = 1;
-
-       if (dev_id == MV_DEV_MV78100 || dev_id == MV_DEV_MV78100_Z0)
-               sc->ic_error_regs = 1;
-
-       error = bus_alloc_resources(dev, mv_ic_spec, sc->ic_res);
-       if (error) {
-               device_printf(dev, "could not allocate resources\n");
-               return (ENXIO);
-       }
-
-       sc->ic_bst = rman_get_bustag(sc->ic_res[0]);
-       sc->ic_bsh = rman_get_bushandle(sc->ic_res[0]);
-
-       /* Mask all interrupts */
-       arm_mask_irq_all();
-
-       return (0);
-}
-
-static device_method_t mv_ic_methods[] = {
-       DEVMETHOD(device_probe,         mv_ic_probe),
-       DEVMETHOD(device_attach,        mv_ic_attach),
-       { 0, 0 }
-};
-
-static driver_t mv_ic_driver = {
-       "ic",
-       mv_ic_methods,
-       sizeof(struct mv_ic_softc),
-};
-
-DRIVER_MODULE(ic, simplebus, mv_ic_driver, 0, 0);
-
-int
-arm_get_next_irq(int last)
-{
-       u_int filt, irq;
-       int next;
-
-       filt = ~((last >= 0) ? (2 << last) - 1 : 0);
-       irq = mv_ic_get_cause() & mv_ic_get_mask();
-       if (irq & filt) {
-               next = ffs(irq & filt) - 1;
-               goto out;
-       }
-       if (mv_ic_sc->ic_high_regs) {
-               filt = ~((last >= 32) ? (2 << (last - 32)) - 1 : 0);
-               irq = mv_ic_get_cause_hi() & mv_ic_get_mask_hi();
-               if (irq & filt) {
-                       next = ffs(irq & filt) + 31;
-                       goto out;
-               }
-       }
-       if (mv_ic_sc->ic_error_regs) {
-               filt = ~((last >= 64) ? (2 << (last - 64)) - 1 : 0);
-               irq = mv_ic_get_cause_error() & mv_ic_get_mask_error();
-               if (irq & filt) {
-                       next = ffs(irq & filt) + 63;
-                       goto out;
-               }
-       }
-       next = -1;
-
- out:
-       CTR3(KTR_INTR, "%s: last=%d, next=%d", __func__, last, next);
-       return (next);
-}
-
-static void
-arm_mask_irq_all(void)
-{
-
-       mv_ic_set_mask(0);
-
-       if (mv_ic_sc->ic_high_regs)
-               mv_ic_set_mask_hi(0);
-
-       if (mv_ic_sc->ic_error_regs)
-               mv_ic_set_mask_error(0);
-}
-
-void
-arm_mask_irq(uintptr_t nb)
-{
-       uint32_t        mr;
-
-       if (nb < 32) {
-               mr = mv_ic_get_mask();
-               mr &= ~(1 << nb);
-               mv_ic_set_mask(mr);
-
-       } else if ((nb < 64) && mv_ic_sc->ic_high_regs) {
-               mr = mv_ic_get_mask_hi();
-               mr &= ~(1 << (nb - 32));
-               mv_ic_set_mask_hi(mr);
-
-       } else if ((nb < 96) && mv_ic_sc->ic_error_regs) {
-               mr = mv_ic_get_mask_error();
-               mr &= ~(1 << (nb - 64));
-               mv_ic_set_mask_error(mr);
-       }
-}
-
-void
-arm_unmask_irq(uintptr_t nb)
-{
-       uint32_t        mr;
-
-       if (nb < 32) {
-               mr = mv_ic_get_mask();
-               mr |= (1 << nb);
-               mv_ic_set_mask(mr);
-
-       } else if ((nb < 64) && mv_ic_sc->ic_high_regs) {
-               mr = mv_ic_get_mask_hi();
-               mr |= (1 << (nb - 32));
-               mv_ic_set_mask_hi(mr);
-
-       } else if ((nb < 96) && mv_ic_sc->ic_error_regs) {
-               mr = mv_ic_get_mask_error();
-               mr |= (1 << (nb - 64));
-               mv_ic_set_mask_error(mr);
-       }
-}
-
-void
-mv_ic_set_mask(uint32_t val)
-{
-
-       bus_space_write_4(mv_ic_sc->ic_bst, mv_ic_sc->ic_bsh,
-           IRQ_MASK, val);
-}
-
-uint32_t
-mv_ic_get_mask(void)
-{
-
-       return (bus_space_read_4(mv_ic_sc->ic_bst,
-           mv_ic_sc->ic_bsh, IRQ_MASK));
-}
-
-uint32_t
-mv_ic_get_cause(void)
-{
-
-       return (bus_space_read_4(mv_ic_sc->ic_bst,
-           mv_ic_sc->ic_bsh, IRQ_CAUSE));
-}
-
-void
-mv_ic_set_mask_hi(uint32_t val)
-{
-
-       bus_space_write_4(mv_ic_sc->ic_bst, mv_ic_sc->ic_bsh,
-           IRQ_MASK_HI, val);
-}
-
-uint32_t
-mv_ic_get_mask_hi(void)
-{
-
-       return (bus_space_read_4(mv_ic_sc->ic_bst,
-           mv_ic_sc->ic_bsh, IRQ_MASK_HI));
-}
-
-uint32_t
-mv_ic_get_cause_hi(void)
-{
-
-       return (bus_space_read_4(mv_ic_sc->ic_bst,
-           mv_ic_sc->ic_bsh, IRQ_CAUSE_HI));
-}
-
-void
-mv_ic_set_mask_error(uint32_t val)
-{
-
-       bus_space_write_4(mv_ic_sc->ic_bst, mv_ic_sc->ic_bsh,
-           IRQ_MASK_ERROR, val);
-}
-
-uint32_t
-mv_ic_get_mask_error(void)
-{
-
-       return (bus_space_read_4(mv_ic_sc->ic_bst,
-           mv_ic_sc->ic_bsh, IRQ_MASK_ERROR));
-}
-
-uint32_t
-mv_ic_get_cause_error(void)
-{
-
-       return (bus_space_read_4(mv_ic_sc->ic_bst,
-           mv_ic_sc->ic_bsh, IRQ_CAUSE_ERROR));
-}

Reply via email to