powerpc: remove the legacy iSeries part of ibmvscsi

The PowerPC legacy iSeries platform is being removed and this code is
no longer selectable.  There is more clean up that can be done, but this
just gets the old code out of the way.

Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Brian King <brking@linux.vnet.ibm.com>
Cc: linux-scsi@vger.kernel.org
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

5 files changed, 3 insertions, 187 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 16570aa84aac..e38d843a2915 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -967,9 +967,8 @@ config SCSI_IPS
 
 config SCSI_IBMVSCSI
         tristate "IBM Virtual SCSI support"
-        depends on PPC_PSERIES || PPC_ISERIES
+        depends on PPC_PSERIES
         select SCSI_SRP_ATTRS
-        select VIOPATH if PPC_ISERIES
         help
           This is the IBM POWER Virtual SCSI Client
 
diff --git a/drivers/scsi/ibmvscsi/Makefile b/drivers/scsi/ibmvscsi/Makefile
index a423d9633625..ff5b5c5538ee 100644
--- a/drivers/scsi/ibmvscsi/Makefile
+++ b/drivers/scsi/ibmvscsi/Makefile
@@ -1,7 +1,6 @@
 obj-$(CONFIG_SCSI_IBMVSCSI)     += ibmvscsic.o
 
 ibmvscsic-y                     += ibmvscsi.o
-ibmvscsic-$(CONFIG_PPC_ISERIES) += iseries_vscsi.o 
 ibmvscsic-$(CONFIG_PPC_PSERIES) += rpa_vscsi.o 
 
 obj-$(CONFIG_SCSI_IBMVSCSIS)    += ibmvstgt.o
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 3d391dc3f11f..e984951baeb6 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -55,13 +55,7 @@
  * and sends a CRQ message back to inform the client that the request has
  * completed.
  *
- * Note that some of the underlying infrastructure is different between
- * machines conforming to the "RS/6000 Platform Architecture" (RPA) and
- * the older iSeries hypervisor models.  To support both, some low level
- * routines have been broken out into rpa_vscsi.c and iseries_vscsi.c.
- * The Makefile should pick one, not two, not zero, of these.
- *
- * TODO: This is currently pretty tied to the IBM i/pSeries hypervisor
+ * TODO: This is currently pretty tied to the IBM pSeries hypervisor
  * interfaces.  It would be really nice to abstract this above an RDMA
  * layer.
  */
@@ -2085,9 +2079,7 @@ int __init ibmvscsi_module_init(void)
         driver_template.can_queue = max_requests;
         max_events = max_requests + 2;
 
-        if (firmware_has_feature(FW_FEATURE_ISERIES))
-                ibmvscsi_ops = &iseriesvscsi_ops;
-        else if (firmware_has_feature(FW_FEATURE_VIO))
+        if (firmware_has_feature(FW_FEATURE_VIO))
                 ibmvscsi_ops = &rpavscsi_ops;
         else
                 return -ENODEV;
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.h b/drivers/scsi/ibmvscsi/ibmvscsi.h
index 02197a2b22b9..c503e1776014 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.h
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.h
@@ -127,7 +127,6 @@ struct ibmvscsi_ops {
         int (*resume) (struct ibmvscsi_host_data *hostdata);
 };
 
-extern struct ibmvscsi_ops iseriesvscsi_ops;
 extern struct ibmvscsi_ops rpavscsi_ops;
 
 #endif                          /* IBMVSCSI_H */
