From patchwork Sun Sep 10 06:56:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 9946217 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 462AC60224 for ; Sun, 10 Sep 2017 06:58:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 377F8288C5 for ; Sun, 10 Sep 2017 06:58:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C5B228A72; Sun, 10 Sep 2017 06:58:39 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED 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 9FED5288C5 for ; Sun, 10 Sep 2017 06:58:38 +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=u43f/6kkJWQ9RMgrzGu2l/XJAJ1om2gz77EkppAWjsE=; b=k/5nxbXek5FZhYl9+u8TruX78x K/gxF/YGU7Cy6ZuBShF4TptVYw4n/AN6J0jIrRwGwNwV4MhGO+UnFdiBnTDnTi1g3j+sCDVtu+HgE 5EC8Kpkd98Ue7TlYHPS1pO0mVreI30odT3DE1uM5TuwoKuwq/XOmj0D59KrgNYxTrDv9fWXV0r+EU R52va10EfE0l31HzZiz2L1r/u6fx1dvt0c9QVl6iuUGsQFtbm2FgFmoi0WiUwWfCxdV6ZWZMXocww vlp9/syXIWzLUx/wbnhXzi9Tk9zq4Zkhsy1BzddEiofmmMH1cwmd7JUiYMNcf7upiqAiYql1Dszxm c/fmflqQ==; 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 1dqwCL-0002ES-Hb; Sun, 10 Sep 2017 06:58:29 +0000 Received: from mail-qk0-x22a.google.com ([2607:f8b0:400d:c09::22a]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dqwBc-0001pu-KE for linux-arm-kernel@lists.infradead.org; Sun, 10 Sep 2017 06:58:08 +0000 Received: by mail-qk0-x22a.google.com with SMTP id z143so13631566qkb.3 for ; Sat, 09 Sep 2017 23:57:24 -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=VI8YzYnC5GnNMufmkMDNDTvEs3jca+fsQmaVa1ucb50=; b=dexyuqajuWWKgY0RbzsIKgYduhXWvB6SqZuMivzYFn5x4Gmo1zHWxzY4aJf4P9XYsv Wt58Zx+66RA51lkcp2d+wnLN0kGB8XoOexSOPtz70AJUucc46hwwWD4VDMy+qOro13Qp 9O7KJrnPAnK2UqoZxhKNqi8XDcufz/TetlA6U= 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=VI8YzYnC5GnNMufmkMDNDTvEs3jca+fsQmaVa1ucb50=; b=b9Ff7Y9E58NRZOCSgU6sOoLcwG1rP4LRn+iaUhKk90R6vKoJx4rb+PxWxOt70VYnRK wCmkmtnpJ6tbhEUdt/cN990CR7xBQR3fMnN51Uwdb8+EYCx6QN42UOF/3RBhsxboHYS4 VgOAh8/OwnrzsQbhg84cj4ndqEKDTIY1BtDAJMGbov+36zADvBGQRgjKwicErcLHA522 F6OgySdFWIVsTTZO6ZOC2hezWJ0c38RpGsva6VX+yWCUFy/H3bz44+nghSC02kl2J2ce JTwofRHr8nydgeb1Tpqoc76NlIsGnrdPQXUBUD3VX7DB52DdaxSlfz7q6c6yiLJstaaH +k+g== X-Gm-Message-State: AHPjjUjz4OCGW+IG3ltI24wlGsqcix8VlstM+ITvt6S0GrkBPMuDvJzA vpZ+PpQ4W74Fj7Cz X-Google-Smtp-Source: AOwi7QAqUQldLRJ2IJI+YyoTbQEs7uXizRwlZXeFtNQyrOzcDFiLdRgotSXfDBbUY8GSK00buxQAeA== X-Received: by 10.55.102.13 with SMTP id a13mr10737770qkc.320.1505026643274; Sat, 09 Sep 2017 23:57:23 -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 t56sm4313535qte.54.2017.09.09.23.57.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 09 Sep 2017 23:57:22 -0700 (PDT) From: Anup Patel To: Will Deacon , Robin Murphy , Joerg Roedel , Baptiste Reynal , Alex Williamson Subject: [PATCH v9] vfio: platform: reset: Add Broadcom FlexRM reset module Date: Sun, 10 Sep 2017 12:26:57 +0530 Message-Id: <1505026617-1399-2-git-send-email-anup.patel@broadcom.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505026617-1399-1-git-send-email-anup.patel@broadcom.com> References: <1505026617-1399-1-git-send-email-anup.patel@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170909_235744_956653_FBA350BF X-CRM114-Status: GOOD ( 20.62 ) 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 Broadcom FlexRM low-level reset for 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 Reviewed-by: Eric Auger Reviewed-by: Eric Auger (again after the misc --- drivers/vfio/platform/reset/Kconfig | 9 ++ drivers/vfio/platform/reset/Makefile | 1 + .../vfio/platform/reset/vfio_platform_bcmflexrm.c | 116 +++++++++++++++++++++ 3 files changed, 126 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..392e3c0 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 && (ARCH_BCM_IPROC || COMPILE_TEST) + default ARCH_BCM_IPROC + 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..ca1cbd7 --- /dev/null +++ b/drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c @@ -0,0 +1,116 @@ +/* + * 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 + +#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 + +/* Register RING_FLUSH_DONE fields */ +#define FLUSH_DONE_MASK 0x1 + +static int vfio_platform_bcmflexrm_shutdown(void __iomem *ring) +{ + unsigned int timeout; + + /* Disable/inactivate ring */ + writel_relaxed(0x0, ring + RING_CONTROL); + + /* Set ring flush state */ + timeout = 1000; /* timeout of 1s */ + 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) + return -ETIMEDOUT; + + /* Clear ring flush state */ + timeout = 1000; /* timeout of 1s */ + writel_relaxed(0x0, ring + RING_CONTROL); + do { + if (!(readl_relaxed(ring + RING_FLUSH_DONE) & + FLUSH_DONE_MASK)) + break; + mdelay(1); + } while (--timeout); + if (!timeout) + return -ETIMEDOUT; + + return 0; +} + +static int vfio_platform_bcmflexrm_reset(struct vfio_platform_device *vdev) +{ + void __iomem *ring; + int rc = 0, ret = 0, ring_num = 0; + 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) { + rc = vfio_platform_bcmflexrm_shutdown(ring); + if (rc) { + dev_warn(vdev->device, + "FlexRM ring%d shutdown error %d\n", + ring_num, rc); + ret |= rc; + } + ring_num++; + } + } + + return ret; +} + +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");