2009-11-02 06:38:49

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: Tree for November 2

Hi all,

Changes since 20091030:

My fixes tree contains a build fix for powerpc/kvm.

The omap tree lost its conflicts.

The jdelvare-hwmon tree lost its conflict.

The kvm tree lost its conflict.

The sound tree gained a conflict against the omap tree.

The catalin tree gained 2 conflicts against the arm-current tree.

The percpu tree revealed a build problem in the tip and kvm trees for
which I applied a patch.

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).

You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 145 trees (counting Linus' and 22 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.

--
Cheers,
Stephen Rothwell [email protected]

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging arm/devel
Merging davinci/davinci-next
Merging omap/for-next
Merging pxa/for-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
CONFLICT (content): Merge conflict in drivers/rtc/Kconfig
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/master
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
CONFLICT (content): Merge conflict in arch/powerpc/kvm/timing.h
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (delete/modify): drivers/net/sfc/sfe4001.c deleted in net/master and modified in HEAD. Version HEAD of drivers/net/sfc/sfe4001.c left in tree.
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/cmd.c
CONFLICT (content): Merge conflict in drivers/staging/rtl8187se/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/rtl8192e/Kconfig
$ git rm -f drivers/net/sfc/sfe4001.c
Applying: net: merge fixup for drivers/net/sfc/falcon_boards.c
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
Merging mtd/master
Merging crypto/master
Merging sound/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3evm.c
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging tmio-mmc/linux-next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/mfd/Kconfig
CONFLICT (content): Merge conflict in drivers/mfd/Makefile
Merging security-testing/next
CONFLICT (content): Merge conflict in Documentation/dontdiff
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in drivers/acpi/video_detect.c
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging drbd/for-jens
CONFLICT (add/add): Merge conflict in drivers/block/drbd/Kconfig
CONFLICT (add/add): Merge conflict in drivers/block/drbd/Makefile
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_actlog.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_int.h
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_main.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_nl.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_receiver.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_req.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_worker.c
CONFLICT (add/add): Merge conflict in include/linux/drbd.h
Merging catalin/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-realview/core.h
CONFLICT (content): Merge conflict in arch/arm/mach-realview/realview_pb1176.c
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in drivers/net/Kconfig
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging devicetree/next-devicetree
Merging limits/writable_limits
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/kernel/kgdb.c
Merging oprofile/for-next
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/x86/kvm/svm.c
CONFLICT (content): Merge conflict in kernel/softlockup.c
CONFLICT (content): Merge conflict in mm/percpu.c
Applying: percpu: merge fixup for variable renaming
Applying: x86: fix put_cpu_var invocation in user return notifiers code
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging quilt/staging
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
Merging scsi-post-merge/master
$ git cherry-pick df5281a73b4ba568ed0d266efc417856524c1e86


Attachments:
(No filename) (8.27 kB)
(No filename) (198.00 B)
Download all attachments

2009-11-02 17:18:11

by Randy Dunlap

[permalink] [raw]
Subject: Re: linux-next: Tree for November 2 (usb/whci)

On Mon, 2 Nov 2009 17:38:45 +1100 Stephen Rothwell wrote:

> Hi all,
>
> Changes since 20091030:


whci build fails on i386 due to 64-bit multiply & divide:

ERROR: "__udivdi3" [drivers/usb/host/whci/whci-hcd.ko] undefined!
ERROR: "__umoddi3" [drivers/usb/host/whci/whci-hcd.ko] undefined!


config attached.

---
~Randy


Attachments:
config-r3449 (71.48 kB)

2009-11-02 18:01:49

by Randy Dunlap

[permalink] [raw]
Subject: Re: linux-next: Tree for November 2 (wireless/wl1271)

Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20091030:


wl1271 build fails when CONFIG_INET=n.
Should this driver depend on INET?

Why does this driver, unlike all other wireless drivers,
want to use register_inetaddr_notifier()?

wl1271_main.c:(.text+0x271052): undefined reference to `unregister_inetaddr_notifier'
wl1271_main.c:(.text+0x2714d7): undefined reference to `register_inetaddr_notifier'

--
~Randy

2009-11-02 18:45:11

by John W. Linville

[permalink] [raw]
Subject: Re: linux-next: Tree for November 2 (wireless/wl1271)

On Mon, Nov 02, 2009 at 10:01:35AM -0800, Randy Dunlap wrote:
> Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20091030:
>
>
> wl1271 build fails when CONFIG_INET=n.
> Should this driver depend on INET?
>
> Why does this driver, unlike all other wireless drivers,
> want to use register_inetaddr_notifier()?
>
> wl1271_main.c:(.text+0x271052): undefined reference to `unregister_inetaddr_notifier'
> wl1271_main.c:(.text+0x2714d7): undefined reference to `register_inetaddr_notifier'

Yeah, that driver is doing some filtering based on IPv4.

Luca, is that necessary? If so, then we need a patch like the one below...?

John

>From ba823accfad68151d80503ff5fb04c049c9eadc2 Mon Sep 17 00:00:00 2001
From: John W. Linville <[email protected]>
Date: Mon, 2 Nov 2009 13:43:32 -0500
Subject: [PATCH] wl1271: depend on INET

wl1271_main.c:(.text+0x271052): undefined reference to `unregister_inetaddr_notifier'
wl1271_main.c:(.text+0x2714d7): undefined reference to `register_inetaddr_notifier'

Driver is doing some filtering based on IP addresses...

Signed-off-by: John W. Linville <[email protected]>
---
drivers/net/wireless/wl12xx/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
index 33de7fa..785e024 100644
--- a/drivers/net/wireless/wl12xx/Kconfig
+++ b/drivers/net/wireless/wl12xx/Kconfig
@@ -42,6 +42,7 @@ config WL1251_SDIO
config WL1271
tristate "TI wl1271 support"
depends on WL12XX && SPI_MASTER && GENERIC_HARDIRQS
+ depends on INET
select FW_LOADER
select CRC7
---help---
--
1.6.2.5

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.

2009-11-02 19:00:12

by John W. Linville

[permalink] [raw]
Subject: Re: linux-next: Tree for November 2 (wireless/wl1271)

Helps if I actually Cc: Luca...

On Mon, Nov 02, 2009 at 01:44:49PM -0500, John W. Linville wrote:
> On Mon, Nov 02, 2009 at 10:01:35AM -0800, Randy Dunlap wrote:
> > Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Changes since 20091030:
> >
> >
> > wl1271 build fails when CONFIG_INET=n.
> > Should this driver depend on INET?
> >
> > Why does this driver, unlike all other wireless drivers,
> > want to use register_inetaddr_notifier()?
> >
> > wl1271_main.c:(.text+0x271052): undefined reference to `unregister_inetaddr_notifier'
> > wl1271_main.c:(.text+0x2714d7): undefined reference to `register_inetaddr_notifier'
>
> Yeah, that driver is doing some filtering based on IPv4.
>
> Luca, is that necessary? If so, then we need a patch like the one below...?
>
> John
>
> From ba823accfad68151d80503ff5fb04c049c9eadc2 Mon Sep 17 00:00:00 2001
> From: John W. Linville <[email protected]>
> Date: Mon, 2 Nov 2009 13:43:32 -0500
> Subject: [PATCH] wl1271: depend on INET
>
> wl1271_main.c:(.text+0x271052): undefined reference to `unregister_inetaddr_notifier'
> wl1271_main.c:(.text+0x2714d7): undefined reference to `register_inetaddr_notifier'
>
> Driver is doing some filtering based on IP addresses...
>
> Signed-off-by: John W. Linville <[email protected]>
> ---
> drivers/net/wireless/wl12xx/Kconfig | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
> index 33de7fa..785e024 100644
> --- a/drivers/net/wireless/wl12xx/Kconfig
> +++ b/drivers/net/wireless/wl12xx/Kconfig
> @@ -42,6 +42,7 @@ config WL1251_SDIO
> config WL1271
> tristate "TI wl1271 support"
> depends on WL12XX && SPI_MASTER && GENERIC_HARDIRQS
> + depends on INET
> select FW_LOADER
> select CRC7
> ---help---
> --
> 1.6.2.5
>
> --
> John W. Linville Someday the world will need a hero, and you
> [email protected] might be all we have. Be ready.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.

2009-11-02 21:11:13

by Luciano Coelho

[permalink] [raw]
Subject: Re: linux-next: Tree for November 2 (wireless/wl1271)

ext John W. Linville wrote:
> Helps if I actually Cc: Luca...

Yes, it does. :) I would see this at some point but CCing me speed things up
quite a lot.

> On Mon, Nov 02, 2009 at 01:44:49PM -0500, John W. Linville wrote:
>> On Mon, Nov 02, 2009 at 10:01:35AM -0800, Randy Dunlap wrote:
>>> Stephen Rothwell wrote:
>>>> Hi all,
>>>>
>>>> Changes since 20091030:
>>>
>>> wl1271 build fails when CONFIG_INET=n.
>>> Should this driver depend on INET?
>>>
>>> Why does this driver, unlike all other wireless drivers,
>>> want to use register_inetaddr_notifier()?
>>>
>>> wl1271_main.c:(.text+0x271052): undefined reference to `unregister_inetaddr_notifier'
>>> wl1271_main.c:(.text+0x2714d7): undefined reference to `register_inetaddr_notifier'
>> Yeah, that driver is doing some filtering based on IPv4.
>>
>> Luca, is that necessary? If so, then we need a patch like the one below...?

Yes, this is necessary. We are doing ARP filtering according to the IP address
of the interface, as you have realized. Our implementation is rather ugly at
the moment, so the plan is to try to get rid of this dependency on INET, but we
need it for now.

Thanks Randy for finding this and thanks John for fixing it.

>> From ba823accfad68151d80503ff5fb04c049c9eadc2 Mon Sep 17 00:00:00 2001
>> From: John W. Linville <[email protected]>
>> Date: Mon, 2 Nov 2009 13:43:32 -0500
>> Subject: [PATCH] wl1271: depend on INET
>>
>> wl1271_main.c:(.text+0x271052): undefined reference to `unregister_inetaddr_notifier'
>> wl1271_main.c:(.text+0x2714d7): undefined reference to `register_inetaddr_notifier'
>>
>> Driver is doing some filtering based on IP addresses...
>>
>> Signed-off-by: John W. Linville <[email protected]>
>> ---
>> drivers/net/wireless/wl12xx/Kconfig | 1 +
>> 1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
>> index 33de7fa..785e024 100644
>> --- a/drivers/net/wireless/wl12xx/Kconfig
>> +++ b/drivers/net/wireless/wl12xx/Kconfig
>> @@ -42,6 +42,7 @@ config WL1251_SDIO
>> config WL1271
>> tristate "TI wl1271 support"
>> depends on WL12XX && SPI_MASTER && GENERIC_HARDIRQS
>> + depends on INET
>> select FW_LOADER
>> select CRC7
>> ---help---
>> --
>> 1.6.2.5

Acked-by: Luciano Coelho <[email protected]>

--
Cheers,
Luca.

2009-11-03 06:04:49

by Luciano Coelho

[permalink] [raw]
Subject: Re: linux-next: Tree for November 2 (wireless/wl1271)

Coelho Luciano (Nokia-D/Helsinki) wrote:
> ext John W. Linville wrote:
>> Helps if I actually Cc: Luca...
>
> Yes, it does. :) I would see this at some point but CCing me speed things up
> quite a lot.


BTW, I think we need this for wl1251 as well. CC'ing Kalle too.


>> On Mon, Nov 02, 2009 at 01:44:49PM -0500, John W. Linville wrote:
>>> On Mon, Nov 02, 2009 at 10:01:35AM -0800, Randy Dunlap wrote:
>>>> Stephen Rothwell wrote:
>>>>> Hi all,
>>>>>
>>>>> Changes since 20091030:
>>>> wl1271 build fails when CONFIG_INET=n.
>>>> Should this driver depend on INET?
>>>>
>>>> Why does this driver, unlike all other wireless drivers,
>>>> want to use register_inetaddr_notifier()?
>>>>
>>>> wl1271_main.c:(.text+0x271052): undefined reference to `unregister_inetaddr_notifier'
>>>> wl1271_main.c:(.text+0x2714d7): undefined reference to `register_inetaddr_notifier'
>>> Yeah, that driver is doing some filtering based on IPv4.
>>>
>>> Luca, is that necessary? If so, then we need a patch like the one below...?
>
> Yes, this is necessary. We are doing ARP filtering according to the IP address
> of the interface, as you have realized. Our implementation is rather ugly at
> the moment, so the plan is to try to get rid of this dependency on INET, but we
> need it for now.
>
> Thanks Randy for finding this and thanks John for fixing it.
>
>>> From ba823accfad68151d80503ff5fb04c049c9eadc2 Mon Sep 17 00:00:00 2001
>>> From: John W. Linville <[email protected]>
>>> Date: Mon, 2 Nov 2009 13:43:32 -0500
>>> Subject: [PATCH] wl1271: depend on INET
>>>
>>> wl1271_main.c:(.text+0x271052): undefined reference to `unregister_inetaddr_notifier'
>>> wl1271_main.c:(.text+0x2714d7): undefined reference to `register_inetaddr_notifier'
>>>
>>> Driver is doing some filtering based on IP addresses...
>>>
>>> Signed-off-by: John W. Linville <[email protected]>
>>> ---
>>> drivers/net/wireless/wl12xx/Kconfig | 1 +
>>> 1 files changed, 1 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
>>> index 33de7fa..785e024 100644
>>> --- a/drivers/net/wireless/wl12xx/Kconfig
>>> +++ b/drivers/net/wireless/wl12xx/Kconfig
>>> @@ -42,6 +42,7 @@ config WL1251_SDIO
>>> config WL1271
>>> tristate "TI wl1271 support"
>>> depends on WL12XX && SPI_MASTER && GENERIC_HARDIRQS
>>> + depends on INET
>>> select FW_LOADER
>>> select CRC7
>>> ---help---
>>> --
>>> 1.6.2.5
>
> Acked-by: Luciano Coelho <[email protected]>
>


--
Cheers,
Luca.

2009-11-04 21:57:55

by Randy Dunlap

[permalink] [raw]
Subject: [PATCH] staging: RTL8192SU depends on USB

From: Randy Dunlap <[email protected]>

USB device driver needs to depend on USB to prevent build errors:

ERROR: "usb_kill_urb" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
ERROR: "usb_deregister" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
ERROR: "usb_control_msg" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
ERROR: "usb_submit_urb" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
ERROR: "usb_register_driver" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
ERROR: "usb_free_urb" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
ERROR: "usb_alloc_urb" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!

Signed-off-by: Randy Dunlap <[email protected]>
---
drivers/staging/rtl8192su/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-next-20091102.orig/drivers/staging/rtl8192su/Kconfig
+++ linux-next-20091102/drivers/staging/rtl8192su/Kconfig
@@ -1,6 +1,6 @@
config RTL8192SU
tristate "RealTek RTL8192SU Wireless LAN NIC driver"
- depends on PCI && WLAN
+ depends on PCI && WLAN && USB
depends on WIRELESS_EXT
default N
---help---

2009-11-07 10:37:44

by Kalle Valo

[permalink] [raw]
Subject: Re: linux-next: Tree for November 2 (wireless/wl1271)

Luciano Coelho <[email protected]> writes:

> Coelho Luciano (Nokia-D/Helsinki) wrote:
>> ext John W. Linville wrote:
>>> Helps if I actually Cc: Luca...
>>
>> Yes, it does. :) I would see this at some point but CCing me speed
>> things up quite a lot.
>
>
> BTW, I think we need this for wl1251 as well. CC'ing Kalle too.

Thanks, but upstream wl1251 doesn't have ARP filter. There is an
internal patch but I haven't submitted it, yet.

--
Kalle Valo

2009-11-09 11:21:45

by Luciano Coelho

[permalink] [raw]
Subject: Re: linux-next: Tree for November 2 (wireless/wl1271)

ext Kalle Valo wrote:
> Luciano Coelho <[email protected]> writes:
>
>> Coelho Luciano (Nokia-D/Helsinki) wrote:
>>> ext John W. Linville wrote:
>>>> Helps if I actually Cc: Luca...
>>> Yes, it does. :) I would see this at some point but CCing me speed
>>> things up quite a lot.
>>
>> BTW, I think we need this for wl1251 as well. CC'ing Kalle too.
>
> Thanks, but upstream wl1251 doesn't have ARP filter. There is an
> internal patch but I haven't submitted it, yet.

Oh, okay. Sorry for not checking. I just noticed that our wl1271
implementation was based on the implementation for wl1251, so I just assumed it
was needed as well.

--
Cheers,
Luca.

2009-11-11 17:04:20

by Randy Dunlap

[permalink] [raw]
Subject: Re: linux-next: Tree for November 2 (usb/whci)

On Mon, 2 Nov 2009 09:13:39 -0800 Randy Dunlap wrote:

> On Mon, 2 Nov 2009 17:38:45 +1100 Stephen Rothwell wrote:
>
> > Hi all,
> >
> > Changes since 20091030: <<<<<<<<<<<<<<<<<<<<<<<<<<
>
>
> whci build fails on i386 due to 64-bit multiply & divide:
>
> ERROR: "__udivdi3" [drivers/usb/host/whci/whci-hcd.ko] undefined!
> ERROR: "__umoddi3" [drivers/usb/host/whci/whci-hcd.ko] undefined!


Still present in linux-next-20091111.

---
~Randy

2009-11-11 17:30:32

by Greg KH

[permalink] [raw]
Subject: Re: linux-next: Tree for November 2 (usb/whci)

On Wed, Nov 11, 2009 at 09:04:03AM -0800, Randy Dunlap wrote:
> On Mon, 2 Nov 2009 09:13:39 -0800 Randy Dunlap wrote:
>
> > On Mon, 2 Nov 2009 17:38:45 +1100 Stephen Rothwell wrote:
> >
> > > Hi all,
> > >
> > > Changes since 20091030: <<<<<<<<<<<<<<<<<<<<<<<<<<
> >
> >
> > whci build fails on i386 due to 64-bit multiply & divide:
> >
> > ERROR: "__udivdi3" [drivers/usb/host/whci/whci-hcd.ko] undefined!
> > ERROR: "__umoddi3" [drivers/usb/host/whci/whci-hcd.ko] undefined!
>
>
> Still present in linux-next-20091111.

David, can you please look into this and resolve it?

thanks,

greg k-h

2009-11-17 11:41:42

by David Vrabel

[permalink] [raw]
Subject: Re: linux-next: Tree for November 2 (usb/whci)

Greg KH wrote:
> On Wed, Nov 11, 2009 at 09:04:03AM -0800, Randy Dunlap wrote:
>> On Mon, 2 Nov 2009 09:13:39 -0800 Randy Dunlap wrote:
>>
>>> On Mon, 2 Nov 2009 17:38:45 +1100 Stephen Rothwell wrote:
>>>
>>>> Hi all,
>>>>
>>>> Changes since 20091030: <<<<<<<<<<<<<<<<<<<<<<<<<<
>>>
>>> whci build fails on i386 due to 64-bit multiply & divide:
>>>
>>> ERROR: "__udivdi3" [drivers/usb/host/whci/whci-hcd.ko] undefined!
>>> ERROR: "__umoddi3" [drivers/usb/host/whci/whci-hcd.ko] undefined!
>>
>> Still present in linux-next-20091111.
>
> David, can you please look into this and resolve it?

Yes, I've been on holiday and haven't had a change to look into it yet.

I can't immediately think of any 64 bit maths and I don't understand why
I haven't seen it. I always build for i386.

David


Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom

2009-11-17 15:51:41

by Randy Dunlap

[permalink] [raw]
Subject: Re: linux-next: Tree for November 2 (usb/whci)

On Tue, 17 Nov 2009 11:40:43 +0000 David Vrabel wrote:

> Greg KH wrote:
> > On Wed, Nov 11, 2009 at 09:04:03AM -0800, Randy Dunlap wrote:
> >> On Mon, 2 Nov 2009 09:13:39 -0800 Randy Dunlap wrote:
> >>
> >>> On Mon, 2 Nov 2009 17:38:45 +1100 Stephen Rothwell wrote:
> >>>
> >>>> Hi all,
> >>>>
> >>>> Changes since 20091030: <<<<<<<<<<<<<<<<<<<<<<<<<<
> >>>
> >>> whci build fails on i386 due to 64-bit multiply & divide:
> >>>
> >>> ERROR: "__udivdi3" [drivers/usb/host/whci/whci-hcd.ko] undefined!
> >>> ERROR: "__umoddi3" [drivers/usb/host/whci/whci-hcd.ko] undefined!
> >>
> >> Still present in linux-next-20091111.
> >
> > David, can you please look into this and resolve it?
>
> Yes, I've been on holiday and haven't had a change to look into it yet.
>
> I can't immediately think of any 64 bit maths and I don't understand why
> I haven't seen it. I always build for i386.

When the driver is built-in (not a loadable module), the messages are:

drivers/built-in.o: In function `qset_add_urb':
(.text+0x4595f8): undefined reference to `__umoddi3'
drivers/built-in.o: In function `qset_add_urb':
(.text+0x45969a): undefined reference to `__udivdi3'

Those could still refer to other (inline) functions...

---
~Randy

2009-11-17 18:51:26

by David Vrabel

[permalink] [raw]
Subject: Re: linux-next: Tree for November 2 (usb/whci)

Randy Dunlap wrote:
>
> When the driver is built-in (not a loadable module), the messages are:
>
> drivers/built-in.o: In function `qset_add_urb':
> (.text+0x4595f8): undefined reference to `__umoddi3'
> drivers/built-in.o: In function `qset_add_urb':
> (.text+0x45969a): undefined reference to `__udivdi3'
>
> Those could still refer to other (inline) functions...

If HIGHMEM64G is set then dma_addr_t is 64 bits which is where the 64
bit maths come from.

David
--
David Vrabel, Senior Software Engineer, Drivers
CSR, Churchill House, Cambridge Business Park, Tel: +44 (0)1223 692562
Cowley Road, Cambridge, CB4 0WZ http://www.csr.com/


Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom