Re: [PATCH 11/20] [SCSI] mpt3sas: Add branding string support for OEM custom HBA

[Sreekanth Reddy <sreekanth.reddy@avagotech.com>]

Hi,

Any review comments on this patch. please let us known if any changes
are required.

Thanks,
Sreekanth

On Fri, Jun 12, 2015 at 3:12 PM, Sreekanth Reddy
<sreekanth.reddy@avagotech.com> wrote:
> Add the following OEM's branding to the mpt3sas driver.
>
> "VendorID"   "DeviceID"  "SubsystemVendor ID"   "SubsystemDevice ID"  Cisco Branding String
> 0x1000         0x97         SVID = 0x1137             0x014C          Cisco 9300-8E 12G SAS HBA
>
> Signed-off-by: Sreekanth Reddy <Sreekanth.Reddy@avagotech.com>
> ---
>  drivers/scsi/mpt3sas/mpt3sas_base.c | 34 ++++++++++++++++++++++++++++++++++
>  drivers/scsi/mpt3sas/mpt3sas_base.h | 11 +++++++++++
>  2 files changed, 45 insertions(+)
>
> diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
> index db362cb..267e489 100644
> --- a/drivers/scsi/mpt3sas/mpt3sas_base.c
> +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
> @@ -2378,6 +2378,39 @@ _base_display_dell_branding(struct MPT3SAS_ADAPTER *ioc)
>         }
>  }
>
> +/**
> + * _base_display_cisco_branding - Display branding string
> + * @ioc: per adapter object
> + *
> + * Return nothing.
> + */
> +static void
> +_base_display_cisco_branding(struct MPT3SAS_ADAPTER *ioc)
> +{
> +       if (ioc->pdev->subsystem_vendor != PCI_VENDOR_ID_CISCO)
> +               return;
> +
> +       switch (ioc->pdev->device) {
> +       case MPI25_MFGPAGE_DEVID_SAS3008:
> +               switch (ioc->pdev->subsystem_device) {
> +               case MPT3SAS_CISCO_12G_HBA_SSDID:
> +                       pr_info(MPT3SAS_FMT "%s\n", ioc->name,
> +                               MPT3SAS_CISCO_12G_HBA_BRANDING);
> +                       break;
> +               default:
> +                       pr_info(MPT3SAS_FMT
> +                         "Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n",
> +                         ioc->name, ioc->pdev->subsystem_device);
> +                       break;
> +               }
> +               break;
> +       default:
> +                pr_info(MPT3SAS_FMT
> +                       "Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n",
> +                       ioc->name, ioc->pdev->subsystem_device);
> +               break;
> +       }
> +}
>
>  /**
>   * _base_display_ioc_capabilities - Disply IOC's capabilities.
> @@ -2410,6 +2443,7 @@ _base_display_ioc_capabilities(struct MPT3SAS_ADAPTER *ioc)
>
>         _base_display_intel_branding(ioc);
>         _base_display_dell_branding(ioc);
> +       _base_display_cisco_branding(ioc);
>
>         pr_info(MPT3SAS_FMT "Protocol=(", ioc->name);
>
> diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h
> index c4780c7..7cdbc65 100644
> --- a/drivers/scsi/mpt3sas/mpt3sas_base.h
> +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
> @@ -163,6 +163,17 @@
>  #define MPT3SAS_DELL_12G_HBA_SSDID     0x1F46
>
>  /*
> + * Cisco HBA branding
> + */
> +#define MPT3SAS_CISCO_12G_HBA_BRANDING       \
> +       "Cisco 9300-8E 12G SAS HBA"
> +
> +/*
> + * Cisco HBA SSSDIDs
> + */
> + #define MPT3SAS_CISCO_12G_HBA_SSDID  0x14C
> +
> +/*
>   * status bits for ioc->diag_buffer_status
>   */
>  #define MPT3_DIAG_BUFFER_IS_REGISTERED (0x01)
> --
> 2.0.2
>



-- 

Regards,
Sreekanth