Commit ecb1cf9c authored by Stefan Richter's avatar Stefan Richter

firewire: ohci: reorder struct fw_ohci for better cache efficiency

The config_rom struct members are only accessed during relatively
infrequent self-ID-complete interrupts and only if the local config ROM
was changed, while the ar_, at_, ir_, it_ members are used very
frequently during I/O.  Hence move the config_rom members further down.

More importantly, make the huge self_id_buffer member the last one; this
is only accessed in self-ID-complete interrupts.
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 6498ba04
...@@ -166,9 +166,6 @@ struct fw_ohci { ...@@ -166,9 +166,6 @@ struct fw_ohci {
struct fw_card card; struct fw_card card;
__iomem char *registers; __iomem char *registers;
dma_addr_t self_id_bus;
__le32 *self_id_cpu;
struct tasklet_struct bus_reset_tasklet;
int node_id; int node_id;
int generation; int generation;
int request_generation; /* for timestamping incoming requests */ int request_generation; /* for timestamping incoming requests */
...@@ -182,14 +179,6 @@ struct fw_ohci { ...@@ -182,14 +179,6 @@ struct fw_ohci {
* this driver with this lock held. * this driver with this lock held.
*/ */
spinlock_t lock; spinlock_t lock;
u32 self_id_buffer[512];
/* Config rom buffers */
__be32 *config_rom;
dma_addr_t config_rom_bus;
__be32 *next_config_rom;
dma_addr_t next_config_rom_bus;
__be32 next_header;
struct ar_context ar_request_ctx; struct ar_context ar_request_ctx;
struct ar_context ar_response_ctx; struct ar_context ar_response_ctx;
...@@ -201,6 +190,18 @@ struct fw_ohci { ...@@ -201,6 +190,18 @@ struct fw_ohci {
u64 ir_context_channels; u64 ir_context_channels;
u32 ir_context_mask; u32 ir_context_mask;
struct iso_context *ir_context_list; struct iso_context *ir_context_list;
__be32 *config_rom;
dma_addr_t config_rom_bus;
__be32 *next_config_rom;
dma_addr_t next_config_rom_bus;
__be32 next_header;
__le32 *self_id_cpu;
dma_addr_t self_id_bus;
struct tasklet_struct bus_reset_tasklet;
u32 self_id_buffer[512];
}; };
static inline struct fw_ohci *fw_ohci(struct fw_card *card) static inline struct fw_ohci *fw_ohci(struct fw_card *card)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment