Page MenuHomeFreeBSD
Differential D6061

Implement SHA-512 truncated (224 and 256 bits)
ClosedPublic
Actions

Authored by allanjude on Apr 22 2016, 1:43 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 20, 7:05 AM
Unknown Object (File)
Fri, Mar 14, 12:28 PM
Unknown Object (File)
Sun, Mar 9, 10:21 PM
Unknown Object (File)
Feb 22 2025, 5:05 AM
Unknown Object (File)
Feb 21 2025, 5:38 PM
Unknown Object (File)
Feb 14 2025, 10:03 AM
Unknown Object (File)
Jan 14 2025, 11:20 PM
Unknown Object (File)
Jan 14 2025, 10:49 PM
View All Files
Subscribers
bcr
cem
imp

Details

Reviewers
cem
jmg
delphij
cperciva
Group Reviewers
manpages
Commits
rS300903: Implement SHA-512 truncated (224 and 256 bits)
Summary

This implements SHA-512/256, which generates a 256 bit hash, but using SHA-512 so is faster than SHA-256 on 64bit platforms.

The main goal of this implementation is to enable support for this faster hashing algorithm in ZFS

This is the follow on to r292782

Test Plan

Verified against: http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/SHA512_256.pdf

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 3530
Build 3570: arc lint + arc unit

Event Timeline

allanjude updated this revision to Diff 15494.Apr 22 2016, 1:43 PM
allanjude retitled this revision from to Implement SHA-512 truncated (224 and 256 bits).
allanjude updated this object.
allanjude edited the test plan for this revision. (Show Details)
allanjude added reviewers: cperciva, jmg, delphij.
Herald added a reviewer: manpages. · View Herald TranscriptApr 22 2016, 1:43 PM
Herald added a subscriber: imp. · View Herald Transcript
bcr added a subscriber: bcr.Apr 22 2016, 1:49 PM

Found a typo.

sbin/md5/md5.1
87

I this think should be "a version".

allanjude updated this revision to Diff 15780.Apr 30 2016, 9:40 PM
allanjude edited edge metadata.

Fix typo spotted by bcr@

Herald edited edge metadata. · View Herald TranscriptApr 30 2016, 9:40 PM
cem added a subscriber: cem.May 26 2016, 6:35 PM
cem added inline comments.
sys/crypto/sha2/sha512c.c
331

what's "so are skipped" mean?

352–356

It seems like these aren't really necessary. I'd suggest removing them and adding a comment where they were in the header to use the SHA512_Update() routine.

359

Use digest[static ...] here :).

369

don't need to cast here.

391–395

Same quibble here.

398

Use digest[static DIGEST_LEN] :)

408

same as above

sys/crypto/sha2/sha512t.h
106

[static DIGEST_LEN]

115

[static DIGEST_LEN]

cem added a reviewer: cem.May 26 2016, 6:35 PM
allanjude marked 7 inline comments as done.May 27 2016, 1:30 AM
allanjude added inline comments.
sys/crypto/sha2/sha512c.c
331

I didn't define the _transform function because it just uses the regular SHA512 one. I'll reword this

352–356

Userland applications that implement this algo expect this symbol to exist in libmd.

359

ok

369

right

allanjude updated this revision to Diff 16958.May 27 2016, 1:37 AM
allanjude marked 3 inline comments as done.
allanjude edited edge metadata.

Update with feedback from cem@

Herald edited edge metadata. · View Herald TranscriptMay 27 2016, 1:37 AM
cem added inline comments.May 27 2016, 4:03 PM
sys/crypto/sha2/sha512c.c
331

still needs rewording

352–356

It seems like userland-only routines and declarations should live in userland, like the _File/_Data routines. But whatever.

369

cast still present

408

This extra cast got missed :)

allanjude updated this revision to Diff 17023.May 28 2016, 4:40 AM
allanjude edited edge metadata.

Parts of the previous update did not get submitted

