Page MenuHomeFreeBSD
Differential D9599

sysutils/py-diffoscope: update to v77
ClosedPublic
Actions

Authored by emaste on Feb 14 2017, 8:42 PM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 21 2025, 4:24 PM
Unknown Object (File)
Dec 15 2024, 9:37 PM
Unknown Object (File)
Oct 17 2024, 1:24 PM
Unknown Object (File)
Oct 3 2024, 1:05 AM
Unknown Object (File)
Sep 7 2024, 5:58 AM
Unknown Object (File)
Sep 5 2024, 1:50 PM
Unknown Object (File)
Aug 31 2024, 3:11 PM
Unknown Object (File)
Aug 17 2024, 6:19 AM
View All 39 Files
Subscribers
None

Details

Reviewers
koobs
bapt
Commits
rP434189: sysutils/py-diffoscope: update to v77
Summary

Security: CVE-2017-0359

See also D9598

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

emaste updated this revision to Diff 25186.Feb 14 2017, 8:42 PM
emaste retitled this revision from to sysutils/py-diffoscope: update to v77.
emaste updated this object.
emaste edited the test plan for this revision. (Show Details)
emaste added reviewers: koobs, bapt.
Closed by commit rP434189: sysutils/py-diffoscope: update to v77 (authored by emaste). · Explain WhyFeb 15 2017, 6:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
2 lines
6 lines

Diff 25186

View Options

Makefile

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
#include <machine/bus.h> #include <machine/bus.h>
#include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h> #include <dev/ofw/ofw_bus_subr.h>
#include <dev/mmc/bridge.h> #include <dev/mmc/bridge.h>
#include <dev/mmc/mmcreg.h> #include <dev/mmc/mmcreg.h>
#include <dev/mmc/mmc_fdt_helpers.h>
#include <dev/sdhci/sdhci.h> #include <dev/sdhci/sdhci.h>
#include "mmcbr_if.h" #include "mmcbr_if.h"
#include "sdhci_if.h" #include "sdhci_if.h"
#include "opt_mmccam.h" #include "opt_mmccam.h"
▲ Show 20 Lines • Show All 91 Lines • ▼ Show 20 Linesstruct bcm_sdhci_softc {
device_t sc_dev; device_t sc_dev;
struct resource * sc_mem_res; struct resource * sc_mem_res;
struct resource * sc_irq_res; struct resource * sc_irq_res;
bus_space_tag_t sc_bst; bus_space_tag_t sc_bst;
bus_space_handle_t sc_bsh; bus_space_handle_t sc_bsh;
void * sc_intrhand; void * sc_intrhand;
struct mmc_request * sc_req; struct mmc_request * sc_req;
struct sdhci_slot sc_slot; struct sdhci_slot sc_slot;
struct mmc_fdt_helper sc_mmc_helper;
int sc_dma_ch; int sc_dma_ch;
bus_dma_tag_t sc_dma_tag; bus_dma_tag_t sc_dma_tag;
bus_dmamap_t sc_dma_map; bus_dmamap_t sc_dma_map;
vm_paddr_t sc_sdhci_buffer_phys; vm_paddr_t sc_sdhci_buffer_phys;
bus_addr_t dmamap_seg_addrs[ALLOCATED_DMA_SEGS]; bus_addr_t dmamap_seg_addrs[ALLOCATED_DMA_SEGS];
bus_size_t dmamap_seg_sizes[ALLOCATED_DMA_SEGS]; bus_size_t dmamap_seg_sizes[ALLOCATED_DMA_SEGS];
int dmamap_seg_count; int dmamap_seg_count;
int dmamap_seg_index; int dmamap_seg_index;
int dmamap_status; int dmamap_status;
uint32_t blksz_and_count; uint32_t blksz_and_count;
uint32_t cmd_and_mode; uint32_t cmd_and_mode;
bool need_update_blk; bool need_update_blk;
#ifdef NOTYET #ifdef NOTYET
device_t clkman; device_t clkman;
#endif #endif
struct bcm_mmc_conf * conf; struct bcm_mmc_conf * conf;
}; };
manuUnsubmitted
Done
Inline Actions

