From: Rob Herring <robh@kernel.org>
To: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, soc@kernel.org,
Andre Przywara <andre.przywara@arm.com>,
Robert Richter <rrichter@marvell.com>, Jon Loeliger <jdl@jdl.com>,
Alexander Graf <graf@amazon.com>,
Matthias Brugger <mbrugger@suse.com>,
Mark Langsdorf <mlangsdo@redhat.com>
Cc: Alex Williamson <alex.williamson@redhat.com>,
Borislav Petkov <bp@alien8.de>, Cornelia Huck <cohuck@redhat.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
"David S. Miller" <davem@davemloft.net>,
devicetree@vger.kernel.org, Eric Auger <eric.auger@redhat.com>,
iommu@lists.linux-foundation.org,
James Morse <james.morse@arm.com>, Jens Axboe <axboe@kernel.dk>,
Joerg Roedel <joro@8bytes.org>,
kvm@vger.kernel.org, linux-clk@vger.kernel.org,
linux-edac@vger.kernel.org, linux-ide@vger.kernel.org,
linux-pm@vger.kernel.org,
Mauro Carvalho Chehab <mchehab@kernel.org>,
netdev@vger.kernel.org, "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Robin Murphy <robin.murphy@arm.com>,
Stephen Boyd <sboyd@kernel.org>, Tony Luck <tony.luck@intel.com>,
Viresh Kumar <viresh.kumar@linaro.org>,
Will Deacon <will@kernel.org>
Subject: [RFC PATCH 01/11] vfio: Remove Calxeda XGMAC reset driver
Date: Tue, 18 Feb 2020 11:13:11 -0600 [thread overview]
Message-ID: <20200218171321.30990-2-robh@kernel.org> (raw)
In-Reply-To: <20200218171321.30990-1-robh@kernel.org>
Cc: Eric Auger <eric.auger@redhat.com>
Cc: Alex Williamson <alex.williamson@redhat.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: kvm@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
---
Do not apply yet.
drivers/vfio/platform/reset/Kconfig | 8 --
drivers/vfio/platform/reset/Makefile | 2 -
.../reset/vfio_platform_calxedaxgmac.c | 74 -------------------
3 files changed, 84 deletions(-)
delete mode 100644 drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c
diff --git a/drivers/vfio/platform/reset/Kconfig b/drivers/vfio/platform/reset/Kconfig
index 1edbe9ee7356..3668d1d92909 100644
--- a/drivers/vfio/platform/reset/Kconfig
+++ b/drivers/vfio/platform/reset/Kconfig
@@ -1,12 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
-config VFIO_PLATFORM_CALXEDAXGMAC_RESET
- tristate "VFIO support for calxeda xgmac reset"
- depends on VFIO_PLATFORM
- help
- Enables the VFIO platform driver to handle reset for Calxeda xgmac
-
- If you don't know what to do here, say N.
-
config VFIO_PLATFORM_AMDXGBE_RESET
tristate "VFIO support for AMD XGBE reset"
depends on VFIO_PLATFORM
diff --git a/drivers/vfio/platform/reset/Makefile b/drivers/vfio/platform/reset/Makefile
index 7294c5ea122e..be7960ce5dbc 100644
--- a/drivers/vfio/platform/reset/Makefile
+++ b/drivers/vfio/platform/reset/Makefile
@@ -1,7 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
-vfio-platform-calxedaxgmac-y := vfio_platform_calxedaxgmac.o
vfio-platform-amdxgbe-y := vfio_platform_amdxgbe.o
-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_calxedaxgmac.c b/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c
deleted file mode 100644
index 09a9453b75c5..000000000000
--- a/drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c
+++ /dev/null
@@ -1,74 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * VFIO platform driver specialized for Calxeda xgmac reset
- * reset code is inherited from calxeda xgmac native driver
- *
- * Copyright 2010-2011 Calxeda, Inc.
- * Copyright (c) 2015 Linaro Ltd.
- * www.linaro.org
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/io.h>
-
-#include "../vfio_platform_private.h"
-
-#define DRIVER_VERSION "0.1"
-#define DRIVER_AUTHOR "Eric Auger <eric.auger@linaro.org>"
-#define DRIVER_DESC "Reset support for Calxeda xgmac vfio platform device"
-
-/* XGMAC Register definitions */
-#define XGMAC_CONTROL 0x00000000 /* MAC Configuration */
-
-/* DMA Control and Status Registers */
-#define XGMAC_DMA_CONTROL 0x00000f18 /* Ctrl (Operational Mode) */
-#define XGMAC_DMA_INTR_ENA 0x00000f1c /* Interrupt Enable */
-
-/* DMA Control registe defines */
-#define DMA_CONTROL_ST 0x00002000 /* Start/Stop Transmission */
-#define DMA_CONTROL_SR 0x00000002 /* Start/Stop Receive */
-
-/* Common MAC defines */
-#define MAC_ENABLE_TX 0x00000008 /* Transmitter Enable */
-#define MAC_ENABLE_RX 0x00000004 /* Receiver Enable */
-
-static inline void xgmac_mac_disable(void __iomem *ioaddr)
-{
- u32 value = readl(ioaddr + XGMAC_DMA_CONTROL);
-
- value &= ~(DMA_CONTROL_ST | DMA_CONTROL_SR);
- writel(value, ioaddr + XGMAC_DMA_CONTROL);
-
- value = readl(ioaddr + XGMAC_CONTROL);
- value &= ~(MAC_ENABLE_TX | MAC_ENABLE_RX);
- writel(value, ioaddr + XGMAC_CONTROL);
-}
-
-static int vfio_platform_calxedaxgmac_reset(struct vfio_platform_device *vdev)
-{
- struct vfio_platform_region *reg = &vdev->regions[0];
-
- if (!reg->ioaddr) {
- reg->ioaddr =
- ioremap(reg->addr, reg->size);
- if (!reg->ioaddr)
- return -ENOMEM;
- }
-
- /* disable IRQ */
- writel(0, reg->ioaddr + XGMAC_DMA_INTR_ENA);
-
- /* Disable the MAC core */
- xgmac_mac_disable(reg->ioaddr);
-
- return 0;
-}
-
-module_vfio_reset_handler("calxeda,hb-xgmac", vfio_platform_calxedaxgmac_reset);
-
-MODULE_VERSION(DRIVER_VERSION);
-MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
--
2.20.1
next prev parent reply other threads:[~2020-02-18 17:13 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-18 17:13 [RFC PATCH 00/11] Removing Calxeda platform support Rob Herring
2020-02-18 17:13 ` Rob Herring [this message]
2020-02-24 13:07 ` [RFC PATCH 01/11] vfio: Remove Calxeda XGMAC reset driver Auger Eric
2020-02-18 17:13 ` [RFC PATCH 02/11] ata: Remove Calxeda AHCI driver Rob Herring
2020-02-20 17:07 ` Mark Langsdorf
2020-02-18 17:13 ` [RFC PATCH 03/11] cpuidle: Remove Calxeda driver Rob Herring
2020-02-18 17:35 ` Daniel Lezcano
2020-02-18 17:13 ` [RFC PATCH 04/11] cpufreq: " Rob Herring
2020-02-19 1:49 ` Viresh Kumar
2020-02-20 17:06 ` Mark Langsdorf
2020-02-18 17:13 ` [RFC PATCH 05/11] EDAC: Remove Calxeda drivers Rob Herring
2020-02-18 17:33 ` Borislav Petkov
2020-02-19 11:57 ` Robert Richter
2020-02-18 17:13 ` [RFC PATCH 06/11] iommu: arm-smmu: Remove Calxeda secure mode quirk Rob Herring
2020-02-18 17:20 ` Will Deacon
2020-02-18 17:32 ` Robin Murphy
2020-02-25 22:01 ` Rob Herring
[not found] ` <20200228100446.GA2395@willie-the-truck>
2020-02-28 10:25 ` Andre Przywara
[not found] ` <20200228105024.GC2395@willie-the-truck>
2020-02-28 13:42 ` Andre Przywara
[not found] ` <20200228135645.GA4745@willie-the-truck>
2020-02-28 14:11 ` Andre Przywara
2020-02-18 17:13 ` [RFC PATCH 07/11] net: Remove Calxeda XGMAC driver Rob Herring
2020-02-18 17:13 ` [RFC PATCH 08/11] clk: Remove Calxeda driver Rob Herring
2020-02-18 17:13 ` [RFC PATCH 09/11] ARM: Remove Calxeda platform support Rob Herring
2020-02-18 17:13 ` [RFC PATCH 10/11] ARM: dts: Remove Calxeda platforms Rob Herring
2020-02-18 17:13 ` [RFC PATCH 11/11] dt-bindings: Remove Calxeda platforms bindings Rob Herring
2020-02-18 17:22 ` Will Deacon
2020-02-18 17:30 ` Rob Herring
2020-02-18 18:13 ` [RFC PATCH 00/11] Removing Calxeda platform support Andre Przywara
2020-02-18 18:40 ` Rob Herring
2020-02-18 18:51 ` Florian Fainelli
2020-02-19 22:54 ` Olof Johansson
2020-02-20 1:38 ` André Przywara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200218171321.30990-2-robh@kernel.org \
--to=robh@kernel.org \
--cc=alex.williamson@redhat.com \
--cc=andre.przywara@arm.com \
--cc=axboe@kernel.dk \
--cc=bp@alien8.de \
--cc=cohuck@redhat.com \
--cc=daniel.lezcano@linaro.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=eric.auger@redhat.com \
--cc=graf@amazon.com \
--cc=iommu@lists.linux-foundation.org \
--cc=james.morse@arm.com \
--cc=jdl@jdl.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-edac@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mbrugger@suse.com \
--cc=mchehab@kernel.org \
--cc=mlangsdo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=robin.murphy@arm.com \
--cc=rrichter@marvell.com \
--cc=sboyd@kernel.org \
--cc=soc@kernel.org \
--cc=tony.luck@intel.com \
--cc=viresh.kumar@linaro.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).