[packages/kernel] Follow upstream with aacraid

[arekm]

commit f17af3a7f134183cff2cbdd8e83151b957f20ad5
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon May 26 12:15:28 2025 +0200

    Follow upstream with aacraid

 kernel-small_fixes.patch | 109 -----------------------------------------------
 1 file changed, 109 deletions(-)
---
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index d06c6649..626faed1 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -1,112 +1,3 @@
-; https://lkml.org/lkml/2019/7/10/244
-diff -ur linux-5.3/drivers/scsi/aacraid.org/aacraid.h linux-5.3/drivers/scsi/aacraid/aacraid.h
---- linux-5.3/drivers/scsi/aacraid.org/aacraid.h	2019-11-01 22:42:37.011469816 +0100
-+++ linux-5.3/drivers/scsi/aacraid/aacraid.h	2019-11-04 09:29:51.321486211 +0100
-@@ -2740,17 +2740,6 @@
- int aac_rx_deliver_producer(struct fib * fib);
- void aac_reinit_aif(struct aac_dev *aac, unsigned int index);
- 
--static inline int aac_is_src(struct aac_dev *dev)
--{
--	u16 device = dev->pdev->device;
--
--	if (device == PMC_DEVICE_S6 ||
--		device == PMC_DEVICE_S7 ||
--		device == PMC_DEVICE_S8)
--		return 1;
--	return 0;
--}
--
- static inline int aac_supports_2T(struct aac_dev *dev)
- {
- 	return (dev->adapter_info.options & AAC_OPT_NEW_COMM_64);
-diff -ur linux-5.3/drivers/scsi/aacraid.org/comminit.c linux-5.3/drivers/scsi/aacraid/comminit.c
---- linux-5.3/drivers/scsi/aacraid.org/comminit.c	2019-11-01 22:42:37.014803249 +0100
-+++ linux-5.3/drivers/scsi/aacraid/comminit.c	2019-11-04 09:29:51.321486211 +0100
-@@ -41,8 +41,11 @@
- {
- 	u32 status = 0;
- 
--	if (aac_is_src(dev))
-+	if (dev->pdev->device == PMC_DEVICE_S6 ||
-+		dev->pdev->device == PMC_DEVICE_S7 ||
-+		dev->pdev->device == PMC_DEVICE_S8) {
- 		status = src_readl(dev, MUnit.OMR);
-+	}
- 	return (status & AAC_INT_MODE_MSIX);
- }
- 
-@@ -349,7 +352,8 @@
- 	/* FIB should be freed only after getting the response from the F/W */
- 	if (status != -ERESTARTSYS)
- 		aac_fib_free(fibctx);
--	if (aac_is_src(dev) &&
-+	if ((dev->pdev->device == PMC_DEVICE_S7 ||
-+	     dev->pdev->device == PMC_DEVICE_S8) &&
- 	     dev->msi_enabled)
- 		aac_set_intx_mode(dev);
- 	return status;
-@@ -610,7 +614,8 @@
- 		dev->max_fib_size = status[1] & 0xFFE0;
- 		host->sg_tablesize = status[2] >> 16;
- 		dev->sg_tablesize = status[2] & 0xFFFF;
--		if (aac_is_src(dev)) {
-+		if (dev->pdev->device == PMC_DEVICE_S7 ||
-+		    dev->pdev->device == PMC_DEVICE_S8) {
- 			if (host->can_queue > (status[3] >> 16) -
- 					AAC_NUM_MGT_FIB)
- 				host->can_queue = (status[3] >> 16) -
-@@ -629,7 +634,9 @@
- 			pr_warn("numacb=%d ignored\n", numacb);
- 	}
- 
--	if (aac_is_src(dev))
-+	if (dev->pdev->device == PMC_DEVICE_S6 ||
-+	    dev->pdev->device == PMC_DEVICE_S7 ||
-+	    dev->pdev->device == PMC_DEVICE_S8)
- 		aac_define_int_mode(dev);
- 	/*
- 	 *	Ok now init the communication subsystem
-diff -ur linux-5.3/drivers/scsi/aacraid.org/commsup.c linux-5.3/drivers/scsi/aacraid/commsup.c
---- linux-5.3/drivers/scsi/aacraid.org/commsup.c	2019-11-01 22:42:37.014803249 +0100
-+++ linux-5.3/drivers/scsi/aacraid/commsup.c	2019-11-04 09:29:51.321486211 +0100
-@@ -2593,7 +2593,9 @@
- {
- 	int i;
- 
--	if (aac_is_src(dev)) {
-+	if (dev->pdev->device == PMC_DEVICE_S6 ||
-+	    dev->pdev->device == PMC_DEVICE_S7 ||
-+	    dev->pdev->device == PMC_DEVICE_S8) {
- 		if (dev->max_msix > 1) {
- 			for (i = 0; i < dev->max_msix; i++)
- 				free_irq(pci_irq_vector(dev->pdev, i),
-diff -ur linux-5.3/drivers/scsi/aacraid.org/linit.c linux-5.3/drivers/scsi/aacraid/linit.c
---- linux-5.3/drivers/scsi/aacraid.org/linit.c	2019-11-01 22:42:37.011469816 +0100
-+++ linux-5.3/drivers/scsi/aacraid/linit.c	2019-11-04 09:29:51.321486211 +0100
-@@ -1567,8 +1567,9 @@
- 	aac_send_shutdown(aac);
- 
- 	aac_adapter_disable_int(aac);
--
--	if (aac_is_src(aac)) {
-+	if (aac->pdev->device == PMC_DEVICE_S6 ||
-+	    aac->pdev->device == PMC_DEVICE_S7 ||
-+	    aac->pdev->device == PMC_DEVICE_S8) {
- 		if (aac->max_msix > 1) {
- 			for (i = 0; i < aac->max_msix; i++) {
- 				free_irq(pci_irq_vector(aac->pdev, i),
-@@ -1858,7 +1859,8 @@
- 	aac_adapter_enable_int(dev);
- 
- 
--	if (aac_is_src(dev))
-+	if (dev->pdev->device == PMC_DEVICE_S7 ||
-+	    dev->pdev->device == PMC_DEVICE_S8)
- 		aac_define_int_mode(dev);
- 
- 	if (dev->msi_enabled)
-
 From e136a4062174a9a8d1c1447ca040ea81accfa6a8 Mon Sep 17 00:00:00 2001
 From: Kees Cook <kees at kernel.org>
 Date: Sat, 26 Apr 2025 00:37:52 -0700
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/f17af3a7f134183cff2cbdd8e83151b957f20ad5