From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E231D1A841F; Wed, 19 Feb 2025 08:32:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739953948; cv=none; b=OYga+9qDxEopxqWQou1gx6X7nM+h3lR+ceqpM2ZxSvGmaTgVA89b9rGSlZlJ/hpog1St1mqxQz9C6zg23KoZj4m6YvNOBaTJihlJkWmUPVNuiCPSteLGCGTlzamj3bKOs4Csnw0rhLR7immD8OCjmET8pufDg94Fma7c5b/ZS3Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739953948; c=relaxed/simple; bh=e2HLWKehVxzhmytjQf/G0+n85O6EZVN8IiVIdEcblrg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pmNnst169sL4D26Q1SRrIYigu0Yw/Pq25+9/OmMY3WG6P4UcY+PaYd+crVYg7VJoOVdJO9nW0PGKSE6hqcMzhNULocM+fopk7AQoItWBQKcoPd84ODsk8yRDJ6j4X3Rc4t1GYLvMuF/tkz2ijRSkjPEACMkFm6ydutDVIRMKTxY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VUcnpL/u; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="VUcnpL/u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F362DC4CED1; Wed, 19 Feb 2025 08:32:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739953947; bh=e2HLWKehVxzhmytjQf/G0+n85O6EZVN8IiVIdEcblrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VUcnpL/um8pu0zpLM5WGIrYD3DJ2LrXZWZd6oYiNmiLPtaa+E5M/M+TgDjlWrcaO4 OSjfEeXnQ5GxWPQWIkWCNd/K38aNkNLzOIi9m8k0SjZd6WDQTNUv8Mwy6cjuhKkpcq AZJ7ONJmLcxx8gQuWLKKzZUmq0A5zWi1XKZXyWls= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Florian Fainelli , Markus Mayer , Artur Weber , Linus Walleij , Bartosz Golaszewski , Sasha Levin Subject: [PATCH 6.13 048/274] gpio: bcm-kona: Fix GPIO lock/unlock for banks above bank 0 Date: Wed, 19 Feb 2025 09:25:02 +0100 Message-ID: <20250219082611.403832225@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219082609.533585153@linuxfoundation.org> References: <20250219082609.533585153@linuxfoundation.org> User-Agent: quilt/0.68 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-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Artur Weber [ Upstream commit de1d0d160f64ee76df1d364d521b2faf465a091c ] The GPIO lock/unlock functions clear/write a bit to the relevant register for each bank. However, due to an oversight the bit that was being written was based on the total GPIO number, not the index of the GPIO within the relevant bank, causing it to fail for any GPIO above 32 (thus any GPIO for banks above bank 0). Fix lock/unlock for these banks by using the correct bit. Fixes: bdb93c03c550 ("gpio: bcm281xx: Centralize register locking") Reviewed-by: Florian Fainelli Reviewed-by: Markus Mayer Signed-off-by: Artur Weber Reviewed-by: Linus Walleij Link: https://lore.kernel.org/r/20250206-kona-gpio-fixes-v2-1-409135eab780@gmail.com Signed-off-by: Bartosz Golaszewski Signed-off-by: Sasha Levin --- drivers/gpio/gpio-bcm-kona.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c index 5321ef98f4427..77bd4ec93a231 100644 --- a/drivers/gpio/gpio-bcm-kona.c +++ b/drivers/gpio/gpio-bcm-kona.c @@ -86,11 +86,12 @@ static void bcm_kona_gpio_lock_gpio(struct bcm_kona_gpio *kona_gpio, u32 val; unsigned long flags; int bank_id = GPIO_BANK(gpio); + int bit = GPIO_BIT(gpio); raw_spin_lock_irqsave(&kona_gpio->lock, flags); val = readl(kona_gpio->reg_base + GPIO_PWD_STATUS(bank_id)); - val |= BIT(gpio); + val |= BIT(bit); bcm_kona_gpio_write_lock_regs(kona_gpio->reg_base, bank_id, val); raw_spin_unlock_irqrestore(&kona_gpio->lock, flags); @@ -102,11 +103,12 @@ static void bcm_kona_gpio_unlock_gpio(struct bcm_kona_gpio *kona_gpio, u32 val; unsigned long flags; int bank_id = GPIO_BANK(gpio); + int bit = GPIO_BIT(gpio); raw_spin_lock_irqsave(&kona_gpio->lock, flags); val = readl(kona_gpio->reg_base + GPIO_PWD_STATUS(bank_id)); - val &= ~BIT(gpio); + val &= ~BIT(bit); bcm_kona_gpio_write_lock_regs(kona_gpio->reg_base, bank_id, val); raw_spin_unlock_irqrestore(&kona_gpio->lock, flags); -- 2.39.5