Page MenuHomeFreeBSD
Differential D15546

Yank crufty INTR_FILTER option
ClosedPublic
Actions

Authored by cem on May 24 2018, 3:49 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Apr 18, 7:38 AM
Unknown Object (File)
Fri, Apr 18, 2:23 AM
Unknown Object (File)
Thu, Apr 17, 6:00 PM
Unknown Object (File)
Mon, Apr 14, 8:24 PM
Unknown Object (File)
Mon, Apr 14, 9:39 AM
Unknown Object (File)
Mon, Apr 14, 4:33 AM
Unknown Object (File)
Sun, Apr 13, 10:15 PM
Unknown Object (File)
Sun, Apr 13, 8:37 PM
View All 84 Files
Subscribers
andrew
imp

Details

Reviewers
jhb
mmacy
Commits
rS334170: Yank crufty INTR_FILTER option
Summary

It was introduced to the tree in r169320 and r169321 in May 2007.

It never got much use and never became a kernel default. The code
duplicates the default path quite a bit, with slight modifications. Just
yank out the cruft. Whatever goals were being aimed for can probably be met
within the existing framework, without a flag day option.

Mostly mechanical change: 'unifdef -m -UINTR_FILTER'.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

cem created this revision.May 24 2018, 3:49 AM
Harbormaster completed remote builds in B16799: Diff 42910.May 24 2018, 3:49 AM
mmacy accepted this revision.May 24 2018, 4:53 AM
This revision is now accepted and ready to land.May 24 2018, 4:53 AM
cem added a comment.May 24 2018, 4:35 PM

(rpaulo was the original author of the driver (and the INTR_FILTER cruft dates to the original commit), but he is inactive now.)

Closed by commit rS334170: Yank crufty INTR_FILTER option (authored by cem). · Explain WhyMay 24 2018, 5:06 PM
This revision was automatically updated to reflect the committed changes.
Herald added subscribers: andrew, imp. · View Herald TranscriptMay 24 2018, 5:06 PM

Revision Contents
Changeset List

PathSize
head/
sys/
arm/
conf/
1 line
conf/
3 lines
dev/
asmc/
24 lines
kern/
540 lines
modules/
asmc/
2 lines

Diff 42938

View Options

head/sys/arm/conf/CRB

