Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
forked fromtorvalds/linux

Commitd2149e1

Browse files
committed
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner: "Three fixes for irq chip drivers: - Make sure the allocations in the GIC-V3 ITS driver are large enough to accomodate the interrupt space - Fix a misplaced __iomem annotation which causes a splat of 26 sparse warnings - Remove an unused function in the IMX GPCV2 driver which causes build warnings"* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip/irq-imx-gpcv2: Remove unused function irqchip/gic-v3-its: Ensure nr_ites >= nr_lpis irqchip/gic-v3-its: Fix misplaced __iomem annotations
2 parents23fe85a +a2f9e65 commitd2149e1

File tree

2 files changed

+6
-21
lines changed

2 files changed

+6
-21
lines changed

‎drivers/irqchip/irq-gic-v3-its.c‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1412,7 +1412,7 @@ static struct irq_chip its_irq_chip = {
14121412
* This gives us (((1UL << id_bits) - 8192) >> 5) possible allocations.
14131413
*/
14141414
#defineIRQS_PER_CHUNK_SHIFT5
1415-
#defineIRQS_PER_CHUNK(1 << IRQS_PER_CHUNK_SHIFT)
1415+
#defineIRQS_PER_CHUNK(1UL << IRQS_PER_CHUNK_SHIFT)
14161416
#defineITS_MAX_LPI_NRBITS16/* 64K LPIs */
14171417

14181418
staticunsigned long*lpi_bitmap;
@@ -2119,11 +2119,10 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,
21192119

21202120
dev=kzalloc(sizeof(*dev),GFP_KERNEL);
21212121
/*
2122-
* At least one bit of EventID is being used, hence a minimum
2123-
* of two entries. No, the architecture doesn't let you
2124-
* express an ITT with a single entry.
2122+
* We allocate at least one chunk worth of LPIs bet device,
2123+
* and thus that many ITEs. The device may require less though.
21252124
*/
2126-
nr_ites=max(2UL,roundup_pow_of_two(nvecs));
2125+
nr_ites=max(IRQS_PER_CHUNK,roundup_pow_of_two(nvecs));
21272126
sz=nr_ites*its->ite_size;
21282127
sz=max(sz,ITS_ITT_ALIGN)+ITS_ITT_ALIGN-1;
21292128
itt=kzalloc(sz,GFP_KERNEL);
@@ -2495,7 +2494,7 @@ static int its_vpe_set_affinity(struct irq_data *d,
24952494

24962495
staticvoidits_vpe_schedule(structits_vpe*vpe)
24972496
{
2498-
void*__iomemvlpi_base=gic_data_rdist_vlpi_base();
2497+
void__iomem*vlpi_base=gic_data_rdist_vlpi_base();
24992498
u64val;
25002499

25012500
/* Schedule the VPE */
@@ -2527,7 +2526,7 @@ static void its_vpe_schedule(struct its_vpe *vpe)
25272526

25282527
staticvoidits_vpe_deschedule(structits_vpe*vpe)
25292528
{
2530-
void*__iomemvlpi_base=gic_data_rdist_vlpi_base();
2529+
void__iomem*vlpi_base=gic_data_rdist_vlpi_base();
25312530
u32count=1000000;/* 1s! */
25322531
boolclean;
25332532
u64val;

‎drivers/irqchip/irq-imx-gpcv2.c‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,6 @@ struct gpcv2_irqchip_data {
2828

2929
staticstructgpcv2_irqchip_data*imx_gpcv2_instance;
3030

31-
/*
32-
* Interface for the low level wakeup code.
33-
*/
34-
u32imx_gpcv2_get_wakeup_source(u32**sources)
35-
{
36-
if (!imx_gpcv2_instance)
37-
return0;
38-
39-
if (sources)
40-
*sources=imx_gpcv2_instance->wakeup_sources;
41-
42-
returnIMR_NUM;
43-
}
44-
4531
staticintgpcv2_wakeup_source_save(void)
4632
{
4733
structgpcv2_irqchip_data*cd;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp