| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20160801121619.GB4541@io.lakedaemon.net>
Date: Mon, 1 Aug 2016 12:16:19 +0000
From: Jason Cooper <jason@...edaemon.net>
To: Zhao Qiang <qiang.zhao@....com>
Cc: oss@...error.net, linuxppc-dev@...ts.ozlabs.org,
linux-kernel@...r.kernel.org, xiaobo.xie@....com
Subject: Re: [PATCH v4 1/3] irqchip/qeic: move qeic driver from
drivers/soc/fsl/qe
Hi Zhao Qiang,
On Mon, Aug 01, 2016 at 10:53:18AM +0800, Zhao Qiang wrote:
> move the driver from drivers/soc/fsl/qe to drivers/irqchip,
> merge qe_ic.h and qe_ic.c into irq-qeic.c.
>
> Signed-off-by: Zhao Qiang <qiang.zhao@....com>
> ---
> Changes for v2:
> - modify the subject and commit msg
> Changes for v3:
> - merge .h file to .c, rename it with irq-qeic.c
> Changes for v4:
> - modify comments
>
> drivers/irqchip/Makefile | 1 +
> drivers/{soc/fsl/qe/qe_ic.c => irqchip/irq-qeic.c} | 95 ++++++++++++++++++-
> drivers/soc/fsl/qe/Makefile | 2 +-
> drivers/soc/fsl/qe/qe_ic.h | 103 ---------------------
> 4 files changed, 94 insertions(+), 107 deletions(-)
> rename drivers/{soc/fsl/qe/qe_ic.c => irqchip/irq-qeic.c} (85%)
Could you disable rename detection so that we can review the entire
codebase being brought into drivers/irqchip?
thx,
Jason.
> delete mode 100644 drivers/soc/fsl/qe/qe_ic.h
>
> diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
> index 38853a1..846b34e 100644
> --- a/drivers/irqchip/Makefile
> +++ b/drivers/irqchip/Makefile
> @@ -69,3 +69,4 @@ obj-$(CONFIG_PIC32_EVIC) += irq-pic32-evic.o
> obj-$(CONFIG_MVEBU_ODMI) += irq-mvebu-odmi.o
> obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o
> obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o
> +obj-$(CONFIG_QUICC_ENGINE) += irq-qeic.o
> diff --git a/drivers/soc/fsl/qe/qe_ic.c b/drivers/irqchip/irq-qeic.c
> similarity index 85%
> rename from drivers/soc/fsl/qe/qe_ic.c
> rename to drivers/irqchip/irq-qeic.c
> index ec2ca86..48ceded 100644
> --- a/drivers/soc/fsl/qe/qe_ic.c
> +++ b/drivers/irqchip/irq-qeic.c
> @@ -1,7 +1,7 @@
> /*
> - * arch/powerpc/sysdev/qe_lib/qe_ic.c
> + * drivers/irqchip/irq-qeic.c
> *
> - * Copyright (C) 2006 Freescale Semiconductor, Inc. All rights reserved.
> + * Copyright (C) 2016 Freescale Semiconductor, Inc. All rights reserved.
> *
> * Author: Li Yang <leoli@...escale.com>
> * Based on code from Shlomi Gridish <gridish@...escale.com>
> @@ -30,7 +30,96 @@
> #include <asm/io.h>
> #include <soc/fsl/qe/qe_ic.h>
>
> -#include "qe_ic.h"
> +#define NR_QE_IC_INTS 64
> +
> +/* QE IC registers offset */
> +#define QEIC_CICR 0x00
> +#define QEIC_CIVEC 0x04
> +#define QEIC_CRIPNR 0x08
> +#define QEIC_CIPNR 0x0c
> +#define QEIC_CIPXCC 0x10
> +#define QEIC_CIPYCC 0x14
> +#define QEIC_CIPWCC 0x18
> +#define QEIC_CIPZCC 0x1c
> +#define QEIC_CIMR 0x20
> +#define QEIC_CRIMR 0x24
> +#define QEIC_CICNR 0x28
> +#define QEIC_CIPRTA 0x30
> +#define QEIC_CIPRTB 0x34
> +#define QEIC_CRICR 0x3c
> +#define QEIC_CHIVEC 0x60
> +
> +/* Interrupt priority registers */
> +#define CIPCC_SHIFT_PRI0 29
> +#define CIPCC_SHIFT_PRI1 26
> +#define CIPCC_SHIFT_PRI2 23
> +#define CIPCC_SHIFT_PRI3 20
> +#define CIPCC_SHIFT_PRI4 13
> +#define CIPCC_SHIFT_PRI5 10
> +#define CIPCC_SHIFT_PRI6 7
> +#define CIPCC_SHIFT_PRI7 4
> +
> +/* CICR priority modes */
> +#define CICR_GWCC 0x00040000
> +#define CICR_GXCC 0x00020000
> +#define CICR_GYCC 0x00010000
> +#define CICR_GZCC 0x00080000
> +#define CICR_GRTA 0x00200000
> +#define CICR_GRTB 0x00400000
> +#define CICR_HPIT_SHIFT 8
> +#define CICR_HPIT_MASK 0x00000300
> +#define CICR_HP_SHIFT 24
> +#define CICR_HP_MASK 0x3f000000
> +
> +/* CICNR */
> +#define CICNR_WCC1T_SHIFT 20
> +#define CICNR_ZCC1T_SHIFT 28
> +#define CICNR_YCC1T_SHIFT 12
> +#define CICNR_XCC1T_SHIFT 4
> +
> +/* CRICR */
> +#define CRICR_RTA1T_SHIFT 20
> +#define CRICR_RTB1T_SHIFT 28
> +
> +/* Signal indicator */
> +#define SIGNAL_MASK 3
> +#define SIGNAL_HIGH 2
> +#define SIGNAL_LOW 0
> +
> +struct qe_ic {
> + /* Control registers offset */
> + volatile u32 __iomem *regs;
> +
> + /* The remapper for this QEIC */
> + struct irq_domain *irqhost;
> +
> + /* The "linux" controller struct */
> + struct irq_chip hc_irq;
> +
> + /* VIRQ numbers of QE high/low irqs */
> + unsigned int virq_high;
> + unsigned int virq_low;
> +};
> +
> +/*
> + * QE interrupt controller internal structure
> + */
> +struct qe_ic_info {
> + /* location of this source at the QIMR register. */
> + u32 mask;
> +
> + /* Mask register offset */
> + u32 mask_reg;
> +
> + /*
> + * for grouped interrupts sources - the interrupt
> + * code as appears at the group priority register
> + */
> + u8 pri_code;
> +
> + /* Group priority register offset */
> + u32 pri_reg;
> +};
>
> static DEFINE_RAW_SPINLOCK(qe_ic_lock);
>
> diff --git a/drivers/soc/fsl/qe/Makefile b/drivers/soc/fsl/qe/Makefile
> index 2031d38..51e4726 100644
> --- a/drivers/soc/fsl/qe/Makefile
> +++ b/drivers/soc/fsl/qe/Makefile
> @@ -1,7 +1,7 @@
> #
> # Makefile for the linux ppc-specific parts of QE
> #
> -obj-$(CONFIG_QUICC_ENGINE)+= qe.o qe_common.o qe_ic.o qe_io.o
> +obj-$(CONFIG_QUICC_ENGINE)+= qe.o qe_common.o qe_io.o
> obj-$(CONFIG_CPM) += qe_common.o
> obj-$(CONFIG_UCC) += ucc.o
> obj-$(CONFIG_UCC_SLOW) += ucc_slow.o
> diff --git a/drivers/soc/fsl/qe/qe_ic.h b/drivers/soc/fsl/qe/qe_ic.h
> deleted file mode 100644
> index 926a2ed..0000000
> --- a/drivers/soc/fsl/qe/qe_ic.h
> +++ /dev/null
> @@ -1,103 +0,0 @@
> -/*
> - * drivers/soc/fsl/qe/qe_ic.h
> - *
> - * QUICC ENGINE Interrupt Controller Header
> - *
> - * Copyright (C) 2006 Freescale Semiconductor, Inc. All rights reserved.
> - *
> - * Author: Li Yang <leoli@...escale.com>
> - * Based on code from Shlomi Gridish <gridish@...escale.com>
> - *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms of the GNU General Public License as published by the
> - * Free Software Foundation; either version 2 of the License, or (at your
> - * option) any later version.
> - */
> -#ifndef _POWERPC_SYSDEV_QE_IC_H
> -#define _POWERPC_SYSDEV_QE_IC_H
> -
> -#include <soc/fsl/qe/qe_ic.h>
> -
> -#define NR_QE_IC_INTS 64
> -
> -/* QE IC registers offset */
> -#define QEIC_CICR 0x00
> -#define QEIC_CIVEC 0x04
> -#define QEIC_CRIPNR 0x08
> -#define QEIC_CIPNR 0x0c
> -#define QEIC_CIPXCC 0x10
> -#define QEIC_CIPYCC 0x14
> -#define QEIC_CIPWCC 0x18
> -#define QEIC_CIPZCC 0x1c
> -#define QEIC_CIMR 0x20
> -#define QEIC_CRIMR 0x24
> -#define QEIC_CICNR 0x28
> -#define QEIC_CIPRTA 0x30
> -#define QEIC_CIPRTB 0x34
> -#define QEIC_CRICR 0x3c
> -#define QEIC_CHIVEC 0x60
> -
> -/* Interrupt priority registers */
> -#define CIPCC_SHIFT_PRI0 29
> -#define CIPCC_SHIFT_PRI1 26
> -#define CIPCC_SHIFT_PRI2 23
> -#define CIPCC_SHIFT_PRI3 20
> -#define CIPCC_SHIFT_PRI4 13
> -#define CIPCC_SHIFT_PRI5 10
> -#define CIPCC_SHIFT_PRI6 7
> -#define CIPCC_SHIFT_PRI7 4
> -
> -/* CICR priority modes */
> -#define CICR_GWCC 0x00040000
> -#define CICR_GXCC 0x00020000
> -#define CICR_GYCC 0x00010000
> -#define CICR_GZCC 0x00080000
> -#define CICR_GRTA 0x00200000
> -#define CICR_GRTB 0x00400000
> -#define CICR_HPIT_SHIFT 8
> -#define CICR_HPIT_MASK 0x00000300
> -#define CICR_HP_SHIFT 24
> -#define CICR_HP_MASK 0x3f000000
> -
> -/* CICNR */
> -#define CICNR_WCC1T_SHIFT 20
> -#define CICNR_ZCC1T_SHIFT 28
> -#define CICNR_YCC1T_SHIFT 12
> -#define CICNR_XCC1T_SHIFT 4
> -
> -/* CRICR */
> -#define CRICR_RTA1T_SHIFT 20
> -#define CRICR_RTB1T_SHIFT 28
> -
> -/* Signal indicator */
> -#define SIGNAL_MASK 3
> -#define SIGNAL_HIGH 2
> -#define SIGNAL_LOW 0
> -
> -struct qe_ic {
> - /* Control registers offset */
> - volatile u32 __iomem *regs;
> -
> - /* The remapper for this QEIC */
> - struct irq_domain *irqhost;
> -
> - /* The "linux" controller struct */
> - struct irq_chip hc_irq;
> -
> - /* VIRQ numbers of QE high/low irqs */
> - unsigned int virq_high;
> - unsigned int virq_low;
> -};
> -
> -/*
> - * QE interrupt controller internal structure
> - */
> -struct qe_ic_info {
> - u32 mask; /* location of this source at the QIMR register. */
> - u32 mask_reg; /* Mask register offset */
> - u8 pri_code; /* for grouped interrupts sources - the interrupt
> - code as appears at the group priority register */
> - u32 pri_reg; /* Group priority register offset */
> -};
> -
> -#endif /* _POWERPC_SYSDEV_QE_IC_H */
> --
> 2.1.0.27.g96db324
>
Powered by blists - more mailing lists