| 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: <1445343032-8032-5-git-send-email-majun258@huawei.com>
Date: Tue, 20 Oct 2015 20:10:32 +0800
From: MaJun <majun258@...wei.com>
To: <Catalin.Marinas@....com>, <linux-kernel@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>, <Will.Deacon@....com>,
<mark.rutland@....com>, <marc.zyngier@....com>,
<jason@...edaemon.net>, <tglx@...utronix.de>, <lizefan@...wei.com>,
<huxinwei@...wei.com>, <dingtianhong@...wei.com>,
<zhaojunhua@...ilicon.com>, <liguozhu@...ilicon.com>,
<xuwei5@...ilicon.com>, <wei.chenwei@...ilicon.com>,
<guohanjun@...wei.com>, <wuyun.wu@...wei.com>,
<guodong.xu@...aro.org>, <haojian.zhuang@...aro.org>,
<zhangfei.gao@...aro.org>, <usman.ahmad@...aro.org>,
<klimov.linux@...il.com>, <gabriele.paoloni@...wei.com>,
<majun258@...wei.com>
Subject: [PATCH RESEND v6 4/4] irqchip:implement the mbigen irq chip operation functions
From: Ma Jun <majun258@...wei.com>
Add the interrupt controller chip operation functions of mbigen chip.
Signed-off-by: Ma Jun <majun258@...wei.com>
---
drivers/irqchip/irq-mbigen.c | 97 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 92 insertions(+), 5 deletions(-)
diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c
index 3a20b25..729e6ac 100644
--- a/drivers/irqchip/irq-mbigen.c
+++ b/drivers/irqchip/irq-mbigen.c
@@ -47,6 +47,20 @@
#define REG_MBIGEN_VEC_OFFSET 0x200
/**
+ * offset of clear register in mbigen node
+ * This register is used to clear the status
+ * of interrupt
+ */
+#define REG_MBIGEN_CLEAR_OFFSET 0xa00
+
+/**
+ * offset of interrupt type register
+ * This register is used to configure interrupt
+ * trigger type
+ */
+#define REG_MBIGEN_TYPE_OFFSET 0x0
+
+/**
* struct mbigen_device - holds the information of mbigen device.
*
* @pdev: pointer to the platform device structure of mbigen chip.
@@ -63,11 +77,19 @@ struct mbigen_device {
* struct mbigen_irq_data - private data of each irq
*
* @base: mapped address of mbigen chip
+ * @pin_offset: local pin offset of interrupt.
* @reg_vec: addr offset of interrupt vector register.
+ * @reg_type: addr offset of interrupt trigger type register.
+ * @reg_clear: addr offset of interrupt clear register.
+ * @type: interrupt trigger type.
*/
struct mbigen_irq_data {
void __iomem *base;
+ unsigned int pin_offset;
unsigned int reg_vec;
+ unsigned int reg_type;
+ unsigned int reg_clear;
+ unsigned int type;
};
static inline int get_mbigen_vec_reg(u32 nid, u32 offset)
@@ -76,6 +98,60 @@ static inline int get_mbigen_vec_reg(u32 nid, u32 offset)
+ REG_MBIGEN_VEC_OFFSET;
}
+static int get_mbigen_type_reg(u32 nid, u32 offset)
+{
+ int ofst;
+
+ ofst = offset / 32 * 4;
+ return ofst + nid * MBIGEN_NODE_OFFSET
+ + REG_MBIGEN_TYPE_OFFSET;
+}
+
+static int get_mbigen_clear_reg(u32 nid, u32 offset)
+{
+ int ofst;
+
+ ofst = offset / 32 * 4;
+ return ofst + nid * MBIGEN_NODE_OFFSET
+ + REG_MBIGEN_CLEAR_OFFSET;
+}
+
+static void mbigen_eoi_irq(struct irq_data *data)
+{
+ struct mbigen_irq_data *mgn_irq_data = irq_data_get_irq_chip_data(data);
+ u32 mask;
+
+ /* only level triggered interrupt need to clear status */
+ if (mgn_irq_data->type == IRQ_TYPE_LEVEL_HIGH) {
+ mask = 1 << (mgn_irq_data->pin_offset % 32);
+ writel_relaxed(mask, mgn_irq_data->reg_clear + mgn_irq_data->base);
+ }
+
+ irq_chip_eoi_parent(data);
+}
+
+static int mbigen_set_type(struct irq_data *d, unsigned int type)
+{
+ struct mbigen_irq_data *mgn_irq_data = irq_data_get_irq_chip_data(d);
+ u32 mask;
+ int val;
+
+ if (type != IRQ_TYPE_LEVEL_HIGH && type != IRQ_TYPE_EDGE_RISING)
+ return -EINVAL;
+
+ mask = 1 << (mgn_irq_data->pin_offset % 32);
+
+ val = readl_relaxed(mgn_irq_data->reg_type + mgn_irq_data->base);
+
+ if (type == IRQ_TYPE_LEVEL_HIGH)
+ val |= mask;
+ else if (type == IRQ_TYPE_EDGE_RISING)
+ val &= ~mask;
+
+ writel_relaxed(val, mgn_irq_data->reg_type + mgn_irq_data->base);
+
+ return 0;
+}
static struct irq_chip mbigen_irq_chip = {
.name = "mbigen-v2",
@@ -99,10 +175,11 @@ static void mbigen_write_msg(struct msi_desc *desc, struct msi_msg *msg)
writel_relaxed(val, mgn_irq_data->reg_vec + mgn_irq_data->base);
}
-static struct mbigen_irq_data *set_mbigen_irq_data(int hwirq)
+static struct mbigen_irq_data *set_mbigen_irq_data(int hwirq,
+ unsigned int type)
{
struct mbigen_irq_data *datap;
- unsigned int nid, pin_offset;
+ unsigned int nid;
datap = kzalloc(sizeof(*datap), GFP_KERNEL);
if (!datap)
@@ -111,11 +188,20 @@ static struct mbigen_irq_data *set_mbigen_irq_data(int hwirq)
/* get the mbigen node number */
nid = (hwirq - RESERVED_IRQ_PER_MBIGEN_CHIP) / IRQS_PER_MBIGEN_NODE + 1;
- pin_offset = (hwirq - RESERVED_IRQ_PER_MBIGEN_CHIP)
+ datap->pin_offset = (hwirq - RESERVED_IRQ_PER_MBIGEN_CHIP)
% IRQS_PER_MBIGEN_NODE;
- datap->reg_vec = get_mbigen_vec_reg(nid, pin_offset);
+ datap->reg_vec = get_mbigen_vec_reg(nid, datap->pin_offset);
+ datap->reg_type = get_mbigen_type_reg(nid, datap->pin_offset);
+
+ /* no clear register for edge triggered interrupt */
+ if (type == IRQ_TYPE_EDGE_RISING)
+ datap->reg_clear = 0;
+ else
+ datap->reg_clear = get_mbigen_clear_reg(nid,
+ datap->pin_offset);
+ datap->type = type;
return datap;
}
@@ -143,6 +229,7 @@ static int mbigen_irq_domain_alloc(struct irq_domain *domain,
{
struct irq_fwspec *fwspec = args;
irq_hw_number_t hwirq = fwspec->param[0];
+ unsigned int type = fwspec->param[1];
struct mbigen_device *mgn_chip;
struct mbigen_irq_data *mgn_irq_data;
int i, err;
@@ -152,7 +239,7 @@ static int mbigen_irq_domain_alloc(struct irq_domain *domain,
return err;
/* set related information of this irq */
- mgn_irq_data = set_mbigen_irq_data(hwirq);
+ mgn_irq_data = set_mbigen_irq_data(hwirq, type);
if (!mgn_irq_data)
return err;
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists