| From stable-bounces@linux.kernel.org Sat Aug 4 09:39:55 2007 |
| From: Stefan Richter <stefanr@s5r6.in-berlin.de> |
| Date: Sat, 4 Aug 2007 18:39:34 +0200 (CEST) |
| Subject: ieee1394: revert "sbp2: enforce 32bit DMA mapping" |
| To: stable@kernel.org |
| Cc: linux-kernel@vger.kernel.org |
| Message-ID: <tkrat.f06cfd50476dd0f7@s5r6.in-berlin.de> |
| Content-Disposition: INLINE |
| |
| |
| From: Stefan Richter <stefanr@s5r6.in-berlin.de> |
| |
| Revert commit 0555659d63c285ceb7ead3115532e1b71b0f27a7 from 2.6.22-rc1. |
| The dma_set_mask call somehow failed on a PowerMac G5, PPC64: |
| http://lkml.org/lkml/2007/8/1/344 |
| |
| Should there ever occur a DMA mapping beyond the physical DMA range, a |
| proper SBP-2 firmware will report transport errors. So let's leave it |
| at that. |
| |
| Same as commit a9c2f18800753c82c45fc13b27bdc148849bdbb2. |
| |
| Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> |
| Tested-by: Olaf Hering <olh@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/ieee1394/sbp2.c | 5 ----- |
| 1 file changed, 5 deletions(-) |
| |
| --- a/drivers/ieee1394/sbp2.c |
| +++ b/drivers/ieee1394/sbp2.c |
| @@ -774,11 +774,6 @@ static struct sbp2_lu *sbp2_alloc_device |
| SBP2_ERR("failed to register lower 4GB address range"); |
| goto failed_alloc; |
| } |
| -#else |
| - if (dma_set_mask(hi->host->device.parent, DMA_32BIT_MASK)) { |
| - SBP2_ERR("failed to set 4GB DMA mask"); |
| - goto failed_alloc; |
| - } |
| #endif |
| } |
| |