diff --git a/drivers/scsi/ibmvscsi/iseries_vscsi.c b/drivers/scsi/ibmvscsi/iseries_vscsi.c
deleted file mode 100644
index f4776451a754..000000000000
--- a/drivers/scsi/ibmvscsi/iseries_vscsi.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* ------------------------------------------------------------
- * iSeries_vscsi.c
- * (C) Copyright IBM Corporation 1994, 2003
- * Authors: Colin DeVilbiss (devilbis@us.ibm.com)
- *          Santiago Leon (santil@us.ibm.com)
- *          Dave Boutcher (sleddog@us.ibm.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- * USA
- *
- * ------------------------------------------------------------
- * iSeries-specific functions of the SCSI host adapter for Virtual I/O devices
- *
- * This driver allows the Linux SCSI peripheral drivers to directly
- * access devices in the hosting partition, either on an iSeries
- * hypervisor system or a converged hypervisor system.
- */
-
-#include <asm/iseries/vio.h>
-#include <asm/iseries/hv_lp_event.h>
-#include <asm/iseries/hv_types.h>
-#include <asm/iseries/hv_lp_config.h>
-#include <asm/vio.h>
-#include <linux/device.h>
-#include "ibmvscsi.h"
-
-/* global variables */
-static struct ibmvscsi_host_data *single_host_data;
-
-/* ------------------------------------------------------------
- * Routines for direct interpartition interaction
- */
-struct srp_lp_event {
-        struct HvLpEvent lpevt; /* 0x00-0x17          */
-        u32 reserved1;          /* 0x18-0x1B; unused  */
-        u16 version;            /* 0x1C-0x1D; unused  */
-        u16 subtype_rc;         /* 0x1E-0x1F; unused  */
-        struct viosrp_crq crq;  /* 0x20-0x3F          */
-};
-
-/** 
- * standard interface for handling logical partition events.
- */
-static void iseriesvscsi_handle_event(struct HvLpEvent *lpevt)
-{
-        struct srp_lp_event *evt = (struct srp_lp_event *)lpevt;
-
-        if (!evt) {
-                printk(KERN_ERR "ibmvscsi: received null event\n");
-                return;
-        }
-
-        if (single_host_data == NULL) {
-                printk(KERN_ERR
-                       "ibmvscsi: received event, no adapter present\n");
-                return;
-        }
-
-        ibmvscsi_handle_crq(&evt->crq, single_host_data);
-}
-
-/* ------------------------------------------------------------
- * Routines for driver initialization
- */
-static int iseriesvscsi_init_crq_queue(struct crq_queue *queue,
-                                       struct ibmvscsi_host_data *hostdata,
-                                       int max_requests)
-{
-        int rc;
-
-        single_host_data = hostdata;
-        rc = viopath_open(viopath_hostLp, viomajorsubtype_scsi, max_requests);
-        if (rc < 0) {
-                printk("viopath_open failed with rc %d in open_event_path\n",
-                       rc);
-                goto viopath_open_failed;
-        }
-
-        rc = vio_setHandler(viomajorsubtype_scsi, iseriesvscsi_handle_event);
-        if (rc < 0) {
-                printk("vio_setHandler failed with rc %d in open_event_path\n",
-                       rc);
-                goto vio_setHandler_failed;
-        }
-        return 0;
-
-      vio_setHandler_failed:
-        viopath_close(viopath_hostLp, viomajorsubtype_scsi, max_requests);
-      viopath_open_failed:
-        return -1;
-}
-
-static void iseriesvscsi_release_crq_queue(struct crq_queue *queue,
-                                           struct ibmvscsi_host_data *hostdata,
-                                           int max_requests)
-{
-        vio_clearHandler(viomajorsubtype_scsi);
-        viopath_close(viopath_hostLp, viomajorsubtype_scsi, max_requests);
-}
-
-/**
- * reset_crq_queue: - resets a crq after a failure
- * @queue:      crq_queue to initialize and register
- * @hostdata:   ibmvscsi_host_data of host
- *
- * no-op for iSeries
- */
-static int iseriesvscsi_reset_crq_queue(struct crq_queue *queue,
-                                        struct ibmvscsi_host_data *hostdata)
-{
-        return 0;
-}
-
-/**
- * reenable_crq_queue: - reenables a crq after a failure
- * @queue:      crq_queue to initialize and register
- * @hostdata:   ibmvscsi_host_data of host
- *
- * no-op for iSeries
- */
-static int iseriesvscsi_reenable_crq_queue(struct crq_queue *queue,
-                                           struct ibmvscsi_host_data *hostdata)
-{
-        return 0;
-}
-
-/**
- * iseriesvscsi_send_crq: - Send a CRQ
- * @hostdata:   the adapter
- * @word1:      the first 64 bits of the data
- * @word2:      the second 64 bits of the data
- */
-static int iseriesvscsi_send_crq(struct ibmvscsi_host_data *hostdata,
-                                 u64 word1, u64 word2)
-{
-        single_host_data = hostdata;
-        return HvCallEvent_signalLpEventFast(viopath_hostLp,
-                                             HvLpEvent_Type_VirtualIo,
-                                             viomajorsubtype_scsi,
-                                             HvLpEvent_AckInd_NoAck,
-                                             HvLpEvent_AckType_ImmediateAck,
-                                             viopath_sourceinst(viopath_hostLp),
-                                             viopath_targetinst(viopath_hostLp),
-                                             0,
-                                             VIOVERSION << 16, word1, word2, 0,
-                                             0);
-}
-
-static int iseriesvscsi_resume(struct ibmvscsi_host_data *hostdata)
-{
-        return 0;
-}
-
-struct ibmvscsi_ops iseriesvscsi_ops = {
-        .init_crq_queue = iseriesvscsi_init_crq_queue,
-        .release_crq_queue = iseriesvscsi_release_crq_queue,
-        .reset_crq_queue = iseriesvscsi_reset_crq_queue,
-        .reenable_crq_queue = iseriesvscsi_reenable_crq_queue,
-        .send_crq = iseriesvscsi_send_crq,
-        .resume = iseriesvscsi_resume,
-};