Show First 20 Lines • Show All 84 Lines • ▼ Show 20 Lines
MODULE_DEPEND(nvme, cam, 1, 1, 1); MODULE_DEPEND(nvme, cam, 1, 1, 1);
static struct _pcsid static struct _pcsid
{ {
uint32_t devid; uint32_t devid;
int match_subdevice; int match_subdevice;
uint16_t subdevice; uint16_t subdevice;
const char *desc; const char *desc;
uint32_t quirks;
} pci_ids[] = { } pci_ids[] = {
{ 0x01118086, 0, 0, "NVMe Controller" }, { 0x01118086, 0, 0, "NVMe Controller" },
{ IDT32_PCI_ID, 0, 0, "IDT NVMe Controller (32 channel)" }, { IDT32_PCI_ID, 0, 0, "IDT NVMe Controller (32 channel)" },
{ IDT8_PCI_ID, 0, 0, "IDT NVMe Controller (8 channel)" }, { IDT8_PCI_ID, 0, 0, "IDT NVMe Controller (8 channel)" },
{ 0x09538086, 1, 0x3702, "DC P3700 SSD" }, { 0x09538086, 1, 0x3702, "DC P3700 SSD" },
{ 0x09538086, 1, 0x3703, "DC P3700 SSD [2.5\" SFF]" }, { 0x09538086, 1, 0x3703, "DC P3700 SSD [2.5\" SFF]" },
{ 0x09538086, 1, 0x3704, "DC P3500 SSD [Add-in Card]" }, { 0x09538086, 1, 0x3704, "DC P3500 SSD [Add-in Card]" },
{ 0x09538086, 1, 0x3705, "DC P3500 SSD [2.5\" SFF]" }, { 0x09538086, 1, 0x3705, "DC P3500 SSD [2.5\" SFF]" },
{ 0x09538086, 1, 0x3709, "DC P3600 SSD [Add-in Card]" }, { 0x09538086, 1, 0x3709, "DC P3600 SSD [Add-in Card]" },
{ 0x09538086, 1, 0x370a, "DC P3600 SSD [2.5\" SFF]" }, { 0x09538086, 1, 0x370a, "DC P3600 SSD [2.5\" SFF]" },
{ 0x00031c58, 0, 0, "HGST SN100", QUIRK_DELAY_B4_CHK_RDY },
{ 0x00231c58, 0, 0, "WDC SN200", QUIRK_DELAY_B4_CHK_RDY },
{ 0x05401c5f, 0, 0, "Memblaze Pblaze4", QUIRK_DELAY_B4_CHK_RDY },
{ 0xa821a821, 0, 0, "Samsung PM1725", QUIRK_DELAY_B4_CHK_RDY },
chuckUnsubmitted
Not Done
Inline Actions

Should the device ID be 0xa821144d?

chuck: Should the device ID be `0xa821144d`?
impAuthorUnsubmitted
Not Done
Inline Actions

yup

imp: yup
{ 0xa821a822, 0, 0, "Samsung PM1725a", QUIRK_DELAY_B4_CHK_RDY },
chuckUnsubmitted
Not Done
Inline Actions

Should the device ID be 0xa822144d?

chuck: Should the device ID be `0xa822144d`?
impAuthorUnsubmitted
Not Done
Inline Actions

yup.

imp: yup.
{ 0x00000000, 0, 0, NULL } { 0x00000000, 0, 0, NULL }
}; };
static int static int
nvme_match(uint32_t devid, uint16_t subdevice, struct _pcsid *ep) nvme_match(uint32_t devid, uint16_t subdevice, struct _pcsid *ep)
{ {
if (devid != ep->devid) if (devid != ep->devid)
return 0; return 0;
▲ Show 20 Lines • Show All 124 Lines • ▼ Show 20 Lines printf("cdw0:%08x sqhd:%04x sqid:%04x "
cpl->status.m, cpl->status.dnr); cpl->status.m, cpl->status.dnr);
} }
static int static int
nvme_attach(device_t dev) nvme_attach(device_t dev)
{ {
struct nvme_controller *ctrlr = DEVICE2SOFTC(dev); struct nvme_controller *ctrlr = DEVICE2SOFTC(dev);
int status; int status;
struct _pcsid *ep;
uint32_t devid;
uint16_t subdevice;
devid = pci_get_devid(dev);
subdevice = pci_get_subdevice(dev);
ep = pci_ids;
while (ep->devid) {
if (nvme_match(devid, subdevice, ep))
break;
++ep;
}
ctrlr->quirks = ep->quirks;
status = nvme_ctrlr_construct(ctrlr, dev); status = nvme_ctrlr_construct(ctrlr, dev);
if (status != 0) { if (status != 0) {
nvme_ctrlr_destruct(ctrlr, dev); nvme_ctrlr_destruct(ctrlr, dev);
return (status); return (status);
} }
▲ Show 20 Lines • Show All 205 Lines • Show Last 20 Lines
View Options

head/sys/conf/options

Show First 20 Lines • Show All 84 Lines • ▼ Show 20 Lines
MODULE_DEPEND(nvme, cam, 1, 1, 1); MODULE_DEPEND(nvme, cam, 1, 1, 1);
static struct _pcsid static struct _pcsid
{ {
uint32_t devid; uint32_t devid;
int match_subdevice; int match_subdevice;
uint16_t subdevice; uint16_t subdevice;
const char *desc; const char *desc;
uint32_t quirks;
} pci_ids[] = { } pci_ids[] = {
{ 0x01118086, 0, 0, "NVMe Controller" }, { 0x01118086, 0, 0, "NVMe Controller" },
{ IDT32_PCI_ID, 0, 0, "IDT NVMe Controller (32 channel)" }, { IDT32_PCI_ID, 0, 0, "IDT NVMe Controller (32 channel)" },
{ IDT8_PCI_ID, 0, 0, "IDT NVMe Controller (8 channel)" }, { IDT8_PCI_ID, 0, 0, "IDT NVMe Controller (8 channel)" },
{ 0x09538086, 1, 0x3702, "DC P3700 SSD" }, { 0x09538086, 1, 0x3702, "DC P3700 SSD" },
{ 0x09538086, 1, 0x3703, "DC P3700 SSD [2.5\" SFF]" }, { 0x09538086, 1, 0x3703, "DC P3700 SSD [2.5\" SFF]" },
{ 0x09538086, 1, 0x3704, "DC P3500 SSD [Add-in Card]" }, { 0x09538086, 1, 0x3704, "DC P3500 SSD [Add-in Card]" },
{ 0x09538086, 1, 0x3705, "DC P3500 SSD [2.5\" SFF]" }, { 0x09538086, 1, 0x3705, "DC P3500 SSD [2.5\" SFF]" },
{ 0x09538086, 1, 0x3709, "DC P3600 SSD [Add-in Card]" }, { 0x09538086, 1, 0x3709, "DC P3600 SSD [Add-in Card]" },
{ 0x09538086, 1, 0x370a, "DC P3600 SSD [2.5\" SFF]" }, { 0x09538086, 1, 0x370a, "DC P3600 SSD [2.5\" SFF]" },
{ 0x00031c58, 0, 0, "HGST SN100", QUIRK_DELAY_B4_CHK_RDY },
{ 0x00231c58, 0, 0, "WDC SN200", QUIRK_DELAY_B4_CHK_RDY },
{ 0x05401c5f, 0, 0, "Memblaze Pblaze4", QUIRK_DELAY_B4_CHK_RDY },
{ 0xa821a821, 0, 0, "Samsung PM1725", QUIRK_DELAY_B4_CHK_RDY },
chuckUnsubmitted
Not Done
Inline Actions

Should the device ID be 0xa821144d?

chuck: Should the device ID be `0xa821144d`?
impAuthorUnsubmitted
Not Done
Inline Actions

yup

imp: yup
{ 0xa821a822, 0, 0, "Samsung PM1725a", QUIRK_DELAY_B4_CHK_RDY },
chuckUnsubmitted
Not Done
Inline Actions

Should the device ID be 0xa822144d?

chuck: Should the device ID be `0xa822144d`?
impAuthorUnsubmitted
Not Done
Inline Actions

yup.

imp: yup.
{ 0x00000000, 0, 0, NULL } { 0x00000000, 0, 0, NULL }
}; };
static int static int
nvme_match(uint32_t devid, uint16_t subdevice, struct _pcsid *ep) nvme_match(uint32_t devid, uint16_t subdevice, struct _pcsid *ep)
{ {
if (devid != ep->devid) if (devid != ep->devid)
return 0; return 0;
▲ Show 20 Lines • Show All 124 Lines • ▼ Show 20 Lines printf("cdw0:%08x sqhd:%04x sqid:%04x "
cpl->status.m, cpl->status.dnr); cpl->status.m, cpl->status.dnr);
} }
static int static int
nvme_attach(device_t dev) nvme_attach(device_t dev)
{ {
struct nvme_controller *ctrlr = DEVICE2SOFTC(dev); struct nvme_controller *ctrlr = DEVICE2SOFTC(dev);
int status; int status;
struct _pcsid *ep;
uint32_t devid;
uint16_t subdevice;
devid = pci_get_devid(dev);
subdevice = pci_get_subdevice(dev);
ep = pci_ids;
while (ep->devid) {
if (nvme_match(devid, subdevice, ep))
break;
++ep;
}
ctrlr->quirks = ep->quirks;
status = nvme_ctrlr_construct(ctrlr, dev); status = nvme_ctrlr_construct(ctrlr, dev);
if (status != 0) { if (status != 0) {
nvme_ctrlr_destruct(ctrlr, dev); nvme_ctrlr_destruct(ctrlr, dev);
return (status); return (status);
} }
▲ Show 20 Lines • Show All 205 Lines • Show Last 20 Lines
View Options

head/sys/dev/asmc/asmc.c

Show First 20 Lines • Show All 84 Lines • ▼ Show 20 Lines
MODULE_DEPEND(nvme, cam, 1, 1, 1); MODULE_DEPEND(nvme, cam, 1, 1, 1);
static struct _pcsid static struct _pcsid
{ {
uint32_t devid; uint32_t devid;
int match_subdevice; int match_subdevice;
uint16_t subdevice; uint16_t subdevice;
const char *desc; const char *desc;
uint32_t quirks;
} pci_ids[] = { } pci_ids[] = {
{ 0x01118086, 0, 0, "NVMe Controller" }, { 0x01118086, 0, 0, "NVMe Controller" },
{ IDT32_PCI_ID, 0, 0, "IDT NVMe Controller (32 channel)" }, { IDT32_PCI_ID, 0, 0, "IDT NVMe Controller (32 channel)" },
{ IDT8_PCI_ID, 0, 0, "IDT NVMe Controller (8 channel)" }, { IDT8_PCI_ID, 0, 0, "IDT NVMe Controller (8 channel)" },
{ 0x09538086, 1, 0x3702, "DC P3700 SSD" }, { 0x09538086, 1, 0x3702, "DC P3700 SSD" },
{ 0x09538086, 1, 0x3703, "DC P3700 SSD [2.5\" SFF]" }, { 0x09538086, 1, 0x3703, "DC P3700 SSD [2.5\" SFF]" },
{ 0x09538086, 1, 0x3704, "DC P3500 SSD [Add-in Card]" }, { 0x09538086, 1, 0x3704, "DC P3500 SSD [Add-in Card]" },
{ 0x09538086, 1, 0x3705, "DC P3500 SSD [2.5\" SFF]" }, { 0x09538086, 1, 0x3705, "DC P3500 SSD [2.5\" SFF]" },
{ 0x09538086, 1, 0x3709, "DC P3600 SSD [Add-in Card]" }, { 0x09538086, 1, 0x3709, "DC P3600 SSD [Add-in Card]" },
{ 0x09538086, 1, 0x370a, "DC P3600 SSD [2.5\" SFF]" }, { 0x09538086, 1, 0x370a, "DC P3600 SSD [2.5\" SFF]" },
{ 0x00031c58, 0, 0, "HGST SN100", QUIRK_DELAY_B4_CHK_RDY },
{ 0x00231c58, 0, 0, "WDC SN200", QUIRK_DELAY_B4_CHK_RDY },
{ 0x05401c5f, 0, 0, "Memblaze Pblaze4", QUIRK_DELAY_B4_CHK_RDY },
{ 0xa821a821, 0, 0, "Samsung PM1725", QUIRK_DELAY_B4_CHK_RDY },
chuckUnsubmitted
Not Done
Inline Actions

Should the device ID be 0xa821144d?

chuck: Should the device ID be `0xa821144d`?
impAuthorUnsubmitted
Not Done
Inline Actions

yup

imp: yup
{ 0xa821a822, 0, 0, "Samsung PM1725a", QUIRK_DELAY_B4_CHK_RDY },
chuckUnsubmitted
Not Done
Inline Actions

Should the device ID be 0xa822144d?

chuck: Should the device ID be `0xa822144d`?
impAuthorUnsubmitted
Not Done
Inline Actions

yup.

imp: yup.
{ 0x00000000, 0, 0, NULL } { 0x00000000, 0, 0, NULL }
}; };
static int static int
nvme_match(uint32_t devid, uint16_t subdevice, struct _pcsid *ep) nvme_match(uint32_t devid, uint16_t subdevice, struct _pcsid *ep)
{ {
if (devid != ep->devid) if (devid != ep->devid)
return 0; return 0;
▲ Show 20 Lines • Show All 124 Lines • ▼ Show 20 Lines printf("cdw0:%08x sqhd:%04x sqid:%04x "
cpl->status.m, cpl->status.dnr); cpl->status.m, cpl->status.dnr);
} }
static int static int
nvme_attach(device_t dev) nvme_attach(device_t dev)
{ {
struct nvme_controller *ctrlr = DEVICE2SOFTC(dev); struct nvme_controller *ctrlr = DEVICE2SOFTC(dev);
int status; int status;
struct _pcsid *ep;
uint32_t devid;
uint16_t subdevice;
devid = pci_get_devid(dev);
subdevice = pci_get_subdevice(dev);
ep = pci_ids;
while (ep->devid) {
if (nvme_match(devid, subdevice, ep))
break;
++ep;
}
ctrlr->quirks = ep->quirks;
status = nvme_ctrlr_construct(ctrlr, dev); status = nvme_ctrlr_construct(ctrlr, dev);
if (status != 0) { if (status != 0) {
nvme_ctrlr_destruct(ctrlr, dev); nvme_ctrlr_destruct(ctrlr, dev);
return (status); return (status);
} }
▲ Show 20 Lines • Show All 205 Lines • Show Last 20 Lines
View Options

head/sys/kern/kern_intr.c

Show First 20 Lines • Show All 84 Lines • ▼ Show 20 Lines
MODULE_DEPEND(nvme, cam, 1, 1, 1); MODULE_DEPEND(nvme, cam, 1, 1, 1);
static struct _pcsid static struct _pcsid
{ {
uint32_t devid; uint32_t devid;
int match_subdevice; int match_subdevice;
uint16_t subdevice; uint16_t subdevice;
const char *desc; const char *desc;
uint32_t quirks;
} pci_ids[] = { } pci_ids[] = {
{ 0x01118086, 0, 0, "NVMe Controller" }, { 0x01118086, 0, 0, "NVMe Controller" },
{ IDT32_PCI_ID, 0, 0, "IDT NVMe Controller (32 channel)" }, { IDT32_PCI_ID, 0, 0, "IDT NVMe Controller (32 channel)" },
{ IDT8_PCI_ID, 0, 0, "IDT NVMe Controller (8 channel)" }, { IDT8_PCI_ID, 0, 0, "IDT NVMe Controller (8 channel)" },
{ 0x09538086, 1, 0x3702, "DC P3700 SSD" }, { 0x09538086, 1, 0x3702, "DC P3700 SSD" },
{ 0x09538086, 1, 0x3703, "DC P3700 SSD [2.5\" SFF]" }, { 0x09538086, 1, 0x3703, "DC P3700 SSD [2.5\" SFF]" },
{ 0x09538086, 1, 0x3704, "DC P3500 SSD [Add-in Card]" }, { 0x09538086, 1, 0x3704, "DC P3500 SSD [Add-in Card]" },
{ 0x09538086, 1, 0x3705, "DC P3500 SSD [2.5\" SFF]" }, { 0x09538086, 1, 0x3705, "DC P3500 SSD [2.5\" SFF]" },
{ 0x09538086, 1, 0x3709, "DC P3600 SSD [Add-in Card]" }, { 0x09538086, 1, 0x3709, "DC P3600 SSD [Add-in Card]" },
{ 0x09538086, 1, 0x370a, "DC P3600 SSD [2.5\" SFF]" }, { 0x09538086, 1, 0x370a, "DC P3600 SSD [2.5\" SFF]" },
{ 0x00031c58, 0, 0, "HGST SN100", QUIRK_DELAY_B4_CHK_RDY },
{ 0x00231c58, 0, 0, "WDC SN200", QUIRK_DELAY_B4_CHK_RDY },
{ 0x05401c5f, 0, 0, "Memblaze Pblaze4", QUIRK_DELAY_B4_CHK_RDY },
{ 0xa821a821, 0, 0, "Samsung PM1725", QUIRK_DELAY_B4_CHK_RDY },
chuckUnsubmitted
Not Done
Inline Actions

Should the device ID be 0xa821144d?

chuck: Should the device ID be `0xa821144d`?
impAuthorUnsubmitted
Not Done
Inline Actions

yup

imp: yup
{ 0xa821a822, 0, 0, "Samsung PM1725a", QUIRK_DELAY_B4_CHK_RDY },
chuckUnsubmitted
Not Done
Inline Actions

Should the device ID be 0xa822144d?

chuck: Should the device ID be `0xa822144d`?
impAuthorUnsubmitted
Not Done
Inline Actions

yup.

imp: yup.
{ 0x00000000, 0, 0, NULL } { 0x00000000, 0, 0, NULL }
}; };
static int static int
nvme_match(uint32_t devid, uint16_t subdevice, struct _pcsid *ep) nvme_match(uint32_t devid, uint16_t subdevice, struct _pcsid *ep)
{ {
if (devid != ep->devid) if (devid != ep->devid)
return 0; return 0;
▲ Show 20 Lines • Show All 124 Lines • ▼ Show 20 Lines printf("cdw0:%08x sqhd:%04x sqid:%04x "
cpl->status.m, cpl->status.dnr); cpl->status.m, cpl->status.dnr);
} }
static int static int
nvme_attach(device_t dev) nvme_attach(device_t dev)
{ {
struct nvme_controller *ctrlr = DEVICE2SOFTC(dev); struct nvme_controller *ctrlr = DEVICE2SOFTC(dev);
int status; int status;
struct _pcsid *ep;
uint32_t devid;
uint16_t subdevice;
devid = pci_get_devid(dev);
subdevice = pci_get_subdevice(dev);
ep = pci_ids;
while (ep->devid) {
if (nvme_match(devid, subdevice, ep))
break;
++ep;
}
ctrlr->quirks = ep->quirks;
status = nvme_ctrlr_construct(ctrlr, dev); status = nvme_ctrlr_construct(ctrlr, dev);
if (status != 0) { if (status != 0) {
nvme_ctrlr_destruct(ctrlr, dev); nvme_ctrlr_destruct(ctrlr, dev);
return (status); return (status);
} }
▲ Show 20 Lines • Show All 205 Lines • Show Last 20 Lines
View Options

head/sys/modules/asmc/Makefile

Loading...