From nobody Sun Feb 16 10:59: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 4YwjTL4prFz5nH8T; Sun, 16 Feb 2025 10:59: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YwjTL3zD3z3S86; Sun, 16 Feb 2025 10:59:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739703542; 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=SNluiqYEwlDqUVq6e7LW8Z7Hvj9UvCH+3AV5FP1IhF8=; b=gLU3E9SOMenQzRTLNgaXPy8DZ2vgxOExKl3obUXmyB0hWsCzb8xM4ThoWMqIQPjLrq5yTP hM08z82TvusjnZFsANxxtFePPp89J8liWQIvV/RW3IjrB/QOe1i6pXCy60pAm6opM+hmj/ Kx0XgffHwOBooBFWTuLlEwElC4fcmhIHQNPyREAWDb26ZxLpUOHjJVtEtxU1UJ7jf/pylw TcCVZc62VpkkjimxTxqIlej8CGFd3lXi56xF3xnvXVbiz37+yQkfzgr/KuvOWiVjoivtzZ AXBkIu44ZzNewfBZowa9EOd+SGhqwGgP0eWNLIwS3qvPusAuDmkDGv5LGDegDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739703542; a=rsa-sha256; cv=none; b=JQ3W5msKiPqAuhYbnFiFevlmTR78Gu5arORpzX5vSngie9zNNnw8XGXv1lo6MprauWGCIQ xXRt8CnU3xBTp0isxt0tCDlUCeBcUbytHGy7y7dOgqYwmwI9yTejrRvQ244CizIoYSzFO9 0a4QRKS3yF6MSFpNb3hsgOAnegxpW03FzX6iGXGNlxQxDHt6cT5hyZstJsmW51bYQuFDks N6vSv/Gzjf2LL7NcBX5kw/Ro22FMb+i+e9FQ6Q0zCYycxOfzDtq8F2UlpqF343e1x1hK9V MPmMHQSeVoW/f2X4Tyhr5nE4XB8zaJdo91rJCxbN9TWr+SwxJzMH8dK7r07Ecw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739703542; 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=SNluiqYEwlDqUVq6e7LW8Z7Hvj9UvCH+3AV5FP1IhF8=; b=rpHdW4mZk80s5KAeVWLJIHUjm1uNJ4JUWeqaZ4TVbCJ9juO4YnfUjGRhvN1fotyf69Pbuo mO+h00lqf4+ojHB7QR3B4D/BGBRDmO1/h7UvDEjMil7ZIpwBmMMsf+JAW56dK9uhQ5bdIL eaTOQPcrWgYHImPfx1PlP2twCW+ZOvjpHduX4Tc7qesVji2Szi/23pHOfRB36UmjYVFxAi FjptWzrt3hGIZ210xnO1TaBZ0dTVC7I/XzuAVnYlD2YwTr1Dalk8Fv3qS2ROVY9jlkvrWE OxcDALopvORaRJvFhzmp5L2xXm/W0iHyx73GjFdzeSV90fOTTyATqhSwPKEXmw== 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 4YwjTL28KdzlGJ; Sun, 16 Feb 2025 10:59: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 51GAx2ki002494; Sun, 16 Feb 2025 10:59:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51GAx226002491; Sun, 16 Feb 2025 10:59:02 GMT (envelope-from git) Date: Sun, 16 Feb 2025 10:59:02 GMT Message-Id: <202502161059.51GAx226002491@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 19f202f859b1 - main - sdhci: Fixes for sdhci_fdt_rockchip.c 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: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19f202f859b101507e26fe181aaf9f0b99f4d59c Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=19f202f859b101507e26fe181aaf9f0b99f4d59c commit 19f202f859b101507e26fe181aaf9f0b99f4d59c Author: Bojan Novković AuthorDate: 2025-02-16 10:41:43 +0000 Commit: Bojan Novković CommitDate: 2025-02-16 10:41:43 +0000 sdhci: Fixes for sdhci_fdt_rockchip.c This change fixes a couple of issues in the Rockchip SDHCI driver: - Fix a panic caused by sdhci_fdt_rockchip_attach not populating the softc's dev variable before initializing clocks - Fix a bug where sdhci_fdt_rockchip_set_clock fails to call sdhci_fdt_set_clock Fixes: e17e33f997d6 Reported by: Alonso Cárdenas Márquez (acardenas@bsd-peru.org) --- sys/dev/sdhci/sdhci_fdt_rockchip.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/dev/sdhci/sdhci_fdt_rockchip.c b/sys/dev/sdhci/sdhci_fdt_rockchip.c index b3311d3e8a48..44a5e2ffe271 100644 --- a/sys/dev/sdhci/sdhci_fdt_rockchip.c +++ b/sys/dev/sdhci/sdhci_fdt_rockchip.c @@ -217,7 +217,7 @@ sdhci_fdt_rockchip_set_clock(device_t dev, struct sdhci_slot *slot, int clock) DLL_STRBIN_TAPNUM_FROM_SW); } } - return (sdhci_fdt_rockchip_set_clock(dev, slot, clock)); + return (sdhci_fdt_set_clock(dev, slot, clock)); } static int @@ -226,6 +226,7 @@ sdhci_fdt_rockchip_attach(device_t dev) struct sdhci_fdt_softc *sc = device_get_softc(dev); int err, compat; + sc->dev = dev; compat = ofw_bus_search_compatible(dev, compat_data)->ocd_data; switch (compat) { case SDHCI_FDT_RK3399: @@ -243,12 +244,10 @@ sdhci_fdt_rockchip_attach(device_t dev) device_printf(dev, "Cannot get syscon handle\n"); return (err); } - if (compat == SDHCI_FDT_RK3399) { - err = sdhci_init_rk3399(dev); - if (err != 0) { - device_printf(dev, "Cannot init RK3399 SDHCI\n"); - return (err); - } + err = sdhci_init_rk3399(dev); + if (err != 0) { + device_printf(dev, "Cannot init RK3399 SDHCI\n"); + return (err); } break; case SDHCI_FDT_RK3568: