From nobody Fri May 3 06:16:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149763943385171.26208819847159; Fri, 16 Jun 2017 11:57:13 -0700 (PDT) Received: from localhost ([::1]:60367 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLwQi-0005Nv-Bn for importer@patchew.org; Fri, 16 Jun 2017 14:57:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLwP8-0004UC-0B for qemu-devel@nongnu.org; Fri, 16 Jun 2017 14:55:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLwP4-0006Vn-VT for qemu-devel@nongnu.org; Fri, 16 Jun 2017 14:55:34 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:35154) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLwP4-0006VT-Oa for qemu-devel@nongnu.org; Fri, 16 Jun 2017 14:55:30 -0400 Received: by mail-qt0-x243.google.com with SMTP id x58so12311428qtc.2 for ; Fri, 16 Jun 2017 11:55:30 -0700 (PDT) Received: from HEDWIG.ini.cmu.edu (HEDWIG.INI.CMU.EDU. [128.2.16.51]) by smtp.gmail.com with ESMTPSA id p24sm1761565qki.49.2017.06.16.11.55.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Jun 2017 11:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M0hrBPj98L0Abphw0y7Hb8yBcCDe37S+V9NYSxSOSM0=; b=LIE5qPshAL2h93nlAPzf6oOtLUi92bZ426wFOVvNdpBlPpadbtOiT1xAHTidMT2cdx 0vCEJwt24FUAyr3PSVcmzd+nX4v5q45c7mFqIA8MiTwUU/UxlqXtQBJBwbRn5KC4bkZz /Nb+/eERroer/EVCp7N8r68BywdIoDh1Je8tVbv/ZJ8qTOEvCYYmBtzKgkzQbkfGED+Z gT0xr5jcVwhptqHT3gHJzLl9A3iHOI8yC4v2g1ThR+2Whnk4l5NdFZAB94+LDcPd0k5G xAC1xUur//HHlJnnYaov2mU0snnnbWkoQIA4Qj3FASQc/uRZDTR/bqBBEidevtbWx+X4 9GBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M0hrBPj98L0Abphw0y7Hb8yBcCDe37S+V9NYSxSOSM0=; b=ZDbPCUr67UqXOCQWWwaf11UVi8Iklo+Atwqth7eD0KfVEdwnlyNbfrWLkvjAyeei49 tO0vIL5AslzX/NjmF7F+IWW2WBalJxTHWnVq+3EV3mopBgYuLInqL53dz5vd/zZ/ADUs Xt0Uy++JiGgmcvKUkFanx6pVnsBHckiPaFNy+j/Ccv5eZjh5F3ct2JoWi+XT35xkryWH Nm9jRZuuyZRDlCkUfdvpdE5aAUNzb6Z+tVoCzTh08fWOhg4+UJjsYlHFmUAHmD3wn/rU uloxNz+0pvs4MfbZ5SPkakJiAUfKeQwPfQ9XAZ0/e3UBUKbUrDjfGD4hsLh5BFlA4C6T OhMg== X-Gm-Message-State: AKS2vOyuCHQcMa6DAMkGaLLfiNUsFwJ5KMbmAGBlZZrlCiKXCnWcZO5H BPK1Yh6aRr3oM4/m X-Received: by 10.55.148.67 with SMTP id w64mr14375414qkd.160.1497639329786; Fri, 16 Jun 2017 11:55:29 -0700 (PDT) From: "Gabriel L. Somlo" To: qemu-devel@nongnu.org Date: Fri, 16 Jun 2017 14:55:14 -0400 Message-Id: <1497639316-22202-2-git-send-email-gsomlo@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497639316-22202-1-git-send-email-gsomlo@gmail.com> References: <1497639316-22202-1-git-send-email-gsomlo@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v3 1/3] applesmc: cosmetic whitespace and indentation cleanup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, eshelton@pobox.com, agraf@suse.de, f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Gabriel Somlo Reviewed-by: Alexander Graf Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Phil Dennis-Jordan --- hw/misc/applesmc.c | 98 ++++++++++++++++++++++++++++----------------------= ---- 1 file changed, 50 insertions(+), 48 deletions(-) diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c index 77fab5b..6381197 100644 --- a/hw/misc/applesmc.c +++ b/hw/misc/applesmc.c @@ -39,21 +39,24 @@ /* #define DEBUG_SMC */ =20 #define APPLESMC_DEFAULT_IOBASE 0x300 -/* data port used by Apple SMC */ -#define APPLESMC_DATA_PORT 0x0 -/* command/status port used by Apple SMC */ -#define APPLESMC_CMD_PORT 0x4 -#define APPLESMC_NR_PORTS 32 =20 -#define APPLESMC_READ_CMD 0x10 -#define APPLESMC_WRITE_CMD 0x11 -#define APPLESMC_GET_KEY_BY_INDEX_CMD 0x12 -#define APPLESMC_GET_KEY_TYPE_CMD 0x13 +enum { + APPLESMC_DATA_PORT =3D 0x00, + APPLESMC_CMD_PORT =3D 0x04, + APPLESMC_NUM_PORTS =3D 0x20, +}; + +enum { + APPLESMC_READ_CMD =3D 0x10, + APPLESMC_WRITE_CMD =3D 0x11, + APPLESMC_GET_KEY_BY_INDEX_CMD =3D 0x12, + APPLESMC_GET_KEY_TYPE_CMD =3D 0x13, +}; =20 #ifdef DEBUG_SMC #define smc_debug(...) fprintf(stderr, "AppleSMC: " __VA_ARGS__) #else -#define smc_debug(...) do { } while(0) +#define smc_debug(...) do { } while (0) #endif =20 static char default_osk[64] =3D "This is a dummy key. Enter the real key " @@ -77,12 +80,11 @@ struct AppleSMCState { uint32_t iobase; uint8_t cmd; uint8_t status; - uint8_t key[4]; + char key[4]; uint8_t read_pos; uint8_t data_len; uint8_t data_pos; uint8_t data[255]; - uint8_t charactic[4]; char *osk; QLIST_HEAD(, AppleSMCData) data_def; }; @@ -93,10 +95,10 @@ static void applesmc_io_cmd_write(void *opaque, hwaddr = addr, uint64_t val, AppleSMCState *s =3D opaque; =20 smc_debug("CMD Write B: %#x =3D %#x\n", addr, val); - switch(val) { - case APPLESMC_READ_CMD: - s->status =3D 0x0c; - break; + switch (val) { + case APPLESMC_READ_CMD: + s->status =3D 0x0c; + break; } s->cmd =3D val; s->read_pos =3D 0; @@ -123,54 +125,54 @@ static void applesmc_io_data_write(void *opaque, hwad= dr addr, uint64_t val, AppleSMCState *s =3D opaque; =20 smc_debug("DATA Write B: %#x =3D %#x\n", addr, val); - switch(s->cmd) { - case APPLESMC_READ_CMD: - if(s->read_pos < 4) { - s->key[s->read_pos] =3D val; - s->status =3D 0x04; - } else if(s->read_pos =3D=3D 4) { - s->data_len =3D val; - s->status =3D 0x05; - s->data_pos =3D 0; - smc_debug("Key =3D %c%c%c%c Len =3D %d\n", s->key[0], - s->key[1], s->key[2], s->key[3], val); - applesmc_fill_data(s); - } - s->read_pos++; - break; + switch (s->cmd) { + case APPLESMC_READ_CMD: + if (s->read_pos < 4) { + s->key[s->read_pos] =3D val; + s->status =3D 0x04; + } else if (s->read_pos =3D=3D 4) { + s->data_len =3D val; + s->status =3D 0x05; + s->data_pos =3D 0; + smc_debug("Key =3D %c%c%c%c Len =3D %d\n", s->key[0], + s->key[1], s->key[2], s->key[3], val); + applesmc_fill_data(s); + } + s->read_pos++; + break; } } =20 -static uint64_t applesmc_io_data_read(void *opaque, hwaddr addr1, - unsigned size) +static uint64_t applesmc_io_data_read(void *opaque, hwaddr addr, unsigned = size) { AppleSMCState *s =3D opaque; uint8_t retval =3D 0; =20 - switch(s->cmd) { - case APPLESMC_READ_CMD: - if(s->data_pos < s->data_len) { - retval =3D s->data[s->data_pos]; - smc_debug("READ_DATA[%d] =3D %#hhx\n", s->data_pos, - retval); - s->data_pos++; - if(s->data_pos =3D=3D s->data_len) { - s->status =3D 0x00; - smc_debug("EOF\n"); - } else - s->status =3D 0x05; + switch (s->cmd) { + case APPLESMC_READ_CMD: + if (s->data_pos < s->data_len) { + retval =3D s->data[s->data_pos]; + smc_debug("READ_DATA[%d] =3D %#hhx\n", s->data_pos, + retval); + s->data_pos++; + if (s->data_pos =3D=3D s->data_len) { + s->status =3D 0x00; + smc_debug("EOF\n"); + } else { + s->status =3D 0x05; } + } } - smc_debug("DATA Read b: %#x =3D %#x\n", addr1, retval); + smc_debug("DATA Read b: %#x =3D %#x\n", addr, retval); =20 return retval; } =20 -static uint64_t applesmc_io_cmd_read(void *opaque, hwaddr addr1, unsigned = size) +static uint64_t applesmc_io_cmd_read(void *opaque, hwaddr addr, unsigned s= ize) { AppleSMCState *s =3D opaque; =20 - smc_debug("CMD Read B: %#x\n", addr1); + smc_debug("CMD Read B: %#x\n", addr); return s->status; } =20 --=20 2.7.4 From nobody Fri May 3 06:16:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497639559832222.7958576450767; Fri, 16 Jun 2017 11:59:19 -0700 (PDT) Received: from localhost ([::1]:60378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLwSk-0007zr-IC for importer@patchew.org; Fri, 16 Jun 2017 14:59:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLwP8-0004UJ-AZ for qemu-devel@nongnu.org; Fri, 16 Jun 2017 14:55:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLwP6-0006Ws-NU for qemu-devel@nongnu.org; Fri, 16 Jun 2017 14:55:34 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:34368) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLwP6-0006WZ-JG for qemu-devel@nongnu.org; Fri, 16 Jun 2017 14:55:32 -0400 Received: by mail-qt0-x243.google.com with SMTP id o21so12325155qtb.1 for ; Fri, 16 Jun 2017 11:55:32 -0700 (PDT) Received: from HEDWIG.ini.cmu.edu (HEDWIG.INI.CMU.EDU. [128.2.16.51]) by smtp.gmail.com with ESMTPSA id p24sm1761565qki.49.2017.06.16.11.55.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Jun 2017 11:55:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N460vkPZ0K/LGC5cuRDmzI3lKr49dqCcmJ1CO9KnAtU=; b=fY/KzaItI189mwJDMIbk0Poix/4pgIea/W9w25VTQkQ/DTjCjLdUPW/6TTwx0vcVeu 54aVMqqUW4/yVWM4MrJwEyeuCTEX8S0DVQJA24H9Kw43xCHgEXn5cHsOAMLvycLNJZul kAn72NPjd0nWbxSD58ZtliMTLXKGpDi6FJRNs8+tSyACd+9c2GiP9ISTTCYWfRi0JFZ2 9hsD78iR1XpduF/CviafDk6eBu7xUMT2Phrp9enZAVurC5I9QJQVbRLNjvTw4zuggK0N blqQe3wSlCWfw8EN76nZ2WK9Wy5k47/EsZg0S+Zj7EOEN0mhRP/4ohmPucclaHeUSbv6 ST2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=N460vkPZ0K/LGC5cuRDmzI3lKr49dqCcmJ1CO9KnAtU=; b=AkB70y49u4nQWficjACQ261t1KQB5P4/VTAkQMxF1BChQ4rbjSzFTCd6rzMW1+fbl0 hV9Fps9pTirhI0KvcIVr4ZT9HmzoQqrS7tY42Cc0onBWaVp1MWqiFDvzXjmGUPVC+S9o njiSTwp8sWj2h7DGCVyTwT1wBGfqVtU3ozSC+TNBfpYcmbJB76oH1RsSEnft54qSyYoF /HPuh0awIwQ0DxLvFOn9r9Q4FDHbSv0f6tJsJTwr51QoeaAk9prvl6+KJsZu+o0XaFoy 5RVmuPf6SNG0jdZYBIOTaEMTTcispdv5ftBIbRBh4YsUOebMzCXHZLo88bQLrK1ofV+k s09g== X-Gm-Message-State: AKS2vOze3lxxvmtWw5Arudrpe5W2PE9tx/bVP9quy6OKLWX8HXNhV6yN Niqb5FGoZ2oD2ftq X-Received: by 10.55.126.197 with SMTP id z188mr13839131qkc.121.1497639331446; Fri, 16 Jun 2017 11:55:31 -0700 (PDT) From: "Gabriel L. Somlo" To: qemu-devel@nongnu.org Date: Fri, 16 Jun 2017 14:55:15 -0400 Message-Id: <1497639316-22202-3-git-send-email-gsomlo@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497639316-22202-1-git-send-email-gsomlo@gmail.com> References: <1497639316-22202-1-git-send-email-gsomlo@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v3 2/3] applesmc: implement error status port X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, eshelton@pobox.com, agraf@suse.de, f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 As of release 10.12.4, OS X (Sierra) refuses to boot unless the AppleSMC supports an additional I/O port, expected to provide an error status code. Update the [cmd|data]_write() and data_read() methods to implement the required state machine, and add I/O region & methods to handle access to the error port. Originally proposed by Eric Shelton based in part on FakeSMC (git://git.assembla.com/fakesmc.git). Signed-off-by: Gabriel Somlo Reviewed-by: Alexander Graf Reviewed-by: Phil Dennis-Jordan Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/applesmc.c | 141 +++++++++++++++++++++++++++++++++++++++++++------= ---- 1 file changed, 115 insertions(+), 26 deletions(-) diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c index 6381197..0d882e8 100644 --- a/hw/misc/applesmc.c +++ b/hw/misc/applesmc.c @@ -43,6 +43,7 @@ enum { APPLESMC_DATA_PORT =3D 0x00, APPLESMC_CMD_PORT =3D 0x04, + APPLESMC_ERR_PORT =3D 0x1e, APPLESMC_NUM_PORTS =3D 0x20, }; =20 @@ -53,6 +54,24 @@ enum { APPLESMC_GET_KEY_TYPE_CMD =3D 0x13, }; =20 +enum { + APPLESMC_ST_CMD_DONE =3D 0x00, + APPLESMC_ST_DATA_READY =3D 0x01, + APPLESMC_ST_BUSY =3D 0x02, + APPLESMC_ST_ACK =3D 0x04, + APPLESMC_ST_NEW_CMD =3D 0x08, +}; + +enum { + APPLESMC_ST_1E_CMD_INTRUPTED =3D 0x80, + APPLESMC_ST_1E_STILL_BAD_CMD =3D 0x81, + APPLESMC_ST_1E_BAD_CMD =3D 0x82, + APPLESMC_ST_1E_NOEXIST =3D 0x84, + APPLESMC_ST_1E_WRITEONLY =3D 0x85, + APPLESMC_ST_1E_READONLY =3D 0x86, + APPLESMC_ST_1E_BAD_INDEX =3D 0xb8, +}; + #ifdef DEBUG_SMC #define smc_debug(...) fprintf(stderr, "AppleSMC: " __VA_ARGS__) #else @@ -77,9 +96,12 @@ struct AppleSMCState { =20 MemoryRegion io_data; MemoryRegion io_cmd; + MemoryRegion io_err; uint32_t iobase; uint8_t cmd; uint8_t status; + uint8_t status_1e; + uint8_t last_ret; char key[4]; uint8_t read_pos; uint8_t data_len; @@ -93,89 +115,138 @@ static void applesmc_io_cmd_write(void *opaque, hwadd= r addr, uint64_t val, unsigned size) { AppleSMCState *s =3D opaque; + uint8_t status =3D s->status & 0x0f; =20 - smc_debug("CMD Write B: %#x =3D %#x\n", addr, val); + smc_debug("CMD received: 0x%02x\n", (uint8_t)val); switch (val) { case APPLESMC_READ_CMD: - s->status =3D 0x0c; + /* did last command run through OK? */ + if (status =3D=3D APPLESMC_ST_CMD_DONE || status =3D=3D APPLESMC_S= T_NEW_CMD) { + s->cmd =3D val; + s->status =3D APPLESMC_ST_NEW_CMD | APPLESMC_ST_ACK; + } else { + smc_debug("ERROR: previous command interrupted!\n"); + s->status =3D APPLESMC_ST_NEW_CMD; + s->status_1e =3D APPLESMC_ST_1E_CMD_INTRUPTED; + } break; + default: + smc_debug("UNEXPECTED CMD 0x%02x\n", (uint8_t)val); + s->status =3D APPLESMC_ST_NEW_CMD; + s->status_1e =3D APPLESMC_ST_1E_BAD_CMD; } - s->cmd =3D val; s->read_pos =3D 0; s->data_pos =3D 0; } =20 -static void applesmc_fill_data(AppleSMCState *s) +static struct AppleSMCData *applesmc_find_key(AppleSMCState *s) { struct AppleSMCData *d; =20 QLIST_FOREACH(d, &s->data_def, node) { if (!memcmp(d->key, s->key, 4)) { - smc_debug("Key matched (%s Len=3D%d Data=3D%s)\n", d->key, - d->len, d->data); - memcpy(s->data, d->data, d->len); - return; + return d; } } + return NULL; } =20 static void applesmc_io_data_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { AppleSMCState *s =3D opaque; + struct AppleSMCData *d; =20 - smc_debug("DATA Write B: %#x =3D %#x\n", addr, val); + smc_debug("DATA received: 0x%02x\n", (uint8_t)val); switch (s->cmd) { case APPLESMC_READ_CMD: + if ((s->status & 0x0f) =3D=3D APPLESMC_ST_CMD_DONE) { + break; + } if (s->read_pos < 4) { s->key[s->read_pos] =3D val; - s->status =3D 0x04; + s->status =3D APPLESMC_ST_ACK; } else if (s->read_pos =3D=3D 4) { - s->data_len =3D val; - s->status =3D 0x05; - s->data_pos =3D 0; - smc_debug("Key =3D %c%c%c%c Len =3D %d\n", s->key[0], - s->key[1], s->key[2], s->key[3], val); - applesmc_fill_data(s); + d =3D applesmc_find_key(s); + if (d !=3D NULL) { + memcpy(s->data, d->data, d->len); + s->data_len =3D d->len; + s->data_pos =3D 0; + s->status =3D APPLESMC_ST_ACK | APPLESMC_ST_DATA_READY; + s->status_1e =3D APPLESMC_ST_CMD_DONE; /* clear on valid = key */ + } else { + smc_debug("READ_CMD: key '%c%c%c%c' not found!\n", + s->key[0], s->key[1], s->key[2], s->key[3]); + s->status =3D APPLESMC_ST_CMD_DONE; + s->status_1e =3D APPLESMC_ST_1E_NOEXIST; + } } s->read_pos++; break; + default: + s->status =3D APPLESMC_ST_CMD_DONE; + s->status_1e =3D APPLESMC_ST_1E_STILL_BAD_CMD; } } =20 +static void applesmc_io_err_write(void *opaque, hwaddr addr, uint64_t val, + unsigned size) +{ + smc_debug("ERR_CODE received: 0x%02x, ignoring!\n", (uint8_t)val); + /* NOTE: writing to the error port not supported! */ +} + static uint64_t applesmc_io_data_read(void *opaque, hwaddr addr, unsigned = size) { AppleSMCState *s =3D opaque; - uint8_t retval =3D 0; =20 switch (s->cmd) { case APPLESMC_READ_CMD: + if (!(s->status & APPLESMC_ST_DATA_READY)) { + break; + } if (s->data_pos < s->data_len) { - retval =3D s->data[s->data_pos]; - smc_debug("READ_DATA[%d] =3D %#hhx\n", s->data_pos, - retval); + s->last_ret =3D s->data[s->data_pos]; + smc_debug("READ '%c%c%c%c'[%d] =3D %02x\n", + s->key[0], s->key[1], s->key[2], s->key[3], + s->data_pos, s->last_ret); s->data_pos++; if (s->data_pos =3D=3D s->data_len) { - s->status =3D 0x00; - smc_debug("EOF\n"); + s->status =3D APPLESMC_ST_CMD_DONE; + smc_debug("READ '%c%c%c%c' Len=3D%d complete!\n", + s->key[0], s->key[1], s->key[2], s->key[3], + s->data_len); } else { - s->status =3D 0x05; + s->status =3D APPLESMC_ST_ACK | APPLESMC_ST_DATA_READY; } } + break; + default: + s->status =3D APPLESMC_ST_CMD_DONE; + s->status_1e =3D APPLESMC_ST_1E_STILL_BAD_CMD; } - smc_debug("DATA Read b: %#x =3D %#x\n", addr, retval); + smc_debug("DATA sent: 0x%02x\n", s->last_ret); =20 - return retval; + return s->last_ret; } =20 static uint64_t applesmc_io_cmd_read(void *opaque, hwaddr addr, unsigned s= ize) { AppleSMCState *s =3D opaque; =20 - smc_debug("CMD Read B: %#x\n", addr); + smc_debug("CMD sent: 0x%02x\n", s->status); return s->status; } =20 +static uint64_t applesmc_io_err_read(void *opaque, hwaddr addr, unsigned s= ize) +{ + AppleSMCState *s =3D opaque; + + /* NOTE: read does not clear the 1e status */ + smc_debug("ERR_CODE sent: 0x%02x\n", s->status_1e); + return s->status_1e; +} + static void applesmc_add_key(AppleSMCState *s, const char *key, int len, const char *data) { @@ -198,6 +269,9 @@ static void qdev_applesmc_isa_reset(DeviceState *dev) QLIST_FOREACH_SAFE(d, &s->data_def, node, next) { QLIST_REMOVE(d, node); } + s->status =3D 0x00; + s->status_1e =3D 0x00; + s->last_ret =3D 0x00; =20 applesmc_add_key(s, "REV ", 6, "\x01\x13\x0f\x00\x00\x03"); applesmc_add_key(s, "OSK0", 32, s->osk); @@ -227,6 +301,16 @@ static const MemoryRegionOps applesmc_cmd_io_ops =3D { }, }; =20 +static const MemoryRegionOps applesmc_err_io_ops =3D { + .write =3D applesmc_io_err_write, + .read =3D applesmc_io_err_read, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .impl =3D { + .min_access_size =3D 1, + .max_access_size =3D 1, + }, +}; + static void applesmc_isa_realize(DeviceState *dev, Error **errp) { AppleSMCState *s =3D APPLE_SMC(dev); @@ -241,6 +325,11 @@ static void applesmc_isa_realize(DeviceState *dev, Err= or **errp) isa_register_ioport(&s->parent_obj, &s->io_cmd, s->iobase + APPLESMC_CMD_PORT); =20 + memory_region_init_io(&s->io_err, OBJECT(s), &applesmc_err_io_ops, s, + "applesmc-err", 1); + isa_register_ioport(&s->parent_obj, &s->io_err, + s->iobase + APPLESMC_ERR_PORT); + if (!s->osk || (strlen(s->osk) !=3D 64)) { fprintf(stderr, "WARNING: Using AppleSMC with invalid key\n"); s->osk =3D default_osk; --=20 2.7.4 From nobody Fri May 3 06:16:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497639427606505.30879172486266; Fri, 16 Jun 2017 11:57:07 -0700 (PDT) Received: from localhost ([::1]:60364 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLwQb-0005JN-OY for importer@patchew.org; Fri, 16 Jun 2017 14:57:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44600) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLwP8-0004UL-QT for qemu-devel@nongnu.org; Fri, 16 Jun 2017 14:55:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLwP7-0006Ym-W5 for qemu-devel@nongnu.org; Fri, 16 Jun 2017 14:55:34 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:35160) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLwP7-0006Y6-SZ for qemu-devel@nongnu.org; Fri, 16 Jun 2017 14:55:33 -0400 Received: by mail-qt0-x243.google.com with SMTP id x58so12311685qtc.2 for ; Fri, 16 Jun 2017 11:55:33 -0700 (PDT) Received: from HEDWIG.ini.cmu.edu (HEDWIG.INI.CMU.EDU. [128.2.16.51]) by smtp.gmail.com with ESMTPSA id p24sm1761565qki.49.2017.06.16.11.55.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Jun 2017 11:55:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vELz7niruQKAcErHMpR99MavOiYYxwWbo2gBI6HMKiU=; b=Vgg5K03nnZ7IizYfrzpMrR61iEUxTvU3k2d2B1nQuNgPC4vYT7K3E66oz3heDPNA3F cimCI2RnE5eBSobunucQ5otqdfZXQDZjnoUkCdmL+dcI/4OHu7AhFXegPQHSZobScxgg DoPiCknDBXfiNQWbbArVnNbid30sVCWwI0w2YyH/otsPTfdMy0/snOkCJwPYZ/O+Bua5 KAh3G8xrUZfPCasmyB8X6cvXpzShnK1SulIVevAvOsh+uOt5Jt1PJrYsEfKg7vm/7qMc EpXQEdl4jIpc7D/53TKzj2aKxgJuE/z3ib49aNx//Tqu5YBQS4tkkik93hx9U9XX3yTm 4Obw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vELz7niruQKAcErHMpR99MavOiYYxwWbo2gBI6HMKiU=; b=Kt4TDkwRnIhVHR5L+lKHIs4KFZ5yvYhzNOaCNrBL6LUBTPbIQcjRgbCXPZvRCt7tah VMV/6GAeN8vLV84pMHEuag0QKe+V2KAsdDmsAln/HXBSO+pY3zUH3bhH9Gjnn1yJHHmS QzkAhA6cU3sIisaeI3KYliWA8pKFqvOx79tF9lEtdJTRrhDGc02j7K/KkmO/ogmLy68w zSz1Bm+72FhgkXBHYoQqjkJvL6YNX06nEfMl80r6cnrJmWiGrfAO86oVniyfvzKwwc8X A1s6a9gWRsJuYFrwZNbXoDd+n4hrDsjBTBJbRvyfg8xZXLBlmRTOT7xhTIfQUDhAjXEI HqQA== X-Gm-Message-State: AKS2vOzBhzUQGZFudGH9z2HG2JBfdJ/yeZ/X+POuw/oEpgCg9wWoOkWM n8zc7FwJ8wRdK5w3 X-Received: by 10.200.8.67 with SMTP id x3mr14535987qth.195.1497639333005; Fri, 16 Jun 2017 11:55:33 -0700 (PDT) From: "Gabriel L. Somlo" To: qemu-devel@nongnu.org Date: Fri, 16 Jun 2017 14:55:16 -0400 Message-Id: <1497639316-22202-4-git-send-email-gsomlo@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497639316-22202-1-git-send-email-gsomlo@gmail.com> References: <1497639316-22202-1-git-send-email-gsomlo@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v3 3/3] applesmc: fix port i/o access width X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, eshelton@pobox.com, agraf@suse.de, f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Set access width of all AppleSMC i/o regions to 1 byte, since they all represent 8-bit-wide ports. Signed-off-by: Gabriel Somlo Reviewed-by: Alexander Graf --- hw/misc/applesmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c index 0d882e8..7896812 100644 --- a/hw/misc/applesmc.c +++ b/hw/misc/applesmc.c @@ -316,12 +316,12 @@ static void applesmc_isa_realize(DeviceState *dev, Er= ror **errp) AppleSMCState *s =3D APPLE_SMC(dev); =20 memory_region_init_io(&s->io_data, OBJECT(s), &applesmc_data_io_ops, s, - "applesmc-data", 4); + "applesmc-data", 1); isa_register_ioport(&s->parent_obj, &s->io_data, s->iobase + APPLESMC_DATA_PORT); =20 memory_region_init_io(&s->io_cmd, OBJECT(s), &applesmc_cmd_io_ops, s, - "applesmc-cmd", 4); + "applesmc-cmd", 1); isa_register_ioport(&s->parent_obj, &s->io_cmd, s->iobase + APPLESMC_CMD_PORT); =20 --=20 2.7.4