SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync code with last fixes and improvements from OpenBSD

Browse source
This commit is contained in:
purplerain 2023-08-11 09:11:00 +00:00
parent 371ae113c6
commit 454dab66ed
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
95 changed files with 1784 additions and 2042 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sys/dev/pci/drm/i915/gem/i915_gem_phys.c
View file

@ -205,7 +205,12 @@ i915_gem_object_put_pages_phys(struct drm_i915_gem_object *obj,
int i915_gem_object_pwrite_phys(struct drm_i915_gem_object *obj,
const struct drm_i915_gem_pwrite *args)
{
#ifdef __linux__
void *vaddr = sg_page(obj->mm.pages->sgl) + args->offset;
#else
struct drm_dmamem *dmah = (void *)sg_page(obj->mm.pages->sgl);
void *vaddr = dmah->kva + args->offset;
#endif
char __user *user_data = u64_to_user_ptr(args->data_ptr);
struct drm_i915_private *i915 = to_i915(obj->base.dev);
int err;
@ -236,7 +241,12 @@ int i915_gem_object_pwrite_phys(struct drm_i915_gem_object *obj,
int i915_gem_object_pread_phys(struct drm_i915_gem_object *obj,
const struct drm_i915_gem_pread *args)
{
#ifdef __linux__
void *vaddr = sg_page(obj->mm.pages->sgl) + args->offset;
#else
struct drm_dmamem *dmah = (void *)sg_page(obj->mm.pages->sgl);
void *vaddr = dmah->kva + args->offset;
#endif
char __user *user_data = u64_to_user_ptr(args->data_ptr);
int err;

6
sys/dev/pci/pcidevs
View file

@ -1,4 +1,4 @@
$OpenBSD: pcidevs,v 1.2044 2023/08/06 14:40:25 jsg Exp $
$OpenBSD: pcidevs,v 1.2045 2023/08/09 21:27:47 kmos Exp $
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
/*
@ -386,6 +386,7 @@ vendor ATRONICS 0x907f Atronics
vendor NETMOS 0x9710 NetMos
vendor 3COM2 0xa727 3Com
vendor PARALLELS 0xaaaa Parallels
vendor CRUCIAL 0xc0a9 Crucial
vendor TIGERJET 0xe159 TigerJet Network
vendor ENDACE 0xeace Endace
vendor BELKIN 0xec80 Belkin Components
@ -2875,6 +2876,9 @@ product CREATIVELABS SBJOY3 0x7005 PCI Gameport Joystick
product CREATIVELABS PPB 0x7006 PCIE-PCI
product CREATIVELABS EV1938 0x8938 Ectiva 1938
/* Crucial products */
product CRUCIAL P5PLUS 0x5407 P5 Plus
/* Cyclades products */
product CYCLADES CYCLOMY_1 0x0100 Cyclom-Y below 1M
product CYCLADES CYCLOMY_2 0x0101 Cyclom-Y

6
sys/dev/pci/pcidevs.h
View file

@ -2,7 +2,7 @@
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
* OpenBSD: pcidevs,v 1.2044 2023/08/06 14:40:25 jsg Exp
* OpenBSD: pcidevs,v 1.2045 2023/08/09 21:27:47 kmos Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@ -391,6 +391,7 @@
#define PCI_VENDOR_NETMOS 0x9710 /* NetMos */
#define PCI_VENDOR_3COM2 0xa727 /* 3Com */
#define PCI_VENDOR_PARALLELS 0xaaaa /* Parallels */
#define PCI_VENDOR_CRUCIAL 0xc0a9 /* Crucial */
#define PCI_VENDOR_TIGERJET 0xe159 /* TigerJet Network */
#define PCI_VENDOR_ENDACE 0xeace /* Endace */
#define PCI_VENDOR_BELKIN 0xec80 /* Belkin Components */
@ -2880,6 +2881,9 @@
#define PCI_PRODUCT_CREATIVELABS_PPB 0x7006 /* PCIE-PCI */
#define PCI_PRODUCT_CREATIVELABS_EV1938 0x8938 /* Ectiva 1938 */
/* Crucial products */
#define PCI_PRODUCT_CRUCIAL_P5PLUS 0x5407 /* P5 Plus */
/* Cyclades products */
#define PCI_PRODUCT_CYCLADES_CYCLOMY_1 0x0100 /* Cyclom-Y below 1M */
#define PCI_PRODUCT_CYCLADES_CYCLOMY_2 0x0101 /* Cyclom-Y */

10
sys/dev/pci/pcidevs_data.h
View file

@ -2,7 +2,7 @@
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
* OpenBSD: pcidevs,v 1.2044 2023/08/06 14:40:25 jsg Exp
* OpenBSD: pcidevs,v 1.2045 2023/08/09 21:27:47 kmos Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@ -9327,6 +9327,10 @@ static const struct pci_known_product pci_known_products[] = {
PCI_VENDOR_CREATIVELABS, PCI_PRODUCT_CREATIVELABS_EV1938,
"Ectiva 1938",
},
{
PCI_VENDOR_CRUCIAL, PCI_PRODUCT_CRUCIAL_P5PLUS,
"P5 Plus",
},
{
PCI_VENDOR_CYCLADES, PCI_PRODUCT_CYCLADES_CYCLOMY_1,
"Cyclom-Y below 1M",
@ -36335,6 +36339,10 @@ static const struct pci_known_vendor pci_known_vendors[] = {
PCI_VENDOR_PARALLELS,
"Parallels",
},
{
PCI_VENDOR_CRUCIAL,
"Crucial",
},
{
PCI_VENDOR_TIGERJET,
"TigerJet Network",