From nobody Wed Sep 07 07:59:39 2022 X-Original-To: dev-commits-src-main@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 4MMvmW4tVLz4bsTp; Wed, 7 Sep 2022 07:59:39 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MMvmW4RGBz46sk; Wed, 7 Sep 2022 07:59:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662537579; 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=qUoNxBl/NroArm25a9fPkkgM86wSPVlX6EujPlHbC4I=; b=KxLiaKtGmWs4wc1Px9lJl+l4V57p+IM/6Tb5+UaPQXZauRl8K6DPsAbrt2ZYYpW8gKUpdf C/cktip8JoaxaT5FiNmcGtclVt4yvegVfq3UPBenc1w6z9OgS29D4BJJQ/pt2ZKxa5rrAC aMp/2zOpU76vOjsnn7FyXid9f/jlrYfrLikZPDBEjUndkc1B90ixhcu+W8uAZlVwn6TIrj 7aDkNCFIT0K+bagedJBTzgISyGQm9c6VBaeiW6AsSpmOfppzKws/sRpn5ghsXPpKDYfa8a mnpi3NfQGkfejH5tLEq8p3uLJW16GwgiVy63g/KTshDMeYO6wxR9stVh8zPKxQ== 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 4MMvmW3VD2zS5C; Wed, 7 Sep 2022 07:59:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2877xd72081960; Wed, 7 Sep 2022 07:59:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2877xdlD081959; Wed, 7 Sep 2022 07:59:39 GMT (envelope-from git) Date: Wed, 7 Sep 2022 07:59:39 GMT Message-Id: <202209070759.2877xdlD081959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Kornel=20Dul=C4=99ba?= Subject: git: 299b6c9cb1a9 - main - uart_bus_acpi: Read clock frequency from bus List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 299b6c9cb1a9a3e3a7a59913dc4f1ea5dff040d5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662537579; 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=qUoNxBl/NroArm25a9fPkkgM86wSPVlX6EujPlHbC4I=; b=K8yVANOxdS4mdNrJOldTuMwyeWSaZcX4xFBV/s/vVNfcn1F3KjcfEVRnD9zCni9qmGIfNc 0O6V6D+7dqUiTo5Ssx2frL+cgzL6+wrZvJMaAkRVN2jBufyUCoHp1Rg7nTdHG/hnoM3Zh/ nthejC1wjrgZrj0Van8MaU1TTr3NoWPG8oUjNW7LsF56d7Qaxdf5gPOAVePgOkyUsdzdQu hK3ByQOX9Vw/S3P2WWSorkLc233UXe0my4aX6UvBYkDGAKqPpQqQbsYSD3NcIpyuGks+La i4+FKEeHXxmS04OMcJqW1Usk5zbTLoyWwxPjPIkqbsGzU5UdRQKbJoTpds2ytA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662537579; a=rsa-sha256; cv=none; b=iIkRZAv8hwsQGO3g/6Z/85JDGnE4JwUyouQyvGWaDKd1t77hGSnWzmJ98VrDOeQApaQ6lh 5rqKsxydaefmZAZY3mnPjeCJuRmXEV5VJPv8cxQ2IYkJI1u3+thqK7F0baVz88KA4mW9gZ F9IGmYPW23/ZEUeNFOtur1cJzuDMXFCdyxOmIBwWcJXSraVDvfr09R212vea/rT6cEsX2h YJXuc8NQJdy0nSj0plyd7B8nP+NBDDous85JZ+Bt1i6RC6tlAaBNbaquyHrsCwiGdrpfcC 6OUETqPxwM4R71UJ2O5OM6gOcvIIJrUR+5ED2eGFBo4qeZS+Q5ZQjxZ84Tnhzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kd: URL: https://cgit.FreeBSD.org/src/commit/?id=299b6c9cb1a9a3e3a7a59913dc4f1ea5dff040d5 commit 299b6c9cb1a9a3e3a7a59913dc4f1ea5dff040d5 Author: Mateusz Kozyra AuthorDate: 2022-09-06 14:54:00 +0000 Commit: Kornel Dulęba CommitDate: 2022-09-07 07:44:58 +0000 uart_bus_acpi: Read clock frequency from bus It is stored in the clock-frequency property. In case of failure, fallback to the harcoded value stored in the compat data. Also, while here improve style. Tested on LS1046ARDB and x86 PC. Reviewed by: mw Obtained from: Semihalf Differential Revision: https://reviews.freebsd.org/D36326 --- sys/dev/uart/uart_bus_acpi.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/sys/dev/uart/uart_bus_acpi.c b/sys/dev/uart/uart_bus_acpi.c index 1018412392dd..8a2eec143577 100644 --- a/sys/dev/uart/uart_bus_acpi.c +++ b/sys/dev/uart/uart_bus_acpi.c @@ -83,19 +83,29 @@ uart_acpi_find_device(device_t dev) static int uart_acpi_probe(device_t dev) { - struct uart_softc *sc; struct acpi_uart_compat_data *cd; + struct uart_softc *sc; + uint32_t rclk; + ssize_t size; sc = device_get_softc(dev); + rclk = 0; - if ((cd = uart_acpi_find_device(dev)) != NULL) { - sc->sc_class = cd->cd_class; - if (cd->cd_desc != NULL) - device_set_desc(dev, cd->cd_desc); - return (uart_bus_probe(dev, cd->cd_regshft, cd->cd_regiowidth, - cd->cd_rclk, 0, 0, cd->cd_quirks)); - } - return (ENXIO); + cd = uart_acpi_find_device(dev); + if (cd == NULL) + return (ENXIO); + + sc->sc_class = cd->cd_class; + if (cd->cd_desc != NULL) + device_set_desc(dev, cd->cd_desc); + + size = device_get_property(dev, "clock-frequency", &rclk, + sizeof(rclk), DEVICE_PROP_UINT32); + if (size < 0 || rclk == 0) + rclk = cd->cd_rclk; + + return (uart_bus_probe(dev, cd->cd_regshft, cd->cd_regiowidth, + rclk, 0, 0, cd->cd_quirks)); } DRIVER_MODULE(uart, acpi, uart_acpi_driver, 0, 0);