Ubuntu
dahdi-linux package

please update zaphfc driver to tip of trunk

Bug #612091 reported by eliza on 2010-07-31

This bug affects 3 people

Affects		Status	Importance	Assigned to	Milestone
	dahdi-linux (Ubuntu)	Fix Released	Low	Unassigned

Bug Description

Binary package hint: dahdi-dkms

Please update the file base.c of the zaphfc driver to the tip of the trunk. Otherwise hfc cards will recognised but wont work, because the D-channel appears to be down. (see http://code.google.com/p/zaphfc/issues/detail?id=1&can=1)

Tags:

Related branches

lp:~gandelman-a/ubuntu/precise/dahdi-linux/merge879743

Merged into lp:ubuntu/precise/dahdi-linux

Dave Walker (community): Approve on 2011-10-27

Ubuntu branches: Pending requested 2011-10-24

Diff: 58272 lines (+30285/-15281)

129 files modified

.pc/applied-patches (+3/-2)
.pc/chanmute/include/dahdi/dahdi_config.h (+19/-8)
.pc/dahdi_linux_extra/drivers/dahdi/Kbuild (+2/-5)
.pc/no_firmware_download/Makefile (+1/-1)
.pc/notest/Makefile (+222/-0)
.pc/oslec_auto/drivers/dahdi/Kbuild (+2/-5)
.pc/wcb4xxp_bn4s0e/drivers/dahdi/wcb4xxp/base.c (+0/-3047)
.pc/xpp_fix_2fxs6fxo/drivers/dahdi/xpp/card_fxs.c (+1649/-0)
.version (+1/-1)
ChangeLog (+1067/-0)
Makefile (+1/-4)
README (+20/-1)
build_tools/live_dahdi (+11/-2)
dahdi-linux-2.4.1-summary.html (+0/-237)
dahdi-linux-2.4.1-summary.txt (+0/-459)
debian/changelog (+49/-0)
debian/control (+2/-2)
debian/dahdi-linux.dahdi.udev (+0/-2)
debian/dahdi-linux.lintian-overrides (+2/-0)
debian/dahdi-linux.udev (+2/-0)
debian/dkms.conf.in (+10/-2)
debian/patches/dahdi_linux_extra (+6610/-329)
debian/patches/define_spinlock (+0/-234)
debian/patches/notest (+15/-0)
debian/patches/series (+3/-2)
debian/patches/wcb4xxp_bn4s0e (+0/-27)
debian/patches/xpp_fix_2fxs6fxo (+116/-0)
debian/patches/zaphfc_d_channel_fix.patch (+22/-0)
debian/rules (+14/-71)
drivers/dahdi/Kbuild (+10/-12)
drivers/dahdi/Kconfig (+32/-10)
drivers/dahdi/ap400/ap400_drv.c (+13/-14)
drivers/dahdi/dahdi-base.c (+3478/-2749)
drivers/dahdi/dahdi-sysfs.c (+230/-0)
drivers/dahdi/dahdi-version.c (+33/-0)
drivers/dahdi/dahdi.h (+37/-0)
drivers/dahdi/dahdi_dummy.c (+2/-3)
drivers/dahdi/dahdi_dynamic.c (+342/-299)
drivers/dahdi/dahdi_dynamic_eth.c (+24/-25)
drivers/dahdi/dahdi_dynamic_ethmf.c (+25/-26)
drivers/dahdi/dahdi_dynamic_loc.c (+120/-114)
drivers/dahdi/dahdi_echocan_jpah.c (+5/-3)
drivers/dahdi/dahdi_echocan_kb1.c (+5/-3)
drivers/dahdi/dahdi_echocan_mg2.c (+5/-3)
drivers/dahdi/dahdi_echocan_oslec.c (+27/-3)
drivers/dahdi/dahdi_echocan_sec.c (+5/-3)
drivers/dahdi/dahdi_echocan_sec2.c (+5/-3)
drivers/dahdi/dahdi_transcode.c (+2/-9)
drivers/dahdi/digits.h (+0/-47)
drivers/dahdi/firmware/Makefile (+14/-1)
drivers/dahdi/fxo_modes.h (+15/-15)
drivers/dahdi/hpec/dahdi_echocan_hpec.c (+5/-3)
drivers/dahdi/oct612x/include/oct6100api/oct6100_channel_inst.h (+40/-31)
drivers/dahdi/oct612x/include/oct6100api/oct6100_defines.h (+9/-1)
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c (+12/-2)
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c (+8/-0)
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c (+4/-4)
drivers/dahdi/opvxa1200.c (+0/-3026)
drivers/dahdi/opvxa1200/Kbuild (+19/-0)
drivers/dahdi/opvxa1200/Makefile (+8/-0)
drivers/dahdi/opvxa1200/base.c (+3049/-0)
drivers/dahdi/opvxd115/Kbuild (+32/-0)
drivers/dahdi/opvxd115/Makefile (+8/-0)
drivers/dahdi/opvxd115/base.c (+4903/-0)
drivers/dahdi/opvxd115/opvxd115-diag.c (+427/-0)
drivers/dahdi/opvxd115/opvxd115.h (+124/-0)
drivers/dahdi/opvxd115/vpm450m.c (+587/-0)
drivers/dahdi/opvxd115/vpm450m.h (+43/-0)
drivers/dahdi/pciradio.c (+0/-2)
drivers/dahdi/tor2.c (+11/-13)
drivers/dahdi/voicebus/GpakCust.c (+62/-59)
drivers/dahdi/voicebus/GpakCust.h (+13/-19)
drivers/dahdi/voicebus/Kbuild (+1/-1)
drivers/dahdi/voicebus/voicebus.c (+133/-120)
drivers/dahdi/voicebus/voicebus.h (+10/-13)
drivers/dahdi/voicebus/voicebus_net.c (+7/-19)
drivers/dahdi/voicebus/vpmoct.c (+814/-0)
drivers/dahdi/voicebus/vpmoct.h (+110/-0)
drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c (+1/-1)
drivers/dahdi/wcb4xxp/base.c (+210/-118)
drivers/dahdi/wcb4xxp/wcb4xxp.h (+0/-2)
drivers/dahdi/wcfxo.c (+1/-3)
drivers/dahdi/wcopenpci.c (+0/-1)
drivers/dahdi/wct1xxp.c (+10/-12)
drivers/dahdi/wct4xxp/Kbuild (+6/-0)
drivers/dahdi/wct4xxp/base.c (+279/-171)
drivers/dahdi/wct4xxp/vpm450m.c (+1/-2)
drivers/dahdi/wctc4xxp/base.c (+119/-105)
drivers/dahdi/wctdm.c (+8/-8)
drivers/dahdi/wctdm24xxp/base.c (+2235/-1506)
drivers/dahdi/wctdm24xxp/wctdm24xxp.h (+122/-100)
drivers/dahdi/wctdm24xxp/xhfc.c (+89/-74)
drivers/dahdi/wctdm24xxp/xhfc.h (+5/-3)
drivers/dahdi/wcte11xp.c (+10/-14)
drivers/dahdi/wcte12xp/GpakHpi.h (+0/-79)
drivers/dahdi/wcte12xp/base.c (+685/-343)
drivers/dahdi/wcte12xp/wcte12xp.h (+8/-5)
drivers/dahdi/xpp/Kbuild (+6/-3)
drivers/dahdi/xpp/card_bri.c (+127/-107)
drivers/dahdi/xpp/card_echo.c (+374/-0)
drivers/dahdi/xpp/card_echo.h (+31/-0)
drivers/dahdi/xpp/card_fxo.c (+56/-58)
drivers/dahdi/xpp/card_fxs.c (+144/-97)
drivers/dahdi/xpp/card_global.c (+7/-128)
drivers/dahdi/xpp/card_global.h (+0/-4)
drivers/dahdi/xpp/card_pri.c (+144/-322)
drivers/dahdi/xpp/firmwares/Makefile (+3/-2)
drivers/dahdi/xpp/init_card_4_30 (+6/-1)
drivers/dahdi/xpp/init_card_5_30 (+3/-0)
drivers/dahdi/xpp/mmapdrv.c (+1/-1)
drivers/dahdi/xpp/xbus-core.c (+60/-274)
drivers/dahdi/xpp/xbus-core.h (+28/-18)
drivers/dahdi/xpp/xbus-pcm.c (+81/-144)
drivers/dahdi/xpp/xbus-pcm.h (+7/-5)
drivers/dahdi/xpp/xbus-sysfs.c (+101/-7)
drivers/dahdi/xpp/xdefs.h (+0/-1)
drivers/dahdi/xpp/xframe_queue.c (+5/-2)
drivers/dahdi/xpp/xpd.h (+35/-36)
drivers/dahdi/xpp/xpp_dahdi.c (+240/-262)
drivers/dahdi/xpp/xpp_dahdi.h (+7/-2)
drivers/dahdi/xpp/xpp_debug (+1/-1)
drivers/dahdi/xpp/xpp_log.h (+0/-52)
drivers/dahdi/xpp/xpp_usb.c (+1/-6)
drivers/dahdi/xpp/xproto.c (+31/-18)
drivers/dahdi/xpp/xproto.h (+37/-17)
drivers/dahdi/zaphfc/base.c (+5/-5)
include/dahdi/dahdi_config.h (+19/-8)
include/dahdi/kernel.h (+202/-50)
include/dahdi/user.h (+23/-7)

lp:ubuntu/precise/dahdi-linux

Revision history for this message

Antonis Kanouras (akanouras) wrote on 2010-08-12:

It's just an one-line change, without which the driver is totally useless.

Is there anything we can do to help push this forward?

Revision history for this message

Dave Walker (davewalker) wrote on 2010-08-12:

@Antonis, if you could provide the 1 line - it would make it easier to update.

Thanks.

Changed in dahdi-linux (Ubuntu):
status:	New → Confirmed
importance:	Undecided → Low

Revision history for this message

eliza (r-launchpad-frithjof-hammer-de) wrote on 2010-08-13:

update zaphfc driver to tip of trunk (r7) Edit (4.3 KiB, text/plain)

I'll try:
This is a patch against the deb source directory of dahdi-linux-2.2.1+dfsg.

Revision history for this message

Antonis Kanouras (akanouras) wrote on 2010-08-13:

What Eliza said :)

