From nobody Tue Nov 10 13:42:56 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 4jP7Bn0CRTz6ySgB for ; Tue, 10 Nov 2026 13:42:57 +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 4jP7Bm5tdZz3MtY for ; Tue, 10 Nov 2026 13:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794318176; 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=8bZ+qA5UheR+Ls+qi7FrenfGL8jv/cvxauev7eZhodg=; b=EtqBw+YocWMiWUpYe3zOS1YowawvKAOBPczPgYcomQVY1fusVvTSwrNYlFAmHanM3DZ7Ws 1A4GbNEL3Q5zPbcExumOs+cxD74T2HGlD4ITtZpqB2IUlpKixICXyF8PXPtR3gF19kF3ZL 2DcmwgXCXnWkljLkmxQkpk6mhJsTuamek9aUwVj8ZSI4pIhGT2sOctsI6spxyeBRdLtuta HOKl7lKF/BOyySFhv5013t6q+lhxDtZUzpOIl5/wR6/MBgcEuf+YPlk/AiK0AAFuFQi5PH fUhm5tAklfyrNCFE+MIoJ7RIG9FL69h8tK9iEruYcgwFxLu0vxkL+ueY42cNig== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794318176; b=PTuxnrqU9PU1TssyEQl/Jm6ofF2tmN//BQmdOUD34r/5Ld1Tekup+JF4onaLtmce7fpyrs aAsYkJ4gyMQL4I9iiSFTfp49V76SJazsUu0moPkMyoRmSHbHJAjPGT4uakKkxgxnaCiyyz UgQrq+ErQehRiv2gQeOuR8Brmz/4iLKJe+xJ6j4qX3s3bgQgB9WZ5z0u3AQTyYPUIlg7yo 5j8BguV60waqqGB2Hv40bZ7yIST+weHLK5DCMLdyRSrRo5coY2FHEMpVt9Q+c6BY1mJWz3 LlwOoHN3I7KVFSJOzANv0A3kZ9bXSncbeTzIsFD8eGlpAjTrOhL3IQgPVwPRRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794318176; 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=8bZ+qA5UheR+Ls+qi7FrenfGL8jv/cvxauev7eZhodg=; b=vf98nGDQRyBXlCqqecnK1TNQON6bZWN6eo86nWKwxtkwUJlkyfOFMEZseSCP+LbdFg3jbk eNiX+SLRMvLP+v0y3shojRHNvZuLaPzXHuAPDcUNTDVxy0RUcnMDPFLzb9lYY/JfFiNpZ0 r7v8xBmj8TpswGzxKxn5UOyvUvTixMTYTEMiakstKQwTGKtt2EiEXKh4dWFFRf1auyXeuS gYLE18iHImRc+WdknnBgYzb4SGZEWsPveOJlmPVD/kw2SheAaXR8oWwRjjowAt+c0hrUpI T2HFTO1BEZ05SKUI2cwVfpeSPaAy5Eqns9/+6slvSQTumC5F3T0q4BkvBLRtGQ== 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 4jP7Bm58xnzV4V for ; Tue, 10 Nov 2026 13:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c0a7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Nov 2026 13:42:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: e41207729840 - main - axp81x: Check the errors of 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: e41207729840f817a45a1db9894c5d633f541009 Auto-Submitted: auto-generated Date: Tue, 10 Nov 2026 13:42:56 +0000 Message-Id: <6af31f60.1c0a7.35aacbb7@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=e41207729840f817a45a1db9894c5d633f541009 commit e41207729840f817a45a1db9894c5d633f541009 Author: Emmanuel Vadot AuthorDate: 2026-11-10 08:25:57 +0000 Commit: Emmanuel Vadot CommitDate: 2026-11-10 13:42:45 +0000 axp81x: Check the errors of the register accesses axp8xx_regnode_enable() wrote back a value computed from a register it failed to read, which clears the enable bits of all the other regulators of that register. Return an error instead, and do the same in the other regnode methods, which used an uninitialised value when an access failed. Also initialise udelay in axp8xx_regnode_init(), as axp8xx_regnode_set_voltage() can now fail before setting it. Tested on: A64, H6 --- sys/arm/allwinner/axp81x.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/sys/arm/allwinner/axp81x.c b/sys/arm/allwinner/axp81x.c index cbdc147585f8..63e6e06cc6d0 100644 --- a/sys/arm/allwinner/axp81x.c +++ b/sys/arm/allwinner/axp81x.c @@ -758,6 +758,7 @@ axp8xx_regnode_init(struct regnode *regnode) struct regnode_std_param *param; int rv, udelay; + udelay = 0; param = regnode_get_stdparam(regnode); if (param->min_uvolt == 0) return (0); @@ -781,6 +782,7 @@ axp8xx_regnode_enable(struct regnode *regnode, bool enable, int *udelay) struct axp8xx_softc *asc; struct axp8xx_reg_sc *sc; uint8_t val; + int error; sc = regnode_get_softc(regnode); asc = device_get_softc(sc->base_dev); @@ -793,7 +795,11 @@ axp8xx_regnode_enable(struct regnode *regnode, bool enable, int *udelay) /* The regulators share the enable registers */ sx_xlock(&asc->reglock); - axp8xx_read(sc->base_dev, sc->def->enable_reg, &val, 1); + if (axp8xx_read(sc->base_dev, sc->def->enable_reg, &val, 1) != 0) { + /* Do not write back a value we do not know */ + sx_xunlock(&asc->reglock); + return (EIO); + } val &= ~sc->def->enable_mask; if (enable) val |= sc->def->enable_value; @@ -803,8 +809,10 @@ axp8xx_regnode_enable(struct regnode *regnode, bool enable, int *udelay) else val &= ~sc->def->enable_value; } - axp8xx_write(sc->base_dev, sc->def->enable_reg, val); + error = axp8xx_write(sc->base_dev, sc->def->enable_reg, val); sx_xunlock(&asc->reglock); + if (error != 0) + return (EIO); *udelay = 0; @@ -859,7 +867,8 @@ axp8xx_regnode_status(struct regnode *regnode, int *status) sc = regnode_get_softc(regnode); *status = 0; - axp8xx_read(sc->base_dev, sc->def->enable_reg, &val, 1); + if (axp8xx_read(sc->base_dev, sc->def->enable_reg, &val, 1) != 0) + return (EIO); if (val & sc->def->enable_mask) *status = REGULATOR_STATUS_ENABLED; @@ -887,7 +896,8 @@ axp8xx_regnode_set_voltage(struct regnode *regnode, int min_uvolt, if (axp8xx_regnode_voltage_to_reg(sc, min_uvolt, max_uvolt, &val) != 0) return (ERANGE); - axp8xx_write(sc->base_dev, sc->def->voltage_reg, val); + if (axp8xx_write(sc->base_dev, sc->def->voltage_reg, val) != 0) + return (EIO); *udelay = 0; @@ -905,7 +915,8 @@ axp8xx_regnode_get_voltage(struct regnode *regnode, int *uvolt) if (!sc->def->voltage_step1 || !sc->def->voltage_step2) return (ENXIO); - axp8xx_read(sc->base_dev, sc->def->voltage_reg, &val, 1); + if (axp8xx_read(sc->base_dev, sc->def->voltage_reg, &val, 1) != 0) + return (EIO); axp8xx_regnode_reg_to_voltage(sc, val & AXP_VOLTCTL_MASK, uvolt); return (0);