From patchwork Tue Feb 4 13:14:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 13959177 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 7706E20DD71 for ; Tue, 4 Feb 2025 13:14:29 +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=1738674869; cv=none; b=QOYhS3Fq/QLIdHUTwm3yojFA3iofKgEmELRQH9Zdlh3DXthtWP9NrRqRf1eZ1BwYZLlDqopQFianQYBYrY4vjubBIG+hwbCRF6PfdynK8TIWxPNe6oozqV8r3EDEHeET4rObLQ6/f75sCMWGyQPn8o1D9CxylKSj9R6VIduce18= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738674869; c=relaxed/simple; bh=C4Y0oFTe87ATUsaE5Py2t5kX/LwIzq+3MQv5G5HA0WA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UNiAMW2L4VHE66SnFI1lROaxylLdY/SAXyHIEvKnJWWAfShtCbtJbDd1PVQ06mCyFHQW5j5FLfy3mqTMidKygcs+sFOP/HRsebUmFy/VXqEUtK4gZALCqw30vAQ5C/VfAgF3lSiElJeRWqfYHQBAY9oCpebzBKeYxT9C0ZISfPA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YBfKmrUF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YBfKmrUF" Received: by smtp.kernel.org (Postfix) id 68045C4CEE4; Tue, 4 Feb 2025 13:14:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DF47C4AF09; Tue, 4 Feb 2025 13:14:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738674869; bh=C4Y0oFTe87ATUsaE5Py2t5kX/LwIzq+3MQv5G5HA0WA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YBfKmrUFm5hJvgxoIUuqE2AUIK6nQELHLG/hTTs3zDrDFpAvbiM0nnDh7ypBO2u2n 7tpCdL0oIaSxr+K03i2fGyEaDir4kKq3gKicnsZVP2acfOVfXZ2KfYQWi+JkFl/QNp etOlhN8byVK0Fa9SqzPkCJS95NnjpXLSDJ0TuKCsqiIbkpWnlb8ZbT1hgraPPS3x/B WEZ0/hZhFzN6VSVR2dFnPgtqoAj2t1nUpmymfNsZ9OxwbjaI1RwWfewhQlCrywLwVc /7u1S61mnX2uFLvmRQOMLZiaDPhr8NkgSskryjkeQiNpyqKDycOlixd8g0wj3FOpGz kYr2Y3ZLqQS9Q== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Arnd Bergmann , soc@kernel.org Cc: arm@kernel.org, Andy Shevchenko , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , linux-crypto@vger.kernel.org, Herbert Xu , Greg Kroah-Hartman , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH 1/5] platform: cznic: turris-omnia-mcu: Refactor requesting MCU interrupt Date: Tue, 4 Feb 2025 14:14:11 +0100 Message-ID: <20250204131415.27014-2-kabel@kernel.org> X-Mailer: git-send-email 2.45.3 In-Reply-To: <20250204131415.27014-1-kabel@kernel.org> References: <20250204131415.27014-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: soc@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Refactor the code that gets and requests the TRNG MCU interrupt in the TRNG part of the driver into a helper function and put it into the GPIO part of the driver. Signed-off-by: Marek Behún --- .../platform/cznic/turris-omnia-mcu-gpio.c | 21 ++++++++++++++++++- .../platform/cznic/turris-omnia-mcu-trng.c | 17 ++++----------- drivers/platform/cznic/turris-omnia-mcu.h | 4 +++- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/drivers/platform/cznic/turris-omnia-mcu-gpio.c b/drivers/platform/cznic/turris-omnia-mcu-gpio.c index 5f35f7c5d5d7..932383f7491a 100644 --- a/drivers/platform/cznic/turris-omnia-mcu-gpio.c +++ b/drivers/platform/cznic/turris-omnia-mcu-gpio.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -195,7 +196,7 @@ static const struct omnia_gpio omnia_gpios[64] = { }; /* mapping from interrupts to indexes of GPIOs in the omnia_gpios array */ -const u8 omnia_int_to_gpio_idx[32] = { +static const u8 omnia_int_to_gpio_idx[32] = { [__bf_shf(OMNIA_INT_CARD_DET)] = 4, [__bf_shf(OMNIA_INT_MSATA_IND)] = 5, [__bf_shf(OMNIA_INT_USB30_OVC)] = 6, @@ -1093,3 +1094,21 @@ int omnia_mcu_register_gpiochip(struct omnia_mcu *mcu) return 0; } + +int omnia_mcu_request_irq(struct omnia_mcu *mcu, u32 spec, + irq_handler_t thread_fn, const char *devname) +{ + u8 irq_idx; + int irq; + + if (!spec) + return -EINVAL; + + irq_idx = omnia_int_to_gpio_idx[__bf_shf(spec)]; + irq = gpiod_to_irq(gpio_device_get_desc(mcu->gc.gpiodev, irq_idx)); + if (irq < 0) + return irq; + + return devm_request_threaded_irq(&mcu->client->dev, irq, NULL, + thread_fn, IRQF_ONESHOT, devname, mcu); +} diff --git a/drivers/platform/cznic/turris-omnia-mcu-trng.c b/drivers/platform/cznic/turris-omnia-mcu-trng.c index 9a1d9292dc9a..e3826959e6de 100644 --- a/drivers/platform/cznic/turris-omnia-mcu-trng.c +++ b/drivers/platform/cznic/turris-omnia-mcu-trng.c @@ -5,12 +5,9 @@ * 2024 by Marek Behún */ -#include #include #include #include -#include -#include #include #include #include @@ -62,17 +59,12 @@ static int omnia_trng_read(struct hwrng *rng, void *data, size_t max, bool wait) int omnia_mcu_register_trng(struct omnia_mcu *mcu) { struct device *dev = &mcu->client->dev; - u8 irq_idx, dummy; - int irq, err; + u8 dummy; + int err; if (!(mcu->features & OMNIA_FEAT_TRNG)) return 0; - irq_idx = omnia_int_to_gpio_idx[__bf_shf(OMNIA_INT_TRNG)]; - irq = gpiod_to_irq(gpio_device_get_desc(mcu->gc.gpiodev, irq_idx)); - if (irq < 0) - return dev_err_probe(dev, irq, "Cannot get TRNG IRQ\n"); - /* * If someone else cleared the TRNG interrupt but did not read the * entropy, a new interrupt won't be generated, and entropy collection @@ -86,9 +78,8 @@ int omnia_mcu_register_trng(struct omnia_mcu *mcu) init_completion(&mcu->trng_entropy_ready); - err = devm_request_threaded_irq(dev, irq, NULL, omnia_trng_irq_handler, - IRQF_ONESHOT, "turris-omnia-mcu-trng", - mcu); + err = omnia_mcu_request_irq(mcu, OMNIA_INT_TRNG, omnia_trng_irq_handler, + "turris-omnia-mcu-trng"); if (err) return dev_err_probe(dev, err, "Cannot request TRNG IRQ\n"); diff --git a/drivers/platform/cznic/turris-omnia-mcu.h b/drivers/platform/cznic/turris-omnia-mcu.h index 088541be3f4c..f2084880a00c 100644 --- a/drivers/platform/cznic/turris-omnia-mcu.h +++ b/drivers/platform/cznic/turris-omnia-mcu.h @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -91,9 +92,10 @@ struct omnia_mcu { }; #ifdef CONFIG_TURRIS_OMNIA_MCU_GPIO -extern const u8 omnia_int_to_gpio_idx[32]; extern const struct attribute_group omnia_mcu_gpio_group; int omnia_mcu_register_gpiochip(struct omnia_mcu *mcu); +int omnia_mcu_request_irq(struct omnia_mcu *mcu, u32 spec, + irq_handler_t thread_fn, const char *devname); #else static inline int omnia_mcu_register_gpiochip(struct omnia_mcu *mcu) {