Re: [OpenWrt-Devel] [PATCH] Add ehci host support for BCM5354 USB20 core

2008-06-11 Thread Steve Brown
Felipe Maya wrote:
> The patch works with one USB port, but with two USB simultaneously
> something wrong happens.
>
> I changed the driver_mipscore.c to enable SSB_DEV_USB11_HOST for bcm5354
> at this line (208): 
>  
>
> if (((bus->chip_id == 0x4710) || (bus->chip_id == 0x5354)) && (irq <=
> 4))
>
> instead
>
> if (((bus->chip_id == 0x4710) && (irq <= 4))
>
>
> and it seems work fine
>
>
>  for (irq = 2, i = 0; i < bus->nr_devices; i++) {
> dev = &(bus->devices[i]);
> dev->irq = ssb_mips_irq(dev) + 2;
> switch (dev->id.coreid) {
> case SSB_DEV_USB11_HOST:
> /* shouldn't need a separate irq line for
> non-4710, most of them have a proper
>  * external usb controller on the pci */
> if (((bus->chip_id == 0x4710) || (bus->chip_id
> == 0x5354)) && (irq <= 4)) {
> set_irq(dev, irq++);
> break;
> }
> /* fallthrough */
> case SSB_DEV_PCI:
> 
> 
> 
>   
What goes wrong?
Are you using the patch I posted on this list?
Also, what router is your 5354 in?

This is very puzzling. One of the major changes was to get rid of the 
fake USB11 device. The single USB20 device now gets shared between the 
ehci and ohci drivers. I don't understand how the code in that case even 
got executed.

I just got a wl500gpv2 that has a 5354 and 2 usb ports. As soon as I get 
some headers soldered to it, I'll try both ports and see if I can get it 
to break.

Steve

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] patch for ip-up

2008-06-11 Thread Brian J. Murrell
On Wed, 2008-06-11 at 22:52 +0200, John Crispin wrote:
> 
> who said it would or would not be merged ?

Nobody, either way.  That it wasn't I took as meaning that it would not,
which is why I was asking why it wasn't.  If that made any sense.  :-)

So should I resubmit that or is it something not generally useful enough
to merge?

b.



signature.asc
Description: This is a digitally signed message part
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] patch for ip-up

2008-06-11 Thread John Crispin
Brian J. Murrell wrote:

> I see the above was applied, but not my proposal for a new hotplug iface
> script below.  Do I need to submit it separately or is there
> philosophical objection to it?

who said it would or would not be merged ?
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] patch for ip-up

2008-06-11 Thread Brian J. Murrell
On Wed, 2008-06-11 at 22:03 +0200, John Crispin wrote:
> applied, but forgot the signed off in the commit msg, sorry
> 
> Brian J. Murrell wrote:
> > I'd like to propose the following patch to
> > package/ppp/files/etc/ppp/ip-up.  It means that hotplug scripts can
> > source the network state and get information about the newly plumbed ppp
> > interface.
> > 
> > Signed off by: Brian J. Murrell <[EMAIL PROTECTED]>
> > 
> > Index: package/ppp/files/etc/ppp/ip-up
> > ===
> > --- package/ppp/files/etc/ppp/ip-up (revision 10709)
> > +++ package/ppp/files/etc/ppp/ip-up (working copy)
> > @@ -6,11 +6,11 @@
> >  PPP_REMOTE="$5"
> >  PPP_IPPARAM="$6"
> >  export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
> > -[ -z "$PPP_IPPARAM" ] || env -i ACTION="ifup" INTERFACE="$PPP_IPPARAM" 
> > DEVICE="$PPP_IFACE" PROTO=ppp /sbin/hotplug-call "iface"
> >  [ -z "$PPP_IPPARAM" -o -z "$PPP_LOCAL" ] || {
> > uci_set_state network "$PPP_IPPARAM" ipaddr "$PPP_LOCAL"
> > uci_set_state network "$PPP_IPPARAM" gateway "$PPP_REMOTE"
> >  }
> > +[ -z "$PPP_IPPARAM" ] || env -i ACTION="ifup" INTERFACE="$PPP_IPPARAM" 
> > DEVICE="$PPP_IFACE" PROTO=ppp /sbin/hotplug-call "iface"
> >  
> >  
> >  [ -d /etc/ppp/ip-up.d ] && {

I see the above was applied, but not my proposal for a new hotplug iface
script below.  Do I need to submit it separately or is there
philosophical objection to it?

> > Signed off by: Brian J. Murrell <[EMAIL PROTECTED]>
> > 
> > config_load network
> > config_get ifname "$INTERFACE" ifname
> > 
> > config_load /var/state/network
> > 
> > # standard hosts file already has a loopback/localhost entry
> > [ "$INTERFACE" = loopback ] && exit 0
> > 
> > # need to wait for others to be done
> > n=0
> > while [ -f /tmp/edit_hosts -a $n -lt 5 ]; do
> > sleep 1
> > let n=n+1
> > done
> > 
> > [ -f /tmp/edit_hosts ] && {
> > logger "Unable to update /etc/hosts due to lock file /tmp/edit_hosts 
> > being present for more than 5 seconds"
> > exit 0
> > }
> > 
> > # tell others we are working
> > echo $$ > /tmp/edit_hosts
> > 
> > [ ifup = "$ACTION" ] && {
> > config_get addr "$INTERFACE" ipaddr
> > 
> > [ -n "$addr" ] && \
> > sed -i -e "/^.* $INTERFACE$/d" -e "\$a$addr $INTERFACE" 
> > /etc/hosts
> > }
> > 
> > [ ifdown = "$ACTION" ] && {
> > sed -i -e "/^.* $INTERFACE$/d" /etc/hosts
> > }
> > 
> > rm -f /tmp/edit_hosts

b.



signature.asc
Description: This is a digitally signed message part
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] patch for ip-up

2008-06-11 Thread John Crispin
applied, but forgot the signed off in the commit msg, sorry

Brian J. Murrell wrote:
> I'd like to propose the following patch to
> package/ppp/files/etc/ppp/ip-up.  It means that hotplug scripts can
> source the network state and get information about the newly plumbed ppp
> interface.
> 
> Signed off by: Brian J. Murrell <[EMAIL PROTECTED]>
> 
> Index: package/ppp/files/etc/ppp/ip-up
> ===
> --- package/ppp/files/etc/ppp/ip-up   (revision 10709)
> +++ package/ppp/files/etc/ppp/ip-up   (working copy)
> @@ -6,11 +6,11 @@
>  PPP_REMOTE="$5"
>  PPP_IPPARAM="$6"
>  export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
> -[ -z "$PPP_IPPARAM" ] || env -i ACTION="ifup" INTERFACE="$PPP_IPPARAM" 
> DEVICE="$PPP_IFACE" PROTO=ppp /sbin/hotplug-call "iface"
>  [ -z "$PPP_IPPARAM" -o -z "$PPP_LOCAL" ] || {
>   uci_set_state network "$PPP_IPPARAM" ipaddr "$PPP_LOCAL"
>   uci_set_state network "$PPP_IPPARAM" gateway "$PPP_REMOTE"
>  }
> +[ -z "$PPP_IPPARAM" ] || env -i ACTION="ifup" INTERFACE="$PPP_IPPARAM" 
> DEVICE="$PPP_IFACE" PROTO=ppp /sbin/hotplug-call "iface"
>  
>  
>  [ -d /etc/ppp/ip-up.d ] && {
> 
> The need for the above patch was discovered by a new hotplug script I
> created in hotplug.d/iface/01-hosts that I'd like to propose for
> addition to the standard hotplug scripts.
> 
> Signed off by: Brian J. Murrell <[EMAIL PROTECTED]>
> 
> config_load network
> config_get ifname "$INTERFACE" ifname
> 
> config_load /var/state/network
> 
> # standard hosts file already has a loopback/localhost entry
> [ "$INTERFACE" = loopback ] && exit 0
> 
> # need to wait for others to be done
> n=0
> while [ -f /tmp/edit_hosts -a $n -lt 5 ]; do
>   sleep 1
>   let n=n+1
> done
> 
> [ -f /tmp/edit_hosts ] && {
>   logger "Unable to update /etc/hosts due to lock file /tmp/edit_hosts 
> being present for more than 5 seconds"
>   exit 0
> }
> 
> # tell others we are working
> echo $$ > /tmp/edit_hosts
> 
> [ ifup = "$ACTION" ] && {
>   config_get addr "$INTERFACE" ipaddr
> 
>   [ -n "$addr" ] && \
>   sed -i -e "/^.* $INTERFACE$/d" -e "\$a$addr $INTERFACE" 
> /etc/hosts
> }
> 
> [ ifdown = "$ACTION" ] && {
>   sed -i -e "/^.* $INTERFACE$/d" /etc/hosts
> }
> 
> rm -f /tmp/edit_hosts
> 
> The result of that script after a reboot of my router is:
> 
> [EMAIL PROTECTED]:~# cat /etc/hosts
> 127.0.0.1 localhost.
> 10.75.22.254  lan
> 33.1.73.242   wan1
> 167.9.10.202  wan0
> 
> Cheers,
> b.
> 
> 
> 
> 
> 
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] privoxy boost 3.0.8