Thanks for the prompt response!

Revision history for this message

Antonis Kanouras (akanouras) wrote on 2010-08-13:

Hmm,

did apt-get source ...
applied Eliza's patch
ran dpkg-buildpackage
installed the resulting dahdi-dkms...deb
and base.c is still unpatched in /var/lib/dkms/...

Debugging atm.

Cheers,
Antonio

Revision history for this message

Antonis Kanouras (akanouras) wrote on 2010-08-14:

Refreshed quilt patch Edit (263.1 KiB, text/plain)

Hello again,

after a long and educational session with quilt, I attach a refreshed version of the debian/patches/dahdi_linux_extra file.

The only change I made was updating drivers/dahdi/zaphfc/base.c to r7 in SVN (was r5). It contains two small changes - the first is an additional header include (linux/sched.h) for building with kernels 2.6.32+ and the second one is a typo fix (D -> DAHDI_D) which did all the damage.

I didn't touch the file debian/patches/zaphfc, as the Debian maintainer merged all extra driver patches into dahdi_linux_extra in http://bugs.debian.org/564720 and did not provide a way to automatically produce it, which I assume means he's going to drop them at a later stage.

I've tested the resulting package on my system and it seemed ok.

Feel free to ask me if anything else is needed.

Cheers,
Antonio

