public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: David Matlack <dmatlack@google.com>
To: gregkh@linuxfoundation.org
Cc: liodot@gmail.com, charrer@alacritech.com,
	linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
	David Matlack <dmatlack@google.com>
Subject: [PATCH 6/7] staging: slicoss: fix 64-bit isr address bug
Date: Mon,  5 May 2014 21:02:36 -0700	[thread overview]
Message-ID: <1399348957-16663-7-git-send-email-dmatlack@google.com> (raw)
In-Reply-To: <1399348957-16663-1-git-send-email-dmatlack@google.com>

This patch fixes a bug that only manifests when the physical address of
the interrupt status register is >4GB. Specifically, the driver was only
telling the device about the lower 32 bits of the ISR. This patch adds
the upper 32 bits.

Signed-off-by: David Matlack <dmatlack@google.com>
---
 drivers/staging/slicoss/slicoss.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 01401e0..55afe0d 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -2815,7 +2815,8 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
 
 		spin_lock_irqsave(&adapter->bit64reglock.lock,
 					adapter->bit64reglock.flags);
-		slic_reg32_write(&slic_regs->slic_addr_upper, 0, DONT_FLUSH);
+		slic_reg32_write(&slic_regs->slic_addr_upper,
+				 SLIC_GET_ADDR_HIGH(&pshmem->isr), DONT_FLUSH);
 		slic_reg32_write(&slic_regs->slic_isp,
 				 SLIC_GET_ADDR_LOW(&pshmem->isr), FLUSH);
 		spin_unlock_irqrestore(&adapter->bit64reglock.lock,
-- 
1.9.2


  parent reply	other threads:[~2014-05-06  4:04 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-06  4:02 [PATCH 0/7] staging: slicoss: bug fixes to stabilize driver David Matlack
2014-05-06  4:02 ` [PATCH 1/7] staging: slicoss: fix use-after-free in slic_entry_probe David Matlack
2014-05-06  4:02 ` [PATCH 2/7] staging: slicoss: fix multiple free-after-free in slic_entry_remove David Matlack
2014-05-06  4:02 ` [PATCH 3/7] staging: slicoss: remove unused members of struct adapter David Matlack
2014-05-06  4:02 ` [PATCH 4/7] staging: slicoss: remove gratuitous debug infrastructure David Matlack
2014-05-06  4:02 ` [PATCH 5/7] staging: slicoss: fix dma memory leak David Matlack
2014-05-06  4:02 ` David Matlack [this message]
2014-05-06  4:02 ` [PATCH 7/7] staging: slicoss: fix use-after-free bug in slic_entry_remove David Matlack

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1399348957-16663-7-git-send-email-dmatlack@google.com \
    --to=dmatlack@google.com \
    --cc=charrer@alacritech.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=liodot@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox