From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B8823B71A7 for ; Wed, 19 Aug 2026 13:40:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787146830; cv=none; b=qEAo5Y9ZXIGdCVVHZVlQ9WqSfnrv1Wkg+yppmZUORTi9aHfh0acZxbKKJCe6IPexmf5C4MTb+2yvRQsHhwFgGpc+2Msd8XNOJ9hSqHv3/3VxfnTjCDFw0N4//r5XQXhvhGyoW6LHZBeB0c+xtioq7sdnHUl12fzJ8BKIBIy6ebY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787146830; c=relaxed/simple; bh=snQKLeLT75NhxJLM/cLRR/hycpX5EWBrYmLePIUVu5o=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JjCMvfCj4STsMgTu5FPaWExv8rGcmhXYdE7I86BvVfIfYur3G+dc8rDBi3+/DSQtWwC8Er1cKsuRV1s+s44NrbV4/XxCmyC/VhXVv1TfMRlUigYBy2cTZihbO0uP41JG4je9Rfe2vbB5l2n9HIyTf7po0qt15TTQwTdnhkm7evU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=APCx5B1T; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="APCx5B1T" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-498028b3d5eso11848645e9.1 for ; Wed, 19 Aug 2026 06:40:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787146826; x=1787751626; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=iNZrccnluIvzYumgzhKOaTGx9wbNf2yl74yeV2pPSb8=; b=APCx5B1TbUG6WCrSvg37Ca6FFFmW/b+/Pxnh584g2VpENy7j8ZYVcREarQ45NtFJM8 rgF9x9+7KS1gQqKC1WqTOv/rqOBHSpSxMvhkpeAHEL3LYl4nTUK7ARuyvP0lX4SaojRH C8IKUlU3YM2CsVO2uy2AC2Q9rK7MDGevNqOFop70FShrBg/YElyar/L4KWrBjTRY7Ywt 3OvHkhyqO6BmZH89OJe5a+PfrU7r7Wtlum77GFockR8saZ7tuBjhlZ4lh6FrbDgo8/Xy IWo9F3gedm4WlVJZbqwpsDhm1NU3psrod27EPbgkaBvDk4AwCH9iGdZbe1FEO4WQR5qN DJsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787146826; x=1787751626; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=iNZrccnluIvzYumgzhKOaTGx9wbNf2yl74yeV2pPSb8=; b=RxvLkejEz3/Sc9aRiakdcr+RRP1JsEIe9iIa1ESEyDDmq3kEKYZceHOEYVbGrwpU6F kzDFFsuHLUFJFXcopvXcR6dDtTHncfGvH3HIz8NmZxqdRcC59aGVO5K+ZqXnE9xHqsdT 1g90CIgugc288BLVgaAAajygx82A1p/KQkDfM0YgwOYiFuRwK7+AVKnS9yZaCkkISesD SmM2CFhYV/7/ZK+d5MZOf5SisxF55fDbzikvP7L5UZabxHbcE6DJM+g/1yj2RYUeewlx DAiM+OoOkSL6EfRxkhkst6Z+aEqrp6dyEeJd4wSLxLSbGDwLRwUR3QDrl6+K6W2BPIzv fv8Q== X-Gm-Message-State: AOJu0YzESdJIMxHxksgdaXuAQv4wHBLLeV6NiqxYjmF4HUQe/TyAVYjt o/dNnukdDRFMknZAC6D4SHf1dmjio+HhI2j+eHR9mqeZeYPf8Nedw9KJ X-Gm-Gg: AR+sD13XOZ60C6ODhMicKmPvlbNe60uv4ULsSh82/f65LeStOcWmiSnYsm44GnMagV4 kWpJRYBpPHnFz58Zz286Ce8m1UmCTb0Zjg4PDzLIVk8kCihpEULZsU7y29xU8CQqod7YH6KFSPl O9DcyvBofZsKU3yNr+bJZmpioRhpwRt3AGP8hL3YKHxBJZ/wmIgLKdVAYqsyPwBy+PhOjGWN5VO XOfJaDRb5yvlh091OezIo3Si9k1Eyc090YejMByBoXNTFGFmqA2lkDtKsJAW31x2a7EU202r9ml NvWSzCfswgkBDGKLM6IjguAXWOqBSeQMv3TZAVnPRcgVBTq59LNsKRyXdWdRPc4EeAqZp+Iz8G3 9NhfXQd6ZIzfVS2EXjjX/072cJMs5X0JmSqvhgyw5BZLo5LJzo2LSN3s+hI4ngYy/SeaQulLnp6 aUNSTW6SXNMcl1HADMn0OB8C/CyeFcz18L3MiYHsYPUQoYPQOQdpmIAJZGi0/WASlQOJh0MYbBF 9fJdjMsnksvYWi8ADBNEp8mIPkcAIBwNn6S X-Received: by 2002:a05:600c:8b03:b0:499:621a:2ec2 with SMTP id 5b1f17b1804b1-499aa1800ecmr103322495e9.3.1787146826264; Wed, 19 Aug 2026 06:40:26 -0700 (PDT) Received: from pumpkin (82-69-66-36.dsl.in-addr.zen.co.uk. [82.69.66.36]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-499aa0d6a84sm57126405e9.10.2026.08.19.06.40.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Aug 2026 06:40:25 -0700 (PDT) Date: Wed, 19 Aug 2026 14:40:24 +0100 From: David Laight To: Juergen Gross Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, Damien Le Moal , Niklas Cassel Subject: Re: [PATCH v2 04/13] drivers/ata: Stop using 32-bit MSR interfaces Message-ID: <20260819144024.7479a0a6@pumpkin> In-Reply-To: <20260819102314.1499258-5-jgross@suse.com> References: <20260819102314.1499258-1-jgross@suse.com> <20260819102314.1499258-5-jgross@suse.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; arm-unknown-linux-gnueabihf) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Wed, 19 Aug 2026 12:23:05 +0200 Juergen Gross wrote: > The 32-bit MSR interfaces rdmsr() and wrmsr() are planned to be > removed. Use the related 64-bit variants instead. > > In drivers/ata/pata_cs5536.c don't redefine rdmsr() and wrmsr() as > empty macros for avoiding misuse, but guard the affected code via > a simple #ifdef. > > Signed-off-by: Juergen Gross > --- > V2: > - avoid sign extension when using wrmsrq() (Sashiko bot) > --- > drivers/ata/pata_cs5535.c | 20 ++++++++++---------- > drivers/ata/pata_cs5536.c | 17 ++++++++--------- > 2 files changed, 18 insertions(+), 19 deletions(-) > > diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c > index d793fc441b46..e16c7f4c7c27 100644 > --- a/drivers/ata/pata_cs5535.c > +++ b/drivers/ata/pata_cs5535.c > @@ -90,7 +90,7 @@ static void cs5535_set_piomode(struct ata_port *ap, struct ata_device *adev) > static const u16 pio_cmd_timings[5] = { > 0xF7F4, 0x53F3, 0x13F1, 0x5131, 0x1131 > }; > - u32 reg, __maybe_unused dummy; > + u32 reg; > struct ata_device *pair = ata_dev_pair(adev); > > int mode = adev->pio_mode - XFER_PIO_0; > @@ -102,16 +102,16 @@ static void cs5535_set_piomode(struct ata_port *ap, struct ata_device *adev) > cmdmode = min(mode, pairmode); > /* Write the other drive timing register if it changed */ > if (cmdmode < pairmode) > - wrmsr(ATAC_CH0D0_PIO + 2 * pair->devno, > - pio_cmd_timings[cmdmode] << 16 | pio_timings[pairmode], 0); > + wrmsrq(ATAC_CH0D0_PIO + 2 * pair->devno, > + (u32)pio_cmd_timings[cmdmode] << 16 | pio_timings[pairmode]); That cast is horribly subtle. Perhaps change the array to be u32 and shift the values in the array initialiser? David > } > /* Write the drive timing register */ > - wrmsr(ATAC_CH0D0_PIO + 2 * adev->devno, > - pio_cmd_timings[cmdmode] << 16 | pio_timings[mode], 0); > + wrmsrq(ATAC_CH0D0_PIO + 2 * adev->devno, > + (u32)pio_cmd_timings[cmdmode] << 16 | pio_timings[mode]); > > /* Set the PIO "format 1" bit in the DMA timing register */ > - rdmsr(ATAC_CH0D0_DMA + 2 * adev->devno, reg, dummy); > - wrmsr(ATAC_CH0D0_DMA + 2 * adev->devno, reg | 0x80000000UL, 0); > + rdmsrq(ATAC_CH0D0_DMA + 2 * adev->devno, reg); > + wrmsrq(ATAC_CH0D0_DMA + 2 * adev->devno, reg | 0x80000000UL); > } > > /** > @@ -129,16 +129,16 @@ static void cs5535_set_dmamode(struct ata_port *ap, struct ata_device *adev) > static const u32 mwdma_timings[3] = { > 0x7F0FFFF3, 0x7F035352, 0x7F024241 > }; > - u32 reg, __maybe_unused dummy; > + u32 reg; > int mode = adev->dma_mode; > > - rdmsr(ATAC_CH0D0_DMA + 2 * adev->devno, reg, dummy); > + rdmsrq(ATAC_CH0D0_DMA + 2 * adev->devno, reg); > reg &= 0x80000000UL; > if (mode >= XFER_UDMA_0) > reg |= udma_timings[mode - XFER_UDMA_0]; > else > reg |= mwdma_timings[mode - XFER_MW_DMA_0]; > - wrmsr(ATAC_CH0D0_DMA + 2 * adev->devno, reg, 0); > + wrmsrq(ATAC_CH0D0_DMA + 2 * adev->devno, reg); > } > > static const struct scsi_host_template cs5535_sht = { > diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c > index 73e81e160c91..61d232a82b5e 100644 > --- a/drivers/ata/pata_cs5536.c > +++ b/drivers/ata/pata_cs5536.c > @@ -32,11 +32,8 @@ > static int use_msr; > module_param_named(msr, use_msr, int, 0644); > MODULE_PARM_DESC(msr, "Force using MSR to configure IDE function (Default: 0)"); > +#define MAYBE_USE_MSR > #else > -#undef rdmsr /* avoid accidental MSR usage on, e.g. x86-64 */ > -#undef wrmsr > -#define rdmsr(x, y, z) do { } while (0) > -#define wrmsr(x, y, z) do { } while (0) > #define use_msr 0 > #endif > > @@ -85,22 +82,24 @@ static const struct dmi_system_id udma_quirk_dmi_table[] = { > > static int cs5536_read(struct pci_dev *pdev, int reg, u32 *val) > { > +#ifdef MAYBE_USE_MSR > if (unlikely(use_msr)) { > - u32 dummy __maybe_unused; > - > - rdmsr(MSR_IDE_CFG + reg, *val, dummy); > + rdmsrq(MSR_IDE_CFG + reg, *val); > return 0; > } > +#endif > > return pci_read_config_dword(pdev, PCI_IDE_CFG + reg * 4, val); > } > > -static int cs5536_write(struct pci_dev *pdev, int reg, int val) > +static int cs5536_write(struct pci_dev *pdev, int reg, u32 val) > { > +#ifdef MAYBE_USE_MSR > if (unlikely(use_msr)) { > - wrmsr(MSR_IDE_CFG + reg, val, 0); > + wrmsrq(MSR_IDE_CFG + reg, val); > return 0; > } > +#endif > > return pci_write_config_dword(pdev, PCI_IDE_CFG + reg * 4, val); > }