Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11568496 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

GHES: Carve out error queueing in a separate function 



Make the handler more readable.

No functionality change.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent b787f68c

drivers/acpi/apei/ghes.c

+29 −22
Original line number Diff line number Diff line
@@ -797,6 +797,32 @@ static void ghes_print_queued_estatus(void) 
	}

}



/* Save estatus for further processing in IRQ context */

static void __process_error(struct ghes *ghes)

{

#ifdef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG

	u32 len, node_len;

	struct ghes_estatus_node *estatus_node;

	struct acpi_hest_generic_status *estatus;



	if (ghes_estatus_cached(ghes->estatus))

		return;



	len = cper_estatus_len(ghes->estatus);

	node_len = GHES_ESTATUS_NODE_LEN(len);



	estatus_node = (void *)gen_pool_alloc(ghes_estatus_pool, node_len);

	if (!estatus_node)

		return;



	estatus_node->ghes = ghes;

	estatus_node->generic = ghes->generic;

	estatus = GHES_ESTATUS_FROM_NODE(estatus_node);

	memcpy(estatus, ghes->estatus, len);

	llist_add(&estatus_node->llnode, &ghes_estatus_llist);

#endif

}



static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs)

{

	struct ghes *ghes, *ghes_global = NULL;
@@ -832,32 +858,13 @@ static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs) 
	}



	list_for_each_entry_rcu(ghes, &ghes_nmi, list) {

#ifdef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG

		u32 len, node_len;

		struct ghes_estatus_node *estatus_node;

		struct acpi_hest_generic_status *estatus;

#endif

		if (!(ghes->flags & GHES_TO_CLEAR))

			continue;

#ifdef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG

		if (ghes_estatus_cached(ghes->estatus))

			goto next;

		/* Save estatus for further processing in IRQ context */

		len = cper_estatus_len(ghes->estatus);

		node_len = GHES_ESTATUS_NODE_LEN(len);

		estatus_node = (void *)gen_pool_alloc(ghes_estatus_pool,

						      node_len);

		if (estatus_node) {

			estatus_node->ghes = ghes;

			estatus_node->generic = ghes->generic;

			estatus = GHES_ESTATUS_FROM_NODE(estatus_node);

			memcpy(estatus, ghes->estatus, len);

			llist_add(&estatus_node->llnode, &ghes_estatus_llist);

		}

next:

#endif



		__process_error(ghes);

		ghes_clear_estatus(ghes);

	}



#ifdef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG

	irq_work_queue(&ghes_proc_irq_work);

#endif