From nobody Tue Nov 10 13:42:55 2026 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 4jP7Bl6X0Jz6ySlc for ; Tue, 10 Nov 2026 13:42:55 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jP7Bl5bN9z3MhL for ; Tue, 10 Nov 2026 13:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794318175; 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=vwT6txtNjs5BPY6gVW7/55IO3wxToLGHDIZv9T58DfI=; b=NFpmfIMdaB6DenI6N/V+7kQIbAl9c9Ku/g3YEiI4eAHRAdwS+SV9S67E4DopjwTE5FhAOr MFq8tWz4v0BHj6zp+urheGyAU34PwGjs5wu07eHXtZNTYvR+Zh4fBbS9uBogkRaFu2erh+ DhcPijC7nHlZU06EZ7nkSNgKZCRyQRCuF+b/Vm7X0plR78QYs4BNwSOZW5yAdjJ3v10kip kHm6PRnysJg8dbKcrBsLUAd9HqJT0sXUruJ7qAvb7VXKcyrtpIs2zPrxHR/bgfMa/y9+jd pKUl2OXhKFXbVvQOOjrBMSCMrDdc725d1jK5WTWUy1vhAP7iWecwXPlPQY1lNQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794318175; b=EAnbxM8GY2JSCRohXgX9zISDqru1Lh3CktyGY1q74lmy9qj3qTVqCBfwlkbUyTJWThI1ny 4ZnddVVPXb12LdBHneKY+FCiuqpy/iPVYrvZFkDqLUHKcjSY9ZxxzOywSgUQhmBY+6LTPd /xPEvxn+bDUtqC/0oPGtpQqscaUj+7YvycweT/tCBkTx8L++kDMmgeDocJNn4YP99TyXeg tFjWB2yrsl4PLySgd0yAfi5p7rYDigOPBsPnKppwWBi4lyZU83VbaeHUh0kvlYFOH+UIs7 hKck3C11mCr9PNfNq47st7oZmfArDYlpMLdTejVnFz0wt2K5VfUf8PijdEmD3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794318175; 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=vwT6txtNjs5BPY6gVW7/55IO3wxToLGHDIZv9T58DfI=; b=KOEJN1HlbMQ/ny6fOsolisV5bjRg/PRHhEMsgZggnqICUUDJnftlxw++ANkgDSVCmoNRML AXMNi2ta0SucVU+CUSIENh0yznExmk5T4UdYnj9HSIc1HDQM4ZLAVowLTH+mwu0P5VBSGK JQNYWIpn9KrBvgih8d68iCRyHgor9WlTxzea2qs9Xf+KXqm1Ei2dMLp867QfRmQ5YaKJWY qZgog4L5XTvuKiETkc41n1AiZZNFw3i0Kxg22q/EHRFKXVmOuq/cRzg+4zjAgI98ft1Hun R0FIAvvxBevPcZGdLBiaAHPNMxYZ/PPn61xfVSWYfgZhm+uDQ5GV+hXAnImoRw== 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 4jP7Bl4hTDzVGL for ; Tue, 10 Nov 2026 13:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1b61e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Nov 2026 13:42:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 40256923a2bd - main - axp81x: Serialize the register accesses List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40256923a2bd1e316fbfbfac692d58947ab40262 Auto-Submitted: auto-generated Date: Tue, 10 Nov 2026 13:42:55 +0000 Message-Id: <6af31f5f.1b61e.e9d45bf@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=40256923a2bd1e316fbfbfac692d58947ab40262 commit 40256923a2bd1e316fbfbfac692d58947ab40262 Author: Emmanuel Vadot AuthorDate: 2026-11-10 08:00:54 +0000 Commit: Emmanuel Vadot CommitDate: 2026-11-10 13:42:45 +0000 axp81x: Serialize the register accesses The registers were accessed with iicbus_transfer(), which does not own the bus. The interrupt driven transfers of the Allwinner twsi controller drop their mutex while they sleep waiting for the interrupt, so two accesses can overlap, and the PMU shares its bus with other devices, an RTC for instance. Use iicbus_transfer_excl() so that the accesses are arbitrated. The regulators share the enable registers and the regulator framework only serializes the accesses to a single regulator. Protect the read-modify-write of these registers with a lock, so that regulators enabled at the same time cannot lose each other's update. No failure was seen without this, it is there for correctness. Tested on: A64, H6 --- sys/arm/allwinner/axp81x.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/arm/allwinner/axp81x.c b/sys/arm/allwinner/axp81x.c index b7d286276294..cbdc147585f8 100644 --- a/sys/arm/allwinner/axp81x.c +++ b/sys/arm/allwinner/axp81x.c @@ -34,9 +34,11 @@ #include #include #include +#include #include #include #include +#include #include #include @@ -683,6 +685,7 @@ struct axp8xx_softc { void *ih; device_t gpiodev; struct mtx mtx; + struct sx reglock; int busy; int type; @@ -726,7 +729,7 @@ axp8xx_read(device_t dev, uint8_t reg, uint8_t *data, uint8_t size) msg[1].len = size; msg[1].buf = data; - return (iicbus_transfer(dev, msg, 2)); + return (iicbus_transfer_excl(dev, msg, 2, IIC_WAIT)); } static int @@ -746,7 +749,7 @@ axp8xx_write(device_t dev, uint8_t reg, uint8_t val) msg.len = sizeof(buf); msg.buf = buf; - return (iicbus_transfer(dev, &msg, 1)); + return (iicbus_transfer_excl(dev, &msg, 1, IIC_WAIT)); } static int @@ -775,10 +778,12 @@ axp8xx_regnode_init(struct regnode *regnode) static int axp8xx_regnode_enable(struct regnode *regnode, bool enable, int *udelay) { + struct axp8xx_softc *asc; struct axp8xx_reg_sc *sc; uint8_t val; sc = regnode_get_softc(regnode); + asc = device_get_softc(sc->base_dev); if (bootverbose) device_printf(sc->base_dev, "%sable %s (%s)\n", @@ -786,6 +791,8 @@ axp8xx_regnode_enable(struct regnode *regnode, bool enable, int *udelay) regnode_get_name(regnode), sc->def->name); + /* The regulators share the enable registers */ + sx_xlock(&asc->reglock); axp8xx_read(sc->base_dev, sc->def->enable_reg, &val, 1); val &= ~sc->def->enable_mask; if (enable) @@ -797,6 +804,7 @@ axp8xx_regnode_enable(struct regnode *regnode, bool enable, int *udelay) val &= ~sc->def->enable_value; } axp8xx_write(sc->base_dev, sc->def->enable_reg, val); + sx_xunlock(&asc->reglock); *udelay = 0; @@ -1567,6 +1575,7 @@ axp8xx_attach(device_t dev) sc->addr = iicbus_get_addr(dev); mtx_init(&sc->mtx, device_get_nameunit(dev), NULL, MTX_DEF); + sx_init(&sc->reglock, "axp8xx regulators"); error = bus_alloc_resources(dev, axp8xx_spec, &sc->res); if (error != 0) {