Date: Fri, 28 Sep 2012 08:05:59 GMT From: Henning Petersen <henning.petersen@t-online.de> To: freebsd-gnats-submit@FreeBSD.org Subject: kern/172133: Change Adaptec 39320LPE to 29320LPE in aic79xx_pci.c Message-ID: <201209280805.q8S85xrd036150@red.freebsd.org> Resent-Message-ID: <201209280810.q8S8A7WC067269@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172133
>Category: kern
>Synopsis: Change Adaptec 39320LPE to 29320LPE in aic79xx_pci.c
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Sep 28 08:10:06 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Henning Petersen
>Release: Freebsd-current
>Organization:
>Environment:
>Description:
Controller Adaptec 39320LPE is unknown, id is 29320LPE.
Change from aic7902_setup to aic7901_setup.
>How-To-Repeat:
>Fix:
diff -u -p -r1.29 aic79xx_pci.c
--- sys/dev/aic7xxx/aic79xx_pci.c 23 Mar 2011 13:10:15 -0000 1.29
+++ sys/dev/aic7xxx/aic79xx_pci.c 28 Sep 2012 07:46:56 -0000
@@ -73,6 +73,7 @@ ahd_compose_id(u_int device, u_int vendo
#define ID_AIC7901 0x800F9005FFFF9005ull
#define ID_AHA_29320A 0x8000900500609005ull
#define ID_AHA_29320ALP 0x8017900500449005ull
+#define ID_AHA_29320LPE 0x8017900500459005ull
#define ID_AIC7901A 0x801E9005FFFF9005ull
#define ID_AHA_29320LP 0x8014900500449005ull
@@ -89,7 +90,6 @@ ahd_compose_id(u_int device, u_int vendo
#define ID_AHA_39320D_B 0x801C900500419005ull
#define ID_AHA_39320D_HP 0x8011900500AC0E11ull
#define ID_AHA_39320D_B_HP 0x801C900500AC0E11ull
-#define ID_AHA_39320LPE 0x8017900500459005ull
#define ID_AIC7902_PCI_REV_A4 0x3
#define ID_AIC7902_PCI_REV_B0 0x10
#define SUBID_HP 0x0E11
@@ -137,6 +137,12 @@ struct ahd_pci_identity ahd_pci_ident_ta
"Adaptec 29320ALP Ultra320 SCSI adapter",
ahd_aic7901_setup
},
+ {
+ ID_AHA_29320LPE,
+ ID_ALL_MASK,
+ "Adaptec 29320LPE Ultra320 SCSI adapter",
+ ahd_aic7901_setup
+ },
/* aic7901A based controllers */
{
ID_AHA_29320LP,
@@ -205,12 +211,6 @@ struct ahd_pci_identity ahd_pci_ident_ta
"Adaptec (HP OEM) 39320D Ultra320 SCSI adapter",
ahd_aic7902_setup
},
- {
- ID_AHA_39320LPE,
- ID_ALL_MASK,
- "Adaptec 39320LPE Ultra320 SCSI adapter",
- ahd_aic7902_setup
- },
/* Generic chip probes for devices we don't know 'exactly' */
{
ID_AIC7901 & ID_9005_GENERIC_MASK,
Patch attached with submission follows:
diff -u -p -r1.29 aic79xx_pci.c
--- sys/dev/aic7xxx/aic79xx_pci.c 23 Mar 2011 13:10:15 -0000 1.29
+++ sys/dev/aic7xxx/aic79xx_pci.c 28 Sep 2012 07:46:56 -0000
@@ -73,6 +73,7 @@ ahd_compose_id(u_int device, u_int vendo
#define ID_AIC7901 0x800F9005FFFF9005ull
#define ID_AHA_29320A 0x8000900500609005ull
#define ID_AHA_29320ALP 0x8017900500449005ull
+#define ID_AHA_29320LPE 0x8017900500459005ull
#define ID_AIC7901A 0x801E9005FFFF9005ull
#define ID_AHA_29320LP 0x8014900500449005ull
@@ -89,7 +90,6 @@ ahd_compose_id(u_int device, u_int vendo
#define ID_AHA_39320D_B 0x801C900500419005ull
#define ID_AHA_39320D_HP 0x8011900500AC0E11ull
#define ID_AHA_39320D_B_HP 0x801C900500AC0E11ull
-#define ID_AHA_39320LPE 0x8017900500459005ull
#define ID_AIC7902_PCI_REV_A4 0x3
#define ID_AIC7902_PCI_REV_B0 0x10
#define SUBID_HP 0x0E11
@@ -137,6 +137,12 @@ struct ahd_pci_identity ahd_pci_ident_ta
"Adaptec 29320ALP Ultra320 SCSI adapter",
ahd_aic7901_setup
},
+ {
+ ID_AHA_29320LPE,
+ ID_ALL_MASK,
+ "Adaptec 29320LPE Ultra320 SCSI adapter",
+ ahd_aic7901_setup
+ },
/* aic7901A based controllers */
{
ID_AHA_29320LP,
@@ -205,12 +211,6 @@ struct ahd_pci_identity ahd_pci_ident_ta
"Adaptec (HP OEM) 39320D Ultra320 SCSI adapter",
ahd_aic7902_setup
},
- {
- ID_AHA_39320LPE,
- ID_ALL_MASK,
- "Adaptec 39320LPE Ultra320 SCSI adapter",
- ahd_aic7902_setup
- },
/* Generic chip probes for devices we don't know 'exactly' */
{
ID_AIC7901 & ID_9005_GENERIC_MASK,
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209280805.q8S85xrd036150>