rpms/kernel/F-13 kernel.spec, 1.2097, 1.2098 linux-2.6-firewire-git-pending.patch, 1.35, 1.36 linux-2.6-firewire-git-update.patch, 1.20, 1.21

Chuck Ebbert cebbert at fedoraproject.org
Wed Jul 14 21:38:34 UTC 2010


Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13437

Modified Files:
	kernel.spec linux-2.6-firewire-git-pending.patch 
	linux-2.6-firewire-git-update.patch 
Log Message:
Truncate firewire patches too


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.2097
retrieving revision 1.2098
diff -u -p -r1.2097 -r1.2098
--- kernel.spec	14 Jul 2010 21:31:30 -0000	1.2097
+++ kernel.spec	14 Jul 2010 21:38:33 -0000	1.2098
@@ -1339,8 +1339,8 @@ ApplyPatch drm-i915-fix-hibernate-memory
 ApplyPatch linux-2.6-intel-iommu-igfx.patch
 
 # linux1394 git patches
-#ApplyPatch linux-2.6-firewire-git-update.patch
-#ApplyOptionalPatch linux-2.6-firewire-git-pending.patch
+ApplyOptionalPatch linux-2.6-firewire-git-update.patch
+ApplyOptionalPatch linux-2.6-firewire-git-pending.patch
 
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
@@ -2028,9 +2028,9 @@ fi
 
 
 %changelog
-* Wed Jul 14 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.1-13
-- Truncate the obsolete git-bluetooth.patch, use ApplyOptionalPatch
-  for git-bluetooth and git-cpufreq patches.
+* Wed Jul 14 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.1-14
+- Truncate the obsolete git bluetooth and firewire patches, use
+  ApplyOptionalPatch for bluetooth, cpufreq and firewire patches.
 
 * Wed Jul 14 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.1-12
 - pci-pm-do-not-use-native-pcie-pme-by-default.patch:

linux-2.6-firewire-git-pending.patch:
 0 files changed

Index: linux-2.6-firewire-git-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/linux-2.6-firewire-git-pending.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- linux-2.6-firewire-git-pending.patch	30 Jan 2009 19:15:58 -0000	1.35
+++ linux-2.6-firewire-git-pending.patch	14 Jul 2010 21:38:33 -0000	1.36
@@ -1,4 +0,0 @@
-#
-# Patches under review and/or pending inclusion in the linux1394-git
-# tree (and/or in by the time your read this), which we want...
-#

linux-2.6-firewire-git-update.patch:
 0 files changed

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.20 -r 1.21 linux-2.6-firewire-git-update.patchIndex: linux-2.6-firewire-git-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/linux-2.6-firewire-git-update.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- linux-2.6-firewire-git-update.patch	30 Jan 2009 19:15:58 -0000	1.20
+++ linux-2.6-firewire-git-update.patch	14 Jul 2010 21:38:33 -0000	1.21
@@ -1,3682 +0,0 @@
-linux1394-2.6.git tree vs. linus v2.6.29-rc3-git1 on 20090130 by jarod
-
----
- firewire-git/drivers/firewire/fw-card.c        |   68 -
- firewire-git/drivers/firewire/fw-cdev.c        | 1014 +++++++++++++++++--------
- firewire-git/drivers/firewire/fw-device.c      |   43 -
- firewire-git/drivers/firewire/fw-device.h      |    7 
- firewire-git/drivers/firewire/fw-iso.c         |  225 ++++-
- firewire-git/drivers/firewire/fw-ohci.c        |  236 ++---
- firewire-git/drivers/firewire/fw-sbp2.c        |   57 -
- firewire-git/drivers/firewire/fw-topology.c    |   28 
- firewire-git/drivers/firewire/fw-topology.h    |   19 
- firewire-git/drivers/firewire/fw-transaction.c |  151 +--
- firewire-git/drivers/firewire/fw-transaction.h |  125 ---
- include/linux/firewire-cdev.h                  |  170 +++-
- 12 files changed, 1359 insertions(+), 784 deletions(-)
-
-diff -Naurp linux-2.6-git/drivers/firewire/fw-card.c firewire-git/drivers/firewire/fw-card.c
---- linux-2.6-git/drivers/firewire/fw-card.c	2009-01-30 13:39:02.989651512 -0500
-+++ firewire-git/drivers/firewire/fw-card.c	2009-01-30 13:35:51.859771884 -0500
-@@ -63,8 +63,7 @@ static int descriptor_count;
- #define BIB_CMC			((1) << 30)
- #define BIB_IMC			((1) << 31)
- 
--static u32 *
--generate_config_rom(struct fw_card *card, size_t *config_rom_length)
-+static u32 *generate_config_rom(struct fw_card *card, size_t *config_rom_length)
- {
- 	struct fw_descriptor *desc;
- 	static u32 config_rom[256];
-@@ -128,8 +127,7 @@ generate_config_rom(struct fw_card *card
- 	return config_rom;
- }
- 
--static void
--update_config_roms(void)
-+static void update_config_roms(void)
- {
- 	struct fw_card *card;
- 	u32 *config_rom;
-@@ -141,8 +139,7 @@ update_config_roms(void)
- 	}
- }
- 
--int
--fw_core_add_descriptor(struct fw_descriptor *desc)
-+int fw_core_add_descriptor(struct fw_descriptor *desc)
- {
- 	size_t i;
- 
-@@ -171,8 +168,7 @@ fw_core_add_descriptor(struct fw_descrip
- 	return 0;
- }
- 
--void
--fw_core_remove_descriptor(struct fw_descriptor *desc)
-+void fw_core_remove_descriptor(struct fw_descriptor *desc)
- {
- 	mutex_lock(&card_mutex);
- 
-@@ -189,8 +185,7 @@ static const char gap_count_table[] = {
- 	63, 5, 7, 8, 10, 13, 16, 18, 21, 24, 26, 29, 32, 35, 37, 40
- };
- 
--void
--fw_schedule_bm_work(struct fw_card *card, unsigned long delay)
-+void fw_schedule_bm_work(struct fw_card *card, unsigned long delay)
- {
- 	int scheduled;
- 
-@@ -200,8 +195,7 @@ fw_schedule_bm_work(struct fw_card *card
- 		fw_card_put(card);
- }
- 
--static void
--fw_card_bm_work(struct work_struct *work)
-+static void fw_card_bm_work(struct work_struct *work)
- {
- 	struct fw_card *card = container_of(work, struct fw_card, work.work);
- 	struct fw_device *root_device;
-@@ -371,17 +365,16 @@ fw_card_bm_work(struct work_struct *work
- 	fw_card_put(card);
- }
- 
--static void
--flush_timer_callback(unsigned long data)
-+static void flush_timer_callback(unsigned long data)
- {
- 	struct fw_card *card = (struct fw_card *)data;
- 
- 	fw_flush_transactions(card);
- }
- 
--void
--fw_card_initialize(struct fw_card *card, const struct fw_card_driver *driver,
--		   struct device *device)
-+void fw_card_initialize(struct fw_card *card,
-+			const struct fw_card_driver *driver,
-+			struct device *device)
- {
- 	static atomic_t index = ATOMIC_INIT(-1);
- 
-@@ -406,9 +399,8 @@ fw_card_initialize(struct fw_card *card,
- }
- EXPORT_SYMBOL(fw_card_initialize);
- 
--int
--fw_card_add(struct fw_card *card,
--	    u32 max_receive, u32 link_speed, u64 guid)
-+int fw_card_add(struct fw_card *card,
-+		u32 max_receive, u32 link_speed, u64 guid)
- {
- 	u32 *config_rom;
- 	size_t length;
-@@ -435,23 +427,20 @@ EXPORT_SYMBOL(fw_card_add);
-  * dummy driver just fails all IO.
-  */
- 
--static int
--dummy_enable(struct fw_card *card, u32 *config_rom, size_t length)
-+static int dummy_enable(struct fw_card *card, u32 *config_rom, size_t length)
- {
- 	BUG();
- 	return -1;
- }
- 
--static int
--dummy_update_phy_reg(struct fw_card *card, int address,
--		     int clear_bits, int set_bits)
-+static int dummy_update_phy_reg(struct fw_card *card, int address,
-+				int clear_bits, int set_bits)
- {
- 	return -ENODEV;
- }
- 
--static int
--dummy_set_config_rom(struct fw_card *card,
--		     u32 *config_rom, size_t length)
-+static int dummy_set_config_rom(struct fw_card *card,
-+				u32 *config_rom, size_t length)
- {
- 	/*
- 	 * We take the card out of card_list before setting the dummy
-@@ -461,27 +450,23 @@ dummy_set_config_rom(struct fw_card *car
- 	return -1;
- }
- 
--static void
--dummy_send_request(struct fw_card *card, struct fw_packet *packet)
-+static void dummy_send_request(struct fw_card *card, struct fw_packet *packet)
- {
- 	packet->callback(packet, card, -ENODEV);
- }
- 
--static void
--dummy_send_response(struct fw_card *card, struct fw_packet *packet)
-+static void dummy_send_response(struct fw_card *card, struct fw_packet *packet)
- {
- 	packet->callback(packet, card, -ENODEV);
- }
- 
--static int
--dummy_cancel_packet(struct fw_card *card, struct fw_packet *packet)
-+static int dummy_cancel_packet(struct fw_card *card, struct fw_packet *packet)
- {
- 	return -ENOENT;
- }
- 
--static int
--dummy_enable_phys_dma(struct fw_card *card,
--		      int node_id, int generation)
-+static int dummy_enable_phys_dma(struct fw_card *card,
-+				 int node_id, int generation)
- {
- 	return -ENODEV;
- }
-@@ -496,16 +481,14 @@ static struct fw_card_driver dummy_drive
- 	.enable_phys_dma = dummy_enable_phys_dma,
- };
- 
--void
--fw_card_release(struct kref *kref)
-+void fw_card_release(struct kref *kref)
- {
- 	struct fw_card *card = container_of(kref, struct fw_card, kref);
- 
- 	complete(&card->done);
- }
- 
--void
--fw_core_remove_card(struct fw_card *card)
[...3291 lines suppressed...]
-+ *
-+ * An %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event is sent after an isochronous
-+ * resource was deallocated at the IRM.  It is also sent when automatic
-+ * reallocation after a bus reset failed.
-+ *
-+ * @channel is <0 if no channel was (de)allocated or if reallocation failed.
-+ * @bandwidth is 0 if no bandwidth was (de)allocated or if reallocation failed.
-+ */
-+struct fw_cdev_event_iso_resource {
-+	__u64 closure;
-+	__u32 type;
-+	__u32 handle;
-+	__s32 channel;
-+	__s32 bandwidth;
-+};
-+
-+/**
-  * union fw_cdev_event - Convenience union of fw_cdev_event_ types
-  * @common:        Valid for all types
-  * @bus_reset:     Valid if @common.type == %FW_CDEV_EVENT_BUS_RESET
-  * @response:      Valid if @common.type == %FW_CDEV_EVENT_RESPONSE
-  * @request:       Valid if @common.type == %FW_CDEV_EVENT_REQUEST
-  * @iso_interrupt: Valid if @common.type == %FW_CDEV_EVENT_ISO_INTERRUPT
-+ * @iso_resource:  Valid if @common.type ==
-+ *				%FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED or
-+ *				%FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED
-  *
-  * Convenience union for userspace use.  Events could be read(2) into an
-  * appropriately aligned char buffer and then cast to this union for further
-@@ -163,13 +214,15 @@ struct fw_cdev_event_iso_interrupt {
-  * not fit will be discarded so that the next read(2) will return a new event.
-  */
- union fw_cdev_event {
--	struct fw_cdev_event_common common;
--	struct fw_cdev_event_bus_reset bus_reset;
--	struct fw_cdev_event_response response;
--	struct fw_cdev_event_request request;
--	struct fw_cdev_event_iso_interrupt iso_interrupt;
-+	struct fw_cdev_event_common		common;
-+	struct fw_cdev_event_bus_reset		bus_reset;
-+	struct fw_cdev_event_response		response;
-+	struct fw_cdev_event_request		request;
-+	struct fw_cdev_event_iso_interrupt	iso_interrupt;
-+	struct fw_cdev_event_iso_resource	iso_resource;
- };
- 
-+/* available since kernel version 2.6.22 */
- #define FW_CDEV_IOC_GET_INFO		_IOWR('#', 0x00, struct fw_cdev_get_info)
- #define FW_CDEV_IOC_SEND_REQUEST	_IOW('#', 0x01, struct fw_cdev_send_request)
- #define FW_CDEV_IOC_ALLOCATE		_IOWR('#', 0x02, struct fw_cdev_allocate)
-@@ -178,18 +231,29 @@ union fw_cdev_event {
- #define FW_CDEV_IOC_INITIATE_BUS_RESET	_IOW('#', 0x05, struct fw_cdev_initiate_bus_reset)
- #define FW_CDEV_IOC_ADD_DESCRIPTOR	_IOWR('#', 0x06, struct fw_cdev_add_descriptor)
- #define FW_CDEV_IOC_REMOVE_DESCRIPTOR	_IOW('#', 0x07, struct fw_cdev_remove_descriptor)
--
- #define FW_CDEV_IOC_CREATE_ISO_CONTEXT	_IOWR('#', 0x08, struct fw_cdev_create_iso_context)
- #define FW_CDEV_IOC_QUEUE_ISO		_IOWR('#', 0x09, struct fw_cdev_queue_iso)
- #define FW_CDEV_IOC_START_ISO		_IOW('#', 0x0a, struct fw_cdev_start_iso)
- #define FW_CDEV_IOC_STOP_ISO		_IOW('#', 0x0b, struct fw_cdev_stop_iso)
-+
-+/* available since kernel version 2.6.24 */
- #define FW_CDEV_IOC_GET_CYCLE_TIMER	_IOR('#', 0x0c, struct fw_cdev_get_cycle_timer)
- 
--/* FW_CDEV_VERSION History
-- *
-- * 1	Feb 18, 2007:  Initial version.
-+/* available since kernel version 2.6.30 */
-+#define FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE       _IOWR('#', 0x0d, struct fw_cdev_allocate_iso_resource)
-+#define FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE      _IOW('#', 0x0e, struct fw_cdev_deallocate)
-+#define FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE   _IOW('#', 0x0f, struct fw_cdev_allocate_iso_resource)
-+#define FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE_ONCE _IOW('#', 0x10, struct fw_cdev_allocate_iso_resource)
-+#define FW_CDEV_IOC_GET_SPEED                    _IOR('#', 0x11, struct fw_cdev_get_speed)
-+#define FW_CDEV_IOC_SEND_BROADCAST_REQUEST       _IOW('#', 0x12, struct fw_cdev_send_request)
-+
-+/*
-+ * FW_CDEV_VERSION History
-+ *  1  (2.6.22)  - initial version
-+ *  2  (2.6.30)  - changed &fw_cdev_event_iso_interrupt.header if
-+ *                 &fw_cdev_create_iso_context.header_size is 8 or more
-  */
--#define FW_CDEV_VERSION		1
-+#define FW_CDEV_VERSION 2
- 
- /**
-  * struct fw_cdev_get_info - General purpose information ioctl
-@@ -201,7 +265,7 @@ union fw_cdev_event {
-  *		case, @rom_length is updated with the actual length of the
-  *		configuration ROM.
-  * @rom:	If non-zero, address of a buffer to be filled by a copy of the
-- *		local node's configuration ROM
-+ *		device's configuration ROM
-  * @bus_reset:	If non-zero, address of a buffer to be filled by a
-  *		&struct fw_cdev_event_bus_reset with the current state
-  *		of the bus.  This does not cause a bus reset to happen.
-@@ -229,7 +293,7 @@ struct fw_cdev_get_info {
-  * Send a request to the device.  This ioctl implements all outgoing requests.
-  * Both quadlet and block request specify the payload as a pointer to the data
-  * in the @data field.  Once the transaction completes, the kernel writes an
-- * &fw_cdev_event_request event back.  The @closure field is passed back to
-+ * &fw_cdev_event_response event back.  The @closure field is passed back to
-  * user space in the response event.
-  */
- struct fw_cdev_send_request {
-@@ -284,9 +348,9 @@ struct fw_cdev_allocate {
- };
- 
- /**
-- * struct fw_cdev_deallocate - Free an address range allocation
-- * @handle:	Handle to the address range, as returned by the kernel when the
-- *		range was allocated
-+ * struct fw_cdev_deallocate - Free a CSR address range or isochronous resource
-+ * @handle:	Handle to the address range or iso resource, as returned by the
-+ *		kernel when the range or resource was allocated
-  */
- struct fw_cdev_deallocate {
- 	__u32 handle;
-@@ -370,6 +434,9 @@ struct fw_cdev_remove_descriptor {
-  *
-  * If a context was successfully created, the kernel writes back a handle to the
-  * context, which must be passed in for subsequent operations on that context.
-+ *
-+ * Note that the effect of a @header_size > 4 depends on
-+ * &fw_cdev_get_info.version, as documented at &fw_cdev_event_iso_interrupt.
-  */
- struct fw_cdev_create_iso_context {
- 	__u32 type;
-@@ -473,10 +540,73 @@ struct fw_cdev_stop_iso {
-  * The %FW_CDEV_IOC_GET_CYCLE_TIMER ioctl reads the isochronous cycle timer
-  * and also the system clock.  This allows to express the receive time of an
-  * isochronous packet as a system time with microsecond accuracy.
-+ *
-+ * @cycle_timer consists of 7 bits cycleSeconds, 13 bits cycleCount, and
-+ * 12 bits cycleOffset, in host byte order.
-  */
- struct fw_cdev_get_cycle_timer {
- 	__u64 local_time;
- 	__u32 cycle_timer;
- };
- 
-+/**
-+ * struct fw_cdev_allocate_iso_resource - (De)allocate a channel or bandwidth
-+ * @closure:	Passed back to userspace in correponding iso resource events
-+ * @channels:	Isochronous channels of which one is to be (de)allocated
-+ * @bandwidth:	Isochronous bandwidth units to be (de)allocated
-+ * @handle:	Handle to the allocation, written by the kernel (only valid in
-+ *		case of %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE ioctls)
-+ *
-+ * The %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE ioctl initiates allocation of an
-+ * isochronous channel and/or of isochronous bandwidth at the isochronous
-+ * resource manager (IRM).  Only one of the channels specified in @channels is
-+ * allocated.  An %FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED is sent after
-+ * communication with the IRM, indicating success or failure in the event data.
-+ * The kernel will automatically reallocate the resources after bus resets.
-+ * Should a reallocation fail, an %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event
-+ * will be sent.  The kernel will also automatically deallocate the resources
-+ * when the file descriptor is closed.
-+ *
-+ * The %FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE ioctl can be used to initiate
-+ * deallocation of resources which were allocated as described above.
-+ * An %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event concludes this operation.
-+ *
-+ * The %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE ioctl is a variant of allocation
-+ * without automatic re- or deallocation.
-+ * An %FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED event concludes this operation,
-+ * indicating success or failure in its data.
-+ *
-+ * The %FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE_ONCE ioctl works like
-+ * %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE except that resources are freed
-+ * instead of allocated.
-+ * An %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event concludes this operation.
-+ *
-+ * To summarize, %FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE allocates iso resources
-+ * for the lifetime of the fd or handle.
-+ * In contrast, %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE allocates iso resources
-+ * for the duration of a bus generation.
-+ *
-+ * @channels is a host-endian bitfield with the least significant bit
-+ * representing channel 0 and the most significant bit representing channel 63:
-+ * 1ULL << c for each channel c that is a candidate for (de)allocation.
-+ *
-+ * @bandwidth is expressed in bandwidth allocation units, i.e. the time to send
-+ * one quadlet of data (payload or header data) at speed S1600.
-+ */
-+struct fw_cdev_allocate_iso_resource {
-+	__u64 closure;
-+	__u64 channels;
-+	__u32 bandwidth;
-+	__u32 handle;
-+};
-+
-+/**
-+ * struct fw_cdev_get_speed - Query maximum speed to or from this device
-+ * @max_speed:	Speed code; minimum of the device's link speed, the local node's
-+ *		link speed, and all PHY port speeds between the two links
-+ */
-+struct fw_cdev_get_speed {
-+	__u32 max_speed;
-+};
-+
- #endif /* _LINUX_FIREWIRE_CDEV_H */



More information about the scm-commits mailing list