From patchwork Tue Feb 6 20:31:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 197643 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1807394dyb; Tue, 6 Feb 2024 12:34:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IEi/+uDDIqLt8KaqIT3DMHbknvhf6k+MOE0I4Zd7Gu0x474pIVAuUvv4J2e5bbV87S5rY7t X-Received: by 2002:a81:ee0a:0:b0:602:af8a:9c7d with SMTP id l10-20020a81ee0a000000b00602af8a9c7dmr2940992ywm.26.1707251656597; Tue, 06 Feb 2024 12:34:16 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707251656; cv=pass; d=google.com; s=arc-20160816; b=T9o5T6uFcmHj0Z6vDWy/+0bPxFKCt1h1ic+7ZG9y+873ekysDLhngYpljZ/so1R+I+ qLAIUdNhl2SA0Ajw0IMBLbINtK5bMf4BQ+2pWm0ZNrVXZSX3Hg/WeKmtDykbs12FTWKl OGfJsdNDApTItrLDRnRuHivhNqvmf82But4kfvgPl42jVxIbu8zKibucmxP28/mAebEA ylbz/1iNABKeempAgfqa+F4w8Hx/5OIb8SspDWJ4Hkws+tYGYfU2KhHXZrT8meIK4mvH 3KID8m8Vvy6M+CC0MTK7kZmFTByXsg6ObA/1s9DMPJypwYKL2yB8kJt5NKngDyXAaW9/ X8Pw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=ToIrT2LNCFz2XCRg0eJnPnbG0vGfFWVjjayhGrOFDO8=; fh=TI3Jc5NbXQqaUBMxNcNxd6jlUxcOey6yv+emsa6Blis=; b=KHlAw6QVzMfegPyjdHlhkv8wtQSiVh0wm8tjmRxNTfQimvgFPf+gE+JbJ3gKycktkq ryllP/zZCyDlHN0q0My3G5pbVtvQzw1pW5PSYZBpo8lItfZ99d5rJB1t+HInT+65L56h 8MAoGFLyvZNbUABKipgnVvb+l71Zwjl1gEJCF5TA9womZ927Kr/Az+9BspemEsFYlAJ5 F8ZW4UulhWwS57Wnx9A4q/7FBIvEoe83ZQoDDIht22Z/Dv74HnatDUKbBWtPSe8+u43q mBkFy4j059AGmnUh37/0uLHNKhPbjX6UTH1dM/2OhzxsbrHIgTtuQIrgYgxevy89e9aF C+ww==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@baylibre-com.20230601.gappssmtp.com header.s=20230601 header.b=EkY94yBQ; arc=pass (i=1 spf=pass spfdomain=baylibre.com dkim=pass dkdomain=baylibre-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-55602-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55602-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=1; AJvYcCXhNQdmdabSmFjQE05/rDbDSQbRAwdwlJRS+cr440adMYhCRiNOjrYL2J5YBX8c09VnkBNqGtTGBxWuOXPjUkrMGS10Ew== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id x4-20020a05620a098400b00783a2469a57si2959956qkx.340.2024.02.06.12.34.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 12:34:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-55602-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20230601.gappssmtp.com header.s=20230601 header.b=EkY94yBQ; arc=pass (i=1 spf=pass spfdomain=baylibre.com dkim=pass dkdomain=baylibre-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-55602-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55602-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 39C6D1C239B0 for ; Tue, 6 Feb 2024 20:34:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 66A7B1BF3F; Tue, 6 Feb 2024 20:33:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="EkY94yBQ" Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) (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 465371B7FC for ; Tue, 6 Feb 2024 20:33:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707251609; cv=none; b=k5vuOseXovWqeth1LIqxRv/9r4hHYdXSZwxJwpNCSyXvo+lzkj4B/HSlt42neUwWoR7B67vobxNbLCItfzyP9R9/J78hg8G3cs3l+SfsERQw7YK01uBVLBrXqCbIdd9pg8K23yjVF7izGBaZOXkWbniaYfDIzhf1eJ3zupRh6ss= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707251609; c=relaxed/simple; bh=ItgJhdHJeveOYLjbW9w4wvk7BQRF9mDexdoZH4wLRiw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PoOMNix3MA1W49CsEEwDK9M6WjqOU11FcmLt1ZTTaOUtyPBXSrDZBkigYU629Kk5TAAiLIG7m4QODVHtmVGPobSQ284YaZTEA+DUOi9swJNrWFXUW5VixCM4TnLuIYGzt2+vL34IL+qYRqc4Qu+odoA1T4J9Ivp8LwQkPS6W1PU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=EkY94yBQ; arc=none smtp.client-ip=209.85.210.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Received: by mail-ot1-f46.google.com with SMTP id 46e09a7af769-6e1352dd653so3843362a34.2 for ; Tue, 06 Feb 2024 12:33:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1707251605; x=1707856405; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ToIrT2LNCFz2XCRg0eJnPnbG0vGfFWVjjayhGrOFDO8=; b=EkY94yBQ/17WV9SnAFRzkkvIpo8WHX1S5qZkzMnoMoU9lx4C10t5JVowDN+y7bHu8s y1WPYfbqZExXJTYae1zc+0inCLg1FC+FTlr5DhFTsL1BwbJIeEIUipWUuXJgoaC9Qnqm 4cB1iD/YwkCqE+PCNeRID8TOXvnO4RYs2WJwR07c54ATxbJE+WPv34erwtK8+PpwMQ4E vSacuhGir3GrRcSVaU0Ay6qjQiK52obiUF5IVUMKa3UA4cZfBAUuYwSazmMmUKfbC8VK ZV8FeHyLKEXsEo/Lzh2KWyPpeAQ/oOPyYzLFVBD/4EOPXbOCMvd7uy1d0JBRM9Q8Mxp9 U4Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707251605; x=1707856405; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ToIrT2LNCFz2XCRg0eJnPnbG0vGfFWVjjayhGrOFDO8=; b=m2LuVTaIQBXGclu3LMbGqfaqbd0Az/XwqVOGKs12A8ZuXuQ28SVASxk6sQ3drK2QkP FEGIAy0oU1eZFVqvFMW6+Bmh1OSavP358FRo5YDkbjo6hEicW/93g2L2vyBy7TriI0KB rNPeFa3AOvAeQZTAb7qi8NEw7KHrAOcWZaTNG/MJRDXle73xkaUNVqsMosZATuWA6EuI Zqnq+qa42tx/WDvwwIyPlU6xj8SW8UoTzYSrVBf9UfWRJwlGyKFfu8z2Qa1z417yFZCV zMGONRbC6PW0PhpXSgFj3OUEpgZsTwZnHbmG3mMLQC+RIjr1fY2r6SHKpkIyE3xnrT6M 8Ohg== X-Gm-Message-State: AOJu0YxlU4akos0uXTGZGH6pmrcCxjnVUzYgTxeEeNfIKNhAHqGHSlQR yJCp45k+UTM+UQyHl5BlvmL5omQRKHOPwQI4LIoye69J8gIRE4vbOyCh37gO7ns= X-Received: by 2002:a9d:75d1:0:b0:6e1:79a:fc8f with SMTP id c17-20020a9d75d1000000b006e1079afc8fmr4035185otl.35.1707251605352; Tue, 06 Feb 2024 12:33:25 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXNlKm8D9l7Atw2xTjsWSlxzc4CW5q/sF3Sc0WcWd9MNNvdSayLRhUki4yL1j3jMhNYqsUErjPlP/RWPygkggOk03aoCptb8LSZT3aBgAkviZNgzaAGhcjj/3SAgT53BknQH1Lu5jNredg6lEp+zedcP7dctbrCR2loSthQAta/H3NAXn0lbBjwMQQYRYTpczKJOw== Received: from freyr.lechnology.com (ip98-183-112-25.ok.ok.cox.net. [98.183.112.25]) by smtp.gmail.com with ESMTPSA id l2-20020a05683016c200b006e11d93ff09sm429581otr.72.2024.02.06.12.33.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 12:33:25 -0800 (PST) From: David Lechner To: linux-spi@vger.kernel.org Cc: David Lechner , Mark Brown , Michael Hennerich , =?utf-8?q?Nuno_S=C3=A1?= , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] spi: axi-spi-engine: remove use of ida for sync id Date: Tue, 6 Feb 2024 14:31:27 -0600 Message-ID: <20240206-axi-spi-engine-round-2-1-v1-1-ea6eeb60f4fb@baylibre.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240206-axi-spi-engine-round-2-1-v1-0-ea6eeb60f4fb@baylibre.com> References: <20240206-axi-spi-engine-round-2-1-v1-0-ea6eeb60f4fb@baylibre.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mailer: b4 0.12.4 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790183113108116055 X-GMAIL-MSGID: 1790183113108116055 Profiling has shown that ida_alloc_range() accounts for about 10% of the time spent in spi_sync() when using the AXI SPI Engine controller. This call is used to create a unique id for each SPI message to match to an IRQ when the message is complete. Since the core SPI code serializes messages in a message queue, we can only have one message in flight at a time, namely host->cur_msg. This means that we can use a fixed value instead of a unique id for each message since there can never be more than one message pending at a time. This patch removes the use of ida for the sync id and replaces it with a constant value. This simplifies the driver and improves performance. Signed-off-by: David Lechner Reviewed-by: Nuno Sa --- drivers/spi/spi-axi-spi-engine.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/drivers/spi/spi-axi-spi-engine.c b/drivers/spi/spi-axi-spi-engine.c index 6b0c72bf3395..9cc602075c17 100644 --- a/drivers/spi/spi-axi-spi-engine.c +++ b/drivers/spi/spi-axi-spi-engine.c @@ -57,6 +57,9 @@ #define SPI_ENGINE_TRANSFER_WRITE 0x1 #define SPI_ENGINE_TRANSFER_READ 0x2 +/* Arbitrary sync ID for use by host->cur_msg */ +#define AXI_SPI_ENGINE_CUR_MSG_SYNC_ID 0x1 + #define SPI_ENGINE_CMD(inst, arg1, arg2) \ (((inst) << 12) | ((arg1) << 8) | (arg2)) @@ -98,8 +101,6 @@ struct spi_engine_message_state { unsigned int rx_length; /** @rx_buf: Bytes not yet written to the RX FIFO. */ uint8_t *rx_buf; - /** @sync_id: ID to correlate SYNC interrupts with this message. */ - u8 sync_id; }; struct spi_engine { @@ -109,7 +110,6 @@ struct spi_engine { spinlock_t lock; void __iomem *base; - struct ida sync_ida; struct timer_list watchdog_timer; struct spi_controller *controller; @@ -483,9 +483,7 @@ static irqreturn_t spi_engine_irq(int irq, void *devid) } if (pending & SPI_ENGINE_INT_SYNC && msg) { - struct spi_engine_message_state *st = msg->state; - - if (completed_id == st->sync_id) { + if (completed_id == AXI_SPI_ENGINE_CUR_MSG_SYNC_ID) { if (timer_delete_sync(&spi_engine->watchdog_timer)) { msg->status = 0; msg->actual_length = msg->frame_length; @@ -510,10 +508,8 @@ static int spi_engine_prepare_message(struct spi_controller *host, struct spi_message *msg) { struct spi_engine_program p_dry, *p; - struct spi_engine *spi_engine = spi_controller_get_devdata(host); struct spi_engine_message_state *st; size_t size; - int ret; st = kzalloc(sizeof(*st), GFP_KERNEL); if (!st) @@ -531,18 +527,10 @@ static int spi_engine_prepare_message(struct spi_controller *host, return -ENOMEM; } - ret = ida_alloc_range(&spi_engine->sync_ida, 0, U8_MAX, GFP_KERNEL); - if (ret < 0) { - kfree(p); - kfree(st); - return ret; - } - - st->sync_id = ret; - spi_engine_compile_message(msg, false, p); - spi_engine_program_add_cmd(p, false, SPI_ENGINE_CMD_SYNC(st->sync_id)); + spi_engine_program_add_cmd(p, false, SPI_ENGINE_CMD_SYNC( + AXI_SPI_ENGINE_CUR_MSG_SYNC_ID)); st->p = p; st->cmd_buf = p->instructions; @@ -555,10 +543,8 @@ static int spi_engine_prepare_message(struct spi_controller *host, static int spi_engine_unprepare_message(struct spi_controller *host, struct spi_message *msg) { - struct spi_engine *spi_engine = spi_controller_get_devdata(host); struct spi_engine_message_state *st = msg->state; - ida_free(&spi_engine->sync_ida, st->sync_id); kfree(st->p); kfree(st); @@ -640,7 +626,6 @@ static int spi_engine_probe(struct platform_device *pdev) spi_engine = spi_controller_get_devdata(host); spin_lock_init(&spi_engine->lock); - ida_init(&spi_engine->sync_ida); timer_setup(&spi_engine->watchdog_timer, spi_engine_timeout, TIMER_IRQSAFE); spi_engine->controller = host; From patchwork Tue Feb 6 20:31:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 197642 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1807379dyb; Tue, 6 Feb 2024 12:34:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IHAGM/HBEp+fZXQJx5vTC0Ya09eO2u/jL/uJa6B3lDZjfPeUJeKNPm2V+u4ismO7OLvx9tI X-Received: by 2002:a17:906:110d:b0:a36:5657:f442 with SMTP id h13-20020a170906110d00b00a365657f442mr2789301eja.10.1707251655852; Tue, 06 Feb 2024 12:34:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707251655; cv=pass; d=google.com; s=arc-20160816; b=hglMlYPFaPmbVw4siphJX3ztl/Syx34qMeNWXe/RlZOp1FhdhKQn6ab/Hzd8QkLGQI m7IiqIIou3NIX/Wb2gjjmL4dBKVkiEBVNBwyjfsotd0Bwc233/a0HAZ48J0tln1Soft5 pV+wHEm2mnLXEb1hs2d2T3cI96FSnofqEnpkxt36D4j2mFtEdO185c+KK/crD8r451+Y 3+4mzEObrxnLh2xKYmpkrTSMeQJDmBXpwRZ97HYndhjDnrdVEgIHsKAv2NBOVJcZI5V7 +pPDXR9Xbjpetl6awekQeKCdp+1SsOoaQCsJF78G+49pWPgJkSa6lo9Hb1UQVlI12REi 8nHA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=YfTOMRIgy5yUmp1Zi1mrOXV6NTegVTcyJrqWrXnDXfo=; fh=plFBxhKMZDbPfCQSBfcrVDJQjQwrv3EtIx9RG/KN6r8=; b=dmYsJDyA4ikYmzyvtGVhTcQxFNJBTpczapPsK61B3VbjezAuM/C2eddzGzDr8O1S4R BjbQE8nv1HR58XC8ps+tNby4BbphpyBHMp0RXbORgCfLfXDvJC8ItQdT1cHZxX6fMidF CppyveuNPix7VmNsnhxRWS8SgyvJsQjMKYTL/B/75mMxxjOc3kKxGgikrxcB28nf1yxB 0fnR1O/gf4Z2jygq5pev63nRFpCtvpVH2IHgzNyCAwRamvoJdMaxfvfDKjrMbePpcgDq sM9lKBEJkzTBOk4tp2W44oNCO0mVFVpDJJTrySN2PnxdZuC5m7qEsTzTe4NtMhjrApnB +org==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@baylibre-com.20230601.gappssmtp.com header.s=20230601 header.b=uNXpjRXu; arc=pass (i=1 spf=pass spfdomain=baylibre.com dkim=pass dkdomain=baylibre-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-55601-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55601-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=1; AJvYcCUQyk7wG2RAwZ6KtZpDSgF/iOzNip7ku8TsshCWVLIL9AH+Y4CJtHPyqrocP+22DUJ+suvVNL0GLMm2Okb/QJm4Tyb1ng== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id s27-20020a170906355b00b00a37cb06d92fsi1430539eja.862.2024.02.06.12.34.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 12:34:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-55601-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20230601.gappssmtp.com header.s=20230601 header.b=uNXpjRXu; arc=pass (i=1 spf=pass spfdomain=baylibre.com dkim=pass dkdomain=baylibre-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-55601-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55601-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 4A5C01F25FC3 for ; Tue, 6 Feb 2024 20:34:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3C3E91BF3B; Tue, 6 Feb 2024 20:33:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="uNXpjRXu" Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) (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 01FFE1B807 for ; Tue, 6 Feb 2024 20:33:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707251609; cv=none; b=qyk5iqdZy9jSWjqYFAa4ySfc/6B1VrNMl/4sMzm+AJYLPOmMQakyfKZ5FeB4T+IpjyNB84V/CjRw01oN/wagbmVoXkrxXR+obHEgiyCy+iU3G4o8xyUfOFgrPWmwB3plZr5GJ6SEaNIi1ElgfIMN95q/SsO13mIa2pbkMd7neek= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707251609; c=relaxed/simple; bh=zV6UMa6KGS3460hptBgo8h2zveZj4vaThxc5kbb1euc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=A8VOgSoW7JcnNlH4W/LJOGNHOt/EnmgQtYlogaBtHaHa+402805RRhx65d+VMyChlKzU5B1CP5wRO5pbzjzlT4pOy36+tBx0/quEWIBefn3mnqrULI0nIWCCEGA+i6TBM1PSXHrIhQCMzxVYl9owXGVYn0zHvDKCFo4fPcSyOM4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=uNXpjRXu; arc=none smtp.client-ip=209.85.210.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-6e1149c16d4so2164552a34.3 for ; Tue, 06 Feb 2024 12:33:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1707251606; x=1707856406; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YfTOMRIgy5yUmp1Zi1mrOXV6NTegVTcyJrqWrXnDXfo=; b=uNXpjRXuSdTOAMczG5ehg8nEJRUSsmBl2egbaAmgfkpCErvlAYEHr8b352FcupFRI/ UXhBA9Jw1SM+ofjnymnO95qugGdn/douklZiU/AcaOt7QvX1D4FxgzC8J9GxM3TKGPqd Iw7rHvETzE/pV1pb0F4PilII5vCVOeFJTjV71wdJFsIme6QI9m8QwskF/tTqaN17Snrf JXdfZd57ksGUUTL2GzeWjl02CBleHt/O2vhPfRb+q3nJN/EwMWAMJx72ji2bjgifdL5j cAOUHOvXBRzD59dZGGTIyw0nwJ8I04xSJt0menMljtiN/qUxrASKhVspGuA7HvNTSq3v JhwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707251606; x=1707856406; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YfTOMRIgy5yUmp1Zi1mrOXV6NTegVTcyJrqWrXnDXfo=; b=vW/8a8/b5+C3P3t6EYoxPX8QNVscqhFI8ovT/VNxrX3nNkQ2xAXX1P0NKfpaVEqOch 1NazcziA4tidJolu2p/3wh+E/jQIt01/GReNmcyTUyEyCmqPS8uij3Ofxg65+IYIM88R YMoFkOF+MOXskNgwprczvqmwzADm1qNFnKpJmn20AWLRWaAD3lTpjiF146jbH0iDjy8B iGX4A7phcrzfQac9jEsN8MuipT3yRxfBUo8vQ1Zz2s8J1cvXRE6Y6uS/JpF+QiBNcdjL rsvXylmAhdUP4Y2uUGD0m/QyyrweL9tty8ErROqrr2Mw3RGCiAR80C1ukJxFmQqxBnqk tLxw== X-Gm-Message-State: AOJu0YxRWiTFVoaq8pd6DCc7AN7peFx0FzDh+L3AMHW3EvDvT/Ks6qDe H5NsA0xkQoGfS+jE3xmIM8s043dXrBjevZhbNzPA29isNlzE8oeL9ZL/3sVU6H4= X-Received: by 2002:a9d:77d2:0:b0:6e0:f903:f7a6 with SMTP id w18-20020a9d77d2000000b006e0f903f7a6mr4073222otl.36.1707251606042; Tue, 06 Feb 2024 12:33:26 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCV+uanjprraKmO3BJdbA8N8V3mZg3/e56x/S+A6o4ojIU2WsGbOoQVl0I9ozFPnU5QepvkfdTSsww7u4InLod8SgXN3j2jrCTvp2CLa+HMZhFUdVj22pGJIxuMYMU+JUEki6KNLWwe01zeKUHEF+s99igBfSGrU4txJtszHp+ndQ3XwYO7lwQ1Tmh/CM7n3+tKIXQ== Received: from freyr.lechnology.com (ip98-183-112-25.ok.ok.cox.net. [98.183.112.25]) by smtp.gmail.com with ESMTPSA id l2-20020a05683016c200b006e11d93ff09sm429581otr.72.2024.02.06.12.33.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 12:33:25 -0800 (PST) From: David Lechner To: linux-spi@vger.kernel.org Cc: David Lechner , Mark Brown , Michael Hennerich , =?utf-8?q?Nuno_S=C3=A1?= , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] spi: axi-spi-engine: move msg finalization out of irq handler Date: Tue, 6 Feb 2024 14:31:28 -0600 Message-ID: <20240206-axi-spi-engine-round-2-1-v1-2-ea6eeb60f4fb@baylibre.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240206-axi-spi-engine-round-2-1-v1-0-ea6eeb60f4fb@baylibre.com> References: <20240206-axi-spi-engine-round-2-1-v1-0-ea6eeb60f4fb@baylibre.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mailer: b4 0.12.4 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790183112477478902 X-GMAIL-MSGID: 1790183112477478902 As a general principal, it is best to do as little as possible in an interrupt handler. This patch reworks the AXI SPI Engine driver to move timer_delete_sync() and spi_finalize_current_message() out of the interrupt handler. Instead, spi_finalize_current_message() is moved to the transfer_one_message function (similar to nearly all other SPI controllers). A completion is now used to wait for the sync interrupt that indicates that the message is complete. The watchdog timer is no longer needed since we can use the wait_for_completion_timeout() function to wait for the message to complete with the same effect. As a bonus, these changes also improve throughput of the SPI controller. For example, this was tested on a ZynqMP with a 80MHz SCLK reading 4 byte samples from an ADC. The max measured throughput increased from 26k to 28k samples per second. Signed-off-by: David Lechner Reviewed-by: Nuno Sa --- drivers/spi/spi-axi-spi-engine.c | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/drivers/spi/spi-axi-spi-engine.c b/drivers/spi/spi-axi-spi-engine.c index 9cc602075c17..3c96aa9232b3 100644 --- a/drivers/spi/spi-axi-spi-engine.c +++ b/drivers/spi/spi-axi-spi-engine.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include @@ -14,7 +15,6 @@ #include #include #include -#include #define SPI_ENGINE_REG_RESET 0x40 @@ -110,9 +110,7 @@ struct spi_engine { spinlock_t lock; void __iomem *base; - struct timer_list watchdog_timer; - struct spi_controller *controller; - + struct completion msg_complete; unsigned int int_enable; }; @@ -484,11 +482,9 @@ static irqreturn_t spi_engine_irq(int irq, void *devid) if (pending & SPI_ENGINE_INT_SYNC && msg) { if (completed_id == AXI_SPI_ENGINE_CUR_MSG_SYNC_ID) { - if (timer_delete_sync(&spi_engine->watchdog_timer)) { - msg->status = 0; - msg->actual_length = msg->frame_length; - spi_finalize_current_message(host); - } + msg->status = 0; + msg->actual_length = msg->frame_length; + complete(&spi_engine->msg_complete); disable_int |= SPI_ENGINE_INT_SYNC; } } @@ -559,7 +555,7 @@ static int spi_engine_transfer_one_message(struct spi_controller *host, unsigned int int_enable = 0; unsigned long flags; - mod_timer(&spi_engine->watchdog_timer, jiffies + msecs_to_jiffies(5000)); + reinit_completion(&spi_engine->msg_complete); spin_lock_irqsave(&spi_engine->lock, flags); @@ -581,21 +577,16 @@ static int spi_engine_transfer_one_message(struct spi_controller *host, spi_engine->int_enable = int_enable; spin_unlock_irqrestore(&spi_engine->lock, flags); - return 0; -} - -static void spi_engine_timeout(struct timer_list *timer) -{ - struct spi_engine *spi_engine = from_timer(spi_engine, timer, watchdog_timer); - struct spi_controller *host = spi_engine->controller; - - if (WARN_ON(!host->cur_msg)) - return; + if (!wait_for_completion_timeout(&spi_engine->msg_complete, + msecs_to_jiffies(5000))) { + dev_err(&host->dev, + "Timeout occurred while waiting for transfer to complete. Hardware is probably broken.\n"); + msg->status = -ETIMEDOUT; + } - dev_err(&host->dev, - "Timeout occurred while waiting for transfer to complete. Hardware is probably broken.\n"); - host->cur_msg->status = -ETIMEDOUT; spi_finalize_current_message(host); + + return msg->status; } static void spi_engine_release_hw(void *p) @@ -626,8 +617,7 @@ static int spi_engine_probe(struct platform_device *pdev) spi_engine = spi_controller_get_devdata(host); spin_lock_init(&spi_engine->lock); - timer_setup(&spi_engine->watchdog_timer, spi_engine_timeout, TIMER_IRQSAFE); - spi_engine->controller = host; + init_completion(&spi_engine->msg_complete); spi_engine->clk = devm_clk_get_enabled(&pdev->dev, "s_axi_aclk"); if (IS_ERR(spi_engine->clk))