Merge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' into staging (2d6838e8) · Commits · SUMMER2020 / students / proj-2021291

default-configs/ppc-softmmu.mak

+2 −2

Original line number	Diff line number	Diff line
		@@ -45,8 +45,8 @@ CONFIG_PREP=y
		CONFIG_MAC=y
		CONFIG_E500=y
		CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
		CONFIG_ETSEC=y
		CONFIG_LIBDECNUMBER=y
		# For PReP
		CONFIG_MC146818RTC=y
		CONFIG_ETSEC=y
		CONFIG_ISA_TESTDEV=y
		CONFIG_LIBDECNUMBER=y

default-configs/ppc64-softmmu.mak

+2 −1

Original line number	Diff line number	Diff line
		@@ -46,6 +46,8 @@ CONFIG_PREP=y
		CONFIG_MAC=y
		CONFIG_E500=y
		CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
		CONFIG_ETSEC=y
		CONFIG_LIBDECNUMBER=y
		# For pSeries
		CONFIG_XICS=$(CONFIG_PSERIES)
		CONFIG_XICS_KVM=$(and $(CONFIG_PSERIES),$(CONFIG_KVM))
		@@ -58,4 +60,3 @@ CONFIG_I82374=y
		CONFIG_I8257=y
		CONFIG_MC146818RTC=y
		CONFIG_ISA_TESTDEV=y
		CONFIG_LIBDECNUMBER=y

hw/core/loader.c

+21 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,27 @@ int load_image(const char filename, uint8_t addr)
		return size;
		}

		/* return the size or -1 if error */
		ssize_t load_image_size(const char filename, void addr, size_t size)
		{
		int fd;
		ssize_t actsize;

		fd = open(filename, O_RDONLY \| O_BINARY);
		if (fd < 0) {
		return -1;
		}

		actsize = read(fd, addr, size);
		if (actsize < 0) {
		close(fd);
		return -1;
		}
		close(fd);

		return actsize;
		}

		/* read()-like version */
		ssize_t read_targphys(const char *name,
		int fd, hwaddr dst_addr, size_t nbytes)

hw/misc/macio/cuda.c

+20 −3

Original line number	Diff line number	Diff line
		@@ -123,13 +123,22 @@ static void cuda_update_irq(CUDAState *s)
		}
		}

		static uint64_t get_tb(uint64_t freq)
		{
		return muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL),
		freq, get_ticks_per_sec());
		}

		static unsigned int get_counter(CUDATimer *s)
		{
		int64_t d;
		unsigned int counter;
		uint64_t tb_diff;

		/* Reverse of the tb calculation algorithm that Mac OS X uses on bootup. */
		tb_diff = get_tb(s->frequency) - s->load_time;
		d = (tb_diff * 0xBF401675E5DULL) / (s->frequency << 24);

		d = muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - s->load_time,
		CUDA_TIMER_FREQ, get_ticks_per_sec());
		if (s->index == 0) {
		/* the timer goes down from latch to -1 (period of latch + 2) */
		if (d <= (s->counter_value + 1)) {
		@@ -147,7 +156,7 @@ static unsigned int get_counter(CUDATimer *s)
		static void set_counter(CUDAState s, CUDATimer ti, unsigned int val)
		{
		CUDA_DPRINTF("T%d.counter=%d\n", 1 + (ti->timer == NULL), val);
		ti->load_time = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
		ti->load_time = get_tb(s->frequency);
		ti->counter_value = val;
		cuda_timer_update(s, ti, ti->load_time);
		}
		@@ -688,6 +697,8 @@ static void cuda_realizefn(DeviceState dev, Error *errp)
		struct tm tm;

		s->timers[0].timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, cuda_timer1, s);
		s->timers[0].frequency = s->frequency;
		s->timers[1].frequency = s->frequency;

		qemu_get_timedate(&tm, 0);
		s->tick_offset = (uint32_t)mktimegm(&tm) + RTC_OFFSET;
		@@ -713,6 +724,11 @@ static void cuda_initfn(Object *obj)
		DEVICE(obj), "adb.0");
		}

		static Property cuda_properties[] = {
		DEFINE_PROP_UINT64("frequency", CUDAState, frequency, 0),
		DEFINE_PROP_END_OF_LIST()
		};

		static void cuda_class_init(ObjectClass oc, void data)
		{
		DeviceClass *dc = DEVICE_CLASS(oc);
		@@ -720,6 +736,7 @@ static void cuda_class_init(ObjectClass oc, void data)
		dc->realize = cuda_realizefn;
		dc->reset = cuda_reset;
		dc->vmsd = &vmstate_cuda;
		dc->props = cuda_properties;
		}

		static const TypeInfo cuda_type_info = {

hw/misc/macio/macio.c

+17 −2

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ typedef struct MacIOState
		void *dbdma;
		MemoryRegion *pic_mem;
		MemoryRegion *escc_mem;
		uint64_t frequency;
		} MacIOState;

		#define OLDWORLD_MACIO(obj) \
		@@ -243,13 +244,18 @@ static void timer_write(void *opaque, hwaddr addr, uint64_t value,
		static uint64_t timer_read(void *opaque, hwaddr addr, unsigned size)
		{
		uint32_t value = 0;
		uint64_t systime = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
		uint64_t kltime;

		kltime = muldiv64(systime, 4194300, get_ticks_per_sec() * 4);
		kltime = muldiv64(kltime, 18432000, 1048575);

		switch (addr) {
		case 0x38:
		value = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
		value = kltime;
		break;
		case 0x3c:
		value = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) >> 32;
		value = kltime >> 32;
		break;
		}

		@@ -346,12 +352,19 @@ static void macio_newworld_class_init(ObjectClass oc, void data)
		pdc->device_id = PCI_DEVICE_ID_APPLE_UNI_N_KEYL;
		}

		static Property macio_properties[] = {
		DEFINE_PROP_UINT64("frequency", MacIOState, frequency, 0),
		DEFINE_PROP_END_OF_LIST()
		};

		static void macio_class_init(ObjectClass klass, void data)
		{
		PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
		DeviceClass *dc = DEVICE_CLASS(klass);

		k->vendor_id = PCI_VENDOR_ID_APPLE;
		k->class_id = PCI_CLASS_OTHERS << 8;
		dc->props = macio_properties;
		}

		static const TypeInfo macio_oldworld_type_info = {
		@@ -398,6 +411,8 @@ void macio_init(PCIDevice *d,
		macio_state->escc_mem = escc_mem;
		/* Note: this code is strongly inspirated from the corresponding code
		in PearPC */
		qdev_prop_set_uint64(DEVICE(&macio_state->cuda), "frequency",
		macio_state->frequency);

		qdev_init_nofail(DEVICE(d));
		}