2011-02-14 16:42:10

by Arkadiusz Miśkiewicz

[permalink] [raw]
Subject: Re: b44 driver causes panic when using swiotlb

FUJITA Tomonori wrote:

> On Tue, 1 Feb 2011 22:54:56 +0900
> FUJITA Tomonori <[email protected]> wrote:
>
>> On Mon, 31 Jan 2011 10:54:12 -0500
>> Chuck Ebbert <[email protected]> wrote:
>>
>> > The b44 driver is triggering this panic in swiotlb_map_page():
>> >
>> > if (!dma_capable(dev, dev_addr, size))
>> > panic("map_single: bounce buffer is not DMA'ble");
>> >
>> > The kernel log says the bounce buffers are at 0xdb400000, but b44 can
>> > only do DMA to the first 1GB of memory:
>>
>> Can you try this? b44 has the own bouncing mechanism so if swiotlb
>> returns an error, the driver can allocate an appropriate buffer.
>>
>> diff --git a/lib/swiotlb.c b/lib/swiotlb.c
>> index c47bbe1..93ca08b 100644
>> --- a/lib/swiotlb.c
>> +++ b/lib/swiotlb.c
>> @@ -686,8 +686,10 @@ dma_addr_t swiotlb_map_page(struct device *dev,
>> struct page *page,
>> /*
>> * Ensure that the address returned is DMA'ble
>> */
>> - if (!dma_capable(dev, dev_addr, size))
>> - panic("map_single: bounce buffer is not DMA'ble");
>> + if (!dma_capable(dev, dev_addr, size)) {
>> + swiotlb_tbl_unmap_single(dev, map, size, dir);
>> + dev_addr = swiotlb_virt_to_bus(dev,
io_tlb_overflow_buffer);
>> + }
>>
>> return dev_addr;
>> }
>
> Ping, any chance to try this?

Friend machine oopsed on network with b44 on 2.6.37, so we tried this patch
and network card was detected nicely and was actually usable. The oops
started to happen after he upgraded memory from 2GB to 4GB in his dell
vostro 1500 notebook.

03:00.0 Ethernet controller: Broadcom Corporation BCM4401-B0 100Base-TX (rev
02)

# grep b44 dmesg.log
[ 8.524297] b44 0000:03:00.0: PCI INT A -> GSI 17 (level, low) -> IRQ 17
[ 8.576838] b44: b44.c:v2.0
[ 8.593920] b44 ssb1:0: eth0: Broadcom 44xx/47xx 10/100BaseT Ethernet
00:1c:23:9b:3f:5f
[ 55.350228] b44 ssb1:0: eth0: Link is up at 100 Mbps, full duplex
[ 55.350233] b44 ssb1:0: eth0: Flow control is off for TX and off for RX


> Thanks,

--
Arkadiusz Mi?kiewicz PLD/Linux Team
arekm / maven.pl http://ftp.pld-linux.org/


2011-02-15 00:40:05

by FUJITA Tomonori

[permalink] [raw]
Subject: Re: b44 driver causes panic when using swiotlb

On Mon, 14 Feb 2011 17:41:54 +0100
Arkadiusz Mi$(D+\(Bkiewicz <[email protected]> wrote:

> FUJITA Tomonori wrote:
>
> > On Tue, 1 Feb 2011 22:54:56 +0900
> > FUJITA Tomonori <[email protected]> wrote:
> >
> >> On Mon, 31 Jan 2011 10:54:12 -0500
> >> Chuck Ebbert <[email protected]> wrote:
> >>
> >> > The b44 driver is triggering this panic in swiotlb_map_page():
> >> >
> >> > if (!dma_capable(dev, dev_addr, size))
> >> > panic("map_single: bounce buffer is not DMA'ble");
> >> >
> >> > The kernel log says the bounce buffers are at 0xdb400000, but b44 can
> >> > only do DMA to the first 1GB of memory:
> >>
> >> Can you try this? b44 has the own bouncing mechanism so if swiotlb
> >> returns an error, the driver can allocate an appropriate buffer.
> >>
> >> diff --git a/lib/swiotlb.c b/lib/swiotlb.c
> >> index c47bbe1..93ca08b 100644
> >> --- a/lib/swiotlb.c
> >> +++ b/lib/swiotlb.c
> >> @@ -686,8 +686,10 @@ dma_addr_t swiotlb_map_page(struct device *dev,
> >> struct page *page,
> >> /*
> >> * Ensure that the address returned is DMA'ble
> >> */
> >> - if (!dma_capable(dev, dev_addr, size))
> >> - panic("map_single: bounce buffer is not DMA'ble");
> >> + if (!dma_capable(dev, dev_addr, size)) {
> >> + swiotlb_tbl_unmap_single(dev, map, size, dir);
> >> + dev_addr = swiotlb_virt_to_bus(dev,
> io_tlb_overflow_buffer);
> >> + }
> >>
> >> return dev_addr;
> >> }
> >
> > Ping, any chance to try this?
>
> Friend machine oopsed on network with b44 on 2.6.37, so we tried this patch
> and network card was detected nicely and was actually usable. The oops

Thanks for the confirmation.

> started to happen after he upgraded memory from 2GB to 4GB in his dell
> vostro 1500 notebook.

Yeah, a system with 2GB memory doesn't use swiotlb so you don't hit
this bug.

Thanks,