From patchwork Fri Nov 20 00:49:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 1403414 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CcdHV4PbVz9sSs for ; Fri, 20 Nov 2020 11:49:58 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=mbTZtbGc; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CcdHV2S0TzDqpC for ; Fri, 20 Nov 2020 11:49:58 +1100 (AEDT) X-Original-To: linux-fsi@lists.ozlabs.org Delivered-To: linux-fsi@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::441; helo=mail-pf1-x441.google.com; envelope-from=joel.stan@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=mbTZtbGc; dkim-atps=neutral Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CcdHP0nn5zDqnk for ; Fri, 20 Nov 2020 11:49:52 +1100 (AEDT) Received: by mail-pf1-x441.google.com with SMTP id t8so6190867pfg.8 for ; Thu, 19 Nov 2020 16:49:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2Q+Mp75nfNtK6sDEMyLCAn9ibN5HjWvl6TODH5bfTHM=; b=mbTZtbGchTO/Nfp1nQK9phNAZQAkQ3UxGzTamYMVaSTEibuNRP/5jqtj2DV6OpK3jM UAgRpels/gxKgJUPbXftL/HXioxwbfp+5btqKIlyXhhl1UqtiNSvewVgvP8Afl/4k/Hi LoAzQnNz8MTJDPgwi5Imxrm50/6KEgAAof+kzr6Lo5gBNKEgf1vGSp1AnZQASYlMknXM 28HXdk2S3f6udbjgyHiz7cB00GDyHQkXjTmZFoyRjlMBOhJ/zfJl79G7E4SnQ2k2YfVq rEGkVoNIn0WXp5eP3Jz9EJ1zdulIwhmTrT5FGl1HaJCucTcwMvS70L6ddIR6D3mT8uMz MGRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=2Q+Mp75nfNtK6sDEMyLCAn9ibN5HjWvl6TODH5bfTHM=; b=STHWtmx9ZCD331S0E6EWelycAkWBwPWYqavgzN6Tfkesog9kqshTFX+dxXTRT+vzxB hD+Jc0i1x3jbJC/wZXxpHOL+DI11uZGk4rQclB/491qGpLRsdl7XfCKYOqTYG9m1vamn YTj3Xr0Zd7wWaIKidAwxnc/Qvx4hhNkI8mUeBJgVdw+AFriyfSAdSsXmeQizbYxS7g9l 2QvStUnWJt66hevJhi+7oZgSk3G2J7NJGdMdA6W7RD0J52SFU6zhLZ3R7++iHGddpUVR Mvoy/BXybjHLL7E5x8+OJu0FdJQ0wjGj5eosiMbnQ+ynFycggvsEPbV/gVRaUDw7lhuq +SnA== X-Gm-Message-State: AOAM532t4nMM/X+80K7JJd1itlrfBatGrVMQj2jMrvj5O9WEN9CG28px Tkdz650mIntMyYXRCxMpr+4= X-Google-Smtp-Source: ABdhPJzmMwRA6Z/TuspnzE2mztwaREvUp8ZN1TfsOwjnlMRSOzHMBVPhc77zLs/morRdW6FYuLDZIw== X-Received: by 2002:a65:4483:: with SMTP id l3mr14680500pgq.96.1605833390301; Thu, 19 Nov 2020 16:49:50 -0800 (PST) Received: from localhost.localdomain ([45.124.203.19]) by smtp.gmail.com with ESMTPSA id s4sm1038802pjn.0.2020.11.19.16.49.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 16:49:49 -0800 (PST) From: Joel Stanley To: Jeremy Kerr , Alistar Popple , Eddie James , Andrew Jeffery , Greg Kroah-Hartman Subject: [PATCH] fsi: Aspeed: Add mutex to protect HW access Date: Fri, 20 Nov 2020 11:19:29 +1030 Message-Id: <20201120004929.185239-1-joel@jms.id.au> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-BeenThere: linux-fsi@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Milton Miller , linux-kernel@vger.kernel.org, linux-fsi@lists.ozlabs.org Errors-To: linux-fsi-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "linux-fsi" From: Eddie James There is nothing to prevent multiple commands being executed simultaneously. Add a mutex to prevent this. Fixes: 606397d67f41 ("fsi: Add ast2600 master driver") Signed-off-by: Eddie James Reviewed-by: Joel Stanley Reviewed-by: Milton Miller Signed-off-by: Joel Stanley --- Hi Greg, can you please merge this. Signed-off-by: Joel Stanley --- drivers/fsi/fsi-master-aspeed.c | 45 +++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/drivers/fsi/fsi-master-aspeed.c b/drivers/fsi/fsi-master-aspeed.c index c006ec008a1a..90dbe58ca1ed 100644 --- a/drivers/fsi/fsi-master-aspeed.c +++ b/drivers/fsi/fsi-master-aspeed.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -19,6 +20,7 @@ struct fsi_master_aspeed { struct fsi_master master; + struct mutex lock; /* protect HW access */ struct device *dev; void __iomem *base; struct clk *clk; @@ -254,6 +256,8 @@ static int aspeed_master_read(struct fsi_master *master, int link, addr |= id << 21; addr += link * FSI_HUB_LINK_SIZE; + mutex_lock(&aspeed->lock); + switch (size) { case 1: ret = opb_readb(aspeed, fsi_base + addr, val); @@ -265,14 +269,14 @@ static int aspeed_master_read(struct fsi_master *master, int link, ret = opb_readl(aspeed, fsi_base + addr, val); break; default: - return -EINVAL; + ret = -EINVAL; + goto done; } ret = check_errors(aspeed, ret); - if (ret) - return ret; - - return 0; +done: + mutex_unlock(&aspeed->lock); + return ret; } static int aspeed_master_write(struct fsi_master *master, int link, @@ -287,6 +291,8 @@ static int aspeed_master_write(struct fsi_master *master, int link, addr |= id << 21; addr += link * FSI_HUB_LINK_SIZE; + mutex_lock(&aspeed->lock); + switch (size) { case 1: ret = opb_writeb(aspeed, fsi_base + addr, *(u8 *)val); @@ -298,14 +304,14 @@ static int aspeed_master_write(struct fsi_master *master, int link, ret = opb_writel(aspeed, fsi_base + addr, *(__be32 *)val); break; default: - return -EINVAL; + ret = -EINVAL; + goto done; } ret = check_errors(aspeed, ret); - if (ret) - return ret; - - return 0; +done: + mutex_unlock(&aspeed->lock); + return ret; } static int aspeed_master_link_enable(struct fsi_master *master, int link, @@ -320,17 +326,21 @@ static int aspeed_master_link_enable(struct fsi_master *master, int link, reg = cpu_to_be32(0x80000000 >> bit); - if (!enable) - return opb_writel(aspeed, ctrl_base + FSI_MCENP0 + (4 * idx), - reg); + mutex_lock(&aspeed->lock); + + if (!enable) { + ret = opb_writel(aspeed, ctrl_base + FSI_MCENP0 + (4 * idx), reg); + goto done; + } ret = opb_writel(aspeed, ctrl_base + FSI_MSENP0 + (4 * idx), reg); if (ret) - return ret; + goto done; mdelay(FSI_LINK_ENABLE_SETUP_TIME); - - return 0; +done: + mutex_unlock(&aspeed->lock); + return ret; } static int aspeed_master_term(struct fsi_master *master, int link, uint8_t id) @@ -431,9 +441,11 @@ static ssize_t cfam_reset_store(struct device *dev, struct device_attribute *att { struct fsi_master_aspeed *aspeed = dev_get_drvdata(dev); + mutex_lock(&aspeed->lock); gpiod_set_value(aspeed->cfam_reset_gpio, 1); usleep_range(900, 1000); gpiod_set_value(aspeed->cfam_reset_gpio, 0); + mutex_unlock(&aspeed->lock); return count; } @@ -597,6 +609,7 @@ static int fsi_master_aspeed_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, aspeed); + mutex_init(&aspeed->lock); aspeed_master_init(aspeed); rc = fsi_master_register(&aspeed->master);