From nobody Mon Dec 8 15:44:27 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 4dQ5rW4wgYz6K0G9 for ; Mon, 08 Dec 2025 15:44:27 +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 4dQ5rW2ddjz44KZ for ; Mon, 08 Dec 2025 15:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765208667; 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=ygZhrxyQuOs88xnFzQ2ii9StVloCtMa9lZvL0Wg8YAk=; b=ubR4My+4uUpEK8BAanhyDRzPfsLDvB44OHa15pp3Poowa/X1oPDpEZXXl5wKPE2dfjgshz 6J8lhbRDrOG6EojG/g+xKkJgJwVajaT+XYTo2U+qmAsUOjyztg03OSqMYcPxai2E9cTcCH 13GLxVyTf70kEOkgUdx9izzaTSjr+dhP2zPgntS6hWeodbeC70Eusp8udd65NhcBALz2Lk fO282dXMp1sQ057W6XVWwTY2gPcwpyyGAtknThOHYZzQOnXIr8BpTTgaV34jMTEI/KGF/i 8nuViN2V5ySO8flN8iJZGtYVF2vLuR1zBwFT5vm06ww1lNpriXxOcCBtVRN/kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765208667; 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=ygZhrxyQuOs88xnFzQ2ii9StVloCtMa9lZvL0Wg8YAk=; b=XNbEzPyrZbBJcT9JRnDkumLsjalM8XWWgRoAVI8OrUOKYxB7LZxgwzcGuAID6THIPjECra uZ+HDFjK8fzb/0Bm5wXQUr06TRWOFwvSh4ajnACu1sZ/LyM18k/ADZx7U/6pHjpgWif7tg vl+Ar18F9rcIwa05XbUzb5qfRzBwro6wqpWU7622ok5itJvPfUqgoPXXL0lFQrS1Jpgg5g f+N3uD5Z9zTaTvidgH8oYGVjVAtL7Z8UELjKot+nigTTiIn4fZSG9pOv8qNH0iSC9ngviR Qfgf+EYej2P+DioHqWoU1edP2OaJrDmhzwNBcxq1qRkpaE7LcYG3+zuRMVDtwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765208667; a=rsa-sha256; cv=none; b=PmfyXL0BiCNxn9rS5qtyY7aXtB0U0XgXPzmGSWaJ29s7iZhXyetKZpdgc0SN/nv4masKTd b+/mPlOqGN4vFfA3sznvBi78TkZ487ILxznO8ztbJgCbjNipJR6PG4TWv6YVbzvSw/JKgc l5uf7cRnTeAulb6u62M5aVyPbezuxjyHngjMc/fod253B9y7x5hYmMSJlGvLsQKsuBQO79 Y0NG72QX8bIcDK+iosO98DYl8uSBVMH+mh2ZEwa/Sya6+VDfCDUml+AdJz/mf13wggU+tE 1+XBlnzUpjuOXkBKaV5R95MN7DtJUybx2YZUntuIUZhDccBxXFM5FW9n3zWaVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dQ5rW1pnwz3M8 for ; Mon, 08 Dec 2025 15:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38d91 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Dec 2025 15:44:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: e65e9bc1b4dd - stable/15 - rtw88: update Realtek's rtw88 driver 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e65e9bc1b4dd4503b77c311dafdfc77eabe3243c Auto-Submitted: auto-generated Date: Mon, 08 Dec 2025 15:44:27 +0000 Message-Id: <6936f25b.38d91.3c7944eb@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e65e9bc1b4dd4503b77c311dafdfc77eabe3243c commit e65e9bc1b4dd4503b77c311dafdfc77eabe3243c Author: Bjoern A. Zeeb AuthorDate: 2025-12-06 09:41:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-08 15:43:54 +0000 rtw88: update Realtek's rtw88 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 ( tag: v6.18 ). Merge commit 'e543442afe3ad5b27616575be2d2402b988656eb' into rtw88 Sponsored by: The FreeBSD Foundation (cherry picked from commit 8b4477f6b8e1b82acfef558a11facbb2797cb690) --- sys/contrib/dev/rtw88/led.c | 13 +++++++------ sys/contrib/dev/rtw88/sdio.c | 4 ++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/sys/contrib/dev/rtw88/led.c b/sys/contrib/dev/rtw88/led.c index 25aa6cbaa728..4cc62e49d167 100644 --- a/sys/contrib/dev/rtw88/led.c +++ b/sys/contrib/dev/rtw88/led.c @@ -6,13 +6,17 @@ #include "debug.h" #include "led.h" -static int rtw_led_set_blocking(struct led_classdev *led, - enum led_brightness brightness) +static int rtw_led_set(struct led_classdev *led, + enum led_brightness brightness) { struct rtw_dev *rtwdev = container_of(led, struct rtw_dev, led_cdev); + mutex_lock(&rtwdev->mutex); + rtwdev->chip->ops->led_set(led, brightness); + mutex_unlock(&rtwdev->mutex); + return 0; } @@ -36,10 +40,7 @@ void rtw_led_init(struct rtw_dev *rtwdev) if (!rtwdev->chip->ops->led_set) return; - if (rtw_hci_type(rtwdev) == RTW_HCI_TYPE_PCIE) - led->brightness_set = rtwdev->chip->ops->led_set; - else - led->brightness_set_blocking = rtw_led_set_blocking; + led->brightness_set_blocking = rtw_led_set; snprintf(rtwdev->led_name, sizeof(rtwdev->led_name), "rtw88-%s", dev_name(rtwdev->dev)); diff --git a/sys/contrib/dev/rtw88/sdio.c b/sys/contrib/dev/rtw88/sdio.c index cc2d4fef3587..99d7c629eac6 100644 --- a/sys/contrib/dev/rtw88/sdio.c +++ b/sys/contrib/dev/rtw88/sdio.c @@ -144,6 +144,10 @@ static u32 rtw_sdio_to_io_address(struct rtw_dev *rtwdev, u32 addr, static bool rtw_sdio_use_direct_io(struct rtw_dev *rtwdev, u32 addr) { + if (!test_bit(RTW_FLAG_POWERON, rtwdev->flags) && + !rtw_sdio_is_bus_addr(addr)) + return false; + return !rtw_sdio_is_sdio30_supported(rtwdev) || rtw_sdio_is_bus_addr(addr); }