From nobody Wed May 22 00:12:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1615044989; cv=none; d=zohomail.com; s=zohoarc; b=WyditkMRzKIbpMZNMhxb1J88tcNxCEEje+i6HixF/cc9K9fbuUEz6o46BTO0vRd2KTl2FUUOVA1q6WHfp79dRNw0RCZu5gSs0O/NH9LsowXQGnlXPZTLZYkvtKJEEVXbt8DcMb+hEucyQn2xIxy1YHTdeKEV7gwYBPg/bLtovZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615044989; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QdVPFW+rTeOfBCb153J72RdegotAb1vteWkrrhEb3Cg=; b=Xqpd67S8DbxmHbZkxE/karwAHkjn96e8J4X1CdIksCOWuff83NkbocMyh1YpoHM1xksR9zJwJNtAp0Wm2SRavCL++mZzlW30dsJuMTCwaeJREFg1OyhTls2m8AO0NGznl2j6hR8jpZ4eaf/h/fFTFLFdSDYYEd0csAQigwWEyIA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1615044989428375.7520013855856; Sat, 6 Mar 2021 07:36:29 -0800 (PST) Received: by mail-wm1-f45.google.com with SMTP id f22-20020a7bc8d60000b029010c024a1407so1137792wml.2 for ; Sat, 06 Mar 2021 07:36:28 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id 75sm10489761wma.23.2021.03.06.07.36.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 07:36:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QdVPFW+rTeOfBCb153J72RdegotAb1vteWkrrhEb3Cg=; b=P1rfKnLZWUHzdLckvOTTPqPpX5iyB3oH1QtkHfUc0eK5EMK5g35w/jakn/r/OQH0ug RjwNvvMFYHvYIQF/KRmOnLW0QHxC+FfmwpfakK3o37r/bDIPuRUL7Wubo83ixJFDiHhl RdtKqxZXNj8Sy4mGMzWMgdtaBh+xHyHvPa9WBQM0q74Lmxb6Gq8TeZr86DsUi2Y7dFhX ZREWYV7QD3IxAQ3jKegBLdsBpL9+MOTWKDPA0vD5UG8Bpc9v/Uf6uu65NMfWJK6zXsVm z71Fci8RP2Pk0FVRdKzqIrGJvVyhEtzKc76J06XkZHt4NOQ+eNhGZLDfknh9x0+1RVPG nK0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QdVPFW+rTeOfBCb153J72RdegotAb1vteWkrrhEb3Cg=; b=PwaVGESOgRPHGdgGHfit93FCMe4Zvz3VAFxtCFUfXS8fAkerDKxOYRwdfoUfglEM+u zIjVsTmOuDMTgWiqeHk8Lphm/egpepWMZeuq/IAmW0I26OBpUjGGttd+6bxD4h3wssdM +wjQjEsXzSNoROSTnOSZCorw5fA6URYb0NwRCpFAhLmSOefDVIia3skb1FEy5v2YQSW+ 9f5dWPnXsB8vCtEH+qQO3PPkwGPln7grXJmLYZsNFq5IBjp0ltMq+6ANFtn1ol9fIf00 k4YHOqKXhwB+7qV1p3osPeZfqUbUqy8zF9xXih1hTKsF5+fw6fI4132OFsVnrgyCQ3GC hVFA== X-Gm-Message-State: AOAM533VoifbiUpzh7zwqe46mHi/Cc1l7WiQgZ8TRi2c0toK1QrR919i 850QDIbMd9ZEJCRRyUD9Ucw= X-Google-Smtp-Source: ABdhPJxKD/K0Y1oJmNZBeli0HPK5bRuqX/Aw0rgywwJt8KSMWrDs5T+xSrzOyRJBbwQkEDIlbV6pdw== X-Received: by 2002:a05:600c:4844:: with SMTP id j4mr14127546wmo.179.1615044987695; Sat, 06 Mar 2021 07:36:27 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Magnus Damm , Yoshinori Sato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 01/14] target/sh4: Fix code style for checkpatch.pl Date: Sat, 6 Mar 2021 16:36:08 +0100 Message-Id: <20210306153621.2393879-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210306153621.2393879-1-f4bug@amsat.org> References: <20210306153621.2393879-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We are going to move this code, fix its style first. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210127232151.3523581-2-f4bug@amsat.org> --- target/sh4/helper.c | 82 ++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/target/sh4/helper.c b/target/sh4/helper.c index 408478ce5dc..fc816137766 100644 --- a/target/sh4/helper.c +++ b/target/sh4/helper.c @@ -330,8 +330,8 @@ static int find_utlb_entry(CPUSH4State * env, target_ul= ong address, int use_asid MMU_IADDR_ERROR, MMU_DADDR_ERROR_READ, MMU_DADDR_ERROR_WRITE. */ static int get_mmu_address(CPUSH4State * env, target_ulong * physical, - int *prot, target_ulong address, - int rw, int access_type) + int *prot, target_ulong address, + int rw, int access_type) { int use_asid, n; tlb_t *matching =3D NULL; @@ -340,12 +340,12 @@ static int get_mmu_address(CPUSH4State * env, target_= ulong * physical, =20 if (rw =3D=3D 2) { n =3D find_itlb_entry(env, address, use_asid); - if (n >=3D 0) { - matching =3D &env->itlb[n]; + if (n >=3D 0) { + matching =3D &env->itlb[n]; if (!(env->sr & (1u << SR_MD)) && !(matching->pr & 2)) { - n =3D MMU_ITLB_VIOLATION; + n =3D MMU_ITLB_VIOLATION; } else { - *prot =3D PAGE_EXEC; + *prot =3D PAGE_EXEC; } } else { n =3D find_utlb_entry(env, address, use_asid); @@ -365,14 +365,14 @@ static int get_mmu_address(CPUSH4State * env, target_= ulong * physical, } else if (n =3D=3D MMU_DTLB_MISS) { n =3D MMU_ITLB_MISS; } - } + } } else { - n =3D find_utlb_entry(env, address, use_asid); - if (n >=3D 0) { - matching =3D &env->utlb[n]; + n =3D find_utlb_entry(env, address, use_asid); + if (n >=3D 0) { + matching =3D &env->utlb[n]; if (!(env->sr & (1u << SR_MD)) && !(matching->pr & 2)) { - n =3D (rw =3D=3D 1) ? MMU_DTLB_VIOLATION_WRITE : - MMU_DTLB_VIOLATION_READ; + n =3D (rw =3D=3D 1) + ? MMU_DTLB_VIOLATION_WRITE : MMU_DTLB_VIOLATION_READ; } else if ((rw =3D=3D 1) && !(matching->pr & 1)) { n =3D MMU_DTLB_VIOLATION_WRITE; } else if ((rw =3D=3D 1) && !matching->d) { @@ -383,15 +383,15 @@ static int get_mmu_address(CPUSH4State * env, target_= ulong * physical, *prot |=3D PAGE_WRITE; } } - } else if (n =3D=3D MMU_DTLB_MISS) { - n =3D (rw =3D=3D 1) ? MMU_DTLB_MISS_WRITE : - MMU_DTLB_MISS_READ; - } + } else if (n =3D=3D MMU_DTLB_MISS) { + n =3D (rw =3D=3D 1) + ? MMU_DTLB_MISS_WRITE : MMU_DTLB_MISS_READ; + } } if (n >=3D 0) { - n =3D MMU_OK; - *physical =3D ((matching->ppn << 10) & ~(matching->size - 1)) | - (address & (matching->size - 1)); + n =3D MMU_OK; + *physical =3D ((matching->ppn << 10) & ~(matching->size - 1)) + | (address & (matching->size - 1)); } return n; } @@ -401,34 +401,34 @@ static int get_physical_address(CPUSH4State * env, ta= rget_ulong * physical, int rw, int access_type) { /* P1, P2 and P4 areas do not use translation */ - if ((address >=3D 0x80000000 && address < 0xc0000000) || - address >=3D 0xe0000000) { + if ((address >=3D 0x80000000 && address < 0xc0000000) || address >=3D = 0xe0000000) { if (!(env->sr & (1u << SR_MD)) - && (address < 0xe0000000 || address >=3D 0xe4000000)) { - /* Unauthorized access in user mode (only store queues are available)= */ + && (address < 0xe0000000 || address >=3D 0xe4000000)) { + /* Unauthorized access in user mode (only store queues are ava= ilable) */ qemu_log_mask(LOG_GUEST_ERROR, "Unauthorized access\n"); - if (rw =3D=3D 0) - return MMU_DADDR_ERROR_READ; - else if (rw =3D=3D 1) - return MMU_DADDR_ERROR_WRITE; - else - return MMU_IADDR_ERROR; - } - if (address >=3D 0x80000000 && address < 0xc0000000) { - /* Mask upper 3 bits for P1 and P2 areas */ - *physical =3D address & 0x1fffffff; - } else { - *physical =3D address; - } - *prot =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; - return MMU_OK; + if (rw =3D=3D 0) { + return MMU_DADDR_ERROR_READ; + } else if (rw =3D=3D 1) { + return MMU_DADDR_ERROR_WRITE; + } else { + return MMU_IADDR_ERROR; + } + } + if (address >=3D 0x80000000 && address < 0xc0000000) { + /* Mask upper 3 bits for P1 and P2 areas */ + *physical =3D address & 0x1fffffff; + } else { + *physical =3D address; + } + *prot =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; + return MMU_OK; } =20 /* If MMU is disabled, return the corresponding physical page */ if (!(env->mmucr & MMUCR_AT)) { - *physical =3D address & 0x1FFFFFFF; - *prot =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; - return MMU_OK; + *physical =3D address & 0x1FFFFFFF; + *prot =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; + return MMU_OK; } =20 /* We need to resort to the MMU */ --=20 2.26.2 From nobody Wed May 22 00:12:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615044994; cv=none; d=zohomail.com; s=zohoarc; b=V54TLmYnOA5syEE2DBOIT8AegCTMrc1zfErvl3UvP1wXRguyyB78r4qKEnsUP5LeWwm8T/cei4ZU35EMka+H9ys+yhWehX7rRNlfbh2+3bdyZxmTxGtQ0textpCU0VJJGlK2SR9Ym4weWxOolKrhYmH4/9MhcSI/HISePGNIxYk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615044994; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=F2UFebTVoWHluSlCY/+GXgLEdPhMIp3RZbpdfu82Uhk=; b=mVbb7v6JDSpMQ2qZMfqSyvAXiCypAYwD3h3fnvRlqum3ubK8bGt0ptpIxDvFyWZeqAz4kpJLTeFnKXqLs7Zz6pT3vdyG9Jtoqct5UV6ElkkX7zDwYpraRzeFplpf5zRWjn7VGb9SKjXtYzxgvL4RKrnQ+Oqhqlq28kgai09sBBE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1615044994609713.1804046162549; Sat, 6 Mar 2021 07:36:34 -0800 (PST) Received: by mail-wm1-f43.google.com with SMTP id y124-20020a1c32820000b029010c93864955so1140735wmy.5 for ; Sat, 06 Mar 2021 07:36:34 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id o9sm9405313wmc.8.2021.03.06.07.36.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 07:36:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F2UFebTVoWHluSlCY/+GXgLEdPhMIp3RZbpdfu82Uhk=; b=g9FhJKChH0Dt25MVTMcIx+XvWtl9ypeYiaemfla8oNegdWtZgjT5cWqG4ESIGif3s4 ihwQkLThruyGFwi6ba0TxCcyifGsbNAt4fYYvLgbQrct5FpXBwEPGKS3m17wVNXIFMJQ qBrvl+4YsVLNVFF/hvNKTqN9OotHACjXLTAga0q9qOgjNU0XoHQju48j5NS+uZUnhqn1 MW3N9dOEc5gjGN2PWzNK/DZQrUjgkCE5TnHQ0RpKDyA12tMniXkigjPuMlabB1xfmiH+ gLC1E8WEvqfD7Q0BVAH6Nq2aoziTlSw4BZFKct594xUxpvQjXZ84Yitw/hUcmkDNoW+X p52A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=F2UFebTVoWHluSlCY/+GXgLEdPhMIp3RZbpdfu82Uhk=; b=VriQ0H3WVunkTLOKkuBVo/La1COA8WgcdtzhSuDnBXoX1fuX8IzqUCNZ4T1id4y2k/ 4FfLkHi2/A7//70yUXpBVB0CeL0LS4Ozz65Fq2jyhy5RkAlvcC12E4flKHX729K+C3VO YMN5cS6lGNrufmgFbqPCaMPIwADLFNaQPveFbWPfj0xPs3XOUiE3TPE9xHtSE92ZtYPC WJ40gDebUFvn9f61h0x7ooKwout1xZaoirYHcd7zpTO5zIgs0pl7/4VCMweQo9udSFf/ kH505ggy3FnvXLfsgG9lCrrma2kBWD7z63Ybat8WcU/SsyOJK2Ad35Uo8fvCcTK24NoA +kcQ== X-Gm-Message-State: AOAM5327TackLD1G9b0GXHrpPhv+FUXgcA4PyfzABeWWHicsm3dIZdeF /m5PF44gxalVYaSZ78pJ1Cw= X-Google-Smtp-Source: ABdhPJwNTi96qMvX2jRRIPEFcDfYvKHG2ElLUU0t2AdCsSk0vtSjW1K8hIK2Fvorls11QYeLI4/0KA== X-Received: by 2002:a1c:df46:: with SMTP id w67mr14089515wmg.176.1615044992876; Sat, 06 Mar 2021 07:36:32 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Magnus Damm , Yoshinori Sato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 02/14] target/sh4: Replace magic value by MMUAccessType definitions Date: Sat, 6 Mar 2021 16:36:09 +0100 Message-Id: <20210306153621.2393879-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210306153621.2393879-1-f4bug@amsat.org> References: <20210306153621.2393879-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Replace the 0/1/2 magic values by the corresponding MMUAccessType. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210127232151.3523581-3-f4bug@amsat.org> --- target/sh4/helper.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target/sh4/helper.c b/target/sh4/helper.c index fc816137766..4303ebf018b 100644 --- a/target/sh4/helper.c +++ b/target/sh4/helper.c @@ -338,7 +338,7 @@ static int get_mmu_address(CPUSH4State * env, target_ul= ong * physical, =20 use_asid =3D !(env->mmucr & MMUCR_SV) || !(env->sr & (1u << SR_MD)); =20 - if (rw =3D=3D 2) { + if (rw =3D=3D MMU_INST_FETCH) { n =3D find_itlb_entry(env, address, use_asid); if (n >=3D 0) { matching =3D &env->itlb[n]; @@ -371,11 +371,11 @@ static int get_mmu_address(CPUSH4State * env, target_= ulong * physical, if (n >=3D 0) { matching =3D &env->utlb[n]; if (!(env->sr & (1u << SR_MD)) && !(matching->pr & 2)) { - n =3D (rw =3D=3D 1) + n =3D (rw =3D=3D MMU_DATA_STORE) ? MMU_DTLB_VIOLATION_WRITE : MMU_DTLB_VIOLATION_READ; - } else if ((rw =3D=3D 1) && !(matching->pr & 1)) { + } else if ((rw =3D=3D MMU_DATA_STORE) && !(matching->pr & 1)) { n =3D MMU_DTLB_VIOLATION_WRITE; - } else if ((rw =3D=3D 1) && !matching->d) { + } else if ((rw =3D=3D MMU_DATA_STORE) && !matching->d) { n =3D MMU_DTLB_INITIAL_WRITE; } else { *prot =3D PAGE_READ; @@ -384,7 +384,7 @@ static int get_mmu_address(CPUSH4State * env, target_ul= ong * physical, } } } else if (n =3D=3D MMU_DTLB_MISS) { - n =3D (rw =3D=3D 1) + n =3D (rw =3D=3D MMU_DATA_STORE) ? MMU_DTLB_MISS_WRITE : MMU_DTLB_MISS_READ; } } @@ -406,9 +406,9 @@ static int get_physical_address(CPUSH4State * env, targ= et_ulong * physical, && (address < 0xe0000000 || address >=3D 0xe4000000)) { /* Unauthorized access in user mode (only store queues are ava= ilable) */ qemu_log_mask(LOG_GUEST_ERROR, "Unauthorized access\n"); - if (rw =3D=3D 0) { + if (rw =3D=3D MMU_DATA_LOAD) { return MMU_DADDR_ERROR_READ; - } else if (rw =3D=3D 1) { + } else if (rw =3D=3D MMU_DATA_STORE) { return MMU_DADDR_ERROR_WRITE; } else { return MMU_IADDR_ERROR; @@ -441,7 +441,7 @@ hwaddr superh_cpu_get_phys_page_debug(CPUState *cs, vad= dr addr) target_ulong physical; int prot; =20 - get_physical_address(&cpu->env, &physical, &prot, addr, 0, 0); + get_physical_address(&cpu->env, &physical, &prot, addr, MMU_DATA_LOAD,= 0); return physical; } =20 --=20 2.26.2 From nobody Wed May 22 00:12:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615044999; cv=none; d=zohomail.com; s=zohoarc; b=LmnbRv12E6YOxwGVPIp1FXovdAVee+lCsVLDp2yTE3Q2zgN+snQiQUuXxtzY9SddYjSC8cEFhkmYkn7cSo3VaAe2WQlsSpGFjKa9aio4VqHaF6hkBzIOnV4KZ7XZdYKpVlBgCMuuUegQJlUEw+M6GqrPniBJIPKAMFSmSBn4bxY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615044999; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Qvvv0vZPl7kPXG3BqztYcAmNKJJgttxJAwWBMl32Qgw=; b=XmTUsNcHOEz1kIPjRBU5/hksJPUTjVlqhYRdNJN26AfoMmdxRz8jOCWb+prfBYzGhURRPbcxdri8o3KN4nKTs1STpXEkOuC9PngkQ0REBqFMHcYeSGw5xExBBCQNdKMrSuFMO1NCtcCiFBasX6X7mrVIIEHFPtMCXWcpMjaXJXA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 1615044999507429.3613048941986; Sat, 6 Mar 2021 07:36:39 -0800 (PST) Received: by mail-wm1-f53.google.com with SMTP id r15-20020a05600c35cfb029010e639ca09eso1139068wmq.1 for ; Sat, 06 Mar 2021 07:36:38 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id v13sm10666362wrt.45.2021.03.06.07.36.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 07:36:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Qvvv0vZPl7kPXG3BqztYcAmNKJJgttxJAwWBMl32Qgw=; b=mmliIsqm20Q55E1F+ZgZjLFne7IPceymNPEPCop9pqBgHNI1tcNyitvSSp31avKBPz yD5WIDLOY76l2S8bwKc2cImcZrytwE9HGIbscEgCJGOnZGjDFbR4qERzT3U516X7+i+f ITFFBZHeE20Y7/HAn05HNvmTiBo0yktxYHcHxbzKNVWzFZZT0COrFBfueRNvuMoSBVcL 8pc/Afx/ODVmzk+h/r87Wu0Fv0TCR7yv8XTCQz/+LixhTdF2XSDTi9M+G4VPpo62fate 62iMniePxqL4Abmh3EDOyd5IR9ovz6jFQz8xPez9fk7679wB4NlIC6+ihPjKVqzH6X9S zVgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Qvvv0vZPl7kPXG3BqztYcAmNKJJgttxJAwWBMl32Qgw=; b=XnbLsNt3BYuDMF8DZmR0huwSpDBoawm03Yb0IGMndKNXzf+/EKkJcNT0FG264rKzJi vTnqfROPP4RL2oCQ82XUUjFyGME7H55XIu9unDXisI3m7xU9dUOLdSlmNbDnhmn5eICQ 2dUdNj7nGxnY2ldwnFs90p0c17ad6D2U2+ImYbzx5cUTsw8BeC7Mjs30rBRAro/3g20i eXleFGuCiL6KHh15VuRZDvOwE0gIPfUr+qQnVwaRpgfmZuDAtS3YOLxeAjnTFv7NdHHo 7VERJbtaiHVh2WlRGpbkehGlVs1chUr2+n5Vzp/Rk5oG9CeNRUguGPchdv7kYtZTRKd8 R3GA== X-Gm-Message-State: AOAM5331pjnFy9RywYe0/5J5U1agYZah6sIELq2E9kdom4l8d3UC7E/n SRblToqOed4Uhk7JJL5X5YM= X-Google-Smtp-Source: ABdhPJyv3WaHQOYxlE7O6FMpGkGHFjSiSn7rrWp5qLv8n9pRiUvZQUZ73UJJBGzScsu3FXFpHqLRPA== X-Received: by 2002:a1c:61c5:: with SMTP id v188mr13745490wmb.20.1615044997807; Sat, 06 Mar 2021 07:36:37 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Magnus Damm , Yoshinori Sato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 03/14] target/sh4: Remove unused 'int access_type' argument Date: Sat, 6 Mar 2021 16:36:10 +0100 Message-Id: <20210306153621.2393879-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210306153621.2393879-1-f4bug@amsat.org> References: <20210306153621.2393879-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) get_mmu_address() and get_physical_address() don't use their 'int access_type' argument: remove it along with ACCESS_INT in superh_cpu_tlb_fill(). Suggested-by: Richard Henderson Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/sh4/helper.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/target/sh4/helper.c b/target/sh4/helper.c index 4303ebf018b..b49efe84916 100644 --- a/target/sh4/helper.c +++ b/target/sh4/helper.c @@ -331,7 +331,7 @@ static int find_utlb_entry(CPUSH4State * env, target_ul= ong address, int use_asid */ static int get_mmu_address(CPUSH4State * env, target_ulong * physical, int *prot, target_ulong address, - int rw, int access_type) + int rw) { int use_asid, n; tlb_t *matching =3D NULL; @@ -398,7 +398,7 @@ static int get_mmu_address(CPUSH4State * env, target_ul= ong * physical, =20 static int get_physical_address(CPUSH4State * env, target_ulong * physical, int *prot, target_ulong address, - int rw, int access_type) + int rw) { /* P1, P2 and P4 areas do not use translation */ if ((address >=3D 0x80000000 && address < 0xc0000000) || address >=3D = 0xe0000000) { @@ -432,7 +432,7 @@ static int get_physical_address(CPUSH4State * env, targ= et_ulong * physical, } =20 /* We need to resort to the MMU */ - return get_mmu_address(env, physical, prot, address, rw, access_type); + return get_mmu_address(env, physical, prot, address, rw); } =20 hwaddr superh_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) @@ -441,7 +441,8 @@ hwaddr superh_cpu_get_phys_page_debug(CPUState *cs, vad= dr addr) target_ulong physical; int prot; =20 - get_physical_address(&cpu->env, &physical, &prot, addr, MMU_DATA_LOAD,= 0); + get_physical_address(&cpu->env, &physical, &prot, addr, MMU_DATA_LOAD); + return physical; } =20 @@ -813,11 +814,9 @@ bool superh_cpu_tlb_fill(CPUState *cs, vaddr address, = int size, MMU_DTLB_VIOLATION_READ); #else target_ulong physical; - int prot, sh_access_type; + int prot; =20 - sh_access_type =3D ACCESS_INT; - ret =3D get_physical_address(env, &physical, &prot, address, - access_type, sh_access_type); + ret =3D get_physical_address(env, &physical, &prot, address, access_ty= pe); =20 if (ret =3D=3D MMU_OK) { address &=3D TARGET_PAGE_MASK; --=20 2.26.2 From nobody Wed May 22 00:12:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1615045003; cv=none; d=zohomail.com; s=zohoarc; b=Xvo5103fJkK0L4e+qqKh5yu+0V0HTOLbF11r0gxdQPSEpFGo09iQsZfemsjZKZGsDRCLQ6vLHXQgYr8f764Ca0Cn1HRGp17bXKekQ4mP60MMlJCp9J00GMpKUbDAPKAcz0txVI+ih7EW6UjYJ1s/0dXhyxe/YVX6mWGcKAkuV/g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615045003; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WejqOAHjA3UzJ3SVMVB/jAcdaKSxmT5Co5pSURdVUwM=; b=eUS0OJJYBPY0FK9g0/IPbf6WhJJkLrSQBBQs7B/NQHBKY3FRzEXp+Y6bz3CaLmxb6M4FRDby7xcizwzayAQsPRS5rRiU3mWyGHC9cFRocWF8km0IjWFztbOcRIbtUZUyIloFzpNCUQIgLyy7TUhdRK1W2yzhnRXEIfuAsfHhA0Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 161504500396876.41628146919425; Sat, 6 Mar 2021 07:36:43 -0800 (PST) Received: by mail-wr1-f49.google.com with SMTP id b18so5893494wrn.6 for ; Sat, 06 Mar 2021 07:36:43 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id d13sm9419140wro.23.2021.03.06.07.36.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 07:36:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WejqOAHjA3UzJ3SVMVB/jAcdaKSxmT5Co5pSURdVUwM=; b=nd7fwvfV/0u3V4/EciJEFb55QJpCFx62kh3ZcbY9dh8CkZ61t95OrCKwhmFxS/5QsV sXcLUUxk3afkP5ZtANgUUE5ECt4tjZLRRP56maJAm6G2TgEDZtVSW0V+WXh+3FPTTUUm Dhtr4h+rAjuKylBjv0toRn5WkylethpoSHeGn2wIBrej3+XDQ5vVg1YyMLiZzBvFusbC hlGDRtHlSBMwbp+OIADm3e7NxQ4MV3OT/lmXgLGLQLBZghtOKvJB8Nwl/cbjlGTTgSAy 9awyzeCzZeJhhOJZfCeO5dgwRVAZzB7aO2jBf2Dm9sdlMRDertAOjS+5+Uv1TzowKoz3 ayIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=WejqOAHjA3UzJ3SVMVB/jAcdaKSxmT5Co5pSURdVUwM=; b=te188R+8BQU1OHc4sF42CWOCl2oL0cW+e7RFHWoCV7B1gkgf+DNKaQcrQNC6EuOFfw Orq7ei+1roIDI2MEqLcJoI6cgDri+D7Co/8ryZ568Qphjrs9ABc+Ef2cKbip7QrdsER/ QkhR3k7WyfT30xfW3UsNHcl8s+7gZiV2pZHcsNOS0Faa1SqDmUrcHGTqyWS3nyU+x01t ZGVrGnmZ3GvmGFIHvFvYD6LQbRPsu4rpBAfL+GsNT3LHrjr8KQcuz3kWaWn6gu0AW66y 81scbNYdmqnGbyJkZJkCrBwjmdKqeJhPKApakiQQmiN6r1bdxQz4nkKssGjLnMLCmtGd R9og== X-Gm-Message-State: AOAM53122FIQYe0LdmG+XGRHYQaywXJRluwe9rn1ygV9jp1vYyUQ9jP0 RT8YChEsX8JMus22ZDdD/A0= X-Google-Smtp-Source: ABdhPJxyYm+AUdzzQYEdrpaIO/oWJqnfaZ5aLZWW8CpQBa/KY8e2aWIM26ZuNKTDXDh6flRxTtQ3HQ== X-Received: by 2002:a5d:6307:: with SMTP id i7mr14814045wru.305.1615045002295; Sat, 06 Mar 2021 07:36:42 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Magnus Damm , Yoshinori Sato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 04/14] target/sh4: Let get_physical_address() use MMUAccessType access_type Date: Sat, 6 Mar 2021 16:36:11 +0100 Message-Id: <20210306153621.2393879-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210306153621.2393879-1-f4bug@amsat.org> References: <20210306153621.2393879-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) superh_cpu_tlb_fill() already provides a access_type variable of type MMUAccessType, and it is passed along, but casted as integer and renamed 'rw'. Simply replace 'int rw' by 'MMUAccessType access_type'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210127232151.3523581-5-f4bug@amsat.org> --- target/sh4/helper.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/sh4/helper.c b/target/sh4/helper.c index b49efe84916..bd8e034f174 100644 --- a/target/sh4/helper.c +++ b/target/sh4/helper.c @@ -331,14 +331,14 @@ static int find_utlb_entry(CPUSH4State * env, target_= ulong address, int use_asid */ static int get_mmu_address(CPUSH4State * env, target_ulong * physical, int *prot, target_ulong address, - int rw) + MMUAccessType access_type) { int use_asid, n; tlb_t *matching =3D NULL; =20 use_asid =3D !(env->mmucr & MMUCR_SV) || !(env->sr & (1u << SR_MD)); =20 - if (rw =3D=3D MMU_INST_FETCH) { + if (access_type =3D=3D MMU_INST_FETCH) { n =3D find_itlb_entry(env, address, use_asid); if (n >=3D 0) { matching =3D &env->itlb[n]; @@ -371,11 +371,11 @@ static int get_mmu_address(CPUSH4State * env, target_= ulong * physical, if (n >=3D 0) { matching =3D &env->utlb[n]; if (!(env->sr & (1u << SR_MD)) && !(matching->pr & 2)) { - n =3D (rw =3D=3D MMU_DATA_STORE) + n =3D (access_type =3D=3D MMU_DATA_STORE) ? MMU_DTLB_VIOLATION_WRITE : MMU_DTLB_VIOLATION_READ; - } else if ((rw =3D=3D MMU_DATA_STORE) && !(matching->pr & 1)) { + } else if ((access_type =3D=3D MMU_DATA_STORE) && !(matching->= pr & 1)) { n =3D MMU_DTLB_VIOLATION_WRITE; - } else if ((rw =3D=3D MMU_DATA_STORE) && !matching->d) { + } else if ((access_type =3D=3D MMU_DATA_STORE) && !matching->d= ) { n =3D MMU_DTLB_INITIAL_WRITE; } else { *prot =3D PAGE_READ; @@ -384,7 +384,7 @@ static int get_mmu_address(CPUSH4State * env, target_ul= ong * physical, } } } else if (n =3D=3D MMU_DTLB_MISS) { - n =3D (rw =3D=3D MMU_DATA_STORE) + n =3D (access_type =3D=3D MMU_DATA_STORE) ? MMU_DTLB_MISS_WRITE : MMU_DTLB_MISS_READ; } } @@ -398,7 +398,7 @@ static int get_mmu_address(CPUSH4State * env, target_ul= ong * physical, =20 static int get_physical_address(CPUSH4State * env, target_ulong * physical, int *prot, target_ulong address, - int rw) + MMUAccessType access_type) { /* P1, P2 and P4 areas do not use translation */ if ((address >=3D 0x80000000 && address < 0xc0000000) || address >=3D = 0xe0000000) { @@ -406,9 +406,9 @@ static int get_physical_address(CPUSH4State * env, targ= et_ulong * physical, && (address < 0xe0000000 || address >=3D 0xe4000000)) { /* Unauthorized access in user mode (only store queues are ava= ilable) */ qemu_log_mask(LOG_GUEST_ERROR, "Unauthorized access\n"); - if (rw =3D=3D MMU_DATA_LOAD) { + if (access_type =3D=3D MMU_DATA_LOAD) { return MMU_DADDR_ERROR_READ; - } else if (rw =3D=3D MMU_DATA_STORE) { + } else if (access_type =3D=3D MMU_DATA_STORE) { return MMU_DADDR_ERROR_WRITE; } else { return MMU_IADDR_ERROR; @@ -432,7 +432,7 @@ static int get_physical_address(CPUSH4State * env, targ= et_ulong * physical, } =20 /* We need to resort to the MMU */ - return get_mmu_address(env, physical, prot, address, rw); + return get_mmu_address(env, physical, prot, address, access_type); } =20 hwaddr superh_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) --=20 2.26.2 From nobody Wed May 22 00:12:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615045008; cv=none; d=zohomail.com; s=zohoarc; b=OQssgb15Jz7HV4tQWnsN9ysfHCFELGPed86dckcipPndWbiSk01eh0TTyCVJqAOT8xKglWhkbLaxNugetkumdwdJNVhwnKJ43P0bPQAcANXh58T+SnzZ8aKXsbC02tLCSiO52yc/eeJh0P5tFxMEYH2U2jnISwmUiRwWVIkEXSI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615045008; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=U9jekP1ZlY6y4eDWk3w+fnL7jGwQwnkLpeMzKZ4FPb8=; b=P02e63WHT8grtIPx9b/QkkGC2CvJkvDbs+ATgFeXvVHQXqsDSflMA6HQWQk6hUMb+vf6XtiWrgvAIi60fBVpPYp1Bd3hxML6KayFV3tADPidbHmM46jNHHLkBc9JcGLb8sWIAlUmZ272HXUdcdr3SPzHokT4gts092RXdXXnb9o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1615045008814919.845345590256; Sat, 6 Mar 2021 07:36:48 -0800 (PST) Received: by mail-wr1-f49.google.com with SMTP id l11so2481811wrp.7 for ; Sat, 06 Mar 2021 07:36:48 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id v9sm9585316wrn.86.2021.03.06.07.36.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 07:36:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U9jekP1ZlY6y4eDWk3w+fnL7jGwQwnkLpeMzKZ4FPb8=; b=cwphV6HO8KHdYDty0MBuOvY/bIrgDUoOodNx+7qLour68N4lxXV5UwdOFCGsXRGC0x 9/Hx0pMBFuOcrknEqEPHGt5MvwmAbs6VffvMr8md8MCamPEP3uad/+Ebd1FMp0skzWKK ZT7OwUPP1lp/HteuKrGOclwTNXyCJZiZsMW1B5C3pEXvCzqAYNpBbF65HNtra4COtOwi /fDmE+jaBa5f9DOVBr78JgJL/si5moyKYZnjWIJmOdTfIug0zBFVvMlmcS2J9SyWqnbl SYwP4yKTz+CCNdfmPvaHOPepXdwX0snJJ/WQTHlWZHCOnA8Yf6JkHKJ5CKJbyfKGMxFi 4Zqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=U9jekP1ZlY6y4eDWk3w+fnL7jGwQwnkLpeMzKZ4FPb8=; b=Pw7KkiJvoOVDAvz23OdCgErDIKASr0hWg+YyscKrtsoLrPClcNidyyBFtzNExLG2fU pfw9ewDcwt6eig6Nv2iwxbfR4GPaqRT0akDglK+G0hHkXSM9u7bLe392EushYIoVQBbC sWSs4/P5kIsAvrf2xK8lrV7g0OY0zaw9ck7DmCr0Ba8kQawGQD0laieJ0GC/nSDj3XQk gkOKAlXkhyHLR9nLfuhTK6pd/sQmQYOjjhKnMgKmcZtuIiGwOzwJ7FQTW30zHwI6PNJK xTycA/+GtaH9k9cyCu7h0R0t/xIzWUL7VFZJ3BfhuGezuLb5qJVNRd7vO0xEh1j8wDy2 3QJQ== X-Gm-Message-State: AOAM530+sP05BUdpfgcnrIdqETlKnWEkRfnHf2jTKX0sEK2ng4pyuq/6 OcUAU6oalaZTJlBvMsRlvTE= X-Google-Smtp-Source: ABdhPJwbQw/YdyUV6ckGXN9YRrHxOP/EZJIkZ9Lyg7sFcqfFBqw/6EvYPxUv9e+xyY0PhMkn5ha4fA== X-Received: by 2002:a5d:4dd2:: with SMTP id f18mr14700121wru.366.1615045007159; Sat, 06 Mar 2021 07:36:47 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Magnus Damm , Yoshinori Sato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 05/14] target/sh4: Remove unused definitions Date: Sat, 6 Mar 2021 16:36:12 +0100 Message-Id: <20210306153621.2393879-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210306153621.2393879-1-f4bug@amsat.org> References: <20210306153621.2393879-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Remove these confusing and unused definitions. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210127232151.3523581-6-f4bug@amsat.org> --- target/sh4/cpu.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index 714e3b56413..01c43440822 100644 --- a/target/sh4/cpu.h +++ b/target/sh4/cpu.h @@ -271,17 +271,6 @@ typedef SuperHCPU ArchCPU; =20 #include "exec/cpu-all.h" =20 -/* Memory access type */ -enum { - /* Privilege */ - ACCESS_PRIV =3D 0x01, - /* Direction */ - ACCESS_WRITE =3D 0x02, - /* Type of instruction */ - ACCESS_CODE =3D 0x10, - ACCESS_INT =3D 0x20 -}; - /* MMU control register */ #define MMUCR 0x1F000010 #define MMUCR_AT (1<<0) --=20 2.26.2 From nobody Wed May 22 00:12:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) client-ip=209.85.128.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615045014; cv=none; d=zohomail.com; s=zohoarc; b=H9jjrUkPRnM1mFjzJ65Y69TOwmetdqHRHkb9onloG2Ymm/8cKG/Zb0lBPD8jCErjv04Mp2FpJNH5Kos6MtDn1wj4AY36O7IfQTghE/qPBbU57tUbixm2pjr+6cZuWWwl3V2N25qY01x64GwA7DeqYmPAXp06J2fLdLdF4woBd1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615045014; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Kmb7Ed8jPYS6p2YVLkmvbxMki/u380FCBzPMox5kFws=; b=BaTcaxtY9rMNzEfkSfRexCZOrv6w9z1Z3DxEJBqYp6fiDaCd0iKbTf0t0yGpyln1Tc17ZXeGRw710Ytwl8r5baeVhTUPANt1WEfuZTtx7ZBVBev5E9G/zg7A1zlOSEs2r/Y/6fEEwqoRAAsrKfBd7QB+Z4cz/Ds76QSfQGVlUFs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.zohomail.com with SMTPS id 1615045014061880.4936347895043; Sat, 6 Mar 2021 07:36:54 -0800 (PST) Received: by mail-wm1-f47.google.com with SMTP id r10-20020a05600c35cab029010c946c95easo1103261wmq.4 for ; Sat, 06 Mar 2021 07:36:53 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id w11sm3461229wrv.88.2021.03.06.07.36.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 07:36:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Kmb7Ed8jPYS6p2YVLkmvbxMki/u380FCBzPMox5kFws=; b=CDDjY5iARCnNYzaEHwTgViQLHUyYktwHzQkXLu2EeXiF0BRUfQhyOb/zEd6tqMlsT3 DNjfzr1jVA7NMc8BrT+hMqZM/KRAglqG0Lz8p/83Iwe9H2G+ybTKwr3EeYFQOYKDlKYg 7WaA3dWHZYOgMJzuV2x4cMRvilfkBcHNKHPEqfQWYYql6hbmGgLzENdF8On40H/569ZW AIw0pod0VCN60+EDFusp9kqvWEsUF5NmuGLWT2sREFvHXozeytBB0TNip/Y0jr30wj0T SRLd4Gjg5nDSy0242cVytR1VWNCx6MiZzxcL2rVUB4RjTQ2X9Tdjni0obKOnNjhi0qYX ObJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Kmb7Ed8jPYS6p2YVLkmvbxMki/u380FCBzPMox5kFws=; b=OENrPRLt3IXEd5qIDbtpXTOxb//oFOgDUS7wTlOJvNo099smpSgQeSWB7w3Gx6fwfE WN2Y70RiN0GD+pTZvHDHLA69cgSinINLCFWuYf1QcXs6RhkU1URONq6rSf8HZtQD6WKT 1X2BLWXKXNN4wMqLzmqewPWOqoVAei7u1ifU33vrlhgViDKcL2ZmiUZeXbUFoEETBfoE pp23Ptc/WE6SQc5qudRDL4RoJPoee5zVM8lj42Fy7IazONsuW5Stiktyn53iSsGQKsZW Oo6cJrBGjKIPVlZgSHxtYlfjDsOFJ8GC8ZxG6Z6o7FNPXUnARZED1qifjppwZUTD7sNl B9Xw== X-Gm-Message-State: AOAM530WVFenpuV3xNziZ4ojxh+pQi84iqzf5cro/s4GoNdrneuMi+4d M3qlEo2ZXh1WBLuBxNSiKss= X-Google-Smtp-Source: ABdhPJwl+/bh3mz8M0/esvilSJ3dm2tuP9Fi6NyGMpwPzz9udk43chNmO1xODDVmrSO4rkWDiNWVhw== X-Received: by 2002:a05:600c:224e:: with SMTP id a14mr13848509wmm.57.1615045012229; Sat, 06 Mar 2021 07:36:52 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Magnus Damm , Yoshinori Sato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Samuel Tardieu , Richard Henderson , Paolo Bonzini , Kevin Wolf , Max Reitz , qemu-block@nongnu.org (open list:Block layer core) Subject: [PULL 06/14] hw/sh4: Add missing license Date: Sat, 6 Mar 2021 16:36:13 +0100 Message-Id: <20210306153621.2393879-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210306153621.2393879-1-f4bug@amsat.org> References: <20210306153621.2393879-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) This code was introduced in commit 27c7ca7e775, ("SHIX board emulation (Samuel Tardieu)"). Use the same license. Cc: Samuel Tardieu Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Paolo Bonzini Message-Id: <20210222141514.2646278-2-f4bug@amsat.org> --- include/hw/sh4/sh.h | 31 ++++++++++++++++++++++++++++--- hw/block/tc58128.c | 26 ++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/include/hw/sh4/sh.h b/include/hw/sh4/sh.h index 93f464bf4cd..becb5969790 100644 --- a/include/hw/sh4/sh.h +++ b/include/hw/sh4/sh.h @@ -1,6 +1,31 @@ -#ifndef QEMU_SH_H -#define QEMU_SH_H -/* Definitions for SH board emulation. */ +/* + * Definitions for SH board emulation + * + * Copyright (c) 2005 Samuel Tardieu + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the ne= xt + * paragraph) shall be included in all copies or substantial portions of t= he + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + * + * SPDX-License-Identifier: MIT + */ +#ifndef QEMU_HW_SH_H +#define QEMU_HW_SH_H =20 #include "hw/sh4/sh_intc.h" #include "target/sh4/cpu-qom.h" diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c index 9888f01ac60..bfc27ad8993 100644 --- a/hw/block/tc58128.c +++ b/hw/block/tc58128.c @@ -1,3 +1,29 @@ +/* + * TC58128 NAND EEPROM emulation + * + * Copyright (c) 2005 Samuel Tardieu + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the ne= xt + * paragraph) shall be included in all copies or substantial portions of t= he + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + * + * SPDX-License-Identifier: MIT + */ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/sh4/sh.h" --=20 2.26.2 From nobody Wed May 22 00:12:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1615045018; cv=none; d=zohomail.com; s=zohoarc; b=EtOHLvCFZAyIgn0/SL8K6lCvKBxDBthXPd9nMEM3g9rhOFwpqrjNz3n1iNahzPXPPj/6V3FQNnLfpyJS8GwZFchTTHY6tqmgwFnZC652ulNkKJHwsnspeRxS67cTOPqRqaA9U9gafCd85lgN3KveoZ97CKp4ZlICK/DSXUlFvm4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615045018; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=93CdE1qEoQc24GPwns1AaSpfGRHJt1bcg0Oz5NlaQ5I=; b=joCMvaGXzL0lU2AmyKaACoVH+TOwuT/RDPQIb6hq+VW0xk8rvHbftzHW+PvtlyEAJ0AAgR/kH842xGmybirl0OuwHPFmrfFTsrjVSWPKHLlGk5TMBXbysGVFajU0fCtHpkeqUkggxxMEBKDoLpC9SUMnYHxdTGW7vx7h2LsX6OQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 161504501873898.238848843308; Sat, 6 Mar 2021 07:36:58 -0800 (PST) Received: by mail-wm1-f49.google.com with SMTP id e23so3478438wmh.3 for ; Sat, 06 Mar 2021 07:36:58 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id z3sm9040816wrw.96.2021.03.06.07.36.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 07:36:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=93CdE1qEoQc24GPwns1AaSpfGRHJt1bcg0Oz5NlaQ5I=; b=EjfgE2Bh8wlIuL3eIWF1GUeIz5eAGPWmSbvn5eq1pYYAbUQCb43yBnRGnBLnyb2nhx G462d/O80IWPvJpjGdCGKK6OhEKvHhnETP1SoEWrvswZrzqtyCYfn4qhBwxbWBOaIpAJ ofZk+OBiEOgJ3eL9rqdkRS3g0JjG8VtMk88SdP/pcgvvzxEwyW2Fhq67kO5xqPgDcDso hXJY3sO3IgYzwAEI9bInlCAlwsLmt5xIfcY54Z44kaDD4/XSKPfUuF/U18Fh2uZUBr4d QTJZ/GUI6i5sHdfsSq94kBr2dySe5Vbn7m/D4G9rTMP9CxE1hXbSNx5jTIt42zierzgU lWmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=93CdE1qEoQc24GPwns1AaSpfGRHJt1bcg0Oz5NlaQ5I=; b=TYuIjxAB/7+mBhYvl/j+gtHuObLvmFZCYdiwMEMHVKJ+XOwLZ2wyVnsbqdV3qEKVaR 3AWX7+9voTnHWeBktQOgoG0HhNF/1zaeHHl+QY7/lPLjEEipXjWLGn41O+F7YlfAur/7 OSth6+4ltdu9H9ynTGzzb9UH8/d0/xONg75Bluv3G2tkEqqFhUWtrSm51QQMD23sH+Q9 omcb3j+I8SUxaDF7y4jZGqdzkf4ayy955IraPoZv5H5ixrbYe6MBO75la9rzY03UihEM vE84bxSVGEcyx7J8DV5/QW48pcJ7Pw0Qhoy46RDL1Y5uFwaQEs1EccP0wY8jRH1rvErj rM7Q== X-Gm-Message-State: AOAM5306wtpZsEn2aI5UbELnPWa4gJLcKSb8qvKP63aMCLtDsMnV0Eva 7wAm+6UtRYOl/avOIJmpeyM= X-Google-Smtp-Source: ABdhPJwO82eqJA3sm7+JvuwjRNkx50maDglStjbvTRWQVdS21S3GsWkBMenaobRudCOUalV+qvZBqw== X-Received: by 2002:a1c:730f:: with SMTP id d15mr13872297wmb.135.1615045017083; Sat, 06 Mar 2021 07:36:57 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Magnus Damm , Yoshinori Sato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Richard Henderson , Paolo Bonzini Subject: [PULL 07/14] hw/sh4: Add missing Kconfig dependency on SH7750 for the R2D board Date: Sat, 6 Mar 2021 16:36:14 +0100 Message-Id: <20210306153621.2393879-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210306153621.2393879-1-f4bug@amsat.org> References: <20210306153621.2393879-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) r2d_init() calls sh7750_init() so depends on SH7750.Harmless at the moment because nothing actually uses CONFIG_SH7750 (hw/sh4/meson.build always compiles sh7750.c and sh7750_regnames.c unconditionally). Fixes: 7ab58d4c841 ("sh4-softmmu.mak: express dependencies with Kconfig") Reported-by: Peter Maydell Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Paolo Bonzini Message-Id: <20210222141514.2646278-3-f4bug@amsat.org> --- hw/sh4/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 4cbce3a0ed5..0452b4624ae 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -10,6 +10,7 @@ config R2D select PCI select SM501 select SH4 + select SH7750 =20 config SHIX bool --=20 2.26.2 From nobody Wed May 22 00:12:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1615045023; cv=none; d=zohomail.com; s=zohoarc; b=CZGcZniltjuQ6ZZWZabossRcTaGuXCyCfX5UBiDgvWysTOQ4O3dadHIZiSa33IkGsb0QwuxpUfPNLQcw4CKZKfspIIJVY4KwKwEV9e8KRB+2eVCJwR5/89S79eqeGC/pSlDJ+P6KXUq2vf6QHpqVesOch+hlsMdnYqNmdnwc+ME= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615045023; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+GxKI5juIqhk1EGDwh5fKAHzAvqchzuN7HVSBiJuxfI=; b=mGgWalkOD+i2I1DNB6EifpsMnfNO9kqZoV4laBvbhb2TyP56RVrNIQFDbOZ4/MQStuFyu/CkHdlShhyOlMQiRug4e3EkUCBCGtPiOGp6FGEoYFzaQItaFd+qPK0EH8dHLodY2/QGAMgSs0f6aLoksy57xBW25sEaPuLncfCLUUo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1615045023672257.6924805366589; Sat, 6 Mar 2021 07:37:03 -0800 (PST) Received: by mail-wr1-f49.google.com with SMTP id 7so5918608wrz.0 for ; Sat, 06 Mar 2021 07:37:03 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id b131sm9323605wmb.34.2021.03.06.07.37.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 07:37:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+GxKI5juIqhk1EGDwh5fKAHzAvqchzuN7HVSBiJuxfI=; b=ZGSjyi32Mp9mqcgwe2Fn136PjSvCe6ceS+4QuNmzew9q8Noh9T+4JNb4NDmd6KatK+ Ms5l8pB2R6clbhpeKrXbDgC6W/pkgZgtRdnbZVpPPK/K0tmYIa9TvhvvAeHzamUM6m5c tioKX3SPOEmDPDOM4TPVBQNA0CN+rOaffKsnStwaEdnapk8tvHULJNZqkBBDQsWk/tCN fHbwdYlT8i+hD1LGt55AUdKHfc4Rn+usn2Pf0+GXz6Xez8J2/d7T8aE6nhyjZ0eKUOI/ yFepoUsv+c6SPNU+m2ybgJQ74rCh/84AYrrLUhCLLVrzjAtpzXVsfi3D7nKFgeXEW2G5 unpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+GxKI5juIqhk1EGDwh5fKAHzAvqchzuN7HVSBiJuxfI=; b=r3TXaCQxYlazG8qoeW0uA3Iia//WJsnacaEWvU3G0d0ZxmJTY1WHemcQQ9Hgpcz7v/ 8hDuGfbr5omObFPyRM/Vn4sarSthDRkJzJQYU0witz+1grO2tL2wQ/xSuXvVxHjEy+qh ZvW5eNI8ohn0PQaMuvKAKeIzYN4bkl0KSkvYbvSj6j0+hO+VQLDLQnAm+lBauqfhrHJb Ed8ahUzfHguo/aTRZQIjhz4E260Gn7Ut2KT9D8TFut8AY5sYaEWFGgVMDO5BLJqAHOGz ss7lLQrMqdX/6y/1q0RsW/vjQF40JZlRjeDQuYd8b/3r5xvH3sr+wZpPu6LOZArX1SrS OtiQ== X-Gm-Message-State: AOAM532BcIhFPyVivRVepm5YSY1G47Ak1Ic4CO3h34nQ/klj2kdm9qfU KoYJNiFhFO+Tl/KrOWmfUFA= X-Google-Smtp-Source: ABdhPJxAE/ckP2EfEWdUMTNDisV/P1tKOefglPRpdm5fUyWUF/szxzAflEFmUbzhqqBRcTfxT4jKKA== X-Received: by 2002:a5d:5283:: with SMTP id c3mr13927252wrv.319.1615045021990; Sat, 06 Mar 2021 07:37:01 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Magnus Damm , Yoshinori Sato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Richard Henderson , Paolo Bonzini Subject: [PULL 08/14] hw/intc: Introduce SH_INTC Kconfig entry Date: Sat, 6 Mar 2021 16:36:15 +0100 Message-Id: <20210306153621.2393879-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210306153621.2393879-1-f4bug@amsat.org> References: <20210306153621.2393879-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We want to be able to use the 'SH4' config for architecture specific features. Add more fine-grained selection by adding a CONFIG_SH_INTC selector for the SH4 interrupt controller. Suggested-by: Peter Maydell Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Paolo Bonzini Message-Id: <20210222141514.2646278-4-f4bug@amsat.org> --- hw/intc/Kconfig | 3 +++ hw/intc/meson.build | 2 +- hw/sh4/Kconfig | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index c18d11142a8..66bf0b90b47 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -53,6 +53,9 @@ config OMPIC config PPC_UIC bool =20 +config SH_INTC + bool + config RX_ICU bool =20 diff --git a/hw/intc/meson.build b/hw/intc/meson.build index 53cba115690..b3d9345a0d2 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -47,7 +47,7 @@ specific_ss.add(when: 'CONFIG_RX_ICU', if_true: files('rx_icu.c')) specific_ss.add(when: 'CONFIG_S390_FLIC', if_true: files('s390_flic.c')) specific_ss.add(when: 'CONFIG_S390_FLIC_KVM', if_true: files('s390_flic_kv= m.c')) -specific_ss.add(when: 'CONFIG_SH4', if_true: files('sh_intc.c')) +specific_ss.add(when: 'CONFIG_SH_INTC', if_true: files('sh_intc.c')) specific_ss.add(when: 'CONFIG_SIFIVE_CLINT', if_true: files('sifive_clint.= c')) specific_ss.add(when: 'CONFIG_SIFIVE_PLIC', if_true: files('sifive_plic.c'= )) specific_ss.add(when: 'CONFIG_XICS', if_true: files('xics.c')) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 0452b4624ae..c2008c6a0d2 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -19,6 +19,7 @@ config SHIX =20 config SH7750 bool + select SH_INTC =20 config SH4 bool --=20 2.26.2 From nobody Wed May 22 00:12:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615045028; cv=none; d=zohomail.com; s=zohoarc; b=GoTR5Jb6Ab5sQp9Eh19BhEXOUzJppybakffRNZYBM+CFAEEu/jvAu17KTHEOZXUA4FVbA3Ln7//dZ3/TfZfdTR11Y1VQBrGtCd2cgi1+uD/Dg0P5KcQUVRZgh4Jca0maMRtJ9Q8g3dtyBr0TLg2QFNKT6hrsbc5hWiOraEvexRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615045028; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VEfG+VEgtzOXP1KKQgBSYNnUGOLnqfQoGKifvKY+0q0=; b=JwZVAm2UQjFoLT2NZ4d5SnGCux3jT8rNJLYt8GALWYQrjLr1k81oOFySj8JEmqCqhWKH8fedtulrwn3dwN84vJyA/YgdSLZJGlugUyBfP0Fn8artJ2TpqJfC+d1dt3Mg43XhNSJqHxCYr6Ejq7w38ZBWzL1RP2RCJax5x6fwEw0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1615045028764660.5912229779786; Sat, 6 Mar 2021 07:37:08 -0800 (PST) Received: by mail-wr1-f50.google.com with SMTP id 7so5918839wrz.0 for ; Sat, 06 Mar 2021 07:37:08 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id c35sm8732533wmp.3.2021.03.06.07.37.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 07:37:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VEfG+VEgtzOXP1KKQgBSYNnUGOLnqfQoGKifvKY+0q0=; b=PpgfGtQigXp99MT8VS2kheBcAuuz2fJiSdB9ui4aaq8nCYjrUdKOsVeAa7wTx0Nzm7 EBEN0f9V9LlkBGmJHXW84V0O9NG10xFN8bwEUDu/nFeGYKV68EJvcK3YK/RkhYeOMS1Z khbweV5zOVamGLCAJm1C7k1mgI7ymO1hJkQvLM9H5yotcyawcYcshNp954vgy+5MzXWa rsP9ahdGm7BlJxJORRL+6PlH5SFghe+zcbjoq6bKJaQ69Rwl/n8IBmZDe4UJh4JAYBJN nNCOaWw/n0X1YYdWDbMQ79PhHvZdOvkuhtRqDhFz9+ZiKg3u5wVq1xaOGkVSEDkYI0rp TTxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=VEfG+VEgtzOXP1KKQgBSYNnUGOLnqfQoGKifvKY+0q0=; b=TsnpB80Wy8Oz3tt3g4erx0/q3qzkyYWYMx8xar8BU+7OTBnhbWVZEer20XoKLh34e6 iN1Xn2BTKBGHuJRPn8p8YmbAXYdoZcSbB2nQFbSPd4NSEluV5L3MWwM9yIhLBaqFFgLd 8yaDIgCjoXnDWDiKZSls1M9cfBbJ5/6K+USB+Lec1ZBan0/pZx5g+LK8jORSPnKGby5o VCvBLDzDcJsIpszmIPXGYq+3Ma/xU341wdpOxP+5zId0XOecAvhDqZgdzyrS32rPCXZH O239Gq5XxOia3pbZmbPtTR/iC0HYTBjb99wFRCj/IL3Q3Y4nYhd0y6jaUzuNC7ixJ/eC BvSw== X-Gm-Message-State: AOAM5336zdtta7b29yV0iSCe8+Yf0HElTUWIl21zooEbF+EuNNV/nQlI Nb06tB9Erh9BzIo+lza0XdE= X-Google-Smtp-Source: ABdhPJyrSwEa8C4r8tPFRJUiLSfIl3EbO2/wXiYUiFiOA0uQ0iHVq2vJqoZxgzrkki6wjkgchHtS1A== X-Received: by 2002:a5d:4523:: with SMTP id j3mr15098901wra.288.1615045027082; Sat, 06 Mar 2021 07:37:07 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Magnus Damm , Yoshinori Sato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Richard Henderson , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 09/14] hw/char: Introduce SH_SCI Kconfig entry Date: Sat, 6 Mar 2021 16:36:16 +0100 Message-Id: <20210306153621.2393879-10-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210306153621.2393879-1-f4bug@amsat.org> References: <20210306153621.2393879-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We want to be able to use the 'SH4' config for architecture specific features. Add more fine-grained selection by adding a CONFIG_SH_SCI selector for the SH4 serial controller. Add the missing MAINTAINERS entries. Suggested-by: Peter Maydell Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Paolo Bonzini Message-Id: <20210222141514.2646278-5-f4bug@amsat.org> --- MAINTAINERS | 2 ++ hw/char/Kconfig | 3 +++ hw/char/meson.build | 2 +- hw/sh4/Kconfig | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 26c9454823a..8405741e910 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1397,6 +1397,7 @@ R2D M: Yoshinori Sato R: Magnus Damm S: Odd Fixes +F: hw/char/sh_serial.c F: hw/sh4/r2d.c F: hw/intc/sh_intc.c F: include/hw/sh4/sh_intc.h @@ -1405,6 +1406,7 @@ Shix M: Yoshinori Sato R: Magnus Damm S: Odd Fixes +F: hw/char/sh_serial.c F: hw/sh4/shix.c F: hw/intc/sh_intc.c F: include/hw/sh4/sh_intc.h diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 939bc447588..f6f4fffd1b7 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -50,6 +50,9 @@ config SCLPCONSOLE config TERMINAL3270 bool =20 +config SH_SCI + bool + config RENESAS_SCI bool =20 diff --git a/hw/char/meson.build b/hw/char/meson.build index 196ac91fa29..afe9a0af88c 100644 --- a/hw/char/meson.build +++ b/hw/char/meson.build @@ -31,7 +31,7 @@ softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_aux.c')) softmmu_ss.add(when: 'CONFIG_RENESAS_SCI', if_true: files('renesas_sci.c')) softmmu_ss.add(when: 'CONFIG_SIFIVE_UART', if_true: files('sifive_uart.c')) -softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('sh_serial.c')) +softmmu_ss.add(when: 'CONFIG_SH_SCI', if_true: files('sh_serial.c')) softmmu_ss.add(when: 'CONFIG_STM32F2XX_USART', if_true: files('stm32f2xx_u= sart.c')) softmmu_ss.add(when: 'CONFIG_MCHP_PFSOC_MMUART', if_true: files('mchp_pfso= c_mmuart.c')) =20 diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index c2008c6a0d2..47240aa97b7 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -20,6 +20,7 @@ config SHIX config SH7750 bool select SH_INTC + select SH_SCI =20 config SH4 bool --=20 2.26.2 From nobody Wed May 22 00:12:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615045033; cv=none; d=zohomail.com; s=zohoarc; b=JpZUYVTc7qAGyurdZKIH44sAGXS1AIVkiSSmYoGv4v2iVq/9csGU9ZfIJc32uGdDX4x9KlniQm9/lPzCYrpHwwj8dCyCsrRUqlIiRfp5mwfP/BIljqIhilqb1wCabFpF5KQU/nIQArtTxqiGS5rkbcoNZ5igLEcPgJA7ORZL0Kc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615045033; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uEOID6/SjEQa+nafaAE6r6SaX3JtENvz2cvvX61NoV4=; b=g7R3fc0VzGJpVBw5a6HzKqhSmFXpUWUSh0kCtpvVE2i17P5bDf3eHQ+q2ghzBhLcZdYtfHyP8T7+huptYO7l0CqtA3fVwzREZGT5EzW5UBaLPUjason0Pa5sWCueKI/68a6Y563gh+Y0K9v/6vzgKr/F1eqen+aQzo1KfzSlLUg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1615045033805679.2083844178926; Sat, 6 Mar 2021 07:37:13 -0800 (PST) Received: by mail-wm1-f51.google.com with SMTP id r15-20020a05600c35cfb029010e639ca09eso1139646wmq.1 for ; Sat, 06 Mar 2021 07:37:13 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id z7sm9539963wrt.70.2021.03.06.07.37.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 07:37:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uEOID6/SjEQa+nafaAE6r6SaX3JtENvz2cvvX61NoV4=; b=qYAxecm3tMNtYSed3tul9cezGZKGJoiOLloFZQzksgnPo2fOZ0fOEKVKwb1lSReAKx btkvvg9ZYOZXZFdodmo3jE1W66wwPInzju0mbkqmL0kNWKKIc/Q5J5Gdcw2Kzs490GLJ 7v+epxuPRM7zPCPY0aE2h+1Y9dvQ0tKgKRQ2ePncZO+6+5rnJZWsUGHFy61vWbshgePU DSUZZ9JWv9soNhsGELJnS/x1mMhFAlSaTe/W+Y54YoXO07eBuZE6fGA0k05hK4basSub Bbm7tVJY4n1yJoA7sHbIAyrFy6YN9Q+Bppii+3DoBAeFEkP3jRrxjFWQ4iOL6ygtdfEz uJEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=uEOID6/SjEQa+nafaAE6r6SaX3JtENvz2cvvX61NoV4=; b=G+ua5tUfnMFaxUREE7AbxFaj3SBnTV1Xlvna/G7IBhi7ohAlGm32SsSzto1/m1Bq6P msPeftYcwKQmpdaXvR1iV3MDQkEzqxyKOCTvi81l5nOyTFK1VQuHGjveowOj2oQ6MEmD 8gIo6yLHSH2gdsOmttqVXHR+kT7sutRgNVfGeMk2Z5W7ONiSvIxVvNoxUDm1G9L792+p ue7DFied3NRVvWKeCU25OPy8ApRSP5hSCJniKT0ntivqm826o+RaxNNiJ5wdsqxWXmVt my7lQHFX/Va+Jq2p3EYLRUI8Na/a8bnlVfi6bKnDRlW64UiQxqoRELThCKzNnTT4o4RK yBcA== X-Gm-Message-State: AOAM532UDYIMe5CxJetTLoSx1mI0VI5AFEjNiRfK3gwbimP4acz2/xZN QnsPG9AiVzKwaLT9gYQfEoA= X-Google-Smtp-Source: ABdhPJxhM+4B66SdsP+hw7kWUDpL6seuAY3Fv8pCJ210A+iZOTo790zEeDrrDSfMsbpr8VFaccWbEQ== X-Received: by 2002:a1c:b783:: with SMTP id h125mr14250831wmf.106.1615045032066; Sat, 06 Mar 2021 07:37:12 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Magnus Damm , Yoshinori Sato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Richard Henderson , Paolo Bonzini Subject: [PULL 10/14] hw/timer: Introduce SH_TIMER Kconfig entry Date: Sat, 6 Mar 2021 16:36:17 +0100 Message-Id: <20210306153621.2393879-11-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210306153621.2393879-1-f4bug@amsat.org> References: <20210306153621.2393879-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We want to be able to use the 'SH4' config for architecture specific features. Add more fine-grained selection by adding a CONFIG_SH_TIMER selector for the SH4 timer control unit. Add the missing MAINTAINERS entries. Suggested-by: Peter Maydell Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Paolo Bonzini Message-Id: <20210222141514.2646278-6-f4bug@amsat.org> --- MAINTAINERS | 2 ++ hw/sh4/Kconfig | 2 +- hw/timer/Kconfig | 4 ++++ hw/timer/meson.build | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 8405741e910..4a722c44b1b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1400,6 +1400,7 @@ S: Odd Fixes F: hw/char/sh_serial.c F: hw/sh4/r2d.c F: hw/intc/sh_intc.c +F: hw/timer/sh_timer.c F: include/hw/sh4/sh_intc.h =20 Shix @@ -1409,6 +1410,7 @@ S: Odd Fixes F: hw/char/sh_serial.c F: hw/sh4/shix.c F: hw/intc/sh_intc.c +F: hw/timer/sh_timer.c F: include/hw/sh4/sh_intc.h =20 SPARC Machines diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 47240aa97b7..e569470a614 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -21,7 +21,7 @@ config SH7750 bool select SH_INTC select SH_SCI + select SH_TIMER =20 config SH4 bool - select PTIMER diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index 8749edfb6a5..18936ef55bf 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -36,6 +36,10 @@ config CMSDK_APB_DUALTIMER bool select PTIMER =20 +config SH_TIMER + bool + select PTIMER + config RENESAS_TMR bool =20 diff --git a/hw/timer/meson.build b/hw/timer/meson.build index be343f68fed..26c2701fd78 100644 --- a/hw/timer/meson.build +++ b/hw/timer/meson.build @@ -30,7 +30,7 @@ softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_ost.c')) softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_timer.c')) softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_systmr.c')) -softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('sh_timer.c')) +softmmu_ss.add(when: 'CONFIG_SH_TIMER', if_true: files('sh_timer.c')) softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_timer.c')) softmmu_ss.add(when: 'CONFIG_STM32F2XX_TIMER', if_true: files('stm32f2xx_t= imer.c')) softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_timer.c')) --=20 2.26.2 From nobody Wed May 22 00:12:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) client-ip=209.85.128.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1615045038; cv=none; d=zohomail.com; s=zohoarc; b=SJ+r1XzwrfgF5jbhuJhnDDkNCr/0EVkU4VY4+11YRh43eFi/bd1QXYMWbYZL4LJBcOdlnJ0SDZgNovta/CNxMr56jfgyv/CFlOmnY+57BGtS3ClMWRHXyEPYIUFfIp+p7SzLmyowlwQnqT+msiP2fdxfTy4Qjs+DNGyEIWJ+Quo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615045038; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l/Phx4FGKpSmQsBkXzl/eBAwn7MJ4VQTWO4Xid9Q6lk=; b=nXueDnZtakoXJzxgpQxTUucMl7XctP+m4bFiKgGUFv2OUf9bXkzerDb1IhCfmxMrpnLz04Uy8f3ztH0EAKtX7kWD4yYn7CoMM2vf6bMWpzUWWF+lP0iW0YoLYrMzs2lH6aKFQ3TUhbQmUU1LPtZQJh7/o5zH77QicNJVPAMPx9s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.zohomail.com with SMTPS id 1615045038929837.1270076399073; Sat, 6 Mar 2021 07:37:18 -0800 (PST) Received: by mail-wm1-f54.google.com with SMTP id e23so3478826wmh.3 for ; Sat, 06 Mar 2021 07:37:18 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id b15sm9184894wrr.47.2021.03.06.07.37.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 07:37:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l/Phx4FGKpSmQsBkXzl/eBAwn7MJ4VQTWO4Xid9Q6lk=; b=eiGTFzDagAyLRjQn8psm0wyLhH4II8gNy5BWM+c1SAyw/E3/Orjx19GjWA/8MGISOy Qj3gJVynv7QJogT+ai5qDPHjUE/wvHQaLYcylueE4ZU9UtoZD0nhrRNci72p2dY7ucQS s0qctcSNSHixYqz05TsUrxdwx7l14b9ARsCgU3j3ROZH9VmhqO86Dko6HEYRGjIijlV/ qcw3LDs5yfoxAIqStfihHuukcvNYu07BGGVgV5VGZ2wpO5nzbrWWkgal4O2S9DbSFeUl uwX324S0xcyp+wpht/9mXPS2WaEVOBDB9of4hO3EpO4bYuKE4CL7S5z/ngPZt6M+seBe qqlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=l/Phx4FGKpSmQsBkXzl/eBAwn7MJ4VQTWO4Xid9Q6lk=; b=X41j3TEc415AWrX2x6BAxUVW0dWZsQDAcksgmgKfn4AC4jW3gfOeO2FmTidzFRxUTD 7W68dQgHQxz1OfC5vqgJDGdOu/ab3FS7i4VJcahcfPFuAcsZUJhqalno4d03vgVznW/t oqI4EDpvA8mLKKUAGCMuJp9keOdOEhwSdtMEfBz/TV/7NMCzRu7n6OU7GvPe+L5btbOh IKzbhSKk+nJqDISPTnBei/NR9GRvTwlae+mojGmKzuvaQO2Zx0gkUyuC7CqD+k8FYH6A VGMHGj/TO7zMjnihUtcEwsRRNNZbjtsKSv9YEH/gsSW7k98sv8jHb2Of971bOEHXIaIi C2JQ== X-Gm-Message-State: AOAM531wCG770OWM/Dk7Nlv/nlqa5DYdmyLKEuqAWNf7BDwSAkWLer41 IsA3dPj40AXcGJjy7quriyU= X-Google-Smtp-Source: ABdhPJxfpUQ5LRk2t62uKXIhWM66CzlkFUEimH0SucMle+D1zjm/5PvqsAvh7D1GdsNKOfLl1O3S/w== X-Received: by 2002:a1c:2288:: with SMTP id i130mr13897572wmi.62.1615045037226; Sat, 06 Mar 2021 07:37:17 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Magnus Damm , Yoshinori Sato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Richard Henderson , Paolo Bonzini , Kevin Wolf , Max Reitz , qemu-block@nongnu.org (open list:Block layer core) Subject: [PULL 11/14] hw/block: Introduce TC58128 eeprom Kconfig entry Date: Sat, 6 Mar 2021 16:36:18 +0100 Message-Id: <20210306153621.2393879-12-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210306153621.2393879-1-f4bug@amsat.org> References: <20210306153621.2393879-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Add more fine-grained selection by adding a CONFIG_TC58128 selector for the TC58128 eeprom. As this device is only used by the Shix machine, add an entry to the proper section in MAINTAINERS. Suggested-by: Peter Maydell Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Paolo Bonzini Message-Id: <20210222141514.2646278-7-f4bug@amsat.org> --- MAINTAINERS | 1 + hw/block/Kconfig | 3 +++ hw/block/meson.build | 2 +- hw/sh4/Kconfig | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 4a722c44b1b..109890af5e0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1407,6 +1407,7 @@ Shix M: Yoshinori Sato R: Magnus Damm S: Odd Fixes +F: hw/block/tc58128.c F: hw/char/sh_serial.c F: hw/sh4/shix.c F: hw/intc/sh_intc.c diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 2d17f481adc..4fcd1521668 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -22,6 +22,9 @@ config ECC config ONENAND bool =20 +config TC58128 + bool + config NVME_PCI bool default y if PCI_DEVICES diff --git a/hw/block/meson.build b/hw/block/meson.build index 602ca6c8541..4bf994c64ff 100644 --- a/hw/block/meson.build +++ b/hw/block/meson.build @@ -12,7 +12,7 @@ softmmu_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('m25p80.c')) softmmu_ss.add(when: 'CONFIG_SWIM', if_true: files('swim.c')) softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c')) -softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('tc58128.c')) +softmmu_ss.add(when: 'CONFIG_TC58128', if_true: files('tc58128.c')) softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.= c')) =20 specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index e569470a614..34c01dadde9 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -16,6 +16,7 @@ config SHIX bool select SH7750 select SH4 + select TC58128 =20 config SH7750 bool --=20 2.26.2 From nobody Wed May 22 00:12:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615045043; cv=none; d=zohomail.com; s=zohoarc; b=Dsb0iGKrMcy6w7Q0QgEhdomoDNc+Qk0WftWAblDDd4EBQJPgP47O8ClSGzrQ5kwX5EfVPxDBfyiSmE9a1/O+IJO0ErzmtgxoT8wUpDq27RTWyQ/HLfryX3CYIeQ9zuGHzpGY/qgRhg7w4vPn2mvE7HE7yBnBXatVR3LRTUjIl0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615045043; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mBQy7H34qbQ/oVKhr/I/dCedDrf+dnuJzMZjQP4qUxI=; b=WG5fOc+DnjGIEqBc+sh+m0V1siZlt6qE5eZoQZzM2diTVcjqke0PWTMaVXqk9asENKkZjM0ELeET0lQ+e/lEfFPO30Z47smBs90cyJ5b0oEJIu3vTgjanbPcDq13bTmn1QaRtkHKEjXw7pl9e6m70Ynphzfn0Eev9CUa/4m+5dM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1615045043958335.2822471705432; Sat, 6 Mar 2021 07:37:23 -0800 (PST) Received: by mail-wr1-f48.google.com with SMTP id l12so5890093wry.2 for ; Sat, 06 Mar 2021 07:37:23 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id z82sm9168036wmg.19.2021.03.06.07.37.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 07:37:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mBQy7H34qbQ/oVKhr/I/dCedDrf+dnuJzMZjQP4qUxI=; b=Ox5nKYGWL8Hezra+cdZ/vy0FmNHFXwWjyJ5VyqcwtqPEvdmQ9E1wZnW5NRCjiAqVUx SEWcWfvGSnDZt3JDMYDRa3jlBNWkzXDzLrPOgIQxfvXHunH9mtKr3tXi8lyeyYPsOiSd IOtUEEq0FGmA28gMdqX07bY2SsHPQkMU3EKqWxaaDSECuGLsq+aC7cV+lsyl235AVgmw 6Xl42pVllm38HoOGkfF+Jsq4xUjlt+P/1DBHj3g44WF7gHXA6aKHhtrYLViTKjpcDpMM yRzS4oh8o1JRnXJrOb3gKZ4yEHBHxA1NlHGhRaryQBKucMDcmswGwqTwalmyKMRL8SH2 bzwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mBQy7H34qbQ/oVKhr/I/dCedDrf+dnuJzMZjQP4qUxI=; b=HnmnTJeCJBYLSV372QHYdsg+2dqrBlkDPVUm85fYch9xnWImCHY8MsWS2749LZ3mJC OPNK4Fl6w2uYN1rINeWsH+x0u5PNCmnOAQYTwImpfKtGBZ+5UCOIWoTWZJ5gbdUmwBg5 3MB16vhQgEI3qF6KvakaZSsLMJpSxkO+0e3TPS2EFLPllNi/eL197GAyyaK7fi1nTUud 8fEH7Vg4/jT2w+0DKPIRkBfSEwtJ2CIfuxNBwBa5hkN9eFSg0a46gJGnhdHTKIidiYRi HtEYPKIpMECCXYyqbafV5Abuz6B/UK+pZcz/iVuDBaN4vTU7SpAAp5UMuHlhDV3Ecmbt oGpw== X-Gm-Message-State: AOAM5324t3bVRtBcfScd1+CHMt1fXXkHErTV0xziIsJZoHpDJxnTCJIR IRKMwmIkMt1EdQScxDXDQOE= X-Google-Smtp-Source: ABdhPJylrEzB1C3fRidTNqS28czEWEjWRP65plQNL2TbxRByY06Hn0AGELwIBXaWOmY+lE3lq6iacQ== X-Received: by 2002:a5d:4445:: with SMTP id x5mr15048027wrr.30.1615045042223; Sat, 06 Mar 2021 07:37:22 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Magnus Damm , Yoshinori Sato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Richard Henderson , Paolo Bonzini Subject: [PULL 12/14] hw/pci-host: Introduce SH_PCI Kconfig entry Date: Sat, 6 Mar 2021 16:36:19 +0100 Message-Id: <20210306153621.2393879-13-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210306153621.2393879-1-f4bug@amsat.org> References: <20210306153621.2393879-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We want to be able to use the 'SH4' config for architecture specific features. Add more fine-grained selection by adding a CONFIG_SH_PCI selector for the SH4 PCI controller. Move the file with the other PCI host devices in hw/pci-host and add its missing MAINTAINERS entries. Suggested-by: Peter Maydell Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Paolo Bonzini Message-Id: <20210222141514.2646278-8-f4bug@amsat.org> --- hw/{sh4 =3D> pci-host}/sh_pci.c | 0 MAINTAINERS | 1 + hw/pci-host/Kconfig | 4 ++++ hw/pci-host/meson.build | 1 + hw/sh4/Kconfig | 1 + hw/sh4/meson.build | 1 - 6 files changed, 7 insertions(+), 1 deletion(-) rename hw/{sh4 =3D> pci-host}/sh_pci.c (100%) diff --git a/hw/sh4/sh_pci.c b/hw/pci-host/sh_pci.c similarity index 100% rename from hw/sh4/sh_pci.c rename to hw/pci-host/sh_pci.c diff --git a/MAINTAINERS b/MAINTAINERS index 109890af5e0..f22d83c1782 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1400,6 +1400,7 @@ S: Odd Fixes F: hw/char/sh_serial.c F: hw/sh4/r2d.c F: hw/intc/sh_intc.c +F: hw/pci-host/sh_pci.c F: hw/timer/sh_timer.c F: include/hw/sh4/sh_intc.h =20 diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index 8b8c763c28c..2ccc96f02ce 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -68,3 +68,7 @@ config PCI_POWERNV =20 config REMOTE_PCIHOST bool + +config SH_PCI + bool + select PCI diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build index 1847c69905c..87a896973e7 100644 --- a/hw/pci-host/meson.build +++ b/hw/pci-host/meson.build @@ -10,6 +10,7 @@ pci_ss.add(when: 'CONFIG_PCI_SABRE', if_true: files('sabre.c')) pci_ss.add(when: 'CONFIG_XEN_IGD_PASSTHROUGH', if_true: files('xen_igd_pt.= c')) pci_ss.add(when: 'CONFIG_REMOTE_PCIHOST', if_true: files('remote.c')) +pci_ss.add(when: 'CONFIG_SH_PCI', if_true: files('sh_pci.c')) =20 # PPC devices pci_ss.add(when: 'CONFIG_PREP_PCI', if_true: files('prep.c')) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 34c01dadde9..b9f0538d57f 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -11,6 +11,7 @@ config R2D select SM501 select SH4 select SH7750 + select SH_PCI =20 config SHIX bool diff --git a/hw/sh4/meson.build b/hw/sh4/meson.build index 303c0f42879..424d5674dea 100644 --- a/hw/sh4/meson.build +++ b/hw/sh4/meson.build @@ -2,7 +2,6 @@ sh4_ss.add(files( 'sh7750.c', 'sh7750_regnames.c', - 'sh_pci.c' )) sh4_ss.add(when: 'CONFIG_R2D', if_true: files('r2d.c')) sh4_ss.add(when: 'CONFIG_SHIX', if_true: files('shix.c')) --=20 2.26.2 From nobody Wed May 22 00:12:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615045049; cv=none; d=zohomail.com; s=zohoarc; b=bhoV+Q5z+65NgMHzKzW37XPln8Kma6qkiPG6zf9AM1q+gs6ADbOoeNbipoKVeBdSx/i8DqV0B46FZ2X37Umdn67WU3UEJqxfh59g5A5yptKUeFF4feYwW1pdogedrqUc3SmyrLTefUPk+0efgd3tYVSvMnUtpFu7+416hpG+sm8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615045049; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=81TC0bXYTxGLtWhvQ00zHVezRA2hvTHOwclpqQk6LRU=; b=PI0VKS1FeC0+4dHlzjQCFsjk0RTBi9yVNSWMYGHRUYgbAHTP2DfUdBtf7hB372jN3o5tAvWDQTGgFod9oUpIpbDB0cEpr47xWYN3iiI+yFHSpcY8ljADOV6LOwWIy9LqsMZyhNK/WP9pc3noEmLLiCBO4ay407zVTy7iQ9tAznI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1615045049723787.7304248186414; Sat, 6 Mar 2021 07:37:29 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id l11so2483750wrp.7 for ; Sat, 06 Mar 2021 07:37:28 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id m9sm9519549wro.52.2021.03.06.07.37.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 07:37:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=81TC0bXYTxGLtWhvQ00zHVezRA2hvTHOwclpqQk6LRU=; b=FX2vGa9fKdnX5bE0EcKhWXfZYVXe01aTanRKNpaVePHicvi/6pskfOmH9zJC7FzbNG pKV6DY9QnzU+0PoXI39JVwfHkeeyW1OwDY0+LprL44G6SevnJEl7v/praoN2DTinrSrP /OFenegM9AIQ2rwQS4nVSbr2L5O3IKB0jT2N9DSHPBjSB1jPoLlJTOIyCufAOY9D00Zh KFvYt6FxKHl0Y9nsj9jnctWIP0S/bW36dhG36M3OruoiMEBOWFM/rGKCZMUHs5cd9Lk9 87KdqGS4/m6OAyUxboe9PQM7z0I0n8DmcH9CHrM932J1yeFhQki62wibtqAhv6wLD8o5 d0aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=81TC0bXYTxGLtWhvQ00zHVezRA2hvTHOwclpqQk6LRU=; b=CqBkwiXzDT3RxrvfaQhtnD1TNb1MGySg04+ghLDq5bDYCIYDcjN/9/EYPnmfbChKml Vdpf/AX+zuIwHueeQGz0WmZJ2tROF4EoovWXET/hTU25M4hXeQ2vNZZuuTAzf1hte4Fn fz36mNkR9xtfP/T4ieYt26yVArNZ3aQSacHN/vjxBOqQnHkE4vzspQhcMftU5D+SPyDg Nb4D7aojQLHefihRSMbl5Gz5u7GhriOgmiEOsIT6tdEirYK8HuFhrYhOzfWooDj5HH0a EqkSbxVeTsY76QVaG1/QCRyFYSUl6SLCbfGIrxL56GL42IXy22LhyBX5eBctQA6e1C7j XQlg== X-Gm-Message-State: AOAM531IzNDti4Tkv1szXPzmENIfPJFzmRbzmz4uCfQ3q0A+ej1EUihj NGKhIbVdOgWZLF3YKVauNIE= X-Google-Smtp-Source: ABdhPJxduzeVsqz3RfXVtcIAWAT3CXvnXqCAx2XWg2bKSfIP+J898DY8Y0kxuyh7sGkNUAcaI7Dlmw== X-Received: by 2002:adf:f711:: with SMTP id r17mr14681816wrp.358.1615045047071; Sat, 06 Mar 2021 07:37:27 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Magnus Damm , Yoshinori Sato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Richard Henderson , Paolo Bonzini Subject: [PULL 13/14] hw/sh4: Remove now unused CONFIG_SH4 from Kconfig Date: Sat, 6 Mar 2021 16:36:20 +0100 Message-Id: <20210306153621.2393879-14-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210306153621.2393879-1-f4bug@amsat.org> References: <20210306153621.2393879-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) As replaced the generic CONFIG_SH4 by more fine-grained selectors, we can remove this now unused config variable. Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Paolo Bonzini Message-Id: <20210222141514.2646278-9-f4bug@amsat.org> --- hw/sh4/Kconfig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index b9f0538d57f..ab733a3f760 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -9,14 +9,12 @@ config R2D select USB_OHCI_PCI select PCI select SM501 - select SH4 select SH7750 select SH_PCI =20 config SHIX bool select SH7750 - select SH4 select TC58128 =20 config SH7750 @@ -24,6 +22,3 @@ config SH7750 select SH_INTC select SH_SCI select SH_TIMER - -config SH4 - bool --=20 2.26.2 From nobody Wed May 22 00:12:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) client-ip=209.85.128.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615045053; cv=none; d=zohomail.com; s=zohoarc; b=L+Sv6CGZykXbPgnjrbBOEAEtor6gfv9WsVMDq3KRWWwCTOfMOHVJmT8f9GoQKa/BBurqDecKnxTQBVNi2ABeG3DROnsxfSWijGVJy0pivRcGAB+oKP1z+SfqIuDNcxXL57C8NP18w5SCbpHltJiqxUuWJM+vrzUTExa6y1oIChE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615045053; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=k8dN1hzgQ4tPFOcaWNv/scrVM7GwL38pvBm6AwY8BGs=; b=kHg7O9y4DQZaFhnuhBrRXPSIXwYRGQJOeKRvFMg98fEY74Xkj4y+iAzcEWVraov3WcERGn3zof/YSe+E0snazy479gk4Jtanbfe1i89vDLxW+rQVUC2XxMpJhMOtYmSUdBU0Q84dqfPhNT69Hp2Hf41IIuPPI12pKnQWyY0SP1A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.zohomail.com with SMTPS id 1615045053522527.5828394231573; Sat, 6 Mar 2021 07:37:33 -0800 (PST) Received: by mail-wm1-f41.google.com with SMTP id f22-20020a7bc8d60000b029010c024a1407so1138966wml.2 for ; Sat, 06 Mar 2021 07:37:32 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id 91sm10376973wrl.20.2021.03.06.07.37.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 07:37:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k8dN1hzgQ4tPFOcaWNv/scrVM7GwL38pvBm6AwY8BGs=; b=V0FVy0ciXk5yU/tt9oLtnui7wFGqoZWBkhIrdrCsG2gq/vCJUiHg2CZOeRmXOvTMc1 Q22D93QDZOcrWVUqAULd9azaO1VJcT1Aw1F1kTypjj9esoHFRwB2zixx5xADhl4xtg5T bt+8Y6XbylYFBcLviCl3uGkpHdSipWZ9cO2Z2NGiTKjSVCMEo0L+gXIrxK//0iRXOToP HxVlEnoKSAh+ut+hEVYm9FEqv1cjPKmiTL5tHvDkLfVc2iSrufLn1gq8lFrJYFZ+7An5 BaVEI81C9jwZkgTWrBxJuvYfi/UwHriKlHo7StHU5qfV13ANk+ZbfUG1G1GWwdmB8cMd vIQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=k8dN1hzgQ4tPFOcaWNv/scrVM7GwL38pvBm6AwY8BGs=; b=nQIrYX9FPiZEF67yBFavSAr9bWAs5sfQepszlBDVycEES8Eg/Q/rhmFY9ihAJOoas8 CdlkpFpJrKhVJkz2LvfkKTuCJij6yamFaLyE/7n5G7tVKESu4ssz6R3JORIn1lIwnII9 MMGQVDVMQ2tMIT0sPaFJ9ty2PGXWFksS3BEDMVSjU3CB0L1ISTv4Yp7riKXNEV7Qsdjt Eb40EkMvGZm6SBtoHgLvfoU2PaPgbNTBK4oKlkUbVQsUAr/Hv++I7tm1omSQPzys4/zo jNulI2SQZKb4LLOkIGiYDdpHniNLvB4UNIG9FRsf3s8ieMgAezvvh12VLJXPfzXqBYmD Dq7A== X-Gm-Message-State: AOAM533R+0Plk0wQvSQ5jZcpFLkcJygTdZp0CbImtJQitdNRuLbbJxxV z1CYUS3643BtjuXDb8bHbuA= X-Google-Smtp-Source: ABdhPJx1W0VNjqsGLN2dS1jmknLQOH0rT9visGLX7c7ol+1q2k5eAgvO2548VGJ9xVMz9Viqnn2BHQ== X-Received: by 2002:a05:600c:2cb9:: with SMTP id h25mr14104705wmc.110.1615045051854; Sat, 06 Mar 2021 07:37:31 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Magnus Damm , Yoshinori Sato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PULL 14/14] hw/sh4/sh7750_regs: Replace link to license by its full content Date: Sat, 6 Mar 2021 16:36:21 +0100 Message-Id: <20210306153621.2393879-15-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210306153621.2393879-1-f4bug@amsat.org> References: <20210306153621.2393879-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) This file is borrowed from the RTEMS source code, which comes with a GPL-2.0-or-later license with a header exception. Expand the GPL-2.0-or-later license in place to not be dependent on a 3rd party website. This also fix the misleading comment "The license and distribution terms for this file may be found in the file LICENSE in this distribution" referring to the RTEMS distribution and not to the QEMU one. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Message-Id: <20210222185605.2714192-1-f4bug@amsat.org> --- hw/sh4/sh7750_regs.h | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/hw/sh4/sh7750_regs.h b/hw/sh4/sh7750_regs.h index 3e4554af315..ab073dadc74 100644 --- a/hw/sh4/sh7750_regs.h +++ b/hw/sh4/sh7750_regs.h @@ -10,8 +10,28 @@ * Victor V. Vengerov * * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. + * found in this file hereafter or at http://www.rtems.com/license/LICENSE. + * + * LICENSE INFORMATION + * + * RTEMS is free software; you can redistribute it and/or modify it under + * terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2, or (at your option) any + * later version. RTEMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. You should have received + * a copy of the GNU General Public License along with RTEMS; see + * file COPYING. If not, write to the Free Software Foundation, 675 + * Mass Ave, Cambridge, MA 02139, USA. + * + * As a special exception, including RTEMS header files in a file, + * instantiating RTEMS generics or templates, or linking other files + * with RTEMS objects to produce an executable application, does not + * by itself cause the resulting executable application to be covered + * by the GNU General Public License. This exception does not + * however invalidate any other reasons why the executable file might be + * covered by the GNU Public License. * * @(#) sh7750_regs.h,v 1.2.4.1 2003/09/04 18:46:00 joel Exp */ --=20 2.26.2