PATCH: mvsas: add support for Supermicro AOC-SAS2LP-MV8

PATCH: mvsas: add support for Supermicro AOC-SAS2LP-MV8

[Jan Kasprzak]

Add support for the AOC-SAS2LP-MV8 SAS-2 controller from SuperMicro.
This controller has subdevice id 0x9485 instead of 0x9480, and apparently
this simple patch is the only thing needed to make it work.

# lspci -vn
[...]
03:00.0 0104: 1b4b:9485 (rev 03)
	Subsystem: 1b4b:9485
	Flags: bus master, fast devsel, latency 0, IRQ 24
	Memory at feba0000 (64-bit, non-prefetchable) [size=128K]
	Memory at febc0000 (64-bit, non-prefetchable) [size=256K]
	Expansion ROM at feb90000 [disabled] [size=64K]
	Capabilities: [40] Power Management version 3
	Capabilities: [50] MSI: Enable- Count=1/1 Maskable- 64bit+
	Capabilities: [70] Express Endpoint, MSI 00
	Capabilities: [100] Advanced Error Reporting
	Capabilities: [140] Virtual Channel
	Kernel driver in use: mvsas
	Kernel modules: mvsas

Signed-off-by: Jan Kasprzak <kas@fi.muni.cz>

diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
index 5ff978b..eacee48 100644
--- a/drivers/scsi/mvsas/mv_init.c
+++ b/drivers/scsi/mvsas/mv_init.c
@@ -728,6 +728,15 @@ static struct pci_device_id mvs_pci_table[] = {
 		.class_mask	= 0,
 		.driver_data	= chip_9485,
 	},
