Skip to content

Commit 56676c4

Browse files
torvaldstorvalds
committed
Merge tag 'for-linus-6.10-1' of https://github.com/cminyard/linux-ipmi
Pull ipmi updates from Corey Minyard: "Mostly updates for deprecated interfaces, platform.remove and converting from a tasklet to a BH workqueue. Also use HAS_IOPORT for disabling inb()/outb()" * tag 'for-linus-6.10-1' of https://github.com/cminyard/linux-ipmi: ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void ipmi: kcs_bmc_aspeed: Convert to platform remove callback returning void ipmi: ipmi_ssif: Convert to platform remove callback returning void ipmi: ipmi_si_platform: Convert to platform remove callback returning void ipmi: ipmi_powernv: Convert to platform remove callback returning void ipmi: bt-bmc: Convert to platform remove callback returning void char: ipmi: handle HAS_IOPORT dependencies ipmi: Convert from tasklet to BH workqueue
2 parents 74eca35 + 999dff3 commit 56676c4

File tree

10 files changed

+35
-45
lines changed

10 files changed

+35
-45
lines changed

‎drivers/char/ipmi/Makefile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@
55

66
ipmi_si-y := ipmi_si_intf.o ipmi_kcs_sm.o ipmi_smic_sm.o ipmi_bt_sm.o \
77
ipmi_si_hotmod.o ipmi_si_hardcode.o ipmi_si_platform.o \
8-
ipmi_si_port_io.o ipmi_si_mem_io.o
9-
ifdef CONFIG_PCI
10-
ipmi_si-y += ipmi_si_pci.o
11-
endif
12-
ifdef CONFIG_PARISC
13-
ipmi_si-y += ipmi_si_parisc.o
14-
endif
8+
ipmi_si_mem_io.o
9+
ipmi_si-$(CONFIG_HAS_IOPORT) += ipmi_si_port_io.o
10+
ipmi_si-$(CONFIG_PCI) += ipmi_si_pci.o
11+
ipmi_si-$(CONFIG_PARISC) += ipmi_si_parisc.o
1512

1613
obj-$(CONFIG_IPMI_HANDLER) += ipmi_msghandler.o
1714
obj-$(CONFIG_IPMI_DEVICE_INTERFACE) += ipmi_devintf.o

‎drivers/char/ipmi/bt-bmc.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -459,14 +459,13 @@ static int bt_bmc_probe(struct platform_device *pdev)
459459
return 0;
460460
}
461461

462-
static int bt_bmc_remove(struct platform_device *pdev)
462+
static void bt_bmc_remove(struct platform_device *pdev)
463463
{
464464
struct bt_bmc *bt_bmc = dev_get_drvdata(&pdev->dev);
465465

466466
misc_deregister(&bt_bmc->miscdev);
467467
if (bt_bmc->irq < 0)
468468
del_timer_sync(&bt_bmc->poll_timer);
469-
return 0;
470469
}
471470

472471
static const struct of_device_id bt_bmc_match[] = {
@@ -482,7 +481,7 @@ static struct platform_driver bt_bmc_driver = {
482481
.of_match_table = bt_bmc_match,
483482
},
484483
.probe = bt_bmc_probe,
485-
.remove = bt_bmc_remove,
484+
.remove_new = bt_bmc_remove,
486485
};
487486

488487
module_platform_driver(bt_bmc_driver);

‎drivers/char/ipmi/ipmi_msghandler.c

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
static struct ipmi_recv_msg *ipmi_alloc_recv_msg(void);
4343
static int ipmi_init_msghandler(void);
44-
static void smi_recv_tasklet(struct tasklet_struct *t);
44+
static void smi_recv_work(struct work_struct *t);
4545
static void handle_new_recv_msgs(struct ipmi_smi *intf);
4646
static void need_waiter(struct ipmi_smi *intf);
4747
static int handle_one_recv_msg(struct ipmi_smi *intf,
@@ -498,13 +498,13 @@ struct ipmi_smi {
498498
/*
499499
* Messages queued for delivery. If delivery fails (out of memory
500500
* for instance), They will stay in here to be processed later in a
501-
* periodic timer interrupt. The tasklet is for handling received
501+
* periodic timer interrupt. The workqueue is for handling received
502502
* messages directly from the handler.
503503
*/
504504
spinlock_t waiting_rcv_msgs_lock;
505505
struct list_head waiting_rcv_msgs;
506506
atomic_t watchdog_pretimeouts_to_deliver;
507-
struct tasklet_struct recv_tasklet;
507+
struct work_struct recv_work;
508508

509509
spinlock_t xmit_msgs_lock;
510510
struct list_head xmit_msgs;
@@ -704,7 +704,7 @@ static void clean_up_interface_data(struct ipmi_smi *intf)
704704
struct cmd_rcvr *rcvr, *rcvr2;
705705
struct list_head list;
706706

707-
tasklet_kill(&intf->recv_tasklet);
707+
cancel_work_sync(&intf->recv_work);
708708

709709
free_smi_msg_list(&intf->waiting_rcv_msgs);
710710
free_recv_msg_list(&intf->waiting_events);
@@ -1319,7 +1319,7 @@ static void free_user(struct kref *ref)
13191319
{
13201320
struct ipmi_user *user = container_of(ref, struct ipmi_user, refcount);
13211321

1322-
/* SRCU cleanup must happen in task context. */
1322+
/* SRCU cleanup must happen in workqueue context. */
13231323
queue_work(remove_work_wq, &user->remove_work);
13241324
}
13251325

@@ -3605,8 +3605,7 @@ int ipmi_add_smi(struct module *owner,
36053605
intf->curr_seq = 0;
36063606
spin_lock_init(&intf->waiting_rcv_msgs_lock);
36073607
INIT_LIST_HEAD(&intf->waiting_rcv_msgs);
3608-
tasklet_setup(&intf->recv_tasklet,
3609-
smi_recv_tasklet);
3608+
INIT_WORK(&intf->recv_work, smi_recv_work);
36103609
atomic_set(&intf->watchdog_pretimeouts_to_deliver, 0);
36113610
spin_lock_init(&intf->xmit_msgs_lock);
36123611
INIT_LIST_HEAD(&intf->xmit_msgs);
@@ -4779,7 +4778,7 @@ static void handle_new_recv_msgs(struct ipmi_smi *intf)
47794778
* To preserve message order, quit if we
47804779
* can't handle a message. Add the message
47814780
* back at the head, this is safe because this
4782-
* tasklet is the only thing that pulls the
4781+
* workqueue is the only thing that pulls the
47834782
* messages.
47844783
*/
47854784
list_add(&smi_msg->link, &intf->waiting_rcv_msgs);
@@ -4812,10 +4811,10 @@ static void handle_new_recv_msgs(struct ipmi_smi *intf)
48124811
}
48134812
}
48144813

4815-
static void smi_recv_tasklet(struct tasklet_struct *t)
4814+
static void smi_recv_work(struct work_struct *t)
48164815
{
48174816
unsigned long flags = 0; /* keep us warning-free. */
4818-
struct ipmi_smi *intf = from_tasklet(intf, t, recv_tasklet);
4817+
struct ipmi_smi *intf = from_work(intf, t, recv_work);
48194818
int run_to_completion = intf->run_to_completion;
48204819
struct ipmi_smi_msg *newmsg = NULL;
48214820

@@ -4866,7 +4865,7 @@ void ipmi_smi_msg_received(struct ipmi_smi *intf,
48664865

48674866
/*
48684867
* To preserve message order, we keep a queue and deliver from
4869-
* a tasklet.
4868+
* a workqueue.
48704869
*/
48714870
if (!run_to_completion)
48724871
spin_lock_irqsave(&intf->waiting_rcv_msgs_lock, flags);
@@ -4887,9 +4886,9 @@ void ipmi_smi_msg_received(struct ipmi_smi *intf,
48874886
spin_unlock_irqrestore(&intf->xmit_msgs_lock, flags);
48884887

48894888
if (run_to_completion)
4890-
smi_recv_tasklet(&intf->recv_tasklet);
4889+
smi_recv_work(&intf->recv_work);
48914890
else
4892-
tasklet_schedule(&intf->recv_tasklet);
4891+
queue_work(system_bh_wq, &intf->recv_work);
48934892
}
48944893
EXPORT_SYMBOL(ipmi_smi_msg_received);
48954894

@@ -4899,7 +4898,7 @@ void ipmi_smi_watchdog_pretimeout(struct ipmi_smi *intf)
48994898
return;
49004899

49014900
atomic_set(&intf->watchdog_pretimeouts_to_deliver, 1);
4902-
tasklet_schedule(&intf->recv_tasklet);
4901+
queue_work(system_bh_wq, &intf->recv_work);
49034902
}
49044903
EXPORT_SYMBOL(ipmi_smi_watchdog_pretimeout);
49054904

@@ -5068,7 +5067,7 @@ static bool ipmi_timeout_handler(struct ipmi_smi *intf,
50685067
flags);
50695068
}
50705069

5071-
tasklet_schedule(&intf->recv_tasklet);
5070+
queue_work(system_bh_wq, &intf->recv_work);
50725071

50735072
return need_timer;
50745073
}

‎drivers/char/ipmi/ipmi_powernv.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,15 +281,13 @@ static int ipmi_powernv_probe(struct platform_device *pdev)
281281
return rc;
282282
}
283283

284-
static int ipmi_powernv_remove(struct platform_device *pdev)
284+
static void ipmi_powernv_remove(struct platform_device *pdev)
285285
{
286286
struct ipmi_smi_powernv *smi = dev_get_drvdata(&pdev->dev);
287287

288288
ipmi_unregister_smi(smi->intf);
289289
free_irq(smi->irq, smi);
290290
irq_dispose_mapping(smi->irq);
291-
292-
return 0;
293291
}
294292

295293
static const struct of_device_id ipmi_powernv_match[] = {
@@ -304,7 +302,7 @@ static struct platform_driver powernv_ipmi_driver = {
304302
.of_match_table = ipmi_powernv_match,
305303
},
306304
.probe = ipmi_powernv_probe,
307-
.remove = ipmi_powernv_remove,
305+
.remove_new = ipmi_powernv_remove,
308306
};
309307

310308

‎drivers/char/ipmi/ipmi_si_intf.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1882,7 +1882,8 @@ int ipmi_si_add_smi(struct si_sm_io *io)
18821882
}
18831883

18841884
if (!io->io_setup) {
1885-
if (io->addr_space == IPMI_IO_ADDR_SPACE) {
1885+
if (IS_ENABLED(CONFIG_HAS_IOPORT) &&
1886+
io->addr_space == IPMI_IO_ADDR_SPACE) {
18861887
io->io_setup = ipmi_si_port_setup;
18871888
} else if (io->addr_space == IPMI_MEM_ADDR_SPACE) {
18881889
io->io_setup = ipmi_si_mem_setup;

‎drivers/char/ipmi/ipmi_si_pci.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ static int ipmi_pci_probe(struct pci_dev *pdev,
9797
}
9898

9999
if (pci_resource_flags(pdev, 0) & IORESOURCE_IO) {
100+
if (!IS_ENABLED(CONFIG_HAS_IOPORT))
101+
return -ENXIO;
102+
100103
io.addr_space = IPMI_IO_ADDR_SPACE;
101104
io.io_setup = ipmi_si_port_setup;
102105
} else {

‎drivers/char/ipmi/ipmi_si_platform.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -405,11 +405,9 @@ static int ipmi_probe(struct platform_device *pdev)
405405
return platform_ipmi_probe(pdev);
406406
}
407407

408-
static int ipmi_remove(struct platform_device *pdev)
408+
static void ipmi_remove(struct platform_device *pdev)
409409
{
410410
ipmi_si_remove_by_dev(&pdev->dev);
411-
412-
return 0;
413411
}
414412

415413
static int pdev_match_name(struct device *dev, const void *data)
@@ -447,7 +445,7 @@ struct platform_driver ipmi_platform_driver = {
447445
.acpi_match_table = ACPI_PTR(acpi_ipmi_match),
448446
},
449447
.probe = ipmi_probe,
450-
.remove = ipmi_remove,
448+
.remove_new = ipmi_remove,
451449
.id_table = si_plat_ids
452450
};
453451

‎drivers/char/ipmi/ipmi_ssif.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2071,15 +2071,14 @@ static int ssif_platform_probe(struct platform_device *dev)
20712071
return dmi_ipmi_probe(dev);
20722072
}
20732073

2074-
static int ssif_platform_remove(struct platform_device *dev)
2074+
static void ssif_platform_remove(struct platform_device *dev)
20752075
{
20762076
struct ssif_addr_info *addr_info = dev_get_drvdata(&dev->dev);
20772077

20782078
mutex_lock(&ssif_infos_mutex);
20792079
list_del(&addr_info->link);
20802080
kfree(addr_info);
20812081
mutex_unlock(&ssif_infos_mutex);
2082-
return 0;
20832082
}
20842083

20852084
static const struct platform_device_id ssif_plat_ids[] = {
@@ -2092,7 +2091,7 @@ static struct platform_driver ipmi_driver = {
20922091
.name = DEVICE_NAME,
20932092
},
20942093
.probe = ssif_platform_probe,
2095-
.remove = ssif_platform_remove,
2094+
.remove_new = ssif_platform_remove,
20962095
.id_table = ssif_plat_ids
20972096
};
20982097

‎drivers/char/ipmi/kcs_bmc_aspeed.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ static int aspeed_kcs_probe(struct platform_device *pdev)
641641
return 0;
642642
}
643643

