* [PATCH 1/3] Layout changes for new mvsas
@ 2009-03-19 8:50 Andy Yan
2009-03-23 0:27 ` James Bottomley
0 siblings, 1 reply; 3+ messages in thread
From: Andy Yan @ 2009-03-19 8:50 UTC (permalink / raw)
To: James Bottomley, jeff, Tejun Heo
Cc: linux-scsi, Michael Wang, Jacky Feng, Ying Chu, Ke Wei
>From e444f857a14757cf483cdbd86f91dee32e99d3ac Mon Sep 17 00:00:00 2001
From: Andy yan <ayan@marvell.com>
Date: Thu, 19 Mar 2009 21:46:48 +0800
Subject: [PATCH 1/3] Layout changes for new mvsas
This patch change Kconfig and Makefile for new layout of mvsas,
mvsas will have own folder, Kconfig, Makefile.
Signed-off-by: Andy Yan <ayan@marvell.com>
Signed-off-by: Ke Wei <kewei@marvell.com>
Signed-off-by: Ying Chu <jasonchu@marvell.com>
---
drivers/scsi/Kconfig | 1 +
drivers/scsi/Makefile | 2 +-
drivers/scsi/mvsas/Kconfig | 42
++++++++++++++++++++++++++++++++++++++++++
drivers/scsi/mvsas/Makefile | 32 ++++++++++++++++++++++++++++++++
4 files changed, 76 insertions(+), 1 deletions(-)
create mode 100644 drivers/scsi/mvsas/Kconfig
create mode 100644 drivers/scsi/mvsas/Makefile
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index e2f44e6..5bb77b1 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -507,6 +507,7 @@ config SCSI_AIC7XXX_OLD
source "drivers/scsi/aic7xxx/Kconfig.aic79xx"
source "drivers/scsi/aic94xx/Kconfig"
+source "drivers/scsi/mvsas/Kconfig"
config SCSI_DPT_I2O
tristate "Adaptec I2O RAID support "
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index cf79296..fdb2dd8 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -124,7 +124,7 @@ obj-$(CONFIG_SCSI_IBMVSCSIS) += ibmvscsi/
obj-$(CONFIG_SCSI_IBMVFC) += ibmvscsi/
obj-$(CONFIG_SCSI_HPTIOP) += hptiop.o
obj-$(CONFIG_SCSI_STEX) += stex.o
-obj-$(CONFIG_SCSI_MVSAS) += mvsas.o
+obj-$(CONFIG_SCSI_MVSAS) += mvsas/
obj-$(CONFIG_PS3_ROM) += ps3rom.o
obj-$(CONFIG_SCSI_CXGB3_ISCSI) += libiscsi.o libiscsi_tcp.o cxgb3i/
diff --git a/drivers/scsi/mvsas/Kconfig b/drivers/scsi/mvsas/Kconfig
new file mode 100644
index 0000000..37096b5
--- /dev/null
+++ b/drivers/scsi/mvsas/Kconfig
@@ -0,0 +1,42 @@
+#
+# Kernel configuration file for 88SE64XX/88SE94XX SAS/SATA driver.
+#
+# Copyright (c) 2005 Adaptec, Inc. All rights reserved.
+# Copyright (c) 2005 Luben Tuikov <luben_tuikov@adaptec.com>
+#
+# This file is licensed under GPLv2.
+#
+# This file is part of the 88SE64XX/88SE94XX driver.
+#
+# The 88SE64XX/88SE94XX driver 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; version 2 of the
+# License.
+#
+# The 88SE64XX/88SE94XX driver 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 88SE64XX/88SE94XX Driver; if not, write to the Free
Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
+#
+#
+
+config SCSI_MVSAS
+ tristate "Marvell 88SE64XX/88SE94XX SAS/SATA support"
+ depends on PCI
+ select SCSI_SAS_LIBSAS
+ select FW_LOADER
+ help
+ This driver supports Marvell's SAS/SATA 3Gb/s PCI-E
88SE64XX and 6Gb/s
+ PCI-E 88SE94XX chip based host adapters.
+
+config SCSI_MVSAS_DEBUG
+ bool "Compile in debug mode"
+ default y
+ depends on SCSI_MVSAS
+ help
+ Compiles the 88SE64XX/88SE94XX driver in debug mode. In
debug mode,
+ the driver prints some messages to the console.
diff --git a/drivers/scsi/mvsas/Makefile b/drivers/scsi/mvsas/Makefile
new file mode 100644
index 0000000..cefc0cf
--- /dev/null
+++ b/drivers/scsi/mvsas/Makefile
@@ -0,0 +1,32 @@
+#
+# Kernel Makefile for the libsas helpers
+#
+# Copyright (C) 2005 Adaptec, Inc. All rights reserved.
+# Copyright (C) 2005 Luben Tuikov <luben_tuikov@adaptec.com>
+#
+# This file is licensed under GPLv2.
+#
+# 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; version 2 of the
+# License.
+#
+# 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
+
+ifeq ($(CONFIG_SCSI_MVSAS_DEBUG),y)
+ EXTRA_CFLAGS += -DMV_DEBUG
+endif
+
+obj-$(CONFIG_SCSI_MVSAS) += mvsas.o
+mvsas-y += mv_init.o \
+ mv_sas.o \
+ mv_64xx.o \
+ mv_94xx.o
--
1.6.2.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/3] Layout changes for new mvsas
2009-03-19 8:50 [PATCH 1/3] Layout changes for new mvsas Andy Yan
@ 2009-03-23 0:27 ` James Bottomley
2009-03-23 2:35 ` Ying Chu
0 siblings, 1 reply; 3+ messages in thread
From: James Bottomley @ 2009-03-23 0:27 UTC (permalink / raw)
To: Andy Yan
Cc: jeff, Tejun Heo, linux-scsi, Michael Wang, Jacky Feng, Ying Chu,
Ke Wei
On Thu, 2009-03-19 at 01:50 -0700, Andy Yan wrote:
> >From e444f857a14757cf483cdbd86f91dee32e99d3ac Mon Sep 17 00:00:00 2001
> From: Andy yan <ayan@marvell.com>
> Date: Thu, 19 Mar 2009 21:46:48 +0800
> Subject: [PATCH 1/3] Layout changes for new mvsas
> This patch change Kconfig and Makefile for new layout of mvsas,
> mvsas will have own folder, Kconfig, Makefile.
>
> Signed-off-by: Andy Yan <ayan@marvell.com>
> Signed-off-by: Ke Wei <kewei@marvell.com>
> Signed-off-by: Ying Chu <jasonchu@marvell.com>
>
> ---
> drivers/scsi/Kconfig | 1 +
> drivers/scsi/Makefile | 2 +-
> drivers/scsi/mvsas/Kconfig | 42
> ++++++++++++++++++++++++++++++++++++++++++
These lines are broken by your email tool, so it makes the patch
unapplyable, I'm afraid. Could you see Documentation/email-clients.txt
and see if you can find a way of making the actual patches not be
wrapped this way?
> drivers/scsi/mvsas/Makefile | 32 ++++++++++++++++++++++++++++++++
> 4 files changed, 76 insertions(+), 1 deletions(-)
> create mode 100644 drivers/scsi/mvsas/Kconfig
> create mode 100644 drivers/scsi/mvsas/Makefile
>
> diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
> index e2f44e6..5bb77b1 100644
> --- a/drivers/scsi/Kconfig
> +++ b/drivers/scsi/Kconfig
> @@ -507,6 +507,7 @@ config SCSI_AIC7XXX_OLD
>
> source "drivers/scsi/aic7xxx/Kconfig.aic79xx"
> source "drivers/scsi/aic94xx/Kconfig"
> +source "drivers/scsi/mvsas/Kconfig"
>
> config SCSI_DPT_I2O
> tristate "Adaptec I2O RAID support "
> diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
> index cf79296..fdb2dd8 100644
> --- a/drivers/scsi/Makefile
> +++ b/drivers/scsi/Makefile
> @@ -124,7 +124,7 @@ obj-$(CONFIG_SCSI_IBMVSCSIS) += ibmvscsi/
> obj-$(CONFIG_SCSI_IBMVFC) += ibmvscsi/
> obj-$(CONFIG_SCSI_HPTIOP) += hptiop.o
> obj-$(CONFIG_SCSI_STEX) += stex.o
> -obj-$(CONFIG_SCSI_MVSAS) += mvsas.o
> +obj-$(CONFIG_SCSI_MVSAS) += mvsas/
> obj-$(CONFIG_PS3_ROM) += ps3rom.o
> obj-$(CONFIG_SCSI_CXGB3_ISCSI) += libiscsi.o libiscsi_tcp.o cxgb3i/
>
> diff --git a/drivers/scsi/mvsas/Kconfig b/drivers/scsi/mvsas/Kconfig
> new file mode 100644
> index 0000000..37096b5
> --- /dev/null
> +++ b/drivers/scsi/mvsas/Kconfig
> @@ -0,0 +1,42 @@
> +#
> +# Kernel configuration file for 88SE64XX/88SE94XX SAS/SATA driver.
> +
> +# Copyright (c) 2005 Adaptec, Inc. All rights reserved.
> +# Copyright (c) 2005 Luben Tuikov <luben_tuikov@adaptec.com>
Interesting copyright for a Marvell file ...
> +# This file is licensed under GPLv2.
> +#
> +# This file is part of the 88SE64XX/88SE94XX driver.
> +#
> +# The 88SE64XX/88SE94XX driver 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; version 2 of the
> +# License.
> +#
> +# The 88SE64XX/88SE94XX driver 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 88SE64XX/88SE94XX Driver; if not, write to the Free
> Software
> +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
> USA
> +#
> +#
> +
> +config SCSI_MVSAS
> + tristate "Marvell 88SE64XX/88SE94XX SAS/SATA support"
> + depends on PCI
> + select SCSI_SAS_LIBSAS
> + select FW_LOADER
> + help
> + This driver supports Marvell's SAS/SATA 3Gb/s PCI-E
> 88SE64XX and 6Gb/s
> + PCI-E 88SE94XX chip based host adapters.
> +
> +config SCSI_MVSAS_DEBUG
> + bool "Compile in debug mode"
> + default y
> + depends on SCSI_MVSAS
> + help
> + Compiles the 88SE64XX/88SE94XX driver in debug mode. In
> debug mode,
> + the driver prints some messages to the console.
> diff --git a/drivers/scsi/mvsas/Makefile b/drivers/scsi/mvsas/Makefile
> new file mode 100644
> index 0000000..cefc0cf
> --- /dev/null
> +++ b/drivers/scsi/mvsas/Makefile
> @@ -0,0 +1,32 @@
> +#
> +# Kernel Makefile for the libsas helpers
Even more interesting description.
> +# Copyright (C) 2005 Adaptec, Inc. All rights reserved.
> +# Copyright (C) 2005 Luben Tuikov <luben_tuikov@adaptec.com>
> +#
> +# This file is licensed under GPLv2.
> +#
> +# 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; version 2 of the
> +# License.
> +#
> +# 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
> +
> +ifeq ($(CONFIG_SCSI_MVSAS_DEBUG),y)
> + EXTRA_CFLAGS += -DMV_DEBUG
> +endif
> +
> +obj-$(CONFIG_SCSI_MVSAS) += mvsas.o
> +mvsas-y += mv_init.o \
> + mv_sas.o \
> + mv_64xx.o \
> + mv_94xx.o
You can't do the Makefile first because if I put it in in this order,
and someone bisects precisely to this point, we have all the symbols but
no actual C files for this Makefile to build, the result would be that
the build would break. Each patch needs to be separately buildable ...
I can do this by merging the three patches together (as often makes
sense for new drivers), so this isn't a huge problem.
James
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH 1/3] Layout changes for new mvsas
2009-03-23 0:27 ` James Bottomley
@ 2009-03-23 2:35 ` Ying Chu
0 siblings, 0 replies; 3+ messages in thread
From: Ying Chu @ 2009-03-23 2:35 UTC (permalink / raw)
To: James Bottomley, Andy Yan
Cc: jeff, linux-scsi, Michael Wang, Jacky Feng, Ke Wei
Sorry about the mess, we will fix our driver and resend the patch file in a solo file.
-----Original Message-----
From: James Bottomley [mailto:James.Bottomley@HansenPartnership.com]
Sent: 2009年3月23日 8:27
To: Andy Yan
Cc: jeff@garzik.org; Tejun Heo; linux-scsi@vger.kernel.org; Michael Wang; Jacky Feng; Ying Chu; Ke Wei
Subject: Re: [PATCH 1/3] Layout changes for new mvsas
On Thu, 2009-03-19 at 01:50 -0700, Andy Yan wrote:
> >From e444f857a14757cf483cdbd86f91dee32e99d3ac Mon Sep 17 00:00:00
> >2001
> From: Andy yan <ayan@marvell.com>
> Date: Thu, 19 Mar 2009 21:46:48 +0800
> Subject: [PATCH 1/3] Layout changes for new mvsas This patch change
> Kconfig and Makefile for new layout of mvsas, mvsas will have own
> folder, Kconfig, Makefile.
>
> Signed-off-by: Andy Yan <ayan@marvell.com>
> Signed-off-by: Ke Wei <kewei@marvell.com>
> Signed-off-by: Ying Chu <jasonchu@marvell.com>
>
> ---
> drivers/scsi/Kconfig | 1 +
> drivers/scsi/Makefile | 2 +-
> drivers/scsi/mvsas/Kconfig | 42
> ++++++++++++++++++++++++++++++++++++++++++
These lines are broken by your email tool, so it makes the patch unapplyable, I'm afraid. Could you see Documentation/email-clients.txt and see if you can find a way of making the actual patches not be wrapped this way?
> drivers/scsi/mvsas/Makefile | 32 ++++++++++++++++++++++++++++++++
> 4 files changed, 76 insertions(+), 1 deletions(-) create mode 100644
> drivers/scsi/mvsas/Kconfig create mode 100644
> drivers/scsi/mvsas/Makefile
>
> diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index
> e2f44e6..5bb77b1 100644
> --- a/drivers/scsi/Kconfig
> +++ b/drivers/scsi/Kconfig
> @@ -507,6 +507,7 @@ config SCSI_AIC7XXX_OLD
>
> source "drivers/scsi/aic7xxx/Kconfig.aic79xx"
> source "drivers/scsi/aic94xx/Kconfig"
> +source "drivers/scsi/mvsas/Kconfig"
>
> config SCSI_DPT_I2O
> tristate "Adaptec I2O RAID support "
> diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index
> cf79296..fdb2dd8 100644
> --- a/drivers/scsi/Makefile
> +++ b/drivers/scsi/Makefile
> @@ -124,7 +124,7 @@ obj-$(CONFIG_SCSI_IBMVSCSIS) += ibmvscsi/
> obj-$(CONFIG_SCSI_IBMVFC) += ibmvscsi/
> obj-$(CONFIG_SCSI_HPTIOP) += hptiop.o
> obj-$(CONFIG_SCSI_STEX) += stex.o
> -obj-$(CONFIG_SCSI_MVSAS) += mvsas.o
> +obj-$(CONFIG_SCSI_MVSAS) += mvsas/
> obj-$(CONFIG_PS3_ROM) += ps3rom.o
> obj-$(CONFIG_SCSI_CXGB3_ISCSI) += libiscsi.o libiscsi_tcp.o cxgb3i/
>
> diff --git a/drivers/scsi/mvsas/Kconfig b/drivers/scsi/mvsas/Kconfig
> new file mode 100644 index 0000000..37096b5
> --- /dev/null
> +++ b/drivers/scsi/mvsas/Kconfig
> @@ -0,0 +1,42 @@
> +#
> +# Kernel configuration file for 88SE64XX/88SE94XX SAS/SATA driver.
> +
> +# Copyright (c) 2005 Adaptec, Inc. All rights reserved.
> +# Copyright (c) 2005 Luben Tuikov <luben_tuikov@adaptec.com>
Interesting copyright for a Marvell file ...
> +# This file is licensed under GPLv2.
> +#
> +# This file is part of the 88SE64XX/88SE94XX driver.
> +#
> +# The 88SE64XX/88SE94XX driver 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; version 2 of the #
> +License.
> +#
> +# The 88SE64XX/88SE94XX driver 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 88SE64XX/88SE94XX Driver; if not, write to the Free
> Software
> +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
> +02110-1301
> USA
> +#
> +#
> +
> +config SCSI_MVSAS
> + tristate "Marvell 88SE64XX/88SE94XX SAS/SATA support"
> + depends on PCI
> + select SCSI_SAS_LIBSAS
> + select FW_LOADER
> + help
> + This driver supports Marvell's SAS/SATA 3Gb/s PCI-E
> 88SE64XX and 6Gb/s
> + PCI-E 88SE94XX chip based host adapters.
> +
> +config SCSI_MVSAS_DEBUG
> + bool "Compile in debug mode"
> + default y
> + depends on SCSI_MVSAS
> + help
> + Compiles the 88SE64XX/88SE94XX driver in debug mode. In
> debug mode,
> + the driver prints some messages to the console.
> diff --git a/drivers/scsi/mvsas/Makefile b/drivers/scsi/mvsas/Makefile
> new file mode 100644 index 0000000..cefc0cf
> --- /dev/null
> +++ b/drivers/scsi/mvsas/Makefile
> @@ -0,0 +1,32 @@
> +#
> +# Kernel Makefile for the libsas helpers
Even more interesting description.
> +# Copyright (C) 2005 Adaptec, Inc. All rights reserved.
> +# Copyright (C) 2005 Luben Tuikov <luben_tuikov@adaptec.com> # # This
> +file is licensed under GPLv2.
> +#
> +# 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; version 2 of the #
> +License.
> +#
> +# 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
> +
> +ifeq ($(CONFIG_SCSI_MVSAS_DEBUG),y)
> + EXTRA_CFLAGS += -DMV_DEBUG
> +endif
> +
> +obj-$(CONFIG_SCSI_MVSAS) += mvsas.o
> +mvsas-y += mv_init.o \
> + mv_sas.o \
> + mv_64xx.o \
> + mv_94xx.o
You can't do the Makefile first because if I put it in in this order, and someone bisects precisely to this point, we have all the symbols but no actual C files for this Makefile to build, the result would be that the build would break. Each patch needs to be separately buildable ...
I can do this by merging the three patches together (as often makes sense for new drivers), so this isn't a huge problem.
James
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-03-23 2:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-19 8:50 [PATCH 1/3] Layout changes for new mvsas Andy Yan
2009-03-23 0:27 ` James Bottomley
2009-03-23 2:35 ` Ying Chu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox