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

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2023-12-05 13:40:24 +00:00
parent 005bcb25db
commit bd69b5651c
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
15 changed files with 217 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sys/dev/mii/eephy.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: eephy.c,v 1.60 2022/04/06 18:59:29 naddy Exp $ */
/* $OpenBSD: eephy.c,v 1.61 2023/12/05 11:06:05 uwe Exp $ */
/*
* Principal Author: Parag Patel
* Copyright (c) 2001
@ -290,11 +290,8 @@ eephy_reset(struct mii_softc *sc)
/*
* Do a software reset for these settings to take effect.
* Disable autonegotiation, such that all capabilities get
* advertised when it is switched back on.
*/
reg = PHY_READ(sc, E1000_CR);
reg &= ~E1000_CR_AUTO_NEG_ENABLE;
PHY_WRITE(sc, E1000_CR, reg | E1000_CR_RESET);
}

13
sys/dev/pci/drm/i915/gt/intel_gt.c
View file

@ -909,8 +909,6 @@ int intel_gt_probe_all(struct drm_i915_private *i915)
err:
i915_probe_error(i915, "Failed to initialize %s! (%d)\n", gtdef->name, ret);
intel_gt_release_all(i915);
return ret;
}
@ -1006,8 +1004,6 @@ int intel_gt_probe_all(struct drm_i915_private *i915)
err:
i915_probe_error(i915, "Failed to initialize %s! (%d)\n", gtdef->name, ret);
intel_gt_release_all(i915);
return ret;
}
@ -1028,15 +1024,6 @@ int intel_gt_tiles_init(struct drm_i915_private *i915)
return 0;
}
void intel_gt_release_all(struct drm_i915_private *i915)
{
struct intel_gt *gt;
unsigned int id;
for_each_gt(gt, i915, id)
i915->gt[id] = NULL;
}
void intel_gt_info_print(const struct intel_gt_info *info,
struct drm_printer *p)
{

8
sys/dev/pci/drm/i915/i915_driver.c
View file

@ -935,7 +935,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
ret = i915_driver_mmio_probe(i915);
if (ret < 0)
goto out_tiles_cleanup;
goto out_runtime_pm_put;
ret = i915_driver_hw_probe(i915);
if (ret < 0)
@ -993,8 +993,6 @@ out_cleanup_hw:
i915_ggtt_driver_late_release(i915);
out_cleanup_mmio:
i915_driver_mmio_release(i915);
out_tiles_cleanup:
intel_gt_release_all(i915);
out_runtime_pm_put:
enable_rpm_wakeref_asserts(&i915->runtime_pm);
i915_driver_late_release(i915);
@ -1047,7 +1045,7 @@ int i915_driver_probe(struct drm_i915_private *i915, const struct pci_device_id
ret = i915_driver_mmio_probe(i915);
if (ret < 0)
goto out_tiles_cleanup;
goto out_runtime_pm_put;
ret = i915_driver_hw_probe(i915);
if (ret < 0)
@ -1107,8 +1105,6 @@ out_cleanup_hw:
i915_ggtt_driver_late_release(i915);
out_cleanup_mmio:
i915_driver_mmio_release(i915);
out_tiles_cleanup:
intel_gt_release_all(i915);
out_runtime_pm_put:
enable_rpm_wakeref_asserts(&i915->runtime_pm);
i915_driver_late_release(i915);

3
sys/dev/pci/if_vr.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_vr.c,v 1.159 2022/03/11 18:00:50 mpi Exp $ */
/* $OpenBSD: if_vr.c,v 1.160 2023/12/05 13:43:39 kevlo Exp $ */
/*
* Copyright (c) 1997, 1998
@ -1603,6 +1603,7 @@ vr_stop(struct vr_softc *sc)
ifp->if_timer = 0;
timeout_del(&sc->sc_to);
timeout_del(&sc->sc_rxto);
ifp->if_flags &= ~IFF_RUNNING;
ifq_clr_oactive(&ifp->if_snd);

12
sys/dev/usb/uthum.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uthum.c,v 1.38 2022/01/09 05:43:02 jsg Exp $ */
/* $OpenBSD: uthum.c,v 1.39 2023/12/04 05:28:25 mglocker Exp $ */
/*
* Copyright (c) 2009, 2010 Yojiro UO <yuo@nui.org>
@ -742,8 +742,16 @@ uthum_refresh_temperntc(struct uthum_softc *sc, int sensor)
int
uthum_ds75_temp(uint8_t msb, uint8_t lsb)
{
int val;
/* DS75: 12bit precision mode : 0.0625 degrees Celsius ticks */
return (msb * 100) + ((lsb >> 4) * 25 / 4);
val = (msb << 8) | lsb;
if (val >= 32768)
val = val - 65536;
val = (val * 100) >> 8;
return val;
}
/* return C-degree * 100 value */