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 D5E2C2F746D for ; Fri, 17 Jul 2026 19:55:22 +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=1784318124; cv=none; b=XR9OcisHbO+vE/PdWqwX6ZeU6oQm6bcrn3V4cZvwZ7vNjudby3sL2xSzNbB8lxQm7FZrSZqXeSDLb+aW8DPnt6GLz20LRwYt4faWW3nmhqtMy2bRW0zeD4hOhRiOGwVKAcrsiH4a8CEiLMrdt/IIcYlJToAkbx2mZoxLoRD37Vg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784318124; c=relaxed/simple; bh=jtktJD5XNe1B9tZh26AIV4tmldvLzlR4iiyAGre+qAE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lOzj5aYudJMrcWbps/G0s6ifgb3h1FzVEdRvyQBGXxStfk/3Sf18+4jho8xseKslNcqt7kknAqaVhxMe2+ymU81Al1C8h+vf/6C9O0kUmXSJuDI4KhGmhmeluvojV6ZscWa69IRohQy16+VT1x/d+25pt61n6WE5Hu5BWjBPaJE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mHMRKNZk; 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="mHMRKNZk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1AD9D1F000E9; Fri, 17 Jul 2026 19:55:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784318122; bh=QI6hVWAEj2XkIZfjLS3X725vcL4iGM3q/2xxl+iDuCc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mHMRKNZkUGuiNN4drwWZckGCV4bTvSrk+5HzA3/85aPMDTJqTAnNqJkwxmW7kzFHy xIoFEd4by6SBa4SwmLyiMz1bh8AcwSpl4ilsg01inHc+Hw8hZuEJiOl9ejHo3sDWTN ZFQmtN4ucqp2E0aKmuI6phsddxsCmEPfgBxJEbkTdEJ2YkmIPsE+ZbsNnzVZPOWeG7 8LHXUegk1K7o7LBv8rxxtHAda4oyEBhKkALyAxLLKjfJcZsqIa/J7BynObiuwGY4K1 zmh5C/L9WeYnE+VffTD39wZGz8uQ2q2XhmEIv9Ei4FybiN2EXK2gMD+lHWVzYzWckK HbOAuYJJf0wxg== From: Sasha Levin To: stable@vger.kernel.org Cc: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 6.6.y 1/2] serial: 8250_mid: Remove 8250_pci usage Date: Fri, 17 Jul 2026 15:55:19 -0400 Message-ID: <20260717195520.2195138-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026071458-expletive-shrubbery-16e0@gregkh> References: <2026071458-expletive-shrubbery-16e0@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Ilpo Järvinen [ Upstream commit a136abd7e7abe0f1247f8ffde6cc7c8ab09f985b ] 8250_mid uses FL_*BASE* from linux/8250_pci.h and nothing else. The code can be simplified by directly defining BARs within the driver instead. Signed-off-by: Ilpo Järvinen Link: https://lore.kernel.org/r/20230915094336.13278-1-ilpo.jarvinen@linux.intel.com Signed-off-by: Greg Kroah-Hartman Stable-dep-of: b1b4efea05a5 ("serial: 8250_mid: Disable DMA for selected platforms") Signed-off-by: Sasha Levin --- drivers/tty/serial/8250/8250_mid.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/tty/serial/8250/8250_mid.c b/drivers/tty/serial/8250/8250_mid.c index 2cc78a4bf7a19c..8ec03863606e4b 100644 --- a/drivers/tty/serial/8250/8250_mid.c +++ b/drivers/tty/serial/8250/8250_mid.c @@ -12,7 +12,6 @@ #include #include -#include #include "8250.h" @@ -32,9 +31,9 @@ struct mid8250; struct mid8250_board { - unsigned int flags; unsigned long freq; unsigned int base_baud; + unsigned int bar; int (*setup)(struct mid8250 *, struct uart_port *p); void (*exit)(struct mid8250 *); }; @@ -169,7 +168,6 @@ static int dnv_setup(struct mid8250 *mid, struct uart_port *p) { struct hsu_dma_chip *chip = &mid->dma_chip; struct pci_dev *pdev = to_pci_dev(p->dev); - unsigned int bar = FL_GET_BASE(mid->board->flags); int ret; pci_set_master(pdev); @@ -183,7 +181,7 @@ static int dnv_setup(struct mid8250 *mid, struct uart_port *p) chip->dev = &pdev->dev; chip->irq = pci_irq_vector(pdev, 0); chip->regs = p->membase; - chip->length = pci_resource_len(pdev, bar); + chip->length = pci_resource_len(pdev, mid->board->bar); chip->offset = DNV_DMA_CHAN_OFFSET; /* Falling back to PIO mode if DMA probing fails */ @@ -291,7 +289,6 @@ static int mid8250_probe(struct pci_dev *pdev, const struct pci_device_id *id) { struct uart_8250_port uart; struct mid8250 *mid; - unsigned int bar; int ret; ret = pcim_enable_device(pdev); @@ -303,7 +300,6 @@ static int mid8250_probe(struct pci_dev *pdev, const struct pci_device_id *id) return -ENOMEM; mid->board = (struct mid8250_board *)id->driver_data; - bar = FL_GET_BASE(mid->board->flags); memset(&uart, 0, sizeof(struct uart_8250_port)); @@ -316,8 +312,8 @@ static int mid8250_probe(struct pci_dev *pdev, const struct pci_device_id *id) uart.port.flags = UPF_SHARE_IRQ | UPF_FIXED_PORT | UPF_FIXED_TYPE; uart.port.set_termios = mid8250_set_termios; - uart.port.mapbase = pci_resource_start(pdev, bar); - uart.port.membase = pcim_iomap(pdev, bar, 0); + uart.port.mapbase = pci_resource_start(pdev, mid->board->bar); + uart.port.membase = pcim_iomap(pdev, mid->board->bar, 0); if (!uart.port.membase) return -ENOMEM; @@ -353,25 +349,25 @@ static void mid8250_remove(struct pci_dev *pdev) } static const struct mid8250_board pnw_board = { - .flags = FL_BASE0, .freq = 50000000, .base_baud = 115200, + .bar = 0, .setup = pnw_setup, .exit = pnw_exit, }; static const struct mid8250_board tng_board = { - .flags = FL_BASE0, .freq = 38400000, .base_baud = 1843200, + .bar = 0, .setup = tng_setup, .exit = tng_exit, }; static const struct mid8250_board dnv_board = { - .flags = FL_BASE1, .freq = 133333333, .base_baud = 115200, + .bar = 1, .setup = dnv_setup, .exit = dnv_exit, }; -- 2.53.0