From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755266AbdBNRuZ (ORCPT ); Tue, 14 Feb 2017 12:50:25 -0500 Received: from mail-cys01nam02on0075.outbound.protection.outlook.com ([104.47.37.75]:26048 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755217AbdBNRt7 (ORCPT ); Tue, 14 Feb 2017 12:49:59 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=David.Daney@cavium.com; From: David Daney To: Linus Walleij , Alexandre Courbot , Rob Herring , Mark Rutland , Marc Zyngier , Thomas Gleixner , linux-gpio@vger.kernel.org, devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org, David Daney Subject: [PATCH v3 3/6] irqdomain: Add irq_domain_{push,pop}_irq() functions. Date: Tue, 14 Feb 2017 09:49:33 -0800 Message-Id: <1487094576-229208-4-git-send-email-david.daney@cavium.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1487094576-229208-1-git-send-email-david.daney@cavium.com> References: <1487094576-229208-1-git-send-email-david.daney@cavium.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: SN1PR0701CA0033.namprd07.prod.outlook.com (10.162.96.43) To SN1PR0701MB1982.namprd07.prod.outlook.com (10.163.131.21) X-MS-Office365-Filtering-Correlation-Id: 313b1079-4214-4117-5995-08d45501dee5 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:SN1PR0701MB1982; X-Microsoft-Exchange-Diagnostics: 1;SN1PR0701MB1982;3:wZDed7qao7QY9vyWTroG5pjlVhxrfmpnvmAGXDKUgME76k4kA9y+82YisPDWExBKbbwSiGuRECsITybavdm/160WLf5qjsnba8MIDcvuhMb7NCYoWIfe7t2aHVq53qzJ0tvbRXLW7IYZ+rbPjG97ucWeFne8D3yb/uR6/EQM78GHN1rPiItvMDFXdc4NdCwN0IAXszGgFWBBUEkVkDglWfdbhaFVu11oViS2PrA7KetLSEjknRbaz7aBmckXoBkvOra1D+cOo5zAYnJ2nkobFw==;25:zeL5fctismQHuKGmj86k/bsGP3o0y65C1o2OL0BYx+r35Q27fbfxbnDWIfMsumtH84qC32bsopo0QxQN92EmBJocyhcc6ZwCqFM1o7c+blgzPD2aI2MyObwFvkY0a6ilhWmaKVmpRVDFtOgxzrZ0e/PjuA1frppCx867Z4YDPiDActulXTmuTDOJ9DDKtSkFXO36NrFiWJljWYELK6oueKzWShYvIg0AI0xlGUfJ8vsGvacviOmnWg6RBZWEmOzur/Pu/E38ZLOCwfmpDivZL3MttOx/jEVVSl10RrF/xa0zYp4I5LZ61KH5g17Gg7XCKVP77LaHbS0KdHkW98hQsOWj0+jZNy5t48pCtvAvvxgt/HXKOeo0oP0j4PGFZ7O1GewYAfGmpK1DOj923w56F/pW3544K4f3KZRpdXpyhuO2VQ/b5vtZjezCFVBjWVQSdeF0kRWusHRFj2bhTMI00A== X-Microsoft-Exchange-Diagnostics: 1;SN1PR0701MB1982;31:7Jkz/9o/FdoJVdedPDNCcqnskGH+k+ywKQBse5wRJt59qd2daS5HO3GT8ZN+CvZnRAwdywqgbfIzkoYMIS24kaCuJINMpMCuE4lkns/6Xlo1ISNFcUEXO08jH0SymXfVYfgTL6Abil52BkTfREOIqNbCXDg0o7+QQ8dqX/BJRAwr2/+A60IqDwOeicpox1AIqWNywkutX/aQ7eQL0HzR0KU3ApGwKnw1+0KS72OV/qsYiP06m9TrBvaiT2qOwjfI;20:tihtJeoM6QMNZdPjeOO0hdF7E8L2FIdwjVaNPbg/w2KCtJKOwA4USldChYPbW+tdD3a0ivbRmIlz7zT0DWPKjd7i4u57tnRiRaEjmBCn5M9PjsgiBR06ORJDlaEbg4MscTHbtogIjvw32Or4hhp10v+ukm+Uquwe5ojkhCN+MvSvYiIEaQM406qPW7IeBJ3wAik1OTHn8zgHeBUv1LfgkMVMOyMvIrFzrpCUmR4S0kDFXPxtmd9vY9iqEyluUHUyron2lDsc44yJy2WO0VXi92g+gyHtEC7BZbNR0JJ7N36niEwnJ4sNwksrOAfR5LmRQeljODhWGHCG+WxxUkDJ2TSY+x1EjkR9/77Esf6KL6I8AL+MA81LXgEWE7MPeHvra9r8Qvgkr8wqrD9lMKiVok3y2uT96UKipnDaBlJ0POB2GSDgvcWkAMPkXl26+kKI6bDSUqZNeyHLKb1aClx73PEJfc8/gX8vz2M/lxMAU2cOgguVDpXtxViyKzvgmSWT X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6041248)(20161123560025)(20161123558025)(20161123555025)(20161123564025)(20161123562025)(6072148);SRVR:SN1PR0701MB1982;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0701MB1982; X-Microsoft-Exchange-Diagnostics: 1;SN1PR0701MB1982;4:l3AECu9rbihciTX/YWLKW236fB40HDulng9dqsKaegEOpEX40En0+/PXvPl0GzL5FLBPDyYv2KwAySRPQIQ3k+0/tJMi9CayyvEkXZRDfAGKJW5JkyFQBK2YMQSvVonhI1PjqHnkNBqrsJYFZCtb/Ijs7bdDrrSRJkSAPJm3lcJMQc3LYroHi2AVt+SV7qbvx0Z+m22MOQaxz3cpNTNoniETM6XpzcpOWdm4VUwTqjj0JZejzLD0El+WuOBCd28Pdu0GfMC6zfAC48oGUdi4tefn+hcpGTVYsD2+pZHhlo0uA8mMfWSTMCDJDiX/0c2VaZUSbczkW5nnwSbrNi2xMG2qMIEWKQzK87K1ZfcFJYL9px8EqAhlqBwkXkO2CIGA+kdKCvgRIg+1SFoJZegDaK9D2lJJsGXQhMGeK/tGkGH38HlqwuRfGhglZLpOoQUxU+pIMtUkd9AHEkaSpCrgr7KXy34vKMWpScZy7fu9yLDGi8JkaTdZox9wNy1ETcbiRMwkg3mkahcqI41uBldps9oWMghBmuqBkvi34g4hSQFHyUAxWU4Hp9+5kIwQGNCrCgmyDnKJqB26bsidJ4KLfWyz0WjejEFPOebWVs3FLdo= X-Forefront-PRVS: 0218A015FA X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(39450400003)(199003)(189002)(5003940100001)(36756003)(81003)(53416004)(53936002)(105586002)(305945005)(5660300001)(6116002)(47776003)(38730400002)(107886003)(66066001)(42186005)(7736002)(6512007)(3846002)(189998001)(4326007)(2950100002)(106356001)(76506005)(6666003)(50466002)(92566002)(76176999)(6486002)(50986999)(25786008)(4720700003)(33646002)(81166006)(81156014)(101416001)(68736007)(97736004)(48376002)(8676002)(86362001)(50226002)(2906002)(6506006)(69596002)(142933001);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR0701MB1982;H:localhost.caveonetworks.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR0701MB1982;23:1qFsU4qTyTfBW2h2cCm8W9wUKWYeMOkMsSnl+yn?= =?us-ascii?Q?yCBljll1BjR01BPUTeiN3uFTjCx/q2PK0iRY51adw2iTJKaSTut6F/TsYT2/?= =?us-ascii?Q?rGXbUxxKJtHl56MO/nLkvvbqncPn/d1KQAZM5vrjt1vi7rSnxnYPLku78IHY?= =?us-ascii?Q?QUtZR71o1OwH/83GQoXH6RLMwY9nAA3LHtd7UrEZUthgzJXgnYuLcFC+Yrc9?= =?us-ascii?Q?5Z4DJTCPQwOWqTTLtDlz1VFx79R4O+sLS88/3j1EInhNx+V1J6syrzScd6ul?= =?us-ascii?Q?iV3DKiqOVi30pNQ+9TB0/dtv4PUiFuGn51tanZD5ah6fkZqtF29gZ6687h7x?= =?us-ascii?Q?Of+zygjGXvTdI7IyOxk/+A+JSrSqQz7sKLcucsHu8yrgGJp8WWdc5lEdFrak?= =?us-ascii?Q?GL1B9EKlR9HKF4CfwfvYVXg63tOB7V7PBTzgPJXVq17giFouETic4pdQQNCh?= =?us-ascii?Q?6NIRr+ppmH6ORiKDV0imSH9GWNJVj7Z5wq5BTkTXlflGgEGGGPkxaatLRq5z?= =?us-ascii?Q?763R9v3ashjNqJ1Y+VKP4zoxMLB1jPUXJ5D9hvmTo/m0SP1smUSO9InqSUXm?= =?us-ascii?Q?PqiULDtj+dN3BpnYA4ekFNS88MDpOM8yHMkglVD3M3L105vKWionRspdrOHZ?= =?us-ascii?Q?pFciBNJwALBCLjWNwIrg9UBl/WFYcunS+oKwsfpxNJ1S2k6CELa5uLYTQXSP?= =?us-ascii?Q?IyY7JEzdRQ0/38Qwob4EWj6zwjYOAJ3ZKXHX+Z6q9ve0it0CCDVZYAZ0SA/s?= =?us-ascii?Q?m0B0+UBOGjo+a2Vbb86aPjtWsYb826fYSLhYFmfQgwr64RX974dUfe37lqs3?= =?us-ascii?Q?eYU7FYeHS3bLcHl6uIZCMyq72V9aoTjyGrk8j4owCj9chFs0mCOQigw9OpW5?= =?us-ascii?Q?Hz6065/hFaLaZgteYR3kNNDDa9PsT5XdK8AcHctKaffjCxwZ4kE2RPCTxaOS?= =?us-ascii?Q?RiFuwKOpO+UMiPIHinpMSkf0EFhaEBUu57lAG8ln4XznzzgKYGPXj0fW7ydK?= =?us-ascii?Q?QWKPodny+P3uBsxoaUCl2F1NgR0TS15QVuWOtfAC1w6eFnnof1KKBOhK3wO7?= =?us-ascii?Q?mxtyaWxyIkNMj4L0LdppyVF0Qys+6l/6hLngiwKtSkyIXOgq436FzyydA32a?= =?us-ascii?Q?4bdsd/eEM0m1jD2pi7inmmmo/sHthUrvg3Pice9mJ4+NubPkS8LhRaLvigIq?= =?us-ascii?Q?pruG6fyNHOv00MBtlsXlt8upz5ypoZzF6XxAEYYjh9aA93bVEuTRJtCneLg?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR0701MB1982;6:I2ekxgt7mgQZIXTRdPjTxDb3JVvmdqZAmxk98OgyJ4PgTJX3ZfcCTZI9dteRL/DB6K1qi6j5AIquZ56ux5aiIrjlHjlDKQCVnB1rlHVNEz7IzN/KSamqG44qebdhm8g2uT0vBK6A8PsDtzRC4Kk3vNrvPiFmcf0V0pvB9OUxdoJ9B88jcu4sqN3+1RVdOoQipcOKQ7UTfJgedDLML+vTKurA24cSWjW8XdrHbXxQSEm/j+RvJhiTzeXXDmxOxHg8swy8d7pleaR4krDP0QF+j29hCHcIZg1L+vFRXojnRQbZOqgyyNP2PKgP/B5Cpm7+0jPiETjt5IzQmhDG2g6J+Q2UnsMTW0h446KQN3Pa8XuVzdVTx2sMGRVNjF/qD0d0J6OeQ/CcZsONNc8dJqZsPw==;5:Ot0hYyFqV/TdvLDpSQ4yDG+5818vxTiDXcxHPLL/m89PuxTyBY2qWCKXnlQXn5Y/iCRZhdlqjkbLE4Yy3I1bFTuzQrSrcceO9d9/yaE9xIpHPnkZnfcNQrJUsB1sR8sIP9nClENM6L0pd+4Ap84WPBAkLz5rfNK09ZV3FoEK6vE=;24:SKVTlxrQEHszVN+T98/B57HPkXyOUkSbDXJXG54KfY0yyr/hSxTgRg3KQH5JybYGMIdgSWzsl5i7RI/Q3hKxvU8X6EjPKmXQ9Ewa6lI2T3Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;SN1PR0701MB1982;7:cMEhYQcIJNtjGGON54MvfItGEVJuVOS8Ug8Lt438DmZz7aed5Y6B/p5RYtQzHpJyOM8G0D1e9eM9u0BOgsuKbiJoBBEr4iTWW1LwdEwgp5Sb6tVKawQDTQPinrgQloTsXvY2j81QezJ5UDxD0sAw/fzNasIgbZR4QQApLcZnwTP7qPUAF+hKpfv4143510YPSasCqEpVkWF3yrqhFet2+Val9Wt4CtyHdJFJ3DgJEQDLrnKDjwbM0NUunE9JVIeDNX5/0dkfnv6ctt13VLwdlySbc9J2dTeacSKaK95odoRTWUOAekEXBs+p1bnGV5y7w4p+IUGQT6o8JFd8IqciSTOi42Elwxtggn66EfsdQ2HFgdLHu8vJGcZVnP/CP3489HzlET1sWwSD5XcTajr6YbmXMUS93wmTk5qihmA4RKKE1tzArcaPQIc5J6MUVBHMk9rbSw2IXX/JOYI9cHR1DqL8bUgpACkgwBELa7P6Pfhn7x4dwoJcR7YMOgYdpY1xlH7eWIMMEa/wwfqxGFKJQg== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2017 17:49:48.3708 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0701MB1982 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For an already existing irqdomain hierarchy, as might be obtained via a call to pci_enable_msix(), a PCI driver wishing to add an additional irqdomain to the hierarchy needs to be able to insert the irqdomain to that already initialized hierarchy. Calling irq_domain_create_hierarchy() allows the new irqdomain to be created, but no existing code allows for initializing the associated irq_data. Add a couple of helper functions (irq_domain_push_irq() irq_domain_pop_irq()) to initialize the irq_data for the new irqdomain. Signed-off-by: David Daney --- include/linux/irqdomain.h | 3 + kernel/irq/irqdomain.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index ffb8460..d8e60d1 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@ -418,6 +418,9 @@ extern void irq_domain_free_irqs_common(struct irq_domain *domain, extern void irq_domain_free_irqs_top(struct irq_domain *domain, unsigned int virq, unsigned int nr_irqs); +extern int irq_domain_push_irq(struct irq_domain *domain, int virq, void *arg); +extern int irq_domain_pop_irq(struct irq_domain *domain, int virq); + extern int irq_domain_alloc_irqs_parent(struct irq_domain *domain, unsigned int irq_base, unsigned int nr_irqs, void *arg); diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index b59e676..5266251 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -1279,6 +1279,143 @@ int __irq_domain_alloc_irqs(struct irq_domain *domain, int irq_base, return ret; } +/* The irq_data was moved, fix the revmap to refer to the new location */ +static void irq_domain_fix_revmap(struct irq_data *d) +{ + void **slot; + + if (d->hwirq < d->domain->revmap_size) + return; /* Not using radix tree. */ + + /* Fix up the revmap. */ + mutex_lock(&revmap_trees_mutex); + slot = radix_tree_lookup_slot(&d->domain->revmap_tree, d->hwirq); + if (slot) + radix_tree_replace_slot(&d->domain->revmap_tree, slot, d); + mutex_unlock(&revmap_trees_mutex); +} + +/** + * irq_domain_push_irq() - Push a domain in to the top of a hierarchy. + * @domain: Domain to push. + * @virq: Irq to push the domain in to. + * @arg: Passed to the irq_domain_ops alloc() function. + * + * For an already existing irqdomain hierarchy, as might be obtained + * via a call to pci_enable_msix(), add an additional domain to the + * head of the processing chain. + */ +int irq_domain_push_irq(struct irq_domain *domain, int virq, void *arg) +{ + struct irq_data *child_irq_data; + struct irq_data *root_irq_data = irq_get_irq_data(virq); + + if (domain == NULL) + return -EINVAL; + + if (WARN_ON(!domain->ops->alloc)) + return -ENOSYS; + + if (!root_irq_data) + return -EINVAL; + + child_irq_data = kzalloc_node(sizeof(*child_irq_data), GFP_KERNEL, + irq_data_get_node(root_irq_data)); + if (!child_irq_data) + return -ENOMEM; + + mutex_lock(&irq_domain_mutex); + + /* Copy the original irq_data. */ + *child_irq_data = *root_irq_data; + + irq_domain_fix_revmap(child_irq_data); + + /* + * Overwrite the root_irq_data, which is embedded in struct + * irq_desc, with values for this domain. + */ + root_irq_data->parent_data = child_irq_data; + root_irq_data->domain = domain; + root_irq_data->mask = 0; + root_irq_data->hwirq = 0; + root_irq_data->chip = NULL; + root_irq_data->chip_data = NULL; + domain->ops->alloc(domain, virq, 1, arg); + + if (root_irq_data->hwirq < domain->revmap_size) { + domain->linear_revmap[root_irq_data->hwirq] = virq; + } else { + mutex_lock(&revmap_trees_mutex); + radix_tree_insert(&domain->revmap_tree, + root_irq_data->hwirq, root_irq_data); + mutex_unlock(&revmap_trees_mutex); + } + + mutex_unlock(&irq_domain_mutex); + + return 0; +} +EXPORT_SYMBOL_GPL(irq_domain_push_irq); + +/** + * irq_domain_pop_irq() - Remove a domain from the top of a hierarchy. + * @domain: Domain to remove. + * @virq: Irq to remove the domain from. + * + * Undo the effects of a call to irq_domain_push_irq(). + */ +int irq_domain_pop_irq(struct irq_domain *domain, int virq) +{ + struct irq_data *root_irq_data = irq_get_irq_data(virq); + struct irq_data *child_irq_data; + struct irq_data *tmp_irq_data; + + if (domain == NULL) + return -EINVAL; + + if (!root_irq_data) + return -EINVAL; + + tmp_irq_data = irq_domain_get_irq_data(domain, virq); + + /* We can only "pop" if this domain is at the top of the list */ + if (WARN_ON(root_irq_data != tmp_irq_data)) + return -ENOSYS; + + if (WARN_ON(root_irq_data->domain != domain)) + return -ENOSYS; + + child_irq_data = root_irq_data->parent_data; + if (WARN_ON(!child_irq_data)) + return -ENOSYS; + + mutex_lock(&irq_domain_mutex); + + root_irq_data->parent_data = NULL; + + if (root_irq_data->hwirq >= domain->revmap_size) { + mutex_lock(&revmap_trees_mutex); + radix_tree_delete(&domain->revmap_tree, root_irq_data->hwirq); + mutex_unlock(&revmap_trees_mutex); + } + + if (domain->ops->free) + domain->ops->free(domain, virq, 1); + + /* Restore the original irq_data. */ + *root_irq_data = *child_irq_data; + + irq_domain_fix_revmap(root_irq_data); + + mutex_unlock(&irq_domain_mutex); + + kfree(child_irq_data); + + return 0; +} +EXPORT_SYMBOL_GPL(irq_domain_pop_irq); + /** * irq_domain_free_irqs - Free IRQ number and associated data structures * @virq: base IRQ number -- 1.8.3.1