Commit 4a13e559 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-ipmi', 'acpi-tables' and 'acpi-apei' 

Merge IMPI driver changes, ACPI tables parsing code changes and
additional APEI changes for v5.18-rc1:

 - Replace usage of found with dedicated list iterator variable
   in the ACPI IPMI driver (Jakob Koschel).

 - Make LAPIC_ADDR_OVR address readable in a message parsed during
   MADT parsing (Vasant Hegde).

 - Clean up variable name confusion in APEI (Jakob Koschel).

* acpi-ipmi:
  ACPI: IPMI: replace usage of found with dedicated list iterator variable

* acpi-tables:
  ACPI: tables: Make LAPIC_ADDR_OVR address readable in message

* acpi-apei:
  ACPI, APEI: Use the correct variable for sizeof()
parents f21a3509 26de0ab9 0b1be2c0 fa341650

drivers/acpi/acpi_ipmi.c

+18 −21
Original line number Diff line number Diff line
@@ -353,29 +353,27 @@ static void ipmi_flush_tx_msg(struct acpi_ipmi_device *ipmi) 
static void ipmi_cancel_tx_msg(struct acpi_ipmi_device *ipmi,

			       struct acpi_ipmi_msg *msg)

{

	struct acpi_ipmi_msg *tx_msg, *temp;

	bool msg_found = false;

	struct acpi_ipmi_msg *tx_msg = NULL, *iter, *temp;

	unsigned long flags;



	spin_lock_irqsave(&ipmi->tx_msg_lock, flags);

	list_for_each_entry_safe(tx_msg, temp, &ipmi->tx_msg_list, head) {

		if (msg == tx_msg) {

			msg_found = true;

			list_del(&tx_msg->head);

	list_for_each_entry_safe(iter, temp, &ipmi->tx_msg_list, head) {

		if (msg == iter) {

			tx_msg = iter;

			list_del(&iter->head);

			break;

		}

	}

	spin_unlock_irqrestore(&ipmi->tx_msg_lock, flags);



	if (msg_found)

	if (tx_msg)

		acpi_ipmi_msg_put(tx_msg);

}



static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data)

{

	struct acpi_ipmi_device *ipmi_device = user_msg_data;

	bool msg_found = false;

	struct acpi_ipmi_msg *tx_msg, *temp;

	struct acpi_ipmi_msg *tx_msg = NULL, *iter, *temp;

	struct device *dev = ipmi_device->dev;

	unsigned long flags;
@@ -387,16 +385,16 @@ static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data) 
	}



	spin_lock_irqsave(&ipmi_device->tx_msg_lock, flags);

	list_for_each_entry_safe(tx_msg, temp, &ipmi_device->tx_msg_list, head) {

		if (msg->msgid == tx_msg->tx_msgid) {

			msg_found = true;

			list_del(&tx_msg->head);

	list_for_each_entry_safe(iter, temp, &ipmi_device->tx_msg_list, head) {

		if (msg->msgid == iter->tx_msgid) {

			tx_msg = iter;

			list_del(&iter->head);

			break;

		}

	}

	spin_unlock_irqrestore(&ipmi_device->tx_msg_lock, flags);



	if (!msg_found) {

	if (!tx_msg) {

		dev_warn(dev,

			 "Unexpected response (msg id %ld) is returned.\n",

			 msg->msgid);
@@ -482,15 +480,14 @@ static void ipmi_register_bmc(int iface, struct device *dev) 


static void ipmi_bmc_gone(int iface)

{

	struct acpi_ipmi_device *ipmi_device, *temp;

	bool dev_found = false;

	struct acpi_ipmi_device *ipmi_device = NULL, *iter, *temp;



	mutex_lock(&driver_data.ipmi_lock);

	list_for_each_entry_safe(ipmi_device, temp,

	list_for_each_entry_safe(iter, temp,

				 &driver_data.ipmi_devices, head) {

		if (ipmi_device->ipmi_ifnum != iface) {

			dev_found = true;

			__ipmi_dev_kill(ipmi_device);

		if (iter->ipmi_ifnum != iface) {

			ipmi_device = iter;

			__ipmi_dev_kill(iter);

			break;

		}

	}
@@ -500,7 +497,7 @@ static void ipmi_bmc_gone(int iface) 
					struct acpi_ipmi_device, head);

	mutex_unlock(&driver_data.ipmi_lock);



	if (dev_found) {

	if (ipmi_device) {

		ipmi_flush_tx_msg(ipmi_device);

		acpi_ipmi_dev_put(ipmi_device);

	}

drivers/acpi/apei/apei-base.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int apei_res_add(struct list_head *res_list, 
	if (res_ins)

		list_add(&res_ins->list, res_list);

	else {

		res_ins = kmalloc(sizeof(*res), GFP_KERNEL);

		res_ins = kmalloc(sizeof(*res_ins), GFP_KERNEL);

		if (!res_ins)

			return -ENOMEM;

		res_ins->start = start;

drivers/acpi/tables.c

+2 −2
Original line number Diff line number Diff line
@@ -151,8 +151,8 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header) 
		{

			struct acpi_madt_local_apic_override *p =

			    (struct acpi_madt_local_apic_override *)header;

			pr_info("LAPIC_ADDR_OVR (address[%p])\n",

				(void *)(unsigned long)p->address);

			pr_info("LAPIC_ADDR_OVR (address[0x%llx])\n",

				p->address);

		}

		break;