microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

MSI: Rename PCI_CAP_ID_HT_IRQCONF into PCI_CAP_ID_HT 

0x08 is the HT capability, while PCI_CAP_ID_HT_IRQCONF would be
the subtype 0x80 that mpic_scan_ht_pic() uses.
Rename PCI_CAP_ID_HT_IRQCONF into PCI_CAP_ID_HT.

And by the way, use it in the ipath driver instead of defining its
own HT_CAPABILITY_ID.

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Brice Goglin 2006-08-31 01:55:24 -04:00 коммит произвёл Greg Kroah-Hartman
Родитель fe97064c28
Коммит 46ff34633e
3 изменённых файлов: 4 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
arch/powerpc/sysdev/mpic.c
Просмотреть файл

@ -339,7 +339,7 @@ static void __init mpic_scan_ht_pic(struct mpic *mpic, u8 __iomem *devbase,
for (pos = readb(devbase + PCI_CAPABILITY_LIST); pos != 0; for (pos = readb(devbase + PCI_CAPABILITY_LIST); pos != 0;
pos = readb(devbase + pos + PCI_CAP_LIST_NEXT)) { pos = readb(devbase + pos + PCI_CAP_LIST_NEXT)) {
u8 id = readb(devbase + pos + PCI_CAP_LIST_ID); u8 id = readb(devbase + pos + PCI_CAP_LIST_ID);
if (id == PCI_CAP_ID_HT_IRQCONF) { if (id == PCI_CAP_ID_HT) {
id = readb(devbase + pos + 3); id = readb(devbase + pos + 3);
if (id == 0x80) if (id == 0x80)
break; break;

5
drivers/infiniband/hw/ipath/ipath_iba6110.c
Просмотреть файл

@ -742,7 +742,6 @@ static int ipath_setup_ht_reset(struct ipath_devdata *dd)
return 0; return 0;
} }
#define HT_CAPABILITY_ID 0x08 /* HT capabilities not defined in kernel */
#define HT_INTR_DISC_CONFIG 0x80 /* HT interrupt and discovery cap */ #define HT_INTR_DISC_CONFIG 0x80 /* HT interrupt and discovery cap */
#define HT_INTR_REG_INDEX 2 /* intconfig requires indirect accesses */ #define HT_INTR_REG_INDEX 2 /* intconfig requires indirect accesses */
@ -973,7 +972,7 @@ static int ipath_setup_ht_config(struct ipath_devdata *dd,
* do this early, before we ever enable errors or hardware errors, * do this early, before we ever enable errors or hardware errors,
* mostly to avoid causing the chip to enter freeze mode. * mostly to avoid causing the chip to enter freeze mode.
*/ */
pos = pci_find_capability(pdev, HT_CAPABILITY_ID); pos = pci_find_capability(pdev, PCI_CAP_ID_HT);
if (!pos) { if (!pos) {
ipath_dev_err(dd, "Couldn't find HyperTransport " ipath_dev_err(dd, "Couldn't find HyperTransport "
"capability; no interrupts\n"); "capability; no interrupts\n");
@ -996,7 +995,7 @@ static int ipath_setup_ht_config(struct ipath_devdata *dd,
else if (cap_type == HT_INTR_DISC_CONFIG) else if (cap_type == HT_INTR_DISC_CONFIG)
ihandler = set_int_handler(dd, pdev, pos); ihandler = set_int_handler(dd, pdev, pos);
} while ((pos = pci_find_next_capability(pdev, pos, } while ((pos = pci_find_next_capability(pdev, pos,
HT_CAPABILITY_ID))); PCI_CAP_ID_HT)));
if (!ihandler) { if (!ihandler) {
ipath_dev_err(dd, "Couldn't find interrupt handler in " ipath_dev_err(dd, "Couldn't find interrupt handler in "

2
include/linux/pci_regs.h
Просмотреть файл

@ -196,7 +196,7 @@
#define PCI_CAP_ID_MSI 0x05 /* Message Signalled Interrupts */ #define PCI_CAP_ID_MSI 0x05 /* Message Signalled Interrupts */
#define PCI_CAP_ID_CHSWP 0x06 /* CompactPCI HotSwap */ #define PCI_CAP_ID_CHSWP 0x06 /* CompactPCI HotSwap */
#define PCI_CAP_ID_PCIX 0x07 /* PCI-X */ #define PCI_CAP_ID_PCIX 0x07 /* PCI-X */
#define PCI_CAP_ID_HT_IRQCONF 0x08 /* HyperTransport IRQ Configuration */ #define PCI_CAP_ID_HT 0x08 /* HyperTransport */
#define PCI_CAP_ID_VNDR 0x09 /* Vendor specific capability */ #define PCI_CAP_ID_VNDR 0x09 /* Vendor specific capability */
#define PCI_CAP_ID_SHPC 0x0C /* PCI Standard Hot-Plug Controller */ #define PCI_CAP_ID_SHPC 0x0C /* PCI Standard Hot-Plug Controller */
#define PCI_CAP_ID_EXP 0x10 /* PCI Express */ #define PCI_CAP_ID_EXP 0x10 /* PCI Express */