From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1DDB352033; Thu, 28 May 2026 20:24:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779999856; cv=none; b=GfjdlXGwBl1Xt7Bnzf4CH6L5TBfiHRwIVKnq9LrqVuYkePh7SadkQ4F4zSNJ81B4g8bYm8LWTiDixsoGNcTFQsuVKhWc7RAf9AKQPH44IgDLtKjQS2XE/OWV4/qYDLmAfzOMwWxAojdKp7HKN8VFAlKkt+R83JcBE1QeM9DRTYk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779999856; c=relaxed/simple; bh=E2MaoaFPerAUZMJvUkUS1xu4WIC4GQxamIJiN52I7Yg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pXMlIahHdZbHe4YEtsWdP+OWFWSI41haDhBygWpfiBWNX3RDw6kW/5iQfoO4/4pH+FIbBXa+tfei5Txbii89KXVsFfbzQThIFfiStHMHVPapQqicVmjkrLTy8VInFmv02mgTyvqV1cj+dyC2PMCog4hMx6u0wRYR80huoyLF1tg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YZVpw3bG; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="YZVpw3bG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C8311F000E9; Thu, 28 May 2026 20:24:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779999855; bh=QHVwIQjFws1m/6S5LEmgCuUwBKtgkyMa0JmsrpgEKk8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YZVpw3bGpGx2X7xBCLRcMfcy28YZCZgyYXqGgWYH2z2sVhJ8MbXL32mETqj8Caz0l KIcDmxclDBsgUBQ7jk2Eld1pVKAOYyXNdOxBbamfP2SsHbStjfhdFHdjXLRZowtXY1 O9IHriGhPdy74wX0pO+AGblPCqQxJKqEC/uEzK7w= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Gabor Juhos , Miquel Raynal , Vinod Koul , Sasha Levin Subject: [PATCH 6.18 215/377] phy: marvell: mvebu-a3700-utmi: fix incorrect USB2_PHY_CTRL register access Date: Thu, 28 May 2026 21:47:33 +0200 Message-ID: <20260528194644.625649866@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194638.371537336@linuxfoundation.org> References: <20260528194638.371537336@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Gabor Juhos [ Upstream commit 91ddf6f722084383fb05be731c0107814b055c0c ] The mvebu_a3700_utmi_phy_power_off() function tries to modify the USB2_PHY_CTRL register by using the IO address of the PHY IP block along with the readl/writel IO accessors. However, the register exist in the USB miscellaneous register space, and as such it must be accessed via regmap like it is done in the mvebu_a3700_utmi_phy_power_on() function. Change the code to use regmap_update_bits() for modífying the register to fix this. Fixes: cc8b7a0ae866 ("phy: add A3700 UTMI PHY driver") Signed-off-by: Gabor Juhos Reviewed-by: Miquel Raynal Link: https://patch.msgid.link/20260321-a3700-utmi-fix-usb2_phy_ctrl-access-v1-1-6005ff4b5058@gmail.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/phy/marvell/phy-mvebu-a3700-utmi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/phy/marvell/phy-mvebu-a3700-utmi.c b/drivers/phy/marvell/phy-mvebu-a3700-utmi.c index 04f4fb4bed702..f882bc57649c7 100644 --- a/drivers/phy/marvell/phy-mvebu-a3700-utmi.c +++ b/drivers/phy/marvell/phy-mvebu-a3700-utmi.c @@ -168,9 +168,8 @@ static int mvebu_a3700_utmi_phy_power_off(struct phy *phy) u32 reg; /* Disable PHY pull-up and enable USB2 suspend */ - reg = readl(utmi->regs + USB2_PHY_CTRL(usb32)); - reg &= ~(RB_USB2PHY_PU | RB_USB2PHY_SUSPM(usb32)); - writel(reg, utmi->regs + USB2_PHY_CTRL(usb32)); + regmap_update_bits(utmi->usb_misc, USB2_PHY_CTRL(usb32), + RB_USB2PHY_PU | RB_USB2PHY_SUSPM(usb32), 0); /* Power down OTG module */ if (usb32) { -- 2.53.0