From patchwork Wed Jan 23 14:15:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1029971 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="saNW4+Am"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43l6lz2bxKz9sBQ for ; Thu, 24 Jan 2019 01:16:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726365AbfAWOPx (ORCPT ); Wed, 23 Jan 2019 09:15:53 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:37151 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727047AbfAWOPw (ORCPT ); Wed, 23 Jan 2019 09:15:52 -0500 Received: by mail-wm1-f67.google.com with SMTP id g67so2098001wmd.2 for ; Wed, 23 Jan 2019 06:15:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WQ66DLEKc/MG0DXybe6MWB+l9aGMWDp/DgE2ls7LES8=; b=saNW4+Amy3TnKB0zLgHSHhGJk6MQOZKunNRlGdRHPvYQVLby7qVAzz+IFyufQWJ7S+ oe1VOSjHW8KPcopwEjmtQjij7NBFTjRSAZ74vyafdUbvV2/58FdDPfSjpbqUMi/CxPFf phgR1ykWQ0fd2GPlpU/Iv/Sim29IZ/sbf4EuMAdYYYtdG+vtUYyuu8aQieTk7x3bJZuX uEKmSrOc+Ldj+MNrJIevMM9d6P8Ioh9vzc2EHjtwg0Dh7xg6PC3inXktcGI3s4INfJuu yac1PhNbSBwEXGyan+ueeGbqZOvqxCYlRthk4n2zKBx0vnXhWrHQMKCQcjDcahATEnG5 pNRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WQ66DLEKc/MG0DXybe6MWB+l9aGMWDp/DgE2ls7LES8=; b=dkgxph6ia7+VmVxlQsUMruecX2zafAb12zS2B5UcQxOy537khmZ6dEWSYNnOr6OkQn Kqa8gCF8HgDGqzcx6RbZs5j2HYUGNjwibKKTCicBnPEDfQPT8euDrL1tk0V9RlQGhK+G byavDdbrq+jRtewaa85nmStAyVbd670x5NvOoHFTcoqqgvVuZYqJi3Iilg9y6lvFnmvF atBdmDdYBqdg+YnqCSwueyOl8NlSCvlWJxPmo3awZou2LwrW0smTHizdvUL6gxx+h/z/ 940ABkkIVH5/cK5XneaRSKTaKwdl3biZcw1bLIABzrwC90SLGJYMjZPLSXBWLkZAUgt2 /YkA== X-Gm-Message-State: AJcUukf+aqqO1n6yiAQeIwuw5jFm9gFBwJoF2UeHk4LzfjF6g8/aCLp3 GMd7VbZ5lUMrlBSkBqmnmNdsnQ== X-Google-Smtp-Source: ALg8bN4h2Oar7UWGtZl83vS4bpMJvuZCqmhytFUocnIlDAoCnH1Z7eOhCsq7/0hUPTQ959COxj9aZg== X-Received: by 2002:a1c:9dc4:: with SMTP id g187mr2987014wme.152.1548252946644; Wed, 23 Jan 2019 06:15:46 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id a8sm29072997wme.23.2019.01.23.06.15.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Jan 2019 06:15:46 -0800 (PST) From: Bartosz Golaszewski To: Linus Walleij , Thomas Gleixner , Marc Zyngier , =?utf-8?q?Uwe_Kleine-K?= =?utf-8?b?w7ZuaWc=?= Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 1/9] irq/irq_sim: don't share the irq_chip structure between simulators Date: Wed, 23 Jan 2019 15:15:30 +0100 Message-Id: <20190123141538.29408-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190123141538.29408-1-brgl@bgdev.pl> References: <20190123141538.29408-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Bartosz Golaszewski We want to support multiple instances of irq_sim. Make struct irq_chip part of the irq_sim structure. Signed-off-by: Bartosz Golaszewski --- include/linux/irq_sim.h | 2 ++ kernel/irq/irq_sim.c | 12 +++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/irq_sim.h b/include/linux/irq_sim.h index 4500d453a63e..eda132c22b57 100644 --- a/include/linux/irq_sim.h +++ b/include/linux/irq_sim.h @@ -6,6 +6,7 @@ #ifndef _LINUX_IRQ_SIM_H #define _LINUX_IRQ_SIM_H +#include #include #include @@ -25,6 +26,7 @@ struct irq_sim_irq_ctx { }; struct irq_sim { + struct irq_chip chip; struct irq_sim_work_ctx work_ctx; int irq_base; unsigned int irq_count; diff --git a/kernel/irq/irq_sim.c b/kernel/irq/irq_sim.c index 98a20e1594ce..b732e4e2e45b 100644 --- a/kernel/irq/irq_sim.c +++ b/kernel/irq/irq_sim.c @@ -25,12 +25,6 @@ static void irq_sim_irqunmask(struct irq_data *data) irq_ctx->enabled = true; } -static struct irq_chip irq_sim_irqchip = { - .name = "irq_sim", - .irq_mask = irq_sim_irqmask, - .irq_unmask = irq_sim_irqunmask, -}; - static void irq_sim_handle_irq(struct irq_work *work) { struct irq_sim_work_ctx *work_ctx; @@ -74,6 +68,10 @@ int irq_sim_init(struct irq_sim *sim, unsigned int num_irqs) return sim->irq_base; } + sim->chip.name = "irq_sim"; + sim->chip.irq_mask = irq_sim_irqmask; + sim->chip.irq_unmask = irq_sim_irqunmask; + sim->work_ctx.pending = bitmap_zalloc(num_irqs, GFP_KERNEL); if (!sim->work_ctx.pending) { kfree(sim->irqs); @@ -84,7 +82,7 @@ int irq_sim_init(struct irq_sim *sim, unsigned int num_irqs) for (i = 0; i < num_irqs; i++) { sim->irqs[i].irqnum = sim->irq_base + i; sim->irqs[i].enabled = false; - irq_set_chip(sim->irq_base + i, &irq_sim_irqchip); + irq_set_chip(sim->irq_base + i, &sim->chip); irq_set_chip_data(sim->irq_base + i, &sim->irqs[i]); irq_set_handler(sim->irq_base + i, &handle_simple_irq); irq_modify_status(sim->irq_base + i,