Herald edited edge metadata. · View Herald TranscriptMay 28 2016, 4:40 AM
allanjude marked 10 inline comments as done.May 28 2016, 4:41 AM
cem accepted this revision.May 28 2016, 2:00 PM
cem edited edge metadata.
This revision is now accepted and ready to land.May 28 2016, 2:00 PM
Closed by commit rS300903: Implement SHA-512 truncated (224 and 256 bits) (authored by allanjude). · Explain WhyMay 28 2016, 4:06 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
lib/
libmd/
37 lines
45 lines
4 lines
sbin/
md5/
6 lines
24 lines
16 lines
sys/
crypto/
sha2/
98 lines
125 lines

Diff 15780

View Options

lib/libmd/Makefile

Show First 20 Lines • Show All 168 Lines • ▼ Show 20 Lines
#define RTSX_RTS5249 0x5249 #define RTSX_RTS5249 0x5249
#define RTSX_RTS5260 0x5260 #define RTSX_RTS5260 0x5260
#define RTSX_RTL8402 0x5286 #define RTSX_RTL8402 0x5286
#define RTSX_RTL8411 0x5289 #define RTSX_RTL8411 0x5289
#define RTSX_RTL8411B 0x5287 #define RTSX_RTL8411B 0x5287
#define RTSX_VERSION "2.1g" #define RTSX_VERSION "2.1g"
static const struct rtsx_device { static const struct rtsx_pciids {
uint16_t vendor_id;
uint16_t device_id; uint16_t device_id;
const char *desc; const char *desc;
} rtsx_devices[] = { } rtsx_ids[] = {
{ RTSX_REALTEK, RTSX_RTS5209, RTSX_VERSION " Realtek RTS5209 PCIe SD Card Reader"}, { RTSX_RTS5209, RTSX_VERSION " Realtek RTS5209 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS5227, RTSX_VERSION " Realtek RTS5227 PCIe SD Card Reader"}, { RTSX_RTS5227, RTSX_VERSION " Realtek RTS5227 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS5229, RTSX_VERSION " Realtek RTS5229 PCIe SD Card Reader"}, { RTSX_RTS5229, RTSX_VERSION " Realtek RTS5229 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS522A, RTSX_VERSION " Realtek RTS522A PCIe SD Card Reader"}, { RTSX_RTS522A, RTSX_VERSION " Realtek RTS522A PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS525A, RTSX_VERSION " Realtek RTS525A PCIe SD Card Reader"}, { RTSX_RTS525A, RTSX_VERSION " Realtek RTS525A PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS5249, RTSX_VERSION " Realtek RTS5249 PCIe SD Card Reader"}, { RTSX_RTS5249, RTSX_VERSION " Realtek RTS5249 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS5260, RTSX_VERSION " Realtek RTS5260 PCIe SD Card Reader"}, { RTSX_RTS5260, RTSX_VERSION " Realtek RTS5260 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTL8402, RTSX_VERSION " Realtek RTL8402 PCIe SD Card Reader"}, { RTSX_RTL8402, RTSX_VERSION " Realtek RTL8402 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTL8411, RTSX_VERSION " Realtek RTL8411 PCIe SD Card Reader"}, { RTSX_RTL8411, RTSX_VERSION " Realtek RTL8411 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTL8411B, RTSX_VERSION " Realtek RTL8411B PCIe SD Card Reader"}, { RTSX_RTL8411B, RTSX_VERSION " Realtek RTL8411B PCIe SD Card Reader" },
{ 0, 0, NULL}
}; };
/* See `kenv | grep smbios.system` */ /* See `kenv | grep smbios.system` */
static const struct rtsx_inversion_model { static const struct rtsx_inversion_model {
char *maker; char *maker;
char *family; char *family;
char *product; char *product;
} rtsx_inversion_models[] = { } rtsx_inversion_models[] = {
▲ Show 20 Lines • Show All 3,365 Lines • ▼ Show 20 Lines
* supports. If there is a match, set the description and return success. * supports. If there is a match, set the description and return success.
*/ */
static int static int
rtsx_probe(device_t dev) rtsx_probe(device_t dev)
{ {
uint16_t vendor_id; uint16_t vendor_id;
uint16_t device_id; uint16_t device_id;
int i; int i;
int result;
vendor_id = pci_get_vendor(dev); vendor_id = pci_get_vendor(dev);
device_id = pci_get_device(dev); device_id = pci_get_device(dev);
result = ENXIO; if (vendor_id != RTSX_REALTEK)
for (i = 0; rtsx_devices[i].vendor_id != 0; i++) { return (ENXIO);
if (rtsx_devices[i].vendor_id == vendor_id && for (i = 0; i < nitems(rtsx_ids); i++) {
rtsx_devices[i].device_id == device_id) { if (rtsx_ids[i].device_id == device_id) {
device_set_desc(dev, rtsx_devices[i].desc); device_set_desc(dev, rtsx_ids[i].desc);
result = BUS_PROBE_DEFAULT; return (BUS_PROBE_DEFAULT);
break;
} }
} }
return (ENXIO);
return (result);
} }
/* /*
* Attach function is only called if the probe is successful. * Attach function is only called if the probe is successful.
*/ */
static int static int
rtsx_attach(device_t dev) rtsx_attach(device_t dev)
{ {
▲ Show 20 Lines • Show All 306 Lines • ▼ Show 20 Lines#endif /* MMCCAM */
DEVMETHOD_END DEVMETHOD_END
}; };
static devclass_t rtsx_devclass; static devclass_t rtsx_devclass;
DEFINE_CLASS_0(rtsx, rtsx_driver, rtsx_methods, sizeof(struct rtsx_softc)); DEFINE_CLASS_0(rtsx, rtsx_driver, rtsx_methods, sizeof(struct rtsx_softc));
DRIVER_MODULE(rtsx, pci, rtsx_driver, rtsx_devclass, NULL, NULL); DRIVER_MODULE(rtsx, pci, rtsx_driver, rtsx_devclass, NULL, NULL);
/* For Plug and Play */
MODULE_PNP_INFO("U16:device;D:#;T:vendor=0x10ec", pci, rtsx,
impUnsubmitted
Not Done
Inline Actions

Does this work? I didn't think that you could specify vendor= like this. I can't seem to find the code that parses it like that, can you help me find what I'm overlooking?

imp: Does this work? I didn't think that you could specify vendor= like this. I can't seem to find…
hlh_restart.beAuthorUnsubmitted
Done
Inline Actions

I test it at every boot on my laptop.

I follow
Example 2: Using T for common vendor value
in man MODULE_PNP_INFO

hlh_restart.be: I test it at every boot on my laptop. I follow Example 2: Using T for common vendor value in…
impUnsubmitted
Not Done
Inline Actions

Ah, indeed. I'd forgotten about T.
Then this looks good to me.

imp: Ah, indeed. I'd forgotten about T. Then this looks good to me.
rtsx_ids, nitems(rtsx_ids));
#ifndef MMCCAM #ifndef MMCCAM
MMC_DECLARE_BRIDGE(rtsx); MMC_DECLARE_BRIDGE(rtsx);
#endif /* !MMCCAM */ #endif /* !MMCCAM */
mavUnsubmitted
Done
Inline Actions

It would be better to reuse the list from main probe function above without duplication. I haven't looked closer into the format string of the macro, but I think it should be possible.

mav: It would be better to reuse the list from main probe function above without duplication. I…
View Options

lib/libmd/sha512.3

Show First 20 Lines • Show All 168 Lines • ▼ Show 20 Lines
#define RTSX_RTS5249 0x5249 #define RTSX_RTS5249 0x5249
#define RTSX_RTS5260 0x5260 #define RTSX_RTS5260 0x5260
#define RTSX_RTL8402 0x5286 #define RTSX_RTL8402 0x5286
#define RTSX_RTL8411 0x5289 #define RTSX_RTL8411 0x5289
#define RTSX_RTL8411B 0x5287 #define RTSX_RTL8411B 0x5287
#define RTSX_VERSION "2.1g" #define RTSX_VERSION "2.1g"
static const struct rtsx_device { static const struct rtsx_pciids {
uint16_t vendor_id;
uint16_t device_id; uint16_t device_id;
const char *desc; const char *desc;
} rtsx_devices[] = { } rtsx_ids[] = {
{ RTSX_REALTEK, RTSX_RTS5209, RTSX_VERSION " Realtek RTS5209 PCIe SD Card Reader"}, { RTSX_RTS5209, RTSX_VERSION " Realtek RTS5209 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS5227, RTSX_VERSION " Realtek RTS5227 PCIe SD Card Reader"}, { RTSX_RTS5227, RTSX_VERSION " Realtek RTS5227 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS5229, RTSX_VERSION " Realtek RTS5229 PCIe SD Card Reader"}, { RTSX_RTS5229, RTSX_VERSION " Realtek RTS5229 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS522A, RTSX_VERSION " Realtek RTS522A PCIe SD Card Reader"}, { RTSX_RTS522A, RTSX_VERSION " Realtek RTS522A PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS525A, RTSX_VERSION " Realtek RTS525A PCIe SD Card Reader"}, { RTSX_RTS525A, RTSX_VERSION " Realtek RTS525A PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS5249, RTSX_VERSION " Realtek RTS5249 PCIe SD Card Reader"}, { RTSX_RTS5249, RTSX_VERSION " Realtek RTS5249 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS5260, RTSX_VERSION " Realtek RTS5260 PCIe SD Card Reader"}, { RTSX_RTS5260, RTSX_VERSION " Realtek RTS5260 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTL8402, RTSX_VERSION " Realtek RTL8402 PCIe SD Card Reader"}, { RTSX_RTL8402, RTSX_VERSION " Realtek RTL8402 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTL8411, RTSX_VERSION " Realtek RTL8411 PCIe SD Card Reader"}, { RTSX_RTL8411, RTSX_VERSION " Realtek RTL8411 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTL8411B, RTSX_VERSION " Realtek RTL8411B PCIe SD Card Reader"}, { RTSX_RTL8411B, RTSX_VERSION " Realtek RTL8411B PCIe SD Card Reader" },
{ 0, 0, NULL}
}; };
/* See `kenv | grep smbios.system` */ /* See `kenv | grep smbios.system` */
static const struct rtsx_inversion_model { static const struct rtsx_inversion_model {
char *maker; char *maker;
char *family; char *family;
char *product; char *product;
} rtsx_inversion_models[] = { } rtsx_inversion_models[] = {
▲ Show 20 Lines • Show All 3,365 Lines • ▼ Show 20 Lines
* supports. If there is a match, set the description and return success. * supports. If there is a match, set the description and return success.
*/ */
static int static int
rtsx_probe(device_t dev) rtsx_probe(device_t dev)
{ {
uint16_t vendor_id; uint16_t vendor_id;
uint16_t device_id; uint16_t device_id;
int i; int i;
int result;
vendor_id = pci_get_vendor(dev); vendor_id = pci_get_vendor(dev);
device_id = pci_get_device(dev); device_id = pci_get_device(dev);
result = ENXIO; if (vendor_id != RTSX_REALTEK)
for (i = 0; rtsx_devices[i].vendor_id != 0; i++) { return (ENXIO);
if (rtsx_devices[i].vendor_id == vendor_id && for (i = 0; i < nitems(rtsx_ids); i++) {
rtsx_devices[i].device_id == device_id) { if (rtsx_ids[i].device_id == device_id) {
device_set_desc(dev, rtsx_devices[i].desc); device_set_desc(dev, rtsx_ids[i].desc);
result = BUS_PROBE_DEFAULT; return (BUS_PROBE_DEFAULT);
break;
} }
} }
return (ENXIO);
return (result);
} }
/* /*
* Attach function is only called if the probe is successful. * Attach function is only called if the probe is successful.
*/ */
static int static int
rtsx_attach(device_t dev) rtsx_attach(device_t dev)
{ {
▲ Show 20 Lines • Show All 306 Lines • ▼ Show 20 Lines#endif /* MMCCAM */
DEVMETHOD_END DEVMETHOD_END
}; };
static devclass_t rtsx_devclass; static devclass_t rtsx_devclass;
DEFINE_CLASS_0(rtsx, rtsx_driver, rtsx_methods, sizeof(struct rtsx_softc)); DEFINE_CLASS_0(rtsx, rtsx_driver, rtsx_methods, sizeof(struct rtsx_softc));
DRIVER_MODULE(rtsx, pci, rtsx_driver, rtsx_devclass, NULL, NULL); DRIVER_MODULE(rtsx, pci, rtsx_driver, rtsx_devclass, NULL, NULL);
/* For Plug and Play */
MODULE_PNP_INFO("U16:device;D:#;T:vendor=0x10ec", pci, rtsx,
impUnsubmitted
Not Done
Inline Actions

Does this work? I didn't think that you could specify vendor= like this. I can't seem to find the code that parses it like that, can you help me find what I'm overlooking?

imp: Does this work? I didn't think that you could specify vendor= like this. I can't seem to find…
hlh_restart.beAuthorUnsubmitted
Done
Inline Actions

I test it at every boot on my laptop.

I follow
Example 2: Using T for common vendor value
in man MODULE_PNP_INFO

hlh_restart.be: I test it at every boot on my laptop. I follow Example 2: Using T for common vendor value in…
impUnsubmitted
Not Done
Inline Actions

Ah, indeed. I'd forgotten about T.
Then this looks good to me.

imp: Ah, indeed. I'd forgotten about T. Then this looks good to me.
rtsx_ids, nitems(rtsx_ids));
#ifndef MMCCAM #ifndef MMCCAM
MMC_DECLARE_BRIDGE(rtsx); MMC_DECLARE_BRIDGE(rtsx);
#endif /* !MMCCAM */ #endif /* !MMCCAM */
mavUnsubmitted
Done
Inline Actions

It would be better to reuse the list from main probe function above without duplication. I haven't looked closer into the format string of the macro, but I think it should be possible.

mav: It would be better to reuse the list from main probe function above without duplication. I…
View Options

lib/libmd/shadriver.c

Show First 20 Lines • Show All 168 Lines • ▼ Show 20 Lines
#define RTSX_RTS5249 0x5249 #define RTSX_RTS5249 0x5249
#define RTSX_RTS5260 0x5260 #define RTSX_RTS5260 0x5260
#define RTSX_RTL8402 0x5286 #define RTSX_RTL8402 0x5286
#define RTSX_RTL8411 0x5289 #define RTSX_RTL8411 0x5289
#define RTSX_RTL8411B 0x5287 #define RTSX_RTL8411B 0x5287
#define RTSX_VERSION "2.1g" #define RTSX_VERSION "2.1g"
static const struct rtsx_device { static const struct rtsx_pciids {
uint16_t vendor_id;
uint16_t device_id; uint16_t device_id;
const char *desc; const char *desc;
} rtsx_devices[] = { } rtsx_ids[] = {
{ RTSX_REALTEK, RTSX_RTS5209, RTSX_VERSION " Realtek RTS5209 PCIe SD Card Reader"}, { RTSX_RTS5209, RTSX_VERSION " Realtek RTS5209 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS5227, RTSX_VERSION " Realtek RTS5227 PCIe SD Card Reader"}, { RTSX_RTS5227, RTSX_VERSION " Realtek RTS5227 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS5229, RTSX_VERSION " Realtek RTS5229 PCIe SD Card Reader"}, { RTSX_RTS5229, RTSX_VERSION " Realtek RTS5229 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS522A, RTSX_VERSION " Realtek RTS522A PCIe SD Card Reader"}, { RTSX_RTS522A, RTSX_VERSION " Realtek RTS522A PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS525A, RTSX_VERSION " Realtek RTS525A PCIe SD Card Reader"}, { RTSX_RTS525A, RTSX_VERSION " Realtek RTS525A PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS5249, RTSX_VERSION " Realtek RTS5249 PCIe SD Card Reader"}, { RTSX_RTS5249, RTSX_VERSION " Realtek RTS5249 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS5260, RTSX_VERSION " Realtek RTS5260 PCIe SD Card Reader"}, { RTSX_RTS5260, RTSX_VERSION " Realtek RTS5260 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTL8402, RTSX_VERSION " Realtek RTL8402 PCIe SD Card Reader"}, { RTSX_RTL8402, RTSX_VERSION " Realtek RTL8402 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTL8411, RTSX_VERSION " Realtek RTL8411 PCIe SD Card Reader"}, { RTSX_RTL8411, RTSX_VERSION " Realtek RTL8411 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTL8411B, RTSX_VERSION " Realtek RTL8411B PCIe SD Card Reader"}, { RTSX_RTL8411B, RTSX_VERSION " Realtek RTL8411B PCIe SD Card Reader" },
{ 0, 0, NULL}
}; };
/* See `kenv | grep smbios.system` */ /* See `kenv | grep smbios.system` */
static const struct rtsx_inversion_model { static const struct rtsx_inversion_model {
char *maker; char *maker;
char *family; char *family;
char *product; char *product;
} rtsx_inversion_models[] = { } rtsx_inversion_models[] = {
▲ Show 20 Lines • Show All 3,365 Lines • ▼ Show 20 Lines
* supports. If there is a match, set the description and return success. * supports. If there is a match, set the description and return success.
*/ */
static int static int
rtsx_probe(device_t dev) rtsx_probe(device_t dev)
{ {
uint16_t vendor_id; uint16_t vendor_id;
uint16_t device_id; uint16_t device_id;
int i; int i;
int result;
vendor_id = pci_get_vendor(dev); vendor_id = pci_get_vendor(dev);
device_id = pci_get_device(dev); device_id = pci_get_device(dev);
result = ENXIO; if (vendor_id != RTSX_REALTEK)
for (i = 0; rtsx_devices[i].vendor_id != 0; i++) { return (ENXIO);
if (rtsx_devices[i].vendor_id == vendor_id && for (i = 0; i < nitems(rtsx_ids); i++) {
rtsx_devices[i].device_id == device_id) { if (rtsx_ids[i].device_id == device_id) {
device_set_desc(dev, rtsx_devices[i].desc); device_set_desc(dev, rtsx_ids[i].desc);
result = BUS_PROBE_DEFAULT; return (BUS_PROBE_DEFAULT);
break;
} }
} }
return (ENXIO);
return (result);
} }
/* /*
* Attach function is only called if the probe is successful. * Attach function is only called if the probe is successful.
*/ */
static int static int
rtsx_attach(device_t dev) rtsx_attach(device_t dev)
{ {
▲ Show 20 Lines • Show All 306 Lines • ▼ Show 20 Lines#endif /* MMCCAM */
DEVMETHOD_END DEVMETHOD_END
}; };
static devclass_t rtsx_devclass; static devclass_t rtsx_devclass;
DEFINE_CLASS_0(rtsx, rtsx_driver, rtsx_methods, sizeof(struct rtsx_softc)); DEFINE_CLASS_0(rtsx, rtsx_driver, rtsx_methods, sizeof(struct rtsx_softc));
DRIVER_MODULE(rtsx, pci, rtsx_driver, rtsx_devclass, NULL, NULL); DRIVER_MODULE(rtsx, pci, rtsx_driver, rtsx_devclass, NULL, NULL);
/* For Plug and Play */
MODULE_PNP_INFO("U16:device;D:#;T:vendor=0x10ec", pci, rtsx,
impUnsubmitted
Not Done
Inline Actions

Does this work? I didn't think that you could specify vendor= like this. I can't seem to find the code that parses it like that, can you help me find what I'm overlooking?

imp: Does this work? I didn't think that you could specify vendor= like this. I can't seem to find…
hlh_restart.beAuthorUnsubmitted
Done
Inline Actions

I test it at every boot on my laptop.

I follow
Example 2: Using T for common vendor value
in man MODULE_PNP_INFO

hlh_restart.be: I test it at every boot on my laptop. I follow Example 2: Using T for common vendor value in…
impUnsubmitted
Not Done
Inline Actions

Ah, indeed. I'd forgotten about T.
Then this looks good to me.

imp: Ah, indeed. I'd forgotten about T. Then this looks good to me.
rtsx_ids, nitems(rtsx_ids));
#ifndef MMCCAM #ifndef MMCCAM
MMC_DECLARE_BRIDGE(rtsx); MMC_DECLARE_BRIDGE(rtsx);
#endif /* !MMCCAM */ #endif /* !MMCCAM */
mavUnsubmitted
Done
Inline Actions

It would be better to reuse the list from main probe function above without duplication. I haven't looked closer into the format string of the macro, but I think it should be possible.

mav: It would be better to reuse the list from main probe function above without duplication. I…
View Options

sbin/md5/Makefile

Show First 20 Lines • Show All 168 Lines • ▼ Show 20 Lines
#define RTSX_RTS5249 0x5249 #define RTSX_RTS5249 0x5249
#define RTSX_RTS5260 0x5260 #define RTSX_RTS5260 0x5260
#define RTSX_RTL8402 0x5286 #define RTSX_RTL8402 0x5286
#define RTSX_RTL8411 0x5289 #define RTSX_RTL8411 0x5289
#define RTSX_RTL8411B 0x5287 #define RTSX_RTL8411B 0x5287
#define RTSX_VERSION "2.1g" #define RTSX_VERSION "2.1g"
static const struct rtsx_device { static const struct rtsx_pciids {
uint16_t vendor_id;
uint16_t device_id; uint16_t device_id;
const char *desc; const char *desc;
} rtsx_devices[] = { } rtsx_ids[] = {
{ RTSX_REALTEK, RTSX_RTS5209, RTSX_VERSION " Realtek RTS5209 PCIe SD Card Reader"}, { RTSX_RTS5209, RTSX_VERSION " Realtek RTS5209 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS5227, RTSX_VERSION " Realtek RTS5227 PCIe SD Card Reader"}, { RTSX_RTS5227, RTSX_VERSION " Realtek RTS5227 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS5229, RTSX_VERSION " Realtek RTS5229 PCIe SD Card Reader"}, { RTSX_RTS5229, RTSX_VERSION " Realtek RTS5229 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS522A, RTSX_VERSION " Realtek RTS522A PCIe SD Card Reader"}, { RTSX_RTS522A, RTSX_VERSION " Realtek RTS522A PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS525A, RTSX_VERSION " Realtek RTS525A PCIe SD Card Reader"}, { RTSX_RTS525A, RTSX_VERSION " Realtek RTS525A PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS5249, RTSX_VERSION " Realtek RTS5249 PCIe SD Card Reader"}, { RTSX_RTS5249, RTSX_VERSION " Realtek RTS5249 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTS5260, RTSX_VERSION " Realtek RTS5260 PCIe SD Card Reader"}, { RTSX_RTS5260, RTSX_VERSION " Realtek RTS5260 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTL8402, RTSX_VERSION " Realtek RTL8402 PCIe SD Card Reader"}, { RTSX_RTL8402, RTSX_VERSION " Realtek RTL8402 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTL8411, RTSX_VERSION " Realtek RTL8411 PCIe SD Card Reader"}, { RTSX_RTL8411, RTSX_VERSION " Realtek RTL8411 PCIe SD Card Reader" },
{ RTSX_REALTEK, RTSX_RTL8411B, RTSX_VERSION " Realtek RTL8411B PCIe SD Card Reader"}, { RTSX_RTL8411B, RTSX_VERSION " Realtek RTL8411B PCIe SD Card Reader" },
{ 0, 0, NULL}
}; };
/* See `kenv | grep smbios.system` */ /* See `kenv | grep smbios.system` */
static const struct rtsx_inversion_model { static const struct rtsx_inversion_model {
char *maker; char *maker;
char *family; char *family;
char *product; char *product;
} rtsx_inversion_models[] = { } rtsx_inversion_models[] = {
▲ Show 20 Lines • Show All 3,365 Lines • ▼ Show 20 Lines
* supports. If there is a match, set the description and return success. * supports. If there is a match, set the description and return success.
*/ */
static int static int
rtsx_probe(device_t dev) rtsx_probe(device_t dev)
{ {
uint16_t vendor_id; uint16_t vendor_id;
uint16_t device_id; uint16_t device_id;
int i; int i;
int result;
vendor_id = pci_get_vendor(dev); vendor_id = pci_get_vendor(dev);
device_id = pci_get_device(dev); device_id = pci_get_device(dev);
result = ENXIO; if (vendor_id != RTSX_REALTEK)
for (i = 0; rtsx_devices[i].vendor_id != 0; i++) { return (ENXIO);
if (rtsx_devices[i].vendor_id == vendor_id && for (i = 0; i < nitems(rtsx_ids); i++) {
rtsx_devices[i].device_id == device_id) { if (rtsx_ids[i].device_id == device_id) {
device_set_desc(dev, rtsx_devices[i].desc); device_set_desc(dev, rtsx_ids[i].desc);
result = BUS_PROBE_DEFAULT; return (BUS_PROBE_DEFAULT);
break;
} }
} }
return (ENXIO);
return (result);
} }
/* /*
* Attach function is only called if the probe is successful. * Attach function is only called if the probe is successful.
*/ */
static int static int
rtsx_attach(device_t dev) rtsx_attach(device_t dev)
{ {
▲ Show 20 Lines • Show All 306 Lines • ▼ Show 20 Lines#endif /* MMCCAM */
DEVMETHOD_END DEVMETHOD_END
}; };
static devclass_t rtsx_devclass; static devclass_t rtsx_devclass;
DEFINE_CLASS_0(rtsx, rtsx_driver, rtsx_methods, sizeof(struct rtsx_softc)); DEFINE_CLASS_0(rtsx, rtsx_driver, rtsx_methods, sizeof(struct rtsx_softc));
DRIVER_MODULE(rtsx, pci, rtsx_driver, rtsx_devclass, NULL, NULL); DRIVER_MODULE(rtsx, pci, rtsx_driver, rtsx_devclass, NULL, NULL);
/* For Plug and Play */
MODULE_PNP_INFO("U16:device;D:#;T:vendor=0x10ec", pci, rtsx,
impUnsubmitted
Not Done
Inline Actions

Does this work? I didn't think that you could specify vendor= like this. I can't seem to find the code that parses it like that, can you help me find what I'm overlooking?

imp: Does this work? I didn't think that you could specify vendor= like this. I can't seem to find…
hlh_restart.beAuthorUnsubmitted
Done
Inline Actions

I test it at every boot on my laptop.

I follow
Example 2: Using T for common vendor value
in man MODULE_PNP_INFO

hlh_restart.be: I test it at every boot on my laptop. I follow Example 2: Using T for common vendor value in…
impUnsubmitted
Not Done
Inline Actions

Ah, indeed. I'd forgotten about T.
Then this looks good to me.

imp: Ah, indeed. I'd forgotten about T. Then this looks good to me.
rtsx_ids, nitems(rtsx_ids));
#ifndef MMCCAM #ifndef MMCCAM
MMC_DECLARE_BRIDGE(rtsx); MMC_DECLARE_BRIDGE(rtsx);
#endif /* !MMCCAM */ #endif /* !MMCCAM */
mavUnsubmitted
Done
Inline Actions

It would be better to reuse the list from main probe function above without duplication. I haven't looked closer into the format string of the macro, but I think it should be possible.

mav: It would be better to reuse the list from main probe function above without duplication. I…
View Options

sbin/md5/md5.1

Loading...
View Options

sbin/md5/md5.c

Loading...
View Options

sys/crypto/sha2/sha512c.c

Loading...
View Options

sys/crypto/sha2/sha512t.h

Loading...