From patchwork Thu Jun 12 09:14:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 896336 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A156224AE0 for ; Thu, 12 Jun 2025 09:14:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749719701; cv=none; b=spJAA/0nlRb0soh5ywrI9kdCFJcsgKXIHenZa05+SwPFUW4KK6z+79be6oeWxri6FG1BpWqqvQZIZ05M0FbIpyD3PnD0r6V8jAaAp4yyIE/oogM8tFTUwFTjRm+1ORrarfZctTItbxQPCKOyOI8D1ZMdlWWwNwNkQFUhSsY99rY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749719701; c=relaxed/simple; bh=I8WC8VmyVZpOBN9ahF6WdBk7M+DI/Cl/vSHnInFjNoM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=UINeGShCixyJq1ob4szNaUesM4L9CPsFDbWPV/S8/OwGKJeRA0shfuJC5lcHxQq/UKFReL/bdMaX0EkyUeH07FvkbNk7LOX4aSb8n86GvLFqiR8JNyz175RVTuHI30DbZ+Da5MxdLKAsKuEYyCdbXn9+a++V8Lfwi9ZhVjbcwug= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=xdvK4nuD; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="xdvK4nuD" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4531e146a24so4329635e9.0 for ; Thu, 12 Jun 2025 02:14:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1749719697; x=1750324497; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kjpbexB8EDGUAbjJEhoZpzc1eJdrhJw0+iAd+J3JqeU=; b=xdvK4nuDnWLLxKiBvp4lZV7pLRLNLsIR4Iy9zAkBSLVjdxaRHV6XHVmYmxVeIA/lPt mQonUxdpPQlNJy00hQ7wTSXy8nrTxakP1dW8K41kHUOMs6q88AMybfskNCwTA3yvqQ0o fOMCMR9Q3idoYXS1DycOWqMSq/EL/xlvQ0rYewMkIGusuWFbs5Msj4vHdv7VCjuHHd8t 8AWpzZXsjM/uIMoPL9uymT+lFbFxzrkAF3QqJ4aYrnZAfbI+OowZNySJev4C20ZPmfiT uHSyIAFRlrBcn9cv5Egfr6R6MQRXoNJrk+B6QuWPUKu28E2c9MWcRQYjiaOgNaGQS2el lb7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749719697; x=1750324497; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kjpbexB8EDGUAbjJEhoZpzc1eJdrhJw0+iAd+J3JqeU=; b=R1LWwu8rzxs9X1SvJLkXabwkV5tLBUYABRCtYfS9yin438xl6cPJ3s77gWZ5MNTIiO jHg99NVue5EiOVlC7CcH8VqnFLKaETxic51IoQcyIdyWCp+CxU1PuR5g3vYc3s60SOkR X+l5PM2NogGRT41FP0Z4ned3ggQp8gOzPErXPom4PWcrqQbv3KKfYei5a8Y3YMouWExa cxCyc2vSzv9EQAm00lUhvgAkoDH4DRULsJF0dhnuzbKS03WQTnCw3YDVPyGQAB0CSJAw iP7w47f9F8Rq+57TsR/QQAarqcgxB+9V3icAcT1/I9bOa715yinANARuC7OKiEJaFBLg PIKA== X-Forwarded-Encrypted: i=1; AJvYcCUT2zI4yrNRxD2nBe6O3kQMvDv7jI6FmrgIyC+XzbqXpqC2VCN4O2OvondpcFx0UUpYAB1nPzIVC2ec@vger.kernel.org X-Gm-Message-State: AOJu0Yy0XHd0Gy3TpN3PLvkdCDkjirUOQljtCye1+8fW3mgCfwDyhKGl t9IKmCoVUsHVlKKp7ZnO7EHetmgq42UnKzHFcJR185m7OkSvapBqtSMKEX8gaom9LLM= X-Gm-Gg: ASbGncu4xY+mehGjQcxpOSHfmSlIVuhCi1iC+XYsZgAcyh1ny3/RGB2Eb8+DiEtuxRy uA6V1gE5ZUgFRZAvbquGHJBsJPd5xZSiMXk0SD/S5A8dD1asZ9+kRH3f2KCN4Ag6WP/xKzvogTl Njd4IJWVS+wl91rVbZCSSjQXrFLjEMUJH8kRJHV5aJd8w4QGuf92TyD6G5BfiiNEuXHUpRqo8Oh eJwoCEBkDk70oh6dS7Ir3P1km0OhZsLE6JoVeAwOTccjMzNR1SQFLU5U2VOFQUHdiT1jcbPkpJZ iG6w/k0i/Ttpn0BxIW5J2MbyVB+CWh39ELkQCHNxqHkes6ecpctvFMIBMjkclac= X-Google-Smtp-Source: AGHT+IEj7fJZOfU+EAHw6kzDkmORmQcdeioJZFJUMmFWmfkS5xsy0lkDbMfqprMQGHqbWZtbCMvaDw== X-Received: by 2002:a05:600c:638f:b0:453:23fe:ca86 with SMTP id 5b1f17b1804b1-4532486b850mr62066355e9.4.1749719696749; Thu, 12 Jun 2025 02:14:56 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:dc:7e00:8b99:9926:3892:5310]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4532e25ec9fsm13940585e9.34.2025.06.12.02.14.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 02:14:56 -0700 (PDT) From: Bartosz Golaszewski To: Bjorn Andersson , Linus Walleij Cc: linux-arm-msm@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , stable@vger.kernel.org Subject: [PATCH v2] pinctrl: qcom: msm: mark certain pins as invalid for interrupts Date: Thu, 12 Jun 2025 11:14:48 +0200 Message-ID: <20250612091448.41546-1-brgl@bgdev.pl> X-Mailer: git-send-email 2.48.1 Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Bartosz Golaszewski On some platforms, the UFS-reset pin has no interrupt logic in TLMM but is nevertheless registered as a GPIO in the kernel. This enables the user-space to trigger a BUG() in the pinctrl-msm driver by running, for example: `gpiomon -c 0 113` on RB2. The exact culprit is requesting pins whose intr_detection_width setting is not 1 or 2 for interrupts. This hits a BUG() in msm_gpio_irq_set_type(). Potentially crashing the kernel due to an invalid request from user-space is not optimal, so let's go through the pins and mark those that would fail the check as invalid for the irq chip as we should not even register them as available irqs. This function can be extended if we determine that there are more corner-cases like this. Fixes: f365be092572 ("pinctrl: Add Qualcomm TLMM driver") Cc: stable@vger.kernel.org Reviewed-by: Bjorn Andersson Signed-off-by: Bartosz Golaszewski --- Changes in v2: - expand the commit message, describing the underlying code issue in detail - added a newline for better readability drivers/pinctrl/qcom/pinctrl-msm.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index f012ea88aa22c..1ff84e8c176d4 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c @@ -1038,6 +1038,25 @@ static bool msm_gpio_needs_dual_edge_parent_workaround(struct irq_data *d, test_bit(d->hwirq, pctrl->skip_wake_irqs); } +static void msm_gpio_irq_init_valid_mask(struct gpio_chip *gc, + unsigned long *valid_mask, + unsigned int ngpios) +{ + struct msm_pinctrl *pctrl = gpiochip_get_data(gc); + const struct msm_pingroup *g; + int i; + + bitmap_fill(valid_mask, ngpios); + + for (i = 0; i < ngpios; i++) { + g = &pctrl->soc->groups[i]; + + if (g->intr_detection_width != 1 && + g->intr_detection_width != 2) + clear_bit(i, valid_mask); + } +} + static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int type) { struct gpio_chip *gc = irq_data_get_irq_chip_data(d); @@ -1441,6 +1460,7 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl) girq->default_type = IRQ_TYPE_NONE; girq->handler = handle_bad_irq; girq->parents[0] = pctrl->irq; + girq->init_valid_mask = msm_gpio_irq_init_valid_mask; ret = gpiochip_add_data(&pctrl->chip, pctrl); if (ret) {