From nobody Wed Nov 27 14:46:31 2024 Received: from mx08lb.world4you.com (mx08lb.world4you.com [81.19.149.118]) (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 C7230183CAA for ; Wed, 9 Oct 2024 20:30:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=81.19.149.118 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728505813; cv=none; b=pN9W9GZZPLcmKK0rnsrOoujejnkvTH+vUoFtP9E8iqdZDXx+1OWU6/Eu4aeh6Ou95FPqIv3zZ9t5YKcmwd0Da2/momZdychoFWAlgO5+vc+G9vMJMTKUrrnvFTmYyR2mmgm/LaNBAH6vdnIDNyck/8OfRTfRYioqjqsgoh8kV+s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728505813; c=relaxed/simple; bh=oBVp6xCJ46lhFLoKzzje44//wjdEV2iRH1V8pvZ1rV8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pYqsTyqprN/UnbMZkOteQLe79Szasq4I+o2cQ+HSgfFcHZ1oz1knQRs+coVwSRmxT838VYIhPmc71vFAsAcz7FpOLLsg3IO2WiupIl3TeB+KPCwsfkIyi5UmNySGEq2b2Q2QhvS2glvDVMRPKYPG+GjHPTCvoKRdi7X6lvdw3NY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com; spf=pass smtp.mailfrom=engleder-embedded.com; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b=xA6Spyj+; arc=none smtp.client-ip=81.19.149.118 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=engleder-embedded.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=engleder-embedded.com header.i=@engleder-embedded.com header.b="xA6Spyj+" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=engleder-embedded.com; s=dkim11; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=z5YHM9D01vA222n9g5hi9rEul/bQJQMaAl6cSatx4Xo=; b=xA6Spyj+q61DOH5jJ9Cjm2YyUD cdlJKJmOjIiT66qKSph5tIfC2r8uuhgMiAvd9zhYE7WB0YTBbgTKytSfwovfj4vL0JJyn/Pfyu0ef Wuy/KWIMOKOgKhrSsYHgjHuHxVi9mOBti1hQOqMG4eE12rBCdq5TSaMQ7iAdpSX5yeZQ=; Received: from 88-117-56-173.adsl.highway.telekom.at ([88.117.56.173] helo=hornet.engleder.at) by mx08lb.world4you.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1sydJw-000000002pc-1aOK; Wed, 09 Oct 2024 22:30:08 +0200 From: Gerhard Engleder To: linux-kernel@vger.kernel.org Cc: arnd@arndb.de, gregkh@linuxfoundation.org, Gerhard Engleder , Gerhard Engleder Subject: [PATCH 6/6] misc: keba: Add UART devices Date: Wed, 9 Oct 2024 22:29:49 +0200 Message-Id: <20241009202949.20164-7-gerhard@engleder-embedded.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20241009202949.20164-1-gerhard@engleder-embedded.com> References: <20241009202949.20164-1-gerhard@engleder-embedded.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-AV-Do-Run: Yes X-ACL-Warn: X-W4Y-Internal Content-Type: text/plain; charset="utf-8" From: Gerhard Engleder Add support for the UART auxiliary devices. This enables access to up to 3 different UARTs, which are implemented in the FPGA. Signed-off-by: Gerhard Engleder --- drivers/misc/keba/cp500.c | 104 ++++++++++++++++++++++++++++++++++++++ include/linux/misc/keba.h | 12 +++++ 2 files changed, 116 insertions(+) diff --git a/drivers/misc/keba/cp500.c b/drivers/misc/keba/cp500.c index afd4d7c06cee..255d3022dae8 100644 --- a/drivers/misc/keba/cp500.c +++ b/drivers/misc/keba/cp500.c @@ -46,6 +46,9 @@ =20 /* MSIX */ #define CP500_AXI_MSIX 3 +#define CP500_RFB_UART_MSIX 4 +#define CP500_DEBUG_UART_MSIX 5 +#define CP500_SI1_UART_MSIX 6 #define CP500_NUM_MSIX 8 #define CP500_NUM_MSIX_NO_MMI 2 #define CP500_NUM_MSIX_NO_AXI 3 @@ -75,6 +78,7 @@ struct cp500_dev_info { off_t offset; size_t size; + unsigned int msix; }; =20 struct cp500_devs { @@ -83,6 +87,9 @@ struct cp500_devs { struct cp500_dev_info i2c; struct cp500_dev_info fan; struct cp500_dev_info batt; + struct cp500_dev_info uart0_rfb; + struct cp500_dev_info uart1_dbg; + struct cp500_dev_info uart2_si1; }; =20 /* list of devices within FPGA of CP035 family (CP035, CP056, CP057) */ @@ -92,6 +99,8 @@ static struct cp500_devs cp035_devices =3D { .i2c =3D { 0x4000, SZ_4K }, .fan =3D { 0x9000, SZ_4K }, .batt =3D { 0xA000, SZ_4K }, + .uart0_rfb =3D { 0xB000, SZ_4K, CP500_RFB_UART_MSIX }, + .uart2_si1 =3D { 0xD000, SZ_4K, CP500_SI1_UART_MSIX }, }; =20 /* list of devices within FPGA of CP505 family (CP503, CP505, CP507) */ @@ -101,6 +110,8 @@ static struct cp500_devs cp505_devices =3D { .i2c =3D { 0x5000, SZ_4K }, .fan =3D { 0x9000, SZ_4K }, .batt =3D { 0xA000, SZ_4K }, + .uart0_rfb =3D { 0xB000, SZ_4K, CP500_RFB_UART_MSIX }, + .uart2_si1 =3D { 0xD000, SZ_4K, CP500_SI1_UART_MSIX }, }; =20 /* list of devices within FPGA of CP520 family (CP520, CP530) */ @@ -110,6 +121,8 @@ static struct cp500_devs cp520_devices =3D { .i2c =3D { 0x5000, SZ_4K }, .fan =3D { 0x8000, SZ_4K }, .batt =3D { 0x9000, SZ_4K }, + .uart0_rfb =3D { 0xC000, SZ_4K, CP500_RFB_UART_MSIX }, + .uart1_dbg =3D { 0xD000, SZ_4K, CP500_DEBUG_UART_MSIX }, }; =20 struct cp500_nvmem { @@ -135,6 +148,9 @@ struct cp500 { struct keba_i2c_auxdev *i2c; struct keba_fan_auxdev *fan; struct keba_batt_auxdev *batt; + struct keba_uart_auxdev *uart0_rfb; + struct keba_uart_auxdev *uart1_dbg; + struct keba_uart_auxdev *uart2_si1; =20 /* ECM EtherCAT BAR */ resource_size_t ecm_hwbase; @@ -510,6 +526,55 @@ static int cp500_register_batt(struct cp500 *cp500) return 0; } =20 +static void cp500_uart_release(struct device *dev) +{ + struct keba_uart_auxdev *uart =3D + container_of(dev, struct keba_uart_auxdev, auxdev.dev); + + kfree(uart); +} + +static int cp500_register_uart(struct cp500 *cp500, + struct keba_uart_auxdev **uart, const char *name, + struct cp500_dev_info *info, unsigned int irq) +{ + int ret; + + *uart =3D kzalloc(sizeof(**uart), GFP_KERNEL); + if (!*uart) + return -ENOMEM; + + (*uart)->auxdev.name =3D name; + (*uart)->auxdev.id =3D 0; + (*uart)->auxdev.dev.release =3D cp500_uart_release; + (*uart)->auxdev.dev.parent =3D &cp500->pci_dev->dev; + (*uart)->io =3D (struct resource) { + /* UART register area */ + .start =3D (resource_size_t) cp500->sys_hwbase + info->offset, + .end =3D (resource_size_t) cp500->sys_hwbase + info->offset + + info->size - 1, + .flags =3D IORESOURCE_MEM, + }; + (*uart)->irq =3D irq; + + ret =3D auxiliary_device_init(&(*uart)->auxdev); + if (ret) { + kfree(*uart); + *uart =3D NULL; + + return ret; + } + ret =3D __auxiliary_device_add(&(*uart)->auxdev, "keba"); + if (ret) { + auxiliary_device_uninit(&(*uart)->auxdev); + *uart =3D NULL; + + return ret; + } + + return 0; +} + static int cp500_nvmem_read(void *priv, unsigned int offset, void *val, size_t bytes) { @@ -668,6 +733,33 @@ static void cp500_register_auxiliary_devs(struct cp500= *cp500) dev_warn(dev, "Failed to register fan!\n"); if (cp500_register_batt(cp500)) dev_warn(dev, "Failed to register battery!\n"); + if (cp500->devs->uart0_rfb.size && + cp500->devs->uart0_rfb.msix < cp500->msix_num) { + int irq =3D pci_irq_vector(cp500->pci_dev, + cp500->devs->uart0_rfb.msix); + + if (cp500_register_uart(cp500, &cp500->uart0_rfb, "rs485-uart", + &cp500->devs->uart0_rfb, irq)) + dev_warn(dev, "Failed to register RFB UART!\n"); + } + if (cp500->devs->uart1_dbg.size && + cp500->devs->uart1_dbg.msix < cp500->msix_num) { + int irq =3D pci_irq_vector(cp500->pci_dev, + cp500->devs->uart1_dbg.msix); + + if (cp500_register_uart(cp500, &cp500->uart1_dbg, "rs232-uart", + &cp500->devs->uart1_dbg, irq)) + dev_warn(dev, "Failed to register debug UART!\n"); + } + if (cp500->devs->uart2_si1.size && + cp500->devs->uart2_si1.msix < cp500->msix_num) { + int irq =3D pci_irq_vector(cp500->pci_dev, + cp500->devs->uart2_si1.msix); + + if (cp500_register_uart(cp500, &cp500->uart2_si1, "uart", + &cp500->devs->uart2_si1, irq)) + dev_warn(dev, "Failed to register SI1 UART!\n"); + } } =20 static void cp500_unregister_dev(struct auxiliary_device *auxdev) @@ -694,6 +786,18 @@ static void cp500_unregister_auxiliary_devs(struct cp5= 00 *cp500) cp500_unregister_dev(&cp500->batt->auxdev); cp500->batt =3D NULL; } + if (cp500->uart0_rfb) { + cp500_unregister_dev(&cp500->uart0_rfb->auxdev); + cp500->uart0_rfb =3D NULL; + } + if (cp500->uart1_dbg) { + cp500_unregister_dev(&cp500->uart1_dbg->auxdev); + cp500->uart1_dbg =3D NULL; + } + if (cp500->uart2_si1) { + cp500_unregister_dev(&cp500->uart2_si1->auxdev); + cp500->uart2_si1 =3D NULL; + } } =20 static irqreturn_t cp500_axi_handler(int irq, void *dev) diff --git a/include/linux/misc/keba.h b/include/linux/misc/keba.h index ca52716f8437..a81d6fa70851 100644 --- a/include/linux/misc/keba.h +++ b/include/linux/misc/keba.h @@ -57,4 +57,16 @@ struct keba_batt_auxdev { struct resource io; }; =20 +/** + * struct keba_uart_auxdev - KEBA UART auxiliary device + * @auxdev: auxiliary device object + * @io: address range of UART controller IO memory + * @irq: number of UART controller interrupt + */ +struct keba_uart_auxdev { + struct auxiliary_device auxdev; + struct resource io; + unsigned int irq; +}; + #endif /* _LINUX_MISC_KEBA_H */ --=20 2.39.2