Skip to contentSkip to conversation

use DMA_32BIT_MASK where appropriate in

PATCH In review Kevin Jackson 3 participants 9 messages Jun 6, 2007

Subsystems (3)
SCSI Kernel janitors 3WARE SAS/SATA-RAID SCSI drivers (3W-xxxx, 3W-9XXX, 3W-SAS)
lore
Share & tools
lore

Kevin Jackson

author
#0 lore raw

PATCH 1/1 use DMA_32BIT_MASK where appropriate in

From: Kev Jackson <[email protected]>

-Removes TW_DMA_MASK definition from header/code use DMA_32BIT_MASK instead as per kernel janitors TODO list

Signed-off-by Kev Jackson <[email protected]>

---

Hopefully this conforms to the requirements in the SubmittingPatches docs :), please point out glaring errors etc (including if this meta-comment really is ignored by changelogs as described in the docs)

scsi/3w-xxxx.c 2007-06-06 10:31:29.000000000 +0700 renamed from scsi/3w-xxxx.c.orig 2007-06-06 10:30:21.000000000 +0700 +1 -1
@@ -2338,7 +2338,7 @@ static int __devinit tw_probe(struct pci
 
        pci_set_master(pdev);
 
-       retval = pci_set_dma_mask(pdev, TW_DMA_MASK);
+       retval = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
        if (retval) {
                printk(KERN_WARNING "3w-xxxx: Failed to set dma mask.");
                goto out_disable_device;
scsi/3w-xxxx.h 2007-06-06 10:32:01.000000000 +0700 renamed from scsi/3w-xxxx.h.orig 2007-06-06 10:30:29.000000000 +0700 +0 -1
@@ -234,7 +234,6 @@ static unsigned char tw_sense_table[][4]
 #define TW_IOCTL_TIMEOUT                      25 /* 25 seconds */
 #define TW_IOCTL_CHRDEV_TIMEOUT               60 /* 60 seconds */
 #define TW_IOCTL_CHRDEV_FREE                  -1
-#define TW_DMA_MASK                          DMA_32BIT_MASK
 #define TW_MAX_CDB_LEN                       16
 
 /* Bitmask macros to eliminate bitfields */

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors

#1 lore raw
Quoted 8 lines · On Wed, 6 Jun 2007 11:15:12 +0700 Kevin Jackson wrote:

From: Kev Jackson <[email protected]>

-Removes TW_DMA_MASK definition from header/code use DMA_32BIT_MASK instead as per kernel janitors TODO list

Signed-off-by Kev Jackson <[email protected]>

---

Preferably include a diffstat summary here. See SubmittingPatches.

scsi/3w-xxxx.c 2007-06-06 10:31:29.000000000 +0700

Quoted 6 lines

Hopefully this conforms to the requirements in the SubmittingPatches docs :), please point out glaring errors etc (including if this meta-comment really is ignored by changelogs as described in the docs)

scsi/3w-xxxx.c 2007-06-06 10:31:29.000000000 +0700 renamed from scsi/3w-xxxx.c.orig 2007-06-06 10:30:21.000000000 +0700 +0 -0

The patch should be able to be applied using 'patch -p1' when at the top of the kernel source tree. IOW, the file names above should have one directory level preceding them, such as:

drivers/scsi/3w-xxxx.c 2007-06-06 10:31:29.000000000 +0700

Quoted 2 lines
drivers/scsi/3w-xxxx.c 2007-06-06 10:31:29.000000000 +0700 renamed from drivers/scsi/3w-xxxx.c.orig 2007-06-06 10:30:21.000000000 +0700 +0 -0

Tools such as quilt and git know about this and can do it for you.

Quoted 12 lines
drivers/scsi/3w-xxxx.c 2007-06-06 10:31:29.000000000 +0700 renamed from drivers/scsi/3w-xxxx.c.orig 2007-06-06 10:30:21.000000000 +0700 +1 -1
@@ -2338,7 +2338,7 @@ static int __devinit tw_probe(struct pci
 
        pci_set_master(pdev);
 
-       retval = pci_set_dma_mask(pdev, TW_DMA_MASK);
+       retval = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
        if (retval) {
                printk(KERN_WARNING "3w-xxxx: Failed to set dma mask.");
                goto out_disable_device;

scsi/3w-xxxx.h 2007-06-06 10:32:01.000000000 +0700 static unsigned char tw_sense_table[][4] · line 239

Quoted 7 lines
scsi/3w-xxxx.h 2007-06-06 10:32:01.000000000 +0700 renamed from scsi/3w-xxxx.h.orig 2007-06-06 10:30:29.000000000 +0700 +0 -1
@@ -234,7 +234,6 @@ static unsigned char tw_sense_table[][4]
 #define TW_IOCTL_TIMEOUT                      25 /* 25 seconds */
 #define TW_IOCTL_CHRDEV_TIMEOUT               60 /* 60 seconds */
 #define TW_IOCTL_CHRDEV_FREE                  -1
-#define TW_DMA_MASK                          DMA_32BIT_MASK
 #define TW_MAX_CDB_LEN                       16
 
 /* Bitmask macros to eliminate bitfields */

Otherwise looks good to me. But then I try to apply the patch and get this:

1 out of 1 hunk FAILED -- saving rejects to file drivers/scsi/3w-xxxx.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/scsi/3w-xxxx.h.rej

and can see that the tabs have been converted to spaces. Yes, gmail does that for you if you use the web interface instead of the SMTP interface. Or using copy-paste from a text editor can also cause it. You'll need to get that taken care of one way or another. Please send a patch to yourself and make sure that you can apply it cleanly...

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
_______________________________________________
Kernel-janitors mailing list [email protected]
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors

author
#2 lore raw

PATCH 1/1 Use DMA_32BIT_MASK where appropriate in

In reply to Kevin Jackson

From: Kev Jackson <[email protected]>

-Remove TW_DMA_MASK and use DMA_32BIT_MASK instead as recommended by kernel janitors TODO list

Signed-off-by Kev Jackson <[email protected]>

---

 drivers/scsi/3w-xxxx.c |    2 +-
 drivers/scsi/3w-xxxx.h |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/3w-xxxx.c +0 -0
index 656bdb1..15ca2a0 100644
@@ -2338,7 +2338,7 @@ static int __devinit tw_probe(struct pci_dev

*pdev, const struct pci_device_id *

pci_set_master(pdev);

- retval = pci_set_dma_mask(pdev, TW_DMA_MASK);
+ retval = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (retval) {
printk(KERN_WARNING "3w-xxxx: Failed to set dma mask."); goto out_disable_device;

drivers/scsi/3w-xxxx.h +0 -1
index 0742e68..4efd6c2 100644
@@ -234,7 +234,6 @@ static unsigned char tw_sense_table[][4]  #define TW_IOCTL_TIMEOUT                      25 /* 25 seconds */
 #define TW_IOCTL_CHRDEV_TIMEOUT               60 /* 60 seconds */
 #define TW_IOCTL_CHRDEV_FREE                  -1
-#define TW_DMA_MASK			      DMA_32BIT_MASK
 #define TW_MAX_CDB_LEN			      16
 
 /* Bitmask macros to eliminate bitfields */

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors

#3 lore raw

Re: [KJ] [patch] use DMA_32BIT_MASK where appropriate

In reply to Kevin Jackson
Quoted 5 lines · Kevin Jackson

From: Kev Jackson <[email protected]>

-Removes TW_DMA_MASK definition from header/code use DMA_32BIT_MASK instead as per kernel janitors TODO list

Quoted 7 lines
Signed-off-by Kev Jackson <[email protected]>

---

Hopefully this conforms to the requirements in the SubmittingPatches docs :), please point out glaring errors etc (including if this meta-comment really is ignored by changelogs as described in the docs)

--

patch failed to apply
patching file drivers/scsi/3w-xxxx.c
Hunk #1 FAILED at 2338.
1 out of 1 hunk FAILED -- saving rejects to file
drivers/scsi/3w-xxxx.c.rej
patching file drivers/scsi/3w-xxxx.h
Hunk #1 FAILED at 234.
1 out of 1 hunk FAILED -- saving rejects to file
drivers/scsi/3w-xxxx.h.rej
---

first setup a git repository on your machine.. it will ease your work follow the below tutorial..

http://linux.yyz.us/git-howto.html

Quoted 26 lines
scsi/3w-xxxx.c 2007-06-06 10:31:29.000000000 +0700 renamed from scsi/3w-xxxx.c.orig 2007-06-06 10:30:21.000000000 +0700 +1 -1
@@ -2338,7 +2338,7 @@ static int __devinit tw_probe(struct pci
 
        pci_set_master(pdev);
 
-       retval = pci_set_dma_mask(pdev, TW_DMA_MASK);
+       retval = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
        if (retval) {
                printk(KERN_WARNING "3w-xxxx: Failed to set dma mask.");
                goto out_disable_device;
scsi/3w-xxxx.h 2007-06-06 10:32:01.000000000 +0700 renamed from scsi/3w-xxxx.h.orig 2007-06-06 10:30:29.000000000 +0700 +0 -1
@@ -234,7 +234,6 @@ static unsigned char tw_sense_table[][4]
 #define TW_IOCTL_TIMEOUT                      25 /* 25 seconds */
 #define TW_IOCTL_CHRDEV_TIMEOUT               60 /* 60 seconds */
 #define TW_IOCTL_CHRDEV_FREE                  -1
-#define TW_DMA_MASK                          DMA_32BIT_MASK
 #define TW_MAX_CDB_LEN                       16
 
 /* Bitmask macros to eliminate bitfields */

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors

Signature · 2 lines
surya.
06/06/2007

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors

#4 lore raw

Re: [KJ] [patch] Use DMA_32BIT_MASK where appropriate

In reply to Kevin Jackson
Quoted 7 lines · Kev Jackson

From: Kev Jackson <[email protected]>

-Remove TW_DMA_MASK and use DMA_32BIT_MASK instead as recommended by kernel janitors TODO list

Signed-off-by Kev Jackson <[email protected]>

failed again

patching file drivers/scsi/3w-xxxx.c
patch: **** malformed patch at line 10: *pdev, const struct pci_device_id *
------
check line number 10, I think it could be a problem with your mail client. First send the patch to yourself and apply it. If it goes fine, you can be sure it goes with others.

Quoted 36 lines

---

 drivers/scsi/3w-xxxx.c |    2 +-
 drivers/scsi/3w-xxxx.h |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/3w-xxxx.c +1 -1
index 656bdb1..15ca2a0 100644
@@ -2338,7 +2338,7 @@ static int __devinit tw_probe(struct pci_dev
 *pdev, const struct pci_device_id *
 
 	pci_set_master(pdev);
 
-	retval = pci_set_dma_mask(pdev, TW_DMA_MASK);
+	retval = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
 	if (retval) {
 		printk(KERN_WARNING "3w-xxxx: Failed to set dma mask.");
drivers/scsi/3w-xxxx.c +0 -0
 		goto out_disable_device;
drivers/scsi/3w-xxxx.h +0 -1
index 0742e68..4efd6c2 100644
@@ -234,7 +234,6 @@ static unsigned char tw_sense_table[][4] =
 #define TW_IOCTL_TIMEOUT                      25 /* 25 seconds */
 #define TW_IOCTL_CHRDEV_TIMEOUT               60 /* 60 seconds */
 #define TW_IOCTL_CHRDEV_FREE                  -1
-#define TW_DMA_MASK			      DMA_32BIT_MASK
 #define TW_MAX_CDB_LEN			      16
 
 /* Bitmask macros to eliminate bitfields */

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors

Signature · 2 lines
surya.
06/06/2007

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors

author
#5 lore raw

Re: [KJ] [patch] Use DMA_32BIT_MASK where appropriate

In reply to Kevin Jackson

Hi all,

Quoted 3 lines

check line number 10, I think it could be a problem with your mail client. First send the patch to yourself and apply it. If it goes fine, you can be sure it goes with others.

Ok, I applied the patch myself before sending this email and it worked fine. Regarding email clients. I use gmail as my primary/main email, I've setup both thunderbird and evolution to use this email account, but when I send an email from my gmail account to my gmail account, it never appears in my thunderbird/evolution inbox. It does however appear in my gmail inbox.

Now as pointed out previously, the gmail web interface messes up tabs, so I cannot use that either.

If anyone knows how I can send to myself without thunderbird/evolution trying to be clever and 'ignoring' such emails I'd be very happy.

Kev
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors

author
#6 lore raw

PATCH 1/1 Use DMA_32BIT_MASK where appropriate in

In reply to Kevin Jackson

From: Kev Jackson <[email protected]>

-Remove TW_DMA_MASK use DMA_32BIT_MASK instead from kernel janitors TODO

Signed-off-by Kev Jackson <[email protected]>

---
Wrapping at 72 chars broke the previous patch, thuderbird setting modified I've tested sending this from gmail -> yahoo and the received patch was applied with no problems. Please let me know if this is now ok.

 drivers/scsi/3w-xxxx.c |    2 +-
 drivers/scsi/3w-xxxx.h |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/3w-xxxx.c +1 -1
index 656bdb1..15ca2a0 100644
@@ -2338,7 +2338,7 @@ static int __devinit tw_probe(struct pci_dev *pdev, const struct pci_device_id *
 
 	pci_set_master(pdev);
 
-	retval = pci_set_dma_mask(pdev, TW_DMA_MASK);
+	retval = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
 	if (retval) {
 		printk(KERN_WARNING "3w-xxxx: Failed to set dma mask.");
 		goto out_disable_device;
drivers/scsi/3w-xxxx.h +0 -1
index 0742e68..4efd6c2 100644
@@ -234,7 +234,6 @@ static unsigned char tw_sense_table[][4]  #define TW_IOCTL_TIMEOUT                      25 /* 25 seconds */
 #define TW_IOCTL_CHRDEV_TIMEOUT               60 /* 60 seconds */
 #define TW_IOCTL_CHRDEV_FREE                  -1
-#define TW_DMA_MASK			      DMA_32BIT_MASK
 #define TW_MAX_CDB_LEN			      16
 
 /* Bitmask macros to eliminate bitfields */

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors

author
#7 lore raw

Re: [KJ] [patch] Use DMA_32BIT_MASK where appropriate

In reply to Kevin Jackson

Hi all,

Quoted 1 line

Ok!! no problems. It applies fine.

Is that the saga over then? :)

Do I need to send another email to the lkml or somewhere else, or is it enough that I sent the patch to kernel janitors?

Kev
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors

#8 lore raw

Re: [KJ] [patch] Use DMA_32BIT_MASK where appropriate

In reply to Kevin Jackson
Quoted 10 lines · Kev Jackson

From: Kev Jackson <[email protected]>

-Remove TW_DMA_MASK use DMA_32BIT_MASK instead from kernel janitors TODO

Signed-off-by Kev Jackson <[email protected]>

---
Wrapping at 72 chars broke the previous patch, thuderbird setting modified I've tested sending this from gmail -> yahoo and the received patch was applied with no problems. Please let me know if this is now ok.

Ok!! no problems. It applies fine.

Quoted 35 lines

 drivers/scsi/3w-xxxx.c |    2 +-
 drivers/scsi/3w-xxxx.h |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/3w-xxxx.c +1 -1
index 656bdb1..15ca2a0 100644
@@ -2338,7 +2338,7 @@ static int __devinit tw_probe(struct pci_dev *pdev, const struct pci_device_id *
 
 	pci_set_master(pdev);
 
-	retval = pci_set_dma_mask(pdev, TW_DMA_MASK);
+	retval = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
 	if (retval) {
 		printk(KERN_WARNING "3w-xxxx: Failed to set dma mask.");
 		goto out_disable_device;
drivers/scsi/3w-xxxx.h +0 -1
index 0742e68..4efd6c2 100644
@@ -234,7 +234,6 @@ static unsigned char tw_sense_table[][4] =
 #define TW_IOCTL_TIMEOUT                      25 /* 25 seconds */
 #define TW_IOCTL_CHRDEV_TIMEOUT               60 /* 60 seconds */
 #define TW_IOCTL_CHRDEV_FREE                  -1
-#define TW_DMA_MASK			      DMA_32BIT_MASK
 #define TW_MAX_CDB_LEN			      16
 
 /* Bitmask macros to eliminate bitfields */

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors

Signature · 2 lines
surya.
06/06/2007

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors