Merge branch 'linus' into perf/urgent
Merge reason: Fix upstream breakage introduced by:
de5d9bf: Move list types from <linux/list.h> to <linux/types.h>.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
19
tools/firewire/Makefile
Normal file
19
tools/firewire/Makefile
Normal file
@@ -0,0 +1,19 @@
|
||||
prefix = /usr
|
||||
nosy-dump-version = 0.4
|
||||
|
||||
CC = gcc
|
||||
|
||||
all : nosy-dump
|
||||
|
||||
nosy-dump : CFLAGS = -Wall -O2 -g
|
||||
nosy-dump : CPPFLAGS = -DVERSION=\"$(nosy-dump-version)\" -I../../drivers/firewire
|
||||
nosy-dump : LDFLAGS = -g
|
||||
nosy-dump : LDLIBS = -lpopt
|
||||
|
||||
nosy-dump : nosy-dump.o decode-fcp.o
|
||||
|
||||
clean :
|
||||
rm -rf *.o nosy-dump
|
||||
|
||||
install :
|
||||
install nosy-dump $(prefix)/bin/nosy-dump
|
||||
213
tools/firewire/decode-fcp.c
Normal file
213
tools/firewire/decode-fcp.c
Normal file
@@ -0,0 +1,213 @@
|
||||
#include <linux/firewire-constants.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "list.h"
|
||||
#include "nosy-dump.h"
|
||||
|
||||
#define CSR_FCP_COMMAND 0xfffff0000b00ull
|
||||
#define CSR_FCP_RESPONSE 0xfffff0000d00ull
|
||||
|
||||
static const char * const ctype_names[] = {
|
||||
[0x0] = "control", [0x8] = "not implemented",
|
||||
[0x1] = "status", [0x9] = "accepted",
|
||||
[0x2] = "specific inquiry", [0xa] = "rejected",
|
||||
[0x3] = "notify", [0xb] = "in transition",
|
||||
[0x4] = "general inquiry", [0xc] = "stable",
|
||||
[0x5] = "(reserved 0x05)", [0xd] = "changed",
|
||||
[0x6] = "(reserved 0x06)", [0xe] = "(reserved 0x0e)",
|
||||
[0x7] = "(reserved 0x07)", [0xf] = "interim",
|
||||
};
|
||||
|
||||
static const char * const subunit_type_names[] = {
|
||||
[0x00] = "monitor", [0x10] = "(reserved 0x10)",
|
||||
[0x01] = "audio", [0x11] = "(reserved 0x11)",
|
||||
[0x02] = "printer", [0x12] = "(reserved 0x12)",
|
||||
[0x03] = "disc", [0x13] = "(reserved 0x13)",
|
||||
[0x04] = "tape recorder/player",[0x14] = "(reserved 0x14)",
|
||||
[0x05] = "tuner", [0x15] = "(reserved 0x15)",
|
||||
[0x06] = "ca", [0x16] = "(reserved 0x16)",
|
||||
[0x07] = "camera", [0x17] = "(reserved 0x17)",
|
||||
[0x08] = "(reserved 0x08)", [0x18] = "(reserved 0x18)",
|
||||
[0x09] = "panel", [0x19] = "(reserved 0x19)",
|
||||
[0x0a] = "bulletin board", [0x1a] = "(reserved 0x1a)",
|
||||
[0x0b] = "camera storage", [0x1b] = "(reserved 0x1b)",
|
||||
[0x0c] = "(reserved 0x0c)", [0x1c] = "vendor unique",
|
||||
[0x0d] = "(reserved 0x0d)", [0x1d] = "all subunit types",
|
||||
[0x0e] = "(reserved 0x0e)", [0x1e] = "subunit_type extended to next byte",
|
||||
[0x0f] = "(reserved 0x0f)", [0x1f] = "unit",
|
||||
};
|
||||
|
||||
struct avc_enum {
|
||||
int value;
|
||||
const char *name;
|
||||
};
|
||||
|
||||
struct avc_field {
|
||||
const char *name; /* Short name for field. */
|
||||
int offset; /* Location of field, specified in bits; */
|
||||
/* negative means from end of packet. */
|
||||
int width; /* Width of field, 0 means use data_length. */
|
||||
struct avc_enum *names;
|
||||
};
|
||||
|
||||
struct avc_opcode_info {
|
||||
const char *name;
|
||||
struct avc_field fields[8];
|
||||
};
|
||||
|
||||
struct avc_enum power_field_names[] = {
|
||||
{ 0x70, "on" },
|
||||
{ 0x60, "off" },
|
||||
{ }
|
||||
};
|
||||
|
||||
static const struct avc_opcode_info opcode_info[256] = {
|
||||
|
||||
/* TA Document 1999026 */
|
||||
/* AV/C Digital Interface Command Set General Specification 4.0 */
|
||||
[0xb2] = { "power", {
|
||||
{ "state", 0, 8, power_field_names }
|
||||
}
|
||||
},
|
||||
[0x30] = { "unit info", {
|
||||
{ "foo", 0, 8 },
|
||||
{ "unit_type", 8, 5 },
|
||||
{ "unit", 13, 3 },
|
||||
{ "company id", 16, 24 },
|
||||
}
|
||||
},
|
||||
[0x31] = { "subunit info" },
|
||||
[0x01] = { "reserve" },
|
||||
[0xb0] = { "version" },
|
||||
[0x00] = { "vendor dependent" },
|
||||
[0x02] = { "plug info" },
|
||||
[0x12] = { "channel usage" },
|
||||
[0x24] = { "connect" },
|
||||
[0x20] = { "connect av" },
|
||||
[0x22] = { "connections" },
|
||||
[0x11] = { "digital input" },
|
||||
[0x10] = { "digital output" },
|
||||
[0x25] = { "disconnect" },
|
||||
[0x21] = { "disconnect av" },
|
||||
[0x19] = { "input plug signal format" },
|
||||
[0x18] = { "output plug signal format" },
|
||||
[0x1f] = { "general bus setup" },
|
||||
|
||||
/* TA Document 1999025 */
|
||||
/* AV/C Descriptor Mechanism Specification Version 1.0 */
|
||||
[0x0c] = { "create descriptor" },
|
||||
[0x08] = { "open descriptor" },
|
||||
[0x09] = { "read descriptor" },
|
||||
[0x0a] = { "write descriptor" },
|
||||
[0x05] = { "open info block" },
|
||||
[0x06] = { "read info block" },
|
||||
[0x07] = { "write info block" },
|
||||
[0x0b] = { "search descriptor" },
|
||||
[0x0d] = { "object number select" },
|
||||
|
||||
/* TA Document 1999015 */
|
||||
/* AV/C Command Set for Rate Control of Isochronous Data Flow 1.0 */
|
||||
[0xb3] = { "rate", {
|
||||
{ "subfunction", 0, 8 },
|
||||
{ "result", 8, 8 },
|
||||
{ "plug_type", 16, 8 },
|
||||
{ "plug_id", 16, 8 },
|
||||
}
|
||||
},
|
||||
|
||||
/* TA Document 1999008 */
|
||||
/* AV/C Audio Subunit Specification 1.0 */
|
||||
[0xb8] = { "function block" },
|
||||
|
||||
/* TA Document 2001001 */
|
||||
/* AV/C Panel Subunit Specification 1.1 */
|
||||
[0x7d] = { "gui update" },
|
||||
[0x7e] = { "push gui data" },
|
||||
[0x7f] = { "user action" },
|
||||
[0x7c] = { "pass through" },
|
||||
|
||||
/* */
|
||||
[0x26] = { "asynchronous connection" },
|
||||
};
|
||||
|
||||
struct avc_frame {
|
||||
uint32_t operand0:8;
|
||||
uint32_t opcode:8;
|
||||
uint32_t subunit_id:3;
|
||||
uint32_t subunit_type:5;
|
||||
uint32_t ctype:4;
|
||||
uint32_t cts:4;
|
||||
};
|
||||
|
||||
static void
|
||||
decode_avc(struct link_transaction *t)
|
||||
{
|
||||
struct avc_frame *frame =
|
||||
(struct avc_frame *) t->request->packet.write_block.data;
|
||||
const struct avc_opcode_info *info;
|
||||
const char *name;
|
||||
char buffer[32];
|
||||
int i;
|
||||
|
||||
info = &opcode_info[frame->opcode];
|
||||
if (info->name == NULL) {
|
||||
snprintf(buffer, sizeof(buffer),
|
||||
"(unknown opcode 0x%02x)", frame->opcode);
|
||||
name = buffer;
|
||||
} else {
|
||||
name = info->name;
|
||||
}
|
||||
|
||||
printf("av/c %s, subunit_type=%s, subunit_id=%d, opcode=%s",
|
||||
ctype_names[frame->ctype], subunit_type_names[frame->subunit_type],
|
||||
frame->subunit_id, name);
|
||||
|
||||
for (i = 0; info->fields[i].name != NULL; i++)
|
||||
printf(", %s", info->fields[i].name);
|
||||
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
int
|
||||
decode_fcp(struct link_transaction *t)
|
||||
{
|
||||
struct avc_frame *frame =
|
||||
(struct avc_frame *) t->request->packet.write_block.data;
|
||||
unsigned long long offset =
|
||||
((unsigned long long) t->request->packet.common.offset_high << 32) |
|
||||
t->request->packet.common.offset_low;
|
||||
|
||||
if (t->request->packet.common.tcode != TCODE_WRITE_BLOCK_REQUEST)
|
||||
return 0;
|
||||
|
||||
if (offset == CSR_FCP_COMMAND || offset == CSR_FCP_RESPONSE) {
|
||||
switch (frame->cts) {
|
||||
case 0x00:
|
||||
decode_avc(t);
|
||||
break;
|
||||
case 0x01:
|
||||
printf("cal fcp frame (cts=0x01)\n");
|
||||
break;
|
||||
case 0x02:
|
||||
printf("ehs fcp frame (cts=0x02)\n");
|
||||
break;
|
||||
case 0x03:
|
||||
printf("havi fcp frame (cts=0x03)\n");
|
||||
break;
|
||||
case 0x0e:
|
||||
printf("vendor specific fcp frame (cts=0x0e)\n");
|
||||
break;
|
||||
case 0x0f:
|
||||
printf("extended cts\n");
|
||||
break;
|
||||
default:
|
||||
printf("reserved fcp frame (ctx=0x%02x)\n", frame->cts);
|
||||
break;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
62
tools/firewire/list.h
Normal file
62
tools/firewire/list.h
Normal file
@@ -0,0 +1,62 @@
|
||||
struct list {
|
||||
struct list *next, *prev;
|
||||
};
|
||||
|
||||
static inline void
|
||||
list_init(struct list *list)
|
||||
{
|
||||
list->next = list;
|
||||
list->prev = list;
|
||||
}
|
||||
|
||||
static inline int
|
||||
list_empty(struct list *list)
|
||||
{
|
||||
return list->next == list;
|
||||
}
|
||||
|
||||
static inline void
|
||||
list_insert(struct list *link, struct list *new_link)
|
||||
{
|
||||
new_link->prev = link->prev;
|
||||
new_link->next = link;
|
||||
new_link->prev->next = new_link;
|
||||
new_link->next->prev = new_link;
|
||||
}
|
||||
|
||||
static inline void
|
||||
list_append(struct list *list, struct list *new_link)
|
||||
{
|
||||
list_insert((struct list *)list, new_link);
|
||||
}
|
||||
|
||||
static inline void
|
||||
list_prepend(struct list *list, struct list *new_link)
|
||||
{
|
||||
list_insert(list->next, new_link);
|
||||
}
|
||||
|
||||
static inline void
|
||||
list_remove(struct list *link)
|
||||
{
|
||||
link->prev->next = link->next;
|
||||
link->next->prev = link->prev;
|
||||
}
|
||||
|
||||
#define list_entry(link, type, member) \
|
||||
((type *)((char *)(link)-(unsigned long)(&((type *)0)->member)))
|
||||
|
||||
#define list_head(list, type, member) \
|
||||
list_entry((list)->next, type, member)
|
||||
|
||||
#define list_tail(list, type, member) \
|
||||
list_entry((list)->prev, type, member)
|
||||
|
||||
#define list_next(elm, member) \
|
||||
list_entry((elm)->member.next, typeof(*elm), member)
|
||||
|
||||
#define list_for_each_entry(pos, list, member) \
|
||||
for (pos = list_head(list, typeof(*pos), member); \
|
||||
&pos->member != (list); \
|
||||
pos = list_next(pos, member))
|
||||
|
||||
1031
tools/firewire/nosy-dump.c
Normal file
1031
tools/firewire/nosy-dump.c
Normal file
File diff suppressed because it is too large
Load Diff
173
tools/firewire/nosy-dump.h
Normal file
173
tools/firewire/nosy-dump.h
Normal file
@@ -0,0 +1,173 @@
|
||||
#ifndef __nosy_dump_h__
|
||||
#define __nosy_dump_h__
|
||||
|
||||
#define array_length(array) (sizeof(array) / sizeof(array[0]))
|
||||
|
||||
#define ACK_NO_ACK 0x0
|
||||
#define ACK_DONE(a) ((a >> 2) == 0)
|
||||
#define ACK_BUSY(a) ((a >> 2) == 1)
|
||||
#define ACK_ERROR(a) ((a >> 2) == 3)
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
struct phy_packet {
|
||||
uint32_t timestamp;
|
||||
union {
|
||||
struct {
|
||||
uint32_t zero:24;
|
||||
uint32_t phy_id:6;
|
||||
uint32_t identifier:2;
|
||||
} common, link_on;
|
||||
|
||||
struct {
|
||||
uint32_t zero:16;
|
||||
uint32_t gap_count:6;
|
||||
uint32_t set_gap_count:1;
|
||||
uint32_t set_root:1;
|
||||
uint32_t root_id:6;
|
||||
uint32_t identifier:2;
|
||||
} phy_config;
|
||||
|
||||
struct {
|
||||
uint32_t more_packets:1;
|
||||
uint32_t initiated_reset:1;
|
||||
uint32_t port2:2;
|
||||
uint32_t port1:2;
|
||||
uint32_t port0:2;
|
||||
uint32_t power_class:3;
|
||||
uint32_t contender:1;
|
||||
uint32_t phy_delay:2;
|
||||
uint32_t phy_speed:2;
|
||||
uint32_t gap_count:6;
|
||||
uint32_t link_active:1;
|
||||
uint32_t extended:1;
|
||||
uint32_t phy_id:6;
|
||||
uint32_t identifier:2;
|
||||
} self_id;
|
||||
|
||||
struct {
|
||||
uint32_t more_packets:1;
|
||||
uint32_t reserved1:1;
|
||||
uint32_t porth:2;
|
||||
uint32_t portg:2;
|
||||
uint32_t portf:2;
|
||||
uint32_t porte:2;
|
||||
uint32_t portd:2;
|
||||
uint32_t portc:2;
|
||||
uint32_t portb:2;
|
||||
uint32_t porta:2;
|
||||
uint32_t reserved0:2;
|
||||
uint32_t sequence:3;
|
||||
uint32_t extended:1;
|
||||
uint32_t phy_id:6;
|
||||
uint32_t identifier:2;
|
||||
} ext_self_id;
|
||||
};
|
||||
uint32_t inverted;
|
||||
uint32_t ack;
|
||||
};
|
||||
|
||||
#define TCODE_PHY_PACKET 0x10
|
||||
|
||||
#define PHY_PACKET_CONFIGURATION 0x00
|
||||
#define PHY_PACKET_LINK_ON 0x01
|
||||
#define PHY_PACKET_SELF_ID 0x02
|
||||
|
||||
struct link_packet {
|
||||
uint32_t timestamp;
|
||||
union {
|
||||
struct {
|
||||
uint32_t priority:4;
|
||||
uint32_t tcode:4;
|
||||
uint32_t rt:2;
|
||||
uint32_t tlabel:6;
|
||||
uint32_t destination:16;
|
||||
|
||||
uint32_t offset_high:16;
|
||||
uint32_t source:16;
|
||||
|
||||
uint32_t offset_low;
|
||||
} common;
|
||||
|
||||
struct {
|
||||
uint32_t common[3];
|
||||
uint32_t crc;
|
||||
} read_quadlet;
|
||||
|
||||
struct {
|
||||
uint32_t common[3];
|
||||
uint32_t data;
|
||||
uint32_t crc;
|
||||
} read_quadlet_response;
|
||||
|
||||
struct {
|
||||
uint32_t common[3];
|
||||
uint32_t extended_tcode:16;
|
||||
uint32_t data_length:16;
|
||||
uint32_t crc;
|
||||
} read_block;
|
||||
|
||||
struct {
|
||||
uint32_t common[3];
|
||||
uint32_t extended_tcode:16;
|
||||
uint32_t data_length:16;
|
||||
uint32_t crc;
|
||||
uint32_t data[0];
|
||||
/* crc and ack follows. */
|
||||
} read_block_response;
|
||||
|
||||
struct {
|
||||
uint32_t common[3];
|
||||
uint32_t data;
|
||||
uint32_t crc;
|
||||
} write_quadlet;
|
||||
|
||||
struct {
|
||||
uint32_t common[3];
|
||||
uint32_t extended_tcode:16;
|
||||
uint32_t data_length:16;
|
||||
uint32_t crc;
|
||||
uint32_t data[0];
|
||||
/* crc and ack follows. */
|
||||
} write_block;
|
||||
|
||||
struct {
|
||||
uint32_t common[3];
|
||||
uint32_t crc;
|
||||
} write_response;
|
||||
|
||||
struct {
|
||||
uint32_t common[3];
|
||||
uint32_t data;
|
||||
uint32_t crc;
|
||||
} cycle_start;
|
||||
|
||||
struct {
|
||||
uint32_t sy:4;
|
||||
uint32_t tcode:4;
|
||||
uint32_t channel:6;
|
||||
uint32_t tag:2;
|
||||
uint32_t data_length:16;
|
||||
|
||||
uint32_t crc;
|
||||
} iso_data;
|
||||
};
|
||||
};
|
||||
|
||||
struct subaction {
|
||||
uint32_t ack;
|
||||
size_t length;
|
||||
struct list link;
|
||||
struct link_packet packet;
|
||||
};
|
||||
|
||||
struct link_transaction {
|
||||
int request_node, response_node, tlabel;
|
||||
struct subaction *request, *response;
|
||||
struct list request_list, response_list;
|
||||
struct list link;
|
||||
};
|
||||
|
||||
int decode_fcp(struct link_transaction *t);
|
||||
|
||||
#endif /* __nosy_dump_h__ */
|
||||
4
tools/perf/arch/arm/Makefile
Normal file
4
tools/perf/arch/arm/Makefile
Normal file
@@ -0,0 +1,4 @@
|
||||
ifndef NO_DWARF
|
||||
PERF_HAVE_DWARF_REGS := 1
|
||||
LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
|
||||
endif
|
||||
64
tools/perf/arch/arm/util/dwarf-regs.c
Normal file
64
tools/perf/arch/arm/util/dwarf-regs.c
Normal file
@@ -0,0 +1,64 @@
|
||||
/*
|
||||
* Mapping of DWARF debug register numbers into register names.
|
||||
*
|
||||
* Copyright (C) 2010 Will Deacon, ARM Ltd.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#include <libio.h>
|
||||
#include <dwarf-regs.h>
|
||||
|
||||
struct pt_regs_dwarfnum {
|
||||
const char *name;
|
||||
unsigned int dwarfnum;
|
||||
};
|
||||
|
||||
#define STR(s) #s
|
||||
#define REG_DWARFNUM_NAME(r, num) {.name = r, .dwarfnum = num}
|
||||
#define GPR_DWARFNUM_NAME(num) \
|
||||
{.name = STR(%r##num), .dwarfnum = num}
|
||||
#define REG_DWARFNUM_END {.name = NULL, .dwarfnum = 0}
|
||||
|
||||
/*
|
||||
* Reference:
|
||||
* http://infocenter.arm.com/help/topic/com.arm.doc.ihi0040a/IHI0040A_aadwarf.pdf
|
||||
*/
|
||||
static const struct pt_regs_dwarfnum regdwarfnum_table[] = {
|
||||
GPR_DWARFNUM_NAME(0),
|
||||
GPR_DWARFNUM_NAME(1),
|
||||
GPR_DWARFNUM_NAME(2),
|
||||
GPR_DWARFNUM_NAME(3),
|
||||
GPR_DWARFNUM_NAME(4),
|
||||
GPR_DWARFNUM_NAME(5),
|
||||
GPR_DWARFNUM_NAME(6),
|
||||
GPR_DWARFNUM_NAME(7),
|
||||
GPR_DWARFNUM_NAME(8),
|
||||
GPR_DWARFNUM_NAME(9),
|
||||
GPR_DWARFNUM_NAME(10),
|
||||
REG_DWARFNUM_NAME("%fp", 11),
|
||||
REG_DWARFNUM_NAME("%ip", 12),
|
||||
REG_DWARFNUM_NAME("%sp", 13),
|
||||
REG_DWARFNUM_NAME("%lr", 14),
|
||||
REG_DWARFNUM_NAME("%pc", 15),
|
||||
REG_DWARFNUM_END,
|
||||
};
|
||||
|
||||
/**
|
||||
* get_arch_regstr() - lookup register name from it's DWARF register number
|
||||
* @n: the DWARF register number
|
||||
*
|
||||
* get_arch_regstr() returns the name of the register in struct
|
||||
* regdwarfnum_table from it's DWARF register number. If the register is not
|
||||
* found in the table, this returns NULL;
|
||||
*/
|
||||
const char *get_arch_regstr(unsigned int n)
|
||||
{
|
||||
const struct pt_regs_dwarfnum *roff;
|
||||
for (roff = regdwarfnum_table; roff->name != NULL; roff++)
|
||||
if (roff->dwarfnum == n)
|
||||
return roff->name;
|
||||
return NULL;
|
||||
}
|
||||
Reference in New Issue
Block a user