644-
static int aspeed_kcs_remove(struct platform_device *pdev)
644+
static void aspeed_kcs_remove(struct platform_device *pdev)
645645
{
646646
struct aspeed_kcs_bmc *priv = platform_get_drvdata(pdev);
647647
struct kcs_bmc_device *kcs_bmc = &priv->kcs_bmc;
@@ -656,8 +656,6 @@ static int aspeed_kcs_remove(struct platform_device *pdev)
656656
priv->obe.remove = true;
657657
spin_unlock_irq(&priv->obe.lock);
658658
del_timer_sync(&priv->obe.timer);
659-
660-
return 0;
661659
}
662660

663661
static const struct of_device_id ast_kcs_bmc_match[] = {
@@ -674,7 +672,7 @@ static struct platform_driver ast_kcs_bmc_driver = {
674672
.of_match_table = ast_kcs_bmc_match,
675673
},
676674
.probe = aspeed_kcs_probe,
677-
.remove = aspeed_kcs_remove,
675+
.remove_new = aspeed_kcs_remove,
678676
};
679677
module_platform_driver(ast_kcs_bmc_driver);
680678

‎drivers/char/ipmi/kcs_bmc_npcm7xx.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ static int npcm7xx_kcs_probe(struct platform_device *pdev)
218218
return 0;
219219
}
220220

221-
static int npcm7xx_kcs_remove(struct platform_device *pdev)
221+
static void npcm7xx_kcs_remove(struct platform_device *pdev)
222222
{
223223
struct npcm7xx_kcs_bmc *priv = platform_get_drvdata(pdev);
224224
struct kcs_bmc_device *kcs_bmc = &priv->kcs_bmc;
@@ -227,8 +227,6 @@ static int npcm7xx_kcs_remove(struct platform_device *pdev)
227227

228228
npcm7xx_kcs_enable_channel(kcs_bmc, false);
229229
npcm7xx_kcs_irq_mask_update(kcs_bmc, (KCS_BMC_EVENT_TYPE_IBF | KCS_BMC_EVENT_TYPE_OBE), 0);
230-
231-
return 0;
232230
}
233231

234232
static const struct of_device_id npcm_kcs_bmc_match[] = {
@@ -243,7 +241,7 @@ static struct platform_driver npcm_kcs_bmc_driver = {
243241
.of_match_table = npcm_kcs_bmc_match,
244242
},
245243
.probe = npcm7xx_kcs_probe,
246-
.remove = npcm7xx_kcs_remove,
244+
.remove_new = npcm7xx_kcs_remove,
247245
};
248246
module_platform_driver(npcm_kcs_bmc_driver);
249247

0 commit comments

Comments
 (0)