* RE: [PATCH v2] powerpc/dts: fix the compatible string of sec 4.0
From: Liu Shengzhou-B36685 @ 2012-03-08 2:59 UTC (permalink / raw)
To: Phillips Kim-R1AAHA
Cc: Liu Shuo-B35362, linuxppc-dev@lists.ozlabs.org, stable@kernel.org
In-Reply-To: <20120307172611.86985d2c22af2c3213770f35@freescale.com>
> -----Original Message-----
> From: Phillips Kim-R1AAHA
> Sent: Thursday, March 08, 2012 7:26 AM
> To: Liu Shengzhou-B36685
> Cc: linuxppc-dev@lists.ozlabs.org; stable@kernel.org; Liu Shuo-B35362
> Subject: Re: [PATCH v2] powerpc/dts: fix the compatible string of sec
> 4.0
>=20
> On Wed, 7 Mar 2012 13:20:06 +0800
> Shengzhou Liu <Shengzhou.Liu@freescale.com> wrote:
>=20
> > From: Liu Shuo <shuo.liu@freescale.com>
> >
> > Fix the compatible string of sec 4.0 to match with CAMM driver
> > according to Documentation/devicetree/bindings/crypto/fsl-sec4.txt
> >
> > Signed-off-by: Liu Shuo <shuo.liu@freescale.com>
> > Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
> > ---
> > v2: refine description.
>=20
> can we patch the caam driver to still work with "fsl-sec4.0"?
>=20
> Thanks,
>=20
> Kim
[Shengzhou] ok, I will post another patch for it. Thanks.
^ permalink raw reply
* [PATCH] powerpc: Remove the main legacy iSerie platform code
From: Stephen Rothwell @ 2012-03-08 3:02 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: ppc-dev
[-- Attachment #1: Type: text/plain, Size: 10736 bytes --]
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/platforms/Makefile | 1 -
arch/powerpc/platforms/iseries/Makefile | 9 -
arch/powerpc/platforms/iseries/call_hpt.h | 102 --
arch/powerpc/platforms/iseries/call_pci.h | 309 -----
arch/powerpc/platforms/iseries/call_sm.h | 37 -
arch/powerpc/platforms/iseries/dt.c | 643 -----------
arch/powerpc/platforms/iseries/exception.S | 311 -----
arch/powerpc/platforms/iseries/exception.h | 58 -
arch/powerpc/platforms/iseries/htab.c | 257 -----
arch/powerpc/platforms/iseries/hvcall.S | 94 --
arch/powerpc/platforms/iseries/hvlog.c | 35 -
arch/powerpc/platforms/iseries/hvlpconfig.c | 39 -
arch/powerpc/platforms/iseries/iommu.c | 260 -----
arch/powerpc/platforms/iseries/ipl_parms.h | 68 --
arch/powerpc/platforms/iseries/irq.c | 400 -------
arch/powerpc/platforms/iseries/irq.h | 13 -
arch/powerpc/platforms/iseries/it_exp_vpd_panel.h | 51 -
arch/powerpc/platforms/iseries/it_lp_naca.h | 80 --
arch/powerpc/platforms/iseries/ksyms.c | 21 -
arch/powerpc/platforms/iseries/lpardata.c | 318 -----
arch/powerpc/platforms/iseries/lpevents.c | 341 ------
arch/powerpc/platforms/iseries/main_store.h | 165 ---
arch/powerpc/platforms/iseries/mf.c | 1275 ---------------------
arch/powerpc/platforms/iseries/misc.S | 26 -
arch/powerpc/platforms/iseries/naca.h | 24 -
arch/powerpc/platforms/iseries/pci.c | 919 ---------------
arch/powerpc/platforms/iseries/pci.h | 58 -
arch/powerpc/platforms/iseries/proc.c | 120 --
arch/powerpc/platforms/iseries/processor_vpd.h | 85 --
arch/powerpc/platforms/iseries/release_data.h | 63 -
arch/powerpc/platforms/iseries/setup.c | 722 ------------
arch/powerpc/platforms/iseries/setup.h | 27 -
arch/powerpc/platforms/iseries/smp.c | 88 --
arch/powerpc/platforms/iseries/spcomm_area.h | 34 -
arch/powerpc/platforms/iseries/vio.c | 556 ---------
arch/powerpc/platforms/iseries/viopath.c | 677 -----------
arch/powerpc/platforms/iseries/vpd_areas.h | 88 --
37 files changed, 0 insertions(+), 8374 deletions(-)
delete mode 100644 arch/powerpc/platforms/iseries/Makefile
delete mode 100644 arch/powerpc/platforms/iseries/call_hpt.h
delete mode 100644 arch/powerpc/platforms/iseries/call_pci.h
delete mode 100644 arch/powerpc/platforms/iseries/call_sm.h
delete mode 100644 arch/powerpc/platforms/iseries/dt.c
delete mode 100644 arch/powerpc/platforms/iseries/exception.S
delete mode 100644 arch/powerpc/platforms/iseries/exception.h
delete mode 100644 arch/powerpc/platforms/iseries/htab.c
delete mode 100644 arch/powerpc/platforms/iseries/hvcall.S
delete mode 100644 arch/powerpc/platforms/iseries/hvlog.c
delete mode 100644 arch/powerpc/platforms/iseries/hvlpconfig.c
delete mode 100644 arch/powerpc/platforms/iseries/iommu.c
delete mode 100644 arch/powerpc/platforms/iseries/ipl_parms.h
delete mode 100644 arch/powerpc/platforms/iseries/irq.c
delete mode 100644 arch/powerpc/platforms/iseries/irq.h
delete mode 100644 arch/powerpc/platforms/iseries/it_exp_vpd_panel.h
delete mode 100644 arch/powerpc/platforms/iseries/it_lp_naca.h
delete mode 100644 arch/powerpc/platforms/iseries/ksyms.c
delete mode 100644 arch/powerpc/platforms/iseries/lpardata.c
delete mode 100644 arch/powerpc/platforms/iseries/lpevents.c
delete mode 100644 arch/powerpc/platforms/iseries/main_store.h
delete mode 100644 arch/powerpc/platforms/iseries/mf.c
delete mode 100644 arch/powerpc/platforms/iseries/misc.S
delete mode 100644 arch/powerpc/platforms/iseries/naca.h
delete mode 100644 arch/powerpc/platforms/iseries/pci.c
delete mode 100644 arch/powerpc/platforms/iseries/pci.h
delete mode 100644 arch/powerpc/platforms/iseries/proc.c
delete mode 100644 arch/powerpc/platforms/iseries/processor_vpd.h
delete mode 100644 arch/powerpc/platforms/iseries/release_data.h
delete mode 100644 arch/powerpc/platforms/iseries/setup.c
delete mode 100644 arch/powerpc/platforms/iseries/setup.h
delete mode 100644 arch/powerpc/platforms/iseries/smp.c
delete mode 100644 arch/powerpc/platforms/iseries/spcomm_area.h
delete mode 100644 arch/powerpc/platforms/iseries/vio.c
delete mode 100644 arch/powerpc/platforms/iseries/viopath.c
delete mode 100644 arch/powerpc/platforms/iseries/vpd_areas.h
This is a git style diff (so does not contain the old contents of the
deleted files).
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index 2635a22..879b4a4 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_FSL_SOC_BOOKE) += 85xx/
obj-$(CONFIG_PPC_86xx) += 86xx/
obj-$(CONFIG_PPC_POWERNV) += powernv/
obj-$(CONFIG_PPC_PSERIES) += pseries/
-obj-$(CONFIG_PPC_ISERIES) += iseries/
obj-$(CONFIG_PPC_MAPLE) += maple/
obj-$(CONFIG_PPC_PASEMI) += pasemi/
obj-$(CONFIG_PPC_CELL) += cell/
diff --git a/arch/powerpc/platforms/iseries/Makefile b/arch/powerpc/platforms/iseries/Makefile
deleted file mode 100644
index a7602b1..0000000
diff --git a/arch/powerpc/platforms/iseries/call_hpt.h b/arch/powerpc/platforms/iseries/call_hpt.h
deleted file mode 100644
index 8d95fe4b..0000000
diff --git a/arch/powerpc/platforms/iseries/call_pci.h b/arch/powerpc/platforms/iseries/call_pci.h
deleted file mode 100644
index dbdf698..0000000
diff --git a/arch/powerpc/platforms/iseries/call_sm.h b/arch/powerpc/platforms/iseries/call_sm.h
deleted file mode 100644
index c7e2516..0000000
diff --git a/arch/powerpc/platforms/iseries/dt.c b/arch/powerpc/platforms/iseries/dt.c
deleted file mode 100644
index f0491cc..0000000
diff --git a/arch/powerpc/platforms/iseries/exception.S b/arch/powerpc/platforms/iseries/exception.S
deleted file mode 100644
index f519ee1..0000000
diff --git a/arch/powerpc/platforms/iseries/exception.h b/arch/powerpc/platforms/iseries/exception.h
deleted file mode 100644
index 50271b5..0000000
diff --git a/arch/powerpc/platforms/iseries/htab.c b/arch/powerpc/platforms/iseries/htab.c
deleted file mode 100644
index 3ae66ab..0000000
diff --git a/arch/powerpc/platforms/iseries/hvcall.S b/arch/powerpc/platforms/iseries/hvcall.S
deleted file mode 100644
index 07ae6ad..0000000
diff --git a/arch/powerpc/platforms/iseries/hvlog.c b/arch/powerpc/platforms/iseries/hvlog.c
deleted file mode 100644
index f476d71..0000000
diff --git a/arch/powerpc/platforms/iseries/hvlpconfig.c b/arch/powerpc/platforms/iseries/hvlpconfig.c
deleted file mode 100644
index f62a0c5..0000000
diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c
deleted file mode 100644
index 2f3d911..0000000
diff --git a/arch/powerpc/platforms/iseries/ipl_parms.h b/arch/powerpc/platforms/iseries/ipl_parms.h
deleted file mode 100644
index 83e4ca4..0000000
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
deleted file mode 100644
index b210345..0000000
diff --git a/arch/powerpc/platforms/iseries/irq.h b/arch/powerpc/platforms/iseries/irq.h
deleted file mode 100644
index a1c2360..0000000
diff --git a/arch/powerpc/platforms/iseries/it_exp_vpd_panel.h b/arch/powerpc/platforms/iseries/it_exp_vpd_panel.h
deleted file mode 100644
index 6de9097..0000000
diff --git a/arch/powerpc/platforms/iseries/it_lp_naca.h b/arch/powerpc/platforms/iseries/it_lp_naca.h
deleted file mode 100644
index cf6dcf6..0000000
diff --git a/arch/powerpc/platforms/iseries/ksyms.c b/arch/powerpc/platforms/iseries/ksyms.c
deleted file mode 100644
index 997e234..0000000
diff --git a/arch/powerpc/platforms/iseries/lpardata.c b/arch/powerpc/platforms/iseries/lpardata.c
deleted file mode 100644
index 00e0ec8..0000000
diff --git a/arch/powerpc/platforms/iseries/lpevents.c b/arch/powerpc/platforms/iseries/lpevents.c
deleted file mode 100644
index 202e227..0000000
diff --git a/arch/powerpc/platforms/iseries/main_store.h b/arch/powerpc/platforms/iseries/main_store.h
deleted file mode 100644
index 1a7a3f5..0000000
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
deleted file mode 100644
index 254c1fc..0000000
diff --git a/arch/powerpc/platforms/iseries/misc.S b/arch/powerpc/platforms/iseries/misc.S
deleted file mode 100644
index 2c6ff0f..0000000
diff --git a/arch/powerpc/platforms/iseries/naca.h b/arch/powerpc/platforms/iseries/naca.h
deleted file mode 100644
index f01708e..0000000
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
deleted file mode 100644
index c754128..0000000
diff --git a/arch/powerpc/platforms/iseries/pci.h b/arch/powerpc/platforms/iseries/pci.h
deleted file mode 100644
index d9cf974..0000000
diff --git a/arch/powerpc/platforms/iseries/proc.c b/arch/powerpc/platforms/iseries/proc.c
deleted file mode 100644
index 0676368..0000000
diff --git a/arch/powerpc/platforms/iseries/processor_vpd.h b/arch/powerpc/platforms/iseries/processor_vpd.h
deleted file mode 100644
index 7ac5d0d..0000000
diff --git a/arch/powerpc/platforms/iseries/release_data.h b/arch/powerpc/platforms/iseries/release_data.h
deleted file mode 100644
index 6ad7d84..0000000
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
deleted file mode 100644
index 8fc6258..0000000
diff --git a/arch/powerpc/platforms/iseries/setup.h b/arch/powerpc/platforms/iseries/setup.h
deleted file mode 100644
index 729754b..0000000
diff --git a/arch/powerpc/platforms/iseries/smp.c b/arch/powerpc/platforms/iseries/smp.c
deleted file mode 100644
index 02df49f..0000000
diff --git a/arch/powerpc/platforms/iseries/spcomm_area.h b/arch/powerpc/platforms/iseries/spcomm_area.h
deleted file mode 100644
index 598b7c1..0000000
diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c
deleted file mode 100644
index 04be62d..0000000
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
deleted file mode 100644
index 40dad08..0000000
diff --git a/arch/powerpc/platforms/iseries/vpd_areas.h b/arch/powerpc/platforms/iseries/vpd_areas.h
deleted file mode 100644
index feb001f..0000000
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* Re: linux-next: manual merge of the powerpc tree with the arm tree
From: Stephen Rothwell @ 2012-03-08 3:51 UTC (permalink / raw)
To: Michael Neuling
Cc: linux-kernel, Rob Herring, linux-next, Paul Mackerras,
linuxppc-dev, Russell King
In-Reply-To: <25744.1331174036@neuling.org>
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
Hi Mikey,
On Thu, 08 Mar 2012 13:33:56 +1100 Michael Neuling <mikey@neuling.org> wrote:
>
> Surely we only need SPARSE_IRQ now and not MAY_HAVE_SPARSE_IRQ.
>
> In fact, keeping MAY_HAVE_SPARSE_IRQ seems to make SPARSE_IRQ user
> selectable, which we don't want anymore since ad5b7f1350c2.
Yes, indeed. I will fix up the merge resolution for tomorrow.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers
From: Stephen Rothwell @ 2012-03-08 4:28 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Jens Axboe, linux-scsi, netdev, LKML, James E.J. Bottomley,
linux-serial, Greg Kroah-Hartman, Brian King, ppc-dev,
David Miller, Alan Cox
[-- 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 --]
^ permalink raw reply
* [PATCH 1/7] powerpc: Remove some of the legacy iSeries specifi device drivers
From: Stephen Rothwell @ 2012-03-08 4:32 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: Jens Axboe, ppc-dev, LKML
In-Reply-To: <20120308152853.b5010336abbb8f90e8a2500c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1122 bytes --]
These drivers are specific to the PowerPC legacy iSeries platform and
their Kconfig is specified in arch/powerpc. Legacy iSeries is being
removed, so these drivers can no longer be selected.
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/block/viodasd.c | 809 ------------------------------------
drivers/cdrom/viocd.c | 739 ---------------------------------
drivers/char/viotape.c | 1041 -----------------------------------------------
3 files changed, 0 insertions(+), 2589 deletions(-)
delete mode 100644 drivers/block/viodasd.c
delete mode 100644 drivers/cdrom/viocd.c
delete mode 100644 drivers/char/viotape.c
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
deleted file mode 100644
index 9a5b2a2..0000000
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
deleted file mode 100644
index 7878da8..0000000
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
deleted file mode 100644
index ad6e64a..0000000
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* [PATCH 2/7] net: powerpc: remove the legacy iSeries ethernet driver
From: Stephen Rothwell @ 2012-03-08 4:33 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: netdev, ppc-dev, David Miller, LKML
In-Reply-To: <20120308152853.b5010336abbb8f90e8a2500c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1623 bytes --]
This driver is specific to the PowerPC legcay iSeries platform which is
being removed.
Cc: David Miller <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/ethernet/ibm/Kconfig | 4 -
drivers/net/ethernet/ibm/Makefile | 1 -
drivers/net/ethernet/ibm/iseries_veth.c | 1710 -------------------------------
3 files changed, 0 insertions(+), 1715 deletions(-)
delete mode 100644 drivers/net/ethernet/ibm/iseries_veth.c
diff --git a/drivers/net/ethernet/ibm/Kconfig b/drivers/net/ethernet/ibm/Kconfig
index 9e16f3f..b9773d2 100644
--- a/drivers/net/ethernet/ibm/Kconfig
+++ b/drivers/net/ethernet/ibm/Kconfig
@@ -29,10 +29,6 @@ config IBMVETH
To compile this driver as a module, choose M here. The module will
be called ibmveth.
-config ISERIES_VETH
- tristate "iSeries Virtual Ethernet driver support"
- depends on PPC_ISERIES
-
source "drivers/net/ethernet/ibm/emac/Kconfig"
config EHEA
diff --git a/drivers/net/ethernet/ibm/Makefile b/drivers/net/ethernet/ibm/Makefile
index 5a7d4e9..2f04e71 100644
--- a/drivers/net/ethernet/ibm/Makefile
+++ b/drivers/net/ethernet/ibm/Makefile
@@ -3,6 +3,5 @@
#
obj-$(CONFIG_IBMVETH) += ibmveth.o
-obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
obj-$(CONFIG_IBM_EMAC) += emac/
obj-$(CONFIG_EHEA) += ehea/
diff --git a/drivers/net/ethernet/ibm/iseries_veth.c b/drivers/net/ethernet/ibm/iseries_veth.c
deleted file mode 100644
index acc31af..0000000
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* [PATCH 3/7] [SCSI] powerpc: remove the legacy iSeries part of ibmvscsi
From: Stephen Rothwell @ 2012-03-08 4:35 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Brian King, ppc-dev, linux-scsi, James E.J. Bottomley, LKML
In-Reply-To: <20120308152853.b5010336abbb8f90e8a2500c@canb.auug.org.au>
[-- 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 --]
^ permalink raw reply related
* [PATCH 4/7] tty: powerpc: remove hvc_iseries
From: Stephen Rothwell @ 2012-03-08 4:37 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: Greg Kroah-Hartman, ppc-dev, LKML
In-Reply-To: <20120308152853.b5010336abbb8f90e8a2500c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1728 bytes --]
The PowerPC legacy iSeries platform is being removed, so this code is no
longer needed.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/tty/hvc/Kconfig | 10 -
drivers/tty/hvc/Makefile | 1 -
drivers/tty/hvc/hvc_iseries.c | 599 -----------------------------------------
3 files changed, 0 insertions(+), 610 deletions(-)
delete mode 100644 drivers/tty/hvc/hvc_iseries.c
diff --git a/drivers/tty/hvc/Kconfig b/drivers/tty/hvc/Kconfig
index 4222035..8ea7f07 100644
--- a/drivers/tty/hvc/Kconfig
+++ b/drivers/tty/hvc/Kconfig
@@ -24,16 +24,6 @@ config HVC_OLD_HVSI
depends on HVC_CONSOLE
default n
-config HVC_ISERIES
- bool "iSeries Hypervisor Virtual Console support"
- depends on PPC_ISERIES
- default y
- select HVC_DRIVER
- select HVC_IRQ
- select VIOPATH
- help
- iSeries machines support a hypervisor virtual console.
-
config HVC_OPAL
bool "OPAL Console support"
depends on PPC_POWERNV
diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile
index 89abf40b..4ca3723 100644
--- a/drivers/tty/hvc/Makefile
+++ b/drivers/tty/hvc/Makefile
@@ -1,7 +1,6 @@
obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi_lib.o
obj-$(CONFIG_HVC_OPAL) += hvc_opal.o hvsi_lib.o
obj-$(CONFIG_HVC_OLD_HVSI) += hvsi.o
-obj-$(CONFIG_HVC_ISERIES) += hvc_iseries.o
obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o
obj-$(CONFIG_HVC_TILE) += hvc_tile.o
obj-$(CONFIG_HVC_DCC) += hvc_dcc.o
diff --git a/drivers/tty/hvc/hvc_iseries.c b/drivers/tty/hvc/hvc_iseries.c
deleted file mode 100644
index 3f4a897..0000000
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* [PATCH 5/7] tty: powerpc: remove SERIAL_ICOM dependency on PPC_ISERIES
From: Stephen Rothwell @ 2012-03-08 4:39 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Greg Kroah-Hartman, ppc-dev, LKML, linux-serial, Alan Cox
In-Reply-To: <20120308152853.b5010336abbb8f90e8a2500c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 880 bytes --]
The PowerPC legacy iSeries platform is being removed so this is no
longer selectable.
Cc: Alan Cox <alan@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-serial@vger.kernel.org
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/tty/serial/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 2de9924..59e7983 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -853,7 +853,7 @@ config SERIAL_MPC52xx_CONSOLE_BAUD
config SERIAL_ICOM
tristate "IBM Multiport Serial Adapter"
- depends on PCI && (PPC_ISERIES || PPC_PSERIES)
+ depends on PCI && PPC_PSERIES
select SERIAL_CORE
select FW_LOADER
help
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* [PATCH 6/7] driver-core: remove legacy iSeries hack
From: Stephen Rothwell @ 2012-03-08 4:41 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: Greg Kroah-Hartman, ppc-dev, LKML
In-Reply-To: <20120308152853.b5010336abbb8f90e8a2500c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2259 bytes --]
The PowerPC legacy iSeries plateform is being removed along with the
"one looney iseries driver", so this code can now be removed as well.
cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/base/driver.c | 30 ------------------------------
include/linux/device.h | 4 ----
2 files changed, 0 insertions(+), 34 deletions(-)
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index b631f7c..db4f54c 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -124,36 +124,6 @@ void driver_remove_file(struct device_driver *drv,
EXPORT_SYMBOL_GPL(driver_remove_file);
/**
- * driver_add_kobj - add a kobject below the specified driver
- * @drv: requesting device driver
- * @kobj: kobject to add below this driver
- * @fmt: format string that names the kobject
- *
- * You really don't want to do this, this is only here due to one looney
- * iseries driver, go poke those developers if you are annoyed about
- * this...
- */
-int driver_add_kobj(struct device_driver *drv, struct kobject *kobj,
- const char *fmt, ...)
-{
- va_list args;
- char *name;
- int ret;
-
- va_start(args, fmt);
- name = kvasprintf(GFP_KERNEL, fmt, args);
- va_end(args);
-
- if (!name)
- return -ENOMEM;
-
- ret = kobject_add(kobj, &drv->p->kobj, "%s", name);
- kfree(name);
- return ret;
-}
-EXPORT_SYMBOL_GPL(driver_add_kobj);
-
-/**
* get_driver - increment driver reference count.
* @drv: driver.
*/
diff --git a/include/linux/device.h b/include/linux/device.h
index b63fb39..46baa1f 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -264,10 +264,6 @@ extern int __must_check driver_create_file(struct device_driver *driver,
extern void driver_remove_file(struct device_driver *driver,
const struct driver_attribute *attr);
-extern int __must_check driver_add_kobj(struct device_driver *drv,
- struct kobject *kobj,
- const char *fmt, ...);
-
extern int __must_check driver_for_each_device(struct device_driver *drv,
struct device *start,
void *data,
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* [PATCH 7/7] powerpc: clean up vio.c
From: Stephen Rothwell @ 2012-03-08 4:43 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: ppc-dev, LKML
In-Reply-To: <20120308152853.b5010336abbb8f90e8a2500c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 3704 bytes --]
This cleans up vio.c after the removal of the legacy iSeries platform.
It also removes some no longer referenced include files.
Signed-off-by: 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 +--
5 files changed, 1 insertions(+), 682 deletions(-)
delete mode 100644 arch/powerpc/include/asm/iseries/hv_call_event.h
delete mode 100644 arch/powerpc/include/asm/iseries/hv_lp_event.h
delete mode 100644 arch/powerpc/include/asm/iseries/iommu.h
delete mode 100644 arch/powerpc/include/asm/iseries/vio.h
diff --git a/arch/powerpc/include/asm/iseries/hv_call_event.h b/arch/powerpc/include/asm/iseries/hv_call_event.h
deleted file mode 100644
index cc029d3..0000000
diff --git a/arch/powerpc/include/asm/iseries/hv_lp_event.h b/arch/powerpc/include/asm/iseries/hv_lp_event.h
deleted file mode 100644
index 8f5da7d..0000000
diff --git a/arch/powerpc/include/asm/iseries/iommu.h b/arch/powerpc/include/asm/iseries/iommu.h
deleted file mode 100644
index 1b9692c..0000000
diff --git a/arch/powerpc/include/asm/iseries/vio.h b/arch/powerpc/include/asm/iseries/vio.h
deleted file mode 100644
index f9ac0d0..0000000
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 8b08629..bca3fc4 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -34,11 +34,6 @@
#include <asm/abs_addr.h>
#include <asm/page.h>
#include <asm/hvcall.h>
-#include <asm/iseries/vio.h>
-#include <asm/iseries/hv_types.h>
-#include <asm/iseries/hv_lp_config.h>
-#include <asm/iseries/hv_call_xm.h>
-#include <asm/iseries/iommu.h>
static struct bus_type vio_bus_type;
@@ -1042,7 +1037,6 @@ static void vio_cmo_sysfs_init(void)
vio_bus_type.bus_attrs = vio_cmo_bus_attrs;
}
#else /* CONFIG_PPC_SMLPAR */
-/* Dummy functions for iSeries platform */
int vio_cmo_entitlement_update(size_t new_entitlement) { return 0; }
void vio_cmo_set_dev_desired(struct vio_dev *viodev, size_t desired) {}
static int vio_cmo_bus_probe(struct vio_dev *viodev) { return 0; }
@@ -1060,9 +1054,6 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
struct iommu_table *tbl;
unsigned long offset, size;
- if (firmware_has_feature(FW_FEATURE_ISERIES))
- return vio_build_iommu_table_iseries(dev);
-
dma_window = of_get_property(dev->dev.of_node,
"ibm,my-dma-window", NULL);
if (!dma_window)
@@ -1195,8 +1186,7 @@ static void __devinit vio_dev_release(struct device *dev)
{
struct iommu_table *tbl = get_iommu_table_base(dev);
- /* iSeries uses a common table for all vio devices */
- if (!firmware_has_feature(FW_FEATURE_ISERIES) && tbl)
+ if (tbl)
iommu_free_table(tbl, dev->of_node ?
dev->of_node->full_name : dev_name(dev));
of_node_put(dev->of_node);
@@ -1244,12 +1234,6 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
viodev->name = of_node->name;
viodev->type = of_node->type;
viodev->unit_address = *unit_address;
- if (firmware_has_feature(FW_FEATURE_ISERIES)) {
- unit_address = of_get_property(of_node,
- "linux,unit_address", NULL);
- if (unit_address != NULL)
- viodev->unit_address = *unit_address;
- }
viodev->dev.of_node = of_node_get(of_node);
if (firmware_has_feature(FW_FEATURE_CMO))
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* Re: linux-next: manual merge of the powerpc tree with the arm tree
From: Benjamin Herrenschmidt @ 2012-03-08 5:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Michael Neuling, linux-kernel, Rob Herring, linux-next,
Paul Mackerras, linuxppc-dev, Russell King
In-Reply-To: <20120308145131.fad50bbc79c36f0b0b12d101@canb.auug.org.au>
On Thu, 2012-03-08 at 14:51 +1100, Stephen Rothwell wrote:
> Hi Mikey,
>
> On Thu, 08 Mar 2012 13:33:56 +1100 Michael Neuling <mikey@neuling.org> wrote:
> >
> > Surely we only need SPARSE_IRQ now and not MAY_HAVE_SPARSE_IRQ.
> >
> > In fact, keeping MAY_HAVE_SPARSE_IRQ seems to make SPARSE_IRQ user
> > selectable, which we don't want anymore since ad5b7f1350c2.
>
> Yes, indeed. I will fix up the merge resolution for tomorrow.
This is my fault. Grant's patch had a collision and I manually fixed it
up. While doing that, I put back MAY_HAVE_SPARSE_IRQ which the patch
originally took out.
Cheers,
Ben.
^ permalink raw reply
* RE: [PATCH v2] powerpc/srio: Fix the compile errors when building with 64bit
From: Liu Gang @ 2012-03-08 6:31 UTC (permalink / raw)
To: David Laight
Cc: r58472, paul.gortmaker, r61911, linux-kernel, Alexandre.Bounine,
akpm, linuxppc-dev, Shaohui Xie
In-Reply-To: <AE90C24D6B3A694183C094C60CF0A2F6026B6E91@saturn3.aculab.com>
Hi, David,
On Wed, 2012-03-07 at 13:18 +0000, David Laight wrote:
> > pr_debug("RIO: fsl_add_outb_message(): destid %4.4x mbox %d
> buffer " \
> > - "%8.8x len %8.8x\n", rdev->destid, mbox, (int)buffer,
> len);
> > + "%8.8lx len %8.8zx\n", rdev->destid, mbox,
> > + (unsigned long)buffer, len);
>
> Should 'buffer' be printed with %p ??
Yes, printing with "%p" can get rid of the cast, although they have the
same print results.
Thanks a lot.
Liu Gang
^ permalink raw reply
* Re: [PATCH 2/7] net: powerpc: remove the legacy iSeries ethernet driver
From: David Miller @ 2012-03-08 6:53 UTC (permalink / raw)
To: sfr; +Cc: linuxppc-dev, linux-kernel, netdev
In-Reply-To: <20120308153353.ee2ff35c8ebe7ee66fa374e9@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 8 Mar 2012 15:33:53 +1100
> This driver is specific to the PowerPC legcay iSeries platform which is
> being removed.
>
> Cc: David Miller <davem@davemloft.net>
> Cc: <netdev@vger.kernel.org>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply
* Re: [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers
From: David Miller @ 2012-03-08 6:53 UTC (permalink / raw)
To: sfr
Cc: axboe, linux-scsi, gregkh, linux-kernel, JBottomley, linux-serial,
netdev, brking, linuxppc-dev, alan
In-Reply-To: <20120308152853.b5010336abbb8f90e8a2500c@canb.auug.org.au>
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.
^ permalink raw reply
* RE: [PATCH 1/9] pci_ids: Add device ID for IBM PCI-X bridge
From: Zang Roy-R61911 @ 2012-03-08 7:55 UTC (permalink / raw)
To: Kumar Gala, Zhao Chenhui-B35336
Cc: linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
In-Reply-To: <08B5FFBF-FFF7-45FF-A98D-181CC0E6CEBC@kernel.crashing.org>
> -----Original Message-----
> From: linuxppc-dev-bounces+tie-fei.zang=3Dfreescale.com@lists.ozlabs.org
> [mailto:linuxppc-dev-bounces+tie-fei.zang=3Dfreescale.com@lists.ozlabs.or=
g]
> On Behalf Of Kumar Gala
> Sent: Tuesday, March 06, 2012 20:14 PM
> To: Zhao Chenhui-B35336
> Cc: linux-pci@vger.kernel.org; linuxppc-dev@lists.ozlabs.org
> Subject: Re: [PATCH 1/9] pci_ids: Add device ID for IBM PCI-X bridge
>=20
>=20
> On Mar 6, 2012, at 3:05 AM, Zhao Chenhui wrote:
>=20
> > Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
> > ---
> > include/linux/pci_ids.h | 1 +
> > 1 files changed, 1 insertions(+), 0 deletions(-)
>=20
> Just merge this with the 2nd patch that actually uses the ID.
Why does this necessary?
I'd prefer using a separate patch for the PCI ID.
Roy
^ permalink raw reply
* Re: [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers
From: Jens Axboe @ 2012-03-08 10:37 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-scsi, Greg Kroah-Hartman, LKML, James E.J. Bottomley,
linux-serial, netdev, Brian King, ppc-dev, David Miller, Alan Cox
In-Reply-To: <20120308152853.b5010336abbb8f90e8a2500c@canb.auug.org.au>
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
^ permalink raw reply
* Re: [PATCH 5/7] tty: powerpc: remove SERIAL_ICOM dependency on PPC_ISERIES
From: Alan Cox @ 2012-03-08 11:18 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: ppc-dev, LKML, linux-serial, Greg Kroah-Hartman
In-Reply-To: <20120308153931.b1b8b4f27d8e4a94b219bf4c@canb.auug.org.au>
On Thu, 8 Mar 2012 15:39:31 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> The PowerPC legacy iSeries platform is being removed so this is no
> longer selectable.
Fine by me
^ permalink raw reply
* RE: [PATCH 2/4] fsl_pci: Add a workaround for PCI 5 errata in MPC8548
From: Zhao Chenhui-B35336 @ 2012-03-08 11:21 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev@lists.ozlabs.org
In-Reply-To: <9449E54A-E134-45B9-A012-C824753D0C97@kernel.crashing.org>
> On Mar 6, 2012, at 3:10 AM, Zhao Chenhui wrote:
>=20
> > + if ((fsl_svr_is(SVR_8548) || fsl_svr_is(SVR_8548_E)) &&
>=20
> Should this also have 8547, 8547E, 8545, 8545E, 8543, & 8543E?
Yes. I will include these chips.
-Chenhui
>=20
> > + !early_find_capability(hose, 0, 0, PCI_CAP_ID_PCIX)) {
> > + early_read_config_word(hose, 0, 0,
> > + PCI_BUS_FUNCTION, &temp);
> > + temp |=3D PCI_BUS_FUNCTION_MDS;
> > + early_write_config_word(hose, 0, 0,
> > + PCI_BUS_FUNCTION, temp);
> > + }
> > }
>=20
^ permalink raw reply
* Re: [PATCH] PPC: Don't sync timebase when inside VM
From: McClintock Matthew-B29882 @ 2012-03-08 17:31 UTC (permalink / raw)
To: Wood Scott-B07421
Cc: <kvm-ppc@vger.kernel.org>, linuxppc-dev, Alexander Graf,
kvm list
In-Reply-To: <4F5100A0.8040802@freescale.com>
On Fri, Mar 2, 2012 at 11:17 AM, Scott Wood <scottwood@freescale.com> wrote=
:
> On 03/02/2012 10:30 AM, Alexander Graf wrote:
>>
>> On 02.03.2012, at 17:20, Scott Wood wrote:
>>
>>> On Fri, Mar 02, 2012 at 03:12:33PM +0100, Alexander Graf wrote:
>>>> When running inside a virtual machine, we can not modify timebase, so
>>>> let's just not call the functions for it then.
>>>>
>>>> This resolves hangs when booting e500 SMP guests on overcommitted host=
s.
>>>>
>>>> Reported-by: Stuart Yoder <B08248@freescale.com>
>>>> Signed-off-by: Alexander Graf <agraf@suse.de>
>>>> ---
>>>> arch/powerpc/platforms/85xx/smp.c | =A0 =A07 +++++++
>>>> 1 files changed, 7 insertions(+), 0 deletions(-)
>>>>
>>>> diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platform=
s/85xx/smp.c
>>>> index ff42490..d4b6c1f 100644
>>>> --- a/arch/powerpc/platforms/85xx/smp.c
>>>> +++ b/arch/powerpc/platforms/85xx/smp.c
>>>> @@ -249,6 +249,13 @@ void __init mpc85xx_smp_init(void)
>>>> =A0 =A0 =A0 =A0 =A0 =A0 smp_85xx_ops.cause_ipi =3D doorbell_cause_ipi;
>>>> =A0 =A0 }
>>>>
>>>> + =A0 /* When running under a hypervisor, we can not modify tb */
>>>> + =A0 np =3D of_find_node_by_path("/hypervisor");
>>>> + =A0 if (np) {
>>>> + =A0 =A0 =A0 =A0 =A0 smp_85xx_ops.give_timebase =3D NULL;
>>>> + =A0 =A0 =A0 =A0 =A0 smp_85xx_ops.take_timebase =3D NULL;
>>>> + =A0 }
>>>> +
>>>> =A0 =A0 smp_ops =3D &smp_85xx_ops;
>>>
>>> Again, for 85xx we should *never* sync the timebase in the kernel,
>>> hypervisor or no.
>>
>> The code says "if the kexec config option is enabled, do the sync". I'm =
fairly sure it's there for a reason.
>
> Sigh. =A0I forgot about that. =A0It's because instead of doing kexec the
> simple way, we actually physically reset the core. =A0We really shouldn't
> do that. =A0And we *really* shouldn't do it just because CONFIG_KEXEC is
> defined, regardless of whether we're actually booting from kexec.
How would one rocver a core that's off in the weeds? We need to at
least stop it somehow before we restart into the kdump kernel. kexec
seems feasible since we have all the cores in a known state...
-M=
^ permalink raw reply
* Re: [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers
From: Greg Kroah-Hartman @ 2012-03-08 17:59 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jens Axboe, linux-scsi, LKML, James E.J. Bottomley, linux-serial,
netdev, Brian King, ppc-dev, David Miller, Alan Cox
In-Reply-To: <20120308152853.b5010336abbb8f90e8a2500c@canb.auug.org.au>
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
^ permalink raw reply
* Re: [PATCH] PPC: Don't sync timebase when inside VM
From: Scott Wood @ 2012-03-08 18:20 UTC (permalink / raw)
To: McClintock Matthew-B29882
Cc: <kvm-ppc@vger.kernel.org>, Wood Scott-B07421, linuxppc-dev,
Alexander Graf, kvm list
In-Reply-To: <CAEsOVNczPUdfUK6oZ7WOTGUQbA135HgrntwvnydbYd-Eo4joLg@mail.gmail.com>
On 03/08/2012 11:31 AM, McClintock Matthew-B29882 wrote:
> On Fri, Mar 2, 2012 at 11:17 AM, Scott Wood <scottwood@freescale.com> wrote:
>> On 03/02/2012 10:30 AM, Alexander Graf wrote:
>>>
>>> On 02.03.2012, at 17:20, Scott Wood wrote:
>>>> Again, for 85xx we should *never* sync the timebase in the kernel,
>>>> hypervisor or no.
>>>
>>> The code says "if the kexec config option is enabled, do the sync". I'm fairly sure it's there for a reason.
>>
>> Sigh. I forgot about that. It's because instead of doing kexec the
>> simple way, we actually physically reset the core. We really shouldn't
>> do that. And we *really* shouldn't do it just because CONFIG_KEXEC is
>> defined, regardless of whether we're actually booting from kexec.
>
> How would one rocver a core that's off in the weeds?
System reset?
I thought kexec was for upgrading your kernel, not recovering from crashes.
> We need to at least stop it somehow before we restart into the kdump kernel. kexec
> seems feasible since we have all the cores in a known state...
Stop, yes. Reset, no.
-Scott
^ permalink raw reply
* Re: [PATCH] PPC: Don't sync timebase when inside VM
From: McClintock Matthew-B29882 @ 2012-03-08 18:24 UTC (permalink / raw)
To: Wood Scott-B07421
Cc: Wood Scott-B07421, kvm list, Alexander Graf,
<kvm-ppc@vger.kernel.org>, McClintock Matthew-B29882,
linuxppc-dev
In-Reply-To: <4F58F85F.8090604@freescale.com>
On Thu, Mar 8, 2012 at 12:20 PM, Scott Wood <scottwood@freescale.com> wrote=
:
> On 03/08/2012 11:31 AM, McClintock Matthew-B29882 wrote:
>> On Fri, Mar 2, 2012 at 11:17 AM, Scott Wood <scottwood@freescale.com> wr=
ote:
>>> On 03/02/2012 10:30 AM, Alexander Graf wrote:
>>>>
>>>> On 02.03.2012, at 17:20, Scott Wood wrote:
>>>>> Again, for 85xx we should *never* sync the timebase in the kernel,
>>>>> hypervisor or no.
>>>>
>>>> The code says "if the kexec config option is enabled, do the sync". I'=
m fairly sure it's there for a reason.
>>>
>>> Sigh. =A0I forgot about that. =A0It's because instead of doing kexec th=
e
>>> simple way, we actually physically reset the core. =A0We really shouldn=
't
>>> do that. =A0And we *really* shouldn't do it just because CONFIG_KEXEC i=
s
>>> defined, regardless of whether we're actually booting from kexec.
>>
>> How would one rocver a core that's off in the weeds?
>
> System reset?
kdump restarts a kernel using a reserved memory region to inspect the
memory of the crashed kernel. Wouldn't system reset cause issues here?
> I thought kexec was for upgrading your kernel, not recovering from crashe=
s.
>
>> We need to at least stop it somehow before we restart into the kdump ker=
nel. kexec
>> seems feasible since we have all the cores in a known state...
>
> Stop, yes. =A0Reset, no.
How would we stop the remaining cores assuming they could be in any state?
-M=
^ permalink raw reply
* Re: [PATCH] PPC: Don't sync timebase when inside VM
From: Scott Wood @ 2012-03-08 18:43 UTC (permalink / raw)
To: McClintock Matthew-B29882
Cc: <kvm-ppc@vger.kernel.org>, Wood Scott-B07421, linuxppc-dev,
Alexander Graf, kvm list
In-Reply-To: <CAEsOVNcqSBh0hmgUQcJJjD28JbreBqYygHF7Q6Y8uaFzdj2PYw@mail.gmail.com>
On 03/08/2012 12:24 PM, McClintock Matthew-B29882 wrote:
> On Thu, Mar 8, 2012 at 12:20 PM, Scott Wood <scottwood@freescale.com> wrote:
>> On 03/08/2012 11:31 AM, McClintock Matthew-B29882 wrote:
>>> On Fri, Mar 2, 2012 at 11:17 AM, Scott Wood <scottwood@freescale.com> wrote:
>>>> On 03/02/2012 10:30 AM, Alexander Graf wrote:
>>>>>
>>>>> On 02.03.2012, at 17:20, Scott Wood wrote:
>>>>>> Again, for 85xx we should *never* sync the timebase in the kernel,
>>>>>> hypervisor or no.
>>>>>
>>>>> The code says "if the kexec config option is enabled, do the sync". I'm fairly sure it's there for a reason.
>>>>
>>>> Sigh. I forgot about that. It's because instead of doing kexec the
>>>> simple way, we actually physically reset the core. We really shouldn't
>>>> do that. And we *really* shouldn't do it just because CONFIG_KEXEC is
>>>> defined, regardless of whether we're actually booting from kexec.
>>>
>>> How would one rocver a core that's off in the weeds?
>>
>> System reset?
>
> kdump restarts a kernel using a reserved memory region to inspect the
> memory of the crashed kernel. Wouldn't system reset cause issues here?
Oh, kdump.
Maybe in that case, go ahead and reset the other cores (or halt them via
some other means), but don't do anything with them. Just boot a single
core in the dump kernel, do the dumping, then reset the system?
Or if you must sync the timebase in Linux, do it the way U-Boot does
(and skip it if you don't have access to the relevant CCSR bits).
Are I/O devices a problem with kdump and not resetting the system,
especially on some of our chips where certain I/O devices are difficult
to reset?
-Scott
^ permalink raw reply
* Re: [PATCH] PPC: Don't sync timebase when inside VM
From: McClintock Matthew-B29882 @ 2012-03-08 18:46 UTC (permalink / raw)
To: Wood Scott-B07421
Cc: Wood Scott-B07421, kvm list, Alexander Graf,
<kvm-ppc@vger.kernel.org>, McClintock Matthew-B29882,
linuxppc-dev
In-Reply-To: <4F58FDC4.2080909@freescale.com>
On Thu, Mar 8, 2012 at 12:43 PM, Scott Wood <scottwood@freescale.com> wrote=
:
> On 03/08/2012 12:24 PM, McClintock Matthew-B29882 wrote:
>> On Thu, Mar 8, 2012 at 12:20 PM, Scott Wood <scottwood@freescale.com> wr=
ote:
>>> On 03/08/2012 11:31 AM, McClintock Matthew-B29882 wrote:
>>>> On Fri, Mar 2, 2012 at 11:17 AM, Scott Wood <scottwood@freescale.com> =
wrote:
>>>>> On 03/02/2012 10:30 AM, Alexander Graf wrote:
>>>>>>
>>>>>> On 02.03.2012, at 17:20, Scott Wood wrote:
>>>>>>> Again, for 85xx we should *never* sync the timebase in the kernel,
>>>>>>> hypervisor or no.
>>>>>>
>>>>>> The code says "if the kexec config option is enabled, do the sync". =
I'm fairly sure it's there for a reason.
>>>>>
>>>>> Sigh. =A0I forgot about that. =A0It's because instead of doing kexec =
the
>>>>> simple way, we actually physically reset the core. =A0We really shoul=
dn't
>>>>> do that. =A0And we *really* shouldn't do it just because CONFIG_KEXEC=
is
>>>>> defined, regardless of whether we're actually booting from kexec.
>>>>
>>>> How would one rocver a core that's off in the weeds?
>>>
>>> System reset?
>>
>> kdump restarts a kernel using a reserved memory region to inspect the
>> memory of the crashed kernel. Wouldn't system reset cause issues here?
>
> Oh, kdump.
>
> Maybe in that case, go ahead and reset the other cores (or halt them via
> some other means), but don't do anything with them. =A0Just boot a single
> core in the dump kernel, do the dumping, then reset the system?
Yes, we could do one core here... but is it worthwhile to do kexec and
kdump differently?
> Or if you must sync the timebase in Linux, do it the way U-Boot does
> (and skip it if you don't have access to the relevant CCSR bits).
Ok - I've never even looked at how the timebase sync was done in Linux
or u-boot. Just enabled the timebase sync
> Are I/O devices a problem with kdump and not resetting the system,
> especially on some of our chips where certain I/O devices are difficult
> to reset?
Anything still occurring will be problematic and *possibly* prevent us
from determining what caused the actual crash.
-M=
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox