Bug 172133

Summary: [aic7xxx] [patch] Change Adaptec 39320LPE to 29320LPE in aic79xx_pci.c
Product: Base System Reporter: henning.petersen
Component: kernAssignee: Oleksandr Tymoshenko <gonzo>
Status: Closed FIXED    
Severity: Affects Only Me CC: gonzo
Priority: Normal Keywords: patch
Version: Unspecified   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description henning.petersen 2012-09-28 09:10:06 UTC
Controller Adaptec 39320LPE is unknown, id is 29320LPE.
Change from aic7902_setup to aic7901_setup.

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:
Comment 1 Eitan Adler freebsd_committer freebsd_triage 2018-05-20 23:52:37 UTC
For bugs matching the following conditions:
- Status == In Progress
- Assignee == "bugs@FreeBSD.org"
- Last Modified Year <= 2017

Do
- Set Status to "Open"
Comment 2 commit-hook freebsd_committer freebsd_triage 2019-01-19 05:32:51 UTC
A commit references this bug:

Author: gonzo
Date: Sat Jan 19 05:31:49 UTC 2019
New revision: 343170
URL: https://svnweb.freebsd.org/changeset/base/343170

Log:
  [aic7xxx] Use correct product name 29320LPE instead of non-existent 39320LPE

  The PCI id belongs to Adaptec 29320LPE controller. The same fix also was
  merged[1] to OpenBSD driver ~6 years ago.

  [1] https://github.com/openbsd/src/commit/f997b5

  PR:		172133
  Submitted by:	henning.petersen@t-online.de
  MFC after:	 1 week

Changes:
  head/sys/dev/aic7xxx/aic79xx_pci.c
Comment 3 Oleksandr Tymoshenko freebsd_committer freebsd_triage 2019-01-19 05:34:45 UTC
Fix has been committed to HEAD. Thanks for submitting the patch and sorry it took so long.
Comment 4 commit-hook freebsd_committer freebsd_triage 2019-02-04 10:21:03 UTC
A commit references this bug:

Author: gonzo
Date: Mon Feb  4 10:20:48 UTC 2019
New revision: 343738
URL: https://svnweb.freebsd.org/changeset/base/343738

Log:
  MFC r343170:

  [aic7xxx] Use correct product name 29320LPE instead of non-existent 39320LPE

  The PCI id belongs to Adaptec 29320LPE controller. The same fix also was
  merged[1] to OpenBSD driver ~6 years ago.

  [1] https://github.com/openbsd/src/commit/f997b5

  PR:		172133
  Submitted by:	henning.petersen@t-online.de

Changes:
_U  stable/12/
  stable/12/sys/dev/aic7xxx/aic79xx_pci.c