github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 04:23:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

serial: 8250: use hashtable

Browse Source 
Instead of open-coding the hash table, use the one provided by
hashtable.h. The semantics is the same, except the code needs not to
compute the hash bucket on its own.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20250611100319.186924-33-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby (SUSE) 2025-06-11 12:03:18 +02:00 committed by Greg Kroah-Hartman
parent 6529c88f6b
commit 0a6fb2dc93
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/tty/serial/8250/8250_core.c
View File

@ -13,6 +13,7 @@
*/ */
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/hashtable.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/ioport.h> #include <linux/ioport.h>
@ -47,8 +48,8 @@ struct irq_info {
struct list_head *head; struct list_head *head;
}; };
#define NR_IRQ_HASH 32 /* Can be adjusted later */ #define IRQ_HASH_BITS 5 /* Can be adjusted later */
static struct hlist_head irq_lists[NR_IRQ_HASH]; static DEFINE_HASHTABLE(irq_lists, IRQ_HASH_BITS);
static DEFINE_MUTEX(hash_mutex); /* Used to walk the hash */ static DEFINE_MUTEX(hash_mutex); /* Used to walk the hash */
/* /*
@ -75,11 +76,8 @@ static irqreturn_t serial8250_interrupt(int irq, void *dev_id)
l = i->head; l = i->head;
do { do {
struct uart_8250_port *up; struct uart_8250_port *up = list_entry(l, struct uart_8250_port, list);
struct uart_port *port; struct uart_port *port = &up->port;
up = list_entry(l, struct uart_8250_port, list);
port = &up->port;
if (port->handle_irq(port)) { if (port->handle_irq(port)) {
handled = 1; handled = 1;
@ -132,14 +130,11 @@ static void serial_do_unlink(struct irq_info *i, struct uart_8250_port *up)
*/ */
static struct irq_info *serial_get_or_create_irq_info(const struct uart_8250_port *up) static struct irq_info *serial_get_or_create_irq_info(const struct uart_8250_port *up)
{ {
struct hlist_head *h;
struct irq_info *i; struct irq_info *i;
mutex_lock(&hash_mutex); mutex_lock(&hash_mutex);
h = &irq_lists[up->port.irq % NR_IRQ_HASH]; hash_for_each_possible(irq_lists, i, node, up->port.irq)
hlist_for_each_entry(i, h, node)
if (i->irq == up->port.irq) if (i->irq == up->port.irq)
goto unlock; goto unlock;
@ -150,7 +145,7 @@ static struct irq_info *serial_get_or_create_irq_info(const struct uart_8250_por
} }
spin_lock_init(&i->lock); spin_lock_init(&i->lock);
i->irq = up->port.irq; i->irq = up->port.irq;
hlist_add_head(&i->node, h); hash_add(irq_lists, &i->node, i->irq);
unlock: unlock:
mutex_unlock(&hash_mutex); mutex_unlock(&hash_mutex);
@ -189,13 +184,10 @@ static int serial_link_irq_chain(struct uart_8250_port *up)
static void serial_unlink_irq_chain(struct uart_8250_port *up) static void serial_unlink_irq_chain(struct uart_8250_port *up)
{ {
struct irq_info *i; struct irq_info *i;
struct hlist_head *h;
mutex_lock(&hash_mutex); mutex_lock(&hash_mutex);
h = &irq_lists[up->port.irq % NR_IRQ_HASH]; hash_for_each_possible(irq_lists, i, node, up->port.irq)
hlist_for_each_entry(i, h, node)
if (i->irq == up->port.irq) if (i->irq == up->port.irq)
break; break;