From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85494435A86 for ; Fri, 21 Aug 2026 14:49:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787323780; cv=none; b=N1UbY49/Ua0dMs3P7m/bniRkbMPs2Ly2AU+k9vciNZ3z3xA7EU0m2tf6+es39ZzFa45RZQYkEClZ6+z+y7K9pEWsx76hM08RWGmg+54BiIXC6FsYAV3yc2h2uAJQfGgx5r+dCnaDfIurxzhu6SVrAIkSrgPxwUnxwu1yQ7843oM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787323780; c=relaxed/simple; bh=6L5kVE+vTKQwXdOCHRVW83aC5/PUKPa62/wRMYtqRm8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eDxPILhqYSnQrN7dZ8XDHvQ+4lTM2k+FIASqEgCCidcjhiEz8dlANWppQSSfMqQ6XK9Q7ML+o+Gy3faetGY3SsdFdP2j8YMZNGCd0hMGAib7va0ak2sRfnIFG799aBaXK5TNlV4RRXv850T2mDYFOgYmIkKEBTUPyYXAGafPtRM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=K2w6fljw; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="K2w6fljw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D94301F00A3A; Fri, 21 Aug 2026 14:49:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787323778; bh=B9gwuIIsygIJrUZgq+Dn0soMAJer0zRDs6KQTHVVriM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=K2w6fljwMUmSMT5oKsWJMw6QQpF7tIEv4nXc2KFoGjwMV50UFEPh4h2N3JGGOTNTE SpZDg6PrWYRPAkFPG8EEzeWnPLyEcuQvHE0Jze/8tITwSksXClVaMTxcinberCg9yt FDZHKazllIn7q771k3D+5pxgzQVn9TkuepBL6l41LvUQkfIrtMPwxQu3Ittzpk9nM+ 8KDFinVfi3UHooFEwYeNcOVwvJoIGU88uk5yZYc+uhJs9Au19m2kWH2EwnOLwB2umY 9ZMEtJCr+6yE0nb9yXgaQB/GV62Q/EQeBCmqmtPZGDkw18635s9Nx2n3HNXlFm2Ey2 hOKaqL3g8NuJA== From: Sasha Levin To: stable@vger.kernel.org Cc: Hugo Villeneuve , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 6.1.y 3/5] serial: sc16is7xx: rename EFR mutex with generic name Date: Fri, 21 Aug 2026 10:49:32 -0400 Message-ID: <20260821144934.3428649-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260821144934.3428649-1-sashal@kernel.org> References: <2026081755-unbaked-recycled-24ab@gregkh> <20260821144934.3428649-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Hugo Villeneuve [ Upstream commit d9b2d7ddbb973b981c20b21e9228581bb156f66f ] This mutex is used as a lock when accessing registers that share the same address space, not necessarily EFR registers. For example, address 0x06 is shared by MSR, TCR and XOFF1 registers, independently of EFR. Rename the mutex with a more generic name to avoid misinterpreting its usage. Signed-off-by: Hugo Villeneuve Link: https://patch.msgid.link/20251027142957.1032073-3-hugo@hugovil.com Signed-off-by: Greg Kroah-Hartman Stable-dep-of: 246ac114f485 ("serial: sc16is7xx: enable THRI before filling TX FIFO") Signed-off-by: Sasha Levin --- drivers/tty/serial/sc16is7xx.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 7067eb1a000df..ad2a4f19686ae 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -330,7 +330,7 @@ struct sc16is7xx_one_config { struct sc16is7xx_one { struct uart_port port; struct regmap *regmap; - struct mutex efr_lock; /* EFR registers access */ + struct mutex lock; /* For registers sharing same address space. */ struct kthread_work tx_work; struct kthread_work reg_work; struct kthread_delayed_work ms_work; @@ -437,7 +437,7 @@ static void sc16is7xx_efr_lock(struct uart_port *port) { struct sc16is7xx_one *one = to_sc16is7xx_one(port, port); - mutex_lock(&one->efr_lock); + mutex_lock(&one->lock); /* Backup content of LCR. */ one->old_lcr = sc16is7xx_port_read(port, SC16IS7XX_LCR_REG); @@ -459,7 +459,7 @@ static void sc16is7xx_efr_unlock(struct uart_port *port) /* Restore original content of LCR */ sc16is7xx_port_write(port, SC16IS7XX_LCR_REG, one->old_lcr); - mutex_unlock(&one->efr_lock); + mutex_unlock(&one->lock); } static void sc16is7xx_ier_clear(struct uart_port *port, u8 bit) @@ -594,7 +594,7 @@ static int sc16is7xx_set_baud(struct uart_port *port, int baud) prescaler == 1 ? 0 : SC16IS7XX_MCR_CLKSEL_BIT); - mutex_lock(&one->efr_lock); + mutex_lock(&one->lock); /* Backup LCR and access special register set (DLL/DLH) */ lcr = sc16is7xx_port_read(port, SC16IS7XX_LCR_REG); @@ -610,7 +610,7 @@ static int sc16is7xx_set_baud(struct uart_port *port, int baud) /* Restore LCR and access to general register set */ sc16is7xx_port_write(port, SC16IS7XX_LCR_REG, lcr); - mutex_unlock(&one->efr_lock); + mutex_unlock(&one->lock); return DIV_ROUND_CLOSEST((clk / prescaler) / 16, div); } @@ -768,7 +768,7 @@ static void sc16is7xx_update_mlines(struct sc16is7xx_one *one) unsigned long flags; unsigned int status, changed; - lockdep_assert_held_once(&one->efr_lock); + lockdep_assert_held_once(&one->lock); status = sc16is7xx_get_hwmctrl(port); changed = status ^ one->old_mctrl; @@ -799,7 +799,7 @@ static bool sc16is7xx_port_irq(struct sc16is7xx_port *s, int portno) struct uart_port *port = &s->p[portno].port; struct sc16is7xx_one *one = to_sc16is7xx_one(port, port); - mutex_lock(&one->efr_lock); + mutex_lock(&one->lock); iir = sc16is7xx_port_read(port, SC16IS7XX_IIR_REG); if (iir & SC16IS7XX_IIR_NO_INT_BIT) { @@ -846,7 +846,7 @@ static bool sc16is7xx_port_irq(struct sc16is7xx_port *s, int portno) } out_port_irq: - mutex_unlock(&one->efr_lock); + mutex_unlock(&one->lock); return rc; } @@ -878,9 +878,9 @@ static void sc16is7xx_tx_proc(struct kthread_work *ws) (port->rs485.delay_rts_before_send > 0)) msleep(port->rs485.delay_rts_before_send); - mutex_lock(&one->efr_lock); + mutex_lock(&one->lock); sc16is7xx_handle_tx(port); - mutex_unlock(&one->efr_lock); + mutex_unlock(&one->lock); } static void sc16is7xx_reconf_rs485(struct uart_port *port) @@ -947,9 +947,9 @@ static void sc16is7xx_ms_proc(struct kthread_work *ws) struct sc16is7xx_port *s = dev_get_drvdata(one->port.dev); if (one->port.state) { - mutex_lock(&one->efr_lock); + mutex_lock(&one->lock); sc16is7xx_update_mlines(one); - mutex_unlock(&one->efr_lock); + mutex_unlock(&one->lock); kthread_queue_delayed_work(&s->kworker, &one->ms_work, HZ); } @@ -1567,7 +1567,7 @@ static int sc16is7xx_probe(struct device *dev, s->p[i].old_mctrl = 0; s->p[i].regmap = regmaps[i]; - mutex_init(&s->p[i].efr_lock); + mutex_init(&s->p[i].lock); ret = uart_get_rs485_mode(&s->p[i].port); if (ret) -- 2.53.0