+	{
+		.vendor		= PCI_VENDOR_ID_MARVELL_EXT,
+		.device		= 0x9485,
+		.subvendor	= PCI_ANY_ID,
+		.subdevice	= 0x9485,
+		.class		= 0,
+		.class_mask	= 0,
+		.driver_data	= chip_9485,
+	},
 	{ PCI_VDEVICE(OCZ, 0x1021), chip_9485}, /* OCZ RevoDrive3 */
 	{ PCI_VDEVICE(OCZ, 0x1022), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */
 	{ PCI_VDEVICE(OCZ, 0x1040), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */

-- 
| Jan "Yenya" Kasprzak  <kas at {fi.muni.cz - work | yenya.net - private}> |
| New GPG 4096R/A45477D5 - see http://www.fi.muni.cz/~kas/pgp-rollover.txt |
| http://www.fi.muni.cz/~kas/    Journal: http://www.fi.muni.cz/~kas/blog/ |
  There's clearly a balance between "octopus merges are fine" and "Christ,
  that's not an octopus, that's a Cthulhu merge".         --Linus Torvalds

RE: PATCH: mvsas: add support for Supermicro AOC-SAS2LP-MV8

[Xiangliang Yu]

Hi, Jan
I think below change may be better:
{ PCI_VDEVICE(MARVELL_EXT, 0x9485), chip_9485 },

> Add support for the AOC-SAS2LP-MV8 SAS-2 controller from SuperMicro.
> This controller has subdevice id 0x9485 instead of 0x9480, and apparently
> this simple patch is the only thing needed to make it work.
> 
> # lspci -vn
> [...]
> 03:00.0 0104: 1b4b:9485 (rev 03)
> 	Subsystem: 1b4b:9485
> 	Flags: bus master, fast devsel, latency 0, IRQ 24
> 	Memory at feba0000 (64-bit, non-prefetchable) [size=128K]
> 	Memory at febc0000 (64-bit, non-prefetchable) [size=256K]
> 	Expansion ROM at feb90000 [disabled] [size=64K]
> 	Capabilities: [40] Power Management version 3
> 	Capabilities: [50] MSI: Enable- Count=1/1 Maskable- 64bit+
> 	Capabilities: [70] Express Endpoint, MSI 00
> 	Capabilities: [100] Advanced Error Reporting
> 	Capabilities: [140] Virtual Channel
> 	Kernel driver in use: mvsas
> 	Kernel modules: mvsas
> 
> Signed-off-by: Jan Kasprzak <kas@fi.muni.cz>
> 
> diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
> index 5ff978b..eacee48 100644
> --- a/drivers/scsi/mvsas/mv_init.c
> +++ b/drivers/scsi/mvsas/mv_init.c
> @@ -728,6 +728,15 @@ static struct pci_device_id mvs_pci_table[] = {
>  		.class_mask	= 0,
>  		.driver_data	= chip_9485,
>  	},
> +	{
> +		.vendor		= PCI_VENDOR_ID_MARVELL_EXT,
> +		.device		= 0x9485,
> +		.subvendor	= PCI_ANY_ID,
> +		.subdevice	= 0x9485,
> +		.class		= 0,
> +		.class_mask	= 0,
> +		.driver_data	= chip_9485,
> +	},
>  	{ PCI_VDEVICE(OCZ, 0x1021), chip_9485}, /* OCZ RevoDrive3 */
>  	{ PCI_VDEVICE(OCZ, 0x1022), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact
> model unknown) */
>  	{ PCI_VDEVICE(OCZ, 0x1040), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact
> model unknown) */
> 
> --
> | Jan "Yenya" Kasprzak  <kas at {fi.muni.cz - work | yenya.net - private}> |
> | New GPG 4096R/A45477D5 - see http://www.fi.muni.cz/~kas/pgp-rollover.txt |
> | http://www.fi.muni.cz/~kas/    Journal: http://www.fi.muni.cz/~kas/blog/
> |
>   There's clearly a balance between "octopus merges are fine" and "Christ,
>   that's not an octopus, that's a Cthulhu merge".         --Linus Torvalds

Re: PATCH: mvsas: add support for Supermicro AOC-SAS2LP-MV8

[James Bottomley]

On Mon, 2014-04-28 at 18:16 -0700, Xiangliang Yu wrote:
> Hi, Jan
> I think below change may be better:
> { PCI_VDEVICE(MARVELL_EXT, 0x9485), chip_9485 },

Ben Hutchings already submitted a patch for this twice, which I cc'd you
on:

http://marc.info/?t=139277203900003

will you ack it?  PCI_VDEVICE() is a sort of take it or leave it macro.
It's not important and it will look untidy and a bit confusing having a
mix of open coding and macros, so I'd say convert all or none.

James


> > Add support for the AOC-SAS2LP-MV8 SAS-2 controller from SuperMicro.
> > This controller has subdevice id 0x9485 instead of 0x9480, and apparently
> > this simple patch is the only thing needed to make it work.
> > 
> > # lspci -vn
> > [...]
> > 03:00.0 0104: 1b4b:9485 (rev 03)
> > 	Subsystem: 1b4b:9485
> > 	Flags: bus master, fast devsel, latency 0, IRQ 24
> > 	Memory at feba0000 (64-bit, non-prefetchable) [size=128K]
> > 	Memory at febc0000 (64-bit, non-prefetchable) [size=256K]
> > 	Expansion ROM at feb90000 [disabled] [size=64K]
> > 	Capabilities: [40] Power Management version 3
> > 	Capabilities: [50] MSI: Enable- Count=1/1 Maskable- 64bit+
> > 	Capabilities: [70] Express Endpoint, MSI 00
> > 	Capabilities: [100] Advanced Error Reporting
> > 	Capabilities: [140] Virtual Channel
> > 	Kernel driver in use: mvsas
> > 	Kernel modules: mvsas
> > 
> > Signed-off-by: Jan Kasprzak <kas@fi.muni.cz>
> > 
> > diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
> > index 5ff978b..eacee48 100644
> > --- a/drivers/scsi/mvsas/mv_init.c
> > +++ b/drivers/scsi/mvsas/mv_init.c
> > @@ -728,6 +728,15 @@ static struct pci_device_id mvs_pci_table[] = {
> >  		.class_mask	= 0,
> >  		.driver_data	= chip_9485,
> >  	},
> > +	{
> > +		.vendor		= PCI_VENDOR_ID_MARVELL_EXT,
> > +		.device		= 0x9485,
> > +		.subvendor	= PCI_ANY_ID,
> > +		.subdevice	= 0x9485,
> > +		.class		= 0,
> > +		.class_mask	= 0,
> > +		.driver_data	= chip_9485,
> > +	},
> >  	{ PCI_VDEVICE(OCZ, 0x1021), chip_9485}, /* OCZ RevoDrive3 */
> >  	{ PCI_VDEVICE(OCZ, 0x1022), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact
> > model unknown) */
> >  	{ PCI_VDEVICE(OCZ, 0x1040), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact
> > model unknown) */
> > 
> > --
> > | Jan "Yenya" Kasprzak  <kas at {fi.muni.cz - work | yenya.net - private}> |
> > | New GPG 4096R/A45477D5 - see http://www.fi.muni.cz/~kas/pgp-rollover.txt |
> > | http://www.fi.muni.cz/~kas/    Journal: http://www.fi.muni.cz/~kas/blog/
> > |
> >   There's clearly a balance between "octopus merges are fine" and "Christ,
> >   that's not an octopus, that's a Cthulhu merge".         --Linus Torvalds
> --
> 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

RE: PATCH: mvsas: add support for Supermicro AOC-SAS2LP-MV8

[Xiangliang Yu]

> Ben Hutchings already submitted a patch for this twice, which I cc'd you
> on:
> 
> http://marc.info/?t=139277203900003
> 
> will you ack it?  PCI_VDEVICE() is a sort of take it or leave it macro.
> It's not important and it will look untidy and a bit confusing having a
> mix of open coding and macros, so I'd say convert all or none.
> 
Using open coding because PCI_VENDOR_ID_MARVELL_EXT was undefined before.
Now, we should use the macros instead of open coding.

> 
> 
> > > Add support for the AOC-SAS2LP-MV8 SAS-2 controller from SuperMicro.
> > > This controller has subdevice id 0x9485 instead of 0x9480, and apparently
> > > this simple patch is the only thing needed to make it work.
> > >
> > > # lspci -vn
> > > [...]
> > > 03:00.0 0104: 1b4b:9485 (rev 03)
> > > 	Subsystem: 1b4b:9485
> > > 	Flags: bus master, fast devsel, latency 0, IRQ 24
> > > 	Memory at feba0000 (64-bit, non-prefetchable) [size=128K]
> > > 	Memory at febc0000 (64-bit, non-prefetchable) [size=256K]
> > > 	Expansion ROM at feb90000 [disabled] [size=64K]
> > > 	Capabilities: [40] Power Management version 3
> > > 	Capabilities: [50] MSI: Enable- Count=1/1 Maskable- 64bit+
> > > 	Capabilities: [70] Express Endpoint, MSI 00
> > > 	Capabilities: [100] Advanced Error Reporting
> > > 	Capabilities: [140] Virtual Channel
> > > 	Kernel driver in use: mvsas
> > > 	Kernel modules: mvsas
> > >
> > > Signed-off-by: Jan Kasprzak <kas@fi.muni.cz>
> > >
> > > diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
> > > index 5ff978b..eacee48 100644
> > > --- a/drivers/scsi/mvsas/mv_init.c
> > > +++ b/drivers/scsi/mvsas/mv_init.c
> > > @@ -728,6 +728,15 @@ static struct pci_device_id mvs_pci_table[] = {
> > >  		.class_mask	= 0,
> > >  		.driver_data	= chip_9485,
> > >  	},
> > > +	{
> > > +		.vendor		= PCI_VENDOR_ID_MARVELL_EXT,
> > > +		.device		= 0x9485,
> > > +		.subvendor	= PCI_ANY_ID,
> > > +		.subdevice	= 0x9485,
> > > +		.class		= 0,
> > > +		.class_mask	= 0,
> > > +		.driver_data	= chip_9485,
> > > +	},
> > >  	{ PCI_VDEVICE(OCZ, 0x1021), chip_9485}, /* OCZ RevoDrive3 */
> > >  	{ PCI_VDEVICE(OCZ, 0x1022), chip_9485}, /* OCZ RevoDrive3/zDriveR4
> (exact
> > > model unknown) */
> > >  	{ PCI_VDEVICE(OCZ, 0x1040), chip_9485}, /* OCZ RevoDrive3/zDriveR4
> (exact
> > > model unknown) */
> > >
> > > --
> > > | Jan "Yenya" Kasprzak  <kas at {fi.muni.cz - work | yenya.net - private}>
> |
> > > | New GPG 4096R/A45477D5 - see http://www.fi.muni.cz/~kas/pgp-rollover.txt
> |
> > > | http://www.fi.muni.cz/~kas/    Journal:
> http://www.fi.muni.cz/~kas/blog/
> > > |
> > >   There's clearly a balance between "octopus merges are fine" and "Christ,
> > >   that's not an octopus, that's a Cthulhu merge".         --Linus Torvalds
> > --
> > 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
> 
> 

RE: PATCH: mvsas: add support for Supermicro AOC-SAS2LP-MV8

[Xiangliang Yu]

> Ben Hutchings already submitted a patch for this twice, which I cc'd you
> on:
> 
> http://marc.info/?t=139277203900003
> 
> will you ack it?  
I can't find this mail in my mail box.

Re: PATCH: mvsas: add support for Supermicro AOC-SAS2LP-MV8

[Jan Kasprzak]

	Hello,

Xiangliang Yu wrote:
: > Ben Hutchings already submitted a patch for this twice, which I cc'd you
: > on:
: > 
: > http://marc.info/?t=139277203900003
: > 
: > will you ack it?  
: I can't find this mail in my mail box.

any news with this patch? Will it be acked by you and submitted upstream?
Thanks!

-Jan Kasprzak

-- 
| Jan "Yenya" Kasprzak  <kas at {fi.muni.cz - work | yenya.net - private}> |
| New GPG 4096R/A45477D5 - see http://www.fi.muni.cz/~kas/pgp-rollover.txt |
| http://www.fi.muni.cz/~kas/    Journal: http://www.fi.muni.cz/~kas/blog/ |
  There's clearly a balance between "octopus merges are fine" and "Christ,
  that's not an octopus, that's a Cthulhu merge".         --Linus Torvalds

Re: PATCH: mvsas: add support for Supermicro AOC-SAS2LP-MV8

[Christoph Hellwig]

On Fri, May 16, 2014 at 02:06:42PM +0200, Jan Kasprzak wrote:
> any news with this patch? Will it be acked by you and submitted upstream?
> Thanks!

Give me an Acked-by and I'll pull it in.

Re: PATCH: mvsas: add support for Supermicro AOC-SAS2LP-MV8

[Jan Kasprzak]

Christoph Hellwig wrote:
: On Fri, May 16, 2014 at 02:06:42PM +0200, Jan Kasprzak wrote:
: > any news with this patch? Will it be acked by you and submitted upstream?
: > Thanks!
: 
: Give me an Acked-by and I'll pull it in.

Acked-By: Jan "Yenya" Kasprzak <kas@fi.muni.cz>

Not sure whether I should ack my own patch, though. But you may apply
it to the original one, which is identical to what I did.
http://marc.info/?l=linux-scsi&m=139277202005675&w=2

Thanks!

-Y.

-- 
| Jan "Yenya" Kasprzak  <kas at {fi.muni.cz - work | yenya.net - private}> |
| New GPG 4096R/A45477D5 - see http://www.fi.muni.cz/~kas/pgp-rollover.txt |
| http://www.fi.muni.cz/~kas/    Journal: http://www.fi.muni.cz/~kas/blog/ |
  There's clearly a balance between "octopus merges are fine" and "Christ,
  that's not an octopus, that's a Cthulhu merge".         --Linus Torvalds

Re: PATCH: mvsas: add support for Supermicro AOC-SAS2LP-MV8

[Christoph Hellwig]

On Fri, May 30, 2014 at 02:50:11PM +0200, Jan Kasprzak wrote:
> Not sure whether I should ack my own patch, though. But you may apply
> it to the original one, which is identical to what I did.
> http://marc.info/?l=linux-scsi&m=139277202005675&w=2

Yes, that's what I will do.

Thanks a lot!