[PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers

[PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1982 bytes --]

Hi all,

This series of patches removes all the legacy iSeries platform specific
drivers (and the iSeries specific part of one).  The legacy iSeries
platform main code has already bee removed along with CONFIG_PPC_ISERIES,
so none of this code is selectable or needed any more.

It would probably be easiest if all these patches were merged via the
powerpc tree to eliminate any dependencies between them.  Their impact on
generic code is very small.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

 arch/powerpc/include/asm/iseries/hv_call_event.h |  201 ---
 arch/powerpc/include/asm/iseries/hv_lp_event.h   |  162 --
 arch/powerpc/include/asm/iseries/iommu.h         |   37 -
 arch/powerpc/include/asm/iseries/vio.h           |  265 ----
 arch/powerpc/kernel/vio.c                        |   18 +-
 drivers/base/driver.c                            |   30 -
 drivers/block/viodasd.c                          |  809 ----------
 drivers/cdrom/viocd.c                            |  739 ----------
 drivers/char/viotape.c                           | 1041 -------------
 drivers/net/ethernet/ibm/Kconfig                 |    4 -
 drivers/net/ethernet/ibm/Makefile                |    1 -
 drivers/net/ethernet/ibm/iseries_veth.c          | 1710 ----------------------
 drivers/scsi/Kconfig                             |    3 +-
 drivers/scsi/ibmvscsi/Makefile                   |    1 -
 drivers/scsi/ibmvscsi/ibmvscsi.c                 |   12 +-
 drivers/scsi/ibmvscsi/ibmvscsi.h                 |    1 -
 drivers/scsi/ibmvscsi/iseries_vscsi.c            |  173 ---
 drivers/tty/hvc/Kconfig                          |   10 -
 drivers/tty/hvc/Makefile                         |    1 -
 drivers/tty/hvc/hvc_iseries.c                    |  599 --------
 drivers/tty/serial/Kconfig                       |    2 +-
 include/linux/device.h                           |    4 -
 22 files changed, 5 insertions(+), 5818 deletions(-)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

[PATCH 3/7] [SCSI] powerpc: remove the legacy iSeries part of ibmvscsi

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3584 bytes --]

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>
---
 drivers/scsi/Kconfig                  |    3 +-
 drivers/scsi/ibmvscsi/Makefile        |    1 -
 drivers/scsi/ibmvscsi/ibmvscsi.c      |   12 +--
 drivers/scsi/ibmvscsi/ibmvscsi.h      |    1 -
 drivers/scsi/ibmvscsi/iseries_vscsi.c |  173 ---------------------------------
 5 files changed, 3 insertions(+), 187 deletions(-)
 delete mode 100644 drivers/scsi/ibmvscsi/iseries_vscsi.c

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 16570aa..e38d843 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 a423d96..ff5b5c5 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 3d391dc..e984951 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 02197a2..c503e17 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 f477645..0000000
-- 
1.7.9.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 8 Mar 2012 15:28:53 +1100

> It would probably be easiest if all these patches were merged via the
> powerpc tree to eliminate any dependencies between them.  Their impact on
> generic code is very small.

No objections.

Re: [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers

[Jens Axboe]

On 03/08/2012 05:28 AM, Stephen Rothwell wrote:
> It would probably be easiest if all these patches were merged via the
> powerpc tree to eliminate any dependencies between them.  Their impact on
> generic code is very small.

Go ahead, no point in doing otherwise.

-- 
Jens Axboe

Re: [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers

[Greg Kroah-Hartman]

On Thu, Mar 08, 2012 at 03:28:53PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> This series of patches removes all the legacy iSeries platform specific
> drivers (and the iSeries specific part of one).  The legacy iSeries
> platform main code has already bee removed along with CONFIG_PPC_ISERIES,
> so none of this code is selectable or needed any more.
> 
> It would probably be easiest if all these patches were merged via the
> powerpc tree to eliminate any dependencies between them.  Their impact on
> generic code is very small.

No objection from me at all.

greg k-h