From patchwork Wed Jul 19 09:33:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 9850913 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3D2B9602C8 for ; Wed, 19 Jul 2017 09:36:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 187E2203B9 for ; Wed, 19 Jul 2017 09:36:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0CC6A28631; Wed, 19 Jul 2017 09:36:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 758EA203B9 for ; Wed, 19 Jul 2017 09:36:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=5ArOfkHsDBs5HgvaeZDi7rfN7yT4FcG7H2p/k1jOiQI=; b=UCeR/r5tyPnOTvG78yc0IeAYYO KSqlmOv1zFGqq0KLjoFOxrEgRT65BDZriBnr3wwuTm5QMcpGbce0r8b5xVufxQsSdbSZtAKK0WLAu ib1CofDyFqiJmOPJM1E14qfooDbKydY4ZjAXsuiO7xIXEyQN5kjRWgS0HQpO84jXWYh5BK/f5fyNq 1PeAxl3kN+gk2p9vnb1ggZoloz/dbNl9TsHXRSjSD6r9LPDVC6E964WRQNQC1hwd8eIENTj6qBGZl LKqHqjwPlms7JBPEDEqvjYGRM/U0cso8+2KmTpeQrQWuH6khjdneeKyAG0ASBR+jjwdVgrop6ITaE se67/EEw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dXlPP-000499-HQ; Wed, 19 Jul 2017 09:36:43 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dXlOb-0003Pe-28 for linux-arm-kernel@bombadil.infradead.org; Wed, 19 Jul 2017 09:35:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=xrlIJ9voCEOqAK71Bf05/cRcBWlnOb0fM4yABm86GJw=; b=tu/cjTqt0UZ/71apUYiBN1PA2 IYkSlSiCJPWlqYcdfHtJIg1ZDw/mnMz2QaXCapd8m3v9u4NMGuQFgqBQPC8TIpUx38x0m7GK2RoKQ eZWoC9a+mbCieHeuc5a6Q8MQeIGGh8Un9MWsnk9Dhv5UCLMUdXONpjbA66RzXI9QFaets63Ob3tjz tB1KJYNP0Mx01x+maip2IoSnlZ5TNNTUT5q6JIHl7eh04Sm9dwZD3R6rv9FI8MbsIAt+h4uqJrMdY eOFKsfXu4TNUmyBvYUbTYPunkg7svfWNSr8PioKFaBoKPs5Q/+xwr0tC83XDOEVYqqeFT9l2EDF3S PmcspmTYw==; Received: from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dXlOX-0003Yc-Nv for linux-arm-kernel@lists.infradead.org; Wed, 19 Jul 2017 09:35:51 +0000 Received: by mail-wr0-x22f.google.com with SMTP id 12so56385070wrb.1 for ; Wed, 19 Jul 2017 02:35:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xrlIJ9voCEOqAK71Bf05/cRcBWlnOb0fM4yABm86GJw=; b=K+Ev9rBFSlKdpwls4zbpFzpX+rBT1oA8mGi7vcA8QNDhezonQZrBRV6R3dZDx9gasK vBWVP3IyPH7LWsAVxgPzK8pyvGRnyA8aAamSfrbhURZD/rcICMhNtLV0tFWLhuCECSqy +SORdhYZCTXoyfHwcgepLceWEymWIFYf1Zhrc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xrlIJ9voCEOqAK71Bf05/cRcBWlnOb0fM4yABm86GJw=; b=hXpVqicBeJ+F1/6JdXfWEH0L0Hc8vaR6HFqDJvOavoqDoA716GM5Qm+MmTa1C6p08E 0tVsCV6PI4gBGsbjHZzt2xh7zrZg9qbXE1N2jbalLfBuQLb01RlxCXEld2vz+UlBcDGR yfTfGtvm2f+pEd9pNu4XzilJm8Oay+eiDo6TmwQKpPpn+v3Iq1X9QwyExL/LN1B/bTso c5xfEUq7owtg8bubEfd3jWM6NNEJX+qxBgw1SBAr14dae1+I1zsNYc6itucn1wDr4Irz zHmXoPr6vwGHiVXuo4kr/6U1orNPlZARxgJIkIAy1UghyFmvbIGfkVMLvvHrf4duG5hS yqQA== X-Gm-Message-State: AIVw1117MqlnmcMtUQ5FBuam87/CT1PKrcTa3rQRE7mDgCcp0dtil3HO 9uZPzWGhXRooHsL8 X-Received: by 10.223.139.30 with SMTP id n30mr877419wra.116.1500456928071; Wed, 19 Jul 2017 02:35:28 -0700 (PDT) Received: from anup-HP-Compaq-8100-Elite-CMT-PC.dhcp.avagotech.net ([192.19.237.250]) by smtp.gmail.com with ESMTPSA id y12sm8227473wrb.39.2017.07.19.02.35.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Jul 2017 02:35:27 -0700 (PDT) From: Anup Patel To: Will Deacon , Robin Murphy , Joerg Roedel , Baptiste Reynal , Alex Williamson Subject: [PATCH 5/5] vfio: platform: reset: Add Broadcom FlexRM reset module Date: Wed, 19 Jul 2017 15:03:58 +0530 Message-Id: <1500456838-18405-6-git-send-email-anup.patel@broadcom.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500456838-18405-1-git-send-email-anup.patel@broadcom.com> References: <1500456838-18405-1-git-send-email-anup.patel@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170719_103549_790681_22A2173D X-CRM114-Status: GOOD ( 23.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kvm@vger.kernel.org, Scott Branden , linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, Anup Patel MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds low-level reset for Broadcom FlexRM to VFIO platform. It will do the following: 1. Disable/Deactivate each FlexRM ring 2. Flush each FlexRM ring The cleanup sequence for FlexRM rings is adapted from Broadcom FlexRM mailbox driver. Signed-off-by: Anup Patel Reviewed-by: Oza Oza Reviewed-by: Scott Branden --- drivers/vfio/platform/reset/Kconfig | 9 +++ drivers/vfio/platform/reset/Makefile | 1 + .../vfio/platform/reset/vfio_platform_bcmflexrm.c | 91 ++++++++++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c diff --git a/drivers/vfio/platform/reset/Kconfig b/drivers/vfio/platform/reset/Kconfig index 70cccc5..8d8d226 100644 --- a/drivers/vfio/platform/reset/Kconfig +++ b/drivers/vfio/platform/reset/Kconfig @@ -13,3 +13,12 @@ config VFIO_PLATFORM_AMDXGBE_RESET Enables the VFIO platform driver to handle reset for AMD XGBE If you don't know what to do here, say N. + +config VFIO_PLATFORM_BCMFLEXRM_RESET + tristate "VFIO support for Broadcom FlexRM reset" + depends on VFIO_PLATFORM + depends on ARCH_BCM_IPROC || COMPILE_TEST + help + Enables the VFIO platform driver to handle reset for Broadcom FlexRM + + If you don't know what to do here, say N. diff --git a/drivers/vfio/platform/reset/Makefile b/drivers/vfio/platform/reset/Makefile index 93f4e23..8d9874b 100644 --- a/drivers/vfio/platform/reset/Makefile +++ b/drivers/vfio/platform/reset/Makefile @@ -5,3 +5,4 @@ ccflags-y += -Idrivers/vfio/platform obj-$(CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET) += vfio-platform-calxedaxgmac.o obj-$(CONFIG_VFIO_PLATFORM_AMDXGBE_RESET) += vfio-platform-amdxgbe.o +obj-$(CONFIG_VFIO_PLATFORM_BCMFLEXRM_RESET) += vfio_platform_bcmflexrm.o diff --git a/drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c b/drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c new file mode 100644 index 0000000..a890472 --- /dev/null +++ b/drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2017 Broadcom + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * This driver provides reset support for Broadcom FlexRM ring manager + * to VFIO platform. + */ + +#include +#include +#include +#include +#include + +#include "vfio_platform_private.h" + +/* FlexRM configuration */ +#define RING_REGS_SIZE 0x10000 +#define RING_VER_MAGIC 0x76303031 + +/* Per-Ring register offsets */ +#define RING_VER 0x000 +#define RING_CONTROL 0x034 +#define RING_FLUSH_DONE 0x038 + +/* Register RING_CONTROL fields */ +#define CONTROL_FLUSH_SHIFT 5 +#define CONTROL_ACTIVE_SHIFT 4 + +/* Register RING_FLUSH_DONE fields */ +#define FLUSH_DONE_MASK 0x1 + +static void vfio_platform_bcmflexrm_shutdown(void __iomem *ring) +{ + unsigned int timeout; + + /* Disable/inactivate ring */ + writel_relaxed(0x0, ring + RING_CONTROL); + + /* Flush ring with timeout of 1s */ + timeout = 1000; + writel_relaxed(BIT(CONTROL_FLUSH_SHIFT), ring + RING_CONTROL); + do { + if (readl_relaxed(ring + RING_FLUSH_DONE) & FLUSH_DONE_MASK) + break; + mdelay(1); + } while (timeout--); + + if (!timeout) + pr_warn("VFIO FlexRM shutdown timedout\n"); +} + +static int vfio_platform_bcmflexrm_reset(struct vfio_platform_device *vdev) +{ + void __iomem *ring; + struct vfio_platform_region *reg = &vdev->regions[0]; + + /* Map FlexRM ring registers if not mapped */ + if (!reg->ioaddr) { + reg->ioaddr = ioremap_nocache(reg->addr, reg->size); + if (!reg->ioaddr) + return -ENOMEM; + } + + /* Discover and shutdown each FlexRM ring */ + for (ring = reg->ioaddr; + ring < (reg->ioaddr + reg->size); ring += RING_REGS_SIZE) { + if (readl_relaxed(ring + RING_VER) == RING_VER_MAGIC) + vfio_platform_bcmflexrm_shutdown(ring); + } + + return 0; +} + +module_vfio_reset_handler("brcm,iproc-flexrm-mbox", + vfio_platform_bcmflexrm_reset); + +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Anup Patel "); +MODULE_DESCRIPTION("Reset support for Broadcom FlexRM VFIO platform device");