Revision history for this message

Antonis Kanouras (akanouras) wrote on 2010-08-14:

dahdi_linux_extra-2 Edit (933 bytes, text/plain)

Attaching a minimal version of the patch which can be applied after dahdi_linux_extra, in case you prefer it in that form.

Also, disregard what I said about the header include, it actually seems like a (minimal) fix for kernels <2.6.32.

Cheers,
Antonio

Brian Murray (brian-murray) on 2010-08-15

tags:

added: patch

Revision history for this message

Launchpad Janitor (janitor) wrote on 2011-10-27:

This bug was fixed in the package dahdi-linux - 1:2.5.0.1+dfsg-1ubuntu1

---------------
dahdi-linux (1:2.5.0.1+dfsg-1ubuntu1) precise; urgency=low

  * Merge from Debian testing (LP: #879743). Remaining changes:
    - debian/dahdi-dkms.install.in : add .version
    - Import modifications by Javier Uruen Val <email address hidden>:
      - debian/system.conf
      - debian/modules
    - DKMS support:
      - debian/control: Added Depends to dahdi-linux (dahdi-dkms | dahdi-source)
      - debian/control: Add dkms package
      - debian/dahdi-dkms.install
      - debian/dahdi-dkms.postinst
      - debian/dahdi-dkms.prerm
      - debian/dahdi-linux.install
      - debian/rules: add code to automatically configure dkms.conf
      - debian/dkms.conf.in
  * Dropped changes:
    - debian/control: Fix typo (right command is m-a a-i dahdi-source)
    - debian/patches/define_spinlock: Fixed upstream
  * debian/rules: Debian moved to dh, re-add code to automatically configure
    dkms.conf
  * debian/dkms.conf.in: update to reflect dahdi-linux-extra patch update
    (opvxa1200's new location (subdir) and to include ap400 and opvxd115)
  * debian/patches/zaphfc_d_channel_fix.patch: Correct typo in zaphfc module
    until fix gets synced into dahdi-linux-extra patch in Debian (LP: #612091)

dahdi-linux (1:2.5.0.1+dfsg-1) unstable; urgency=low

  * New upstream release (Closes: #639702).
    - Patch wcb4xxp_bn4s0e removed: merged upstream.
    - Patch define_spinlock removed: merged upstream.
    - Patch dahdi-linux-extra updated.
  * Updated dahdi-linux-extra:
    - "Upstream" is now a complete git mirror.
    - Actually include ap400 in the list of modules to build.
    - Updated OpenVox drivers: opvxa1200 is a subdirectory
    - Updated OpenVox drivers: opvxd115 added (digital cards).
  * Patch define_spinlock: include a (slightly big) build fix from upstream.
  * Standards version 3.9.2 (no change needed).
  * Switch to dh.
  * Patch notest: Remove a bogus upstream 'test' target.
  * Lintian override for an odd interpteter a dummy kernel module init script.
  * Dahdi udev rules are now named 'dahdi-linux.conf'.
  * Patch xpp_fix_2fxs6fxo: bugfix for Xorcom 2FXX6FXO module code.
-- Adam Gandelman <email address hidden> Fri, 21 Oct 2011 17:32:09 -0700

This bug was fixed in the package dahdi-linux - 1:2.5.0.1+dfsg-1ubuntu1

---------------
dahdi-linux (1:2.5.0.1+dfsg-1ubuntu1) precise; urgency=low

* Merge from Debian testing (LP: #879743). Remaining changes:
    - debian/dahdi-dkms.install.in : add .version
    - Import modifications by Javier Uruen Val <javi@warp.es>:
      - debian/system.conf
      - debian/modules
    - DKMS support:
      - debian/control: Added Depends to dahdi-linux (dahdi-dkms | dahdi-source)
      - debian/control: Add dkms package
      - debian/dahdi-dkms.install
      - debian/dahdi-dkms.postinst
      - debian/dahdi-dkms.prerm
      - debian/dahdi-linux.install
      - debian/rules: add code to automatically configure dkms.conf
      - debian/dkms.conf.in
  * Dropped changes:
    - debian/control: Fix typo (right command is m-a a-i dahdi-source)
    - debian/patches/define_spinlock: Fixed upstream
  * debian/rules: Debian moved to dh, re-add code to automatically configure
    dkms.conf
  * debian/dkms.conf.in: update to reflect dahdi-linux-extra patch update
    (opvxa1200's new  location (subdir) and to include ap400 and opvxd115)
  * debian/patches/zaphfc_d_channel_fix.patch: Correct typo in zaphfc module
    until fix gets synced into dahdi-linux-extra patch in Debian (LP: #612091)

dahdi-linux (1:2.5.0.1+dfsg-1) unstable; urgency=low

* New upstream release (Closes: #639702).
    - Patch wcb4xxp_bn4s0e removed: merged upstream.
    - Patch define_spinlock removed: merged upstream.
    - Patch dahdi-linux-extra updated.
  * Updated dahdi-linux-extra:
    - "Upstream" is now a complete git mirror.
    - Actually include ap400 in the list of modules to build.
    - Updated OpenVox drivers: opvxa1200 is a subdirectory
    - Updated OpenVox drivers: opvxd115 added (digital cards).
  * Patch define_spinlock: include a (slightly big) build fix from upstream.
  * Standards version 3.9.2 (no change needed).
  * Switch to dh.
  * Patch notest: Remove a bogus upstream 'test' target.
  * Lintian override for an odd interpteter a dummy kernel module init script.
  * Dahdi udev rules are now named 'dahdi-linux.conf'.
  * Patch xpp_fix_2fxs6fxo: bugfix for Xorcom 2FXX6FXO module code.
 -- Adam Gandelman <adamg@canonical.com>   Fri, 21 Oct 2011 17:32:09 -0700

Changed in dahdi-linux (Ubuntu):
status:	Confirmed → Fix Released

Revision history for this message

Adam Gandelman (gandelman-a) wrote on 2011-10-28:

Would someone who has been affected by this bug and still has the hardware available please confirm the fix in the newest upload to precise so that we may prepare an SRU for previous Ubuntu releases? Thanks.

Revision history for this message

Antonis Kanouras (akanouras) wrote on 2011-10-28:

#10

Unfortunately I cannot test this anymore as I had to switch that machine to Debian Squeeze, which already contained this fix (among others).

Apparently, although with this fix the card is correctly initialised ("pri show spans" in the Asterisk console shows "PRI span 1/0: Provisioned, Up, Active"), it exhibits severe instability after a while (loses interrupts, etc.) leading me to believe other parts of DAHDI needed patching as well.

By all means though, do prepare an SRU, it may work on hardware configurations other than mine.