2008-06-11 Thread John Crispin
fixed
joerg jungermann wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA1
> 
> Hi
> 
> This patch boost privoxy to version 3.0.8, to support transparent
> (intercepting) proxiing of HTTP/80 connections.
> 
> cya
> 
> Index: privoxy/Makefile
> ===
> - --- privoxy/Makefile(revision 11136)
> +++ privoxy/Makefile(working copy)
> @@ -9,7 +9,7 @@
>  include $(TOPDIR)/rules.mk
> 
>  PKG_NAME:=privoxy
> - -PKG_VERSION:=3.0.6
> +PKG_VERSION:=3.0.8
>  PKG_RELEASE:=3
> 
>  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable-src.tar.gz
> 
> - --
> Joerg Jungermann
> - 
>  Rechnerbetrieb Mathematik  | Zustaendig fuer:
>  Universitaet-Paderborn  - Fakultaet 5  |   Linux, Web
> -BEGIN PGP SIGNATURE-
> Version: GnuPG v1.4.6 (GNU/Linux)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
> 
> iD8DBQFIKudqsta551Pt/1URAh2TAJ0UGz7lDI4RsoXvT2Ui6X2iNemaPgCgl+LO
> aFm4ofyBFkUEp+Oj7vWB+tY=
> =2EJA
> -END PGP SIGNATURE-
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] et131x kernel module

2008-06-11 Thread John Crispin
applied

Christoph Dwertmann wrote:
> This adds support for Agere ET131x Gigabit Ethernet cards.
> 
> Signed-off-by: Christoph Dwertmann <[EMAIL PROTECTED]>
> 
> ---
> 
> Index: package/et131x/Makefile
> ===
> --- package/et131x/Makefile   (revision 0)
> +++ package/et131x/Makefile   (revision 0)
> @@ -0,0 +1,36 @@
> +include $(TOPDIR)/rules.mk
> +include $(INCLUDE_DIR)/kernel.mk
> +
> +PKG_NAME:=et131x
> +PKG_VERSION:=1.2.3-3
> +PKG_RELEASE:=1
> +
> +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
> +PKG_SOURCE_URL:[EMAIL PROTECTED]/et131x
> +PKG_MD5SUM:=9496422c7d218f27bae1be42a04d122e
> +
> +include $(INCLUDE_DIR)/package.mk
> +
> +define KernelPackage/et131x
> +  SUBMENU:=Network Devices
> +  TITLE:=Agere ET131x Gigabit Ethernet driver
> +  URL:=http://sourceforge.net/projects/et131x
> +  FILES:=$(PKG_BUILD_DIR)/et131x.$(LINUX_KMOD_SUFFIX)
> +  DEPENDS:[EMAIL PROTECTED]
> +  AUTOLOAD:=$(call AutoLoad,70,et131x)
> +endef
> +
> +define KernelPackage/et131x/description
> +   This package contains the et131x kernel module.
> +endef
> +
> +define Build/Compile
> +   $(MAKE) -C "$(LINUX_DIR)" \
> +ARCH="$(LINUX_KARCH)" \
> +CROSS_COMPILE="$(TARGET_CROSS)" \
> +   SUBDIRS="$(PKG_BUILD_DIR)" \
> +$(PKG_EXTRA_KCONFIG) \
> +EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)"
> +endef
> +
> +$(eval $(call KernelPackage,et131x)
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] Add ehci host support for BCM5354 USB20 core

2008-06-11 Thread Felipe Maya
The patch works with one USB port, but with two USB simultaneously
something wrong happens.

I changed the driver_mipscore.c to enable SSB_DEV_USB11_HOST for bcm5354
at this line (208): 
 

if (((bus->chip_id == 0x4710) || (bus->chip_id == 0x5354)) && (irq <=
4))

instead

if (((bus->chip_id == 0x4710) && (irq <= 4))


and it seems work fine


 for (irq = 2, i = 0; i < bus->nr_devices; i++) {
dev = &(bus->devices[i]);
dev->irq = ssb_mips_irq(dev) + 2;
switch (dev->id.coreid) {
case SSB_DEV_USB11_HOST:
/* shouldn't need a separate irq line for
non-4710, most of them have a proper
 * external usb controller on the pci */
if (((bus->chip_id == 0x4710) || (bus->chip_id
== 0x5354)) && (irq <= 4)) {
set_irq(dev, irq++);
break;
}
/* fallthrough */
case SSB_DEV_PCI:





On Mon, 2008-06-09 at 05:19 -0700, Steve Brown wrote:
> Michael Buesch wrote:
> > On Monday 09 June 2008 13:48:35 Steve Brown wrote:
> >   
> >> This adds support to ehci-hcd for the ehci host function of the USB20 ssb 
> >> core in the Broadcom BCM5354. That core implements both ehci and ohci. The 
> >> support is implemented as a library or extension to the ohci-ssb support 
> >> in the ohci-hcd driver and is not standalone. The ehci-hcd driver must 
> >> load before the ohci-hcd driver.
> >>
> >> Signed-off-by: Steve Brown <[EMAIL PROTECTED]>
> >> Cc: Michael Buesch <[EMAIL PROTECTED]>
> >> 
> >
> > Do you have commit access to SVN?
> > If not, I'll commit it for you. (I assume you tested this patch and it 
> > works correctly).
> >
> >   
> I don't have commit access.
> 
> I've tested both ehci and ohci using the new code as well as built 
> without ehci and tested that ohci still worked. This was done using the 
> same file I submitted. As for the build process, selecting ehci selects 
> ohci. Also, ehci is loaded first. But, you never know.
> 
> Thanks for your help,
> 
> Steve
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] libnfnetlink: include new header file in install dev

2008-06-11 Thread Fabian Hugelshofer
John Crispin wrote:
> thanks, applied, [11432]

Hm, the change is not correct. The line should be modified. The change 
adds a new one instead. I just applied this patch today without 
problems. Might the "-" got lost, when you copied it?

> Fabian Hugelshofer wrote:
>> (Oops, previous patches had missing path. Still needs to be applied...)
>>
>> In libnfnetlink 0.0.38 a new header file (linux_libnfnetlink_compat.h)
>> was introduced, which needs to be copied to the staging dir as well.
>> Right now build fails for applications using libnfnetlink.
>>
>> Signed-off-by: Fabian Hugelshofer <[EMAIL PROTECTED]>
>>
>> Index: libs/libnfnetlink/Makefile
>> ===
>> --- libs/libnfnetlink/Makefile   (revision 11430)
>> +++ libs/libnfnetlink/Makefile   (working copy)
>> @@ -50,7 +50,7 @@
>>  
>>  define Build/InstallDev
>>  mkdir -p $(1)/usr/include/libnfnetlink
>> -$(CP) 
>> $(PKG_INSTALL_DIR)/usr/include/libnfnetlink/{libnfnetlink,linux_nfnetlink}.h 
>> $(1)/usr/include/libnfnetlink/
>> +$(CP) 
>> $(PKG_INSTALL_DIR)/usr/include/libnfnetlink/{libnfnetlink,linux_nfnetlink,linux_nfnetlink_compat}.h
>>  $(1)/usr/include/libnfnetlink/
>>  mkdir -p $(1)/usr/lib
>>  $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfnetlink.{a,so*} $(1)/usr/lib/
>>  endef

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] libnfnetlink: include new header file in install dev

2008-06-11 Thread John Crispin
thanks, applied, [11432]



Fabian Hugelshofer wrote:
> (Oops, previous patches had missing path. Still needs to be applied...)
> 
> In libnfnetlink 0.0.38 a new header file (linux_libnfnetlink_compat.h)
> was introduced, which needs to be copied to the staging dir as well.
> Right now build fails for applications using libnfnetlink.
> 
> Signed-off-by: Fabian Hugelshofer <[EMAIL PROTECTED]>
> 
> Index: libs/libnfnetlink/Makefile
> ===
> --- libs/libnfnetlink/Makefile(revision 11430)
> +++ libs/libnfnetlink/Makefile(working copy)
> @@ -50,7 +50,7 @@
>  
>  define Build/InstallDev
>   mkdir -p $(1)/usr/include/libnfnetlink
> - $(CP) 
> $(PKG_INSTALL_DIR)/usr/include/libnfnetlink/{libnfnetlink,linux_nfnetlink}.h 
> $(1)/usr/include/libnfnetlink/
> + $(CP) 
> $(PKG_INSTALL_DIR)/usr/include/libnfnetlink/{libnfnetlink,linux_nfnetlink,linux_nfnetlink_compat}.h
>  $(1)/usr/include/libnfnetlink/
>   mkdir -p $(1)/usr/lib
>   $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfnetlink.{a,so*} $(1)/usr/lib/
>  endef
> 
> 
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [PATCH] libnfnetlink: include new header file in install dev

2008-06-11 Thread Fabian Hugelshofer
(Oops, previous patches had missing path. Still needs to be applied...)

In libnfnetlink 0.0.38 a new header file (linux_libnfnetlink_compat.h)
was introduced, which needs to be copied to the staging dir as well.
Right now build fails for applications using libnfnetlink.

Signed-off-by: Fabian Hugelshofer <[EMAIL PROTECTED]>

Index: libs/libnfnetlink/Makefile
===
--- libs/libnfnetlink/Makefile  (revision 11430)
+++ libs/libnfnetlink/Makefile  (working copy)
@@ -50,7 +50,7 @@
 
 define Build/InstallDev
mkdir -p $(1)/usr/include/libnfnetlink
-   $(CP) 
$(PKG_INSTALL_DIR)/usr/include/libnfnetlink/{libnfnetlink,linux_nfnetlink}.h 
$(1)/usr/include/libnfnetlink/
+   $(CP) 
$(PKG_INSTALL_DIR)/usr/include/libnfnetlink/{libnfnetlink,linux_nfnetlink,linux_nfnetlink_compat}.h
 $(1)/usr/include/libnfnetlink/
mkdir -p $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfnetlink.{a,so*} $(1)/usr/lib/
 endef


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel