Commit 34641a58 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bcollins/linux1394-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/bcollins/linux1394-2.6: (28 commits)
  eth1394: replace __constant_htons by htons
  ieee1394: adjust code formatting in highlevel.c
  ieee1394: hl_irqs_lock is taken in hardware interrupt context
  ieee1394_core: switch to kthread API
  ieee1394: sbp2: Kconfig fix
  ieee1394: add preprocessor constant for invalid csr address
  sbp2: fix deregistration of status fifo address space
  [PATCH] eth1394: endian fixes
  Fix broken suspend/resume in ohci1394
  sbp2: use __attribute__((packed)) for on-the-wire structures
  sbp2: provide helptext for CONFIG_IEEE1394_SBP2_PHYS_DMA and mark it experimental
  Update feature removal of obsolete raw1394 ISO requests.
  sbp2: fix S800 transfers if phys_dma is off
  sbp2: remove ohci1394 specific constant
  ohci1394: make phys_dma parameter read-only
  ohci1394: set address range properties
  ieee1394: extend lowlevel API for address range properties
  sbp2: log number of supported concurrent logins
  sbp2: remove manipulation of inquiry response
  ieee1394: save RAM by using a single tlabel for broadcast transactions
  ...
parents 2eec0e08 7136b807

Documentation/feature-removal-schedule.txt

+2 −2
Original line number Diff line number Diff line
@@ -49,11 +49,11 @@ Who: Paul E. McKenney <paulmck@us.ibm.com> 
---------------------------



What:	raw1394: requests of type RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN

When:	November 2005

When:	November 2006

Why:	Deprecated in favour of the new ioctl-based rawiso interface, which is

	more efficient.  You should really be using libraw1394 for raw1394

	access anyway.

Who:	Jody McIntyre <scjody@steamballoon.com>

Who:	Jody McIntyre <scjody@modernduck.com>



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

drivers/ieee1394/Kconfig

+11 −2
Original line number Diff line number Diff line
@@ -128,8 +128,17 @@ config IEEE1394_SBP2 
	  1394 bus.  SBP-2 devices include harddrives and DVD devices.



config IEEE1394_SBP2_PHYS_DMA

	bool "Enable Phys DMA support for SBP2 (Debug)"

	depends on IEEE1394 && IEEE1394_SBP2

	bool "Enable replacement for physical DMA in SBP2"

	depends on IEEE1394 && IEEE1394_SBP2 && EXPERIMENTAL && (X86_32 || PPC_32)

	help

	  This builds sbp2 for use with non-OHCI host adapters which do not

	  support physical DMA or for when ohci1394 is run with phys_dma=0.

	  Physical DMA is data movement without assistence of the drivers'

	  interrupt handlers.  This option includes the interrupt handlers

	  that are required in absence of this hardware feature.



	  This option is buggy and currently broken on some architectures.

	  If unsure, say N.



config IEEE1394_ETH1394

	tristate "Ethernet over 1394"

drivers/ieee1394/csr1212.c

+1 −1
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ static int csr1212_append_new_cache(struct csr1212_csr *csr, size_t romsize) 
	romsize = (romsize + (csr->max_rom - 1)) & ~(csr->max_rom - 1);



	csr_addr = csr->ops->allocate_addr_range(romsize, csr->max_rom, csr->private);

	if (csr_addr == ~0ULL) {

	if (csr_addr == CSR1212_INVALID_ADDR_SPACE) {

		return CSR1212_ENOMEM;

	}

	if (csr_addr < CSR1212_REGISTER_SPACE_BASE) {

drivers/ieee1394/csr1212.h

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ 


#define  CSR1212_EXTENDED_ROM_SIZE		(0x10000 * sizeof(u_int32_t))



#define  CSR1212_INVALID_ADDR_SPACE		-1



/* Config ROM image structures */

struct csr1212_bus_info_block_img {

drivers/ieee1394/dma.c

+9 −9
Original line number Diff line number Diff line
@@ -145,12 +145,12 @@ void dma_region_free(struct dma_region *dma) 
/* find the scatterlist index and remaining offset corresponding to a

   given offset from the beginning of the buffer */

static inline int dma_region_find(struct dma_region *dma, unsigned long offset,

				  unsigned long *rem)

				  unsigned int start, unsigned long *rem)

{

	int i;

	unsigned long off = offset;



	for (i = 0; i < dma->n_dma_pages; i++) {

	for (i = start; i < dma->n_dma_pages; i++) {

		if (off < sg_dma_len(&dma->sglist[i])) {

			*rem = off;

			break;
@@ -170,7 +170,7 @@ dma_addr_t dma_region_offset_to_bus(struct dma_region * dma, 
	unsigned long rem = 0;



	struct scatterlist *sg =

	    &dma->sglist[dma_region_find(dma, offset, &rem)];

	    &dma->sglist[dma_region_find(dma, offset, 0, &rem)];

	return sg_dma_address(sg) + rem;

}
@@ -178,13 +178,13 @@ void dma_region_sync_for_cpu(struct dma_region *dma, unsigned long offset, 
			     unsigned long len)

{

	int first, last;

	unsigned long rem;

	unsigned long rem = 0;



	if (!len)

		len = 1;



	first = dma_region_find(dma, offset, &rem);

	last = dma_region_find(dma, offset + len - 1, &rem);

	first = dma_region_find(dma, offset, 0, &rem);

	last = dma_region_find(dma, rem + len - 1, first, &rem);



	pci_dma_sync_sg_for_cpu(dma->dev, &dma->sglist[first], last - first + 1,

				dma->direction);
@@ -194,13 +194,13 @@ void dma_region_sync_for_device(struct dma_region *dma, unsigned long offset, 
				unsigned long len)

{

	int first, last;

	unsigned long rem;

	unsigned long rem = 0;



	if (!len)

		len = 1;



	first = dma_region_find(dma, offset, &rem);

	last = dma_region_find(dma, offset + len - 1, &rem);

	first = dma_region_find(dma, offset, 0, &rem);

	last = dma_region_find(dma, rem + len - 1, first, &rem);



	pci_dma_sync_sg_for_device(dma->dev, &dma->sglist[first],

				   last - first + 1, dma->direction);

CRA Git | Maintained and supported by SUSTech CRA and CCSE