Skip to contentSkip to conversation

scsi: The supplement for the arithmetic of iomem of the Type_B Adapter of arcmsr

PATCH In review nickcheng 3 participants 4 messages Mar 14, 2008 – Mar 17, 2008 SCSI

lore
Share & tools
lore

nickcheng

author
#0 lore raw

PATCH 1/1 scsi: The supplement for the arithmetic of iomem of the Type_B Adapter of arcmsr

Subject: [PATCH] scsi: The supplement for the arithmetic of iomem of the Type_B Adapter
Description:
add the description for the change of the arithmetic of iomem of the Type_B Adapter in ChangeLog.arcmsr

--- ChangeLog.arcmsr.old 2008-03-14 20:15:07.000000000 +0800
+++ ChangeLog.arcmsr.new 2008-03-14 20:02:12.000000000 +0800
@@ -115,4 +115,8 @@
** that the current GFP_KERNEL|GFP_DMA flags are wrong: firstly we are in
** atomic context, secondly this memory is not used for DMA.
** Also removed some unneeded casts. Thanks to Daniel Drake <[email protected]>
+** 2.The Type B Adapter teardown does iounmap on pointers subtracted by a
+** constant offset. Since the offset is in bytes, we need the pointers to
+** be of type void * not uint32_t * so the subtraction is done in the
+** correct units and we iounmap the correct area.
**************************************************************************

#1 lore raw

Review

Quoted 4 lines · On Fri, 14 Mar 2008 20:51:17 +0800 "nickcheng" <[email protected]> wrote:

[patch-ChangeLog.arcmsr.txt text/plain (764B)]
___--- ChangeLog.arcmsr.old 2008-03-14 20:15:07.000000000 +0800
+++ ChangeLog.arcmsr.new 2008-03-14 20:02:12.000000000 +0800

(quoted diff) +0 -0
@@ -115,4 +115,8 @@

This patch had three weird non-ascii characters at the start.

Please prepare patches in patch -p1' form. So the patch will apply with patch -p1' from within the kernel's top-level directory.

I fixed both the above problems.

Does this file actually need to exist? We prefer to get our changelog information from `git-log', not from a standalone file.

maintainer
#2 lore raw
In reply to nickcheng
Quoted 6 lines · nickcheng

Subject: [PATCH] scsi: The supplement for the arithmetic of iomem of the Type_B Adapter
Description:
add the description for the change of the arithmetic of iomem of the Type_B Adapter in ChangeLog.arcmsr

I confused you when I said I want the change log clearer, didn't I? What I meant was the *git* changelog that precedes the patch, not your Changelog.arcmsr, which I don't think we really care about.

Can I suggest the below for the correct replacement for both of these patches?

James

---

From: nickcheng <[email protected]>
Subject: [SCSI] arcmsr: fix iounmap error for Type B adapter

The Type B Adapter teardown does iounmap on pointers subtracted by a constant offset. Since the offset is in bytes, we need the pointers to be of type void * not uint32_t * so the subtraction is done in the correct units and we iounmap the correct area.

---
 drivers/scsi/arcmsr/arcmsr.h |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
drivers/scsi/arcmsr/arcmsr.h +7 -7
index 0393707..3288be2 100644
@@ -341,13 +341,13 @@ struct MessageUnit_B
 	uint32_t	done_qbuffer[ARCMSR_MAX_HBB_POSTQUEUE];
 	uint32_t	postq_index;
 	uint32_t	doneq_index;
-	uint32_t	__iomem *drv2iop_doorbell_reg;
-	uint32_t	__iomem *drv2iop_doorbell_mask_reg;
-	uint32_t	__iomem *iop2drv_doorbell_reg;
-	uint32_t	__iomem *iop2drv_doorbell_mask_reg;
-	uint32_t	__iomem *msgcode_rwbuffer_reg;
-	uint32_t	__iomem *ioctl_wbuffer_reg;
-	uint32_t	__iomem *ioctl_rbuffer_reg;
+	void		__iomem *drv2iop_doorbell_reg;
+	void		__iomem *drv2iop_doorbell_mask_reg;
+	void		__iomem *iop2drv_doorbell_reg;
+	void		__iomem *iop2drv_doorbell_mask_reg;
+	void		__iomem *msgcode_rwbuffer_reg;
+	void		__iomem *ioctl_wbuffer_reg;
+	void		__iomem *ioctl_rbuffer_reg;
 };
 
 /*
Signature · 1 line
1.5.4.1
author
#3 lore raw

RE: [PATCH] scsi: The supplement for the arithmetic of iomem ofthe Type_B Adapter of arcmsr

Hi James,
What a mess I made!! Terrible
As you suggest, I agree with you. (I hope this time I don't misconstrue again.)
Thanks,
-----Original Message-----
From: James Bottomley [mailto:[email protected]]
Sent: Saturday, March 15, 2008 4:27 AM
To: [email protected]
Cc: [email protected]; [email protected]; 'Tomas Henzl'; [email protected]; 'Andrew Morton'
Subject: Re: [PATCH] scsi: The supplement for the arithmetic of iomem ofthe Type_B Adapter of arcmsr

Quoted 4 lines · nickcheng

Subject: [PATCH] scsi: The supplement for the arithmetic of iomem of the Type_B Adapter
Description:
add the description for the change of the arithmetic of iomem of the

Type_B

Quoted 2 lines

Adapter in ChangeLog.arcmsr

I confused you when I said I want the change log clearer, didn't I? What I meant was the *git* changelog that precedes the patch, not your Changelog.arcmsr, which I don't think we really care about.

Can I suggest the below for the correct replacement for both of these patches?

James

---

From: nickcheng <[email protected]>
Subject: [SCSI] arcmsr: fix iounmap error for Type B adapter

The Type B Adapter teardown does iounmap on pointers subtracted by a constant offset. Since the offset is in bytes, we need the pointers to be of type void * not uint32_t * so the subtraction is done in the correct units and we iounmap the correct area.

---
 drivers/scsi/arcmsr/arcmsr.h |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
drivers/scsi/arcmsr/arcmsr.h +7 -7
index 0393707..3288be2 100644
@@ -341,13 +341,13 @@ struct MessageUnit_B
 	uint32_t	done_qbuffer[ARCMSR_MAX_HBB_POSTQUEUE];
 	uint32_t	postq_index;
 	uint32_t	doneq_index;
-	uint32_t	__iomem *drv2iop_doorbell_reg;
-	uint32_t	__iomem *drv2iop_doorbell_mask_reg;
-	uint32_t	__iomem *iop2drv_doorbell_reg;
-	uint32_t	__iomem *iop2drv_doorbell_mask_reg;
-	uint32_t	__iomem *msgcode_rwbuffer_reg;
-	uint32_t	__iomem *ioctl_wbuffer_reg;
-	uint32_t	__iomem *ioctl_rbuffer_reg;
+	void		__iomem *drv2iop_doorbell_reg;
+	void		__iomem *drv2iop_doorbell_mask_reg;
+	void		__iomem *iop2drv_doorbell_reg;
+	void		__iomem *iop2drv_doorbell_mask_reg;
+	void		__iomem *msgcode_rwbuffer_reg;
+	void		__iomem *ioctl_wbuffer_reg;
+	void		__iomem *ioctl_rbuffer_reg;
 };
 
 /*
Signature · 1 line
1.5.4.1