Skip to content

Commit 989e43c

Browse files
Sreekanth Reddymartinkpetersen
Sreekanth Reddy
authored and
martinkpetersen
committed
mpt3sas: Added OEM Gen2 PnP ID branding names
Added OEM Gen2 PnP ID branding names from mpt2sas driver. Signed-off-by: Sreekanth Reddy <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 146b16c commit 989e43c

File tree

2 files changed

+305
-114
lines changed

2 files changed

+305
-114
lines changed

‎drivers/scsi/mpt3sas/mpt3sas_base.c

Lines changed: 221 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -2508,143 +2508,261 @@ mpt3sas_base_put_smid_default(struct MPT3SAS_ADAPTER *ioc, u16 smid)
25082508
}
25092509

25102510
/**
2511-
* _base_display_intel_branding - Display branding string
2511+
* _base_display_OEMs_branding - Display branding string
25122512
* @ioc: per adapter object
25132513
*
25142514
* Return nothing.
25152515
*/
25162516
static void
2517-
_base_display_intel_branding(struct MPT3SAS_ADAPTER *ioc)
2517+
_base_display_OEMs_branding(struct MPT3SAS_ADAPTER *ioc)
25182518
{
25192519
if (ioc->pdev->subsystem_vendor != PCI_VENDOR_ID_INTEL)
25202520
return;
25212521

2522-
switch (ioc->pdev->device) {
2523-
case MPI25_MFGPAGE_DEVID_SAS3008:
2524-
switch (ioc->pdev->subsystem_device) {
2525-
case MPT3SAS_INTEL_RMS3JC080_SSDID:
2526-
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2527-
MPT3SAS_INTEL_RMS3JC080_BRANDING);
2528-
break;
2529-
2530-
case MPT3SAS_INTEL_RS3GC008_SSDID:
2531-
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2532-
MPT3SAS_INTEL_RS3GC008_BRANDING);
2533-
break;
2534-
case MPT3SAS_INTEL_RS3FC044_SSDID:
2535-
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2536-
MPT3SAS_INTEL_RS3FC044_BRANDING);
2537-
break;
2538-
case MPT3SAS_INTEL_RS3UC080_SSDID:
2539-
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2540-
MPT3SAS_INTEL_RS3UC080_BRANDING);
2522+
switch (ioc->pdev->subsystem_vendor) {
2523+
case PCI_VENDOR_ID_INTEL:
2524+
switch (ioc->pdev->device) {
2525+
case MPI2_MFGPAGE_DEVID_SAS2008:
2526+
switch (ioc->pdev->subsystem_device) {
2527+
case MPT2SAS_INTEL_RMS2LL080_SSDID:
2528+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2529+
MPT2SAS_INTEL_RMS2LL080_BRANDING);
2530+
break;
2531+
case MPT2SAS_INTEL_RMS2LL040_SSDID:
2532+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2533+
MPT2SAS_INTEL_RMS2LL040_BRANDING);
2534+
break;
2535+
case MPT2SAS_INTEL_SSD910_SSDID:
2536+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2537+
MPT2SAS_INTEL_SSD910_BRANDING);
2538+
break;
2539+
default:
2540+
pr_info(MPT3SAS_FMT
2541+
"Intel(R) Controller: Subsystem ID: 0x%X\n",
2542+
ioc->name, ioc->pdev->subsystem_device);
2543+
break;
2544+
}
2545+
case MPI2_MFGPAGE_DEVID_SAS2308_2:
2546+
switch (ioc->pdev->subsystem_device) {
2547+
case MPT2SAS_INTEL_RS25GB008_SSDID:
2548+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2549+
MPT2SAS_INTEL_RS25GB008_BRANDING);
2550+
break;
2551+
case MPT2SAS_INTEL_RMS25JB080_SSDID:
2552+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2553+
MPT2SAS_INTEL_RMS25JB080_BRANDING);
2554+
break;
2555+
case MPT2SAS_INTEL_RMS25JB040_SSDID:
2556+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2557+
MPT2SAS_INTEL_RMS25JB040_BRANDING);
2558+
break;
2559+
case MPT2SAS_INTEL_RMS25KB080_SSDID:
2560+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2561+
MPT2SAS_INTEL_RMS25KB080_BRANDING);
2562+
break;
2563+
case MPT2SAS_INTEL_RMS25KB040_SSDID:
2564+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2565+
MPT2SAS_INTEL_RMS25KB040_BRANDING);
2566+
break;
2567+
case MPT2SAS_INTEL_RMS25LB040_SSDID:
2568+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2569+
MPT2SAS_INTEL_RMS25LB040_BRANDING);
2570+
break;
2571+
case MPT2SAS_INTEL_RMS25LB080_SSDID:
2572+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2573+
MPT2SAS_INTEL_RMS25LB080_BRANDING);
2574+
break;
2575+
default:
2576+
pr_info(MPT3SAS_FMT
2577+
"Intel(R) Controller: Subsystem ID: 0x%X\n",
2578+
ioc->name, ioc->pdev->subsystem_device);
2579+
break;
2580+
}
2581+
case MPI25_MFGPAGE_DEVID_SAS3008:
2582+
switch (ioc->pdev->subsystem_device) {
2583+
case MPT3SAS_INTEL_RMS3JC080_SSDID:
2584+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2585+
MPT3SAS_INTEL_RMS3JC080_BRANDING);
2586+
break;
2587+
2588+
case MPT3SAS_INTEL_RS3GC008_SSDID:
2589+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2590+
MPT3SAS_INTEL_RS3GC008_BRANDING);
2591+
break;
2592+
case MPT3SAS_INTEL_RS3FC044_SSDID:
2593+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2594+
MPT3SAS_INTEL_RS3FC044_BRANDING);
2595+
break;
2596+
case MPT3SAS_INTEL_RS3UC080_SSDID:
2597+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2598+
MPT3SAS_INTEL_RS3UC080_BRANDING);
2599+
break;
2600+
default:
2601+
pr_info(MPT3SAS_FMT
2602+
"Intel(R) Controller: Subsystem ID: 0x%X\n",
2603+
ioc->name, ioc->pdev->subsystem_device);
2604+
break;
2605+
}
25412606
break;
25422607
default:
25432608
pr_info(MPT3SAS_FMT
2544-
"Intel(R) Controller: Subsystem ID: 0x%X\n",
2545-
ioc->name, ioc->pdev->subsystem_device);
2609+
"Intel(R) Controller: Subsystem ID: 0x%X\n",
2610+
ioc->name, ioc->pdev->subsystem_device);
25462611
break;
25472612
}
25482613
break;
2549-
default:
2550-
pr_info(MPT3SAS_FMT
2551-
"Intel(R) Controller: Subsystem ID: 0x%X\n",
2552-
ioc->name, ioc->pdev->subsystem_device);
2553-
break;
2554-
}
2555-
}
2556-
2557-
2558-
2559-
/**
2560-
* _base_display_dell_branding - Display branding string
2561-
* @ioc: per adapter object
2562-
*
2563-
* Return nothing.
2564-
*/
2565-
static void
2566-
_base_display_dell_branding(struct MPT3SAS_ADAPTER *ioc)
2567-
{
2568-
if (ioc->pdev->subsystem_vendor != PCI_VENDOR_ID_DELL)
2569-
return;
2570-
2571-
switch (ioc->pdev->device) {
2572-
case MPI25_MFGPAGE_DEVID_SAS3008:
2573-
switch (ioc->pdev->subsystem_device) {
2574-
case MPT3SAS_DELL_12G_HBA_SSDID:
2575-
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2576-
MPT3SAS_DELL_12G_HBA_BRANDING);
2614+
case PCI_VENDOR_ID_DELL:
2615+
switch (ioc->pdev->device) {
2616+
case MPI2_MFGPAGE_DEVID_SAS2008:
2617+
switch (ioc->pdev->subsystem_device) {
2618+
case MPT2SAS_DELL_6GBPS_SAS_HBA_SSDID:
2619+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2620+
MPT2SAS_DELL_6GBPS_SAS_HBA_BRANDING);
2621+
break;
2622+
case MPT2SAS_DELL_PERC_H200_ADAPTER_SSDID:
2623+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2624+
MPT2SAS_DELL_PERC_H200_ADAPTER_BRANDING);
2625+
break;
2626+
case MPT2SAS_DELL_PERC_H200_INTEGRATED_SSDID:
2627+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2628+
MPT2SAS_DELL_PERC_H200_INTEGRATED_BRANDING);
2629+
break;
2630+
case MPT2SAS_DELL_PERC_H200_MODULAR_SSDID:
2631+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2632+
MPT2SAS_DELL_PERC_H200_MODULAR_BRANDING);
2633+
break;
2634+
case MPT2SAS_DELL_PERC_H200_EMBEDDED_SSDID:
2635+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2636+
MPT2SAS_DELL_PERC_H200_EMBEDDED_BRANDING);
2637+
break;
2638+
case MPT2SAS_DELL_PERC_H200_SSDID:
2639+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2640+
MPT2SAS_DELL_PERC_H200_BRANDING);
2641+
break;
2642+
case MPT2SAS_DELL_6GBPS_SAS_SSDID:
2643+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2644+
MPT2SAS_DELL_6GBPS_SAS_BRANDING);
2645+
break;
2646+
default:
2647+
pr_info(MPT3SAS_FMT
2648+
"Dell 6Gbps HBA: Subsystem ID: 0x%X\n",
2649+
ioc->name, ioc->pdev->subsystem_device);
2650+
break;
2651+
}
2652+
break;
2653+
case MPI25_MFGPAGE_DEVID_SAS3008:
2654+
switch (ioc->pdev->subsystem_device) {
2655+
case MPT3SAS_DELL_12G_HBA_SSDID:
2656+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2657+
MPT3SAS_DELL_12G_HBA_BRANDING);
2658+
break;
2659+
default:
2660+
pr_info(MPT3SAS_FMT
2661+
"Dell 12Gbps HBA: Subsystem ID: 0x%X\n",
2662+
ioc->name, ioc->pdev->subsystem_device);
2663+
break;
2664+
}
25772665
break;
25782666
default:
25792667
pr_info(MPT3SAS_FMT
2580-
"Dell 12Gbps HBA: Subsystem ID: 0x%X\n", ioc->name,
2668+
"Dell HBA: Subsystem ID: 0x%X\n", ioc->name,
25812669
ioc->pdev->subsystem_device);
25822670
break;
25832671
}
25842672
break;
2585-
default:
2586-
pr_info(MPT3SAS_FMT
2587-
"Dell 12Gbps HBA: Subsystem ID: 0x%X\n", ioc->name,
2588-
ioc->pdev->subsystem_device);
2589-
break;
2590-
}
2591-
}
2592-
2593-
/**
2594-
* _base_display_cisco_branding - Display branding string
2595-
* @ioc: per adapter object
2596-
*
2597-
* Return nothing.
2598-
*/
2599-
static void
2600-
_base_display_cisco_branding(struct MPT3SAS_ADAPTER *ioc)
2601-
{
2602-
if (ioc->pdev->subsystem_vendor != PCI_VENDOR_ID_CISCO)
2603-
return;
2604-
2605-
switch (ioc->pdev->device) {
2606-
case MPI25_MFGPAGE_DEVID_SAS3008:
2607-
switch (ioc->pdev->subsystem_device) {
2608-
case MPT3SAS_CISCO_12G_8E_HBA_SSDID:
2609-
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2610-
MPT3SAS_CISCO_12G_8E_HBA_BRANDING);
2611-
break;
2612-
case MPT3SAS_CISCO_12G_8I_HBA_SSDID:
2613-
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2614-
MPT3SAS_CISCO_12G_8I_HBA_BRANDING);
2673+
case PCI_VENDOR_ID_CISCO:
2674+
switch (ioc->pdev->device) {
2675+
case MPI25_MFGPAGE_DEVID_SAS3008:
2676+
switch (ioc->pdev->subsystem_device) {
2677+
case MPT3SAS_CISCO_12G_8E_HBA_SSDID:
2678+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2679+
MPT3SAS_CISCO_12G_8E_HBA_BRANDING);
2680+
break;
2681+
case MPT3SAS_CISCO_12G_8I_HBA_SSDID:
2682+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2683+
MPT3SAS_CISCO_12G_8I_HBA_BRANDING);
2684+
break;
2685+
case MPT3SAS_CISCO_12G_AVILA_HBA_SSDID:
2686+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2687+
MPT3SAS_CISCO_12G_AVILA_HBA_BRANDING);
2688+
break;
2689+
default:
2690+
pr_info(MPT3SAS_FMT
2691+
"Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n",
2692+
ioc->name, ioc->pdev->subsystem_device);
2693+
break;
2694+
}
26152695
break;
2616-
case MPT3SAS_CISCO_12G_AVILA_HBA_SSDID:
2617-
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2696+
case MPI25_MFGPAGE_DEVID_SAS3108_1:
2697+
switch (ioc->pdev->subsystem_device) {
2698+
case MPT3SAS_CISCO_12G_AVILA_HBA_SSDID:
2699+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
26182700
MPT3SAS_CISCO_12G_AVILA_HBA_BRANDING);
2701+
break;
2702+
case MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_SSDID:
2703+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2704+
MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_BRANDING
2705+
);
2706+
break;
2707+
default:
2708+
pr_info(MPT3SAS_FMT
2709+
"Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n",
2710+
ioc->name, ioc->pdev->subsystem_device);
2711+
break;
2712+
}
26192713
break;
26202714
default:
26212715
pr_info(MPT3SAS_FMT
2622-
"Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n",
2623-
ioc->name, ioc->pdev->subsystem_device);
2716+
"Cisco SAS HBA: Subsystem ID: 0x%X\n",
2717+
ioc->name, ioc->pdev->subsystem_device);
26242718
break;
26252719
}
26262720
break;
2627-
case MPI25_MFGPAGE_DEVID_SAS3108_1:
2628-
switch (ioc->pdev->subsystem_device) {
2629-
case MPT3SAS_CISCO_12G_AVILA_HBA_SSDID:
2630-
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2631-
MPT3SAS_CISCO_12G_AVILA_HBA_BRANDING);
2632-
break;
2633-
case MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_SSDID:
2634-
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2635-
MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_BRANDING);
2636-
break;
2721+
case MPT2SAS_HP_3PAR_SSVID:
2722+
switch (ioc->pdev->device) {
2723+
case MPI2_MFGPAGE_DEVID_SAS2004:
2724+
switch (ioc->pdev->subsystem_device) {
2725+
case MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_SSDID:
2726+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2727+
MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_BRANDING);
2728+
break;
2729+
default:
2730+
pr_info(MPT3SAS_FMT
2731+
"HP 6Gbps SAS HBA: Subsystem ID: 0x%X\n",
2732+
ioc->name, ioc->pdev->subsystem_device);
2733+
break;
2734+
}
2735+
case MPI2_MFGPAGE_DEVID_SAS2308_2:
2736+
switch (ioc->pdev->subsystem_device) {
2737+
case MPT2SAS_HP_2_4_INTERNAL_SSDID:
2738+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2739+
MPT2SAS_HP_2_4_INTERNAL_BRANDING);
2740+
break;
2741+
case MPT2SAS_HP_2_4_EXTERNAL_SSDID:
2742+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2743+
MPT2SAS_HP_2_4_EXTERNAL_BRANDING);
2744+
break;
2745+
case MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_SSDID:
2746+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2747+
MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_BRANDING);
2748+
break;
2749+
case MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_SSDID:
2750+
pr_info(MPT3SAS_FMT "%s\n", ioc->name,
2751+
MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_BRANDING);
2752+
break;
2753+
default:
2754+
pr_info(MPT3SAS_FMT
2755+
"HP 6Gbps SAS HBA: Subsystem ID: 0x%X\n",
2756+
ioc->name, ioc->pdev->subsystem_device);
2757+
break;
2758+
}
26372759
default:
26382760
pr_info(MPT3SAS_FMT
2639-
"Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n",
2640-
ioc->name, ioc->pdev->subsystem_device);
2761+
"HP SAS HBA: Subsystem ID: 0x%X\n",
2762+
ioc->name, ioc->pdev->subsystem_device);
26412763
break;
26422764
}
2643-
break;
26442765
default:
2645-
pr_info(MPT3SAS_FMT
2646-
"Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n",
2647-
ioc->name, ioc->pdev->subsystem_device);
26482766
break;
26492767
}
26502768
}
@@ -2678,9 +2796,7 @@ _base_display_ioc_capabilities(struct MPT3SAS_ADAPTER *ioc)
26782796
(bios_version & 0x0000FF00) >> 8,
26792797
bios_version & 0x000000FF);
26802798

2681-
_base_display_intel_branding(ioc);
2682-
_base_display_dell_branding(ioc);
2683-
_base_display_cisco_branding(ioc);
2799+
_base_display_OEMs_branding(ioc);
26842800

26852801
pr_info(MPT3SAS_FMT "Protocol=(", ioc->name);
26862802

0 commit comments

Comments
 (0)