From nobody Thu Sep 25 17:48:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cXh5G670Cz68MMl; Thu, 25 Sep 2025 17:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cXh5G4q5Yz3nMG; Thu, 25 Sep 2025 17:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758822482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LvoxV7zAUBoQDaUD4YHA7Kfhzx99qZIN5QXQLySpmrw=; b=wKs4VEQX9V4v/Rdq59mYTp6W7mWYxkfg+NFNNBEzWXfnlL6BBw3zfvHpzCKiQRHL0z+UdP tBaTdiKsi58OGqG7PLiwscNX6wZtzPMhuxpMGRiBHfaLQiPvSbaCb0BBfQJqI4xYfu/n/D +Hjmhzr40Wl33Hzz87bJZBBzQeKy/9b6xSPAmi6TZ4HCuefpW+f4PyC6rrPnfn0FDnOTHk 51D0XyDN7cXAgOJcnutvVyxd9p2sU9AacOWNVNfhMR0es+doH9ybvq8U4nXq/cyplI2wnk lkHMtyV9wJ/7UMpBlYeh3vMMMthXts2QGN3yxVO2IKDRas+hxUmThpwYFiuJSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758822482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LvoxV7zAUBoQDaUD4YHA7Kfhzx99qZIN5QXQLySpmrw=; b=tBVgs6NRqAXeJ87Aj5Fm2vb6SAUAe+L/LysIexTIbnCCxiJ2v5k/06ncv652+T+Aeqb5xP 50/w/EaPr7M8q8GwUj6vf9SpSams6JQek189nmLe993oJfe//8TrWEFXStVJjXFsVjmLUJ 6ZxNTMtxQD4AFmWIujgg2NiN1pdnBahM/jgsuOwTzRT4KYIWaaVDwqCjSzJE/QnAC2qnqw pauJanHGiV9NBuCxeDNhZc+C8B/MzC6lhqUHks4Jhh5w60k8jvdXtSH7KZ4QjfVgN68Vbd rAJfTOrvsoQ/2paVWFKPba6y/pcTfESIp/ce54h/sX6twQjtnClEXC4F1q9vOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758822482; a=rsa-sha256; cv=none; b=g4DTyCCyvyyivPdwxGN4RVIG9z3zfwHIDe98dG+ifI0aizN78ViIohRN7TAs+ZiO9Tn7Pp MHDZf2rnWwOL9EdwIYUYzBRVZ4jGIHNSv71G+58yx5dlGayv6uTmbnWPANKix4SV0MlYB0 UipTADdH4B+fKEvDC2diUUpzcq+GPiuxhkZJ3b/P424bjz7Y3mt/pBKc612avXx/aeb4Sl Ymm8XvjmqtKkNLqwgigmCamrWbdChAdUpC+Q2iTw8ciJqM4A7JUkOm+WKZCSjNd+1tLjZw G7H9k+AsRTH0kcEzyZjToyZPKL4XVX3NGI10PzkoZ9uffbjOvNDUlCy+y5SgUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cXh5G4Hq2z1Qm1; Thu, 25 Sep 2025 17:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58PHm2fb073992; Thu, 25 Sep 2025 17:48:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58PHm2dR073989; Thu, 25 Sep 2025 17:48:02 GMT (envelope-from git) Date: Thu, 25 Sep 2025 17:48:02 GMT Message-Id: <202509251748.58PHm2dR073989@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: ace98a8fb8fe - main - rk_gpio: Enable gpio allocation via fdt List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ace98a8fb8fe18d47ccbb55619a9ffd4ac10f98c Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=ace98a8fb8fe18d47ccbb55619a9ffd4ac10f98c commit ace98a8fb8fe18d47ccbb55619a9ffd4ac10f98c Author: Evgenii Ivanov AuthorDate: 2025-09-25 17:15:08 +0000 Commit: Ahmad Khalifa CommitDate: 2025-09-25 17:28:37 +0000 rk_gpio: Enable gpio allocation via fdt The code is based on bcm2835_gpio.c. This enables allocating gpio interrupts via interrupts property in fdt. Reviewed by: vexeduxr MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D52513 --- sys/arm64/rockchip/rk_gpio.c | 98 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 80 insertions(+), 18 deletions(-) diff --git a/sys/arm64/rockchip/rk_gpio.c b/sys/arm64/rockchip/rk_gpio.c index 7358239a7c35..145d9769f35f 100644 --- a/sys/arm64/rockchip/rk_gpio.c +++ b/sys/arm64/rockchip/rk_gpio.c @@ -663,46 +663,108 @@ rk_gpio_get_node(device_t bus, device_t dev) } static int -rk_pic_map_intr(device_t dev, struct intr_map_data *data, - struct intr_irqsrc **isrcp) +rk_gpio_pic_map_fdt(struct rk_gpio_softc *sc, + struct intr_map_data_fdt *daf, + u_int *irqp, uint32_t *modep) { - struct rk_gpio_softc *sc = device_get_softc(dev); - struct intr_map_data_gpio *gdata; uint32_t irq; + uint32_t mode; - if (data->type != INTR_MAP_DATA_GPIO) { - device_printf(dev, "Wrong type\n"); - return (ENOTSUP); - } - gdata = (struct intr_map_data_gpio *)data; - irq = gdata->gpio_pin_num; + if (daf->ncells != 2) + return (EINVAL); + + irq = daf->cells[0]; + if (irq >= RK_GPIO_MAX_PINS) + return (EINVAL); + + /* Only reasonable modes are supported. */ + if (daf->cells[1] == 1) + mode = GPIO_INTR_EDGE_RISING; + else if (daf->cells[1] == 2) + mode = GPIO_INTR_EDGE_FALLING; + else if (daf->cells[1] == 3) + mode = GPIO_INTR_EDGE_BOTH; + else if (daf->cells[1] == 4) + mode = GPIO_INTR_LEVEL_HIGH; + else if (daf->cells[1] == 8) + mode = GPIO_INTR_LEVEL_LOW; + else + return (EINVAL); + + *irqp = irq; + if (modep != NULL) + *modep = mode; + return (0); +} + +static int +rk_gpio_pic_map_gpio(struct rk_gpio_softc *sc, + struct intr_map_data_gpio *dag, + u_int *irqp, uint32_t *modep) +{ + uint32_t irq; + irq = dag->gpio_pin_num; if (irq >= RK_GPIO_MAX_PINS) { - device_printf(dev, "Invalid interrupt %u\n", irq); + device_printf(sc->sc_dev, "Invalid interrupt %u\n", + irq); return (EINVAL); } - *isrcp = RK_GPIO_ISRC(sc, irq); + + *irqp = irq; + if (modep != NULL) + *modep = dag->gpio_intr_mode; return (0); } +static int +rk_gpio_pic_map(struct rk_gpio_softc *sc, struct intr_map_data *data, + u_int *irqp, uint32_t *modep) +{ + switch (data->type) { + case INTR_MAP_DATA_FDT: + return (rk_gpio_pic_map_fdt(sc, + (struct intr_map_data_fdt *)data, irqp, modep)); + case INTR_MAP_DATA_GPIO: + return (rk_gpio_pic_map_gpio(sc, + (struct intr_map_data_gpio *)data, irqp, modep)); + default: + device_printf(sc->sc_dev, "Wrong type\n"); + return (ENOTSUP); + } +} + +static int +rk_pic_map_intr(device_t dev, struct intr_map_data *data, + struct intr_irqsrc **isrcp) +{ + int error; + struct rk_gpio_softc *sc = device_get_softc(dev); + uint32_t irq; + + error = rk_gpio_pic_map(sc, data, &irq, NULL); + if (error == 0) + *isrcp = RK_GPIO_ISRC(sc, irq); + return (error); +} + static int rk_pic_setup_intr(device_t dev, struct intr_irqsrc *isrc, struct resource *res, struct intr_map_data *data) { struct rk_gpio_softc *sc = device_get_softc(dev); struct rk_pin_irqsrc *rkisrc = (struct rk_pin_irqsrc *)isrc; - struct intr_map_data_gpio *gdata; uint32_t mode; - uint8_t pin; + uint32_t pin; if (!data) { device_printf(dev, "No map data\n"); return (ENOTSUP); } - gdata = (struct intr_map_data_gpio *)data; - mode = gdata->gpio_intr_mode; - pin = gdata->gpio_pin_num; - if (rkisrc->irq != gdata->gpio_pin_num) { + if (rk_gpio_pic_map(sc, data, &pin, &mode) != 0) + return (EINVAL); + + if (rkisrc->irq != pin) { device_printf(dev, "Interrupts don't match\n"); return (EINVAL); }