From patchwork Mon Jun 23 10:12:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 899423 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 B19C41FE44A; Mon, 23 Jun 2025 10:12:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750673570; cv=none; b=Ksfgp0LQuCzJPkId8NXvhOIi6dRNhxr5bBLTgFaP/uuVbcS4E/ZlE75IfCqJmyHDRGyZEVJ448WOqlBu8owcHvBzvnObEXr9n5bKmtk6K0VcJSKgQNfUe2e/r2Pm4TQ63pK8oLnZYb13Xz8ydQSyd3uvygh19U+swPg1+rHKm5Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750673570; c=relaxed/simple; bh=hgfA/b06GuQR9iRfwkMjqHmGnydmJxYS9Q7Ri5B7ndY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=X1Y6gXpqmOPJhksE+0i5MdaxIaGFeWpebSCbK7orhwo51wATeQlNx5v4ZnBR3jhfWKxYM/wByzJ/jJJsND0sInrx30by02jBOeGNZPkps6tpMzHsJUBKJZS/X2VMPXE4YKKH6HvXocKM4WWw+PsHq8/pHwdNlhuoD2fRN23pHic= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pTLE45Pw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pTLE45Pw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 129E1C4CEF0; Mon, 23 Jun 2025 10:12:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750673570; bh=hgfA/b06GuQR9iRfwkMjqHmGnydmJxYS9Q7Ri5B7ndY=; h=From:To:Cc:Subject:Date:From; b=pTLE45Pwy/7Ih/VF0V81Zobp/miUcMfOC6jgVBNwrlkUOZyQ9GsRhgcV/r90zXQ5g wZtutyGP970xPoXjMfUssBBlvarwZkazUAeih6NkPGVCaiw60A2JN36r5Wh9gudwZU UNrg4Oa6aLbu7wiFpSVci7h9F0QwMEh3shxe3y5PnXWXKOZpdRG9j/6QiSBvve2frq mTCrqLm6nKgX+B/Gz282qB1FBZe/COHYsxzIXc3L0twUjQJ5TCzRffA/7xTUlL9KE4 l4zYVFwh/QljNNFmf+JjYWZwh+akLHO2M2zSczcyIfcF/kqzKSHGgtnFpZyfxaRWhO h1rm8mRDn25Cw== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , kernel test robot , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" Subject: [PATCH 1/2] serial: ce4100: fix build after serial_in/out() changes Date: Mon, 23 Jun 2025 12:12:45 +0200 Message-ID: <20250623101246.486866-1-jirislaby@kernel.org> X-Mailer: git-send-email 2.50.0 Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This x86_32 driver remain unnoticed, so after the commit below, the compilation now fails with: arch/x86/platform/ce4100/ce4100.c:107:16: error: incompatible function pointer types assigning to '...' from '...' To fix the error, convert also ce4100 to the new uart_port::serial_{in,out}() types. Signed-off-by: Jiri Slaby (SUSE) Fixes: fc9ceb501e38 ("serial: 8250: sanitize uart_port::serial_{in,out}() types") Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202506190552.TqNasrC3-lkp@intel.com/ Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.org Cc: "H. Peter Anvin" --- arch/x86/platform/ce4100/ce4100.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c index f8126821a94d..f19d20f0dfa4 100644 --- a/arch/x86/platform/ce4100/ce4100.c +++ b/arch/x86/platform/ce4100/ce4100.c @@ -49,9 +49,9 @@ static unsigned int mem_serial_in(struct uart_port *p, int offset) * errata number 9 in Errata - B step. */ -static unsigned int ce4100_mem_serial_in(struct uart_port *p, int offset) +static u32 ce4100_mem_serial_in(struct uart_port *p, unsigned int offset) { - unsigned int ret, ier, lsr; + u32 ret, ier, lsr; if (offset == UART_IIR) { offset = offset << p->regshift; @@ -73,7 +73,7 @@ static unsigned int ce4100_mem_serial_in(struct uart_port *p, int offset) return ret; } -static void ce4100_mem_serial_out(struct uart_port *p, int offset, int value) +static void ce4100_mem_serial_out(struct uart_port *p, unsigned int offset, u32 value) { offset = offset << p->regshift; writel(value, p->membase + offset); From patchwork Mon Jun 23 10:12:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 899676 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0356D23A9BE; Mon, 23 Jun 2025 10:12:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750673573; cv=none; b=HZIHwqfOQ7/ujo3MIu3VAsv6GqWUE3451/7mjjJWjIvgTzZ6GDXRTR1hqVxbDz7dzOmC4SlZVNo1A9SWkitg82XqnyS+ZDUzFJU38Nn6kbgg9YKHPIbfZvI1cH5gVGl+VPdoXIy46GmNVJbB+RZyYFortwxPUx0/alwBGhh8OrU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750673573; c=relaxed/simple; bh=EpFFplIt00ij91D3qC5Z0NcMfeDRE0WklzeKPrVl3gU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SHgz9qVnogJBfPtve3HkFWWVTGmYCTanqjsXeAzS2sqro1fKtytbJcA78/4TmmtCBLg5kMp0ZhGmWPYroYTRx1uaIndRU1ggXaj4vrk4gk7FLiTYinCfqacwrIu1sOPtoYLKcN2WbxlErTrjOarXDnQiQ3rXwAM8LUu6RmrY7jM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=u5x4JTW2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="u5x4JTW2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2A2AC4CEF2; Mon, 23 Jun 2025 10:12:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750673572; bh=EpFFplIt00ij91D3qC5Z0NcMfeDRE0WklzeKPrVl3gU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u5x4JTW2TeLdedqA7js41rhEFsB2zXXUvhcRBnrtHLlWf0G9YNUwbdBupXiFcZ/tZ xKX/BMGiheDK6VJjUTbmQv4shu1mRgxG6acqrYtF7V3tgRNj/1SvWVOAFSG83eoDbP MokfoP6fzR7cnBhqAxuM0rxaFaoVdEXXLK9h/gFHLXLZX0BZaYPlzZ+xLB5WMZEX7o FHyd2fctg+10B+XbtWU98I6uZs/KNEDr7kb/MA+VF/bnUfIvLcNNgP9+/BViQN7mPg /kPwILfeafyULLQl3YVrSxOZ93LFl9N95HWzEV0kCyOfqyl+7LQHKFZ3YqJ/0GJA4h zfWK+S1HyzBzg== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" Subject: [PATCH 2/2] serial: ce4100: clean up serial_in/out() hooks Date: Mon, 23 Jun 2025 12:12:46 +0200 Message-ID: <20250623101246.486866-2-jirislaby@kernel.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623101246.486866-1-jirislaby@kernel.org> References: <20250623101246.486866-1-jirislaby@kernel.org> Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 ce4100_mem_serial_in() unnecessarily contains 4 nested 'if's. That makes the code hard to follow. Invert the conditions and return early if the particular conditions do not hold. And use "<<=" for shifting the offset in both of the hooks. Signed-off-by: Jiri Slaby (SUSE) Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.org Cc: "H. Peter Anvin" --- arch/x86/platform/ce4100/ce4100.c | 39 +++++++++++++++++-------------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c index f19d20f0dfa4..08492bea9713 100644 --- a/arch/x86/platform/ce4100/ce4100.c +++ b/arch/x86/platform/ce4100/ce4100.c @@ -53,29 +53,32 @@ static u32 ce4100_mem_serial_in(struct uart_port *p, unsigned int offset) { u32 ret, ier, lsr; - if (offset == UART_IIR) { - offset = offset << p->regshift; - ret = readl(p->membase + offset); - if (ret & UART_IIR_NO_INT) { - /* see if the TX interrupt should have really set */ - ier = mem_serial_in(p, UART_IER); - /* see if the UART's XMIT interrupt is enabled */ - if (ier & UART_IER_THRI) { - lsr = mem_serial_in(p, UART_LSR); - /* now check to see if the UART should be - generating an interrupt (but isn't) */ - if (lsr & (UART_LSR_THRE | UART_LSR_TEMT)) - ret &= ~UART_IIR_NO_INT; - } - } - } else - ret = mem_serial_in(p, offset); + if (offset != UART_IIR) + return mem_serial_in(p, offset); + + offset <<= p->regshift; + + ret = readl(p->membase + offset); + if (!(ret & UART_IIR_NO_INT)) + return ret; + + /* see if the TX interrupt should have really set */ + ier = mem_serial_in(p, UART_IER); + /* see if the UART's XMIT interrupt is enabled */ + if (!(ier & UART_IER_THRI)) + return ret; + + lsr = mem_serial_in(p, UART_LSR); + /* now check to see if the UART should be generating an interrupt (but isn't) */ + if (lsr & (UART_LSR_THRE | UART_LSR_TEMT)) + ret &= ~UART_IIR_NO_INT; + return ret; } static void ce4100_mem_serial_out(struct uart_port *p, unsigned int offset, u32 value) { - offset = offset << p->regshift; + offset <<= p->regshift; writel(value, p->membase + offset); }