Commit 56676c4c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 74eca356 999dff3c

drivers/char/ipmi/Makefile

+4 −7
Original line number Diff line number Diff line
@@ -5,13 +5,10 @@ 


ipmi_si-y := ipmi_si_intf.o ipmi_kcs_sm.o ipmi_smic_sm.o ipmi_bt_sm.o \

	ipmi_si_hotmod.o ipmi_si_hardcode.o ipmi_si_platform.o \

	ipmi_si_port_io.o ipmi_si_mem_io.o

ifdef CONFIG_PCI

ipmi_si-y += ipmi_si_pci.o

endif

ifdef CONFIG_PARISC

ipmi_si-y += ipmi_si_parisc.o

endif

	ipmi_si_mem_io.o

ipmi_si-$(CONFIG_HAS_IOPORT) += ipmi_si_port_io.o

ipmi_si-$(CONFIG_PCI) += ipmi_si_pci.o

ipmi_si-$(CONFIG_PARISC) += ipmi_si_parisc.o



obj-$(CONFIG_IPMI_HANDLER) += ipmi_msghandler.o

obj-$(CONFIG_IPMI_DEVICE_INTERFACE) += ipmi_devintf.o

drivers/char/ipmi/bt-bmc.c

+2 −3
Original line number Diff line number Diff line
@@ -459,14 +459,13 @@ static int bt_bmc_probe(struct platform_device *pdev) 
	return 0;

}



static int bt_bmc_remove(struct platform_device *pdev)

static void bt_bmc_remove(struct platform_device *pdev)

{

	struct bt_bmc *bt_bmc = dev_get_drvdata(&pdev->dev);



	misc_deregister(&bt_bmc->miscdev);

	if (bt_bmc->irq < 0)

		del_timer_sync(&bt_bmc->poll_timer);

	return 0;

}



static const struct of_device_id bt_bmc_match[] = {
@@ -482,7 +481,7 @@ static struct platform_driver bt_bmc_driver = { 
		.of_match_table = bt_bmc_match,

	},

	.probe = bt_bmc_probe,

	.remove = bt_bmc_remove,

	.remove_new = bt_bmc_remove,

};



module_platform_driver(bt_bmc_driver);

drivers/char/ipmi/ipmi_msghandler.c

+14 −15
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 


static struct ipmi_recv_msg *ipmi_alloc_recv_msg(void);

static int ipmi_init_msghandler(void);

static void smi_recv_tasklet(struct tasklet_struct *t);

static void smi_recv_work(struct work_struct *t);

static void handle_new_recv_msgs(struct ipmi_smi *intf);

static void need_waiter(struct ipmi_smi *intf);

static int handle_one_recv_msg(struct ipmi_smi *intf,
@@ -498,13 +498,13 @@ struct ipmi_smi { 
	/*

	 * Messages queued for delivery.  If delivery fails (out of memory

	 * for instance), They will stay in here to be processed later in a

	 * periodic timer interrupt.  The tasklet is for handling received

	 * periodic timer interrupt.  The workqueue is for handling received

	 * messages directly from the handler.

	 */

	spinlock_t       waiting_rcv_msgs_lock;

	struct list_head waiting_rcv_msgs;

	atomic_t	 watchdog_pretimeouts_to_deliver;

	struct tasklet_struct recv_tasklet;

	struct work_struct recv_work;



	spinlock_t             xmit_msgs_lock;

	struct list_head       xmit_msgs;
@@ -704,7 +704,7 @@ static void clean_up_interface_data(struct ipmi_smi *intf) 
	struct cmd_rcvr  *rcvr, *rcvr2;

	struct list_head list;



	tasklet_kill(&intf->recv_tasklet);

	cancel_work_sync(&intf->recv_work);



	free_smi_msg_list(&intf->waiting_rcv_msgs);

	free_recv_msg_list(&intf->waiting_events);
@@ -1319,7 +1319,7 @@ static void free_user(struct kref *ref) 
{

	struct ipmi_user *user = container_of(ref, struct ipmi_user, refcount);



	/* SRCU cleanup must happen in task context. */

	/* SRCU cleanup must happen in workqueue context. */

	queue_work(remove_work_wq, &user->remove_work);

}
@@ -3605,8 +3605,7 @@ int ipmi_add_smi(struct module *owner, 
	intf->curr_seq = 0;

	spin_lock_init(&intf->waiting_rcv_msgs_lock);

	INIT_LIST_HEAD(&intf->waiting_rcv_msgs);

	tasklet_setup(&intf->recv_tasklet,

		     smi_recv_tasklet);

	INIT_WORK(&intf->recv_work, smi_recv_work);

	atomic_set(&intf->watchdog_pretimeouts_to_deliver, 0);

	spin_lock_init(&intf->xmit_msgs_lock);

	INIT_LIST_HEAD(&intf->xmit_msgs);
@@ -4779,7 +4778,7 @@ static void handle_new_recv_msgs(struct ipmi_smi *intf) 
			 * To preserve message order, quit if we

			 * can't handle a message.  Add the message

			 * back at the head, this is safe because this

			 * tasklet is the only thing that pulls the

			 * workqueue is the only thing that pulls the

			 * messages.

			 */

			list_add(&smi_msg->link, &intf->waiting_rcv_msgs);
@@ -4812,10 +4811,10 @@ static void handle_new_recv_msgs(struct ipmi_smi *intf) 
	}

}



static void smi_recv_tasklet(struct tasklet_struct *t)

static void smi_recv_work(struct work_struct *t)

{

	unsigned long flags = 0; /* keep us warning-free. */

	struct ipmi_smi *intf = from_tasklet(intf, t, recv_tasklet);

	struct ipmi_smi *intf = from_work(intf, t, recv_work);

	int run_to_completion = intf->run_to_completion;

	struct ipmi_smi_msg *newmsg = NULL;
@@ -4866,7 +4865,7 @@ void ipmi_smi_msg_received(struct ipmi_smi *intf, 


	/*

	 * To preserve message order, we keep a queue and deliver from

	 * a tasklet.

	 * a workqueue.

	 */

	if (!run_to_completion)

		spin_lock_irqsave(&intf->waiting_rcv_msgs_lock, flags);
@@ -4887,9 +4886,9 @@ void ipmi_smi_msg_received(struct ipmi_smi *intf, 
		spin_unlock_irqrestore(&intf->xmit_msgs_lock, flags);



	if (run_to_completion)

		smi_recv_tasklet(&intf->recv_tasklet);

		smi_recv_work(&intf->recv_work);

	else

		tasklet_schedule(&intf->recv_tasklet);

		queue_work(system_bh_wq, &intf->recv_work);

}

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



	atomic_set(&intf->watchdog_pretimeouts_to_deliver, 1);

	tasklet_schedule(&intf->recv_tasklet);

	queue_work(system_bh_wq, &intf->recv_work);

}

EXPORT_SYMBOL(ipmi_smi_watchdog_pretimeout);
@@ -5068,7 +5067,7 @@ static bool ipmi_timeout_handler(struct ipmi_smi *intf, 
				       flags);

	}



	tasklet_schedule(&intf->recv_tasklet);

	queue_work(system_bh_wq, &intf->recv_work);



	return need_timer;

}

drivers/char/ipmi/ipmi_powernv.c

+2 −4
Original line number Diff line number Diff line
@@ -281,15 +281,13 @@ static int ipmi_powernv_probe(struct platform_device *pdev) 
	return rc;

}



static int ipmi_powernv_remove(struct platform_device *pdev)

static void ipmi_powernv_remove(struct platform_device *pdev)

{

	struct ipmi_smi_powernv *smi = dev_get_drvdata(&pdev->dev);



	ipmi_unregister_smi(smi->intf);

	free_irq(smi->irq, smi);

	irq_dispose_mapping(smi->irq);



	return 0;

}



static const struct of_device_id ipmi_powernv_match[] = {
@@ -304,7 +302,7 @@ static struct platform_driver powernv_ipmi_driver = { 
		.of_match_table	= ipmi_powernv_match,

	},

	.probe	= ipmi_powernv_probe,

	.remove	= ipmi_powernv_remove,

	.remove_new = ipmi_powernv_remove,

};

drivers/char/ipmi/ipmi_si_intf.c

+2 −1
Original line number Diff line number Diff line
@@ -1882,7 +1882,8 @@ int ipmi_si_add_smi(struct si_sm_io *io) 
	}



	if (!io->io_setup) {

		if (io->addr_space == IPMI_IO_ADDR_SPACE) {

		if (IS_ENABLED(CONFIG_HAS_IOPORT) &&

		    io->addr_space == IPMI_IO_ADDR_SPACE) {

			io->io_setup = ipmi_si_port_setup;

		} else if (io->addr_space == IPMI_MEM_ADDR_SPACE) {

			io->io_setup = ipmi_si_mem_setup;