From nobody Wed Oct 1 09:39:00 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 4cc8yF13Z9z69GRc; Wed, 01 Oct 2025 09:39:01 +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 4cc8yD5yFFz3HFw; Wed, 01 Oct 2025 09:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759311540; 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=5fFrEDv3McEBrYviM1wQAjQLeSx7726Rs7Y5na+M6/A=; b=Ugne8TmgXYblFlF0iqZJQEGXb8N9SISr59z8IhS0yXbR4HOEP5JyM9orJsyw8a3YjgmrDa aiiHiwSCMe04d70Ib09N9dNxUAtnPWPLKCgJluiXAAE/O/WxURm5NWTTt5FsvsUO0P54tH 0bOTgFAQGkFDSgujJtS7BWjdB+DW7a7tSzEisSVUoceguX5XX0X6RFPO1cjLSa56gzUSff YFmZ0eDvXrgCrFqwS+svMN/sfylNI2mJElHRkpc22Rt8UO4ZYFTjuSKYrSyiMEJnBsk87u G+EKnHsSDJ6am5ihv4deB7NY6IU3npGBfmOYONZqRQTPtG5fEKhU5wn8db4tNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759311540; 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=5fFrEDv3McEBrYviM1wQAjQLeSx7726Rs7Y5na+M6/A=; b=CgQdq6+PADSADoqYsgSi/xVQdHmxw+P8fX9aCz1XCLP7K1LRoeWEO0XlIcFrToqrtu+3bq pT9AyUCV8N22Ci/foxKnZXekO/vYX62cnXQiLQGrc6mr4adDT323cqkz/U/OR3M3hrx8AD MWS0jMkZqiE0uDoA7t9qDM9Sn3Wb5BIIkxggHYuDidQ7CG7VNG4i10pB9q1/m3LtqKkVy0 Xyxma1EpLkwrC79oeYCRpgHaK3cQ0dV5BgzHO7PuVGynYa+lhGV/7ZjVL6CsVFOA3l8EVH svUVjbDx9VBY9esxOdtAXDAv2qq5k/LyneHqdSc/iQJ1AcJ6psapTCHaAcrMXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759311540; a=rsa-sha256; cv=none; b=sdomxwmnJ8qa+/kvsYdrWj7Uzd5QsBVqX7sPkZ+11i+3QFrJ+hm2vg+GyRVmQY2V6jykGT tK1qmPdikzWRYwSi8/FNyOPRropwD40DZM2uDZSE6gecqYR9u7n8N2ogZ/36Et6Y/6EhKK XlxMlRwsokwjTyn9FiGLgXarZQDtRZ7RAHf4GzaRJaptdJ6t+X3pagYiC0LFLjhQyDze9t YHofllwL4xePtpjkVh7Ymv4wKai5Wvi84qMhBJG1TtjK9UVNXl/lFD1CywWqNiLJG1euPA cCgj/w8WiA3z7+s5Bhs6BcrX/hgwXZnSxJMwGZjPdySi28aH9GA3JYPxLANmmQ== 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 4cc8yD5YRtz2Gq; Wed, 01 Oct 2025 09:39:00 +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 5919d0mI016828; Wed, 1 Oct 2025 09:39:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5919d0Bc016825; Wed, 1 Oct 2025 09:39:00 GMT (envelope-from git) Date: Wed, 1 Oct 2025 09:39:00 GMT Message-Id: <202510010939.5919d0Bc016825@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org, dev-commits-src-branches@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ahmad Khalifa Subject: git: cddbc26251d6 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: cddbc26251d618b1229114ffc62c85bc3b39a25e Auto-Submitted: auto-generated The branch stable/15 has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=cddbc26251d618b1229114ffc62c85bc3b39a25e commit cddbc26251d618b1229114ffc62c85bc3b39a25e Author: Evgenii Ivanov AuthorDate: 2025-09-25 17:15:08 +0000 Commit: Ahmad Khalifa CommitDate: 2025-10-01 09:37:36 +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 (cherry picked from commit ace98a8fb8fe18d47ccbb55619a9ffd4ac10f98c) --- 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); }