I don't think that you need this one.

manu: I don't think that you need this one.
static int bcm_sdhci_probe(device_t); static int bcm_sdhci_probe(device_t);
static int bcm_sdhci_attach(device_t); static int bcm_sdhci_attach(device_t);
static int bcm_sdhci_detach(device_t); static int bcm_sdhci_detach(device_t);
static void bcm_sdhci_intr(void *); static void bcm_sdhci_intr(void *);
static int bcm_sdhci_get_ro(device_t, device_t); static int bcm_sdhci_get_ro(device_t, device_t);
static void bcm_sdhci_dma_intr(int ch, void *arg); static void bcm_sdhci_dma_intr(int ch, void *arg);
▲ Show 20 Lines • Show All 127 Lines • ▼ Show 20 Lines#endif
sc->sc_slot.caps = SDHCI_CAN_VDD_330 | SDHCI_CAN_VDD_180; sc->sc_slot.caps = SDHCI_CAN_VDD_330 | SDHCI_CAN_VDD_180;
if (bcm2835_sdhci_hs) if (bcm2835_sdhci_hs)
sc->sc_slot.caps |= SDHCI_CAN_DO_HISPD; sc->sc_slot.caps |= SDHCI_CAN_DO_HISPD;
sc->sc_slot.caps |= (default_freq << SDHCI_CLOCK_BASE_SHIFT); sc->sc_slot.caps |= (default_freq << SDHCI_CLOCK_BASE_SHIFT);
sc->sc_slot.quirks = sc->conf->quirks; sc->sc_slot.quirks = sc->conf->quirks;
sdhci_init_slot(dev, &sc->sc_slot, 0); sdhci_init_slot(dev, &sc->sc_slot, 0);
mmc_fdt_parse(dev, 0, &sc->sc_mmc_helper, &sc->sc_slot.host);
sc->sc_dma_ch = bcm_dma_allocate(BCM_DMA_CH_ANY); sc->sc_dma_ch = bcm_dma_allocate(BCM_DMA_CH_ANY);
if (sc->sc_dma_ch == BCM_DMA_CH_INVALID) if (sc->sc_dma_ch == BCM_DMA_CH_INVALID)
goto fail; goto fail;
err = bcm_dma_setup_intr(sc->sc_dma_ch, bcm_sdhci_dma_intr, sc); err = bcm_dma_setup_intr(sc->sc_dma_ch, bcm_sdhci_dma_intr, sc);
if (err != 0) { if (err != 0) {
device_printf(dev, device_printf(dev,
▲ Show 20 Lines • Show All 58 Lines • ▼ Show 20 Lines
bcm_sdhci_intr(void *arg) bcm_sdhci_intr(void *arg)
{ {
struct bcm_sdhci_softc *sc = arg; struct bcm_sdhci_softc *sc = arg;
sdhci_generic_intr(&sc->sc_slot); sdhci_generic_intr(&sc->sc_slot);
} }
static int static int
bcm_sdhci_update_ios(device_t bus, device_t child)
{
struct bcm_sdhci_softc *sc;
struct mmc_ios *ios;
int rv;
sc = device_get_softc(bus);
ios = &sc->sc_slot.host.ios;
if (ios->power_mode == power_up) {
if (sc->sc_mmc_helper.vmmc_supply)
regulator_enable(sc->sc_mmc_helper.vmmc_supply);
if (sc->sc_mmc_helper.vqmmc_supply)
regulator_enable(sc->sc_mmc_helper.vqmmc_supply);
}
rv = sdhci_generic_update_ios(bus, child);
if (rv != 0)
return (rv);
if (ios->power_mode == power_off) {
if (sc->sc_mmc_helper.vmmc_supply)
regulator_disable(sc->sc_mmc_helper.vmmc_supply);
if (sc->sc_mmc_helper.vqmmc_supply)
regulator_disable(sc->sc_mmc_helper.vqmmc_supply);
}
return (0);
}
static int
bcm_sdhci_get_ro(device_t bus, device_t child) bcm_sdhci_get_ro(device_t bus, device_t child)
{ {
return (0); return (0);
} }
static inline uint32_t static inline uint32_t
RD4(struct bcm_sdhci_softc *sc, bus_size_t off) RD4(struct bcm_sdhci_softc *sc, bus_size_t off)
▲ Show 20 Lines • Show All 382 Lines • ▼ Show 20 Linesstatic device_method_t bcm_sdhci_methods[] = {
DEVMETHOD(device_detach, bcm_sdhci_detach), DEVMETHOD(device_detach, bcm_sdhci_detach),
/* Bus interface */ /* Bus interface */
DEVMETHOD(bus_read_ivar, sdhci_generic_read_ivar), DEVMETHOD(bus_read_ivar, sdhci_generic_read_ivar),
DEVMETHOD(bus_write_ivar, sdhci_generic_write_ivar), DEVMETHOD(bus_write_ivar, sdhci_generic_write_ivar),
DEVMETHOD(bus_add_child, bus_generic_add_child), DEVMETHOD(bus_add_child, bus_generic_add_child),
/* MMC bridge interface */ /* MMC bridge interface */
DEVMETHOD(mmcbr_update_ios, sdhci_generic_update_ios), DEVMETHOD(mmcbr_update_ios, bcm_sdhci_update_ios),
DEVMETHOD(mmcbr_request, sdhci_generic_request), DEVMETHOD(mmcbr_request, sdhci_generic_request),
DEVMETHOD(mmcbr_get_ro, bcm_sdhci_get_ro), DEVMETHOD(mmcbr_get_ro, bcm_sdhci_get_ro),
DEVMETHOD(mmcbr_acquire_host, sdhci_generic_acquire_host), DEVMETHOD(mmcbr_acquire_host, sdhci_generic_acquire_host),
DEVMETHOD(mmcbr_release_host, sdhci_generic_release_host), DEVMETHOD(mmcbr_release_host, sdhci_generic_release_host),
/* Platform transfer methods */ /* Platform transfer methods */
DEVMETHOD(sdhci_platform_will_handle, bcm_sdhci_will_handle_transfer), DEVMETHOD(sdhci_platform_will_handle, bcm_sdhci_will_handle_transfer),
DEVMETHOD(sdhci_platform_start_transfer, bcm_sdhci_start_transfer), DEVMETHOD(sdhci_platform_start_transfer, bcm_sdhci_start_transfer),
Show All 31 Lines
View Options

distinfo

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
#include <machine/bus.h> #include <machine/bus.h>
#include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h> #include <dev/ofw/ofw_bus_subr.h>
#include <dev/mmc/bridge.h> #include <dev/mmc/bridge.h>
#include <dev/mmc/mmcreg.h> #include <dev/mmc/mmcreg.h>
#include <dev/mmc/mmc_fdt_helpers.h>
#include <dev/sdhci/sdhci.h> #include <dev/sdhci/sdhci.h>
#include "mmcbr_if.h" #include "mmcbr_if.h"
#include "sdhci_if.h" #include "sdhci_if.h"
#include "opt_mmccam.h" #include "opt_mmccam.h"
▲ Show 20 Lines • Show All 91 Lines • ▼ Show 20 Linesstruct bcm_sdhci_softc {
device_t sc_dev; device_t sc_dev;
struct resource * sc_mem_res; struct resource * sc_mem_res;
struct resource * sc_irq_res; struct resource * sc_irq_res;
bus_space_tag_t sc_bst; bus_space_tag_t sc_bst;
bus_space_handle_t sc_bsh; bus_space_handle_t sc_bsh;
void * sc_intrhand; void * sc_intrhand;
struct mmc_request * sc_req; struct mmc_request * sc_req;
struct sdhci_slot sc_slot; struct sdhci_slot sc_slot;
struct mmc_fdt_helper sc_mmc_helper;
int sc_dma_ch; int sc_dma_ch;
bus_dma_tag_t sc_dma_tag; bus_dma_tag_t sc_dma_tag;
bus_dmamap_t sc_dma_map; bus_dmamap_t sc_dma_map;
vm_paddr_t sc_sdhci_buffer_phys; vm_paddr_t sc_sdhci_buffer_phys;
bus_addr_t dmamap_seg_addrs[ALLOCATED_DMA_SEGS]; bus_addr_t dmamap_seg_addrs[ALLOCATED_DMA_SEGS];
bus_size_t dmamap_seg_sizes[ALLOCATED_DMA_SEGS]; bus_size_t dmamap_seg_sizes[ALLOCATED_DMA_SEGS];
int dmamap_seg_count; int dmamap_seg_count;
int dmamap_seg_index; int dmamap_seg_index;
int dmamap_status; int dmamap_status;
uint32_t blksz_and_count; uint32_t blksz_and_count;
uint32_t cmd_and_mode; uint32_t cmd_and_mode;
bool need_update_blk; bool need_update_blk;
#ifdef NOTYET #ifdef NOTYET
device_t clkman; device_t clkman;
#endif #endif
struct bcm_mmc_conf * conf; struct bcm_mmc_conf * conf;
}; };
manuUnsubmitted
Done
Inline Actions

I don't think that you need this one.

manu: I don't think that you need this one.
static int bcm_sdhci_probe(device_t); static int bcm_sdhci_probe(device_t);
static int bcm_sdhci_attach(device_t); static int bcm_sdhci_attach(device_t);
static int bcm_sdhci_detach(device_t); static int bcm_sdhci_detach(device_t);
static void bcm_sdhci_intr(void *); static void bcm_sdhci_intr(void *);
static int bcm_sdhci_get_ro(device_t, device_t); static int bcm_sdhci_get_ro(device_t, device_t);
static void bcm_sdhci_dma_intr(int ch, void *arg); static void bcm_sdhci_dma_intr(int ch, void *arg);
▲ Show 20 Lines • Show All 127 Lines • ▼ Show 20 Lines#endif
sc->sc_slot.caps = SDHCI_CAN_VDD_330 | SDHCI_CAN_VDD_180; sc->sc_slot.caps = SDHCI_CAN_VDD_330 | SDHCI_CAN_VDD_180;
if (bcm2835_sdhci_hs) if (bcm2835_sdhci_hs)
sc->sc_slot.caps |= SDHCI_CAN_DO_HISPD; sc->sc_slot.caps |= SDHCI_CAN_DO_HISPD;
sc->sc_slot.caps |= (default_freq << SDHCI_CLOCK_BASE_SHIFT); sc->sc_slot.caps |= (default_freq << SDHCI_CLOCK_BASE_SHIFT);
sc->sc_slot.quirks = sc->conf->quirks; sc->sc_slot.quirks = sc->conf->quirks;
sdhci_init_slot(dev, &sc->sc_slot, 0); sdhci_init_slot(dev, &sc->sc_slot, 0);
mmc_fdt_parse(dev, 0, &sc->sc_mmc_helper, &sc->sc_slot.host);
sc->sc_dma_ch = bcm_dma_allocate(BCM_DMA_CH_ANY); sc->sc_dma_ch = bcm_dma_allocate(BCM_DMA_CH_ANY);
if (sc->sc_dma_ch == BCM_DMA_CH_INVALID) if (sc->sc_dma_ch == BCM_DMA_CH_INVALID)
goto fail; goto fail;
err = bcm_dma_setup_intr(sc->sc_dma_ch, bcm_sdhci_dma_intr, sc); err = bcm_dma_setup_intr(sc->sc_dma_ch, bcm_sdhci_dma_intr, sc);
if (err != 0) { if (err != 0) {
device_printf(dev, device_printf(dev,
▲ Show 20 Lines • Show All 58 Lines • ▼ Show 20 Lines
bcm_sdhci_intr(void *arg) bcm_sdhci_intr(void *arg)
{ {
struct bcm_sdhci_softc *sc = arg; struct bcm_sdhci_softc *sc = arg;
sdhci_generic_intr(&sc->sc_slot); sdhci_generic_intr(&sc->sc_slot);
} }
static int static int
bcm_sdhci_update_ios(device_t bus, device_t child)
{
struct bcm_sdhci_softc *sc;
struct mmc_ios *ios;
int rv;
sc = device_get_softc(bus);
ios = &sc->sc_slot.host.ios;
if (ios->power_mode == power_up) {
if (sc->sc_mmc_helper.vmmc_supply)
regulator_enable(sc->sc_mmc_helper.vmmc_supply);
if (sc->sc_mmc_helper.vqmmc_supply)
regulator_enable(sc->sc_mmc_helper.vqmmc_supply);
}
rv = sdhci_generic_update_ios(bus, child);
if (rv != 0)
return (rv);
if (ios->power_mode == power_off) {
if (sc->sc_mmc_helper.vmmc_supply)
regulator_disable(sc->sc_mmc_helper.vmmc_supply);
if (sc->sc_mmc_helper.vqmmc_supply)
regulator_disable(sc->sc_mmc_helper.vqmmc_supply);
}
return (0);
}
static int
bcm_sdhci_get_ro(device_t bus, device_t child) bcm_sdhci_get_ro(device_t bus, device_t child)
{ {
return (0); return (0);
} }
static inline uint32_t static inline uint32_t
RD4(struct bcm_sdhci_softc *sc, bus_size_t off) RD4(struct bcm_sdhci_softc *sc, bus_size_t off)
▲ Show 20 Lines • Show All 382 Lines • ▼ Show 20 Linesstatic device_method_t bcm_sdhci_methods[] = {
DEVMETHOD(device_detach, bcm_sdhci_detach), DEVMETHOD(device_detach, bcm_sdhci_detach),
/* Bus interface */ /* Bus interface */
DEVMETHOD(bus_read_ivar, sdhci_generic_read_ivar), DEVMETHOD(bus_read_ivar, sdhci_generic_read_ivar),
DEVMETHOD(bus_write_ivar, sdhci_generic_write_ivar), DEVMETHOD(bus_write_ivar, sdhci_generic_write_ivar),
DEVMETHOD(bus_add_child, bus_generic_add_child), DEVMETHOD(bus_add_child, bus_generic_add_child),
/* MMC bridge interface */ /* MMC bridge interface */
DEVMETHOD(mmcbr_update_ios, sdhci_generic_update_ios), DEVMETHOD(mmcbr_update_ios, bcm_sdhci_update_ios),
DEVMETHOD(mmcbr_request, sdhci_generic_request), DEVMETHOD(mmcbr_request, sdhci_generic_request),
DEVMETHOD(mmcbr_get_ro, bcm_sdhci_get_ro), DEVMETHOD(mmcbr_get_ro, bcm_sdhci_get_ro),
DEVMETHOD(mmcbr_acquire_host, sdhci_generic_acquire_host), DEVMETHOD(mmcbr_acquire_host, sdhci_generic_acquire_host),
DEVMETHOD(mmcbr_release_host, sdhci_generic_release_host), DEVMETHOD(mmcbr_release_host, sdhci_generic_release_host),
/* Platform transfer methods */ /* Platform transfer methods */
DEVMETHOD(sdhci_platform_will_handle, bcm_sdhci_will_handle_transfer), DEVMETHOD(sdhci_platform_will_handle, bcm_sdhci_will_handle_transfer),
DEVMETHOD(sdhci_platform_start_transfer, bcm_sdhci_start_transfer), DEVMETHOD(sdhci_platform_start_transfer, bcm_sdhci_start_transfer),
Show All 31 Lines